ACPI: resource: Consolidate IRQ trigger-type override DMI tables
PATCH 1/2 ACPI: resource: Consolidate IRQ trigger-type override DMI tables
Before this patch there were 6 dmi_system_id tables. While looking at the override_table[] there are only 2 cases:
1. irq 1, level, active-low, not-shared, skip-override
2. irq 1, edge, activ-low, shared, force-override
Merge the dmi_system_id tables for identical cases together, going from 6 dmi_system_id tables and 6 override_table[] entries to just 2, one for each case.
---
Note this applies on top of my recent quirk submission for the ASUS ExpertBook B1402CBA:
https://lore.kernel.org/linux-acpi/[email protected]/
--- drivers/acpi/resource.c | 52 +++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 31 deletions(-)
drivers/acpi/resource.c +21 -31
@@ -385,7 +385,12 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity) }EXPORT_SYMBOL_GPL (acpi_dev_get_irq_type); -static const struct dmi_system_id medion_laptop[] = { +/* +* DMI matches for boards where the DSDT specifies the kbd IRQ as +* level active-low and using the override changes this to rising edge, +* stopping the keyboard from working. +*/ +static const struct dmi_system_id irq1_level_low_skip_override[] = { { .ident ="MEDION P15651" , .matches = {
@@ -407,10 +412,6 @@ static const struct dmi_system_id medion_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "M1xA"), }, }, - { } -}; - -static const struct dmi_system_id asus_laptop[] = { { .ident = "Asus Vivobook K3402ZA", .matches = {
@@ -474,20 +475,28 @@ static const struct dmi_system_id asus_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), }, }, + { + .ident = "LG Electronics 17U70P", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), + DMI_MATCH(DMI_BOARD_NAME, "17U70P"), + }, + }, { } }; -static const struct dmi_system_id tongfang_gm_rg[] = { +/* +* DMI matches for AMD Zen boards where the DSDT specifies the kbd IRQ +* as falling edge and this must be overridden to rising edge, +* to have a working keyboard. +*/ +static const struct dmi_system_id irq1_edge_low_force_override[] = { { .ident ="TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD" , .matches = {DMI_MATCH (DMI_BOARD_NAME ,"GMxRGxx" ), }, }, - { } -}; - -static const struct dmi_system_id maingear_laptop[] = { { .ident ="MAINGEAR Vector Pro 2 15" , .matches = {
@@ -502,10 +511,6 @@ static const struct dmi_system_id maingear_laptop[] = { DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-17A3070T"), }, }, - { } -}; - -static const struct dmi_system_id pcspecialist_laptop[] = { { .ident = "PCSpecialist Elimina Pro 16 M",/*
@@ -520,17 +525,6 @@ static const struct dmi_system_id pcspecialist_laptop[] = { { } }; -static const struct dmi_system_id lg_laptop[] = { - { - .ident ="LG Electronics 17U70P" , - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"LG Electronics" ), -DMI_MATCH (DMI_BOARD_NAME ,"17U70P" ), - }, - }, - { } -}; -struct irq_override_cmp {const struct dmi_system_id *system;unsigned char irq;
@@ -541,12 +535,8 @@ struct irq_override_cmp { };static const struct irq_override_cmp override_table[] = { - { medion_laptop,1 ,ACPI_LEVEL_SENSITIVE ,ACPI_ACTIVE_LOW ,0 , false }, - { asus_laptop,1 ,ACPI_LEVEL_SENSITIVE ,ACPI_ACTIVE_LOW ,0 , false }, - { tongfang_gm_rg,1 ,ACPI_EDGE_SENSITIVE ,ACPI_ACTIVE_LOW ,1 , true }, - { maingear_laptop,1 ,ACPI_EDGE_SENSITIVE ,ACPI_ACTIVE_LOW ,1 , true }, - { pcspecialist_laptop,1 ,ACPI_EDGE_SENSITIVE ,ACPI_ACTIVE_LOW ,1 , true }, - { lg_laptop,1 ,ACPI_LEVEL_SENSITIVE ,ACPI_ACTIVE_LOW ,0 , false }, + { irq1_level_low_skip_override,1 ,ACPI_LEVEL_SENSITIVE ,ACPI_ACTIVE_LOW ,0 , false }, + { irq1_edge_low_force_override,1 ,ACPI_EDGE_SENSITIVE ,ACPI_ACTIVE_LOW ,1 , true }, }; static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
Signature · 1 line
2.41.0
PATCH 2/2 ACPI: resource: Drop .ident values from dmi_system_id tables
The dmi_system_id.ident values are not used, replace the .ident = "$ident" lines with /* $ident */ to drop the unused strings from the text section.
--- drivers/acpi/resource.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)
drivers/acpi/resource.c +18 -17
@@ -392,91 +392,91 @@ EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type);*/ static const struct dmi_system_id irq1_level_low_skip_override[] = { { - .ident ="MEDION P15651" , +/* MEDION P15651 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"MEDION" ),DMI_MATCH (DMI_BOARD_NAME ,"M15T" ), }, }, { - .ident ="MEDION S17405" , +/* MEDION S17405 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"MEDION" ),DMI_MATCH (DMI_BOARD_NAME ,"M17T" ), }, }, { - .ident ="MEDION S17413" , +/* MEDION S17413 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"MEDION" ),DMI_MATCH (DMI_BOARD_NAME ,"M1xA" ), }, }, { - .ident ="Asus Vivobook K3402ZA" , +/* Asus Vivobook K3402ZA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"K3402ZA" ), }, }, { - .ident ="Asus Vivobook K3502ZA" , +/* Asus Vivobook K3502ZA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"K3502ZA" ), }, }, { - .ident ="Asus Vivobook S5402ZA" , +/* Asus Vivobook S5402ZA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"S5402ZA" ), }, }, { - .ident ="Asus Vivobook S5602ZA" , +/* Asus Vivobook S5602ZA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"S5602ZA" ), }, }, { - .ident ="Asus ExpertBook B1402CBA" , +/* Asus ExpertBook B1402CBA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"B1402CBA" ), }, }, { - .ident ="Asus ExpertBook B1502CBA" , +/* Asus ExpertBook B1502CBA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"B1502CBA" ), }, }, { - .ident ="Asus ExpertBook B2402CBA" , +/* Asus ExpertBook B2402CBA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"B2402CBA" ), }, }, { - .ident ="Asus ExpertBook B2402FBA" , +/* Asus ExpertBook B2402FBA */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"B2402FBA" ), }, }, { - .ident ="Asus ExpertBook B2502" , +/* Asus ExpertBook B2502 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ),DMI_MATCH (DMI_BOARD_NAME ,"B2502CBA" ), }, }, { - .ident ="LG Electronics 17U70P" , +/* LG Electronics 17U70P */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"LG Electronics" ),DMI_MATCH (DMI_BOARD_NAME ,"17U70P" ),
@@ -492,28 +492,29 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {*/ static const struct dmi_system_id irq1_edge_low_force_override[] = { { - .ident ="TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD" , +/* TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD */ .matches = {DMI_MATCH (DMI_BOARD_NAME ,"GMxRGxx" ), }, }, { - .ident ="MAINGEAR Vector Pro 2 15" , +/* MAINGEAR Vector Pro 2 15 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Micro Electronics Inc" ),DMI_MATCH (DMI_PRODUCT_NAME ,"MG-VCP2-15A3070T" ), } }, { - .ident ="MAINGEAR Vector Pro 2 17" , +/* MAINGEAR Vector Pro 2 17 */ .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Micro Electronics Inc" ),DMI_MATCH (DMI_PRODUCT_NAME ,"MG-VCP2-17A3070T" ), }, }, { - .ident ="PCSpecialist Elimina Pro 16 M" ,/* +* PCSpecialist Elimina Pro 16 M +* * Some models have product-name "Elimina Pro 16 M", * others "GM6BGEQ". Match on board-name to match both. */
Signature · 1 line
2.41.0
Quoted 117 lines · Hans de Goede
Before this patch there were 6
dmi_system_idtables. While looking at the override_table[] there are only 2 cases:
1. irq 1, level, active-low, not-shared, skip-override
2. irq 1, edge, activ-low, shared, force-overrideMerge the
dmi_system_idtables for identical cases together, going from 6dmi_system_idtables and 6 override_table[] entries to just 2, one for each case.Signed-off-by Hans de Goede <[email protected]>---
Note this applies on top of my recent quirk submission for the ASUS ExpertBook B1402CBA:
https://lore.kernel.org/linux-acpi/[email protected]/--- drivers/acpi/resource.c | 52 +++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 31 deletions(-)drivers/acpi/resource.c +19
-27@@ -385,7 +385,12 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity) }EXPORT_SYMBOL_GPL (acpi_dev_get_irq_type); -static const struct dmi_system_id medion_laptop[] = { +/* +* DMI matches for boards where the DSDT specifies the kbd IRQ as +* level active-low and using the override changes this to rising edge, +* stopping the keyboard from working. +*/ +static const struct dmi_system_id irq1_level_low_skip_override[] = { { .ident ="MEDION P15651" , .matches = {@@ -407,10 +412,6 @@ static const struct dmi_system_id medion_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "M1xA"), }, }, - { } -}; - -static const struct dmi_system_id asus_laptop[] = { { .ident = "Asus Vivobook K3402ZA", .matches = {@@ -474,20 +475,28 @@ static const struct dmi_system_id asus_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), }, }, + { + .ident = "LG Electronics 17U70P", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), + DMI_MATCH(DMI_BOARD_NAME, "17U70P"), + }, + }, { } }; -static const struct dmi_system_id tongfang_gm_rg[] = { +/* + * DMI matches for AMD Zen boards where the DSDT specifies the kbd IRQ + * as falling edge and this must be overridden to rising edge, + * to have a working keyboard. + */ +static const struct dmi_system_id irq1_edge_low_force_override[] = { { .ident = "TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD", .matches = { DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"), }, }, - { } -}; - -static const struct dmi_system_id maingear_laptop[] = { { .ident = "MAINGEAR Vector Pro 2 15", .matches = {@@ -502,10 +511,6 @@ static const struct dmi_system_id maingear_laptop[] = { DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-17A3070T"), }, }, - { } -}; - -static const struct dmi_system_id pcspecialist_laptop[] = { { .ident = "PCSpecialist Elimina Pro 16 M",/* @@ -520,17 +525,6 @@ static const struct dmi_system_id pcspecialist_laptop[] = { { } }; -static const struct dmi_system_id lg_laptop[] = { - { - .ident ="LG Electronics 17U70P" , - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"LG Electronics" ), -DMI_MATCH (DMI_BOARD_NAME ,"17U70P" ), - }, - }, - { } -}; -struct irq_override_cmp {const struct dmi_system_id *system;unsigned char irq;@@ -541,12 +535,8 @@ struct irq_override_cmp { };static const struct irq_override_cmp override_table[] = { - { medion_laptop,1 ,ACPI_LEVEL_SENSITIVE ,ACPI_ACTIVE_LOW ,0 , false }, - { asus_laptop,1 ,ACPI_LEVEL_SENSITIVE ,ACPI_ACTIVE_LOW ,0 , false },
drivers/acpi/resource.c struct irq_override_cmp {
Quoted 10 lines
drivers/acpi/resource.c +2
-5- { tongfang_gm_rg, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, - { maingear_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, - { pcspecialist_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, - { lg_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false }, + { irq1_level_low_skip_override, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false }, + { irq1_edge_low_force_override, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, }; static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, --
Applied, along with the [2/2], as 6.7 material, thanks!