Commit 7f369a8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more ACPI updates from Rafael Wysocki:
 "These add support for new MADT flags to ACPICA, constify the PNP bus
  type structure and add new ACPI IRQ management quirks.

  Specifics:

   - Make pnp_bus_type const (Greg Kroah-Hartman)

   - Add ACPI IRQ management quirks for ASUS ExpertBook B1502CGA and
     ASUS Vivobook E1504GA and E1504GAB (Ben Mayo, Michael Maltsev)

   - Add new MADT GICC/GICR/ITS non-coherent flags and GICC online
     capable bit handling to ACPICA (Lorenzo Pieralisi)"

* tag 'acpi-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPICA: MADT: Add new MADT GICC/GICR/ITS non-coherent flags handling
  ACPICA: MADT: Add GICC online capable bit handling
  ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CGA
  ACPI: resource: Add DMI quirks for ASUS Vivobook E1504GA and E1504GAB
  PNP: make pnp_bus_type const
parents 7b5bcf9b 5b5268cd

drivers/acpi/resource.c

+21 −0
Original line number Diff line number Diff line
@@ -461,6 +461,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"),

		},

	},

	{

		/* Asus ExpertBook B1502CGA */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "B1502CGA"),

		},

	},

	{

		/* Asus ExpertBook B2402CBA */

		.matches = {
@@ -482,6 +489,20 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"),

		},

	},

	{

		/* Asus Vivobook E1504GA */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "E1504GA"),

		},

	},

	{

		/* Asus Vivobook E1504GAB */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "E1504GAB"),

		},

	},

	{

		/* LG Electronics 17U70P */

		.matches = {

drivers/pnp/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static const struct dev_pm_ops pnp_bus_dev_pm_ops = { 
	.restore = pnp_bus_resume,

};



struct bus_type pnp_bus_type = {

const struct bus_type pnp_bus_type = {

	.name    = "pnp",

	.match   = pnp_bus_match,

	.probe   = pnp_device_probe,

include/acpi/actbl2.h

+10 −2
Original line number Diff line number Diff line
@@ -1046,6 +1046,8 @@ struct acpi_madt_generic_interrupt { 
/* ACPI_MADT_ENABLED                    (1)      Processor is usable if set */

#define ACPI_MADT_PERFORMANCE_IRQ_MODE  (1<<1)	/* 01: Performance Interrupt Mode */

#define ACPI_MADT_VGIC_IRQ_MODE         (1<<2)	/* 02: VGIC Maintenance Interrupt mode */

#define ACPI_MADT_GICC_ONLINE_CAPABLE   (1<<3)	/* 03: Processor is online capable  */

#define ACPI_MADT_GICC_NON_COHERENT     (1<<4)	/* 04: GIC redistributor is not coherent */



/* 12: Generic Distributor (ACPI 5.0 + ACPI 6.0 changes) */
@@ -1090,21 +1092,27 @@ struct acpi_madt_generic_msi_frame { 


struct acpi_madt_generic_redistributor {

	struct acpi_subtable_header header;

	u16 reserved;		/* reserved - must be zero */

	u8 flags;

	u8 reserved;		/* reserved - must be zero */

	u64 base_address;

	u32 length;

};



#define ACPI_MADT_GICR_NON_COHERENT     (1)



/* 15: Generic Translator (ACPI 6.0) */



struct acpi_madt_generic_translator {

	struct acpi_subtable_header header;

	u16 reserved;		/* reserved - must be zero */

	u8 flags;

	u8 reserved;		/* reserved - must be zero */

	u32 translation_id;

	u64 base_address;

	u32 reserved2;

};



#define ACPI_MADT_ITS_NON_COHERENT      (1)



/* 16: Multiprocessor wakeup (ACPI 6.4) */



struct acpi_madt_multiproc_wakeup {

include/linux/pnp.h

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ struct pnp_protocol { 
#define protocol_for_each_dev(protocol, dev)	\

	list_for_each_entry(dev, &(protocol)->devices, protocol_list)



extern struct bus_type pnp_bus_type;

extern const struct bus_type pnp_bus_type;



#if defined(CONFIG_PNP)