Commit 775f9535 authored by Murali Karicheri's avatar Murali Karicheri Committed by David S. Miller

net: netcp: ethss: make sgmii configuration conditional

As a preparatory patch to add support for 2u cpsw hardware found on
K2G SoC, make sgmii configuration conditional. This is required
since 2u uses RGMII interface instead of SGMII and to allow for driver
re-use.
Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2953586d
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
#define IS_SS_ID_VER_14(d) \ #define IS_SS_ID_VER_14(d) \
(GBE_IDENT((d)->ss_version) == GBE_SS_VERSION_14) (GBE_IDENT((d)->ss_version) == GBE_SS_VERSION_14)
#define IS_SS_ID_2U(d) \
(GBE_IDENT((d)->ss_version) == GBE_SS_ID_2U)
#define GBENU_SS_REG_INDEX 0 #define GBENU_SS_REG_INDEX 0
#define GBENU_SM_REG_INDEX 1 #define GBENU_SM_REG_INDEX 1
...@@ -2239,7 +2241,8 @@ static void gbe_slave_stop(struct gbe_intf *intf) ...@@ -2239,7 +2241,8 @@ static void gbe_slave_stop(struct gbe_intf *intf)
struct gbe_priv *gbe_dev = intf->gbe_dev; struct gbe_priv *gbe_dev = intf->gbe_dev;
struct gbe_slave *slave = intf->slave; struct gbe_slave *slave = intf->slave;
gbe_sgmii_rtreset(gbe_dev, slave, true); if (!IS_SS_ID_2U(gbe_dev))
gbe_sgmii_rtreset(gbe_dev, slave, true);
gbe_port_reset(slave); gbe_port_reset(slave);
/* Disable forwarding */ /* Disable forwarding */
cpsw_ale_control_set(gbe_dev->ale, slave->port_num, cpsw_ale_control_set(gbe_dev->ale, slave->port_num,
...@@ -2274,9 +2277,11 @@ static int gbe_slave_open(struct gbe_intf *gbe_intf) ...@@ -2274,9 +2277,11 @@ static int gbe_slave_open(struct gbe_intf *gbe_intf)
void (*hndlr)(struct net_device *) = gbe_adjust_link; void (*hndlr)(struct net_device *) = gbe_adjust_link;
gbe_sgmii_config(priv, slave); if (!IS_SS_ID_2U(priv))
gbe_sgmii_config(priv, slave);
gbe_port_reset(slave); gbe_port_reset(slave);
gbe_sgmii_rtreset(priv, slave, false); if (!IS_SS_ID_2U(priv))
gbe_sgmii_rtreset(priv, slave, false);
gbe_port_config(priv, slave, priv->rx_packet_max); gbe_port_config(priv, slave, priv->rx_packet_max);
gbe_set_slave_mac(slave, gbe_intf); gbe_set_slave_mac(slave, gbe_intf);
/* enable forwarding */ /* enable forwarding */
...@@ -3042,7 +3047,8 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev, ...@@ -3042,7 +3047,8 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev,
continue; continue;
} }
gbe_sgmii_config(gbe_dev, slave); if (!IS_SS_ID_2U(gbe_dev))
gbe_sgmii_config(gbe_dev, slave);
gbe_port_reset(slave); gbe_port_reset(slave);
gbe_port_config(gbe_dev, slave, gbe_dev->rx_packet_max); gbe_port_config(gbe_dev, slave, gbe_dev->rx_packet_max);
list_add_tail(&slave->slave_list, &gbe_dev->secondary_slaves); list_add_tail(&slave->slave_list, &gbe_dev->secondary_slaves);
...@@ -3399,7 +3405,9 @@ static int set_gbenu_ethss_priv(struct gbe_priv *gbe_dev, ...@@ -3399,7 +3405,9 @@ static int set_gbenu_ethss_priv(struct gbe_priv *gbe_dev,
} }
gbe_dev->switch_regs = regs; gbe_dev->switch_regs = regs;
gbe_dev->sgmii_port_regs = gbe_dev->ss_regs + GBENU_SGMII_MODULE_OFFSET; if (!IS_SS_ID_2U(gbe_dev))
gbe_dev->sgmii_port_regs =
gbe_dev->ss_regs + GBENU_SGMII_MODULE_OFFSET;
/* Although sgmii modules are mem mapped to one contiguous /* Although sgmii modules are mem mapped to one contiguous
* region on GBENU devices, setting sgmii_port34_regs allows * region on GBENU devices, setting sgmii_port34_regs allows
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment