| Message ID | 20250202-rb1-bt-v3-4-6797a4467ced@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Bluetooth: qca: add Qualcomm WCN3950 BT/WiFi chip support | expand |
On 2.02.2025 1:16 PM, Dmitry Baryshkov wrote: > While adding interconnect support for the QCM2290 platform some of them > got the c&p error, rogue MASTER_APPSS_PROC for the config_noc > interconnect. Turn that into SLAVE_QUP_0 as expected. > > Fixes: 5b970ff0193d ("arm64: dts: qcom: qcm2290: Hook up interconnects") > Reported-by: Konrad Dybcio <konradybcio@kernel.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > arch/arm64/boot/dts/qcom/qcm2290.dtsi | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi > index f0746123e594d5ce5cc314c956eaca11556a9211..6e3e57dd02612f3568f07f1e198028413f463c69 100644 > --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi > +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi > @@ -1073,7 +1073,7 @@ spi0: spi@4a80000 { > interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG > &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, > <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG > - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; > + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; Still incorrect, this should be &qup_virt SLAVE_QUP_CORE_0 Konrad
On Mon, 3 Feb 2025 at 15:50, Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> wrote: > > On 2.02.2025 1:16 PM, Dmitry Baryshkov wrote: > > While adding interconnect support for the QCM2290 platform some of them > > got the c&p error, rogue MASTER_APPSS_PROC for the config_noc > > interconnect. Turn that into SLAVE_QUP_0 as expected. > > > > Fixes: 5b970ff0193d ("arm64: dts: qcom: qcm2290: Hook up interconnects") > > Reported-by: Konrad Dybcio <konradybcio@kernel.org> > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/qcm2290.dtsi | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi > > index f0746123e594d5ce5cc314c956eaca11556a9211..6e3e57dd02612f3568f07f1e198028413f463c69 100644 > > --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi > > +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi > > @@ -1073,7 +1073,7 @@ spi0: spi@4a80000 { > > interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG > > &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, > > <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG > > - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; > > + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; > > Still incorrect, this should be &qup_virt SLAVE_QUP_CORE_0 Hmm, why? qup_virt has its own path. I think this one (using CNOC) matches the usage on other platforms. > > Konrad
On 3.02.2025 3:00 PM, Dmitry Baryshkov wrote: > On Mon, 3 Feb 2025 at 15:50, Konrad Dybcio > <konrad.dybcio@oss.qualcomm.com> wrote: >> >> On 2.02.2025 1:16 PM, Dmitry Baryshkov wrote: >>> While adding interconnect support for the QCM2290 platform some of them >>> got the c&p error, rogue MASTER_APPSS_PROC for the config_noc >>> interconnect. Turn that into SLAVE_QUP_0 as expected. >>> >>> Fixes: 5b970ff0193d ("arm64: dts: qcom: qcm2290: Hook up interconnects") >>> Reported-by: Konrad Dybcio <konradybcio@kernel.org> >>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >>> --- >>> arch/arm64/boot/dts/qcom/qcm2290.dtsi | 16 ++++++++-------- >>> 1 file changed, 8 insertions(+), 8 deletions(-) >>> >>> diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi >>> index f0746123e594d5ce5cc314c956eaca11556a9211..6e3e57dd02612f3568f07f1e198028413f463c69 100644 >>> --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi >>> @@ -1073,7 +1073,7 @@ spi0: spi@4a80000 { >>> interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG >>> &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, >>> <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG >>> - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; >>> + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; >> >> Still incorrect, this should be &qup_virt SLAVE_QUP_CORE_0 > > Hmm, why? qup_virt has its own path. I think this one (using CNOC) > matches the usage on other platforms. Oh hmm.. you're right.. very confusingly named.. Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Konrad
diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi index f0746123e594d5ce5cc314c956eaca11556a9211..6e3e57dd02612f3568f07f1e198028413f463c69 100644 --- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi +++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi @@ -1073,7 +1073,7 @@ spi0: spi@4a80000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>; @@ -1092,7 +1092,7 @@ uart0: serial@4a80000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; status = "disabled"; @@ -1137,7 +1137,7 @@ spi1: spi@4a84000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>; @@ -1184,7 +1184,7 @@ spi2: spi@4a88000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>; @@ -1231,7 +1231,7 @@ spi3: spi@4a8c000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>; @@ -1278,7 +1278,7 @@ spi4: spi@4a90000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>; @@ -1297,7 +1297,7 @@ uart4: serial@4a90000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; status = "disabled"; @@ -1342,7 +1342,7 @@ spi5: spi@4a94000 { interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>, <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG - &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>; + &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>; interconnect-names = "qup-core", "qup-config"; #address-cells = <1>;
While adding interconnect support for the QCM2290 platform some of them got the c&p error, rogue MASTER_APPSS_PROC for the config_noc interconnect. Turn that into SLAVE_QUP_0 as expected. Fixes: 5b970ff0193d ("arm64: dts: qcom: qcm2290: Hook up interconnects") Reported-by: Konrad Dybcio <konradybcio@kernel.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)