Skip to content

L
linux
Commit a45627ba authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel
Browse files
Options

iommu/amd: Include PCI segment ID when initialize IOMMU 

Extend current device ID variables to 32-bit to include the 16-bit
segment ID when parsing device information from IVRS table to initialize
each IOMMU.
Co-developed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20220706113825.25582-31-vasant.hegde@amd.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent bf87972c
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 33 deletions
drivers/iommu/amd/amd_iommu.h
View file @ a45627ba
...@@ -125,7 +125,7 @@ static inline int get_pci_sbdf_id(struct pci_dev *pdev) ...@@ -125,7 +125,7 @@ static inline int get_pci_sbdf_id(struct pci_dev *pdev)
extern bool translation_pre_enabled(struct amd_iommu *iommu); extern bool translation_pre_enabled(struct amd_iommu *iommu);
extern bool amd_iommu_is_attach_deferred(struct device *dev); extern bool amd_iommu_is_attach_deferred(struct device *dev);
extern int __init add_special_device(u8 type, u8 id, u16 *devid, extern int __init add_special_device(u8 type, u8 id, u32 *devid,
bool cmd_line); bool cmd_line);
#ifdef CONFIG_DMI #ifdef CONFIG_DMI
......
drivers/iommu/amd/amd_iommu_types.h
View file @ a45627ba
...@@ -744,8 +744,8 @@ struct acpihid_map_entry { ...@@ -744,8 +744,8 @@ struct acpihid_map_entry {
struct list_head list; struct list_head list;
u8 uid[ACPIHID_UID_LEN]; u8 uid[ACPIHID_UID_LEN];
u8 hid[ACPIHID_HID_LEN]; u8 hid[ACPIHID_HID_LEN];
u16 devid; u32 devid;
u16 root_devid; u32 root_devid;
bool cmd_line; bool cmd_line;
struct iommu_group *group; struct iommu_group *group;
}; };
...@@ -753,7 +753,7 @@ struct acpihid_map_entry { ...@@ -753,7 +753,7 @@ struct acpihid_map_entry {
struct devid_map { struct devid_map {
struct list_head list; struct list_head list;
u8 id; u8 id;
u16 devid; u32 devid;
bool cmd_line; bool cmd_line;
}; };
......
drivers/iommu/amd/init.c
View file @ a45627ba
...@@ -1148,7 +1148,7 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu, ...@@ -1148,7 +1148,7 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu,
amd_iommu_set_rlookup_table(iommu, devid); amd_iommu_set_rlookup_table(iommu, devid);
} }
int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line) int __init add_special_device(u8 type, u8 id, u32 *devid, bool cmd_line)
{ {
struct devid_map *entry; struct devid_map *entry;
struct list_head *list; struct list_head *list;
...@@ -1185,7 +1185,7 @@ int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line) ...@@ -1185,7 +1185,7 @@ int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line)
return 0; return 0;
} }
static int __init add_acpi_hid_device(u8 *hid, u8 *uid, u16 *devid, static int __init add_acpi_hid_device(u8 *hid, u8 *uid, u32 *devid,
bool cmd_line) bool cmd_line)
{ {
struct acpihid_map_entry *entry; struct acpihid_map_entry *entry;
...@@ -1264,7 +1264,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1264,7 +1264,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
{ {
u8 *p = (u8 *)h; u8 *p = (u8 *)h;
u8 *end = p, flags = 0; u8 *end = p, flags = 0;
u16 devid = 0, devid_start = 0, devid_to = 0; u16 devid = 0, devid_start = 0, devid_to = 0, seg_id;
u32 dev_i, ext_flags = 0; u32 dev_i, ext_flags = 0;
bool alias = false; bool alias = false;
struct ivhd_entry *e; struct ivhd_entry *e;
...@@ -1300,6 +1300,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1300,6 +1300,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
while (p < end) { while (p < end) {
e = (struct ivhd_entry *)p; e = (struct ivhd_entry *)p;
seg_id = pci_seg->id;
switch (e->type) { switch (e->type) {
case IVHD_DEV_ALL: case IVHD_DEV_ALL:
...@@ -1310,9 +1312,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1310,9 +1312,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
case IVHD_DEV_SELECT: case IVHD_DEV_SELECT:
DUMP_printk(" DEV_SELECT\t\t\t devid: %02x:%02x.%x " DUMP_printk(" DEV_SELECT\t\t\t devid: %04x:%02x:%02x.%x "
"flags: %02x\n", "flags: %02x\n",
PCI_BUS_NUM(e->devid), seg_id, PCI_BUS_NUM(e->devid),
PCI_SLOT(e->devid), PCI_SLOT(e->devid),
PCI_FUNC(e->devid), PCI_FUNC(e->devid),
e->flags); e->flags);
...@@ -1323,8 +1325,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1323,8 +1325,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
case IVHD_DEV_SELECT_RANGE_START: case IVHD_DEV_SELECT_RANGE_START:
DUMP_printk(" DEV_SELECT_RANGE_START\t " DUMP_printk(" DEV_SELECT_RANGE_START\t "
"devid: %02x:%02x.%x flags: %02x\n", "devid: %04x:%02x:%02x.%x flags: %02x\n",
PCI_BUS_NUM(e->devid), seg_id, PCI_BUS_NUM(e->devid),
PCI_SLOT(e->devid), PCI_SLOT(e->devid),
PCI_FUNC(e->devid), PCI_FUNC(e->devid),
e->flags); e->flags);
...@@ -1336,9 +1338,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1336,9 +1338,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
case IVHD_DEV_ALIAS: case IVHD_DEV_ALIAS:
DUMP_printk(" DEV_ALIAS\t\t\t devid: %02x:%02x.%x " DUMP_printk(" DEV_ALIAS\t\t\t devid: %04x:%02x:%02x.%x "
"flags: %02x devid_to: %02x:%02x.%x\n", "flags: %02x devid_to: %02x:%02x.%x\n",
PCI_BUS_NUM(e->devid), seg_id, PCI_BUS_NUM(e->devid),
PCI_SLOT(e->devid), PCI_SLOT(e->devid),
PCI_FUNC(e->devid), PCI_FUNC(e->devid),
e->flags, e->flags,
...@@ -1355,13 +1357,13 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1355,13 +1357,13 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
case IVHD_DEV_ALIAS_RANGE: case IVHD_DEV_ALIAS_RANGE:
DUMP_printk(" DEV_ALIAS_RANGE\t\t " DUMP_printk(" DEV_ALIAS_RANGE\t\t "
"devid: %02x:%02x.%x flags: %02x " "devid: %04x:%02x:%02x.%x flags: %02x "
"devid_to: %02x:%02x.%x\n", "devid_to: %04x:%02x:%02x.%x\n",
PCI_BUS_NUM(e->devid), seg_id, PCI_BUS_NUM(e->devid),
PCI_SLOT(e->devid), PCI_SLOT(e->devid),
PCI_FUNC(e->devid), PCI_FUNC(e->devid),
e->flags, e->flags,
PCI_BUS_NUM(e->ext >> 8), seg_id, PCI_BUS_NUM(e->ext >> 8),
PCI_SLOT(e->ext >> 8), PCI_SLOT(e->ext >> 8),
PCI_FUNC(e->ext >> 8)); PCI_FUNC(e->ext >> 8));
...@@ -1373,9 +1375,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1373,9 +1375,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
case IVHD_DEV_EXT_SELECT: case IVHD_DEV_EXT_SELECT:
DUMP_printk(" DEV_EXT_SELECT\t\t devid: %02x:%02x.%x " DUMP_printk(" DEV_EXT_SELECT\t\t devid: %04x:%02x:%02x.%x "
"flags: %02x ext: %08x\n", "flags: %02x ext: %08x\n",
PCI_BUS_NUM(e->devid), seg_id, PCI_BUS_NUM(e->devid),
PCI_SLOT(e->devid), PCI_SLOT(e->devid),
PCI_FUNC(e->devid), PCI_FUNC(e->devid),
e->flags, e->ext); e->flags, e->ext);
...@@ -1387,8 +1389,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1387,8 +1389,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
case IVHD_DEV_EXT_SELECT_RANGE: case IVHD_DEV_EXT_SELECT_RANGE:
DUMP_printk(" DEV_EXT_SELECT_RANGE\t devid: " DUMP_printk(" DEV_EXT_SELECT_RANGE\t devid: "
"%02x:%02x.%x flags: %02x ext: %08x\n", "%04x:%02x:%02x.%x flags: %02x ext: %08x\n",
PCI_BUS_NUM(e->devid), seg_id, PCI_BUS_NUM(e->devid),
PCI_SLOT(e->devid), PCI_SLOT(e->devid),
PCI_FUNC(e->devid), PCI_FUNC(e->devid),
e->flags, e->ext); e->flags, e->ext);
...@@ -1400,8 +1402,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1400,8 +1402,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
case IVHD_DEV_RANGE_END: case IVHD_DEV_RANGE_END:
DUMP_printk(" DEV_RANGE_END\t\t devid: %02x:%02x.%x\n", DUMP_printk(" DEV_RANGE_END\t\t devid: %04x:%02x:%02x.%x\n",
PCI_BUS_NUM(e->devid), seg_id, PCI_BUS_NUM(e->devid),
PCI_SLOT(e->devid), PCI_SLOT(e->devid),
PCI_FUNC(e->devid)); PCI_FUNC(e->devid));
...@@ -1419,11 +1421,11 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1419,11 +1421,11 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
case IVHD_DEV_SPECIAL: { case IVHD_DEV_SPECIAL: {
u8 handle, type; u8 handle, type;
const char *var; const char *var;
u16 devid; u32 devid;
int ret; int ret;
handle = e->ext & 0xff; handle = e->ext & 0xff;
devid = (e->ext >> 8) & 0xffff; devid = PCI_SEG_DEVID_TO_SBDF(seg_id, (e->ext >> 8));
type = (e->ext >> 24) & 0xff; type = (e->ext >> 24) & 0xff;
if (type == IVHD_SPECIAL_IOAPIC) if (type == IVHD_SPECIAL_IOAPIC)
...@@ -1433,9 +1435,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1433,9 +1435,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
else else
var = "UNKNOWN"; var = "UNKNOWN";
DUMP_printk(" DEV_SPECIAL(%s[%d])\t\tdevid: %02x:%02x.%x\n", DUMP_printk(" DEV_SPECIAL(%s[%d])\t\tdevid: %04x:%02x:%02x.%x\n",
var, (int)handle, var, (int)handle,
PCI_BUS_NUM(devid), seg_id, PCI_BUS_NUM(devid),
PCI_SLOT(devid), PCI_SLOT(devid),
PCI_FUNC(devid)); PCI_FUNC(devid));
...@@ -1453,7 +1455,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1453,7 +1455,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
} }
case IVHD_DEV_ACPI_HID: { case IVHD_DEV_ACPI_HID: {
u16 devid; u32 devid;
u8 hid[ACPIHID_HID_LEN]; u8 hid[ACPIHID_HID_LEN];
u8 uid[ACPIHID_UID_LEN]; u8 uid[ACPIHID_UID_LEN];
int ret; int ret;
...@@ -1496,9 +1498,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, ...@@ -1496,9 +1498,9 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
break; break;
} }
devid = e->devid; devid = PCI_SEG_DEVID_TO_SBDF(seg_id, e->devid);
DUMP_printk(" DEV_ACPI_HID(%s[%s])\t\tdevid: %02x:%02x.%x\n", DUMP_printk(" DEV_ACPI_HID(%s[%s])\t\tdevid: %04x:%02x:%02x.%x\n",
hid, uid, hid, uid, seg_id,
PCI_BUS_NUM(devid), PCI_BUS_NUM(devid),
PCI_SLOT(devid), PCI_SLOT(devid),
PCI_FUNC(devid)); PCI_FUNC(devid));
......
drivers/iommu/amd/quirks.c
View file @ a45627ba
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
struct ivrs_quirk_entry { struct ivrs_quirk_entry {
u8 id; u8 id;
u16 devid; u32 devid;
}; };
enum { enum {
...@@ -49,7 +49,7 @@ static int __init ivrs_ioapic_quirk_cb(const struct dmi_system_id *d) ...@@ -49,7 +49,7 @@ static int __init ivrs_ioapic_quirk_cb(const struct dmi_system_id *d)
const struct ivrs_quirk_entry *i; const struct ivrs_quirk_entry *i;
for (i = d->driver_data; i->id != 0 && i->devid != 0; i++) for (i = d->driver_data; i->id != 0 && i->devid != 0; i++)
add_special_device(IVHD_SPECIAL_IOAPIC, i->id, (u16 *)&i->devid, 0); add_special_device(IVHD_SPECIAL_IOAPIC, i->id, (u32 *)&i->devid, 0);
return 0; return 0;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7