From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BDEC482F0 for ; Mon, 19 Feb 2024 18:48:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708368535; cv=none; b=OfJbAnH+g4NnboUnj7CzpatZUTh9nMs3jFvj61E4zvwwigdR3Yl8BzKOvDas7s/q1f6inTd8FzN4Db7JWArFqpgc4srlznGBzZqqoaiQfXxZNOpeBAiTYD0W9vZmBoukQar+Di9GZSh2KfO7N+VefGTV2G+jTHU1O3zJEjnZcA8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708368535; c=relaxed/simple; bh=Ji9y/xQ2HhSEh4Xg8XUo68lUs068DvNPBkK9cDP/KPk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=pTHPv4lYpSOGw1yiAsAbaMgfdOS25z7WgWITDTg0TW4TeLInXsaERl7bIJx3LqinKUyLGaej4ZqfIDOAPNuHre9f96VTnUxRizq35Q7M6n2QtBLYsl+7vizAxSm7rZFhNeRst4oRIqy2WcHAMquT/UkWqSUxiDaRMUv0b/fPp8o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wutGkIBf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wutGkIBf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5680C433C7; Mon, 19 Feb 2024 18:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708368535; bh=Ji9y/xQ2HhSEh4Xg8XUo68lUs068DvNPBkK9cDP/KPk=; h=Subject:To:Cc:From:Date:From; b=wutGkIBfPCpUlnF0UlJx4S0GGK/2j47IJbRTMmog1IsriztmyJJA5jmQbeY3nuv15 LU2gioixiAuIrFClkVro7ZP8ders5LnAwQWUEtf4E9uRnrxqooyu7a9MCcUQSKS0T0 /YTt8l582CX6WTNs01zvX8frnETSY4zmP1Z25XQk= Subject: FAILED: patch "[PATCH] pmdomain: renesas: r8a77980-sysc: CR7 must be always on" failed to apply to 5.10-stable tree To: geert+renesas@glider.be,ulf.hansson@linaro.org Cc: From: Date: Mon, 19 Feb 2024 19:48:46 +0100 Message-ID: <2024021946-unfitting-schnapps-e6e2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-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 . 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.10.y git checkout FETCH_HEAD git cherry-pick -x f0e4a1356466ec1858ae8e5c70bea2ce5e55008b # git commit -s git send-email --to '' --in-reply-to '2024021946-unfitting-schnapps-e6e2@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: f0e4a1356466 ("pmdomain: renesas: r8a77980-sysc: CR7 must be always on") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f0e4a1356466ec1858ae8e5c70bea2ce5e55008b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Fri, 12 Jan 2024 17:33:55 +0100 Subject: [PATCH] pmdomain: renesas: r8a77980-sysc: CR7 must be always on MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 diff --git a/drivers/pmdomain/renesas/r8a77980-sysc.c b/drivers/pmdomain/renesas/r8a77980-sysc.c index 39ca84a67daa..621e411fc999 100644 --- a/drivers/pmdomain/renesas/r8a77980-sysc.c +++ b/drivers/pmdomain/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 },