From patchwork Tue Sep 1 13:54:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 32748 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id AE0DBB7B64 for ; Tue, 1 Sep 2009 23:58:37 +1000 (EST) Received: by ozlabs.org (Postfix) id 9E1B9DDD0B; Tue, 1 Sep 2009 23:58:37 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 1DA6EDDD01 for ; Tue, 1 Sep 2009 23:58:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754862AbZIAN60 (ORCPT ); Tue, 1 Sep 2009 09:58:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754831AbZIAN60 (ORCPT ); Tue, 1 Sep 2009 09:58:26 -0400 Received: from mail-px0-f203.google.com ([209.85.216.203]:63674 "EHLO mail-px0-f203.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754827AbZIAN6Z (ORCPT ); Tue, 1 Sep 2009 09:58:25 -0400 Received: by pxi42 with SMTP id 42so2272pxi.20 for ; Tue, 01 Sep 2009 06:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=MzByuI3ybAXuGR4tVCJQ9S1uesw2Zjz40sM4DKfNLz8=; b=FkjgGPRyRuIPslnVyDxruK3tG6w6xmfz1Q6Xomu8qGcFjVLKauNukGCXpTFg12z7Re W0nhOf2seVhd9AV74DW7LokJMg5YLhiSYlQzU3OBaBJZUmeSDRybPg1OGW5hF+0yCZP9 Bn770Zt7E61mMCEiqjXzxf9gka3I4Rt3bgnJ4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=ouznP7v6eHNSWZbNnsP8PBkQTqLwG/cBkp8LEb9h9YjiCJ6y9F/wuxK7sZQ2xiooi0 0Yj7qFXUdzyIvrRGeb1xar4+xNs2qjClnPNNS5rEPb5aSLYJCykrOj1E4G91nJ0qINq/ EcTvJ3sa0PfjkezrDjUPiw5xs68dEKpwJKdSw= Received: by 10.114.253.23 with SMTP id a23mr4518742wai.155.1251813507637; Tue, 01 Sep 2009 06:58:27 -0700 (PDT) Received: from ?192.168.0.100? ([121.168.21.96]) by mx.google.com with ESMTPS id j15sm1068888waf.16.2009.09.01.06.58.25 (version=SSLv3 cipher=RC4-MD5); Tue, 01 Sep 2009 06:58:26 -0700 (PDT) Message-ID: <4A9D2793.1020502@ring3k.org> Date: Tue, 01 Sep 2009 22:54:27 +0900 From: Mike McCormack User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090706) MIME-Version: 1.0 To: Stephen Hemminger CC: netdev@vger.kernel.org Subject: [PATCH] sky2: Use 32bit read to read Y2_VAUX_AVAIL Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Stephen Hemminger --- 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) */