iommu/amd: Allow matching ACPI HID devices without matching UIDs
Subsystems (2)
PATCH 1/1 iommu/amd: Allow matching ACPI HID devices without matching UIDs
From: Mario Limonciello <[email protected]>
A BIOS upgrade has changed the IVRS DTE UID for a device that no longer matches the UID in the SSDT. Checking with BIOS team, this is intended behavior, however it breaks the existing logic check in get_acpihid_device_id().
In this case there is only one ACPI device on the system with that _HID but the _UID mismatch.
IVRS:
```
[1E4h 0484 001h] Subtable Type : F0 [Device Entry: ACPI HID Named Device]
[1E5h 0485 002h] Device ID : 0060
[1E7h 0487 001h] Data Setting (decoded below) : 40
INITPass : 0
EIntPass : 0
NMIPass : 0
Reserved : 0
System MGMT : 0
LINT0 Pass : 1
LINT1 Pass : 0
[1E8h 0488 008h] ACPI HID : "MSFT0201"
[1F0h 0496 008h] ACPI CID : 0000000000000000
[1F8h 0504 001h] UID Format : 02
[1F9h 0505 001h] UID Length : 09
[1FAh 0506 009h] UID : "\_SB.MHSP"
```SSDT:
```
Device (MHSP)
{
Name (_ADR, Zero) // _ADR: Address
Name (_HID, "MSFT0201") // _HID: Hardware ID
Name (_UID, One) // _UID: Unique ID
```To handle this case; while enumerating ACPI devices in get_acpihid_device_id() count the number of matching ACPI devices with a matching _HID. If there is exactly one _HID match then accept it even if the UID doesn't match.
--- drivers/iommu/amd/iommu.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/iommu/amd/iommu.c +19 -5
@@ -109,7 +109,8 @@ static inline int get_acpihid_device_id(struct device *dev, struct acpihid_map_entry **entry) {struct acpi_device *adev =ACPI_COMPANION (dev); -struct acpihid_map_entry *p; +struct acpihid_map_entry *p, *p1; +int hid_count =0 ;if (!adev)return -ENODEV ;
@@ -117,12 +118,25 @@ static inline int get_acpihid_device_id(struct device *dev,list_for_each_entry (p, &acpihid_map, list) {if (acpi_dev_hid_uid_match (adev, p->hid, p->uid[0 ] ? p->uid :NULL )) { -if (entry) - *entry = p; -return p->devid; + p1 = p; + hid_count =1 ; +break ; + } + +/* If there is no UID match, but exactly one HID match, return that match */ +if (acpi_dev_hid_match (adev, p->hid)) { + p1 = p; + hid_count++; } } -return -EINVAL ; + +if (hid_count !=1 ) +return -EINVAL ; + +if (entry) + *entry = p1; + +return p1->devid; }static inline int get_device_sbdf_id (struct device *dev)
Signature · 1 line
2.43.0
Suthikulpanit, Suravee
reviewerMario,
This is actually a bug in the BIOS, and should be fixed in by the BIOS. I would prefer FW BUG in the dmesg to report the issue.
As a workarond, Linux can override this using the command line option.
Suravee
Quoted 91 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
A BIOS upgrade has changed the IVRS DTE UID for a device that no longer matches the UID in the SSDT. Checking with BIOS team, this is intended behavior, however it breaks the existing logic check in
get_acpihid_device_id().In this case there is only one ACPI device on the system with that
_HIDbut the_UIDmismatch.IVRS:
``` [1E4h 0484 001h] Subtable Type : F0 [Device Entry: ACPI HID Named Device] [1E5h 0485 002h] Device ID : 0060 [1E7h 0487 001h] Data Setting (decoded below) : 40 INITPass : 0 EIntPass : 0 NMIPass : 0 Reserved : 0 System MGMT : 0 LINT0 Pass : 1 LINT1 Pass : 0 [1E8h 0488 008h] ACPI HID : "MSFT0201" [1F0h 0496 008h] ACPI CID : 0000000000000000 [1F8h 0504 001h] UID Format : 02 [1F9h 0505 001h] UID Length : 09 [1FAh 0506 009h] UID : "\_SB.MHSP" ```SSDT:
``` Device (MHSP) { Name (_ADR, Zero) // _ADR: Address Name (_HID, "MSFT0201") // _HID: Hardware ID Name (_UID, One) // _UID: Unique ID ```To handle this case; while enumerating ACPI devices in
get_acpihid_device_id()count the number of matching ACPI devices with a matching_HID. If there is exactly one_HIDmatch then accept it even if the UID doesn't match.Signed-off-by Mario Limonciello <[email protected]>--- drivers/iommu/amd/iommu.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)drivers/iommu/amd/iommu.c +19
-5@@ -109,7 +109,8 @@ static inline int get_acpihid_device_id(struct device *dev, struct acpihid_map_entry **entry) {struct acpi_device *adev =ACPI_COMPANION (dev); -struct acpihid_map_entry *p; +struct acpihid_map_entry *p, *p1; +int hid_count =0 ;if (!adev)return -ENODEV ;@@ -117,12 +118,25 @@ static inline int get_acpihid_device_id(struct device *dev,list_for_each_entry (p, &acpihid_map, list) {if (acpi_dev_hid_uid_match (adev, p->hid, p->uid[0 ] ? p->uid :NULL )) { -if (entry) - *entry = p; -return p->devid; + p1 = p; + hid_count =1 ; +break ; + } + +/* If there is no UID match, but exactly one HID match, return that match */ +if (acpi_dev_hid_match (adev, p->hid)) { + p1 = p; + hid_count++; } } -return -EINVAL ; + +if (hid_count !=1 ) +return -EINVAL ; + +if (entry) + *entry = p1; + +return p1->devid; }static inline int get_device_sbdf_id (struct device *dev)
Quoted 7 lines · Suravee
Mario,
This is actually a bug in the BIOS, and should be fixed in by the BIOS. I would prefer FW BUG in the dmesg to report the issue.
As a workarond, Linux can override this using the command line option.
Suravee
+Paul
Suravee,
This was my initial inclination as well. We actually had a test BIOS that lines up the SSDT and IVRS which fixes Linux but it causes problems outside of Linux.
Paul clarified that UID matching should be considered "optional" and just be used as more weight for an identifier which is how we got to this patch.
Thanks,
Quoted 95 lines · Mario Limonciello
Quoted 92 lines
From: Mario Limonciello <[email protected]>
A BIOS upgrade has changed the IVRS DTE UID for a device that no longer matches the UID in the SSDT. Checking with BIOS team, this is intended behavior, however it breaks the existing logic check in
get_acpihid_device_id().In this case there is only one ACPI device on the system with that
_HIDbut the_UIDmismatch.IVRS:
``` [1E4h 0484 001h] Subtable Type : F0 [Device Entry: ACPI HID Named Device] [1E5h 0485 002h] Device ID : 0060 [1E7h 0487 001h] Data Setting (decoded below) : 40 INITPass : 0 EIntPass : 0 NMIPass : 0 Reserved : 0 System MGMT : 0 LINT0 Pass : 1 LINT1 Pass : 0 [1E8h 0488 008h] ACPI HID : "MSFT0201" [1F0h 0496 008h] ACPI CID : 0000000000000000 [1F8h 0504 001h] UID Format : 02 [1F9h 0505 001h] UID Length : 09 [1FAh 0506 009h] UID : "\_SB.MHSP" ```SSDT:
``` Device (MHSP) { Name (_ADR, Zero) // _ADR: Address Name (_HID, "MSFT0201") // _HID: Hardware ID Name (_UID, One) // _UID: Unique ID ```To handle this case; while enumerating ACPI devices in
get_acpihid_device_id()count the number of matching ACPI devices with a matching_HID. If there is exactly one_HIDmatch then accept it even if the UID doesn't match.Signed-off-by Mario Limonciello <[email protected]>---
drivers/iommu/amd/iommu.c| 24 +++++++++++++++++++-----1 file changed, 19 insertions(+), 5 deletions(-)drivers/iommu/amd/iommu.c +8
-4@@ -109,7 +109,8 @@ static inline int get_acpihid_device_id(struct device *dev, struct acpihid_map_entry **entry) { struct acpi_device *adev = ACPI_COMPANION(dev); - struct acpihid_map_entry *p; + struct acpihid_map_entry *p, *p1; + int hid_count = 0; if (!adev) return -ENODEV;@@ -117,12 +118,25 @@ static inline int get_acpihid_device_id(structdevice *dev, list_for_each_entry(p, &acpihid_map, list) { if (acpi_dev_hid_uid_match(adev, p->hid, p->uid[0] ? p->uid : NULL)) { - if (entry) - *entry = p; - return p->devid; + p1 = p; + hid_count = 1; + break; + } + + /* If there is no UID match, but exactly one HID match,return that match */
+ if (acpi_dev_hid_match(adev, p->hid)) {
+ p1 = p;
+ hid_count++;
}
}
- return-EINVAL;drivers/iommu/amd/iommu.c +8
-0+ + if (hid_count != 1) + return -EINVAL; + + if (entry) + *entry = p1; + + return p1->devid;}
static inline intget_device_sbdf_id(struct device *dev)