From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH] sky2: Use 32bit read to read Y2_VAUX_AVAIL Date: Tue, 1 Sep 2009 08:57:57 -0700 Message-ID: <20090901085757.47b5c09c@nehalam> References: <4A9D2793.1020502@ring3k.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: Mike McCormack Return-path: Received: from mail.vyatta.com ([76.74.103.46]:38850 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754067AbZIAP6B (ORCPT ); Tue, 1 Sep 2009 11:58:01 -0400 In-Reply-To: <4A9D2793.1020502@ring3k.org> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, 01 Sep 2009 22:54:27 +0900 Mike McCormack wrote: > 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 > > Signed-off-by: Mike McCormack > --- > drivers/net/sky2.c | 2 +- > drivers/net/sky2.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c > index 7108b12..d1f3b46 100644 > --- a/drivers/net/sky2.c > +++ b/drivers/net/sky2.c > @@ -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)); > diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h > index 34042ff..e0f23a1 100644 > --- a/drivers/net/sky2.h > +++ b/drivers/net/sky2.h > @@ -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) */ Acked-by: Stephen Hemminger