Commit ff35164e authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[SKY2]: fix power settings on Yukon XL 



Make sure PCI register for PHY power gets set correctly.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 295b54c4

drivers/net/sky2.c

+6 −7
Original line number Diff line number Diff line
@@ -606,20 +606,19 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff) 
{

	struct pci_dev *pdev = hw->pdev;

	u32 reg1;

	static const u32 phy_power[]

		= { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };



	/* looks like this XL is back asswards .. */

	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)

		onoff = !onoff;

	static const u32 phy_power[] = { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };

	static const u32 coma_mode[] = { PCI_Y2_PHY1_COMA, PCI_Y2_PHY2_COMA };



	pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);

	/* Turn on/off phy power saving */

	if (onoff)

		/* Turn off phy power saving */

		reg1 &= ~phy_power[port];

	else

		reg1 |= phy_power[port];



	if (onoff && hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)

		reg1 |= coma_mode[port];



	pci_write_config_dword(pdev, PCI_DEV_REG1, reg1);

	pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);