phy: xilinx: zynqmp: Fix bus width setting for SGMII
PATCH 1/1 phy: xilinx: zynqmp: Fix bus width setting for SGMII
TX_PROT_BUS_WIDTH and RX_PROT_BUS_WIDTH are single registers with separate bit fields for each lane. The code in xpsgtr_phy_init_sgmii was not preserving the existing register value for other lanes, so enabling the PHY in SGMII mode on one lane zeroed out the settings for all other lanes, causing other PS-GTR peripherals such as USB3 to malfunction.
Use xpsgtr_clr_set to only manipulate the desired bits in the register.
--- drivers/phy/xilinx/phy-zynqmp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/phy/xilinx/phy-zynqmp.c +6 -5
@@ -134,7 +134,8 @@#define PROT_BUS_WIDTH_10 0x0#define PROT_BUS_WIDTH_20 0x1#define PROT_BUS_WIDTH_40 0x2 -#define PROT_BUS_WIDTH_SHIFT 2 +#define PROT_BUS_WIDTH_SHIFT (n) ((n) * 2) +#define PROT_BUS_WIDTH_MASK (n) GENMASK((n) * 2 + 1, (n) * 2)/* Number of GT lanes */ #define NUM_LANES 4
@@ -445,12 +446,12 @@ static void xpsgtr_phy_init_sata(struct xpsgtr_phy *gtr_phy)static void xpsgtr_phy_init_sgmii (struct xpsgtr_phy *gtr_phy) {struct xpsgtr_dev *gtr_dev = gtr_phy->dev; +u32 mask =PROT_BUS_WIDTH_MASK (gtr_phy->lane); +u32 val =PROT_BUS_WIDTH_10 <<PROT_BUS_WIDTH_SHIFT (gtr_phy->lane);/* Set SGMII protocol TX and RX bus width to 10 bits. */ -xpsgtr_write (gtr_dev,TX_PROT_BUS_WIDTH , -PROT_BUS_WIDTH_10 << (gtr_phy->lane *PROT_BUS_WIDTH_SHIFT )); -xpsgtr_write (gtr_dev,RX_PROT_BUS_WIDTH , -PROT_BUS_WIDTH_10 << (gtr_phy->lane *PROT_BUS_WIDTH_SHIFT )); +xpsgtr_clr_set (gtr_dev,TX_PROT_BUS_WIDTH , mask, val); +xpsgtr_clr_set (gtr_dev,RX_PROT_BUS_WIDTH , mask, val);xpsgtr_bypass_scrambler_8b10b (gtr_phy); }
Signature · 7 lines
2.31.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Hi Robert,
Thank you for the patch.
Quoted 10 lines · Robert Hancock
TX_PROT_BUS_WIDTHandRX_PROT_BUS_WIDTHare single registers with separate bit fields for each lane. The code inxpsgtr_phy_init_sgmiiwas not preserving the existing register value for other lanes, so enabling the PHY in SGMII mode on one lane zeroed out the settings for all other lanes, causing other PS-GTR peripherals such as USB3 to malfunction.Use
xpsgtr_clr_setto only manipulate the desired bits in the register.Fixes 4a33bea00314 ("phy: zynqmp: Add PHY driver for the Xilinx ZynqMP Gigabit Transceiver")Signed-off-by Robert Hancock <[email protected]>
Quoted 35 lines
--- drivers/phy/xilinx/phy-zynqmp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/phy/xilinx/phy-zynqmp.c +6
-5@@ -134,7 +134,8 @@#define PROT_BUS_WIDTH_10 0x0#define PROT_BUS_WIDTH_20 0x1#define PROT_BUS_WIDTH_40 0x2 -#define PROT_BUS_WIDTH_SHIFT 2 +#define PROT_BUS_WIDTH_SHIFT (n) ((n) * 2) +#define PROT_BUS_WIDTH_MASK (n) GENMASK((n) * 2 + 1, (n) * 2)/* Number of GT lanes */ #define NUM_LANES 4@@ -445,12 +446,12 @@ static void xpsgtr_phy_init_sata(struct xpsgtr_phy *gtr_phy)static void xpsgtr_phy_init_sgmii (struct xpsgtr_phy *gtr_phy) {struct xpsgtr_dev *gtr_dev = gtr_phy->dev; +u32 mask =PROT_BUS_WIDTH_MASK (gtr_phy->lane); +u32 val =PROT_BUS_WIDTH_10 <<PROT_BUS_WIDTH_SHIFT (gtr_phy->lane);/* Set SGMII protocol TX and RX bus width to 10 bits. */ -xpsgtr_write (gtr_dev,TX_PROT_BUS_WIDTH , -PROT_BUS_WIDTH_10 << (gtr_phy->lane *PROT_BUS_WIDTH_SHIFT )); -xpsgtr_write (gtr_dev,RX_PROT_BUS_WIDTH , -PROT_BUS_WIDTH_10 << (gtr_phy->lane *PROT_BUS_WIDTH_SHIFT )); +xpsgtr_clr_set (gtr_dev,TX_PROT_BUS_WIDTH , mask, val); +xpsgtr_clr_set (gtr_dev,RX_PROT_BUS_WIDTH , mask, val);xpsgtr_bypass_scrambler_8b10b (gtr_phy); }
Signature · 8 lines
Regards, Laurent Pinchart -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Quoted 35 lines · Robert Hancock
TX_PROT_BUS_WIDTHandRX_PROT_BUS_WIDTHare single registers with separate bit fields for each lane. The code inxpsgtr_phy_init_sgmiiwas not preserving the existing register value for other lanes, so enabling the PHY in SGMII mode on one lane zeroed out the settings for all other lanes, causing other PS-GTR peripherals such as USB3 to malfunction.Use
xpsgtr_clr_setto only manipulate the desired bits in the register.Fixes 4a33bea00314 ("phy: zynqmp: Add PHY driver for the Xilinx ZynqMP Gigabit Transceiver")Signed-off-by Robert Hancock <[email protected]>--- drivers/phy/xilinx/phy-zynqmp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/phy/xilinx/phy-zynqmp.c +4
-1@@ -134,7 +134,8 @@#define PROT_BUS_WIDTH_10 0x0#define PROT_BUS_WIDTH_20 0x1#define PROT_BUS_WIDTH_40 0x2 -#define PROT_BUS_WIDTH_SHIFT 2 +#define PROT_BUS_WIDTH_SHIFT (n) ((n) * 2) +#define PROT_BUS_WIDTH_MASK (n) GENMASK((n) * 2 + 1, (n) * 2)/* Number of GT lanes */ #define NUM_LANES 4@@ -445,12 +446,12 @@ static void xpsgtr_phy_init_sata(struct xpsgtr_phy *gtr_phy)static void xpsgtr_phy_init_sgmii (struct xpsgtr_phy *gtr_phy) {struct xpsgtr_dev *gtr_dev = gtr_phy->dev; +u32 mask =PROT_BUS_WIDTH_MASK (gtr_phy->lane); +u32 val =PROT_BUS_WIDTH_10 <<PROT_BUS_WIDTH_SHIFT (gtr_phy->lane);
drivers/phy/xilinx/phy-zynqmp.c static void xpsgtr_phy_init_sata(struct xpsgtr_phy *gtr_phy) · line 457
Quoted 10 lines
drivers/phy/xilinx/phy-zynqmp.c +2
-4/* Set SGMII protocol TX and RX bus width to 10 bits. */ -xpsgtr_write (gtr_dev,TX_PROT_BUS_WIDTH , -PROT_BUS_WIDTH_10 << (gtr_phy->lane *PROT_BUS_WIDTH_SHIFT )); -xpsgtr_write (gtr_dev,RX_PROT_BUS_WIDTH , -PROT_BUS_WIDTH_10 << (gtr_phy->lane *PROT_BUS_WIDTH_SHIFT )); +xpsgtr_clr_set (gtr_dev,TX_PROT_BUS_WIDTH , mask, val); +xpsgtr_clr_set (gtr_dev,RX_PROT_BUS_WIDTH , mask, val);xpsgtr_bypass_scrambler_8b10b (gtr_phy); }
I have found this issue while I was developing u-boot driver for the same.
Thanks,
Michal
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Quoted 7 lines · Robert Hancock
TX_PROT_BUS_WIDTHandRX_PROT_BUS_WIDTHare single registers with separate bit fields for each lane. The code inxpsgtr_phy_init_sgmiiwas not preserving the existing register value for other lanes, so enabling the PHY in SGMII mode on one lane zeroed out the settings for all other lanes, causing other PS-GTR peripherals such as USB3 to malfunction.Use
xpsgtr_clr_setto only manipulate the desired bits in the register.
Applied, thanks
Signature · 6 lines
~Vinod -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy