Commit b6f88870 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Joerg Roedel
Browse files

s390/pci: prepare is_passed_through() for dma-iommu 



With the IOMMU always controlled through the IOMMU driver testing for
zdev->s390_domain is not a valid indication of the device being
passed-through. Instead test if zdev->kzdev is set.

Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Link: https://lore.kernel.org/r/20230928-dma_iommu-v13-2-9e5fc4dacc36@linux.ibm.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent fa4c4507

arch/s390/pci/pci_event.c

+11 −4
Original line number Diff line number Diff line
@@ -59,9 +59,16 @@ static inline bool ers_result_indicates_abort(pci_ers_result_t ers_res) 
	}

}



static bool is_passed_through(struct zpci_dev *zdev)

static bool is_passed_through(struct pci_dev *pdev)

{

	return zdev->s390_domain;

	struct zpci_dev *zdev = to_zpci(pdev);

	bool ret;



	mutex_lock(&zdev->kzdev_lock);

	ret = !!zdev->kzdev;

	mutex_unlock(&zdev->kzdev_lock);



	return ret;

}



static bool is_driver_supported(struct pci_driver *driver)
@@ -176,7 +183,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev) 
	}

	pdev->error_state = pci_channel_io_frozen;



	if (is_passed_through(to_zpci(pdev))) {

	if (is_passed_through(pdev)) {

		pr_info("%s: Cannot be recovered in the host because it is a pass-through device\n",

			pci_name(pdev));

		goto out_unlock;
@@ -239,7 +246,7 @@ static void zpci_event_io_failure(struct pci_dev *pdev, pci_channel_state_t es) 
	 * we will inject the error event and let the guest recover the device

	 * itself.

	 */

	if (is_passed_through(to_zpci(pdev)))

	if (is_passed_through(pdev))

		goto out;

	driver = to_pci_driver(pdev->dev.driver);

	if (driver && driver->err_handler && driver->err_handler->error_detected)