Message ID | 20230401173523.15244-5-me@dylanvanassche.be |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1351254vqo; Sat, 1 Apr 2023 10:37:23 -0700 (PDT) X-Google-Smtp-Source: AKy350ZUaSYyYCKz8x2TU521pyWqc/e4L5R27+cBa5CiMyOgkhsbcf6AJxUrAapdml3QrXfgdocp X-Received: by 2002:a17:907:9a0d:b0:947:55ad:dd00 with SMTP id kr13-20020a1709079a0d00b0094755addd00mr8705940ejc.26.1680370642854; Sat, 01 Apr 2023 10:37:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680370642; cv=none; d=google.com; s=arc-20160816; b=0AZ+ZJGpmOSj5eZwCZPwMjF2nLrmsMTHNok5sFqqWKqO4G7eCS3e7HRLCVbSdjOphy oWlWJgGLDvlSux2KtfsSEraWRQkSSBgd7odlfg8iq17IiHVTavY1i7czRpdRrWWgFWnC M41dCWPrp8LAT8fnIFCa/uvCgda60bLjOF6f7VHQ/HUohAcA/X84MaBbwob0iJWKttnJ VAGA2pvNMBV95fsp62ue3Y9gMVpyncBCshFGCsvPJgUKVpr2CmY+sLWIWfLHrEBjH+c2 0Y0z3U+OVujAqJW0zOHL7QYIWpSJYdBJ7UF2TFqhn0rHNYkEuIJGHULgvMTCbxGHs16I 4vAw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hWiphqrZhkAwhsMq44QXsxmY4StgGMzw96DBVzGwbS4=; b=X2rVb/7yhhrE8zdiwlYIpldop7RmF1w7QizeW3zGa36eEC/wVCryTRWS20kGqhtbeK Uh2txuQQBOz0kQkZl6tuCQ8UCFJULz7uibkKqdSZsciCPOZbPK66zxObMYBK/hSinNvT nl61jPMD8allJHZFhKTeM1lGD5sJrxomHmAjnCtr8F/7dV4TuhRVgUz7qFocOzTJPMeB s9Q0MgrGMm2KRrFKaAnyvQ5gdnkgcqY8FxGa387E8YrLgZsD1aYWdn7Qt9+Ble+s+h2U D+n7fzHRl8MWMHEkpKJzCWHhkdoBQAsKWDzguC7RhOOn5To+ZhWsN+2ikwKDLrUs5y1C HLAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@dylanvanassche.be header.s=MBO0001 header.b=ddfzjzp0; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=dylanvanassche.be Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gy19-20020a170906f25300b0093b854a4922si4782929ejb.486.2023.04.01.10.36.55; Sat, 01 Apr 2023 10:37:22 -0700 (PDT) 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=@dylanvanassche.be header.s=MBO0001 header.b=ddfzjzp0; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=dylanvanassche.be Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230146AbjDARfz (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Sat, 1 Apr 2023 13:35:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229997AbjDARfr (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 1 Apr 2023 13:35:47 -0400 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BE0B1CB81; Sat, 1 Apr 2023 10:35:46 -0700 (PDT) Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Ppkp71fpzz9sln; Sat, 1 Apr 2023 19:35:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dylanvanassche.be; s=MBO0001; t=1680370543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hWiphqrZhkAwhsMq44QXsxmY4StgGMzw96DBVzGwbS4=; b=ddfzjzp0PySIkcifLTRe7jSBbikRLVMmx/vVPhivEQJqmeoUmjHKtx/4yubxbG6eLxxkgy vrUUtoZqOWH2rmsN/1Z1I3W0OyL11mf5o5QJcXQjETb1OV3dsemq8pTNRH0DtdxIoRxFeO DeoVWdJnz6G51tUZRf472Dfmy8N2mT0ALymrIGURdEq9WKPGzWRPPTI8il3ICrL9hA9Tvo K132rYq0DSkw2ctP5ZRIIqUPihB1GmfIZ0GmG/quWveANFeJ4Oyp1b/N4Tr97cgBRn1tbM 4x3fgJxGJjtjCOLXmQ8nL372y1xuoqWYytZSQ+yjv/qrKQ3hx4jHrUESFO+pwA== From: Dylan Van Assche <me@dylanvanassche.be> To: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> Cc: Konrad Dybcio <konrad.dybcio@linaro.org>, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Dylan Van Assche <me@dylanvanassche.be> Subject: [PATCH v4 4/6] dts: qcom: arm64: qcom: sdm845: use defines for VMIDs Date: Sat, 1 Apr 2023 19:35:21 +0200 Message-Id: <20230401173523.15244-5-me@dylanvanassche.be> In-Reply-To: <20230401173523.15244-1-me@dylanvanassche.be> References: <20230401173523.15244-1-me@dylanvanassche.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4Ppkp71fpzz9sln X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761996327041452248?= X-GMAIL-MSGID: =?utf-8?q?1761996327041452248?= |
Series |
dts: qcom: arm64: sdm845: SLPI DSP enablement
|
|
Commit Message
Dylan Van Assche
April 1, 2023, 5:35 p.m. UTC
Use VMID defines for SLPI's FastRPC node in the Qualcomm SDM845 DTS
instead of hardcoded magic values.
Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Comments
On 01/04/2023 19:35, Dylan Van Assche wrote: > Use VMID defines for SLPI's FastRPC node in the Qualcomm SDM845 DTS > instead of hardcoded magic values. > > Signed-off-by: Dylan Van Assche <me@dylanvanassche.be> > --- > arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi > index 1f25a7f4e02b..dc4b553cbe2e 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi > @@ -13,6 +13,7 @@ > #include <dt-bindings/clock/qcom,rpmh.h> > #include <dt-bindings/clock/qcom,videocc-sdm845.h> > #include <dt-bindings/dma/qcom-gpi.h> > +#include <dt-bindings/firmware/qcom,scm.h> > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/interconnect/qcom,osm-l3.h> > #include <dt-bindings/interconnect/qcom,sdm845.h> > @@ -3372,7 +3373,8 @@ fastrpc { > qcom,glink-channels = "fastrpcglink-apps-dsp"; > label = "sdsp"; > qcom,non-secure-domain; > - qcom,vmids = <0x3 0xF 0x5 0x6>; Didn't you just add it in previous patch? Don't add incorrect code which you immediately change. Best regards, Krzysztof
Hi Krzysztof, On Mon, 2023-04-03 at 11:20 +0200, Krzysztof Kozlowski wrote: > On 01/04/2023 19:35, Dylan Van Assche wrote: > > Use VMID defines for SLPI's FastRPC node in the Qualcomm SDM845 DTS > > instead of hardcoded magic values. > > > > Signed-off-by: Dylan Van Assche <me@dylanvanassche.be> > > --- > > arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi > > b/arch/arm64/boot/dts/qcom/sdm845.dtsi > > index 1f25a7f4e02b..dc4b553cbe2e 100644 > > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi > > @@ -13,6 +13,7 @@ > > #include <dt-bindings/clock/qcom,rpmh.h> > > #include <dt-bindings/clock/qcom,videocc-sdm845.h> > > #include <dt-bindings/dma/qcom-gpi.h> > > +#include <dt-bindings/firmware/qcom,scm.h> > > #include <dt-bindings/gpio/gpio.h> > > #include <dt-bindings/interconnect/qcom,osm-l3.h> > > #include <dt-bindings/interconnect/qcom,sdm845.h> > > @@ -3372,7 +3373,8 @@ fastrpc { > > qcom,glink-channels = > > "fastrpcglink-apps-dsp"; > > label = "sdsp"; > > qcom,non-secure-domain; > > - qcom,vmids = <0x3 0xF 0x5 > > 0x6>; > > Didn't you just add it in previous patch? Don't add incorrect code > which > you immediately change. > Both are similar, the code is in fact the same. I followed what Konrad suggested in v3 to make a patch on top: > Please use the recently-introduced header and depend on (and make a patch atop) https://lore.kernel.org/linux-devicetree/20230330165322.118279-1-me@dylanvanassche.be/T/#mab3c3421157acb0a4811dad5bb62d7349a9d4008 I can squash this patch in the FastRPC node one, that would make it disappear. Let me know what you prefer and I will do it in v5 :) > Best regards, > Krzysztof > Kind regards, Dylan Van Assche
On 03/04/2023 17:32, Dylan Van Assche wrote: > Hi Krzysztof, > > On Mon, 2023-04-03 at 11:20 +0200, Krzysztof Kozlowski wrote: >> On 01/04/2023 19:35, Dylan Van Assche wrote: >>> Use VMID defines for SLPI's FastRPC node in the Qualcomm SDM845 DTS >>> instead of hardcoded magic values. >>> >>> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be> >>> --- >>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi >>> b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>> index 1f25a7f4e02b..dc4b553cbe2e 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>> @@ -13,6 +13,7 @@ >>> #include <dt-bindings/clock/qcom,rpmh.h> >>> #include <dt-bindings/clock/qcom,videocc-sdm845.h> >>> #include <dt-bindings/dma/qcom-gpi.h> >>> +#include <dt-bindings/firmware/qcom,scm.h> >>> #include <dt-bindings/gpio/gpio.h> >>> #include <dt-bindings/interconnect/qcom,osm-l3.h> >>> #include <dt-bindings/interconnect/qcom,sdm845.h> >>> @@ -3372,7 +3373,8 @@ fastrpc { >>> qcom,glink-channels = >>> "fastrpcglink-apps-dsp"; >>> label = "sdsp"; >>> qcom,non-secure-domain; >>> - qcom,vmids = <0x3 0xF 0x5 >>> 0x6>; >> >> Didn't you just add it in previous patch? Don't add incorrect code >> which >> you immediately change. >> > > Both are similar, the code is in fact the same. I followed what Konrad > suggested in v3 to make a patch on top: I don't understand. Device nodes are similar, but they are different? If you add a line in patch X and change it in patch X+1, then something is wrong. Isn't this the case here or these are different device nodes? Best regards, Krzysztof
Hi, On Mon, 2023-04-03 at 17:47 +0200, Krzysztof Kozlowski wrote: > On 03/04/2023 17:32, Dylan Van Assche wrote: > > Hi Krzysztof, > > > > On Mon, 2023-04-03 at 11:20 +0200, Krzysztof Kozlowski wrote: > > > On 01/04/2023 19:35, Dylan Van Assche wrote: > > > > Use VMID defines for SLPI's FastRPC node in the Qualcomm SDM845 > > > > DTS > > > > instead of hardcoded magic values. > > > > > > > > Signed-off-by: Dylan Van Assche <me@dylanvanassche.be> > > > > --- > > > > arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +++- > > > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi > > > > b/arch/arm64/boot/dts/qcom/sdm845.dtsi > > > > index 1f25a7f4e02b..dc4b553cbe2e 100644 > > > > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi > > > > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi > > > > @@ -13,6 +13,7 @@ > > > > #include <dt-bindings/clock/qcom,rpmh.h> > > > > #include <dt-bindings/clock/qcom,videocc-sdm845.h> > > > > #include <dt-bindings/dma/qcom-gpi.h> > > > > +#include <dt-bindings/firmware/qcom,scm.h> > > > > #include <dt-bindings/gpio/gpio.h> > > > > #include <dt-bindings/interconnect/qcom,osm-l3.h> > > > > #include <dt-bindings/interconnect/qcom,sdm845.h> > > > > @@ -3372,7 +3373,8 @@ fastrpc { > > > > qcom,glink-channels = > > > > "fastrpcglink-apps-dsp"; > > > > label = "sdsp"; > > > > qcom,non-secure-domain; > > > > - qcom,vmids = <0x3 0xF > > > > 0x5 > > > > 0x6>; > > > > > > Didn't you just add it in previous patch? Don't add incorrect > > > code > > > which > > > you immediately change. > > > > > > > Both are similar, the code is in fact the same. I followed what > > Konrad > > suggested in v3 to make a patch on top: > > I don't understand. Device nodes are similar, but they are different? > If > you add a line in patch X and change it in patch X+1, then something > is > wrong. Isn't this the case here or these are different device nodes? > They are the same node. In the original patch the values are hex values, but Konrad asked to make a patch on top depending on the qcom scm header which has these magic hex values with defines. I can make the defines as default, no problem. Will do in v5. Kind regards, Dylan > > Best regards, > Krzysztof >
On 3.04.2023 18:22, Dylan Van Assche wrote: > Hi, > > On Mon, 2023-04-03 at 17:47 +0200, Krzysztof Kozlowski wrote: >> On 03/04/2023 17:32, Dylan Van Assche wrote: >>> Hi Krzysztof, >>> >>> On Mon, 2023-04-03 at 11:20 +0200, Krzysztof Kozlowski wrote: >>>> On 01/04/2023 19:35, Dylan Van Assche wrote: >>>>> Use VMID defines for SLPI's FastRPC node in the Qualcomm SDM845 >>>>> DTS >>>>> instead of hardcoded magic values. >>>>> >>>>> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be> >>>>> --- >>>>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +++- >>>>> 1 file changed, 3 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi >>>>> b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>>>> index 1f25a7f4e02b..dc4b553cbe2e 100644 >>>>> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >>>>> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>>>> @@ -13,6 +13,7 @@ >>>>> #include <dt-bindings/clock/qcom,rpmh.h> >>>>> #include <dt-bindings/clock/qcom,videocc-sdm845.h> >>>>> #include <dt-bindings/dma/qcom-gpi.h> >>>>> +#include <dt-bindings/firmware/qcom,scm.h> >>>>> #include <dt-bindings/gpio/gpio.h> >>>>> #include <dt-bindings/interconnect/qcom,osm-l3.h> >>>>> #include <dt-bindings/interconnect/qcom,sdm845.h> >>>>> @@ -3372,7 +3373,8 @@ fastrpc { >>>>> qcom,glink-channels = >>>>> "fastrpcglink-apps-dsp"; >>>>> label = "sdsp"; >>>>> qcom,non-secure-domain; >>>>> - qcom,vmids = <0x3 0xF >>>>> 0x5 >>>>> 0x6>; >>>> >>>> Didn't you just add it in previous patch? Don't add incorrect >>>> code >>>> which >>>> you immediately change. >>>> >>> >>> Both are similar, the code is in fact the same. I followed what >>> Konrad >>> suggested in v3 to make a patch on top: >> >> I don't understand. Device nodes are similar, but they are different? >> If >> you add a line in patch X and change it in patch X+1, then something >> is >> wrong. Isn't this the case here or these are different device nodes? >> > > They are the same node. > In the original patch the values are hex values, but Konrad asked to > make a patch on top depending on the qcom scm header which has these > magic hex values with defines. Sorry if that wasn't clear, but what I meant to ask for is "pick this patch that will get in soon and add the VMIDs you need on top of it so that you can send it in parallel and Bjorn can merge both easily" and had nothing to do with splitting out its inclusion in the dts Konrad > I can make the defines as default, no problem. Will do in v5. > > Kind regards, > Dylan > >> >> Best regards, >> Krzysztof >> >
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 1f25a7f4e02b..dc4b553cbe2e 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -13,6 +13,7 @@ #include <dt-bindings/clock/qcom,rpmh.h> #include <dt-bindings/clock/qcom,videocc-sdm845.h> #include <dt-bindings/dma/qcom-gpi.h> +#include <dt-bindings/firmware/qcom,scm.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interconnect/qcom,osm-l3.h> #include <dt-bindings/interconnect/qcom,sdm845.h> @@ -3372,7 +3373,8 @@ fastrpc { qcom,glink-channels = "fastrpcglink-apps-dsp"; label = "sdsp"; qcom,non-secure-domain; - qcom,vmids = <0x3 0xF 0x5 0x6>; + qcom,vmids = <QCOM_SCM_VMID_HLOS QCOM_SCM_VMID_MSS_MSA + QCOM_SCM_VMID_SSC_Q6 QCOM_SCM_VMID_ADSP_Q6>; memory-region = <&fastrpc_mem>; #address-cells = <1>; #size-cells = <0>;