| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 14 Mar 2023 16:42:18 -0500
From: Andrew Davis <afd@...com>
To: Siddharth Vadapalli <s-vadapalli@...com>, <nm@...com>,
<vigneshr@...com>, <kristo@...nel.org>, <robh+dt@...nel.org>,
<krzysztof.kozlowski@...aro.org>,
<krzysztof.kozlowski+dt@...aro.org>
CC: <devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <srk@...com>
Subject: Re: [PATCH v2 2/2] arm64: dts: ti: k3-j721e: Add overlay to enable
CPSW9G ports in QSGMII mode
On 3/10/23 4:35 AM, Siddharth Vadapalli wrote:
> The J7 Quad Port Add-On Ethernet Card for J721E Common-Proc-Board supports
> QSGMII mode. Use the overlay to configure CPSW9G ports in QSGMII mode.
>
> Add support to reset the PHY from kernel by using gpio-hog and gpio-reset.
>
> Add aliases for CPSW9G ports to enable kernel to fetch MAC addresses
> directly from U-Boot.
>
> Signed-off-by: Siddharth Vadapalli <s-vadapalli@...com>
> ---
> arch/arm64/boot/dts/ti/Makefile | 4 +
> .../dts/ti/k3-j721e-quad-port-eth-exp.dtso | 148 ++++++++++++++++++
> 2 files changed, 152 insertions(+)
> create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-quad-port-eth-exp.dtso
>
> diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
> index 6acd12409d59..167bcd9b09b7 100644
> --- a/arch/arm64/boot/dts/ti/Makefile
> +++ b/arch/arm64/boot/dts/ti/Makefile
> @@ -45,3 +45,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm.dtb
>
> # Enable support for device-tree overlays
> DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@
> +DTC_FLAGS_k3-j721e-common-proc-board += -@
> +
> +# Device-tree overlays
> +dtb-$(CONFIG_ARCH_K3) += k3-j721e-quad-port-eth-exp.dtbo
I'd recommend this; since the EVM as sold comes with the quad port
expansion, let's call that the J721e "EVM". That will allow us to
keep it separate from the Beagle and SK boards. Since this overlay
applies only to the EVM it should named like this:
k3-j721e-evm-quad-port-eth-exp.dtbo
and then when it is applied to the common-proc-board then the result
is called:
k3-j721e-evm.dtb
This way you can take the EVM and run it with that DTB or take the
base board DTB and apply different overlays (there are the GESI and
the Infotainment overlays next). So the full change to this Makefile
in this patch should be this:
--- a/arch/arm64/boot/dts/ti/Makefile
+++ b/arch/arm64/boot/dts/ti/Makefile
@@ -31,8 +31,9 @@ dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb
dtb-$(CONFIG_ARCH_K3) += k3-j7200-common-proc-board.dtb
# Boards with J721e SoC
+k3-j721e-evm-dtbs := k3-j721e-common-proc-board.dtb k3-j721e-evm-quad-port-eth-exp.dtbo
dtb-$(CONFIG_ARCH_K3) += k3-j721e-beagleboneai64.dtb
-dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb
+dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm.dtb
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
Notice we do not need to do that " += -@" stuff either, since
an overlay is applied to make the k3-j721e-evm.dtb, the base DT,
k3-j721e-common-proc-board.dtb
is given symbols automatically.
Yet another benefit is this causes the build to test applying the
overlay and warn us of any missing symbols.
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-quad-port-eth-exp.dtso b/arch/arm64/boot/dts/ti/k3-j721e-quad-port-eth-exp.dtso
> new file mode 100644
> index 000000000000..d7977d16c921
> --- /dev/null
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-quad-port-eth-exp.dtso
> @@ -0,0 +1,148 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/**
> + * DT Overlay for CPSW9G in QSGMII mode using J7 Quad Port ETH EXP Add-On Ethernet Card with
> + * J721E board.
> + *
> + * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
> + */
> +
> +/dts-v1/;
> +/plugin/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/mux/ti-serdes.h>
> +#include <dt-bindings/pinctrl/k3.h>
> +#include <dt-bindings/phy/phy.h>
> +#include <dt-bindings/phy/phy-cadence.h>
> +
> +/ {
> + fragment@102 {
> + target-path = "/";
This is the old style for fragments, just use
&{/} {
aliases {
> + __overlay__ {
> + aliases {
> + ethernet1 = "/bus@...000/ethernet@...0000/ethernet-ports/port@1";
> + ethernet2 = "/bus@...000/ethernet@...0000/ethernet-ports/port@2";
> + ethernet3 = "/bus@...000/ethernet@...0000/ethernet-ports/port@3";
> + ethernet4 = "/bus@...000/ethernet@...0000/ethernet-ports/port@4";
> + };
> + };
> + };
> +};
> +
> +&cpsw0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&mdio0_pins_default>;
The MDIO pinmux belongs in the mdio node. Then since it doesn't need
any extra info here, leave this node enabled in the base dtbs.
> +};
> +
> +&cpsw0_port1 {
> + phy-handle = <&cpsw9g_phy0>;
> + phy-mode = "qsgmii";
> + mac-address = [00 00 00 00 00 00];
> + phys = <&cpsw0_phy_gmii_sel 1>;
> +};
> +
> +&cpsw0_port2 {
> + phy-handle = <&cpsw9g_phy1>;
> + phy-mode = "qsgmii";
> + mac-address = [00 00 00 00 00 00];
> + phys = <&cpsw0_phy_gmii_sel 2>;
> +};
> +
> +&cpsw0_port3 {
> + phy-handle = <&cpsw9g_phy2>;
> + phy-mode = "qsgmii";
> + mac-address = [00 00 00 00 00 00];
> + phys = <&cpsw0_phy_gmii_sel 3>;
> +};
> +
> +&cpsw0_port4 {
> + phy-handle = <&cpsw9g_phy3>;
> + phy-mode = "qsgmii";
> + mac-address = [00 00 00 00 00 00];
> + phys = <&cpsw0_phy_gmii_sel 4>;
> +};
> +
> +&cpsw0_port5 {
> + status = "disabled";
Since these need phy handles to function, disable them in the base
dtb and only enable the ones connected in this overlay.
Andrew
> +};
> +
> +&cpsw0_port6 {
> + status = "disabled";
> +};
> +
> +&cpsw0_port7 {
> + status = "disabled";
> +};
> +
> +&cpsw0_port8 {
> + status = "disabled";
> +};
> +
> +&cpsw9g_mdio {
> + reset-gpios = <&exp2 17 GPIO_ACTIVE_LOW>;
> + reset-post-delay-us = <120000>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + cpsw9g_phy0: ethernet-phy@17 {
> + reg = <17>;
> + };
> + cpsw9g_phy1: ethernet-phy@16 {
> + reg = <16>;
> + };
> + cpsw9g_phy2: ethernet-phy@18 {
> + reg = <18>;
> + };
> + cpsw9g_phy3: ethernet-phy@19 {
> + reg = <19>;
> + };
> +};
> +
> +&exp2 {
> + qsgmii-line-hog {
> + gpio-hog;
> + gpios = <16 GPIO_ACTIVE_HIGH>;
> + output-low;
> + line-name = "qsgmii-pwrdn-line";
> + };
> +};
> +
> +&main_pmx0 {
> + mdio0_pins_default: mdio0-pins-default {
> + pinctrl-single,pins = <
> + J721E_IOPAD(0x1bc, PIN_OUTPUT, 0) /* (V24) MDIO0_MDC */
> + J721E_IOPAD(0x1b8, PIN_INPUT, 0) /* (V26) MDIO0_MDIO */
> + >;
> + };
> +};
> +
> +&serdes_ln_ctrl {
> + idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_QSGMII_LANE2>,
> + <J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,
> + <J721E_SERDES2_LANE0_PCIE2_LANE0>, <J721E_SERDES2_LANE1_PCIE2_LANE1>,
> + <J721E_SERDES3_LANE0_USB3_0_SWAP>, <J721E_SERDES3_LANE1_USB3_0>,
> + <J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,
> + <J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;
> +};
> +
> +&serdes_wiz0 {
> + status = "okay";
> +};
> +
> +&serdes0 {
> + status = "okay";
> +
> + assigned-clocks = <&serdes0 CDNS_SIERRA_PLL_CMNLC>, <&serdes0 CDNS_SIERRA_PLL_CMNLC1>;
> + assigned-clock-parents = <&wiz0_pll1_refclk>, <&wiz0_pll1_refclk>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + serdes0_qsgmii_link: phy@1 {
> + reg = <1>;
> + cdns,num-lanes = <1>;
> + #phy-cells = <0>;
> + cdns,phy-type = <PHY_TYPE_QSGMII>;
> + resets = <&serdes_wiz0 2>;
> + };
> +};
Powered by blists - more mailing lists