| Message ID | 20240110112059.2498-2-quic_luoj@quicinc.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Add PPE device tree node for Qualcomm IPQ SoC | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On 10/01/2024 12:20, Luo Jie wrote: > The PPE device tree node includes the PPE initialization configurations > and UNIPHY instance configuration. > > Ther are 3 UNIPHYs(PCS) on the platform ipq9574, which register the > clock provider to output the clock for PPE port to work on the different > link speed. > > Signed-off-by: Luo Jie <quic_luoj@quicinc.com> > --- > arch/arm64/boot/dts/qcom/ipq9574.dtsi | 730 +++++++++++++++++++++++++- > 1 file changed, 724 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi > index 810cda4a850f..5fa241e27c8b 100644 > --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi > +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi > @@ -775,16 +775,734 @@ nsscc: nsscc@39b00000 { > <&bias_pll_nss_noc_clk>, > <&bias_pll_ubi_nc_clk>, > <&gcc_gpll0_out_aux>, > - <0>, > - <0>, > - <0>, > - <0>, > - <0>, > - <0>, > + <&uniphys 0>, > + <&uniphys 1>, > + <&uniphys 2>, > + <&uniphys 3>, > + <&uniphys 4>, > + <&uniphys 5>, > <&xo_board_clk>; > #clock-cells = <1>; > #reset-cells = <1>; > }; > + > + qcom_ppe: qcom-ppe@3a000000 { qcom is definitely not a generic name. Node names should be generic. See also an explanation and list of examples (not exhaustive) in DT specification: https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html#generic-names-recommendation > + compatible = "qcom,ipq9574-ppe"; I don't see this documented. I don't see reference to posted bindings. Please run scripts/checkpatch.pl and fix reported warnings. Some warnings can be ignored, but the code here looks like it needs a fix. Feel free to get in touch if the warning is not clear. Ignoring this warning is a sign you don't really check your patches before sending. > + reg = <0x3a000000 0xb00000>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; Put after reg. > + status = "okay"; Drop All of above comments apply to your entire patchset and all places. Looking at code further, it does not look like suitable for mainline, but copy of downstream code. That's not what we expect upstream. Please go back to your bindings first. Also, I really insist you reaching out to other folks to help you in this process. Best regards, Krzysztof
On 1/10/2024 7:40 PM, Krzysztof Kozlowski wrote: > On 10/01/2024 12:20, Luo Jie wrote: >> The PPE device tree node includes the PPE initialization configurations >> and UNIPHY instance configuration. >> >> Ther are 3 UNIPHYs(PCS) on the platform ipq9574, which register the >> clock provider to output the clock for PPE port to work on the different >> link speed. >> >> Signed-off-by: Luo Jie <quic_luoj@quicinc.com> >> --- >> arch/arm64/boot/dts/qcom/ipq9574.dtsi | 730 +++++++++++++++++++++++++- >> 1 file changed, 724 insertions(+), 6 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi >> index 810cda4a850f..5fa241e27c8b 100644 >> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi >> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi >> @@ -775,16 +775,734 @@ nsscc: nsscc@39b00000 { >> <&bias_pll_nss_noc_clk>, >> <&bias_pll_ubi_nc_clk>, >> <&gcc_gpll0_out_aux>, >> - <0>, >> - <0>, >> - <0>, >> - <0>, >> - <0>, >> - <0>, >> + <&uniphys 0>, >> + <&uniphys 1>, >> + <&uniphys 2>, >> + <&uniphys 3>, >> + <&uniphys 4>, >> + <&uniphys 5>, >> <&xo_board_clk>; >> #clock-cells = <1>; >> #reset-cells = <1>; >> }; >> + >> + qcom_ppe: qcom-ppe@3a000000 { > > qcom is definitely not a generic name. > > Node names should be generic. See also an explanation and list of > examples (not exhaustive) in DT specification: > https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html#generic-names-recommendation Ok, will update to use a generic name in the link, Thanks for the guidance and the link. > > >> + compatible = "qcom,ipq9574-ppe"; > > I don't see this documented. I don't see reference to posted bindings. The DT bindings patch was part of the driver series as below. This property was documented in the DT bindings patch. Attaching it to DTSI series should make it more clear. If this is fine, I will update the DTSI series with the DT bindings patch. https://lore.kernel.org/netdev/20240110142428.52026d9e@kernel.org/ > > Please run scripts/checkpatch.pl and fix reported warnings. Some > warnings can be ignored, but the code here looks like it needs a fix. > Feel free to get in touch if the warning is not clear. > > Ignoring this warning is a sign you don't really check your patches > before sending. We have run the checkpatch.pl on the whole patch series including this device tree patch set together with PPE driver patch set. As mentioned above, I will add the DT bindings patch into the DTS series. This should help with the checkpatch issue. > >> + reg = <0x3a000000 0xb00000>; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; > > Put after reg. Ok. > >> + status = "okay"; > > Drop Ok. > > All of above comments apply to your entire patchset and all places. > > Looking at code further, it does not look like suitable for mainline, > but copy of downstream code. That's not what we expect upstream. Please > go back to your bindings first. Also, I really insist you reaching out > to other folks to help you in this process. > > Best regards, > Krzysztof > We will do internal review of the gaps and update the patches as per your comments. Thanks for the review comments.
On Thu, 11 Jan 2024 at 17:31, Jie Luo <quic_luoj@quicinc.com> wrote: > > > > On 1/10/2024 7:40 PM, Krzysztof Kozlowski wrote: > > On 10/01/2024 12:20, Luo Jie wrote: > >> The PPE device tree node includes the PPE initialization configurations > >> and UNIPHY instance configuration. > >> > >> Ther are 3 UNIPHYs(PCS) on the platform ipq9574, which register the > >> clock provider to output the clock for PPE port to work on the different > >> link speed. > >> > >> Signed-off-by: Luo Jie <quic_luoj@quicinc.com> > >> --- > >> arch/arm64/boot/dts/qcom/ipq9574.dtsi | 730 +++++++++++++++++++++++++- > >> 1 file changed, 724 insertions(+), 6 deletions(-) > >> > >> diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi > >> index 810cda4a850f..5fa241e27c8b 100644 > >> --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi > >> +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi > >> @@ -775,16 +775,734 @@ nsscc: nsscc@39b00000 { > >> <&bias_pll_nss_noc_clk>, > >> <&bias_pll_ubi_nc_clk>, > >> <&gcc_gpll0_out_aux>, > >> - <0>, > >> - <0>, > >> - <0>, > >> - <0>, > >> - <0>, > >> - <0>, > >> + <&uniphys 0>, > >> + <&uniphys 1>, > >> + <&uniphys 2>, > >> + <&uniphys 3>, > >> + <&uniphys 4>, > >> + <&uniphys 5>, > >> <&xo_board_clk>; > >> #clock-cells = <1>; > >> #reset-cells = <1>; > >> }; > >> + > >> + qcom_ppe: qcom-ppe@3a000000 { > > > > qcom is definitely not a generic name. > > > > Node names should be generic. See also an explanation and list of > > examples (not exhaustive) in DT specification: > > https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html#generic-names-recommendation > > Ok, will update to use a generic name in the link, Thanks for the > guidance and the link. > > > > > >> + compatible = "qcom,ipq9574-ppe"; > > > > I don't see this documented. I don't see reference to posted bindings. > > The DT bindings patch was part of the driver series as below. This > property was documented in the DT bindings patch. Attaching it to DTSI > series should make it more clear. If this is fine, I will update the > DTSI series with the DT bindings patch. > https://lore.kernel.org/netdev/20240110142428.52026d9e@kernel.org/ > > > > > Please run scripts/checkpatch.pl and fix reported warnings. Some > > warnings can be ignored, but the code here looks like it needs a fix. > > Feel free to get in touch if the warning is not clear. > > > > Ignoring this warning is a sign you don't really check your patches > > before sending. > > We have run the checkpatch.pl on the whole patch series including this > device tree patch set together with PPE driver patch set. > As mentioned above, I will add the DT bindings patch into the DTS > series. This should help with the checkpatch issue. This will cause even more confusion, as there will be two instances of the dt-bindings patch. One in the driver patchset, another one in the DT changes. You just have to specify the dependencies in the cover letter. Another option is to wait for the bindings + driver to be accepted, then send the DTSI changes (and again, specify the dependency). > > > > >> + reg = <0x3a000000 0xb00000>; > >> + #address-cells = <1>; > >> + #size-cells = <1>; > >> + ranges; > > > > Put after reg. > Ok. > > > > >> + status = "okay"; > > > > Drop > Ok. > > > > > All of above comments apply to your entire patchset and all places. > > > > Looking at code further, it does not look like suitable for mainline, > > but copy of downstream code. That's not what we expect upstream. Please > > go back to your bindings first. Also, I really insist you reaching out > > to other folks to help you in this process. > > > > Best regards, > > Krzysztof > > > We will do internal review of the gaps and update the patches as per > your comments. > > Thanks for the review comments. From the first glance, the bindings do not follow upstream principles. You have all the settings (tdm, port config, etc) in the DT, while they should instead go to the driver. Well, unless you expect that the board might need to override them.
On 1/12/2024 12:06 AM, Dmitry Baryshkov wrote: > On Thu, 11 Jan 2024 at 17:31, Jie Luo <quic_luoj@quicinc.com> wrote: >> >> >> >> >> Ok, will update to use a generic name in the link, Thanks for the >> guidance and the link. >>> >>> >>>> + compatible = "qcom,ipq9574-ppe"; >>> >>> I don't see this documented. I don't see reference to posted bindings. >> >> The DT bindings patch was part of the driver series as below. This >> property was documented in the DT bindings patch. Attaching it to DTSI >> series should make it more clear. If this is fine, I will update the >> DTSI series with the DT bindings patch. >> https://lore.kernel.org/netdev/20240110142428.52026d9e@kernel.org/ >> >>> >>> Please run scripts/checkpatch.pl and fix reported warnings. Some >>> warnings can be ignored, but the code here looks like it needs a fix. >>> Feel free to get in touch if the warning is not clear. >>> >>> Ignoring this warning is a sign you don't really check your patches >>> before sending. >> >> We have run the checkpatch.pl on the whole patch series including this >> device tree patch set together with PPE driver patch set. >> As mentioned above, I will add the DT bindings patch into the DTS >> series. This should help with the checkpatch issue. > > This will cause even more confusion, as there will be two instances of > the dt-bindings patch. One in the driver patchset, another one in the > DT changes. You just have to specify the dependencies in the cover > letter. Another option is to wait for the bindings + driver to be > accepted, then send the DTSI changes (and again, specify the > dependency). > Thanks Dmitry for the suggestions. As per the ongoing discussion on this series, we will hold off this DTS patch series for some time. We will update the cover letter of the DTSI series to point to the below driver series as a dependency, when we resume the series. https://lore.kernel.org/netdev/20240110154414.GH9296@kernel.org/ >> >>> >>>> + reg = <0x3a000000 0xb00000>; >>>> + #address-cells = <1>; >>>> + #size-cells = <1>; >>>> + ranges; >>> >>> Put after reg. >> Ok. >> >>> >>>> + status = "okay"; >>> >>> Drop >> Ok. >> >>> >>> All of above comments apply to your entire patchset and all places. >>> >>> Looking at code further, it does not look like suitable for mainline, >>> but copy of downstream code. That's not what we expect upstream. Please >>> go back to your bindings first. Also, I really insist you reaching out >>> to other folks to help you in this process. >>> >>> Best regards, >>> Krzysztof >>> >> We will do internal review of the gaps and update the patches as per >> your comments. >> >> Thanks for the review comments. > > From the first glance, the bindings do not follow upstream principles. > You have all the settings (tdm, port config, etc) in the DT, while > they should instead go to the driver. Well, unless you expect that the > board might need to override them. > Hi Dmitry, The TDM configuration varies per SoC type, since the ethernet port capabilities of the SoCs vary. So we will have two different TDM configurations for IPQ5332 and IPQ9574 SoC. The driver also will need to support future SoC, so we choose to configure this from the DTSI. The same reason applies to the port scheduler config as well. Thanks for review comments.
On 12/01/2024 15:40, Jie Luo wrote: >> >> From the first glance, the bindings do not follow upstream principles. >> You have all the settings (tdm, port config, etc) in the DT, while >> they should instead go to the driver. Well, unless you expect that the >> board might need to override them. >> > Hi Dmitry, > The TDM configuration varies per SoC type, since the ethernet port > capabilities of the SoCs vary. So we will have two different TDM > configurations for IPQ5332 and IPQ9574 SoC. The driver also will > need to support future SoC, so we choose to configure this from the > DTSI. The same reason applies to the port scheduler config as well. Your statements here confirm Dmitry suggestion, so these are not board specific and should go to the driver. Please read again Dmitry's sentences. Best regards, Krzysztof
On 12 January 2024 16:40:02 EET, Jie Luo <quic_luoj@quicinc.com> wrote: > > >On 1/12/2024 12:06 AM, Dmitry Baryshkov wrote: >> On Thu, 11 Jan 2024 at 17:31, Jie Luo <quic_luoj@quicinc.com> wrote: > >>> >>>> >>>>> + reg = <0x3a000000 0xb00000>; >>>>> + #address-cells = <1>; >>>>> + #size-cells = <1>; >>>>> + ranges; >>>> >>>> Put after reg. >>> Ok. >>> >>>> >>>>> + status = "okay"; >>>> >>>> Drop >>> Ok. >>> >>>> >>>> All of above comments apply to your entire patchset and all places. >>>> >>>> Looking at code further, it does not look like suitable for mainline, >>>> but copy of downstream code. That's not what we expect upstream. Please >>>> go back to your bindings first. Also, I really insist you reaching out >>>> to other folks to help you in this process. >>>> >>>> Best regards, >>>> Krzysztof >>>> >>> We will do internal review of the gaps and update the patches as per >>> your comments. >>> >>> Thanks for the review comments. >> >> From the first glance, the bindings do not follow upstream principles. >> You have all the settings (tdm, port config, etc) in the DT, while >> they should instead go to the driver. Well, unless you expect that the >> board might need to override them. >> >Hi Dmitry, >The TDM configuration varies per SoC type, since the ethernet port capabilities of the SoCs vary. So we will have two different TDM configurations for IPQ5332 and IPQ9574 SoC. The driver also will >need to support future SoC, so we choose to configure this from the DTSI. The same reason applies to the port scheduler config as well. If it differs from SoC to SoC only, it goes to the driver. Point. No other options. Thank you. > >Thanks for review comments.
On 1/12/2024 11:03 PM, Dmitry Baryshkov wrote: > On 12 January 2024 16:40:02 EET, Jie Luo <quic_luoj@quicinc.com> wrote: >> >> >> On 1/12/2024 12:06 AM, Dmitry Baryshkov wrote: >>> On Thu, 11 Jan 2024 at 17:31, Jie Luo <quic_luoj@quicinc.com> wrote: >> >>>> >>>>> >>>>>> + reg = <0x3a000000 0xb00000>; >>>>>> + #address-cells = <1>; >>>>>> + #size-cells = <1>; >>>>>> + ranges; >>>>> >>>>> Put after reg. >>>> Ok. >>>> >>>>> >>>>>> + status = "okay"; >>>>> >>>>> Drop >>>> Ok. >>>> >>>>> >>>>> All of above comments apply to your entire patchset and all places. >>>>> >>>>> Looking at code further, it does not look like suitable for mainline, >>>>> but copy of downstream code. That's not what we expect upstream. Please >>>>> go back to your bindings first. Also, I really insist you reaching out >>>>> to other folks to help you in this process. >>>>> >>>>> Best regards, >>>>> Krzysztof >>>>> >>>> We will do internal review of the gaps and update the patches as per >>>> your comments. >>>> >>>> Thanks for the review comments. >>> >>> From the first glance, the bindings do not follow upstream principles. >>> You have all the settings (tdm, port config, etc) in the DT, while >>> they should instead go to the driver. Well, unless you expect that the >>> board might need to override them. >>> >> Hi Dmitry, >> The TuratDM configion varies per SoC type, since the ethernet port capabilities of the SoCs vary. So we will have two different TDM configurations for IPQ5332 and IPQ9574 SoC. The driver also will >> need to support future SoC, so we choose to configure this from the DTSI. The same reason applies to the port scheduler config as well. > > If it differs from SoC to SoC only, it goes to the driver. Point. No other options. Thank you. Understand it, Thanks for the advise, will move it to the driver code. > >> >> Thanks for review comments. >
On 1/12/2024 10:51 PM, Krzysztof Kozlowski wrote: > On 12/01/2024 15:40, Jie Luo wrote: >>> >>> From the first glance, the bindings do not follow upstream principles. >>> You have all the settings (tdm, port config, etc) in the DT, while >>> they should instead go to the driver. Well, unless you expect that the >>> board might need to override them. >>> >> Hi Dmitry, >> The TDM configuration varies per SoC type, since the ethernet port >> capabilities of the SoCs vary. So we will have two different TDM >> configurations for IPQ5332 and IPQ9574 SoC. The driver also will >> need to support future SoC, so we choose to configure this from the >> DTSI. The same reason applies to the port scheduler config as well. > > Your statements here confirm Dmitry suggestion, so these are not board > specific and should go to the driver. Please read again Dmitry's sentences. > > Best regards, > Krzysztof > Sure, we will update the driver to configure the TDM depending on the SoC need.
diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi index 810cda4a850f..5fa241e27c8b 100644 --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi @@ -775,16 +775,734 @@ nsscc: nsscc@39b00000 { <&bias_pll_nss_noc_clk>, <&bias_pll_ubi_nc_clk>, <&gcc_gpll0_out_aux>, - <0>, - <0>, - <0>, - <0>, - <0>, - <0>, + <&uniphys 0>, + <&uniphys 1>, + <&uniphys 2>, + <&uniphys 3>, + <&uniphys 4>, + <&uniphys 5>, <&xo_board_clk>; #clock-cells = <1>; #reset-cells = <1>; }; + + qcom_ppe: qcom-ppe@3a000000 { + compatible = "qcom,ipq9574-ppe"; + reg = <0x3a000000 0xb00000>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + status = "okay"; + + clocks = <&gcc GCC_CMN_12GPLL_AHB_CLK>, + <&gcc GCC_CMN_12GPLL_SYS_CLK>, + <&gcc GCC_UNIPHY0_SYS_CLK>, + <&gcc GCC_UNIPHY1_SYS_CLK>, + <&gcc GCC_UNIPHY2_SYS_CLK>, + <&gcc GCC_UNIPHY0_AHB_CLK>, + <&gcc GCC_UNIPHY1_AHB_CLK>, + <&gcc GCC_UNIPHY2_AHB_CLK>, + <&gcc GCC_NSSCC_CLK>, + <&gcc GCC_NSSNOC_NSSCC_CLK>, + <&gcc GCC_NSSNOC_SNOC_CLK>, + <&gcc GCC_NSSNOC_SNOC_1_CLK>, + <&nsscc NSS_CC_PPE_SWITCH_CLK>, + <&nsscc NSS_CC_PPE_SWITCH_CFG_CLK>, + <&nsscc NSS_CC_NSSNOC_PPE_CLK>, + <&nsscc NSS_CC_NSSNOC_PPE_CFG_CLK>, + <&nsscc NSS_CC_PPE_EDMA_CLK>, + <&nsscc NSS_CC_PPE_EDMA_CFG_CLK>, + <&nsscc NSS_CC_PPE_SWITCH_IPE_CLK>, + <&nsscc NSS_CC_PPE_SWITCH_BTQ_CLK>, + <&nsscc NSS_CC_PORT1_MAC_CLK>, + <&nsscc NSS_CC_PORT2_MAC_CLK>, + <&nsscc NSS_CC_PORT3_MAC_CLK>, + <&nsscc NSS_CC_PORT4_MAC_CLK>, + <&nsscc NSS_CC_PORT5_MAC_CLK>, + <&nsscc NSS_CC_PORT6_MAC_CLK>, + <&nsscc NSS_CC_PORT1_RX_CLK>, + <&nsscc NSS_CC_PORT1_TX_CLK>, + <&nsscc NSS_CC_PORT2_RX_CLK>, + <&nsscc NSS_CC_PORT2_TX_CLK>, + <&nsscc NSS_CC_PORT3_RX_CLK>, + <&nsscc NSS_CC_PORT3_TX_CLK>, + <&nsscc NSS_CC_PORT4_RX_CLK>, + <&nsscc NSS_CC_PORT4_TX_CLK>, + <&nsscc NSS_CC_PORT5_RX_CLK>, + <&nsscc NSS_CC_PORT5_TX_CLK>, + <&nsscc NSS_CC_PORT6_RX_CLK>, + <&nsscc NSS_CC_PORT6_TX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT1_RX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT1_TX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT2_RX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT2_TX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT3_RX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT3_TX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT4_RX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT4_TX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT5_RX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT5_TX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT6_RX_CLK>, + <&nsscc NSS_CC_UNIPHY_PORT6_TX_CLK>, + <&nsscc NSS_CC_PORT5_RX_CLK_SRC>, + <&nsscc NSS_CC_PORT5_TX_CLK_SRC>; + clock-names = "cmn_ahb", + "cmn_sys", + "uniphy0_sys", + "uniphy1_sys", + "uniphy2_sys", + "uniphy0_ahb", + "uniphy1_ahb", + "uniphy2_ahb", + "gcc_nsscc", + "gcc_nssnoc_nsscc", + "gcc_nssnoc_snoc", + "gcc_nssnoc_snoc_1", + "nss_ppe", + "nss_ppe_cfg", + "nssnoc_ppe", + "nssnoc_ppe_cfg", + "nss_edma", + "nss_edma_cfg", + "nss_ppe_ipe", + "nss_ppe_btq", + "port1_mac", + "port2_mac", + "port3_mac", + "port4_mac", + "port5_mac", + "port6_mac", + "nss_port1_rx", + "nss_port1_tx", + "nss_port2_rx", + "nss_port2_tx", + "nss_port3_rx", + "nss_port3_tx", + "nss_port4_rx", + "nss_port4_tx", + "nss_port5_rx", + "nss_port5_tx", + "nss_port6_rx", + "nss_port6_tx", + "uniphy_port1_rx", + "uniphy_port1_tx", + "uniphy_port2_rx", + "uniphy_port2_tx", + "uniphy_port3_rx", + "uniphy_port3_tx", + "uniphy_port4_rx", + "uniphy_port4_tx", + "uniphy_port5_rx", + "uniphy_port5_tx", + "uniphy_port6_rx", + "uniphy_port6_tx", + "nss_port5_rx_clk_src", + "nss_port5_tx_clk_src"; + + resets = <&nsscc PPE_FULL_RESET>, + <&gcc GCC_UNIPHY0_SYS_RESET>, + <&gcc GCC_UNIPHY1_SYS_RESET>, + <&gcc GCC_UNIPHY2_SYS_RESET>, + <&gcc GCC_UNIPHY0_AHB_RESET>, + <&gcc GCC_UNIPHY1_AHB_RESET>, + <&gcc GCC_UNIPHY2_AHB_RESET>, + <&gcc GCC_UNIPHY0_XPCS_RESET>, + <&gcc GCC_UNIPHY1_XPCS_RESET>, + <&gcc GCC_UNIPHY2_XPCS_RESET>, + <&nsscc UNIPHY0_SOFT_RESET>, + <&nsscc UNIPHY_PORT5_ARES>, + <&nsscc UNIPHY_PORT6_ARES>, + <&nsscc UNIPHY_PORT1_ARES>, + <&nsscc UNIPHY_PORT2_ARES>, + <&nsscc UNIPHY_PORT3_ARES>, + <&nsscc UNIPHY_PORT4_ARES>, + <&nsscc NSSPORT1_RESET>, + <&nsscc NSSPORT2_RESET>, + <&nsscc NSSPORT3_RESET>, + <&nsscc NSSPORT4_RESET>, + <&nsscc NSSPORT5_RESET>, + <&nsscc NSSPORT6_RESET>, + <&nsscc PORT1_MAC_ARES>, + <&nsscc PORT2_MAC_ARES>, + <&nsscc PORT3_MAC_ARES>, + <&nsscc PORT4_MAC_ARES>, + <&nsscc PORT5_MAC_ARES>, + <&nsscc PORT6_MAC_ARES>; + reset-names = "ppe", + "uniphy0_sys", + "uniphy1_sys", + "uniphy2_sys", + "uniphy0_ahb", + "uniphy1_ahb", + "uniphy2_ahb", + "uniphy0_xpcs", + "uniphy1_xpcs", + "uniphy2_xpcs", + "uniphy0_soft", + "uniphy1_soft", + "uniphy2_soft", + "uniphy0_port1_dis", + "uniphy0_port2_dis", + "uniphy0_port3_dis", + "uniphy0_port4_dis", + "nss_port1", + "nss_port2", + "nss_port3", + "nss_port4", + "nss_port5", + "nss_port6", + "nss_port1_mac", + "nss_port2_mac", + "nss_port3_mac", + "nss_port4_mac", + "nss_port5_mac", + "nss_port6_mac"; + + uniphys: qcom-uniphy@7a00000 { + reg = <0x7a00000 0x10000>, + <0x7a10000 0x10000>, + <0x7a20000 0x10000>; + #clock-cells = <0x1>; + clock-output-names = "uniphy0_gcc_rx_clk", + "uniphy0_gcc_tx_clk", + "uniphy1_gcc_rx_clk", + "uniphy1_gcc_tx_clk", + "uniphy2_gcc_rx_clk", + "uniphy2_gcc_tx_clk"; + }; + + tdm-config { + /* + * qcom,tdm-bm-config = <valid egress port + * second_valid second_port>; + */ + qcom,tdm-bm-config = <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 1 0 0>, + <1 1 1 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 7 0 0>, + <1 1 7 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 1 0 0>, + <1 1 1 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 2 0 0>, + <1 1 2 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 1 0 0>, + <1 1 1 0 0>, + <1 0 3 0 0>, + <1 1 3 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 7 0 0>, + <1 1 7 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 1 0 0>, + <1 1 1 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 4 0 0>, + <1 1 4 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 1 0 0>, + <1 1 1 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 2 0 0>, + <1 1 2 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 7 0 0>, + <1 1 7 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 1 0 0>, + <1 1 1 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 3 0 0>, + <1 1 3 0 0>, + <1 0 1 0 0>, + <1 1 1 0 0>, + <1 0 0 0 0>, + <1 1 0 0 0>, + <1 0 5 0 0>, + <1 1 5 0 0>, + <1 0 6 0 0>, + <1 1 6 0 0>, + <1 0 4 0 0>, + <1 1 4 0 0>, + <1 0 7 0 0>, + <1 1 7 0 0>; + + /* + * qcom,tdm-port-scheduler-config = <ensch_bmp ensch_port + * desch_port desch_second_valid desch_second_port>; + */ + qcom,tdm-port-scheduler-config = <0x98 6 0 1 1>, + <0x94 5 6 1 3>, + <0x86 0 5 1 4>, + <0x8C 1 6 1 0>, + <0x1C 7 5 1 1>, + <0x98 2 6 1 0>, + <0x1C 5 7 1 1>, + <0x34 3 6 1 0>, + <0x8C 4 5 1 1>, + <0x98 2 6 1 0>, + <0x8C 5 4 1 1>, + <0xA8 0 6 1 2>, + <0x98 5 1 1 0>, + <0x98 6 5 1 2>, + <0x89 1 6 1 4>, + <0xA4 3 0 1 1>, + <0x8C 5 6 1 4>, + <0xA8 0 2 1 1>, + <0x98 6 5 1 0>, + <0xC4 4 3 1 1>, + <0x94 6 5 1 0>, + <0x1C 7 6 1 1>, + <0x98 2 5 1 0>, + <0x1C 6 7 1 1>, + <0x1C 5 6 1 0>, + <0x94 3 5 1 1>, + <0x8C 4 6 1 0>, + <0x94 1 5 1 3>, + <0x94 6 1 1 0>, + <0xD0 3 5 1 2>, + <0x98 6 0 1 1>, + <0x94 5 6 1 3>, + <0x94 1 5 1 0>, + <0x98 2 6 1 1>, + <0x8C 4 5 1 0>, + <0x1C 7 6 1 1>, + <0x8C 0 5 1 4>, + <0x89 1 6 1 2>, + <0x98 5 0 1 1>, + <0x94 6 5 1 3>, + <0x92 0 6 1 2>, + <0x98 1 5 1 0>, + <0x98 6 2 1 1>, + <0xD0 0 5 1 3>, + <0x94 6 0 1 1>, + <0x8C 5 6 1 4>, + <0x8C 1 5 1 0>, + <0x1C 6 7 1 1>, + <0x1C 5 6 1 0>, + <0xB0 2 3 1 1>, + <0xC4 4 5 1 0>, + <0x8C 6 4 1 1>, + <0xA4 3 6 1 0>, + <0x1C 5 7 1 1>, + <0x4C 0 5 1 4>, + <0x8C 6 0 1 1>, + <0x34 7 6 1 3>, + <0x94 5 0 1 1>, + <0x98 6 5 1 2>; + }; + + buffer-management-config { + /* qcom,group-config = <group group_buf>; */ + qcom,group-config = <0 1550>; + /* + * qcom,port-config = <group port prealloc react + * ceil weight res_off res_ceil dynamic>; + */ + qcom,port-config = <0 0 0 100 1146 7 8 0 1>, + <0 1 0 100 250 4 36 0 1>, + <0 2 0 100 250 4 36 0 1>, + <0 3 0 100 250 4 36 0 1>, + <0 4 0 100 250 4 36 0 1>, + <0 5 0 100 250 4 36 0 1>, + <0 6 0 100 250 4 36 0 1>, + <0 7 0 100 250 4 36 0 1>, + <0 8 0 128 250 4 36 0 1>, + <0 9 0 128 250 4 36 0 1>, + <0 10 0 128 250 4 36 0 1>, + <0 11 0 128 250 4 36 0 1>, + <0 12 0 128 250 4 36 0 1>, + <0 13 0 128 250 4 36 0 1>, + <0 14 0 40 250 4 36 0 1>; + }; + + queue-management-config { + /* + * qcom,group-config = <group total prealloc + * ceil resume_off>; + */ + qcom,group-config = <0 2000 0 0 0>; + /* + * qcom,queue-config = <queue_base queue_num + * group prealloc ceil weight resume_off dynamic>; + */ + qcom,queue-config = <0 256 0 0 400 4 36 1>, + <256 44 0 0 250 0 36 0>; + }; + + port-scheduler-resource { + port0 { + port-id = <0>; + qcom,ucast-queue = <0 63>; + qcom,mcast-queue = <256 263>; + qcom,l0sp = <0 0>; + qcom,l0cdrr = <0 7>; + qcom,l0edrr = <0 7>; + qcom,l1cdrr = <0 0>; + qcom,l1edrr = <0 0>; + }; + + port1 { + port-id = <1>; + qcom,ucast-queue = <204 211>; + qcom,mcast-queue = <272 275>; + qcom,l0sp = <51 52>; + qcom,l0cdrr = <108 115>; + qcom,l0edrr = <108 115>; + qcom,l1cdrr = <23 24>; + qcom,l1edrr = <23 24>; + }; + + port2 { + port-id = <2>; + qcom,ucast-queue = <212 219>; + qcom,mcast-queue = <276 279>; + qcom,l0sp = <53 54>; + qcom,l0cdrr = <116 123>; + qcom,l0edrr = <116 123>; + qcom,l1cdrr = <25 26>; + qcom,l1edrr = <25 26>; + }; + + port3 { + port-id = <3>; + qcom,ucast-queue = <220 227>; + qcom,mcast-queue = <280 283>; + qcom,l0sp = <55 56>; + qcom,l0cdrr = <124 131>; + qcom,l0edrr = <124 131>; + qcom,l1cdrr = <27 28>; + qcom,l1edrr = <27 28>; + }; + + port4 { + port-id = <4>; + qcom,ucast-queue = <228 235>; + qcom,mcast-queue = <284 287>; + qcom,l0sp = <57 58>; + qcom,l0cdrr = <132 139>; + qcom,l0edrr = <132 139>; + qcom,l1cdrr = <29 30>; + qcom,l1edrr = <29 30>; + }; + + port5 { + port-id = <5>; + qcom,ucast-queue = <236 243>; + qcom,mcast-queue = <288 291>; + qcom,l0sp = <59 60>; + qcom,l0cdrr = <140 147>; + qcom,l0edrr = <140 147>; + qcom,l1cdrr = <31 32>; + qcom,l1edrr = <31 32>; + }; + + port6 { + port-id = <6>; + qcom,ucast-queue = <244 251>; + qcom,mcast-queue = <292 295>; + qcom,l0sp = <61 62>; + qcom,l0cdrr = <148 155>; + qcom,l0edrr = <148 155>; + qcom,l1cdrr = <33 34>; + qcom,l1edrr = <33 34>; + }; + + port7 { + port-id = <7>; + qcom,ucast-queue = <252 255>; + qcom,mcast-queue = <296 299>; + qcom,l0sp = <63 63>; + qcom,l0cdrr = <156 159>; + qcom,l0edrr = <156 159>; + qcom,l1cdrr = <35 35>; + qcom,l1edrr = <35 35>; + }; + }; + + port-scheduler-config { + port0 { + port-id = <0>; + l1scheduler { + group0 { + /* flow ID from L0 SP */ + qcom,flow = <0>; + /* sp cpri cdrr epri edrr */ + qcom,scheduler-config = <0 0 0 0 0>; + }; + }; + + l0scheduler { + group0 { + /* unicast queue */ + qcom,ucast-queue = <0>; + qcom,ucast-loop-priority = <8>; + /* multicast queue */ + qcom,mcast-queue = <256>; + /* sp cpri cdrr epri edrr */ + qcom,scheduler-config = <0 0 0 0 0>; + }; + + group1 { + qcom,ucast-queue = <8>; + qcom,ucast-loop-priority = <8>; + qcom,mcast-queue = <257>; + qcom,scheduler-config = <0 0 0 0 0>; + }; + + group2 { + qcom,ucast-queue = <16>; + qcom,ucast-loop-priority = <8>; + qcom,mcast-queue = <258>; + qcom,scheduler-config = <0 0 0 0 0>; + }; + + group3 { + qcom,ucast-queue = <24>; + qcom,ucast-loop-priority = <8>; + qcom,mcast-queue = <259>; + qcom,scheduler-config = <0 0 0 0 0>; + }; + + group4 { + qcom,ucast-queue = <32>; + qcom,ucast-loop-priority = <8>; + qcom,mcast-queue = <260>; + qcom,scheduler-config = <0 0 0 0 0>; + }; + + group5 { + qcom,ucast-queue = <40>; + qcom,ucast-loop-priority = <8>; + qcom,mcast-queue = <261>; + qcom,scheduler-config = <0 0 0 0 0>; + }; + + group6 { + qcom,ucast-queue = <48>; + qcom,ucast-loop-priority = <8>; + qcom,mcast-queue = <262>; + qcom,scheduler-config = <0 0 0 0 0>; + }; + + group7 { + qcom,ucast-queue = <56>; + qcom,ucast-loop-priority = <8>; + qcom,mcast-queue = <263>; + qcom,scheduler-config = <0 0 0 0 0>; + }; + }; + }; + + port1 { + port-id = <1>; + l1scheduler { + group0 { + qcom,flow = <51>; + qcom,flow-loop-priority = <2>; + qcom,scheduler-config = <1 0 23 0 23>; + }; + }; + + l0scheduler { + group0 { + qcom,ucast-queue = <204>; + qcom,ucast-loop-priority = <8>; + /* max priority per SP */ + qcom,drr-max-priority = <4>; + qcom,mcast-queue = <272>; + qcom,mcast-loop-priority = <4>; + qcom,scheduler-config = <51 0 108 0 108>; + }; + }; + }; + + port2 { + port-id = <2>; + l1scheduler { + group0 { + qcom,flow = <53>; + qcom,flow-loop-priority = <2>; + qcom,scheduler-config = <2 0 25 0 25>; + }; + }; + + l0scheduler { + group0 { + qcom,ucast-queue = <212>; + qcom,ucast-loop-priority = <8>; + /* max priority per SP */ + qcom,drr-max-priority = <4>; + qcom,mcast-queue = <276>; + qcom,mcast-loop-priority = <4>; + qcom,scheduler-config = <53 0 116 0 116>; + }; + }; + }; + + port3 { + port-id = <3>; + l1scheduler { + group0 { + qcom,flow = <55>; + qcom,flow-loop-priority = <2>; + qcom,scheduler-config = <3 0 27 0 27>; + }; + }; + + l0scheduler { + group0 { + qcom,ucast-queue = <220>; + qcom,ucast-loop-priority = <8>; + /* max priority per SP */ + qcom,drr-max-priority = <4>; + qcom,mcast-queue = <280>; + qcom,mcast-loop-priority = <4>; + qcom,scheduler-config = <55 0 124 0 124>; + }; + }; + }; + + port4 { + port-id = <4>; + l1scheduler { + group0 { + qcom,flow = <57>; + qcom,flow-loop-priority = <2>; + qcom,scheduler-config = <4 0 29 0 29>; + }; + }; + + l0scheduler { + group0 { + qcom,ucast-queue = <228>; + qcom,ucast-loop-priority = <8>; + /* max priority per SP */ + qcom,drr-max-priority = <4>; + qcom,mcast-queue = <284>; + qcom,mcast-loop-priority = <4>; + qcom,scheduler-config = <57 0 132 0 132>; + }; + }; + }; + + port5 { + port-id = <5>; + l1scheduler { + group0 { + qcom,flow = <59>; + qcom,flow-loop-priority = <2>; + qcom,scheduler-config = <5 0 31 0 31>; + }; + }; + + l0scheduler { + group0 { + qcom,ucast-queue = <236>; + qcom,ucast-loop-priority = <8>; + /* max priority per SP */ + qcom,drr-max-priority = <4>; + qcom,mcast-queue = <288>; + qcom,mcast-loop-priority = <4>; + qcom,scheduler-config = <59 0 140 0 140>; + }; + }; + }; + + port6 { + port-id = <6>; + l1scheduler { + group0 { + qcom,flow = <61>; + qcom,flow-loop-priority = <2>; + qcom,scheduler-config = <6 0 33 0 33>; + }; + }; + + l0scheduler { + group0 { + qcom,ucast-queue = <244>; + qcom,ucast-loop-priority = <8>; + /* max priority per SP */ + qcom,drr-max-priority = <4>; + qcom,mcast-queue = <292>; + qcom,mcast-loop-priority = <4>; + qcom,scheduler-config = <61 0 148 0 148>; + }; + }; + }; + + port7 { + port-id = <7>; + l1scheduler { + group0 { + qcom,flow = <63>; + qcom,scheduler-config = <7 0 35 0 35>; + }; + }; + + l0scheduler { + group0 { + qcom,ucast-queue = <252>; + qcom,ucast-loop-priority = <4>; + qcom,mcast-queue = <296>; + qcom,mcast-loop-priority = <4>; + qcom,scheduler-config = <63 0 156 0 156>; + }; + }; + }; + }; + }; }; thermal-zones {
The PPE device tree node includes the PPE initialization configurations and UNIPHY instance configuration. Ther are 3 UNIPHYs(PCS) on the platform ipq9574, which register the clock provider to output the clock for PPE port to work on the different link speed. Signed-off-by: Luo Jie <quic_luoj@quicinc.com> --- arch/arm64/boot/dts/qcom/ipq9574.dtsi | 730 +++++++++++++++++++++++++- 1 file changed, 724 insertions(+), 6 deletions(-)