From: "Rafał Miłecki" <zajec5@gmail.com>
To: linux-wireless@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>
Cc: b43-dev@lists.infradead.org,
"Gábor Stefanik" <netrolller.3d@gmail.com>,
"Rafał Miłecki" <zajec5@gmail.com>
Subject: [PATCH 1/2] b43: N-PHY: band width setting with dumb clock control call
Date: Sun, 22 Aug 2010 21:49:48 +0200 [thread overview]
Message-ID: <1282506589-8220-1-git-send-email-zajec5@gmail.com> (raw)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/net/wireless/b43/phy_common.c | 20 ++++++++++++++++++++
drivers/net/wireless/b43/phy_common.h | 11 +++++++++++
drivers/net/wireless/b43/phy_n.c | 4 ++--
drivers/net/wireless/b43/phy_n.h | 1 -
4 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 8f7d7ef..b06e3f0 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -466,3 +466,23 @@ struct b43_c32 b43_cordic(int theta)
return ret;
}
+
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/ClkCtlClk */
+static void b43_clock_control(struct b43_wldev *dev, u32 mode)
+{
+ ; /* TODO */
+}
+
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/BmacBwSet */
+void b43_bmac_set_b_width(struct b43_wldev *dev, u8 b_width)
+{
+ bool fast = dev->phy.forcefastclk;;
+ if (!fast)
+ b43_clock_control(dev, 0);
+ dev->phy.b_width = b_width;
+ b43_read32(dev, B43_MMIO_MACCTL); /* flush writes */
+ /* TODO: Call PHY BMAC Reset */
+ dev->phy.ops->init(dev);
+ if (fast)
+ b43_clock_control(dev, 2);
+}
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index bd480b4..9886db0 100644
--- a/drivers/net/wireless/b43/phy_common.h
+++ b/drivers/net/wireless/b43/phy_common.h
@@ -218,6 +218,9 @@ struct b43_phy {
bool supports_2ghz;
bool supports_5ghz;
+ /* Band width */
+ u8 b_width;
+
/* HT info */
bool is_40mhz;
@@ -256,6 +259,9 @@ struct b43_phy {
/* PHY TX errors counter. */
atomic_t txerr_cnt;
+ /* Clock */
+ bool forcefastclk;
+
#ifdef CONFIG_B43_DEBUG
/* PHY registers locked (w.r.t. firmware) */
bool phy_locked;
@@ -429,4 +435,9 @@ void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on);
struct b43_c32 b43_cordic(int theta);
+/**
+ * b43_bmac_set_b_width - Set band width
+ */
+void b43_bmac_set_b_width(struct b43_wldev *dev, u8 b_width);
+
#endif /* LINUX_B43_PHY_COMMON_H_ */
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 2466c0a..ac217da 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3410,8 +3410,8 @@ static int b43_nphy_set_chanspec(struct b43_wldev *dev,
nphy->radio_chanspec = chanspec;
- if (chanspec.b_width != nphy->b_width)
- ; /* TODO: BMAC BW Set (chanspec.b_width) */
+ if (chanspec.b_width != dev->phy.b_width)
+ b43_bmac_set_b_width(dev, chanspec.b_width);
/* TODO: use defines */
if (chanspec.b_width == 3) {
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h
index 8b6d570..e7acae2 100644
--- a/drivers/net/wireless/b43/phy_n.h
+++ b/drivers/net/wireless/b43/phy_n.h
@@ -984,7 +984,6 @@ struct b43_phy_n {
u16 papd_epsilon_offset[2];
s32 preamble_override;
u32 bb_mult_save;
- u8 b_width;
struct b43_chanspec radio_chanspec;
bool gain_boost;
--
1.7.1
next reply other threads:[~2010-08-22 19:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-22 19:49 Rafał Miłecki [this message]
2010-08-22 19:49 ` [PATCH 2/2] b43: N-PHY: add sub calls of band width setting Rafał Miłecki
2010-08-22 19:52 ` Gábor Stefanik
2010-08-22 19:58 ` Rafał Miłecki
2010-08-22 20:04 ` Gábor Stefanik
2010-08-22 20:14 ` Rafał Miłecki
2010-08-22 20:29 ` Larry Finger
2010-08-25 19:07 ` Michael Büsch
2010-08-22 23:20 ` [PATCH 1/2] b43: N-PHY: band width setting with dumb clock control call Julian Calaby
2010-08-22 23:30 ` Gábor Stefanik
2010-08-22 23:37 ` Rafał Miłecki
2010-08-23 22:53 ` Rafał Miłecki
2010-08-23 23:17 ` Larry Finger
2010-08-23 23:56 ` Gábor Stefanik
2010-08-22 23:35 ` Rafał Miłecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282506589-8220-1-git-send-email-zajec5@gmail.com \
--to=zajec5@gmail.com \
--cc=b43-dev@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netrolller.3d@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).