ar71xx: allow to disable link polling on unused PHYs

SVN-Revision: 31533
lede-17.01
Gabor Juhos 2012-04-29 18:29:24 +00:00
parent a8d3109208
commit 3e3a4d3d6b
3 changed files with 16 additions and 4 deletions

View File

@ -721,6 +721,8 @@ void __init ath79_register_eth(unsigned int id)
pdata->speed = SPEED_1000; pdata->speed = SPEED_1000;
pdata->duplex = DUPLEX_FULL; pdata->duplex = DUPLEX_FULL;
pdata->switch_data = &ath79_switch_data; pdata->switch_data = &ath79_switch_data;
ath79_switch_data.phy_poll_mask |= BIT(4);
} }
pdata->has_gbit = 1; pdata->has_gbit = 1;
pdata->is_ar724x = 1; pdata->is_ar724x = 1;
@ -776,6 +778,8 @@ void __init ath79_register_eth(unsigned int id)
pdata->speed = SPEED_1000; pdata->speed = SPEED_1000;
pdata->duplex = DUPLEX_FULL; pdata->duplex = DUPLEX_FULL;
pdata->switch_data = &ath79_switch_data; pdata->switch_data = &ath79_switch_data;
ath79_switch_data.phy_poll_mask |= BIT(4);
} }
pdata->has_gbit = 1; pdata->has_gbit = 1;

View File

@ -19,6 +19,7 @@
struct ag71xx_switch_platform_data { struct ag71xx_switch_platform_data {
u8 phy4_mii_en:1; u8 phy4_mii_en:1;
u8 phy_poll_mask;
}; };
struct ag71xx_platform_data { struct ag71xx_platform_data {

View File

@ -1115,19 +1115,26 @@ static void link_function(struct work_struct *work) {
struct ag71xx *ag = container_of(work, struct ag71xx, link_work.work); struct ag71xx *ag = container_of(work, struct ag71xx, link_work.work);
struct ar7240sw *as = ag->phy_priv; struct ar7240sw *as = ag->phy_priv;
unsigned long flags; unsigned long flags;
u8 mask;
int i; int i;
int status = 0; int status = 0;
for (i = 0; i < as->swdev.ports; i++) { mask = ~as->swdata->phy_poll_mask;
int link = ar7240sw_phy_read(ag->mii_bus, i, MII_BMSR); for (i = 0; i < AR7240_NUM_PHYS; i++) {
if(link & BMSR_LSTATUS) { int link;
if (!(mask & BIT(i)))
continue;
link = ar7240sw_phy_read(ag->mii_bus, i, MII_BMSR);
if (link & BMSR_LSTATUS) {
status = 1; status = 1;
break; break;
} }
} }
spin_lock_irqsave(&ag->lock, flags); spin_lock_irqsave(&ag->lock, flags);
if(status != ag->link) { if (status != ag->link) {
ag->link = status; ag->link = status;
ag71xx_link_adjust(ag); ag71xx_link_adjust(ag);
} }