From cf28264196e596c11d0d47f6150dfef5c0e4239f Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Mon, 9 Mar 2020 23:43:12 +0100 Subject: virtio-serial: Rework shutdown sequence The "io" word of term-io.fs opens two separate instances of the device for stdin and stdout. The prom_init() function in Linux closes stdin at some point, which internally calls quiesce and shuts the device down through a quiesce hook. When the "open-count" variable in virtio-serial.fs reaches 0, ie. when closing the last instance, we call "close" two times, which is clearly wrong. This never hits however because the stdout instance is never closed which prevents "open-count" to reach 0. It would make more sense to shutdown the device when closing the last instance, for symmetry with the first open that initializes the device. Change the shutdown sequence to do that rather than relying on a quiesce hook. Have quiesce to explicitly close stdout, which is supposedly the last instance, and shutdown the device. Signed-off-by: Greg Kurz Signed-off-by: Alexey Kardashevskiy --- slof/fs/client.fs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'slof') diff --git a/slof/fs/client.fs b/slof/fs/client.fs index db7a192..76231f9 100644 --- a/slof/fs/client.fs +++ b/slof/fs/client.fs @@ -203,6 +203,11 @@ ALSO client-voc DEFINITIONS \ End of life of SLOF now, call platform quiesce as quiesce \ is an undocumented extension and not everybody supports it close-dev + \ Some device, eg. virtio-serial, need all instances to be + \ closed in order to be reset properly + s" stdout" get-chosen IF + decode-int nip nip close-dev + THEN quiesce ELSE close-dev -- cgit v1.1