sky2: Use 32bit read to read Y2_VAUX_AVAIL
Subsystems (2)
PATCH 1/1 sky2: Use 32bit read to read Y2_VAUX_AVAIL
B0_CTST is a 24bit register according to the vendor driver (sk98lin). A 16bit read on B0_CTST will always return 0 for Y2_VAUX_AVAIL (1<<16),
so use a 32bit read when testing Y2_VAUX_AVAIL
--- drivers/net/sky2.c | 2 +- drivers/net/sky2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/sky2.c +1 -1
@@ -273,7 +273,7 @@ static void sky2_power_aux(struct sky2_hw *hw) Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS);/* switch power to VAUX */ -if (sky2_read16 (hw,B0_CTST ) &Y2_VAUX_AVAIL ) +if (sky2_read32 (hw,B0_CTST ) &Y2_VAUX_AVAIL )sky2_write8 (hw,B0_POWER_CTRL , (PC_VAUX_ENA |PC_VCC_ENA |PC_VAUX_ON |PC_VCC_OFF ));
drivers/net/sky2.h +1 -1
@@ -260,7 +260,7 @@ enum csr_regs { Y2_CFG_AER = 0x1d00, /* PCI Advanced Error Report region */ }; -/* B0_CTST 16 bit Control/Status register */ +/* B0_CTST 24 bit Control/Status register */ enum {Y2_VMAIN_AVAIL =1 <<17 ,/* VMAIN available (YUKON-2 only) */ Y2_VAUX_AVAIL =1 <<16 ,/* VAUX available (YUKON-2 only) */
Signature · 1 line
1.5.6.5
Quoted 28 lines · On Tue, 01 Sep 2009 22:54:27 +0900 Mike McCormack <[email protected]> wrote:
B0_CTSTis a 24bit register according to the vendor driver (sk98lin). A 16bit read onB0_CTSTwill always return 0 forY2_VAUX_AVAIL(1<<16),
so use a 32bit read when testingY2_VAUX_AVAILSigned-off-by Mike McCormack <[email protected]>--- drivers/net/sky2.c | 2 +- drivers/net/sky2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/net/sky2.c +1
-1@@ -273,7 +273,7 @@ static void sky2_power_aux(struct sky2_hw *hw) Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS);/* switch power to VAUX */ -if (sky2_read16 (hw,B0_CTST ) &Y2_VAUX_AVAIL ) +if (sky2_read32 (hw,B0_CTST ) &Y2_VAUX_AVAIL )sky2_write8 (hw,B0_POWER_CTRL , (PC_VAUX_ENA |PC_VCC_ENA |PC_VAUX_ON |PC_VCC_OFF ));drivers/net/sky2.h +0
-0
drivers/net/sky2.h enum csr_regs { · line 266
Quoted 8 lines
drivers/net/sky2.h +1
-1@@ -260,7 +260,7 @@ enum csr_regs { Y2_CFG_AER = 0x1d00, /* PCI Advanced Error Report region */ }; -/* B0_CTST 16 bit Control/Status register */ +/* B0_CTST 24 bit Control/Status register */ enum {Y2_VMAIN_AVAIL =1 <<17 ,/* VMAIN available (YUKON-2 only) */ Y2_VAUX_AVAIL =1 <<16 ,/* VAUX available (YUKON-2 only) */
From: Stephen Hemminger <[email protected]>
Date: Tue, 1 Sep 2009 08:57:57 -0700
Quoted 8 lines
Quoted 5 lines · On Tue, 01 Sep 2009 22:54:27 +0900 Mike McCormack <[email protected]> wrote:
B0_CTSTis a 24bit register according to the vendor driver (sk98lin). A 16bit read onB0_CTSTwill always return 0 forY2_VAUX_AVAIL(1<<16),
so use a 32bit read when testingY2_VAUX_AVAILSigned-off-by Mike McCormack <[email protected]>
...
Quoted 1 line
Applied.