From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Date: Wed, 29 Apr 2009 15:07:47 -0700 Subject: [ath9k-devel] [patch 48/58] ath9k: AR9280 PCI devices must serialize IO as well In-Reply-To: <20090429221657.GA11765@kroah.com> References: <20090429220659.339950874@mini.kroah.org> Message-ID: <20090429220930.126527883@mini.kroah.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org An embedded and charset-unspecified text was scrubbed... Name: ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch Url: http://lists.ath9k.org/pipermail/ath9k-devel/attachments/20090429/3b3642b3/attachment.txt From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from kroah.org ([198.145.64.141]:40710 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760094AbZD2WVs (ORCPT ); Wed, 29 Apr 2009 18:21:48 -0400 Message-Id: <20090429220930.126527883@mini.kroah.org> (sfid-20090430_002214_342707_4AEB7EBD) Date: Wed, 29 Apr 2009 15:07:47 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , Theodore Ts'o , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "Luis R. Rodriguez" , ath9k-devel@venema.h4ckr.net, linux-wireless@vger.kernel.org Subject: [patch 48/58] ath9k: AR9280 PCI devices must serialize IO as well References: <20090429220659.339950874@mini.kroah.org> In-Reply-To: <20090429221657.GA11765@kroah.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Luis R. Rodriguez This is a port of: commit SHA1 5ec905a8df3fa877566ba98298433fbfb3d688cc for 2.6.27 Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath9k/hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c @@ -3313,7 +3313,8 @@ static struct ath_hal *ath9k_hw_do_attac } if (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) { - if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) { + if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI || + (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) { ah->ah_config.serialize_regmode = SER_REG_MODE_ON; } else { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762939AbZD2WkU (ORCPT ); Wed, 29 Apr 2009 18:40:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760053AbZD2WVx (ORCPT ); Wed, 29 Apr 2009 18:21:53 -0400 Received: from kroah.org ([198.145.64.141]:40710 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760094AbZD2WVs (ORCPT ); Wed, 29 Apr 2009 18:21:48 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Wed Apr 29 15:09:30 2009 Message-Id: <20090429220930.126527883@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 29 Apr 2009 15:07:47 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "Luis R. Rodriguez" , ath9k-devel@venema.h4ckr.net, linux-wireless@vger.kernel.org Subject: [patch 48/58] ath9k: AR9280 PCI devices must serialize IO as well References: <20090429220659.339950874@mini.kroah.org> Content-Disposition: inline; filename=ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch In-Reply-To: <20090429221657.GA11765@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Luis R. Rodriguez This is a port of: commit SHA1 5ec905a8df3fa877566ba98298433fbfb3d688cc for 2.6.27 Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath9k/hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c @@ -3313,7 +3313,8 @@ static struct ath_hal *ath9k_hw_do_attac } if (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) { - if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) { + if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI || + (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) { ah->ah_config.serialize_regmode = SER_REG_MODE_ON; } else {