Skip to content

Commit 5b5268c

Browse files
committed
Merge branches 'pnp', 'acpi-resource' and 'acpica'
Merge a PNP change, new ACPI IRQ management quirks and a small ACPICA code update 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). * pnp: PNP: make pnp_bus_type const * acpi-resource: ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CGA ACPI: resource: Add DMI quirks for ASUS Vivobook E1504GA and E1504GAB * acpica: ACPICA: MADT: Add new MADT GICC/GICR/ITS non-coherent flags handling ACPICA: MADT: Add GICC online capable bit handling
4 parents 7da7107 + 2fb7e4d + e315e86 + 3be8fb1 commit 5b5268c

File tree

4 files changed

+33
-4
lines changed

4 files changed

+33
-4
lines changed

drivers/acpi/resource.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
461461
DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"),
462462
},
463463
},
464+
{
465+
/* Asus ExpertBook B1502CGA */
466+
.matches = {
467+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
468+
DMI_MATCH(DMI_BOARD_NAME, "B1502CGA"),
469+
},
470+
},
464471
{
465472
/* Asus ExpertBook B2402CBA */
466473
.matches = {
@@ -482,6 +489,20 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
482489
DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"),
483490
},
484491
},
492+
{
493+
/* Asus Vivobook E1504GA */
494+
.matches = {
495+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
496+
DMI_MATCH(DMI_BOARD_NAME, "E1504GA"),
497+
},
498+
},
499+
{
500+
/* Asus Vivobook E1504GAB */
501+
.matches = {
502+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
503+
DMI_MATCH(DMI_BOARD_NAME, "E1504GAB"),
504+
},
505+
},
485506
{
486507
/* LG Electronics 17U70P */
487508
.matches = {

drivers/pnp/driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
256256
.restore = pnp_bus_resume,
257257
};
258258

259-
struct bus_type pnp_bus_type = {
259+
const struct bus_type pnp_bus_type = {
260260
.name = "pnp",
261261
.match = pnp_bus_match,
262262
.probe = pnp_device_probe,

include/acpi/actbl2.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,8 @@ struct acpi_madt_generic_interrupt {
10461046
/* ACPI_MADT_ENABLED (1) Processor is usable if set */
10471047
#define ACPI_MADT_PERFORMANCE_IRQ_MODE (1<<1) /* 01: Performance Interrupt Mode */
10481048
#define ACPI_MADT_VGIC_IRQ_MODE (1<<2) /* 02: VGIC Maintenance Interrupt mode */
1049+
#define ACPI_MADT_GICC_ONLINE_CAPABLE (1<<3) /* 03: Processor is online capable */
1050+
#define ACPI_MADT_GICC_NON_COHERENT (1<<4) /* 04: GIC redistributor is not coherent */
10491051

10501052
/* 12: Generic Distributor (ACPI 5.0 + ACPI 6.0 changes) */
10511053

@@ -1090,21 +1092,27 @@ struct acpi_madt_generic_msi_frame {
10901092

10911093
struct acpi_madt_generic_redistributor {
10921094
struct acpi_subtable_header header;
1093-
u16 reserved; /* reserved - must be zero */
1095+
u8 flags;
1096+
u8 reserved; /* reserved - must be zero */
10941097
u64 base_address;
10951098
u32 length;
10961099
};
10971100

1101+
#define ACPI_MADT_GICR_NON_COHERENT (1)
1102+
10981103
/* 15: Generic Translator (ACPI 6.0) */
10991104

11001105
struct acpi_madt_generic_translator {
11011106
struct acpi_subtable_header header;
1102-
u16 reserved; /* reserved - must be zero */
1107+
u8 flags;
1108+
u8 reserved; /* reserved - must be zero */
11031109
u32 translation_id;
11041110
u64 base_address;
11051111
u32 reserved2;
11061112
};
11071113

1114+
#define ACPI_MADT_ITS_NON_COHERENT (1)
1115+
11081116
/* 16: Multiprocessor wakeup (ACPI 6.4) */
11091117

11101118
struct acpi_madt_multiproc_wakeup {

include/linux/pnp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ struct pnp_protocol {
435435
#define protocol_for_each_dev(protocol, dev) \
436436
list_for_each_entry(dev, &(protocol)->devices, protocol_list)
437437

438-
extern struct bus_type pnp_bus_type;
438+
extern const struct bus_type pnp_bus_type;
439439

440440
#if defined(CONFIG_PNP)
441441

0 commit comments

Comments
 (0)