Patchwork net: Add missing TST_CFG_WRITE bits around sky2_pci_write

login
register
mail settings
Submitter Sebastian Spaeth
Date March 11, 2010, 1:17 p.m.
Message ID <1268313433-7030-3-git-send-email-Sebastian@SSpaeth.de>
Download mbox | patch
Permalink /patch/47316/
State Superseded
Delegated to: Stefan Bader
Headers show

Comments

Sebastian Spaeth - March 11, 2010, 1:17 p.m.
From: Takashi Iwai <tiwai@suse.de>

Add missing TST_CFG_WRITE bits around sky2_pci_write*() in Optima
setup routines.  Without the cfg-write bits, the driver may spew endless
link-up messages through qlink irq.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---
 drivers/net/sky2.c |    4 ++++
 1 file changed, 4 insertions(+)

Patch

--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2122,7 +2122,9 @@  static void sky2_qlink_intr(struct sky2_
 
 	/* reset PHY Link Detect */
 	phy = sky2_pci_read16(hw, PSM_CONFIG_REG4);
+	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
 	sky2_pci_write16(hw, PSM_CONFIG_REG4, phy | 1);
+	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
 	sky2_link_up(sky2);
 }
@@ -3043,6 +3045,7 @@  static void sky2_reset(struct sky2_hw *h
 		reg <<= PSM_CONFIG_REG4_TIMER_PHY_LINK_DETECT_BASE;
 
 		/* reset PHY Link Detect */
+		sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
 		sky2_pci_write16(hw, PSM_CONFIG_REG4,
 				 reg | PSM_CONFIG_REG4_RST_PHY_LINK_DETECT);
 		sky2_pci_write16(hw, PSM_CONFIG_REG4, reg);
@@ -3061,6 +3064,7 @@  static void sky2_reset(struct sky2_hw *h
 			/* restore the PCIe Link Control register */
 			sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
 		}
+		sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
 		/* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
 		sky2_write32(hw, Y2_PEX_PHY_DATA, PEX_DB_ACCESS | (0x08UL << 16));