From patchwork Mon Jun 27 12:58:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 920642 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 p5RD37Br026868 for ; Mon, 27 Jun 2011 13:03:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759839Ab1F0M7z (ORCPT ); Mon, 27 Jun 2011 08:59:55 -0400 Received: from mail-fx0-f52.google.com ([209.85.161.52]:62841 "EHLO mail-fx0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756417Ab1F0M6I (ORCPT ); Mon, 27 Jun 2011 08:58:08 -0400 Received: by fxd18 with SMTP id 18so1789140fxd.11 for ; Mon, 27 Jun 2011 05:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=FpQeSvppht7nQYcFESOxywRaTM3m/pLqIxFNWd7PBmI=; b=nYheDZqTfvxwuulksf/F7Vtw17ArRxXRD+608V1v+SLbvGyL1clrqGtRplG2j0BD3W 82493dL4NkJX19WkgC1CJGX4/r+dnxDt01AWlDLyDJFZwbgo9kTbx5o3vg2vUHSsmhw/ 2W6VR2rq2HuASuWc9GbwhlsE/aieSRGT3mesU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=funItaTbVyupGBOTPA4lCMjVH1c3TYEp9y85Qb4HJ33egPNmtFlvF79ctYQ/NO0Rqz ChF1/9Fveejohc31jHs5RHr57NWpsfd4TaZ4eyCCfG3FhR22rOGDBhofGci56HJEspQ/ XNN1jrygdNtszhFGEXfM1y75NKFxLmMuYW4Mw= Received: by 10.223.145.6 with SMTP id b6mr8948238fav.2.1309179487644; Mon, 27 Jun 2011 05:58:07 -0700 (PDT) Received: from localhost.localdomain (acyg40.neoplus.adsl.tpnet.pl [83.11.190.40]) by mx.google.com with ESMTPS id h1sm3518539fag.11.2011.06.27.05.58.05 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 05:58:06 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: linux-wireless@vger.kernel.org, "John W. Linville" Cc: b43-dev@lists.infradead.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 2/5] b43: HT-PHY: upload PHY values when switching channel Date: Mon, 27 Jun 2011 14:58:51 +0200 Message-Id: <1309179534-8081-2-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1309179534-8081-1-git-send-email-zajec5@gmail.com> References: <1309179534-8081-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 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]); Mon, 27 Jun 2011 13:03:54 +0000 (UTC) After calibrating radio you can find few PHY writes in MMIO dumps: phy_read(0x0009) -> 0x0000 phy_write(0x01ce) <- 0x03dd phy_write(0x01cf) <- 0x03d9 phy_write(0x01d0) <- 0x03d5 phy_write(0x01d1) <- 0x0424 phy_write(0x01d2) <- 0x0429 phy_write(0x01d3) <- 0x042d By comparing to N-PHY code we found out that they are PHY tables for channel switching plus band info read at the beginning. Signed-off-by: Rafa? Mi?ecki --- drivers/net/wireless/b43/phy_ht.c | 16 +++++++++++++++- drivers/net/wireless/b43/phy_ht.h | 14 +++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c index 72f01ce..c48bcf6 100644 --- a/drivers/net/wireless/b43/phy_ht.c +++ b/drivers/net/wireless/b43/phy_ht.c @@ -82,7 +82,21 @@ static void b43_phy_ht_channel_setup(struct b43_wldev *dev, const struct b43_phy_ht_channeltab_e_phy *e, struct ieee80211_channel *new_channel) { - /* TODO */ + bool old_band_5ghz; + + old_band_5ghz = b43_phy_read(dev, B43_PHY_HT_BANDCTL) & 0; /* FIXME */ + if (new_channel->band == IEEE80211_BAND_5GHZ && !old_band_5ghz) { + /* TODO */ + } else if (new_channel->band == IEEE80211_BAND_2GHZ && old_band_5ghz) { + /* TODO */ + } + + b43_phy_write(dev, B43_PHY_HT_BW1, e->bw1); + b43_phy_write(dev, B43_PHY_HT_BW2, e->bw2); + b43_phy_write(dev, B43_PHY_HT_BW3, e->bw3); + b43_phy_write(dev, B43_PHY_HT_BW4, e->bw4); + b43_phy_write(dev, B43_PHY_HT_BW5, e->bw5); + b43_phy_write(dev, B43_PHY_HT_BW6, e->bw6); } static int b43_phy_ht_set_channel(struct b43_wldev *dev, diff --git a/drivers/net/wireless/b43/phy_ht.h b/drivers/net/wireless/b43/phy_ht.h index afa448d..7ad7aff 100644 --- a/drivers/net/wireless/b43/phy_ht.h +++ b/drivers/net/wireless/b43/phy_ht.h @@ -4,9 +4,16 @@ #include "phy_common.h" +#define B43_PHY_HT_BANDCTL 0x009 /* Band control */ #define B43_PHY_HT_TABLE_ADDR 0x072 /* Table address */ #define B43_PHY_HT_TABLE_DATALO 0x073 /* Table data low */ #define B43_PHY_HT_TABLE_DATAHI 0x074 /* Table data high */ +#define B43_PHY_HT_BW1 0x1CE +#define B43_PHY_HT_BW2 0x1CF +#define B43_PHY_HT_BW3 0x1D0 +#define B43_PHY_HT_BW4 0x1D1 +#define B43_PHY_HT_BW5 0x1D2 +#define B43_PHY_HT_BW6 0x1D3 #define B43_PHY_HT_RF_CTL1 B43_PHY_EXTG(0x010) @@ -20,7 +27,12 @@ /* Values for PHY registers used on channel switching */ struct b43_phy_ht_channeltab_e_phy { - /* TODO */ + u16 bw1; + u16 bw2; + u16 bw3; + u16 bw4; + u16 bw5; + u16 bw6; };