From 8848975282fb5cbd3bbcb7c8e035f17594d00b9e Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 12 Sep 2022 06:56:18 -0400 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- ...ngson32-ls1c-fix-hang-during-startup.patch | 37 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-5.4/mips-loongson32-ls1c-fix-hang-during-startup.patch diff --git a/queue-5.4/mips-loongson32-ls1c-fix-hang-during-startup.patch b/queue-5.4/mips-loongson32-ls1c-fix-hang-during-startup.patch new file mode 100644 index 00000000000..9d6b1b09f1b --- /dev/null +++ b/queue-5.4/mips-loongson32-ls1c-fix-hang-during-startup.patch @@ -0,0 +1,37 @@ +From 42b702ce95b9d5123ac4ddbaf41395e2a12eb119 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Aug 2022 19:17:25 +0800 +Subject: MIPS: loongson32: ls1c: Fix hang during startup + +From: Yang Ling + +[ Upstream commit 35508d2424097f9b6a1a17aac94f702767035616 ] + +The RTCCTRL reg of LS1C is obselete. +Writing this reg will cause system hang. + +Fixes: 60219c563c9b6 ("MIPS: Add RTC support for Loongson1C board") +Signed-off-by: Yang Ling +Tested-by: Keguang Zhang +Acked-by: Keguang Zhang +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/loongson32/ls1c/board.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/mips/loongson32/ls1c/board.c b/arch/mips/loongson32/ls1c/board.c +index e9de6da0ce51f..9dcfe9de55b0a 100644 +--- a/arch/mips/loongson32/ls1c/board.c ++++ b/arch/mips/loongson32/ls1c/board.c +@@ -15,7 +15,6 @@ static struct platform_device *ls1c_platform_devices[] __initdata = { + static int __init ls1c_platform_init(void) + { + ls1x_serial_set_uartclk(&ls1x_uart_pdev); +- ls1x_rtc_set_extclk(&ls1x_rtc_pdev); + + return platform_add_devices(ls1c_platform_devices, + ARRAY_SIZE(ls1c_platform_devices)); +-- +2.35.1 + diff --git a/queue-5.4/series b/queue-5.4/series index 7ca70e15111..76b36cef0fe 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -105,3 +105,4 @@ nvme-tcp-fix-uaf-when-detecting-digest-errors.patch tcp-fix-early-etimedout-after-spurious-non-sack-rto.patch sch_sfb-also-store-skb-len-before-calling-child-enqu.patch x86-nospec-fix-i386-rsb-stuffing.patch +mips-loongson32-ls1c-fix-hang-during-startup.patch -- 2.47.3