From: Sasha Levin Date: Sun, 22 Nov 2020 17:03:30 +0000 (-0500) Subject: Fixes for 4.4 X-Git-Tag: v4.4.246~39 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=155ab41c7a85f7a11ff712aed44b684014bee2cb;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/arm64-psci-avoid-printing-in-cpu_psci_cpu_die.patch b/queue-4.4/arm64-psci-avoid-printing-in-cpu_psci_cpu_die.patch new file mode 100644 index 00000000000..2c6455d0ad8 --- /dev/null +++ b/queue-4.4/arm64-psci-avoid-printing-in-cpu_psci_cpu_die.patch @@ -0,0 +1,50 @@ +From 7ede5845fa01471b51beb1b9f70fa52a1fd17fef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Nov 2020 09:57:55 +0000 +Subject: arm64: psci: Avoid printing in cpu_psci_cpu_die() + +From: Will Deacon + +[ Upstream commit 891deb87585017d526b67b59c15d38755b900fea ] + +cpu_psci_cpu_die() is called in the context of the dying CPU, which +will no longer be online or tracked by RCU. It is therefore not generally +safe to call printk() if the PSCI "cpu off" request fails, so remove the +pr_crit() invocation. + +Cc: Qian Cai +Cc: "Paul E. McKenney" +Cc: Catalin Marinas +Link: https://lore.kernel.org/r/20201106103602.9849-2-will@kernel.org +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + arch/arm64/kernel/psci.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c +index e6ad81556575c..ae91d202b7475 100644 +--- a/arch/arm64/kernel/psci.c ++++ b/arch/arm64/kernel/psci.c +@@ -136,7 +136,6 @@ static int cpu_psci_cpu_disable(unsigned int cpu) + + static void cpu_psci_cpu_die(unsigned int cpu) + { +- int ret; + /* + * There are no known implementations of PSCI actually using the + * power state field, pass a sensible default for now. +@@ -144,9 +143,7 @@ static void cpu_psci_cpu_die(unsigned int cpu) + u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN << + PSCI_0_2_POWER_STATE_TYPE_SHIFT; + +- ret = psci_ops.cpu_off(state); +- +- pr_crit("unable to power off CPU%u (%d)\n", cpu, ret); ++ psci_ops.cpu_off(state); + } + + static int cpu_psci_cpu_kill(unsigned int cpu) +-- +2.27.0 + diff --git a/queue-4.4/pinctrl-rockchip-enable-gpio-pclk-for-rockchip_gpio_.patch b/queue-4.4/pinctrl-rockchip-enable-gpio-pclk-for-rockchip_gpio_.patch new file mode 100644 index 00000000000..c481ec40e45 --- /dev/null +++ b/queue-4.4/pinctrl-rockchip-enable-gpio-pclk-for-rockchip_gpio_.patch @@ -0,0 +1,39 @@ +From 99b04d89a9a2211ffb06d1051f8bd4431aeec2c0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Oct 2020 14:37:30 +0800 +Subject: pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq + +From: Jianqun Xu + +[ Upstream commit 63fbf8013b2f6430754526ef9594f229c7219b1f ] + +There need to enable pclk_gpio when do irq_create_mapping, since it will +do access to gpio controller. + +Signed-off-by: Jianqun Xu +Reviewed-by: Heiko Stuebner +Reviewed-by: Kever Yang +Link: https://lore.kernel.org/r/20201013063731.3618-3-jay.xu@rock-chips.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-rockchip.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c +index 616055b5e9967..eba400df82154 100644 +--- a/drivers/pinctrl/pinctrl-rockchip.c ++++ b/drivers/pinctrl/pinctrl-rockchip.c +@@ -1445,7 +1445,9 @@ static int rockchip_gpio_to_irq(struct gpio_chip *gc, unsigned offset) + if (!bank->domain) + return -ENXIO; + ++ clk_enable(bank->clk); + virq = irq_create_mapping(bank->domain, offset); ++ clk_disable(bank->clk); + + return (virq) ? : -ENXIO; + } +-- +2.27.0 + diff --git a/queue-4.4/series b/queue-4.4/series index 5e512825406..cc40d40ba8c 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -10,3 +10,5 @@ qlcnic-fix-error-return-code-in-qlcnic_83xx_restart_hw.patch sctp-change-to-hold-put-transport-for-proto_unreach_timer.patch net-usb-qmi_wwan-set-dtr-quirk-for-mr400.patch net-have-netpoll-bring-up-dsa-management-interface.patch +pinctrl-rockchip-enable-gpio-pclk-for-rockchip_gpio_.patch +arm64-psci-avoid-printing-in-cpu_psci_cpu_die.patch