From patchwork Fri Jun 10 06:48:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Chadd X-Patchwork-Id: 867942 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5A6m4DB001246 for ; Fri, 10 Jun 2011 06:48:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752568Ab1FJGsD (ORCPT ); Fri, 10 Jun 2011 02:48:03 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:61227 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751634Ab1FJGsB (ORCPT ); Fri, 10 Jun 2011 02:48:01 -0400 Received: by gxk21 with SMTP id 21so1446888gxk.19 for ; Thu, 09 Jun 2011 23:48:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=yfwqfbUd38mZ6yWA9az3KOUjgGxq0Ijq+bfoPXmZRG8=; b=qOHENmv82Qjzi9cwRgd5IsOQ2EUNXgthV1MuFTIlxa58yukNMXQh3lkE+sQ2bwyTaT Zwtqx1oNxAQAv2V7Prdn/Nr0VFQ+LcxSrtOZdKAiV6ya4oj58BoVup5vMaOb0NeJK8zI g/2kmPbSwIfDI3IdeRVrVdgOjtRDVNbKNhhIs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; b=X3tjJwUF1vzvg00JnZei2fAtC5dKw4YoxSsFIa9PQo3DXHnb2Oehyd9Df5/Yu/L3F0 mY9v1PMZh2YtDnONUNie9Fd/ghYtjnbzBOXNwmXZ7DfEF7lcKKoNmSUL3D+yuOEOXXoZ RoGuQ4nGhygJ6k0EFG9Od9vnUVJ2gBGyiY6EE= MIME-Version: 1.0 Received: by 10.150.72.23 with SMTP id u23mr2994710yba.160.1307688480785; Thu, 09 Jun 2011 23:48:00 -0700 (PDT) Received: by 10.150.216.3 with HTTP; Thu, 9 Jun 2011 23:48:00 -0700 (PDT) In-Reply-To: <20110224200203.GB17412@elie> References: <20110224182022.57e32862@toddler> <20110224200203.GB17412@elie> Date: Fri, 10 Jun 2011 14:48:00 +0800 X-Google-Sender-Auth: cE33p8SiKymcWGH3OF6B7aImI8Q Message-ID: Subject: Re: ath9k causes lockups since kernel 2.6.35 From: Adrian Chadd To: Jonathan Nieder Cc: ath9k-devel@venema.h4ckr.net, Tony Houghton , linux-wireless Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Jun 2011 06:48:05 +0000 (UTC) Hi all, This patch against the current wireless-testing tree restores bit 6/7 being set for the AR9285. Tony, would you please test this out and see if this works? This is against the latest wireless-testing. Thanks, Adrian the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c index f344cc2..5e4e37f 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c @@ -384,6 +384,7 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, } } +#if 0 if (AR_SREV_9280(ah) || AR_SREV_9285(ah) || AR_SREV_9287(ah)) { /* * Disable bit 6 and 7 before entering D3 to @@ -391,6 +392,7 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, */ val &= ~(AR_WA_BIT6 | AR_WA_BIT7); } +#endif if (AR_SREV_9280(ah)) val |= AR_WA_BIT22; diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h index c18ee99..a3c893d 100644 --- a/drivers/net/wireless/ath/ath9k/reg.h +++ b/drivers/net/wireless/ath/ath9k/reg.h @@ -704,7 +704,7 @@ #define AR_WA_ANALOG_SHIFT (1 << 20) #define AR_WA_POR_SHORT (1 << 21) /* PCI-E Phy reset control */ #define AR_WA_BIT22 (1 << 22) -#define AR9285_WA_DEFAULT 0x004a050b +#define AR9285_WA_DEFAULT 0x004a05cb #define AR9280_WA_DEFAULT 0x0040073b #define AR_WA_DEFAULT 0x0000073f -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in