Commit cd16044d authored by Marcin Wojtas's avatar Marcin Wojtas Committed by Greg Kroah-Hartman
Browse files

serial: 8250: dw: enable using pdata with ACPI 



Commit ffd38144 ("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.
While at it, sort all entries alphabetically.

Fixes: ffd38144 ("serial: 8250: dw: Move the USR register to pdata")
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
Link: https://lore.kernel.org/r/20220620121046.1307412-1-mw@semihalf.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a111daf0

drivers/tty/serial/8250/8250_dw.c

+12 −12
Original line number Diff line number Diff line
@@ -773,18 +773,18 @@ static const struct of_device_id dw8250_of_match[] = { 
MODULE_DEVICE_TABLE(of, dw8250_of_match);



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 },

	{ "80860F0A", (kernel_ulong_t)&dw8250_dw_apb },

	{ "8086228A", (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 },

	{ "APMC0D08", (kernel_ulong_t)&dw8250_dw_apb},

	{ "BRCM2032", (kernel_ulong_t)&dw8250_dw_apb },

	{ "HISI0031", (kernel_ulong_t)&dw8250_dw_apb },

	{ "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 },

	{ },

};

MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match);