Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

realtek: 5.15: rtl93xx: add 1000Base-X and 10GBase-CR support on SerDes

Browse source 
This patch adds support for 1000Base-X and 10GBase-CR directly on the
SerDes lanes of rtl93xx SoCs.
This fixes SFP/SFP+ support on devices like the XSG1250-12.

Signed-off-by: Tobias Schramm <tobias@t-sys.eu>
This commit is contained in:
Tobias Schramm 2024-02-04 16:28:07 +01:00 committed by Sander Vanheule
parent 9fe2412e62
commit 9daf4dff6b
3 changed files with 101 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/dsa.c
View file

@ -811,8 +811,10 @@ static void rtl93xx_phylink_mac_config(struct dsa_switch *ds, int port,
sds_num = priv->ports[port].sds_num; sds_num = priv->ports[port].sds_num;
pr_info("%s SDS is %d\n", __func__, sds_num); pr_info("%s SDS is %d\n", __func__, sds_num);
if (sds_num >= 0 && state->interface == PHY_INTERFACE_MODE_10GBASER) if (sds_num >= 0 &&
rtl9300_serdes_setup(sds_num, state->interface); (state->interface == PHY_INTERFACE_MODE_1000BASEX ||
state->interface == PHY_INTERFACE_MODE_10GBASER))
rtl9300_serdes_setup(port, sds_num, state->interface);
reg = sw_r32(priv->r->mac_force_mode_ctrl(port)); reg = sw_r32(priv->r->mac_force_mode_ctrl(port));
reg &= ~(0xf << 3); reg &= ~(0xf << 3);

2
target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/rtl83xx.h
View file

@ -121,7 +121,7 @@ irqreturn_t rtl839x_switch_irq(int irq, void *dev_id);
void rtl930x_vlan_profile_dump(int index); void rtl930x_vlan_profile_dump(int index);
int rtl9300_sds_power(int mac, int val); int rtl9300_sds_power(int mac, int val);
void rtl9300_sds_rst(int sds_num, u32 mode); void rtl9300_sds_rst(int sds_num, u32 mode);
int rtl9300_serdes_setup(int sds_num, phy_interface_t phy_mode); int rtl9300_serdes_setup(int port, int sds_num, phy_interface_t phy_mode);
void rtl930x_print_matrix(void); void rtl930x_print_matrix(void);
/* RTL931x-specific */ /* RTL931x-specific */

232
target/linux/realtek/files-5.15/drivers/net/phy/rtl83xx-phy.c
View file

@ -1646,6 +1646,8 @@ static int rtl9300_read_status(struct phy_device *phydev)
mode = rtl9300_sds_mode_get(sds_num); mode = rtl9300_sds_mode_get(sds_num);
pr_info("%s got SDS mode %02x\n", __func__, mode); pr_info("%s got SDS mode %02x\n", __func__, mode);
if (mode == RTL930X_SDS_OFF)
mode = rtl9300_sds_field_r(sds_num, 0x1f, 9, 11, 7);
if (mode == RTL930X_SDS_MODE_10GBASER) { /* 10GR mode */ if (mode == RTL930X_SDS_MODE_10GBASER) { /* 10GR mode */
status = rtl9300_sds_field_r(sds_num, 0x5, 0, 12, 12); status = rtl9300_sds_field_r(sds_num, 0x5, 0, 12, 12);
latch_status = rtl9300_sds_field_r(sds_num, 0x4, 1, 2, 2); latch_status = rtl9300_sds_field_r(sds_num, 0x4, 1, 2, 2);
@ -1662,10 +1664,13 @@ static int rtl9300_read_status(struct phy_device *phydev)
if (latch_status) { if (latch_status) {
phydev->link = true; phydev->link = true;
if (mode == RTL930X_SDS_MODE_10GBASER) if (mode == RTL930X_SDS_MODE_10GBASER) {
phydev->speed = SPEED_10000; phydev->speed = SPEED_10000;
else phydev->interface = PHY_INTERFACE_MODE_10GBASER;
} else {
phydev->speed = SPEED_1000; phydev->speed = SPEED_1000;
phydev->interface = PHY_INTERFACE_MODE_1000BASEX;
}
phydev->duplex = DUPLEX_FULL; phydev->duplex = DUPLEX_FULL;
} }
@ -1861,13 +1866,26 @@ void rtl9300_sds_tx_config(int sds, phy_interface_t phy_if)
switch(phy_if) { switch(phy_if) {
case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_1000BASEX:
pre_amp = 0x1;
main_amp = 0x9;
post_amp = 0x1;
page = 0x25; page = 0x25;
break; break;
case PHY_INTERFACE_MODE_HSGMII: case PHY_INTERFACE_MODE_HSGMII:
case PHY_INTERFACE_MODE_2500BASEX: case PHY_INTERFACE_MODE_2500BASEX:
pre_amp = 0;
post_amp = 0x8;
pre_en = 0;
page = 0x29; page = 0x29;
break; break;
case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_10GBASER:
case PHY_INTERFACE_MODE_USXGMII:
case PHY_INTERFACE_MODE_XGMII:
pre_en = 0;
pre_amp = 0;
main_amp = 0x10;
post_amp = 0;
post_en = 0;
page = 0x2f; page = 0x2f;
break; break;
default: default:
@ -2713,6 +2731,7 @@ u32 rtl9300_sds_sym_err_get(int sds_num, phy_interface_t phy_mode)
case PHY_INTERFACE_MODE_XGMII: case PHY_INTERFACE_MODE_XGMII:
break; break;
case PHY_INTERFACE_MODE_1000BASEX:
case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_10GBASER:
v = rtl930x_read_sds_phy(sds_num, 5, 1); v = rtl930x_read_sds_phy(sds_num, 5, 1);
return v & 0xff; return v & 0xff;
@ -2737,6 +2756,7 @@ int rtl9300_sds_check_calibration(int sds_num, phy_interface_t phy_mode)
errors2 = rtl9300_sds_sym_err_get(sds_num, phy_mode); errors2 = rtl9300_sds_sym_err_get(sds_num, phy_mode);
switch (phy_mode) { switch (phy_mode) {
case PHY_INTERFACE_MODE_1000BASEX:
case PHY_INTERFACE_MODE_XGMII: case PHY_INTERFACE_MODE_XGMII:
if ((errors2 - errors1 > 100) || if ((errors2 - errors1 > 100) ||
(errors1 >= 0xffff00) || (errors2 >= 0xffff00)) { (errors1 >= 0xffff00) || (errors2 >= 0xffff00)) {
@ -2783,53 +2803,83 @@ void rtl9300_phy_enable_10g_1g(int sds_num)
pr_info("%s set medium after: %08x\n", __func__, v); pr_info("%s set medium after: %08x\n", __func__, v);
} }
static int rtl9300_sds_10g_idle(int sds_num);
static void rtl9300_serdes_patch(int sds_num);
#define RTL930X_MAC_FORCE_MODE_CTRL (0xCA1C) #define RTL930X_MAC_FORCE_MODE_CTRL (0xCA1C)
/* phy_mode = PHY_INTERFACE_MODE_10GBASER, sds_mode = 0x1a */ int rtl9300_serdes_setup(int port, int sds_num, phy_interface_t phy_mode)
int rtl9300_serdes_setup(int sds_num, phy_interface_t phy_mode)
{ {
int sds_mode;
int calib_tries = 0; int calib_tries = 0;
switch (phy_mode) { /* Turn Off Serdes */
case PHY_INTERFACE_MODE_HSGMII: rtl9300_sds_rst(sds_num, RTL930X_SDS_OFF);
sds_mode = RTL930X_SDS_MODE_HSGMII;
break; /* Apply serdes patches */
case PHY_INTERFACE_MODE_1000BASEX: rtl9300_serdes_patch(sds_num);
sds_mode = RTL930X_SDS_MODE_1000BASEX;
break;
case PHY_INTERFACE_MODE_XGMII:
sds_mode = RTL930X_SDS_MODE_XGMII;
break;
case PHY_INTERFACE_MODE_10GBASER:
sds_mode = RTL930X_SDS_MODE_10GBASER;
break;
case PHY_INTERFACE_MODE_USXGMII:
sds_mode = RTL930X_SDS_MODE_USXGMII;
break;
default:
pr_err("%s: unknown serdes mode: %s\n", __func__, phy_modes(phy_mode));
return -EINVAL;
}
/* Maybe use dal_longan_sds_init */ /* Maybe use dal_longan_sds_init */
/* dal_longan_construct_serdesConfig_init */ /* Serdes Construct */ /* dal_longan_construct_serdesConfig_init */ /* Serdes Construct */
rtl9300_phy_enable_10g_1g(sds_num); rtl9300_phy_enable_10g_1g(sds_num);
/* Set Serdes Mode */ /* Disable MAC */
rtl9300_sds_set(sds_num, RTL930X_SDS_MODE_10GBASER); /* 0x1b: RTK_MII_10GR1000BX_AUTO */ sw_w32_mask(0, 1, RTL930X_MAC_FORCE_MODE_CTRL + 4 * port);
mdelay(20);
/* Do RX calibration */ /* ----> dal_longan_sds_mode_set */
pr_info("%s: Configuring RTL9300 SERDES %d\n", __func__, sds_num);
/* Configure link to MAC */
rtl9300_serdes_mac_link_config(sds_num, true, true); /* MAC Construct */
/* Re-Enable MAC */
sw_w32_mask(1, 0, RTL930X_MAC_FORCE_MODE_CTRL + 4 * port);
/* Enable SDS in desired mode */
rtl9300_force_sds_mode(sds_num, phy_mode);
/* Enable Fiber RX */
rtl9300_sds_field_w(sds_num, 0x20, 2, 12, 12, 0);
/* Calibrate SerDes receiver in loopback mode */
rtl9300_sds_10g_idle(sds_num);
do { do {
rtl9300_do_rx_calibration(sds_num, phy_mode); rtl9300_do_rx_calibration(sds_num, phy_mode);
calib_tries++; calib_tries++;
mdelay(50); mdelay(50);
} while (rtl9300_sds_check_calibration(sds_num, phy_mode) && calib_tries < 3); } while (rtl9300_sds_check_calibration(sds_num, phy_mode) && calib_tries < 3);
if (calib_tries >= 3)
pr_warn("%s: SerDes RX calibration failed\n", __func__);
/* Leave loopback mode */
rtl9300_sds_tx_config(sds_num, phy_mode);
return 0; return 0;
} }
static int rtl9300_sds_10g_idle(int sds_num)
{
bool busy;
int i = 0;
do {
if (sds_num % 2) {
rtl9300_sds_field_w(sds_num - 1, 0x1f, 0x2, 15, 0, 53);
busy = !!rtl9300_sds_field_r(sds_num - 1, 0x1f, 0x14, 1, 1);
} else {
rtl9300_sds_field_w(sds_num, 0x1f, 0x2, 15, 0, 53);
busy = !!rtl9300_sds_field_r(sds_num, 0x1f, 0x14, 0, 0);
}
i++;
} while (busy && i < 100);
if (i < 100)
return 0;
pr_warn("%s WARNING: Waiting for RX idle timed out, SDS %d\n", __func__, sds_num);
return -EIO;
}
typedef struct { typedef struct {
u8 page; u8 page;
u8 reg; u8 reg;
@ -2927,6 +2977,23 @@ sds_config rtl9300_a_sds_10gr_lane1[] =
{0x2B, 0x14, 0x3108}, {0x2D, 0x13, 0x3C87}, {0x2D, 0x14, 0x1808}, {0x2B, 0x14, 0x3108}, {0x2D, 0x13, 0x3C87}, {0x2D, 0x14, 0x1808},
}; };
static void rtl9300_serdes_patch(int sds_num)
{
if (sds_num % 2) {
for (int i = 0; i < sizeof(rtl9300_a_sds_10gr_lane1) / sizeof(sds_config); ++i) {
rtl930x_write_sds_phy(sds_num, rtl9300_a_sds_10gr_lane1[i].page,
rtl9300_a_sds_10gr_lane1[i].reg,
rtl9300_a_sds_10gr_lane1[i].data);
}
} else {
for (int i = 0; i < sizeof(rtl9300_a_sds_10gr_lane0) / sizeof(sds_config); ++i) {
rtl930x_write_sds_phy(sds_num, rtl9300_a_sds_10gr_lane0[i].page,
rtl9300_a_sds_10gr_lane0[i].reg,
rtl9300_a_sds_10gr_lane0[i].data);
}
}
}
int rtl9300_sds_cmu_band_get(int sds) int rtl9300_sds_cmu_band_get(int sds)
{ {
u32 page; u32 page;
@ -2952,113 +3019,6 @@ int rtl9300_sds_cmu_band_get(int sds)
return cmu_band; return cmu_band;
} }
int rtl9300_configure_serdes(struct phy_device *phydev)
{
int phy_mode = PHY_INTERFACE_MODE_10GBASER;
struct device *dev = &phydev->mdio.dev;
int calib_tries = 0;
u32 sds_num = 0;
int sds_mode;
if (dev->of_node) {
struct device_node *dn = dev->of_node;
int phy_addr = phydev->mdio.addr;
if (of_property_read_u32(dn, "sds", &sds_num))
sds_num = -1;
pr_info("%s: Port %d, SerDes is %d\n", __func__, phy_addr, sds_num);
} else {
dev_err(dev, "No DT node.\n");
return -EINVAL;
}
if (sds_num < 0)
return 0;
if (phy_mode != PHY_INTERFACE_MODE_10GBASER) /* TODO: for now we only patch 10GR SerDes */
return 0;
switch (phy_mode) {
case PHY_INTERFACE_MODE_HSGMII:
sds_mode = RTL930X_SDS_MODE_HSGMII;
break;
case PHY_INTERFACE_MODE_1000BASEX:
sds_mode = RTL930X_SDS_MODE_1000BASEX;
break;
case PHY_INTERFACE_MODE_XGMII:
sds_mode = RTL930X_SDS_MODE_XGMII;
break;
case PHY_INTERFACE_MODE_10GBASER:
sds_mode = RTL930X_SDS_MODE_10GBASER;
break;
case PHY_INTERFACE_MODE_USXGMII:
sds_mode = RTL930X_SDS_MODE_USXGMII;
break;
default:
pr_err("%s: unknown serdes mode: %s\n", __func__, phy_modes(phy_mode));
return -EINVAL;
}
pr_info("%s CMU BAND is %d\n", __func__, rtl9300_sds_cmu_band_get(sds_num));
/* Turn Off Serdes */
rtl9300_sds_rst(sds_num, RTL930X_SDS_OFF);
pr_info("%s PATCHING SerDes %d\n", __func__, sds_num);
if (sds_num % 2) {
for (int i = 0; i < sizeof(rtl9300_a_sds_10gr_lane1) / sizeof(sds_config); ++i) {
rtl930x_write_sds_phy(sds_num, rtl9300_a_sds_10gr_lane1[i].page,
rtl9300_a_sds_10gr_lane1[i].reg,
rtl9300_a_sds_10gr_lane1[i].data);
}
} else {
for (int i = 0; i < sizeof(rtl9300_a_sds_10gr_lane0) / sizeof(sds_config); ++i) {
rtl930x_write_sds_phy(sds_num, rtl9300_a_sds_10gr_lane0[i].page,
rtl9300_a_sds_10gr_lane0[i].reg,
rtl9300_a_sds_10gr_lane0[i].data);
}
}
rtl9300_phy_enable_10g_1g(sds_num);
/* Disable MAC */
sw_w32_mask(0, 1, RTL930X_MAC_FORCE_MODE_CTRL);
mdelay(20);
/* ----> dal_longan_sds_mode_set */
pr_info("%s: Configuring RTL9300 SERDES %d, mode %02x\n", __func__, sds_num, sds_mode);
/* Configure link to MAC */
rtl9300_serdes_mac_link_config(sds_num, true, true); /* MAC Construct */
/* Disable MAC */
sw_w32_mask(0, 1, RTL930X_MAC_FORCE_MODE_CTRL);
mdelay(20);
rtl9300_force_sds_mode(sds_num, PHY_INTERFACE_MODE_NA);
/* Re-Enable MAC */
sw_w32_mask(1, 0, RTL930X_MAC_FORCE_MODE_CTRL);
rtl9300_force_sds_mode(sds_num, phy_mode);
/* Do RX calibration */
do {
rtl9300_do_rx_calibration(sds_num, phy_mode);
calib_tries++;
mdelay(50);
} while (rtl9300_sds_check_calibration(sds_num, phy_mode) && calib_tries < 3);
if (calib_tries >= 3)
pr_err("%s CALIBTRATION FAILED\n", __func__);
rtl9300_sds_tx_config(sds_num, phy_mode);
/* The clock needs only to be configured on the FPGA implementation */
return 0;
}
void rtl9310_sds_field_w(int sds, u32 page, u32 reg, int end_bit, int start_bit, u32 v) void rtl9310_sds_field_w(int sds, u32 page, u32 reg, int end_bit, int start_bit, u32 v)
{ {
int l = end_bit - start_bit + 1; int l = end_bit - start_bit + 1;
@ -3870,7 +3830,7 @@ static int rtl9300_serdes_probe(struct phy_device *phydev)
phydev_info(phydev, "Detected internal RTL9300 Serdes\n"); phydev_info(phydev, "Detected internal RTL9300 Serdes\n");
return rtl9300_configure_serdes(phydev); return 0;
} }
static struct phy_driver rtl83xx_phy_driver[] = { static struct phy_driver rtl83xx_phy_driver[] = {