Message ID | 20230219165701.2557446-1-abel.vesa@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp930518wrn; Sun, 19 Feb 2023 09:03:55 -0800 (PST) X-Google-Smtp-Source: AK7set9jKXO3YUFuWDJKEF7Y1mPorLpPYy0hUMGIfYQD9eRMRq3x+MYV57mP0IfYhrHF8yPMcEbL X-Received: by 2002:a17:90b:4c87:b0:233:d181:5b75 with SMTP id my7-20020a17090b4c8700b00233d1815b75mr516464pjb.31.1676826235244; Sun, 19 Feb 2023 09:03:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676826235; cv=none; d=google.com; s=arc-20160816; b=IpeW2v7QC7Pi1PJAMhAX57ke+GQI4Nq2b3TLnEmmAjbnh7SPYSW4HT5kazw8IegccA zlDbXizWluDxm9NGM8PrRXVf8mxH3PTAH9dwLY7BC3FzlrhwIHS28ODHowUaVHa3Iz2m lBifzr2RKQSZBTIwU9UPWKdqnddtIdmjt0yEYHIpYu/hpmULtG/d4lIG7f1FRtOpj9AV 43hrj6c6wfLmPlwTFTP9MwZ5GYjNA5y+O9ogu5+mtaI/Dl1VEXp7HvKCHJGMmOw9KQjR BTXyjUfMLhQmr5gnCTQ2WM5jtyf/2frsXjQlPzNaAbqWfv1w9Ec725WUmxx1gvvSfwl7 GCJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=kj+lBJ82i0AJk03H8+z+wxkrXrlcvM3V1YG5aWXZ/k0=; b=XEfcG8J8p1TwyE4FjW4t9ByqeMcH0EXOWbZoVk6GLjeGJuUlK8E6acfG7B1GC4lGLH cSEshd463pTYfbxL5HKFrFGEDGKsxpPm9UlIPdXlGC+GumUqPVLwR9Xn8KnaOUfFbGCD lUs3HzAnstk4grbr7buwafz2/kGWKNnLpoo7uEYmB7fjVfVUvglKMuo7OYb0eY9G2/V5 q5Dt5cgvFOmvjYMQhfzJe/XzwE8kI2ZK8mVAD84Ecm2DKpJjbCmmv2Aj1LpAPe+bmWu2 vROE5uE1CBqvqrgA8wdIQhPdeaR7ubp1+pYQXnSrn7xkg7xy/tyIGBYqQ0KEGNqTMRJH NqFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OmLhAumy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g1-20020a17090a828100b00230aa06e06dsi4705618pjn.105.2023.02.19.09.03.42; Sun, 19 Feb 2023 09:03:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OmLhAumy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230362AbjBSQ5L (ORCPT <rfc822;assdfgzxcv4@gmail.com> + 99 others); Sun, 19 Feb 2023 11:57:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229985AbjBSQ5K (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 19 Feb 2023 11:57:10 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9738412061 for <linux-kernel@vger.kernel.org>; Sun, 19 Feb 2023 08:57:08 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id et7so3641916edb.9 for <linux-kernel@vger.kernel.org>; Sun, 19 Feb 2023 08:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kj+lBJ82i0AJk03H8+z+wxkrXrlcvM3V1YG5aWXZ/k0=; b=OmLhAumynGYzNay+Qy8rCJvvmIz9OqvoBP/ads/ltAT+OkYAJivj9hpJdSyroAXigx kyQsJJjO/XEAnlok2ozZYdXGdh1d1C6R+P+hB7eHxqVB3KGl0iYlNztd3S/Qcnqc9kHl PZpxd+Jfej+QETt8q/CfcK6lm/24vjnYnUkVyiVYFExdqOR8VJ2h13D2FsBAlW8K1BSk MuTNZCvnZMkAHsQPCGYdDU5dR+DFVeVKIaiJ/FQYFbCZUk10yc+0m8OjKuRfzC0z9Mwt p7RQzEXFcdkqCYUzxuoe4Bu4Gg85NmhS1Z4h/mayzG9RiqMCsK82e4rgL5nWKj/7+4ZA 9YKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kj+lBJ82i0AJk03H8+z+wxkrXrlcvM3V1YG5aWXZ/k0=; b=PPtPd0yrux1vduH/onomfSGZ01PlBylmq2TkDXb2bPgpvLiSj1FCM8L7xzbsP2gUq4 k3xUoCd/j6Nu/Yb7lzZw2NolMruaRyy/t0lULcYYNF4xY48ax6z2MnJ/BZCfclSvV0wA HZfAx4xlaI9sXuK6CRxYHOfmE5R9Up45HJI3FDtW/ykW943nDmOEaS6UncK8ovNbtMYL qUq2Yt3NRGSQtLlOeuVbCAXHEVzN1RzVJwdnAFJwNLzptS+BbDAmEZVpXaJUkOinVZ4n HBArIFuwQ5hKKw+TDTzK/VrI/Q7w0qA8nx+aQndkr8PIW77jUBHVuvCYROM+D5AeATNh o1Ig== X-Gm-Message-State: AO0yUKWOjRJezrnhNKd51e4+wO9aoXtU3T5QpyaPT9JmHShl6tKl1zDp lVUWsekAwOkiBWfOyFZFUdTPLw== X-Received: by 2002:a17:906:1014:b0:8b1:756c:1a30 with SMTP id 20-20020a170906101400b008b1756c1a30mr12153399ejm.59.1676825827088; Sun, 19 Feb 2023 08:57:07 -0800 (PST) Received: from hackbox.lan ([94.52.112.99]) by smtp.gmail.com with ESMTPSA id w5-20020a1709064a0500b008bbc4f3bceesm2213504eju.118.2023.02.19.08.57.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 08:57:06 -0800 (PST) From: Abel Vesa <abel.vesa@linaro.org> To: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Johan Hovold <johan@kernel.org>, Sai Prakash Ranjan <quic_saipraka@quicinc.com>, Juerg Haefliger <juerg.haefliger@canonical.com> Cc: linux-arm-msm@vger.kernel.org, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, stable@vger.kernel.org Subject: [PATCH v3] soc: qcom: llcc: Fix slice configuration values for SC8280XP Date: Sun, 19 Feb 2023 18:57:01 +0200 Message-Id: <20230219165701.2557446-1-abel.vesa@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758279746436982627?= X-GMAIL-MSGID: =?utf-8?q?1758279746436982627?= |
Series |
[v3] soc: qcom: llcc: Fix slice configuration values for SC8280XP
|
|
Commit Message
Abel Vesa
Feb. 19, 2023, 4:57 p.m. UTC
The slice IDs for CVPFW, CPUSS1 and CPUWHT currently overflow the 32bit LLCC config registers. Fix that by using the slice ID values taken from the latest LLCC SC table. Fixes: ec69dfbdc426 ("soc: qcom: llcc: Add sc8180x and sc8280xp configurations") Cc: stable@vger.kernel.org # 5.19+ Signed-off-by: Abel Vesa <abel.vesa@linaro.org> Tested-by: Juerg Haefliger <juerg.haefliger@canonical.com> Reviewed-by: Sai Prakash Ranjan <quic_saipraka@quicinc.com> Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- The v2 is here: https://lore.kernel.org/all/20230127144724.1292580-1-abel.vesa@linaro.org/ Changes since v2: * specifically mentioned the 3 slice IDs that are being fixed and what is happening without this patch * added stabke Cc line * added Juerg's T-b tag * added Sai's R-b tag * added Konrad's A-b tag Changes since v1: * dropped the LLCC_GPU and LLCC_WRCACHE max_cap changes * took the new values from documentatio this time rather than downstream kernel drivers/soc/qcom/llcc-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Sun, Feb 19, 2023 at 06:57:01PM +0200, Abel Vesa wrote: > The slice IDs for CVPFW, CPUSS1 and CPUWHT currently overflow the 32bit > LLCC config registers. Fix that by using the slice ID values taken from > the latest LLCC SC table. This still doesn't really explain what the impact of this bug is (e.g. for people doing backports), but I guess this will do. > Fixes: ec69dfbdc426 ("soc: qcom: llcc: Add sc8180x and sc8280xp configurations") > Cc: stable@vger.kernel.org # 5.19+ > Signed-off-by: Abel Vesa <abel.vesa@linaro.org> > Tested-by: Juerg Haefliger <juerg.haefliger@canonical.com> > Reviewed-by: Sai Prakash Ranjan <quic_saipraka@quicinc.com> > Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> Reviewed-by: Johan Hovold <johan+linaro@kernel.org> > --- > > The v2 is here: > https://lore.kernel.org/all/20230127144724.1292580-1-abel.vesa@linaro.org/ > > Changes since v2: > * specifically mentioned the 3 slice IDs that are being fixed and > what is happening without this patch > * added stabke Cc line > * added Juerg's T-b tag > * added Sai's R-b tag > * added Konrad's A-b tag > > Changes since v1: > * dropped the LLCC_GPU and LLCC_WRCACHE max_cap changes > * took the new values from documentatio this time rather than > downstream kernel > > drivers/soc/qcom/llcc-qcom.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c > index 23ce2f78c4ed..26efe12012a0 100644 > --- a/drivers/soc/qcom/llcc-qcom.c > +++ b/drivers/soc/qcom/llcc-qcom.c > @@ -191,9 +191,9 @@ static const struct llcc_slice_config sc8280xp_data[] = { > { LLCC_CVP, 28, 512, 3, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > { LLCC_APTCM, 30, 1024, 3, 1, 0x0, 0x1, 1, 0, 0, 1, 0, 0 }, > { LLCC_WRCACHE, 31, 1024, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, > - { LLCC_CVPFW, 32, 512, 1, 0, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > - { LLCC_CPUSS1, 33, 2048, 1, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > - { LLCC_CPUHWT, 36, 512, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, > + { LLCC_CVPFW, 17, 512, 1, 0, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > + { LLCC_CPUSS1, 3, 2048, 1, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > + { LLCC_CPUHWT, 5, 512, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, > }; > > static const struct llcc_slice_config sdm845_data[] = {
On 23-03-06 14:01:20, Johan Hovold wrote: > On Sun, Feb 19, 2023 at 06:57:01PM +0200, Abel Vesa wrote: > > The slice IDs for CVPFW, CPUSS1 and CPUWHT currently overflow the 32bit > > LLCC config registers. Fix that by using the slice ID values taken from > > the latest LLCC SC table. > > This still doesn't really explain what the impact of this bug is (e.g. > for people doing backports), but I guess this will do. > Sent a v4 here: https://lore.kernel.org/all/20230306135527.509796-1-abel.vesa@linaro.org/ > > Fixes: ec69dfbdc426 ("soc: qcom: llcc: Add sc8180x and sc8280xp configurations") > > Cc: stable@vger.kernel.org # 5.19+ > > Signed-off-by: Abel Vesa <abel.vesa@linaro.org> > > Tested-by: Juerg Haefliger <juerg.haefliger@canonical.com> > > Reviewed-by: Sai Prakash Ranjan <quic_saipraka@quicinc.com> > > Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Added your R-b tag. Thanks. > > > --- > > > > The v2 is here: > > https://lore.kernel.org/all/20230127144724.1292580-1-abel.vesa@linaro.org/ > > > > Changes since v2: > > * specifically mentioned the 3 slice IDs that are being fixed and > > what is happening without this patch > > * added stabke Cc line > > * added Juerg's T-b tag > > * added Sai's R-b tag > > * added Konrad's A-b tag > > > > Changes since v1: > > * dropped the LLCC_GPU and LLCC_WRCACHE max_cap changes > > * took the new values from documentatio this time rather than > > downstream kernel > > > > drivers/soc/qcom/llcc-qcom.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c > > index 23ce2f78c4ed..26efe12012a0 100644 > > --- a/drivers/soc/qcom/llcc-qcom.c > > +++ b/drivers/soc/qcom/llcc-qcom.c > > @@ -191,9 +191,9 @@ static const struct llcc_slice_config sc8280xp_data[] = { > > { LLCC_CVP, 28, 512, 3, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > > { LLCC_APTCM, 30, 1024, 3, 1, 0x0, 0x1, 1, 0, 0, 1, 0, 0 }, > > { LLCC_WRCACHE, 31, 1024, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, > > - { LLCC_CVPFW, 32, 512, 1, 0, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > > - { LLCC_CPUSS1, 33, 2048, 1, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > > - { LLCC_CPUHWT, 36, 512, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, > > + { LLCC_CVPFW, 17, 512, 1, 0, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > > + { LLCC_CPUSS1, 3, 2048, 1, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, > > + { LLCC_CPUHWT, 5, 512, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, > > }; > > > > static const struct llcc_slice_config sdm845_data[] = {
On Mon, Mar 06, 2023 at 03:57:52PM +0200, Abel Vesa wrote: > On 23-03-06 14:01:20, Johan Hovold wrote: > > On Sun, Feb 19, 2023 at 06:57:01PM +0200, Abel Vesa wrote: > > > The slice IDs for CVPFW, CPUSS1 and CPUWHT currently overflow the 32bit > > > LLCC config registers. Fix that by using the slice ID values taken from > > > the latest LLCC SC table. > > > > This still doesn't really explain what the impact of this bug is (e.g. > > for people doing backports), but I guess this will do. > > > > Sent a v4 here: > https://lore.kernel.org/all/20230306135527.509796-1-abel.vesa@linaro.org/ Looks good, thanks! Johan
On Sun, 19 Feb 2023 18:57:01 +0200, Abel Vesa wrote: > The slice IDs for CVPFW, CPUSS1 and CPUWHT currently overflow the 32bit > LLCC config registers. Fix that by using the slice ID values taken from > the latest LLCC SC table. > > Applied, thanks! [1/1] soc: qcom: llcc: Fix slice configuration values for SC8280XP commit: 77bf4b3ed42e31d29b255fcd6530fb7a1e217e89 Best regards,
diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c index 23ce2f78c4ed..26efe12012a0 100644 --- a/drivers/soc/qcom/llcc-qcom.c +++ b/drivers/soc/qcom/llcc-qcom.c @@ -191,9 +191,9 @@ static const struct llcc_slice_config sc8280xp_data[] = { { LLCC_CVP, 28, 512, 3, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, { LLCC_APTCM, 30, 1024, 3, 1, 0x0, 0x1, 1, 0, 0, 1, 0, 0 }, { LLCC_WRCACHE, 31, 1024, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, - { LLCC_CVPFW, 32, 512, 1, 0, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, - { LLCC_CPUSS1, 33, 2048, 1, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, - { LLCC_CPUHWT, 36, 512, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, + { LLCC_CVPFW, 17, 512, 1, 0, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, + { LLCC_CPUSS1, 3, 2048, 1, 1, 0xfff, 0x0, 0, 0, 0, 1, 0, 0 }, + { LLCC_CPUHWT, 5, 512, 1, 1, 0xfff, 0x0, 0, 0, 0, 0, 1, 0 }, }; static const struct llcc_slice_config sdm845_data[] = {