]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
sky2: pci posting issues
authorstephen hemminger <shemminger@vyatta.com>
Wed, 16 Nov 2011 13:42:56 +0000 (13:42 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Nov 2011 01:27:09 +0000 (20:27 -0500)
A couple of the reset and setup paths have possible PCI posting issues.
When setting registers, a read is necessary to force the writes to complete.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/sky2.c

index f9c4529299bd9bccc45716ed3173aebf080a2fa7..98ad38a5588feed84aa9e35338e5661e0dad83e8 100644 (file)
@@ -869,6 +869,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
 
        /* block receiver */
        sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
+       sky2_read32(hw, B0_CTST);
 }
 
 static void sky2_set_tx_stfwd(struct sky2_hw *hw, unsigned port)
@@ -2045,6 +2046,8 @@ static void sky2_tx_reset(struct sky2_hw *hw, unsigned port)
 
        sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);
        sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
+
+       sky2_read32(hw, B0_CTST);
 }
 
 static void sky2_hw_down(struct sky2_port *sky2)