Skip to content

Commit

Permalink
[PATCH] skge: use workq for PHY handling
Browse files Browse the repository at this point in the history 
Since accessing the PHY can take 100's of usecs, use a work queue to
allow spinning in outside of soft/hard irq.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Jun 8, 2006
1 parent b10c066 commit d85b514
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 26 deletions.
46 changes: 23 additions & 23 deletions drivers/net/skge.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ static void skge_led(struct skge_port *skge, enum led_mode mode)
struct skge_hw *hw = skge->hw;
int port = skge->port;

spin_lock_bh(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
if (hw->chip_id == CHIP_ID_GENESIS) {
switch (mode) {
case LED_MODE_OFF:
Expand Down Expand Up @@ -663,7 +663,7 @@ static void skge_led(struct skge_port *skge, enum led_mode mode)
PHY_M_LED_MO_RX(MO_LED_ON));
}
}
spin_unlock_bh(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);
}

/* blink LED's for finding board */
Expand Down Expand Up @@ -2038,15 +2038,15 @@ static void skge_phy_reset(struct skge_port *skge)
netif_stop_queue(skge->netdev);
netif_carrier_off(skge->netdev);

spin_lock_bh(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
if (hw->chip_id == CHIP_ID_GENESIS) {
genesis_reset(hw, port);
genesis_mac_init(hw, port);
} else {
yukon_reset(hw, port);
yukon_init(hw, port);
}
spin_unlock_bh(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);
}

/* Basic MII support */
Expand All @@ -2067,12 +2067,12 @@ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
/* fallthru */
case SIOCGMIIREG: {
u16 val = 0;
spin_lock_bh(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
if (hw->chip_id == CHIP_ID_GENESIS)
err = __xm_phy_read(hw, skge->port, data->reg_num & 0x1f, &val);
else
err = __gm_phy_read(hw, skge->port, data->reg_num & 0x1f, &val);
spin_unlock_bh(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);
data->val_out = val;
break;
}
Expand All @@ -2081,14 +2081,14 @@ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (!capable(CAP_NET_ADMIN))
return -EPERM;

spin_lock_bh(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
if (hw->chip_id == CHIP_ID_GENESIS)
err = xm_phy_write(hw, skge->port, data->reg_num & 0x1f,
data->val_in);
else
err = gm_phy_write(hw, skge->port, data->reg_num & 0x1f,
data->val_in);
spin_unlock_bh(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);
break;
}
return err;
Expand Down Expand Up @@ -2191,12 +2191,12 @@ static int skge_up(struct net_device *dev)
goto free_rx_ring;

/* Initialize MAC */
spin_lock_bh(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
if (hw->chip_id == CHIP_ID_GENESIS)
genesis_mac_init(hw, port);
else
yukon_mac_init(hw, port);
spin_unlock_bh(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);

/* Configure RAMbuffers */
chunk = hw->ram_size / ((hw->ports + 1)*2);
Expand Down Expand Up @@ -2847,16 +2847,16 @@ static void skge_error_irq(struct skge_hw *hw)
}

/*
* Interrupt from PHY are handled in tasklet (soft irq)
* Interrupt from PHY are handled in work queue
* because accessing phy registers requires spin wait which might
* cause excess interrupt latency.
*/
static void skge_extirq(unsigned long data)
static void skge_extirq(void *arg)
{
struct skge_hw *hw = (struct skge_hw *) data;
struct skge_hw *hw = arg;
int port;

spin_lock(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
for (port = 0; port < hw->ports; port++) {
struct net_device *dev = hw->dev[port];
struct skge_port *skge = netdev_priv(dev);
Expand All @@ -2868,7 +2868,7 @@ static void skge_extirq(unsigned long data)
bcom_phy_intr(skge);
}
}
spin_unlock(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);

hw->intr_mask |= IS_EXT_REG;
skge_write32(hw, B0_IMSK, hw->intr_mask);
Expand All @@ -2886,7 +2886,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)

if (status & IS_EXT_REG) {
hw->intr_mask &= ~IS_EXT_REG;
tasklet_schedule(&hw->ext_tasklet);
schedule_work(&hw->phy_work);
}

if (status & (IS_R1_F|IS_XA1_F)) {
Expand Down Expand Up @@ -2957,7 +2957,7 @@ static int skge_set_mac_address(struct net_device *dev, void *p)
if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;

spin_lock_bh(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
memcpy_toio(hw->regs + B2_MAC_1 + port*8,
dev->dev_addr, ETH_ALEN);
Expand All @@ -2970,7 +2970,7 @@ static int skge_set_mac_address(struct net_device *dev, void *p)
gma_set_addr(hw, port, GM_SRC_ADDR_1L, dev->dev_addr);
gma_set_addr(hw, port, GM_SRC_ADDR_2L, dev->dev_addr);
}
spin_unlock_bh(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);

return 0;
}
Expand Down Expand Up @@ -3150,14 +3150,14 @@ static int skge_reset(struct skge_hw *hw)

skge_write32(hw, B0_IMSK, hw->intr_mask);

spin_lock_bh(&hw->phy_lock);
mutex_lock(&hw->phy_mutex);
for (i = 0; i < hw->ports; i++) {
if (hw->chip_id == CHIP_ID_GENESIS)
genesis_reset(hw, i);
else
yukon_reset(hw, i);
}
spin_unlock_bh(&hw->phy_lock);
mutex_unlock(&hw->phy_mutex);

return 0;
}
Expand Down Expand Up @@ -3305,8 +3305,8 @@ static int __devinit skge_probe(struct pci_dev *pdev,
}

hw->pdev = pdev;
spin_lock_init(&hw->phy_lock);
tasklet_init(&hw->ext_tasklet, skge_extirq, (unsigned long) hw);
mutex_init(&hw->phy_mutex);
INIT_WORK(&hw->phy_work, skge_extirq, hw);

hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
if (!hw->regs) {
Expand Down Expand Up @@ -3392,7 +3392,7 @@ static void __devexit skge_remove(struct pci_dev *pdev)
skge_write16(hw, B0_LED, LED_STAT_OFF);
skge_write8(hw, B0_CTST, CS_RST_SET);

tasklet_kill(&hw->ext_tasklet);
flush_scheduled_work();

free_irq(pdev->irq, hw);
pci_release_regions(pdev);
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/skge.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2399,9 +2399,8 @@ struct skge_hw {
u32 ram_size;
u32 ram_offset;
u16 phy_addr;

struct tasklet_struct ext_tasklet;
spinlock_t phy_lock;
struct work_struct phy_work;
struct mutex phy_mutex;
};

enum {
Expand Down

0 comments on commit d85b514

Please sign in to comment.