FAILED: patch "[PATCH] serial: 8250_em: Fix UART port type" failed to apply to 5.4-stable tree

FAILED: patch "[PATCH] serial: 8250_em: Fix UART port type" failed to apply to 5.4-stable tree

[gregkh]

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 32e293be736b853f168cd065d9cbc1b0c69f545d
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '167930353815674@kroah.com' --subject-prefix 'PATCH 5.4.y' HEAD^..

Possible dependencies:

32e293be736b ("serial: 8250_em: Fix UART port type")
2a1dbd259e63 ("serial: 8250_em: Switch to use platform_get_irq()")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 32e293be736b853f168cd065d9cbc1b0c69f545d Mon Sep 17 00:00:00 2001
From: Biju Das <biju.das.jz@bp.renesas.com>
Date: Mon, 27 Feb 2023 11:41:46 +0000
Subject: [PATCH] serial: 8250_em: Fix UART port type

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 <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230227114152.22265-2-biju.das.jz@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index f8e99995eee9..d94c3811a8f7 100644
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -106,8 +106,8 @@ static int serial8250_em_probe(struct platform_device *pdev)
 	memset(&up, 0, sizeof(up));
 	up.port.mapbase = regs->start;
 	up.port.irq = irq;
-	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;
 

RE: FAILED: patch "[PATCH] serial: 8250_em: Fix UART port type" failed to apply to 5.4-stable tree

[Biju Das]

Hi Greg,

Thanks for feedback.

> Subject: FAILED: patch "[PATCH] serial: 8250_em: Fix UART port type" failed
> to apply to 5.4-stable tree
> 
> 
> The patch below does not apply to the 5.4-stable tree.
> If someone wants it applied there, or to any other stable or longterm tree,
> then please email the backport, including the original git commit id to
> <stable@vger.kernel.org>.
> 
> To reproduce the conflict and resubmit, you may use the following commands:
> 
> git fetch
> https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.kernel
> .org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fstable%2Flinux.git%2F&data=05%7C01
> %7Cbiju.das.jz%40bp.renesas.com%7C05314cf919e7472983e208db29233b43%7C53d8257
> 1da1947e49cb4625a166a4a2a%7C0%7C0%7C638149003512485403%7CUnknown%7CTWFpbGZsb
> 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000
> %7C%7C%7C&sdata=eLxnB6PHZsrF3%2BUbZ4r90nz5se5HFps6MGCXbzNpudk%3D&reserved=0
> linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x
> 32e293be736b853f168cd065d9cbc1b0c69f545d
> # <resolve conflicts, build, test, etc.> git commit -s git send-email --to
> '<stable@vger.kernel.org>' --in-reply-to '167930353815674@kroah.com' --
> subject-prefix 'PATCH 5.4.y' HEAD^..
> 
> Possible dependencies:
> 
> 32e293be736b ("serial: 8250_em: Fix UART port type")
> 2a1dbd259e63 ("serial: 8250_em: Switch to use platform_get_irq()")


OK, will send these fixes to 5.4 and similarly for 4.19 and 4.14.

Cheers,
Biju

> 
> ------------------ original commit in Linus's tree ------------------
> 
> From 32e293be736b853f168cd065d9cbc1b0c69f545d Mon Sep 17 00:00:00 2001
> From: Biju Das <biju.das.jz@bp.renesas.com>
> Date: Mon, 27 Feb 2023 11:41:46 +0000
> Subject: [PATCH] serial: 8250_em: Fix UART port type
> 
> 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 <biju.das.jz@bp.renesas.com>
> Link:
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> diff --git a/drivers/tty/serial/8250/8250_em.c
> b/drivers/tty/serial/8250/8250_em.c
> index f8e99995eee9..d94c3811a8f7 100644
> --- a/drivers/tty/serial/8250/8250_em.c
> +++ b/drivers/tty/serial/8250/8250_em.c
> @@ -106,8 +106,8 @@ static int serial8250_em_probe(struct platform_device
> *pdev)
>  	memset(&up, 0, sizeof(up));
>  	up.port.mapbase = regs->start;
>  	up.port.irq = irq;
> -	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;
>