Commit 4cde06ed authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] skge: ignore phy interrupts during negotiation 



During autonegotiation set PHY interrupt mask to ignore
bogus speed change interrupts.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent d8a09943

drivers/net/skge.c

+3 −3
Original line number Diff line number Diff line
@@ -1660,9 +1660,9 @@ static void yukon_init(struct skge_hw *hw, int port) 


	/* Enable phy interrupt on autonegotiation complete (or link up) */

	if (skge->autoneg == AUTONEG_ENABLE)

		gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL);

		gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_MSK);

	else

		gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);

		gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_DEF_MSK);

}



static void yukon_reset(struct skge_hw *hw, int port)
@@ -1891,7 +1891,7 @@ static void yukon_link_up(struct skge_port *skge) 
	reg |= GM_GPCR_RX_ENA | GM_GPCR_TX_ENA;

	gma_write16(hw, port, GM_GP_CTRL, reg);



	gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);

	gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_DEF_MSK);

	skge_link_up(skge);

}

drivers/net/skge.h

+5 −3
Original line number Diff line number Diff line
@@ -1449,10 +1449,12 @@ enum { 
	PHY_M_IS_DTE_CHANGE	= 1<<2, /* DTE Power Det. Status Changed */

	PHY_M_IS_POL_CHANGE	= 1<<1, /* Polarity Changed */

	PHY_M_IS_JABBER		= 1<<0, /* Jabber */

};



#define PHY_M_DEF_MSK	( PHY_M_IS_AN_ERROR | PHY_M_IS_LSP_CHANGE | \

			  PHY_M_IS_LST_CHANGE | PHY_M_IS_FIFO_ERROR)

	PHY_M_IS_DEF_MSK	= PHY_M_IS_AN_ERROR | PHY_M_IS_LSP_CHANGE |

				  PHY_M_IS_LST_CHANGE | PHY_M_IS_FIFO_ERROR,



	PHY_M_IS_AN_MSK		= PHY_M_IS_AN_ERROR | PHY_M_IS_AN_COMPL,

};



/*****  PHY_MARV_EXT_CTRL	16 bit r/w	Ext. PHY Specific Ctrl *****/

enum {