diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-01-08 20:24:26 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-01-08 20:24:26 +0000 |
| commit | c16715f8d2d31f52bbaf888efd3fdb424b7a69bd (patch) | |
| tree | 5b448280dec6e0617a9b8921f2f3ba52c119b2e9 | |
| parent | 0bcc97ac2615b620a40f2df96a6c674a0139e78f (diff) | |
| download | upstream-c16715f8d2d31f52bbaf888efd3fdb424b7a69bd.tar.gz upstream-c16715f8d2d31f52bbaf888efd3fdb424b7a69bd.tar.bz2 upstream-c16715f8d2d31f52bbaf888efd3fdb424b7a69bd.zip | |
generic: rtl8366: enable ports only after VLAN configuration is done
SVN-Revision: 24938
4 files changed, 30 insertions, 8 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c index 7995f34a43..f9a332d875 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c @@ -486,6 +486,21 @@ static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable) return 0; } +int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable) +{ + int port; + int err; + + for (port = 0; port < smi->num_ports; port++) { + err = smi->ops->enable_port(smi, port, enable); + if (err) + return err; + } + + return 0; +} +EXPORT_SYMBOL_GPL(rtl8366_enable_all_ports); + int rtl8366_reset_vlan(struct rtl8366_smi *smi) { struct rtl8366_vlan_mc vlanmc; @@ -1189,6 +1204,10 @@ int rtl8366_smi_init(struct rtl8366_smi *smi) goto err_disable_hw; } + err = rtl8366_enable_all_ports(smi, 1); + if (err) + goto err_disable_hw; + err = rtl8366_smi_mii_init(smi); if (err) goto err_free_sck; diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h index 7239cf9faf..2504dd3278 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h +++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h @@ -104,6 +104,7 @@ int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data); int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data); int rtl8366_reset_vlan(struct rtl8366_smi *smi); +int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable); #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS int rtl8366_debugfs_open(struct inode *inode, struct file *file); diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index 492ed25351..847d666dd2 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -274,9 +274,6 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi) REG_RMW(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_MAX_LENGTH_MASK, RTL8366RB_SGCR_MAX_LENGTH_1536); - /* enable all ports */ - REG_WR(smi, RTL8366RB_PECR, 0); - /* enable learning for all ports */ REG_WR(smi, RTL8366RB_SSCR0, 0); @@ -962,7 +959,11 @@ static int rtl8366rb_sw_reset_switch(struct switch_dev *dev) if (err) return err; - return rtl8366_reset_vlan(smi); + err = rtl8366_reset_vlan(smi); + if (err) + return err; + + return rtl8366_enable_all_ports(smi, 1); } static struct switch_attr rtl8366rb_globals[] = { diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c index 2d472cfd34..74e0a3029c 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c @@ -257,9 +257,6 @@ static int rtl8366s_hw_init(struct rtl8366_smi *smi) REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK, RTL8366S_SGCR_MAX_LENGTH_1536); - /* enable all ports */ - REG_WR(smi, RTL8366S_PECR, 0); - /* enable learning for all ports */ REG_WR(smi, RTL8366S_SSCR0, 0); @@ -808,7 +805,11 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev) if (err) return err; - return rtl8366_reset_vlan(smi); + err = rtl8366_reset_vlan(smi); + if (err) + return err; + + return rtl8366_enable_all_ports(smi, 1); } static struct switch_attr rtl8366s_globals[] = { |