Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 12:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: gem: Remove undocumented is-internal-pcspma dt flag

Browse source 
Generic understanding/consideration is that phy-mode as sgmi means that the
internal PCS(Physical Coding Sublayer) should be enabled by default.
Xilinx GEM implementation allows configuration GEM (gmii mode) + PL PCS PMA
(sgmii mode, Physical Medum Attachment) but in this case phy-mode should be
setup as gmii.
The reason for this assumption is that phy-mode should be described based
on GEM configuration not based on mode coming out of PHY.

Also Linux kernel automatically setting up PCSSEL bit when phy mode is
sgmii without a need to specified additional DT propety.
All our DTSes with sgmii phy mode have this flag enabled that's why there
is no need/reason to just duplicate information.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/2ecdbcc4ce692e2f8b3e7054a2abab35f6c03a69.1726213052.git.michal.simek@amd.com
This commit is contained in:
Michal Simek 2024-09-13 09:37:38 +02:00
parent 067e029480
commit 6161eaf057
9 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/dts/zynqmp-dlc21-revA.dts
View file

@ -87,7 +87,6 @@
status = "okay"; status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; /* DTG generates this properly 1512 */ phy-mode = "sgmii"; /* DTG generates this properly 1512 */
is-internal-pcspma;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

1
arch/arm/dts/zynqmp-e-a2197-00-revA.dts
View file

@ -155,7 +155,6 @@
phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; phy-mode = "sgmii";
is-internal-pcspma;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

1
arch/arm/dts/zynqmp-g-a2197-00-revA.dts
View file

@ -80,7 +80,6 @@
status = "okay"; status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; phy-mode = "sgmii";
is-internal-pcspma;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

1
arch/arm/dts/zynqmp-p-a2197-00-revA.dts
View file

@ -90,7 +90,6 @@
status = "okay"; status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; /* DTG generates this properly 1512 */ phy-mode = "sgmii"; /* DTG generates this properly 1512 */
is-internal-pcspma;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

1
arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
View file

@ -195,7 +195,6 @@
phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; phy-mode = "sgmii";
is-internal-pcspma;
assigned-clock-rates = <250000000>; assigned-clock-rates = <250000000>;
}; };

1
arch/arm/dts/zynqmp-sck-kr-g-revB.dtso
View file

@ -216,7 +216,6 @@
phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; phy-mode = "sgmii";
is-internal-pcspma;
assigned-clock-rates = <250000000>; assigned-clock-rates = <250000000>;
}; };

1
arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts
View file

@ -117,7 +117,6 @@
status = "okay"; status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; /* DTG generates this properly 1512 */ phy-mode = "sgmii"; /* DTG generates this properly 1512 */
is-internal-pcspma;
/* phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; */ /* phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; */
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;

1
arch/arm/dts/zynqmp-vpk120-revA.dts
View file

@ -118,7 +118,6 @@
status = "okay"; status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "sgmii"; /* DTG generates this properly 1512 */ phy-mode = "sgmii"; /* DTG generates this properly 1512 */
is-internal-pcspma;
/* phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; */ /* phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; */
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;

9
drivers/net/zynq_gem.c
View file

@ -228,7 +228,6 @@ struct zynq_gem_priv {
struct clk tx_clk; struct clk tx_clk;
struct clk pclk; struct clk pclk;
u32 max_speed; u32 max_speed;
bool int_pcs;
bool dma_64bit; bool dma_64bit;
u32 clk_en_info; u32 clk_en_info;
struct reset_ctl_bulk resets; struct reset_ctl_bulk resets;
@ -504,8 +503,7 @@ static int zynq_gem_init(struct udevice *dev)
* Set SGMII enable PCS selection only if internal PCS/PMA * Set SGMII enable PCS selection only if internal PCS/PMA
* core is used and interface is SGMII. * core is used and interface is SGMII.
*/ */
if (priv->interface == PHY_INTERFACE_MODE_SGMII && if (priv->interface == PHY_INTERFACE_MODE_SGMII) {
priv->int_pcs) {
nwconfig |= ZYNQ_GEM_NWCFG_SGMII_ENBL | nwconfig |= ZYNQ_GEM_NWCFG_SGMII_ENBL |
ZYNQ_GEM_NWCFG_PCS_SEL; ZYNQ_GEM_NWCFG_PCS_SEL;
} }
@ -529,8 +527,7 @@ static int zynq_gem_init(struct udevice *dev)
writel(nwcfg, &regs->nwcfg); writel(nwcfg, &regs->nwcfg);
#ifdef CONFIG_ARM64 #ifdef CONFIG_ARM64
if (priv->interface == PHY_INTERFACE_MODE_SGMII && if (priv->interface == PHY_INTERFACE_MODE_SGMII) {
priv->int_pcs) {
/* /*
* Disable AN for fixed link configuration, enable otherwise. * Disable AN for fixed link configuration, enable otherwise.
* Must be written after PCS_SEL is set in nwconfig, * Must be written after PCS_SEL is set in nwconfig,
@ -992,8 +989,6 @@ static int zynq_gem_of_to_plat(struct udevice *dev)
return -EINVAL; return -EINVAL;
priv->interface = pdata->phy_interface; priv->interface = pdata->phy_interface;
priv->int_pcs = dev_read_bool(dev, "is-internal-pcspma");
priv->clk_en_info = dev_get_driver_data(dev); priv->clk_en_info = dev_get_driver_data(dev);
return 0; return 0;