iommu/amd: Allow matching ACPI HID devices without matching UIDs
Subsystems (2)
PATCH v3 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. In this case there is only one ACPI device on the system with that _HID but the _UID mismatch.
IVRS:
```
Subtable Type : F0 [Device Entry: ACPI HID Named Device]
Device ID : 0060
Data Setting (decoded below) : 40
INITPass : 0
EIntPass : 0
NMIPass : 0
Reserved : 0
System MGMT : 0
LINT0 Pass : 1
LINT1 Pass : 0
ACPI HID : "MSFT0201"
ACPI CID : 0000000000000000
UID Format : 02
UID Length : 09
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. Other operating systems allow this, but the current IVRS spec leaves some ambiguity whether to allow or disallow it. This should be clarified in future revisions of the spec. Output 'Firmware Bug' for this case to encourage it to be solved in the BIOS.
---
v3:
* Count HID matches as well (cover # HID w/o UID > 2)
* Drop level of indentation with early bail on error
* Show number of matches in error message
* Adjust commit message
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Vasant Hegde <[email protected]>
Cc: Paul Blinzer <[email protected]>
--- drivers/iommu/amd/iommu.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)
drivers/iommu/amd/iommu.c +28 -5
@@ -109,7 +109,9 @@ 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 =NULL ; +int hid_count =0 ; +bool fw_bug;if (!adev)return -ENODEV ;
@@ -117,12 +119,33 @@ 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; + fw_bug = false; + hid_count =1 ; +break ; + } + +/* +* Count HID matches w/o UID, raise FW_BUG but allow exactly one match +*/ +if (acpi_dev_hid_match (adev, p->hid)) { + p1 = p; + hid_count++; + fw_bug = true; } } -return -EINVAL ; + +if (!p1) +return -EINVAL ; +if (fw_bug) +dev_err_once (dev,FW_BUG "No ACPI device matched UID, but %d device%s matched HID.\n" , + hid_count, hid_count >1 ?"s" :"" ); +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
Quoted 43 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. In this case there is only one ACPI device on the system with that
_HIDbut the_UIDmismatch.IVRS:
``` Subtable Type : F0 [Device Entry: ACPI HID Named Device] Device ID : 0060 Data Setting (decoded below) : 40 INITPass : 0 EIntPass : 0 NMIPass : 0 Reserved : 0 System MGMT : 0 LINT0 Pass : 1 LINT1 Pass : 0 ACPI HID : "MSFT0201" ACPI CID : 0000000000000000 UID Format : 02 UID Length : 09 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. Other operating systems allow this, but the current IVRS spec leaves some ambiguity whether to allow or disallow it. This should be clarified in future revisions of the spec. Output 'Firmware Bug' for this case to encourage it to be solved in the BIOS.Signed-off-by Mario Limonciello <[email protected]>
Quoted 9 lines
---
v3:
* Count HID matches as well (cover # HID w/o UID > 2)
* Drop level of indentation with early bail on error
* Show number of matches in error message
* Adjust commit message
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Vasant Hegde <[email protected]>
Cc: Paul Blinzer <[email protected]>
-Vasant
Quoted 2 lines · Mario Limonciello
drivers/iommu/amd/iommu.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)
Applied, thanks.