Re: [PATCH] serial: 8250: dw: enable using pdata with ACPI

From: Marcin Wojtas
Date: Mon Jun 20 2022 - 05:14:40 EST


Hi,

pon., 20 cze 2022 o 10:01 Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
napisał(a):
>
> On Sun, Jun 19, 2022 at 9:43 AM Marcin Wojtas <mw@xxxxxxxxxxxx> wrote:
> >
> > Commit 3242fe805b52 ("serial: 8250: dw: Move the USR register to pdata")
> > caused NULL-pointer dereference when booting with ACPI by unconditional
> > usage of the recently added pdata.
> >
> > In order to fix that and prevent similar issues in future, hook the
> > default version of this structure in dw8250_acpi_match table.
>
> Thanks for the report and fix! One proposal below.
>
> ...
>
> > static const struct acpi_device_id dw8250_acpi_match[] = {
> > - { "INT33C4", 0 },
> > - { "INT33C5", 0 },
> > - { "INT3434", 0 },
> > - { "INT3435", 0 },
> > - { "80860F0A", 0 },
> > - { "8086228A", 0 },
> > - { "APMC0D08", 0},
> > - { "AMD0020", 0 },
> > - { "AMDI0020", 0 },
> > - { "AMDI0022", 0 },
> > - { "BRCM2032", 0 },
> > - { "HISI0031", 0 },
> > + { "INT33C4", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "INT33C5", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "INT3434", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "INT3435", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "80860F0A", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "8086228A", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "APMC0D08", (kernel_ulong_t)&dw8250_dw_apb},
> > + { "AMD0020", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "AMDI0020", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "AMDI0022", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "BRCM2032", (kernel_ulong_t)&dw8250_dw_apb },
> > + { "HISI0031", (kernel_ulong_t)&dw8250_dw_apb },
>
> Since you are touching all of them, please keep the order
> alphanumerically sorted by the HID.

Sure.

Thanks,
Marcin