Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7fdb6e6 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/vt-d: Fix crash when accessing VT-d sysfs entries 



The link between the iommu sysfs-device and the struct
intel_iommu is no longer stored as driver-data. Update the
code to use the new access method.

Reported-by: default avatarDave Jones <davej@codemonkey.org.uk>
Fixes: 39ab9555 ('iommu: Add sysfs bindings for struct iommu_device')
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 86292b33

drivers/iommu/intel-iommu.c

+11 −6
Original line number Diff line number Diff line
@@ -4730,11 +4730,16 @@ static int intel_iommu_cpu_dead(unsigned int cpu) 
	return 0;

}



static inline struct intel_iommu *dev_to_intel_iommu(struct device *dev)

{

	return container_of(dev, struct intel_iommu, iommu.dev);

}



static ssize_t intel_iommu_show_version(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	struct intel_iommu *iommu = dev_get_drvdata(dev);

	struct intel_iommu *iommu = dev_to_intel_iommu(dev);

	u32 ver = readl(iommu->reg + DMAR_VER_REG);

	return sprintf(buf, "%d:%d\n",

		       DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver));
@@ -4745,7 +4750,7 @@ static ssize_t intel_iommu_show_address(struct device *dev, 
					struct device_attribute *attr,

					char *buf)

{

	struct intel_iommu *iommu = dev_get_drvdata(dev);

	struct intel_iommu *iommu = dev_to_intel_iommu(dev);

	return sprintf(buf, "%llx\n", iommu->reg_phys);

}

static DEVICE_ATTR(address, S_IRUGO, intel_iommu_show_address, NULL);
@@ -4754,7 +4759,7 @@ static ssize_t intel_iommu_show_cap(struct device *dev, 
				    struct device_attribute *attr,

				    char *buf)

{

	struct intel_iommu *iommu = dev_get_drvdata(dev);

	struct intel_iommu *iommu = dev_to_intel_iommu(dev);

	return sprintf(buf, "%llx\n", iommu->cap);

}

static DEVICE_ATTR(cap, S_IRUGO, intel_iommu_show_cap, NULL);
@@ -4763,7 +4768,7 @@ static ssize_t intel_iommu_show_ecap(struct device *dev, 
				    struct device_attribute *attr,

				    char *buf)

{

	struct intel_iommu *iommu = dev_get_drvdata(dev);

	struct intel_iommu *iommu = dev_to_intel_iommu(dev);

	return sprintf(buf, "%llx\n", iommu->ecap);

}

static DEVICE_ATTR(ecap, S_IRUGO, intel_iommu_show_ecap, NULL);
@@ -4772,7 +4777,7 @@ static ssize_t intel_iommu_show_ndoms(struct device *dev, 
				      struct device_attribute *attr,

				      char *buf)

{

	struct intel_iommu *iommu = dev_get_drvdata(dev);

	struct intel_iommu *iommu = dev_to_intel_iommu(dev);

	return sprintf(buf, "%ld\n", cap_ndoms(iommu->cap));

}

static DEVICE_ATTR(domains_supported, S_IRUGO, intel_iommu_show_ndoms, NULL);
@@ -4781,7 +4786,7 @@ static ssize_t intel_iommu_show_ndoms_used(struct device *dev, 
					   struct device_attribute *attr,

					   char *buf)

{

	struct intel_iommu *iommu = dev_get_drvdata(dev);

	struct intel_iommu *iommu = dev_to_intel_iommu(dev);

	return sprintf(buf, "%d\n", bitmap_weight(iommu->domain_ids,

						  cap_ndoms(iommu->cap)));

}