skge: update
Subsystems (2)
cover skge: update
Several enhancements: WOL now works, use dev_printk macros and allow handling broken hardware better.
PATCH 1/4 skge: handle zero address at open
Some motherboards are broken and have no address set. Failing at probe time prevents the device from ever being used (like to download a fixed BIOS). Instead warn on probe and check again when device is brought up. That way the address can be set.
drivers/net/skge.c +5 -3
@@ -2373,6 +2373,9 @@ static int skge_up(struct net_device *desize_t rx_size, tx_size;int err; +if (!is_valid_ether_addr (dev->dev_addr)) +return -EINVAL ; +if (netif_msg_ifup (skge)) printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
@@ -3567,11 +3570,10 @@ static int __devinit skge_probe(struct pif (!dev) goto err_out_led_off; +/* Some motherboards are broken and has zero in ROM. */ if (!is_valid_ether_addr (dev->dev_addr)) { - printk(KERN_ERR PFX "%s: bad (zero?) ethernet address in rom\n", + printk(KERN_WARNING PFX "%s: bad (zero?) ethernet address in rom\n", pci_name(pdev)); - err = -EIO ; - goto err_out_free_netdev; } err =register_netdev (dev);
Re: [PATCH 1/4] skge: handle zero address at open
Quoted 5 lines · Stephen Hemminger
Some motherboards are broken and have no address set. Failing at probe time prevents the device from ever being used (like to download a fixed BIOS). Instead warn on probe and check again when device is brought up. That way the address
can be set.Signed-off-by Stephen Hemminger <[email protected]>
applied 1-4
PATCH 2/4 skge: use dev_printk
In reply to Stephen HemmingerUse dev_printk related macros for PCI related errors and warnings
drivers/net/skge.c +31 -38
@@ -2395,7 +2395,7 @@ static int skge_up(struct net_device *deBUG_ON (skge->dma &7 );if ((u64 )skge->dma >>32 != ((u64 ) skge->dma + skge->mem_size) >>32 ) { - printk(KERN_ERR PFX "pci_alloc_consistent region crosses 4G boundary\n"); +dev_err (&hw->pdev->dev,"pci_alloc_consistent region crosses 4G boundary\n" ); err = -EINVAL ; goto free_pci_mem; }
@@ -3004,6 +3004,7 @@ static void skge_mac_intr(struct skge_hw/* Handle device specific framing and timeout interrupts */ static void skge_error_irq (struct skge_hw *hw) { +struct pci_dev *pdev = hw->pdev;u32 hwstatus =skge_read32 (hw,B0_HWE_ISRC );if (hw->chip_id ==CHIP_ID_GENESIS ) {
@@ -3019,12 +3020,12 @@ static void skge_error_irq(struct skge_h }if (hwstatus &IS_RAM_RD_PAR ) { - printk(KERN_ERR PFX "Ram read data parity error\n"); +dev_err (&pdev->dev,"Ram read data parity error\n" );skge_write16 (hw,B3_RI_CTRL ,RI_CLR_RD_PERR ); }if (hwstatus &IS_RAM_WR_PAR ) { - printk(KERN_ERR PFX "Ram write data parity error\n"); +dev_err (&pdev->dev,"Ram write data parity error\n" );skge_write16 (hw,B3_RI_CTRL ,RI_CLR_WR_PERR ); }
@@ -3035,38 +3036,38 @@ static void skge_error_irq(struct skge_hskge_mac_parity (hw,1 );if (hwstatus &IS_R1_PAR_ERR ) { - printk(KERN_ERR PFX "%s: receive queue parity error\n", - hw->dev[0]->name); +dev_err (&pdev->dev,"%s: receive queue parity error\n" , + hw->dev[0 ]->name);skge_write32 (hw,B0_R1_CSR ,CSR_IRQ_CL_P ); }if (hwstatus &IS_R2_PAR_ERR ) { - printk(KERN_ERR PFX "%s: receive queue parity error\n", - hw->dev[1]->name); +dev_err (&pdev->dev,"%s: receive queue parity error\n" , + hw->dev[1 ]->name);skge_write32 (hw,B0_R2_CSR ,CSR_IRQ_CL_P ); }if (hwstatus & (IS_IRQ_MST_ERR |IS_IRQ_STAT )) {u16 pci_status, pci_cmd; -pci_read_config_word (hw->pdev,PCI_COMMAND , &pci_cmd); -pci_read_config_word (hw->pdev,PCI_STATUS , &pci_status); +pci_read_config_word (pdev,PCI_COMMAND , &pci_cmd); +pci_read_config_word (pdev,PCI_STATUS , &pci_status); - printk(KERN_ERR PFX "%s: PCI error cmd=%#x status=%#x\n", - pci_name(hw->pdev), pci_cmd, pci_status); +dev_err (&pdev->dev,"PCI error cmd=%#x status=%#x\n" , + pci_cmd, pci_status);/* Write the error bits back to clear them. */ pci_status &=PCI_STATUS_ERROR_BITS ;skge_write8 (hw,B2_TST_CTRL1 ,TST_CFG_WRITE_ON ); -pci_write_config_word (hw->pdev,PCI_COMMAND , +pci_write_config_word (pdev,PCI_COMMAND , pci_cmd |PCI_COMMAND_SERR |PCI_COMMAND_PARITY ); -pci_write_config_word (hw->pdev,PCI_STATUS , pci_status); +pci_write_config_word (pdev,PCI_STATUS , pci_status);skge_write8 (hw,B2_TST_CTRL1 ,TST_CFG_WRITE_OFF );/* if error still set then just ignore it */ hwstatus =skge_read32 (hw,B0_HWE_ISRC );if (hwstatus &IS_IRQ_STAT ) { - printk(KERN_INFO PFX "unable to clear error (so ignoring them)\n"); +dev_warn (&hw->pdev->dev,"unable to clear error (so ignoring them)\n" ); hw->intr_mask &= ~IS_HW_ERR ; } }
@@ -3280,8 +3281,8 @@ static int skge_reset(struct skge_hw *hw hw->phy_addr =PHY_ADDR_BCOM ;break ;default : - printk(KERN_ERR PFX "%s: unsupported phy type 0x%x\n", - pci_name(hw->pdev), hw->phy_type); +dev_err (&hw->pdev->dev,"unsupported phy type 0x%x\n" , + hw->phy_type);return -EOPNOTSUPP ; }break ;
@@ -3296,8 +3297,8 @@ static int skge_reset(struct skge_hw *hwbreak ;default : - printk(KERN_ERR PFX "%s: unsupported chip type 0x%x\n", - pci_name(hw->pdev), hw->chip_id); +dev_err (&hw->pdev->dev,"unsupported chip type 0x%x\n" , + hw->chip_id);return -EOPNOTSUPP ; }
@@ -3337,7 +3338,7 @@ static int skge_reset(struct skge_hw *hw/* avoid boards with stuck Hardware error bits */ if ((skge_read32 (hw,B0_ISRC ) &IS_HW_ERR ) && (skge_read32 (hw,B0_HWE_ISRC ) &IS_IRQ_SENSOR )) { - printk(KERN_WARNING PFX "stuck hardware sensor bit\n"); +dev_warn (&hw->pdev->dev,"stuck hardware sensor bit\n" ); hw->intr_mask &= ~IS_HW_ERR ; }
@@ -3411,7 +3412,7 @@ static struct net_device *skge_devinit(sstruct net_device *dev =alloc_etherdev (sizeof (*skge));if (!dev) { -printk (KERN_ERR "skge etherdev alloc failed" ); +dev_err (&hw->pdev->dev,"etherdev alloc failed\n" );return NULL ; }
@@ -3499,15 +3500,13 @@ static int __devinit skge_probe(struct p err =pci_enable_device (pdev);if (err) { - printk(KERN_ERR PFX "%s cannot enable PCI device\n", - pci_name(pdev)); +dev_err (&pdev->dev,"cannot enable PCI device\n" ); goto err_out; } err =pci_request_regions (pdev,DRV_NAME );if (err) { - printk(KERN_ERR PFX "%s cannot obtain PCI resources\n", - pci_name(pdev)); +dev_err (&pdev->dev,"cannot obtain PCI resources\n" ); goto err_out_disable_pdev; }
@@ -3522,8 +3521,7 @@ static int __devinit skge_probe(struct p }if (err) { - printk(KERN_ERR PFX "%s no usable DMA configuration\n", - pci_name(pdev)); +dev_err (&pdev->dev,"no usable DMA configuration\n" ); goto err_out_free_regions; }
@@ -3541,8 +3539,7 @@ static int __devinit skge_probe(struct p err = -ENOMEM ; hw =kzalloc (sizeof (*hw),GFP_KERNEL );if (!hw) { - printk(KERN_ERR PFX "%s: cannot allocate hardware struct\n", - pci_name(pdev)); +dev_err (&pdev->dev,"cannot allocate hardware struct\n" ); goto err_out_free_regions; }
@@ -3553,8 +3550,7 @@ static int __devinit skge_probe(struct p hw->regs =ioremap_nocache (pci_resource_start (pdev,0 ),0x4000 );if (!hw->regs) { - printk(KERN_ERR PFX "%s: cannot map device registers\n", - pci_name(pdev)); +dev_err (&pdev->dev,"cannot map device registers\n" ); goto err_out_free_hw; }
@@ -3571,21 +3567,18 @@ static int __devinit skge_probe(struct p goto err_out_led_off;/* Some motherboards are broken and has zero in ROM. */ -if (!is_valid_ether_addr (dev->dev_addr)) { - printk(KERN_WARNING PFX "%s: bad (zero?) ethernet address in rom\n", - pci_name(pdev)); - } +if (!is_valid_ether_addr (dev->dev_addr)) +dev_warn (&pdev->dev,"bad (zero?) ethernet address in rom\n" ); err =register_netdev (dev);if (err) { - printk(KERN_ERR PFX "%s: cannot register net device\n", - pci_name(pdev)); +dev_err (&pdev->dev,"cannot register net device\n" ); goto err_out_free_netdev; } err =request_irq (pdev->irq, skge_intr,IRQF_SHARED , dev->name, hw);if (err) { - printk(KERN_ERR PFX "%s: cannot assign irq %d\n", +dev_err (&pdev->dev,"%s: cannot assign irq %d\n" , dev->name, pdev->irq); goto err_out_unregister; }
@@ -3596,7 +3589,7 @@ static int __devinit skge_probe(struct pskge_show_addr (dev1); else {/* Failure to register second port need not be fatal */ - printk(KERN_WARNING PFX "register of second port failed\n"); +dev_warn (&pdev->dev,"register of second port failed\n" ); hw->dev[1 ] =NULL ;free_netdev (dev1); }
PATCH 3/4 skge: WOL support
In reply to Stephen HemmingerAdd WOL support for Yukon chipsets in skge device.
--- drivers/net/skge.c | 158 +++++++++++++++++++++++++++++++++++++++++------------ drivers/net/skge.h | 2 2 files changed, 125 insertions(+), 35 deletions(-)
drivers/net/skge.c +123 -35
@@ -132,18 +132,93 @@ static void skge_get_regs(struct net_dev }/* Wake on Lan only supported on Yukon chips with rev 1 or above */ -static int wol_supported (const struct skge_hw *hw) +static u32 wol_supported (const struct skge_hw *hw) { -return !((hw->chip_id ==CHIP_ID_GENESIS || - (hw->chip_id ==CHIP_ID_YUKON && hw->chip_rev ==0 ))); +if (hw->chip_id ==CHIP_ID_YUKON && hw->chip_rev !=0 ) +return WAKE_MAGIC |WAKE_PHY ; +else +return 0 ; +} + +static u32 pci_wake_enabled (struct pci_dev *dev) +{ +int pm =pci_find_capability (dev,PCI_CAP_ID_PM ); +u16 value; + +/* If device doesn't support PM Capabilities, but request is to disable +* wake events, it's a nop; otherwise fail */ +if (!pm) +return 0 ; + +pci_read_config_word (dev, pm +PCI_PM_PMC , &value); + + value &=PCI_PM_CAP_PME_MASK ; + value >>=ffs (PCI_PM_CAP_PME_MASK ) -1 ;/* First bit of mask */ + +return value !=0 ; +} + +static void skge_wol_init (struct skge_port *skge) +{ +struct skge_hw *hw = skge->hw; +int port = skge->port; +enum pause_control save_mode; +u32 ctrl; + +/* Bring hardware out of reset */ +skge_write16 (hw,B0_CTST ,CS_RST_CLR ); +skge_write16 (hw,SK_REG (port,GMAC_LINK_CTRL ),GMLC_RST_CLR ); + +skge_write8 (hw,SK_REG (port,GPHY_CTRL ),GPC_RST_CLR ); +skge_write8 (hw,SK_REG (port,GMAC_CTRL ),GMC_RST_CLR ); + +/* Force to 10/100 skge_reset will re-enable on resume */ + save_mode = skge->flow_control; + skge->flow_control =FLOW_MODE_SYMMETRIC ; + + ctrl = skge->advertising; + skge->advertising &= ~(ADVERTISED_1000baseT_Half|ADVERTISED_1000baseT_Full); + +skge_phy_reset (skge); + + skge->flow_control = save_mode; + skge->advertising = ctrl; + +/* Set GMAC to no flow control and auto update for speed/duplex */ +gma_write16 (hw, port,GM_GP_CTRL , +GM_GPCR_FC_TX_DIS |GM_GPCR_TX_ENA |GM_GPCR_RX_ENA | +GM_GPCR_DUP_FULL |GM_GPCR_FC_RX_DIS |GM_GPCR_AU_FCT_DIS ); + +/* Set WOL address */ +memcpy_toio (hw->regs +WOL_REGS (port,WOL_MAC_ADDR ), + skge->netdev->dev_addr,ETH_ALEN ); + +/* Turn on appropriate WOL control bits */ +skge_write16 (hw,WOL_REGS (port,WOL_CTRL_STAT ),WOL_CTL_CLEAR_RESULT ); + ctrl =0 ; +if (skge->wol &WAKE_PHY ) + ctrl |=WOL_CTL_ENA_PME_ON_LINK_CHG |WOL_CTL_ENA_LINK_CHG_UNIT ; +else + ctrl |=WOL_CTL_DIS_PME_ON_LINK_CHG |WOL_CTL_DIS_LINK_CHG_UNIT ; + +if (skge->wol &WAKE_MAGIC ) + ctrl |=WOL_CTL_ENA_PME_ON_MAGIC_PKT |WOL_CTL_ENA_MAGIC_PKT_UNIT ; +else + ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ;; + + ctrl |=WOL_CTL_DIS_PME_ON_PATTERN |WOL_CTL_DIS_PATTERN_UNIT ; +skge_write16 (hw,WOL_REGS (port,WOL_CTRL_STAT ), ctrl); + +/* block receiver */ +skge_write8 (hw,SK_REG (port,RX_GMF_CTRL_T ),GMF_RST_SET ); }static void skge_get_wol (struct net_device *dev,struct ethtool_wolinfo *wol) {struct skge_port *skge =netdev_priv (dev); - wol->supported =wol_supported (skge->hw) ?WAKE_MAGIC :0 ; - wol->wolopts = skge->wol ?WAKE_MAGIC :0 ; + wol->supported =wol_supported (skge->hw); + wol->wolopts = skge->wol; }static int skge_set_wol (struct net_device *dev,struct ethtool_wolinfo *wol)
@@ -151,23 +226,12 @@ static int skge_set_wol(struct net_devicstruct skge_port *skge =netdev_priv (dev);struct skge_hw *hw = skge->hw; -if (wol->wolopts !=WAKE_MAGIC && wol->wolopts !=0 ) -return -EOPNOTSUPP ; - -if (wol->wolopts ==WAKE_MAGIC && !wol_supported (hw)) +if (wol->wolopts &wol_supported (hw))return -EOPNOTSUPP ; - skge->wol = wol->wolopts ==WAKE_MAGIC ; - -if (skge->wol) { -memcpy_toio (hw->regs +WOL_MAC_ADDR , dev->dev_addr,ETH_ALEN ); - -skge_write16 (hw,WOL_CTRL_STAT , -WOL_CTL_ENA_PME_ON_MAGIC_PKT | -WOL_CTL_ENA_MAGIC_PKT_UNIT ); - }else -skge_write16 (hw,WOL_CTRL_STAT ,WOL_CTL_DEFAULT ); - + skge->wol = wol->wolopts; +if (!netif_running (dev)) +skge_wol_init (skge);return 0 ; }
@@ -3456,6 +3520,7 @@ static struct net_device *skge_devinit(s skge->duplex =-1 ; skge->speed =-1 ; skge->advertising =skge_supported_modes (hw); + skge->wol =pci_wake_enabled (hw->pdev) ?wol_supported (hw) :0 ; hw->dev[port] = dev;
@@ -3654,28 +3719,46 @@ static void __devexit skge_remove(struct }#ifdef CONFIG_PM +static int vaux_avail (struct pci_dev *pdev) +{ +int pm_cap; + + pm_cap =pci_find_capability (pdev,PCI_CAP_ID_PM ); +if (pm_cap) { +u16 ctl; +pci_read_config_word (pdev, pm_cap +PCI_PM_PMC , &ctl); +if (ctl &PCI_PM_CAP_AUX_POWER ) +return 1 ; + } +return 0 ; +} + +static int skge_suspend (struct pci_dev *pdev,pm_message_t state) {struct skge_hw *hw =pci_get_drvdata (pdev); -int i, wol =0 ; +int i, err, wol =0 ; + + err =pci_save_state (pdev); +if (err) +return err; -pci_save_state (pdev);for (i =0 ; i < hw->ports; i++) {struct net_device *dev = hw->dev[i]; +struct skge_port *skge =netdev_priv (dev); -if (netif_running (dev)) { -struct skge_port *skge =netdev_priv (dev); +if (netif_running (dev)) +skge_down (dev); +if (skge->wol) +skge_wol_init (skge); -netif_carrier_off (dev); -if (skge->wol) -netif_stop_queue (dev); -else -skge_down (dev); - wol |= skge->wol; - } -netif_device_detach (dev); + wol |= skge->wol; } +if (wol &&vaux_avail (pdev)) +skge_write8 (hw,B0_POWER_CTRL , +PC_VAUX_ENA |PC_VCC_ENA |PC_VAUX_ON |PC_VCC_OFF ); +skge_write32 (hw,B0_IMSK ,0 );pci_enable_wake (pdev,pci_choose_state (pdev, state), wol);pci_set_power_state (pdev,pci_choose_state (pdev, state));
@@ -3688,8 +3771,14 @@ static int skge_resume(struct pci_dev *pstruct skge_hw *hw =pci_get_drvdata (pdev);int i, err; -pci_set_power_state (pdev,PCI_D0 ); -pci_restore_state (pdev); + err =pci_set_power_state (pdev,PCI_D0 ); +if (err) + goto out; + + err =pci_restore_state (pdev); +if (err) + goto out; +pci_enable_wake (pdev,PCI_D0 ,0 ); err =skge_reset (hw);
@@ -3699,7 +3788,6 @@ static int skge_resume(struct pci_dev *pfor (i =0 ; i < hw->ports; i++) {struct net_device *dev = hw->dev[i]; -netif_device_attach (dev);if (netif_running (dev)) { err =skge_up (dev);
drivers/net/skge.h +2 -0
@@ -876,11 +876,13 @@ enum {WOL_PATT_CNT_0 =0x0f38 ,/* 32 bit WOL Pattern Counter 3..0 */ WOL_PATT_CNT_4 = 0x0f3c,/* 24 bit WOL Pattern Counter 6..4 */ }; +#define WOL_REGS (port, x) (x + (port)*0x80)enum {WOL_PATT_RAM_1 =0x1000 ,/* WOL Pattern RAM Link 1 */ WOL_PATT_RAM_2 =0x1400 ,/* WOL Pattern RAM Link 2 */ }; +#define WOL_PATT_RAM_BASE (port) (WOL_PATT_RAM_1 + (port)*0x400)enum { BASE_XMAC_1 = 0x2000,/* XMAC 1 registers */
Re: [PATCH 3/4] skge: WOL support
Hi Stephen,
just a nitpick.
Quoted 6 lines · Stephen Hemminger
drivers/net/skge.c +0
-0@@ -132,18 +132,93 @@ static void skge_get_regs(struct net_dev }/* Wake on Lan only supported on Yukon chips with rev 1 or above */
drivers/net/skge.c static void skge_get_regs(struct net_dev · line 141
Quoted 10 lines
drivers/net/skge.c +6
-3-static int wol_supported (const struct skge_hw *hw) +static u32 wol_supported (const struct skge_hw *hw) { -return !((hw->chip_id ==CHIP_ID_GENESIS || - (hw->chip_id ==CHIP_ID_YUKON && hw->chip_rev ==0 ))); +if (hw->chip_id ==CHIP_ID_YUKON && hw->chip_rev !=0 ) +return WAKE_MAGIC |WAKE_PHY ; +else +return 0 ; +}
You can delete that comment, if you write exactly, what the comment says:
if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev >= 1) return WAKE_MAGIC | WAKE_PHY; else return 0;
Regards
Ingo Oeser
PATCH 4/4 skge: version 1.10
In reply to Stephen HemmingerMark this as 1.10 because WOL now works
drivers/net/skge.c +1 -1
@@ -42,7 +42,7 @@#include "skge.h" #define DRV_NAME "skge" -#define DRV_VERSION "1.9" +#define DRV_VERSION "1.10"#define PFX DRV_NAME " "#define DEFAULT_TX_RING_SIZE 128