Commit d8f9176b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI updates from Rafael Wysocki:
 "These update the ACPICA code in the kernel to the most recent upstream
  revision including (but not limited to) new material introduced in the
  6.4 version of the spec, update message printing in the ACPI-related
  code, address a few issues and clean up code in a number of places.

  Specifics:

   - Update ACPICA code in the kernel to upstream revision 20210331
     including the following changes:

      * Add parsing for IVRS IVHD 40h and device entry F0h (Alexander
        Monakov).

      * Add new CEDT table for CXL 2.0 and iASL support for it (Ben
        Widawsky, Bob Moore).

      * NFIT: add Location Cookie field (Bob Moore).

      * HMAT: add new fields/flags (Bob Moore).

      * Add new flags in SRAT (Bob Moore).

      * PMTT: add new fields/structures (Bob Moore).

      * Add CSI2Bus resource template (Bob Moore).

      * iASL: Decode subtable type field for VIOT (Bob Moore).

      * Fix various typos and spelling mistakes (Colin Ian King).

      * Add new predefined objects _BPC, _BPS, and _BPT (Erik Kaneda).

      * Add USB4 capabilities UUID (Erik Kaneda).

      * Add CXL ACPI device ID and _CBR object (Erik Kaneda).

      * MADT: add Multiprocessor Wakeup Structure (Erik Kaneda).

      * PCCT: add support for subtable type 5 (Erik Kaneda).

      * PPTT: add new version of subtable type 1 (Erik Kaneda).

      * Add SDEV secure access components (Erik Kaneda).

      * Add support for PHAT table (Erik Kaneda).

      * iASL: Add definitions for the VIOT table (Jean-Philippe
        Brucker).

      * acpisrc: Add missing conversion for VIOT support (Jean-Philippe
        Brucker).

      * IORT: Updates for revision E.b (Shameer Kolothum).

   - Rearrange message printing in ACPI-related code to avoid using the
     ACPICA's internal message printing macros outside ACPICA and do
     some related code cleanups (Rafael Wysocki).

   - Modify the device enumeration code to turn off all of the unused
     ACPI power resources at the end (Rafael Wysocki).

   - Change the ACPI power resources handling code to turn off unused
     ACPI power resources without checking their status which should not
     be necessary by the spec (Rafael Wysocki).

   - Add empty stubs for CPPC-related functions to be used when
     CONFIG_ACPI_CPPC_LIB is not set (Rafael Wysocki).

   - Simplify device enumeration code (Rafael Wysocki).

   - Change device enumeration code to use match_string() for string
     matching (Andy Shevchenko).

   - Modify irqresource_disabled() to retain the resouce flags that have
     been set already (Angela Czubak).

   - Add native backlight whitelist entry for GA401/GA502/GA503 (Luke
     Jones).

   - Modify the ACPI backlight driver to let the native backlight
     handling take over on hardware-reduced systems (Hans de Goede).

   - Introduce acpi_dev_get() and switch over the ACPI core code to
     using it (Andy Shevchenko).

   - Use kobj_attribute as callback argument instead of a local struct
     type in the CPPC linrary code (Nathan Chancellor).

   - Drop unneeded initializatio of a static variable from the ACPI
     processor driver (Tian Tao).

   - Drop unnecessary local variable assignment from the ACPI APEI code
     (Colin Ian King).

   - Document for_each_acpi_dev_match() macro (Andy Shevchenko).

   - Address assorted coding style issues in multiple places (Xiaofei
     Tan).

   - Capitalize TLAs in a few comments (Andy Shevchenko).

   - Correct assorted typos in comments (Tom Saeger)"

* tag 'acpi-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (68 commits)
  ACPI: video: use native backlight for GA401/GA502/GA503
  ACPI: APEI: remove redundant assignment to variable rc
  ACPI: utils: Capitalize abbreviations in the comments
  ACPI: utils: Document for_each_acpi_dev_match() macro
  ACPI: bus: Introduce acpi_dev_get() and reuse it in ACPI code
  ACPI: scan: Utilize match_string() API
  resource: Prevent irqresource_disabled() from erasing flags
  ACPI: CPPC: Replace cppc_attr with kobj_attribute
  ACPI: scan: Call acpi_get_object_info() from acpi_set_pnp_ids()
  ACPI: scan: Drop sta argument from acpi_init_device_object()
  ACPI: scan: Drop sta argument from acpi_add_single_object()
  ACPI: scan: Rearrange checks in acpi_bus_check_add()
  ACPI: scan: Fold acpi_bus_type_and_status() into its caller
  ACPI: video: Check LCD flag on ACPI-reduced-hardware devices
  ACPI: utils: Add acpi_reduced_hardware() helper
  ACPI: dock: fix some coding style issues
  ACPI: sysfs: fix some coding style issues
  ACPI: PM: add a missed blank line after declarations
  ACPI: custom_method: fix a coding style issue
  ACPI: CPPC: fix some coding style issues
  ...
parents 47080f22 b6237f61

Documentation/admin-guide/kernel-parameters.txt

+1 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
			CONFIG_ACPI_DEBUG must be enabled to produce any ACPI

			debug output.  Bits in debug_layer correspond to a

			_COMPONENT in an ACPI source file, e.g.,

			    #define _COMPONENT ACPI_PCI_COMPONENT

			    #define _COMPONENT ACPI_EVENTS

			Bits in debug_level correspond to a level in

			ACPI_DEBUG_PRINT statements, e.g.,

			    ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...
@@ -60,8 +60,6 @@ 


			Enable processor driver info messages:

			    acpi.debug_layer=0x20000000

			Enable PCI/PCI interrupt routing info messages:

			    acpi.debug_layer=0x400000

			Enable AML "Debug" output, i.e., stores to the Debug

			object while interpreting AML:

			    acpi.debug_layer=0xffffffff acpi.debug_level=0x2

Documentation/firmware-guide/acpi/debug.rst

+12 −24
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



=================

ACPI Debug Output

=================

====================

ACPI CA Debug Output

====================



The ACPI CA, the Linux ACPI core, and some ACPI drivers can generate debug

output.  This document describes how to use this facility.

The ACPI CA can generate debug output.  This document describes how to use this

facility.



Compile-time configuration

==========================



ACPI debug output is globally enabled by CONFIG_ACPI_DEBUG.  If this config

option is turned off, the debug messages are not even built into the

kernel.

The ACPI CA debug output is globally enabled by CONFIG_ACPI_DEBUG.  If this

config option is not set, the debug messages are not even built into the kernel.



Boot- and run-time configuration

================================
@@ -27,16 +26,16 @@ debug_layer (component) 
=======================



The "debug_layer" is a mask that selects components of interest, e.g., a

specific driver or part of the ACPI interpreter.  To build the debug_layer

bitmask, look for the "#define _COMPONENT" in an ACPI source file.

specific part of the ACPI interpreter.  To build the debug_layer bitmask, look

for the "#define _COMPONENT" in an ACPI source file.



You can set the debug_layer mask at boot-time using the acpi.debug_layer

command line argument, and you can change it after boot by writing values

to /sys/module/acpi/parameters/debug_layer.



The possible components are defined in include/acpi/acoutput.h and

include/acpi/acpi_drivers.h.  Reading /sys/module/acpi/parameters/debug_layer

shows the supported mask values, currently these::

The possible components are defined in include/acpi/acoutput.h.



Reading /sys/module/acpi/parameters/debug_layer shows the supported mask values::



    ACPI_UTILITIES                  0x00000001

    ACPI_HARDWARE                   0x00000002
@@ -52,13 +51,6 @@ shows the supported mask values, currently these:: 
    ACPI_CA_DISASSEMBLER            0x00000800

    ACPI_COMPILER                   0x00001000

    ACPI_TOOLS                      0x00002000

    ACPI_SBS_COMPONENT              0x00100000

    ACPI_FAN_COMPONENT              0x00200000

    ACPI_PCI_COMPONENT              0x00400000

    ACPI_CONTAINER_COMPONENT        0x01000000

    ACPI_SYSTEM_COMPONENT           0x02000000

    ACPI_MEMORY_DEVICE_COMPONENT    0x08000000

    ACPI_PROCESSOR_COMPONENT        0x20000000



debug_level

===========
@@ -127,10 +119,6 @@ AML) during boot:: 


    acpi.debug_layer=0xffffffff acpi.debug_level=0x2



Enable PCI and PCI interrupt routing debug messages::



    acpi.debug_layer=0x400000 acpi.debug_level=0x4



Enable all ACPI hardware-related messages::



    acpi.debug_layer=0x2 acpi.debug_level=0xffffffff

drivers/acpi/ac.c

+9 −21
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 *  acpi_ac.c - ACPI AC Adapter Driver ($Revision: 27 $)

 *  acpi_ac.c - ACPI AC Adapter Driver (Revision: 27)

 *

 *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>

 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -85,10 +85,7 @@ struct acpi_ac { 


#define to_acpi_ac(x) power_supply_get_drvdata(x)



/* --------------------------------------------------------------------------

                               AC Adapter Management

   -------------------------------------------------------------------------- */



/* AC Adapter Management */

static int acpi_ac_get_state(struct acpi_ac *ac)

{

	acpi_status status = AE_OK;
@@ -109,9 +106,7 @@ static int acpi_ac_get_state(struct acpi_ac *ac) 
	return 0;

}



/* --------------------------------------------------------------------------

                            sysfs I/F

   -------------------------------------------------------------------------- */

/* sysfs I/F */

static int get_ac_property(struct power_supply *psy,

			   enum power_supply_property psp,

			   union power_supply_propval *val)
@@ -138,10 +133,7 @@ static enum power_supply_property ac_props[] = { 
	POWER_SUPPLY_PROP_ONLINE,

};



/* --------------------------------------------------------------------------

                                   Driver Model

   -------------------------------------------------------------------------- */



/* Driver Model */

static void acpi_ac_notify(struct acpi_device *device, u32 event)

{

	struct acpi_ac *ac = acpi_driver_data(device);
@@ -174,8 +166,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) 
		acpi_notifier_call_chain(device, event, (u32) ac->state);

		kobject_uevent(&ac->charger->dev.kobj, KOBJ_CHANGE);

	}



	return;

}



static int acpi_ac_battery_notify(struct notifier_block *nb,
@@ -187,7 +177,7 @@ static int acpi_ac_battery_notify(struct notifier_block *nb, 
	/*

	 * On HP Pavilion dv6-6179er AC status notifications aren't triggered

	 * when adapter is plugged/unplugged. However, battery status

	 * notifcations are triggered when battery starts charging or

	 * notifications are triggered when battery starts charging or

	 * discharging. Re-reading AC status triggers lost AC notifications,

	 * if AC status has changed.

	 */
@@ -282,9 +272,8 @@ static int acpi_ac_add(struct acpi_device *device) 
	ac->battery_nb.notifier_call = acpi_ac_battery_notify;

	register_acpi_notifier(&ac->battery_nb);

end:

	if (result) {

	if (result)

		kfree(ac);

	}



	return result;

}
@@ -293,7 +282,7 @@ static int acpi_ac_add(struct acpi_device *device) 
static int acpi_ac_resume(struct device *dev)

{

	struct acpi_ac *ac;

	unsigned old_state;

	unsigned int old_state;



	if (!dev)

		return -EINVAL;
@@ -352,9 +341,8 @@ static int __init acpi_ac_init(void) 
	}



	result = acpi_bus_register_driver(&acpi_ac_driver);

	if (result < 0) {

	if (result < 0)

		return -ENODEV;

	}



	return 0;

}

drivers/acpi/acpi_apd.c

+4 −4
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static const struct apd_device_desc hip08_spi_desc = { 


#endif



/**

/*

 * Create platform device during acpi scan attach handle.

 * Return value > 0 on success of creating device.

 */

drivers/acpi/acpi_ipmi.c

+0 −1
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ static void ipmi_register_bmc(int iface, struct device *dev) 
	ipmi_dev_release(ipmi_device);

err_ref:

	put_device(smi_data.dev);

	return;

}



static void ipmi_bmc_gone(int iface)