iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'acpi-tools', 'acpi-docs' and 'pnp'

Browse Source 
Merge an ACPI pfrut utility update, an ACPI documentation update and a
PNP update for 6.10:

 - Fix a typo in the ACPI documentation regarding the layout of sysfs
   subdirectory representing the ACPI namespace (John Watts).

 - Make the ACPI pfrut utility print the update_cap field during
   capability query (Chen Yu).

 - Add HAS_IOPORT dependencies to PNP (Niklas Schnelle).

* acpi-tools:
  ACPI: tools: pfrut: Print the update_cap field during capability query

* acpi-docs:
  Documentation: firmware-guide: ACPI: Fix namespace typo

* pnp:
  PNP: add HAS_IOPORT dependencies
This commit is contained in:
Rafael J. Wysocki 2024-05-13 21:03:24 +02:00
commit e573d27e18
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/firmware-guide/acpi/namespace.rst
View File

@ -15,7 +15,7 @@ ACPI Device Tree - Representation of ACPI Namespace
Abstract
========
The Linux ACPI subsystem converts ACPI namespace objects into a Linux
device tree under the /sys/devices/LNXSYSTEM:00 and updates it upon
device tree under the /sys/devices/LNXSYSTM:00 and updates it upon
receiving ACPI hotplug notification events. For each device object
in this hierarchy there is a corresponding symbolic link in the
/sys/bus/acpi/devices.
@ -326,7 +326,7 @@ example ACPI namespace illustrated in Figure 2 with the addition of
fixed PWR_BUTTON/SLP_BUTTON devices is shown below::
+--------------+---+-----------------+
| LNXSYSTEM:00 | \ | acpi:LNXSYSTEM: |
| LNXSYSTM:00 | \ | acpi:LNXSYSTM: |
+--------------+---+-----------------+
|
| +-------------+-----+----------------+

2
drivers/pnp/isapnp/Kconfig
View File

@ -4,7 +4,7 @@
#
config ISAPNP
bool "ISA Plug and Play support"
depends on ISA || COMPILE_TEST
depends on ISA || (HAS_IOPORT && COMPILE_TEST)
help
Say Y here if you would like support for ISA Plug and Play devices.
Some information is in <file:Documentation/userspace-api/isapnp.rst>.

2
tools/power/acpi/tools/pfrut/pfrut.c
View File

@ -174,6 +174,8 @@ void print_cap(struct pfru_update_cap_info *cap)
exit(1);
}
printf("update capability:%d\n", cap->update_cap);
uuid_unparse(cap->code_type, uuid);
printf("code injection image type:%s\n", uuid);
printf("fw_version:%d\n", cap->fw_version);