Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86a31a75 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] sky2: more fixes for Yukon Ultra 



Logic error in the phy initialization code. Also, turn on wake on lan
bit in status control.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2d2a3871

drivers/net/sky2.c

+2 −1
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) 
		}



		if (hw->chip_id == CHIP_ID_YUKON_EC_U) {

			sky2_write16(hw, B0_CTST, Y2_HW_WOL_ON);

			sky2_pci_write32(hw, PCI_DEV_REG3, 0);

			reg1 = sky2_pci_read32(hw, PCI_DEV_REG4);

			reg1 &= P_ASPM_CONTROL_MSK;
@@ -307,7 +308,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port) 
	u16 ctrl, ct1000, adv, pg, ledctrl, ledover;



	if (sky2->autoneg == AUTONEG_ENABLE &&

	    (hw->chip_id != CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)) {

	    !(hw->chip_id == CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)) {

		u16 ectrl = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL);



		ectrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |

drivers/net/sky2.h

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ enum csr_regs { 
enum {

	Y2_VMAIN_AVAIL	= 1<<17,/* VMAIN available (YUKON-2 only) */

	Y2_VAUX_AVAIL	= 1<<16,/* VAUX available (YUKON-2 only) */

	Y2_HW_WOL_ON	= 1<<15,/* HW WOL On  (Yukon-EC Ultra A1 only) */

	Y2_HW_WOL_OFF	= 1<<14,/* HW WOL On  (Yukon-EC Ultra A1 only) */

	Y2_ASF_ENABLE	= 1<<13,/* ASF Unit Enable (YUKON-2 only) */

	Y2_ASF_DISABLE	= 1<<12,/* ASF Unit Disable (YUKON-2 only) */

	Y2_CLK_RUN_ENA	= 1<<11,/* CLK_RUN Enable  (YUKON-2 only) */