Commit 2ca4231d authored by Mike McCormack's avatar Mike McCormack Committed by David S. Miller
Browse files

sky2: Enable/disable WOL per hardware device 



Y2_HW_WOL_ON/Y2_HW_WOL_OFF should be set and cleared per chip,
not per port.  On dual port cards, Y2_HW_WOL_ON should be
enabled if either sky2 port has WOL enabled.

Found while reviewing code for a WOL regression, though this is
probably not the cause of the regression.

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e1e8a47

drivers/net/sky2.c

+22 −7
Original line number Diff line number Diff line
@@ -3228,6 +3228,27 @@ static inline u8 sky2_wol_supported(const struct sky2_hw *hw) 
	return sky2_is_copper(hw) ? (WAKE_PHY | WAKE_MAGIC) : 0;

}



static void sky2_hw_set_wol(struct sky2_hw *hw)

{

	int wol = 0;

	int i;



	for (i = 0; i < hw->ports; i++) {

		struct net_device *dev = hw->dev[i];

		struct sky2_port *sky2 = netdev_priv(dev);



		if (sky2->wol)

			wol = 1;

	}



	if (hw->chip_id == CHIP_ID_YUKON_EC_U ||

	    hw->chip_id == CHIP_ID_YUKON_EX ||

	    hw->chip_id == CHIP_ID_YUKON_FE_P)

		sky2_write32(hw, B0_CTST, wol ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);



	device_set_wakeup_enable(&hw->pdev->dev, wol);

}



static void sky2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)

{

	const struct sky2_port *sky2 = netdev_priv(dev);
@@ -3247,13 +3268,7 @@ static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 


	sky2->wol = wol->wolopts;



	if (hw->chip_id == CHIP_ID_YUKON_EC_U ||

	    hw->chip_id == CHIP_ID_YUKON_EX ||

	    hw->chip_id == CHIP_ID_YUKON_FE_P)

		sky2_write32(hw, B0_CTST, sky2->wol

			     ? Y2_HW_WOL_ON : Y2_HW_WOL_OFF);



	device_set_wakeup_enable(&hw->pdev->dev, sky2->wol);

	sky2_hw_set_wol(hw);



	if (!netif_running(dev))

		sky2_wol_init(sky2);

CRA Git | Maintained and supported by SUSTech CRA and CCSE