From: Sasha Levin Date: Sat, 24 Feb 2024 03:37:44 +0000 (-0500) Subject: Fixes for 5.10 X-Git-Tag: v4.19.308~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05316d47dfde44dcea8bf202a69e1eac2d9c2b1d;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/pmdomain-renesas-r8a77980-sysc-cr7-must-be-always-on.patch b/queue-5.10/pmdomain-renesas-r8a77980-sysc-cr7-must-be-always-on.patch new file mode 100644 index 00000000000..2ff55d760f2 --- /dev/null +++ b/queue-5.10/pmdomain-renesas-r8a77980-sysc-cr7-must-be-always-on.patch @@ -0,0 +1,47 @@ +From 2dbc1aafa55e2db542821e116df0a5ec3ed378b3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Jan 2024 17:33:55 +0100 +Subject: pmdomain: renesas: r8a77980-sysc: CR7 must be always on +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Geert Uytterhoeven + +[ Upstream commit f0e4a1356466ec1858ae8e5c70bea2ce5e55008b ] + +The power domain containing the Cortex-R7 CPU core on the R-Car V3H SoC +must always be in power-on state, unlike on other SoCs in the R-Car Gen3 +family. See Table 9.4 "Power domains" in the R-Car Series, 3rd +Generation Hardware User’s Manual Rev.1.00 and later. + +Fix this by marking the domain as a CPU domain without control +registers, so the driver will not touch it. + +Fixes: 41d6d8bd8ae9 ("soc: renesas: rcar-sysc: add R8A77980 support") +Signed-off-by: Geert Uytterhoeven +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/fdad9a86132d53ecddf72b734dac406915c4edc0.1705076735.git.geert+renesas@glider.be +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/soc/renesas/r8a77980-sysc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/soc/renesas/r8a77980-sysc.c b/drivers/soc/renesas/r8a77980-sysc.c +index 39ca84a67daad..621e411fc9991 100644 +--- a/drivers/soc/renesas/r8a77980-sysc.c ++++ b/drivers/soc/renesas/r8a77980-sysc.c +@@ -25,7 +25,8 @@ static const struct rcar_sysc_area r8a77980_areas[] __initconst = { + PD_CPU_NOCR }, + { "ca53-cpu3", 0x200, 3, R8A77980_PD_CA53_CPU3, R8A77980_PD_CA53_SCU, + PD_CPU_NOCR }, +- { "cr7", 0x240, 0, R8A77980_PD_CR7, R8A77980_PD_ALWAYS_ON }, ++ { "cr7", 0x240, 0, R8A77980_PD_CR7, R8A77980_PD_ALWAYS_ON, ++ PD_CPU_NOCR }, + { "a3ir", 0x180, 0, R8A77980_PD_A3IR, R8A77980_PD_ALWAYS_ON }, + { "a2ir0", 0x400, 0, R8A77980_PD_A2IR0, R8A77980_PD_A3IR }, + { "a2ir1", 0x400, 1, R8A77980_PD_A2IR1, R8A77980_PD_A3IR }, +-- +2.43.0 + diff --git a/queue-5.10/series b/queue-5.10/series index 4b4c6b9dbb0..518f60efa21 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -39,3 +39,4 @@ hwmon-coretemp-enlarge-per-package-core-count-limit.patch scsi-lpfc-use-unsigned-type-for-num_sge.patch firewire-core-send-bus-reset-promptly-on-gap-count-e.patch virtio-blk-ensure-no-requests-in-virtqueues-before-d.patch +pmdomain-renesas-r8a77980-sysc-cr7-must-be-always-on.patch