On Wed, Aug 9, 2023 at 5:00 PM Hans de Goede <hdegoede@xxxxxxxxxx> wrote: > > Hi, > > On 8/9/23 16:57, Rafael J. Wysocki wrote: > > On Wed, Aug 9, 2023 at 4:40 PM Hans de Goede <hdegoede@xxxxxxxxxx> wrote: > >> > >> Hi, > >> > >> On 8/9/23 11:20, Jiri Slaby wrote: > >>> On 09. 08. 23, 10:55, Hans de Goede wrote: > >>>> On AMD Zen acpi_dev_irq_override() by default prefers the DSDT IRQ 1 > >>>> settings over the MADT settings. > >>>> > >>>> This causes the keyboard to malfunction on some laptop models > >>>> (see Links), all models from the Links have an INT_SRC_OVR MADT entry > >>>> for IRQ 1. > >>> ... > >>>> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> > >>> ... > >>>> diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c > >>>> index 21b542a6866c..b88e5e0135ab 100644 > >>>> --- a/arch/x86/kernel/acpi/boot.c > >>>> +++ b/arch/x86/kernel/acpi/boot.c > >>>> @@ -52,6 +52,7 @@ int acpi_lapic; > >>>> int acpi_ioapic; > >>>> int acpi_strict; > >>>> int acpi_disable_cmcff; > >>>> +int acpi_int_src_ovr[NR_IRQS_LEGACY]; > >>> > >>> So why not to use bool to make it clear this is not an irq number, but a state? > >>> > >>>> /* ACPI SCI override configuration */ > >>>> u8 acpi_sci_flags __initdata; > >>>> @@ -588,6 +589,9 @@ acpi_parse_int_src_ovr(union acpi_subtable_headers * header, > >>>> acpi_table_print_madt_entry(&header->common); > >>>> + if (intsrc->source_irq < NR_IRQS_LEGACY) > >>>> + acpi_int_src_ovr[intsrc->source_irq] = 1; > >>> > >>> And "true" here. > >> > >> Ack that would indeed be better. > >> > >> Rafael, can you fix this up while merging or do you want a v4 series ? > > > > I think I can do that. > > Great, thank you. > > Do you have any comments on this series, or is this ready for merging now? I've applied this series as 6.5-rc6 material and made the change discussed above. It has been added to my linux-next branch too. Thanks!
