Commit d08d6f5d authored by Pierre Morel's avatar Pierre Morel Committed by Vasily Gorbik
Browse files

s390/pci: adaptation of iommu to multifunction 



In the future the bus sysdata may not directly point to the
zpci_dev.

In preparation of upcoming patches let us abstract the
access to the zpci_dev from the device inside the pci device.

Signed-off-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent e6ab7490

arch/s390/include/asm/pci.h

+5 −0
Original line number Diff line number Diff line
@@ -231,6 +231,11 @@ static inline struct zpci_dev *to_zpci(struct pci_dev *pdev) 
	return pdev->sysdata;

}



static inline struct zpci_dev *to_zpci_dev(struct device *dev)

{

	return to_zpci(to_pci_dev(dev));

}



struct zpci_dev *get_zdev_by_fid(u32);



/* DMA */

drivers/iommu/s390-iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int s390_iommu_attach_device(struct iommu_domain *domain, 
				    struct device *dev)

{

	struct s390_domain *s390_domain = to_s390_domain(domain);

	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;

	struct zpci_dev *zdev = to_zpci_dev(dev);

	struct s390_domain_device *domain_device;

	unsigned long flags;

	int rc;
@@ -139,7 +139,7 @@ static void s390_iommu_detach_device(struct iommu_domain *domain, 
				     struct device *dev)

{

	struct s390_domain *s390_domain = to_s390_domain(domain);

	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;

	struct zpci_dev *zdev = to_zpci_dev(dev);

	struct s390_domain_device *domain_device, *tmp;

	unsigned long flags;

	int found = 0;
@@ -169,7 +169,7 @@ static void s390_iommu_detach_device(struct iommu_domain *domain, 
static int s390_iommu_add_device(struct device *dev)

{

	struct iommu_group *group = iommu_group_get_for_dev(dev);

	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;

	struct zpci_dev *zdev = to_zpci_dev(dev);



	if (IS_ERR(group))

		return PTR_ERR(group);
@@ -182,7 +182,7 @@ static int s390_iommu_add_device(struct device *dev) 


static void s390_iommu_remove_device(struct device *dev)

{

	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;

	struct zpci_dev *zdev = to_zpci_dev(dev);

	struct iommu_domain *domain;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE