mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-24 11:25:43 +00:00
More ACPI updates for 6.8-rc1
- 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). -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmWmb9MSHHJqd0Byand5 c29ja2kubmV0AAoJEILEb/54YlRx+dUP/0q6+52cVFPTxzDhhRx3XF5NBi3N7fWA UQIujrfMp19OaG+jT6UxqHlpG0/KUrH3114RFY8YP+cNISHh+Rllm8dpso6nqva1 nvsJC2Ohwa3xN4bURHS8jCrTCjX5pOWsPszDxA2Ttrw8qerjlKwMeNpzdRbQ5csR zuiGP9h1LJsTcNVCKHA06btmJ0zG3AdKQi57ZJbKKatfQOWJUNZbQ+41F1AXvMz/ lR1Vk4KubDEIURIsmi8HaVG/ero8gHj+XH9a582Oe9Jmt/M0ULfgpxafi2JYE67q jZ3kD7swJIq0FxYdSYRdQLvnqNnMBf1Jx+iqUOMqUldqOomc5T2/57xsI5v63pxp anVR3lYzFg3Q4jKNl2iN47vTuWSnA06uPe8A5KP4aWGjlkCqQbrDn+3jct75PzA8 8Ftj/MyRA11aUlBg6xtrmK6bh5gVsDgsXB3fZBiPKYBAYMlIPnyQpCQ2Ruxaj/0U OVgELkspNmk1U0LUEdUN/TYsBGJPu0UxTHfWk7aoXKW1JhSewYn0kyn3R5xMmEUy YM1z6LYsqaHd7Mjr34UVKRMDvurhlLr+zn9jLP0BolauSLG8RAVy5m4uy8k1TihX 6nRzTdXmGiHmsJ/G5y0b+l18IQXaIVEQkvt0T5oSZqtABCH2yFYtY1Q6HDbVCCyt bz23qtVmRhW0 =mkT+ -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
7f369a8f5b
4 changed files with 33 additions and 4 deletions
|
@ -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 = {
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue