OSDN Git Service

s390/pci: fix DMA cleanup on hard deconfigure
authorNiklas Schnelle <schnelle@linux.ibm.com>
Wed, 24 Mar 2021 10:21:21 +0000 (11:21 +0100)
committerHeiko Carstens <hca@linux.ibm.com>
Sun, 28 Mar 2021 18:23:54 +0000 (20:23 +0200)
commit652d40b2f8bec14957295f999e3d329c3b53390f
treeaa52eaa90ff9467f375b61934a7c16aa81d8d16f
parent263df6e485445aff8f6189c1913b916b8c7f4f1d
s390/pci: fix DMA cleanup on hard deconfigure

In commit dee60c0dbc83 ("s390/pci: add zpci_event_hard_deconfigured()")
we added a zdev_enabled() check to what was previously an uncoditional
call to zpci_disable_device(). There are two problems with that. Firstly
zpci_had_deconfigured() is only called on event 0x0304 for which the
device is always already disabled by the platform so it is always false.
Secondly zpci_disable_device() not only disables the device but also
calls zpci_dma_exit_device() which is thus not called and we leak the
DMA tables.

Fix this by calling zpci_disable_device() unconditionally to perform
Linux side cleanup including the freeing of DMA tables.

Fixes: dee60c0dbc83 ("s390/pci: add zpci_event_hard_deconfigured()")
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Acked-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/pci/pci_event.c