Commit 5ecc5ac2 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'iommu-fix-v4.11-rc0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
 "Fix an issue introduced this merge window into the AMD and Intel IOMMU
  drivers that causes an oops when the vendor-specific sysfs-entries are
  accessed.

  The reason for this issue is that I forgot to update the sysfs code in
  the drivers when moving the iommu 'struct device' to the iommu-core"

* tag 'iommu-fix-v4.11-rc0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix crash when accessing AMD-Vi sysfs entries
  iommu/vt-d: Fix crash when accessing VT-d sysfs entries
parents 8313064c b7a42b9d
...@@ -1507,7 +1507,7 @@ static ssize_t amd_iommu_show_cap(struct device *dev, ...@@ -1507,7 +1507,7 @@ static ssize_t amd_iommu_show_cap(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct amd_iommu *iommu = dev_get_drvdata(dev); struct amd_iommu *iommu = dev_to_amd_iommu(dev);
return sprintf(buf, "%x\n", iommu->cap); return sprintf(buf, "%x\n", iommu->cap);
} }
static DEVICE_ATTR(cap, S_IRUGO, amd_iommu_show_cap, NULL); static DEVICE_ATTR(cap, S_IRUGO, amd_iommu_show_cap, NULL);
...@@ -1516,7 +1516,7 @@ static ssize_t amd_iommu_show_features(struct device *dev, ...@@ -1516,7 +1516,7 @@ static ssize_t amd_iommu_show_features(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct amd_iommu *iommu = dev_get_drvdata(dev); struct amd_iommu *iommu = dev_to_amd_iommu(dev);
return sprintf(buf, "%llx\n", iommu->features); return sprintf(buf, "%llx\n", iommu->features);
} }
static DEVICE_ATTR(features, S_IRUGO, amd_iommu_show_features, NULL); static DEVICE_ATTR(features, S_IRUGO, amd_iommu_show_features, NULL);
......
...@@ -569,6 +569,11 @@ struct amd_iommu { ...@@ -569,6 +569,11 @@ struct amd_iommu {
volatile u64 __aligned(8) cmd_sem; volatile u64 __aligned(8) cmd_sem;
}; };
static inline struct amd_iommu *dev_to_amd_iommu(struct device *dev)
{
return container_of(dev, struct amd_iommu, iommu.dev);
}
#define ACPIHID_UID_LEN 256 #define ACPIHID_UID_LEN 256
#define ACPIHID_HID_LEN 9 #define ACPIHID_HID_LEN 9
......
...@@ -4730,11 +4730,16 @@ static int intel_iommu_cpu_dead(unsigned int cpu) ...@@ -4730,11 +4730,16 @@ static int intel_iommu_cpu_dead(unsigned int cpu)
return 0; 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, static ssize_t intel_iommu_show_version(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) 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); u32 ver = readl(iommu->reg + DMAR_VER_REG);
return sprintf(buf, "%d:%d\n", return sprintf(buf, "%d:%d\n",
DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver)); DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver));
...@@ -4745,7 +4750,7 @@ static ssize_t intel_iommu_show_address(struct device *dev, ...@@ -4745,7 +4750,7 @@ static ssize_t intel_iommu_show_address(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) 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); return sprintf(buf, "%llx\n", iommu->reg_phys);
} }
static DEVICE_ATTR(address, S_IRUGO, intel_iommu_show_address, NULL); 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, ...@@ -4754,7 +4759,7 @@ static ssize_t intel_iommu_show_cap(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) 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); return sprintf(buf, "%llx\n", iommu->cap);
} }
static DEVICE_ATTR(cap, S_IRUGO, intel_iommu_show_cap, NULL); 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, ...@@ -4763,7 +4768,7 @@ static ssize_t intel_iommu_show_ecap(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) 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); return sprintf(buf, "%llx\n", iommu->ecap);
} }
static DEVICE_ATTR(ecap, S_IRUGO, intel_iommu_show_ecap, NULL); 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, ...@@ -4772,7 +4777,7 @@ static ssize_t intel_iommu_show_ndoms(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) 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)); return sprintf(buf, "%ld\n", cap_ndoms(iommu->cap));
} }
static DEVICE_ATTR(domains_supported, S_IRUGO, intel_iommu_show_ndoms, NULL); 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, ...@@ -4781,7 +4786,7 @@ static ssize_t intel_iommu_show_ndoms_used(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) 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, return sprintf(buf, "%d\n", bitmap_weight(iommu->domain_ids,
cap_ndoms(iommu->cap))); cap_ndoms(iommu->cap)));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment