From: Greg Kroah-Hartman Date: Mon, 20 Mar 2023 14:16:28 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.14.311~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7865974ddac9e51b9e6357a0a4415afe75b1319d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: serial-8250_em-fix-uart-port-type.patch --- diff --git a/queue-4.14/serial-8250_em-fix-uart-port-type.patch b/queue-4.14/serial-8250_em-fix-uart-port-type.patch new file mode 100644 index 00000000000..af18d87e9d5 --- /dev/null +++ b/queue-4.14/serial-8250_em-fix-uart-port-type.patch @@ -0,0 +1,38 @@ +From 32e293be736b853f168cd065d9cbc1b0c69f545d Mon Sep 17 00:00:00 2001 +From: Biju Das +Date: Mon, 27 Feb 2023 11:41:46 +0000 +Subject: serial: 8250_em: Fix UART port type + +From: Biju Das + +commit 32e293be736b853f168cd065d9cbc1b0c69f545d upstream. + +As per HW manual for EMEV2 "R19UH0040EJ0400 Rev.4.00", the UART +IP found on EMMA mobile SoC is Register-compatible with the +general-purpose 16750 UART chip. Fix UART port type as 16750 and +enable 64-bytes fifo support. + +Fixes: 22886ee96895 ("serial8250-em: Emma Mobile UART driver V2") +Cc: stable@vger.kernel.org +Signed-off-by: Biju Das +Link: https://lore.kernel.org/r/20230227114152.22265-2-biju.das.jz@bp.renesas.com +[biju: manually fixed the conflicts] +Signed-off-by: Biju Das +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_em.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/tty/serial/8250/8250_em.c ++++ b/drivers/tty/serial/8250/8250_em.c +@@ -113,8 +113,8 @@ static int serial8250_em_probe(struct pl + memset(&up, 0, sizeof(up)); + up.port.mapbase = regs->start; + up.port.irq = irq->start; +- up.port.type = PORT_UNKNOWN; +- up.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP; ++ up.port.type = PORT_16750; ++ up.port.flags = UPF_FIXED_PORT | UPF_IOREMAP | UPF_FIXED_TYPE; + up.port.dev = &pdev->dev; + up.port.private_data = priv; + diff --git a/queue-4.14/series b/queue-4.14/series index 0e7cad62116..f4ac6f95dec 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -25,3 +25,4 @@ sh-intc-avoid-spurious-sizeof-pointer-div-warning.patch ftrace-fix-invalid-address-access-in-lookup_rec-when-index-is-0.patch fbdev-stifb-provide-valid-pixelclock-and-add-fb_check_var-checks.patch drm-i915-don-t-use-stolen-memory-for-ring-buffers-with-llc.patch +serial-8250_em-fix-uart-port-type.patch