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

Pull more ACPI updates from Rafael Wysocki:
 "These add some new device IDs, update a few drivers (processor,
  battery, backlight) and clean up code in a few places.

  Specifics:

   - Add Meteor Lake ACPI IDs for DPTF devices (Sumeet Pawnikar)

   - Rearrange find_child_checks() to simplify code (Rafael Wysocki)

   - Use memremap() to map the UCSI mailbox that is always in main
     memory and drop acpi_release_memory() that has no more users
     (Heikki Krogerus, Dan Carpenter)

   - Make max_cstate/nocst/bm_check_disable processor module parameters
     visible in sysfs (Yajun Deng)

   - Fix typo in the CPPC driver (Julia Lawall)

   - Make the ACPI battery driver show the "not-charging" status by
     default unless "charging" or "full" is directly indicated (Werner
     Sembach)

   - Improve the PM notifier in the ACPI backlight driver (Zhang Rui)

   - Clean up some white space in the ACPI code (Ian Cowan)"

* tag 'acpi-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  usb: typec: ucsi: acpi: fix a NULL vs IS_ERR() check in probe
  ACPI: DPTF: Support Meteor Lake
  ACPI: CPPC: fix typo in comment
  ACPI: video: improve PM notifer callback
  ACPI: clean up white space in a few places for consistency
  ACPI: glue: Rearrange find_child_checks()
  ACPI: processor: idle: Expose max_cstate/nocst/bm_check_disable read-only in sysfs
  ACPI: battery: Make "not-charging" the default on no charging or full info
  ACPI: OSL: Remove the helper for deactivating memory region
  usb: typec: ucsi: acpi: Map the mailbox with memremap()

diff --combined include/linux/acpi.h
index f3fdfd784a6c9f640870b75825d452c7c9900315,4781c2a07f71987f5cc0e15a8c27316c14d03fa6..4f82a5bc6d987fe9ef1f6ddfb253d9ba0e087fc2
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -520,9 -520,6 +520,6 @@@ int acpi_check_resource_conflict(const 
  int acpi_check_region(resource_size_t start, resource_size_t n,
                      const char *name);
  
- acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,
-                               u32 level);
- 
  int acpi_resources_are_enforced(void);
  
  #ifdef CONFIG_HIBERNATION
@@@ -550,16 -547,10 +547,16 @@@ struct acpi_osc_context 
  
  acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
  
 -/* Indexes into _OSC Capabilities Buffer (DWORDs 2 & 3 are device-specific) */
 +/* Number of _OSC capability DWORDS depends on bridge type */
 +#define OSC_PCI_CAPABILITY_DWORDS             3
 +#define OSC_CXL_CAPABILITY_DWORDS             5
 +
 +/* Indexes into _OSC Capabilities Buffer (DWORDs 2 to 5 are device-specific) */
  #define OSC_QUERY_DWORD                               0       /* DWORD 1 */
  #define OSC_SUPPORT_DWORD                     1       /* DWORD 2 */
  #define OSC_CONTROL_DWORD                     2       /* DWORD 3 */
 +#define OSC_EXT_SUPPORT_DWORD                 3       /* DWORD 4 */
 +#define OSC_EXT_CONTROL_DWORD                 4       /* DWORD 5 */
  
  /* _OSC Capabilities DWORD 1: Query/Control and Error Returns (generic) */
  #define OSC_QUERY_ENABLE                      0x00000001  /* input */
@@@ -616,29 -607,6 +613,29 @@@ extern u32 osc_sb_native_usb4_control
  #define OSC_PCI_EXPRESS_LTR_CONTROL           0x00000020
  #define OSC_PCI_EXPRESS_DPC_CONTROL           0x00000080
  
 +/* CXL _OSC: Capabilities DWORD 4: Support Field */
 +#define OSC_CXL_1_1_PORT_REG_ACCESS_SUPPORT   0x00000001
 +#define OSC_CXL_2_0_PORT_DEV_REG_ACCESS_SUPPORT       0x00000002
 +#define OSC_CXL_PROTOCOL_ERR_REPORTING_SUPPORT        0x00000004
 +#define OSC_CXL_NATIVE_HP_SUPPORT             0x00000008
 +
 +/* CXL _OSC: Capabilities DWORD 5: Control Field */
 +#define OSC_CXL_ERROR_REPORTING_CONTROL               0x00000001
 +
 +static inline u32 acpi_osc_ctx_get_pci_control(struct acpi_osc_context *context)
 +{
 +      u32 *ret = context->ret.pointer;
 +
 +      return ret[OSC_CONTROL_DWORD];
 +}
 +
 +static inline u32 acpi_osc_ctx_get_cxl_control(struct acpi_osc_context *context)
 +{
 +      u32 *ret = context->ret.pointer;
 +
 +      return ret[OSC_EXT_CONTROL_DWORD];
 +}
 +
  #define ACPI_GSB_ACCESS_ATTRIB_QUICK          0x00000002
  #define ACPI_GSB_ACCESS_ATTRIB_SEND_RCV         0x00000004
  #define ACPI_GSB_ACCESS_ATTRIB_BYTE           0x00000006
@@@ -1035,17 -1003,6 +1032,17 @@@ static inline int acpi_register_wakeup_
  static inline void acpi_unregister_wakeup_handler(
        bool (*wakeup)(void *context), void *context) { }
  
 +struct acpi_osc_context;
 +static inline u32 acpi_osc_ctx_get_pci_control(struct acpi_osc_context *context)
 +{
 +      return 0;
 +}
 +
 +static inline u32 acpi_osc_ctx_get_cxl_control(struct acpi_osc_context *context)
 +{
 +      return 0;
 +}
 +
  #endif        /* !CONFIG_ACPI */
  
  #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC