From patchwork Mon Jun 27 22:08:53 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: 922582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5RME3SN026423 for ; Mon, 27 Jun 2011 22:14:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755043Ab1F0WM6 (ORCPT ); Mon, 27 Jun 2011 18:12:58 -0400 Received: from mail-fx0-f52.google.com ([209.85.161.52]:44952 "EHLO mail-fx0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755046Ab1F0WIL (ORCPT ); Mon, 27 Jun 2011 18:08:11 -0400 Received: by mail-fx0-f52.google.com with SMTP id 18so2183704fxd.11 for ; Mon, 27 Jun 2011 15:08:10 -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=cM+hVtGXCRLJ5GxULL0k9eN6GC7Npw+D5A+APjPXP6I=; b=g4eDKmR4AUrNjRMiUwo+Oj3jqPUK+IIPqtC9ktjU3FV2WnDzC4GgOe8yozSI4Ib2kq 6aeHfi1mY9Y3UTs0RagY071euTfB8kEpKS6XAwLl96kRKssuEdbnUJ9inJyM4+p1Rbfk oY3rp0rC64gk/9e6yafqUzu31rC03fwS0lUag= 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=uuCpvX5p0hjPKXczUy0CsL1Kq1shderW9mBWpKa4l76ULMBIfbZIDdO7BOYLbXB3om Oc4atuXsO1sUzvMAE80n05p0kT2Tp8wC/iELaeFmysFMiJsK/Ufm8rukJyu1uCR+H+rp Sf3NfoGIOnhAqgkF/fcmH7VOkbKAOtXv/bX+I= Received: by 10.223.43.1 with SMTP id u1mr3016386fae.38.1309212490694; Mon, 27 Jun 2011 15:08:10 -0700 (PDT) Received: from localhost.localdomain (acyg40.neoplus.adsl.tpnet.pl [83.11.190.40]) by mx.google.com with ESMTPS id 7sm2444461fat.18.2011.06.27.15.08.08 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 15:08:09 -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/2] b43: HT-PHY: init radio when enabling it Date: Tue, 28 Jun 2011 00:08:53 +0200 Message-Id: <1309212533-4473-2-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1309212533-4473-1-git-send-email-zajec5@gmail.com> References: <1309212533-4473-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 (demeter2.kernel.org [140.211.167.43]); Mon, 27 Jun 2011 22:14:03 +0000 (UTC) Masks and sets were found in MMIO dumps by using MMIO hacks. Shortly: radio_write(0x0c51) <- 0x0070 radio_write(0x0c5a) <- 0x0003 radio_write(0x0146) <- 0x0003 radio_write(0x0546) <- 0x0003 radio_write(0x0946) <- 0x0003 radio_write(0x002e) <- 0x0078 radio_write(0x00c0) <- 0x0080 radio_write(0x002e) <- 0xff87 radio_write(0x00c0) <- 0xff7f radio_write(0x0011) <- 0xfff7 Signed-off-by: Rafa? Mi?ecki --- The long versions of the dumps that were used to write it: radio_write(0x0c51) <- 0x0070 radio_write(0x0c5a) <- 0x0003 radio_read(0x0146) -> 0x0000 radio_write(0x0146) <- 0x0003 radio_read(0x0546) -> 0x0000 radio_write(0x0546) <- 0x0003 radio_read(0x0946) -> 0x0000 radio_write(0x0946) <- 0x0003 radio_read(0x002e) -> 0x0000 radio_write(0x002e) <- 0x0078 radio_read(0x00c0) -> 0x0000 radio_write(0x00c0) <- 0x0080 radio_read(0x002e) -> 0x0000 radio_write(0x002e) <- 0x0000 radio_read(0x00c0) -> 0x0000 radio_write(0x00c0) <- 0x0000 radio_read(0x0011) -> 0x0000 radio_write(0x0011) <- 0x0000 ***** radio_write(0x0c51) <- 0x0070 radio_write(0x0c5a) <- 0x0003 radio_read(0x0146) -> 0xffff radio_write(0x0146) <- 0xffff radio_read(0x0546) -> 0xffff radio_write(0x0546) <- 0xffff radio_read(0x0946) -> 0xffff radio_write(0x0946) <- 0xffff radio_read(0x002e) -> 0xffff radio_write(0x002e) <- 0xffff radio_read(0x00c0) -> 0xffff radio_write(0x00c0) <- 0xffff radio_read(0x002e) -> 0xffff radio_write(0x002e) <- 0xff87 radio_read(0x00c0) -> 0xffff radio_write(0x00c0) <- 0xff7f radio_read(0x0011) -> 0xffff radio_write(0x0011) <- 0xfff7 --- drivers/net/wireless/b43/phy_ht.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c index 8df92e1..28fb746 100644 --- a/drivers/net/wireless/b43/phy_ht.c +++ b/drivers/net/wireless/b43/phy_ht.c @@ -28,6 +28,10 @@ #include "radio_2059.h" #include "main.h" +/************************************************** + * Radio 2059. + **************************************************/ + static void b43_radio_2059_channel_setup(struct b43_wldev *dev, const struct b43_phy_ht_channeltab_e_radio2059 *e) { @@ -79,6 +83,30 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev, udelay(300); } +static void b43_radio_2059_init(struct b43_wldev *dev) +{ + const u16 routing[] = { R2059_SYN, R2059_TXRX0, R2059_RXRX1 }; + u8 i; + + b43_radio_write(dev, R2059_ALL | 0x51, 0x0070); + b43_radio_write(dev, R2059_ALL | 0x5a, 0x0003); + + for (i = 0; i < ARRAY_SIZE(routing); i++) + b43_radio_set(dev, routing[i] | 0x146, 0x3); + + b43_radio_set(dev, 0x2e, 0x0078); + b43_radio_set(dev, 0xc0, 0x0080); + msleep(2); + b43_radio_mask(dev, 0x2e, ~0x0078); + b43_radio_mask(dev, 0xc0, ~0x0080); + + b43_radio_mask(dev, 0x11, 0x0008); +} + +/************************************************** + * Channel switching ops. + **************************************************/ + 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) @@ -200,6 +228,11 @@ static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev, b43_phy_maskset(dev, B43_PHY_HT_RF_CTL1, ~0, 0x1); b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, ~0); b43_phy_maskset(dev, B43_PHY_HT_RF_CTL1, ~0, 0x2); + + if (dev->phy.radio_ver == 0x2059) + b43_radio_2059_init(dev); + else + B43_WARN_ON(1); } }