Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+33 -4
+21
drivers/acpi/resource.c
··· 462 462 }, 463 463 }, 464 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 + }, 471 + { 465 472 /* Asus ExpertBook B2402CBA */ 466 473 .matches = { 467 474 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ··· 487 480 .matches = { 488 481 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), 489 482 DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), 483 + }, 484 + }, 485 + { 486 + /* Asus Vivobook E1504GA */ 487 + .matches = { 488 + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), 489 + DMI_MATCH(DMI_BOARD_NAME, "E1504GA"), 490 + }, 491 + }, 492 + { 493 + /* Asus Vivobook E1504GAB */ 494 + .matches = { 495 + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), 496 + DMI_MATCH(DMI_BOARD_NAME, "E1504GAB"), 490 497 }, 491 498 }, 492 499 {
+1 -1
drivers/pnp/driver.c
··· 256 256 .restore = pnp_bus_resume, 257 257 }; 258 258 259 - struct bus_type pnp_bus_type = { 259 + const struct bus_type pnp_bus_type = { 260 260 .name = "pnp", 261 261 .match = pnp_bus_match, 262 262 .probe = pnp_device_probe,
+10 -2
include/acpi/actbl2.h
··· 1046 1046 /* ACPI_MADT_ENABLED (1) Processor is usable if set */ 1047 1047 #define ACPI_MADT_PERFORMANCE_IRQ_MODE (1<<1) /* 01: Performance Interrupt Mode */ 1048 1048 #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 */ 1049 1051 1050 1052 /* 12: Generic Distributor (ACPI 5.0 + ACPI 6.0 changes) */ 1051 1053 ··· 1092 1090 1093 1091 struct acpi_madt_generic_redistributor { 1094 1092 struct acpi_subtable_header header; 1095 - u16 reserved; /* reserved - must be zero */ 1093 + u8 flags; 1094 + u8 reserved; /* reserved - must be zero */ 1096 1095 u64 base_address; 1097 1096 u32 length; 1098 1097 }; 1098 + 1099 + #define ACPI_MADT_GICR_NON_COHERENT (1) 1099 1100 1100 1101 /* 15: Generic Translator (ACPI 6.0) */ 1101 1102 1102 1103 struct acpi_madt_generic_translator { 1103 1104 struct acpi_subtable_header header; 1104 - u16 reserved; /* reserved - must be zero */ 1105 + u8 flags; 1106 + u8 reserved; /* reserved - must be zero */ 1105 1107 u32 translation_id; 1106 1108 u64 base_address; 1107 1109 u32 reserved2; 1108 1110 }; 1111 + 1112 + #define ACPI_MADT_ITS_NON_COHERENT (1) 1109 1113 1110 1114 /* 16: Multiprocessor wakeup (ACPI 6.4) */ 1111 1115
+1 -1
include/linux/pnp.h
··· 435 435 #define protocol_for_each_dev(protocol, dev) \ 436 436 list_for_each_entry(dev, &(protocol)->devices, protocol_list) 437 437 438 - extern struct bus_type pnp_bus_type; 438 + extern const struct bus_type pnp_bus_type; 439 439 440 440 #if defined(CONFIG_PNP) 441 441