Skip to contentSkip to conversation

i386:acpi: Remove _HID from the SMBus ACPI entry

PATCH In review [email protected] 4 participants 7 messages Jan 6, 2020 – Jan 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386:acpi: Remove _HID from the SMBus ACPI entry

From: Corey Minyard <[email protected]>

Per the ACPI spec (version 6.1, section 6.1.5 _HID) it is not required on enumerated buses (like PCI in this case), _ADR is required (and is already there). And the _HID value is wrong. Linux appears to ignore the _HID entry, but it confuses Windows.

Cc Michael S. Tsirkin <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 hw/i386/acpi-build.c | 1 -
 1 file changed, 1 deletion(-)
hw/i386/acpi-build.c +0 -1
index 7b8da62d41..ab73a8f4c8 100644
@@ -1815,7 +1815,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
     Aml *scope = aml_scope("_SB.PCI0");
     Aml *dev = aml_device("SMB0");
 
-    aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005")));
     aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
     build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0");
     aml_append(scope, dev);
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · On Mon, 6 Jan 2020 09:27:05 -0600 [email protected] wrote:

From: Corey Minyard <[email protected]>

Per the ACPI spec (version 6.1, section 6.1.5 _HID) it is not required on enumerated buses (like PCI in this case), _ADR is required (and is already there). And the _HID value is wrong. Linux appears to ignore the _HID entry, but it confuses Windows.

Cc Michael S. Tsirkin <[email protected]>
Cc Igor Mammedov <[email protected]>
Quoted 16 lines
---
 hw/i386/acpi-build.c | 1 -
 1 file changed, 1 deletion(-)
hw/i386/acpi-build.c +0 -1
index 7b8da62d41..ab73a8f4c8 100644
@@ -1815,7 +1815,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
     Aml *scope = aml_scope("_SB.PCI0");
     Aml *dev = aml_device("SMB0");
 
-    aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005")));
     aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
     build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0");
     aml_append(scope, dev);
#2 lore raw
In reply to [email protected]
Quoted 6 lines · On Mon, 6 Jan 2020 09:27:05 -0600 [email protected] wrote:

From: Corey Minyard <[email protected]>

Per the ACPI spec (version 6.1, section 6.1.5 _HID) it is not required on enumerated buses (like PCI in this case), _ADR is required (and is already there). And the _HID value is wrong. Linux appears to ignore the _HID entry, but it confuses Windows.

Corey,

Could you clarify as what "confuses Windows" means?
s/confuses Windows/description of the observed problem and on what windows version/

Quoted 20 lines
Cc Michael S. Tsirkin <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 hw/i386/acpi-build.c | 1 -
 1 file changed, 1 deletion(-)
hw/i386/acpi-build.c +0 -1
index 7b8da62d41..ab73a8f4c8 100644
@@ -1815,7 +1815,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
     Aml *scope = aml_scope("_SB.PCI0");
     Aml *dev = aml_device("SMB0");
 
-    aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005")));
     aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
     build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0");
     aml_append(scope, dev);
#3 lore raw
Quoted 10 lines · Igor Mammedov
Quoted 6 lines · On Mon, 6 Jan 2020 09:27:05 -0600 [email protected] wrote:

From: Corey Minyard <[email protected]>

Per the ACPI spec (version 6.1, section 6.1.5 _HID) it is not required on enumerated buses (like PCI in this case), _ADR is required (and is already there). And the _HID value is wrong. Linux appears to ignore the _HID entry, but it confuses Windows.

Quoted 4 lines

Corey,

Could you clarify as what "confuses Windows" means?
s/confuses Windows/description of the observed problem and on what windows version/

Yeah, I should have done that. The error is not given, but the report says" "It is detected by Windows 10 as 'Unknown Device' and there is no driver available." Link is https://bugs.launchpad.net/qemu/+bug/1856724

I'll add that to the text, along with the link.

-corey

Quoted 22 lines
Quoted 21 lines
Cc Michael S. Tsirkin <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 hw/i386/acpi-build.c | 1 -
 1 file changed, 1 deletion(-)
hw/i386/acpi-build.c +0 -1
index 7b8da62d41..ab73a8f4c8 100644
@@ -1815,7 +1815,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
     Aml *scope = aml_scope("_SB.PCI0");
     Aml *dev = aml_device("SMB0");
 
-    aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005")));
     aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
     build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0");
     aml_append(scope, dev);
#4 lore raw
Quoted 16 lines · Corey Minyard
Quoted 10 lines · Igor Mammedov
Quoted 6 lines · On Mon, 6 Jan 2020 09:27:05 -0600 [email protected] wrote:

From: Corey Minyard <[email protected]>

Per the ACPI spec (version 6.1, section 6.1.5 _HID) it is not required on enumerated buses (like PCI in this case), _ADR is required (and is already there). And the _HID value is wrong. Linux appears to ignore the _HID entry, but it confuses Windows.

Quoted 4 lines

Corey,

Could you clarify as what "confuses Windows" means?
s/confuses Windows/description of the observed problem and on what windows version/

Quoted 7 lines

Yeah, I should have done that. The error is not given, but the report says" "It is detected by Windows 10 as 'Unknown Device' and there is no driver available." Link is https://bugs.launchpad.net/qemu/+bug/1856724

I'll add that to the text, along with the link.

-corey

ok so you will repost with igor's ack and tweaked commit log?

Quoted 22 lines
Quoted 22 lines
Quoted 21 lines
Cc Michael S. Tsirkin <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 hw/i386/acpi-build.c | 1 -
 1 file changed, 1 deletion(-)
hw/i386/acpi-build.c +0 -1
index 7b8da62d41..ab73a8f4c8 100644
@@ -1815,7 +1815,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
     Aml *scope = aml_scope("_SB.PCI0");
     Aml *dev = aml_device("SMB0");
 
-    aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005")));
     aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
     build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0");
     aml_append(scope, dev);
#5 lore raw

PATCH 1/1 i386:acpi: Remove _HID from the SMBus ACPI entry

From: Corey Minyard <[email protected]>

Per the ACPI spec (version 6.1, section 6.1.5 _HID) it is not required on enumerated buses (like PCI in this case), _ADR is required (and is already there). And the _HID value is wrong. Linux appears to ignore the _HID entry, but Windows 10 detects it as 'Unknown Device' and there is no driver available. See https://bugs.launchpad.net/qemu/+bug/1856724

---
 hw/i386/acpi-build.c             |   1 -
 tests/data/acpi/q35/DSDT         | Bin 7879 -> 7869 bytes
 tests/data/acpi/q35/DSDT.bridge  | Bin 7896 -> 7886 bytes
 tests/data/acpi/q35/DSDT.cphp    | Bin 8342 -> 8332 bytes
 tests/data/acpi/q35/DSDT.dimmpxm | Bin 9532 -> 9522 bytes
 tests/data/acpi/q35/DSDT.ipmibt  | Bin 7954 -> 7944 bytes
 tests/data/acpi/q35/DSDT.memhp   | Bin 9238 -> 9228 bytes
 tests/data/acpi/q35/DSDT.mmio64  | Bin 9009 -> 8999 bytes
 tests/data/acpi/q35/DSDT.numamem | Bin 7885 -> 7875 bytes
 9 files changed, 1 deletion(-)
hw/i386/acpi-build.c +0 -1
index 7b8da62d41..ab73a8f4c8 100644
@@ -1815,7 +1815,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
     Aml *scope = aml_scope("_SB.PCI0");
     Aml *dev = aml_device("SMB0");
 
-    aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005")));
     aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func)));
     build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0");
     aml_append(scope, dev);
tests/data/acpi/q35/DSDT binary +0 -0
index 77ea60ffed421c566138fe6341421f579129a582..1f91888d7a485850cf27f152e247a90b208003dc 100644
GIT binary patch
tests/data/acpi/q35/DSDT.bridge binary +0 -0
index fbc2d40000428b402586ea9302b5ccf36ef8de1e..eae3a2a8657e9986d8ac592958503c0b516faaef 100644
GIT binary patch
tests/data/acpi/q35/DSDT.cphp binary +0 -0
index 6a896cb2142feadbcabc6276b59c138a7e93f540..53d735a4de25c4d8e23eed102fcd01376168c5b3 100644
GIT binary patch
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
index 23fdf5e60a5069f60d6c680ac9c68c4a8a81318e..02ccdd5f38d5b2356dcca89398c41dcf2595dfff 100644
GIT binary patch
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
index c3fca0a71efa7b55c958a49f305389426fbe7922..9e2d4f785c54629d233924a503cfe81199e22aa0 100644
GIT binary patch
tests/data/acpi/q35/DSDT.memhp binary +0 -0
index 2abd0e36cd1344cbca3fa4ab59c5db2ea326d125..baefa611acadce4c6da5babdaafad533d19358e6 100644
GIT binary patch
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
index b32034a11c1f8a0a156df3765df44b14a88dbb4d..aae0ea2110a54b02f772d99e66df0730d74b43d9 100644
GIT binary patch
tests/data/acpi/q35/DSDT.numamem binary +0 -0
index d8b2b47f8b47067d375021a30086ca97d8aca43f..859a2e08710ba37f56c9c32b0235ff90cedb1905 100644
GIT binary patch
Signature · 1 line
2.17.1
#6 lore raw
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===

Using expected file 'tests/data/acpi/q35/DSDT.acpihmat'
acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-PJHGE0], Expected [aml:tests/data/acpi/q35/DSDT.acpihmat].
to see ASL diff between mismatched files install IASL, rebuild QEMU from scratch and re-run tests with V=1 environment variable set**
ERROR:/tmp/qemu-test/src/tests/qtest/bios-tables-test.c:477:test_acpi_asl: assertion failed: (all_tables_match)
ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/bios-tables-test.c:477:test_acpi_asl: assertion failed: (all_tables_match)
TEST iotest-qcow2: 037
make: *** [check-qtest-x86_64] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 038
qemu-system-aarch64: -accel kvm: invalid accelerator kvm
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=3c84ff1231e546e3bf21da6674ef6224', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-11hj6_il/src/docker-src.2020-01-13-10.58.46.23497:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=3c84ff1231e546e3bf21da6674ef6224
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-11hj6_il/src'
make: *** [docker-run-test-quick@centos7] Error 2

real 9m20.765s
user 0m8.987s

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]