KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: rtl8366: enable ports only after VLAN configuration is done

Browse source 
SVN-Revision: 24938
This commit is contained in:
Gabor Juhos 2011-01-08 20:24:26 +00:00
parent 0bcc97ac26
commit c16715f8d2
4 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
View file

@ -486,6 +486,21 @@ static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
return 0; 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) int rtl8366_reset_vlan(struct rtl8366_smi *smi)
{ {
struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_mc vlanmc;
@ -1189,6 +1204,10 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
goto err_disable_hw; goto err_disable_hw;
} }
err = rtl8366_enable_all_ports(smi, 1);
if (err)
goto err_disable_hw;
err = rtl8366_smi_mii_init(smi); err = rtl8366_smi_mii_init(smi);
if (err) if (err)
goto err_free_sck; goto err_free_sck;

1
target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
View file

@ -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_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data);
int rtl8366_reset_vlan(struct rtl8366_smi *smi); 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 #ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file); int rtl8366_debugfs_open(struct inode *inode, struct file *file);

9
target/linux/generic/files/drivers/net/phy/rtl8366rb.c
View file

@ -274,9 +274,6 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi)
REG_RMW(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_MAX_LENGTH_MASK, REG_RMW(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_MAX_LENGTH_MASK,
RTL8366RB_SGCR_MAX_LENGTH_1536); RTL8366RB_SGCR_MAX_LENGTH_1536);
/* enable all ports */
REG_WR(smi, RTL8366RB_PECR, 0);
/* enable learning for all ports */ /* enable learning for all ports */
REG_WR(smi, RTL8366RB_SSCR0, 0); REG_WR(smi, RTL8366RB_SSCR0, 0);
@ -962,7 +959,11 @@ static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
if (err) if (err)
return 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[] = { static struct switch_attr rtl8366rb_globals[] = {

9
target/linux/generic/files/drivers/net/phy/rtl8366s.c
View file

@ -257,9 +257,6 @@ static int rtl8366s_hw_init(struct rtl8366_smi *smi)
REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK, REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
RTL8366S_SGCR_MAX_LENGTH_1536); RTL8366S_SGCR_MAX_LENGTH_1536);
/* enable all ports */
REG_WR(smi, RTL8366S_PECR, 0);
/* enable learning for all ports */ /* enable learning for all ports */
REG_WR(smi, RTL8366S_SSCR0, 0); REG_WR(smi, RTL8366S_SSCR0, 0);
@ -808,7 +805,11 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
if (err) if (err)
return 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[] = { static struct switch_attr rtl8366s_globals[] = {