* [PATCH 1/4] bcma: trivial: add helpers for masking/setting
@ 2011-07-16 23:06 Rafał Miłecki
2011-07-16 23:06 ` [PATCH 2/4] bcma: allow setting FAST clockmode for a core Rafał Miłecki
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Rafał Miłecki @ 2011-07-16 23:06 UTC (permalink / raw)
To: linux-wireless, John W. Linville; +Cc: b43-dev, Rafał Miłecki
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
include/linux/bcma/bcma.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 3895aeb..6e5dc7b 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -243,8 +243,16 @@ void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)
core->bus->ops->awrite32(core, offset, value);
}
+#define bcma_mask32(cc, offset, mask) \
+ bcma_write32(cc, offset, bcma_read32(cc, offset) & (mask))
+#define bcma_set32(cc, offset, set) \
+ bcma_write32(cc, offset, bcma_read32(cc, offset) | (set))
+#define bcma_maskset32(cc, offset, mask, set) \
+ bcma_write32(cc, offset, (bcma_read32(cc, offset) & (mask)) | (set))
+
extern bool bcma_core_is_enabled(struct bcma_device *core);
extern void bcma_core_disable(struct bcma_device *core, u32 flags);
extern int bcma_core_enable(struct bcma_device *core, u32 flags);
+
#endif /* LINUX_BCMA_H_ */
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] bcma: allow setting FAST clockmode for a core
2011-07-16 23:06 [PATCH 1/4] bcma: trivial: add helpers for masking/setting Rafał Miłecki
@ 2011-07-16 23:06 ` Rafał Miłecki
2011-07-19 20:42 ` John W. Linville
2011-07-16 23:06 ` [PATCH 3/4] bcma: allow enabling PLL Rafał Miłecki
2011-07-16 23:06 ` [PATCH 4/4] b43: bcma: implement full core reset Rafał Miłecki
2 siblings, 1 reply; 8+ messages in thread
From: Rafał Miłecki @ 2011-07-16 23:06 UTC (permalink / raw)
To: linux-wireless, John W. Linville; +Cc: b43-dev, Rafał Miłecki
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
drivers/bcma/core.c | 31 +++++++++++++++++++++++++++++++
include/linux/bcma/bcma.h | 8 +++++++-
2 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 1ec7d45..0686b1b 100644
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -50,3 +50,34 @@ int bcma_core_enable(struct bcma_device *core, u32 flags)
return 0;
}
EXPORT_SYMBOL_GPL(bcma_core_enable);
+
+void bcma_core_set_clockmode(struct bcma_device *core,
+ enum bcma_clkmode clkmode)
+{
+ u16 i;
+
+ WARN_ON(core->id.id != BCMA_CORE_CHIPCOMMON &&
+ core->id.id != BCMA_CORE_PCIE &&
+ core->id.id != BCMA_CORE_80211);
+
+ switch (clkmode) {
+ case BCMA_CLKMODE_FAST:
+ bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
+ udelay(64);
+ for (i = 0; i < 1500; i++) {
+ if (bcma_read32(core, BCMA_CLKCTLST) &
+ BCMA_CLKCTLST_HAVEHT) {
+ i = 0;
+ break;
+ }
+ udelay(10);
+ }
+ if (i)
+ pr_err("HT force timeout\n");
+ break;
+ case BCMA_CLKMODE_DYNAMIC:
+ pr_warn("Dynamic clockmode not supported yet!\n");
+ break;
+ }
+}
+EXPORT_SYMBOL_GPL(bcma_core_set_clockmode);
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 6e5dc7b..37017c1 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -25,6 +25,11 @@ struct bcma_chipinfo {
u8 pkg;
};
+enum bcma_clkmode {
+ BCMA_CLKMODE_FAST,
+ BCMA_CLKMODE_DYNAMIC,
+};
+
struct bcma_host_ops {
u8 (*read8)(struct bcma_device *core, u16 offset);
u16 (*read16)(struct bcma_device *core, u16 offset);
@@ -253,6 +258,7 @@ void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)
extern bool bcma_core_is_enabled(struct bcma_device *core);
extern void bcma_core_disable(struct bcma_device *core, u32 flags);
extern int bcma_core_enable(struct bcma_device *core, u32 flags);
-
+extern void bcma_core_set_clockmode(struct bcma_device *core,
+ enum bcma_clkmode clkmode);
#endif /* LINUX_BCMA_H_ */
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/4] bcma: allow setting FAST clockmode for a core
2011-07-16 23:06 ` [PATCH 2/4] bcma: allow setting FAST clockmode for a core Rafał Miłecki
@ 2011-07-19 20:42 ` John W. Linville
2011-07-19 20:50 ` Rafał Miłecki
0 siblings, 1 reply; 8+ messages in thread
From: John W. Linville @ 2011-07-19 20:42 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: linux-wireless, b43-dev
CC [M] drivers/bcma/core.o
drivers/bcma/core.c: In function ?bcma_core_set_clockmode?:
drivers/bcma/core.c:65:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
drivers/bcma/core.c:65:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/bcma/core.c:65:73: error: ?BCMA_CLKCTLST_FORCEHT? undeclared (first use in this function)
drivers/bcma/core.c:69:8: error: ?BCMA_CLKCTLST_HAVEHT? undeclared (first use in this function)
drivers/bcma/core.c: In function ?bcma_core_pll_ctl?:
drivers/bcma/core.c:89:35: error: ?BCMA_CLKCTLST_EXTRESREQ? undeclared (first use in this function)
drivers/bcma/core.c:90:38: error: ?BCMA_CLKCTLST_EXTRESST? undeclared (first use in this function)
drivers/bcma/core.c:93:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
make[2]: *** [drivers/bcma/core.o] Error 1
make[1]: *** [drivers/bcma] Error 2
make: *** [drivers] Error 2
On Sun, Jul 17, 2011 at 01:06:04AM +0200, Rafa? Mi?ecki wrote:
>
> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
> ---
> drivers/bcma/core.c | 31 +++++++++++++++++++++++++++++++
> include/linux/bcma/bcma.h | 8 +++++++-
> 2 files changed, 38 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
> index 1ec7d45..0686b1b 100644
> --- a/drivers/bcma/core.c
> +++ b/drivers/bcma/core.c
> @@ -50,3 +50,34 @@ int bcma_core_enable(struct bcma_device *core, u32 flags)
> return 0;
> }
> EXPORT_SYMBOL_GPL(bcma_core_enable);
> +
> +void bcma_core_set_clockmode(struct bcma_device *core,
> + enum bcma_clkmode clkmode)
> +{
> + u16 i;
> +
> + WARN_ON(core->id.id != BCMA_CORE_CHIPCOMMON &&
> + core->id.id != BCMA_CORE_PCIE &&
> + core->id.id != BCMA_CORE_80211);
> +
> + switch (clkmode) {
> + case BCMA_CLKMODE_FAST:
> + bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
> + udelay(64);
> + for (i = 0; i < 1500; i++) {
> + if (bcma_read32(core, BCMA_CLKCTLST) &
> + BCMA_CLKCTLST_HAVEHT) {
> + i = 0;
> + break;
> + }
> + udelay(10);
> + }
> + if (i)
> + pr_err("HT force timeout\n");
> + break;
> + case BCMA_CLKMODE_DYNAMIC:
> + pr_warn("Dynamic clockmode not supported yet!\n");
> + break;
> + }
> +}
> +EXPORT_SYMBOL_GPL(bcma_core_set_clockmode);
> diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
> index 6e5dc7b..37017c1 100644
> --- a/include/linux/bcma/bcma.h
> +++ b/include/linux/bcma/bcma.h
> @@ -25,6 +25,11 @@ struct bcma_chipinfo {
> u8 pkg;
> };
>
> +enum bcma_clkmode {
> + BCMA_CLKMODE_FAST,
> + BCMA_CLKMODE_DYNAMIC,
> +};
> +
> struct bcma_host_ops {
> u8 (*read8)(struct bcma_device *core, u16 offset);
> u16 (*read16)(struct bcma_device *core, u16 offset);
> @@ -253,6 +258,7 @@ void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)
> extern bool bcma_core_is_enabled(struct bcma_device *core);
> extern void bcma_core_disable(struct bcma_device *core, u32 flags);
> extern int bcma_core_enable(struct bcma_device *core, u32 flags);
> -
> +extern void bcma_core_set_clockmode(struct bcma_device *core,
> + enum bcma_clkmode clkmode);
>
> #endif /* LINUX_BCMA_H_ */
> --
> 1.7.3.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
John W. Linville Someday the world will need a hero, and you
linville at tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/4] bcma: allow setting FAST clockmode for a core
2011-07-19 20:42 ` John W. Linville
@ 2011-07-19 20:50 ` Rafał Miłecki
2011-07-19 20:54 ` Rafał Miłecki
0 siblings, 1 reply; 8+ messages in thread
From: Rafał Miłecki @ 2011-07-19 20:50 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, b43-dev
W dniu 19 lipca 2011 22:42 u?ytkownik John W. Linville
<linville@tuxdriver.com> napisa?:
> ?CC [M] ?drivers/bcma/core.o
> drivers/bcma/core.c: In function ?bcma_core_set_clockmode?:
> drivers/bcma/core.c:65:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
> drivers/bcma/core.c:65:22: note: each undeclared identifier is reported only once for each function it appears in
> drivers/bcma/core.c:65:73: error: ?BCMA_CLKCTLST_FORCEHT? undeclared (first use in this function)
> drivers/bcma/core.c:69:8: error: ?BCMA_CLKCTLST_HAVEHT? undeclared (first use in this function)
> drivers/bcma/core.c: In function ?bcma_core_pll_ctl?:
> drivers/bcma/core.c:89:35: error: ?BCMA_CLKCTLST_EXTRESREQ? undeclared (first use in this function)
> drivers/bcma/core.c:90:38: error: ?BCMA_CLKCTLST_EXTRESST? undeclared (first use in this function)
> drivers/bcma/core.c:93:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
> make[2]: *** [drivers/bcma/core.o] Error 1
> make[1]: *** [drivers/bcma] Error 2
> make: *** [drivers] Error 2
I'm sorry, that's quite normal you could lost order&dependency with
the amount of patches I've sent.
As nobody objected, please apply
[RFC][PATCH] bcma: move define of BCMA_CLKCTLST register
It should be applied before this one.
> On Sun, Jul 17, 2011 at 01:06:04AM +0200, Rafa? Mi?ecki wrote:
>>
>> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
>> ---
>> ?drivers/bcma/core.c ? ? ? | ? 31 +++++++++++++++++++++++++++++++
>> ?include/linux/bcma/bcma.h | ? ?8 +++++++-
>> ?2 files changed, 38 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
>> index 1ec7d45..0686b1b 100644
>> --- a/drivers/bcma/core.c
>> +++ b/drivers/bcma/core.c
>> @@ -50,3 +50,34 @@ int bcma_core_enable(struct bcma_device *core, u32 flags)
>> ? ? ? return 0;
>> ?}
>> ?EXPORT_SYMBOL_GPL(bcma_core_enable);
>> +
>> +void bcma_core_set_clockmode(struct bcma_device *core,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ?enum bcma_clkmode clkmode)
>> +{
>> + ? ? u16 i;
>> +
>> + ? ? WARN_ON(core->id.id != BCMA_CORE_CHIPCOMMON &&
>> + ? ? ? ? ? ? core->id.id != BCMA_CORE_PCIE &&
>> + ? ? ? ? ? ? core->id.id != BCMA_CORE_80211);
>> +
>> + ? ? switch (clkmode) {
>> + ? ? case BCMA_CLKMODE_FAST:
>> + ? ? ? ? ? ? bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
>> + ? ? ? ? ? ? udelay(64);
>> + ? ? ? ? ? ? for (i = 0; i < 1500; i++) {
>> + ? ? ? ? ? ? ? ? ? ? if (bcma_read32(core, BCMA_CLKCTLST) &
>> + ? ? ? ? ? ? ? ? ? ? ? ? BCMA_CLKCTLST_HAVEHT) {
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? i = 0;
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
>> + ? ? ? ? ? ? ? ? ? ? }
>> + ? ? ? ? ? ? ? ? ? ? udelay(10);
>> + ? ? ? ? ? ? }
>> + ? ? ? ? ? ? if (i)
>> + ? ? ? ? ? ? ? ? ? ? pr_err("HT force timeout\n");
>> + ? ? ? ? ? ? break;
>> + ? ? case BCMA_CLKMODE_DYNAMIC:
>> + ? ? ? ? ? ? pr_warn("Dynamic clockmode not supported yet!\n");
>> + ? ? ? ? ? ? break;
>> + ? ? }
>> +}
>> +EXPORT_SYMBOL_GPL(bcma_core_set_clockmode);
>> diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
>> index 6e5dc7b..37017c1 100644
>> --- a/include/linux/bcma/bcma.h
>> +++ b/include/linux/bcma/bcma.h
>> @@ -25,6 +25,11 @@ struct bcma_chipinfo {
>> ? ? ? u8 pkg;
>> ?};
>>
>> +enum bcma_clkmode {
>> + ? ? BCMA_CLKMODE_FAST,
>> + ? ? BCMA_CLKMODE_DYNAMIC,
>> +};
>> +
>> ?struct bcma_host_ops {
>> ? ? ? u8 (*read8)(struct bcma_device *core, u16 offset);
>> ? ? ? u16 (*read16)(struct bcma_device *core, u16 offset);
>> @@ -253,6 +258,7 @@ void bcma_awrite32(struct bcma_device *core, u16 offset, u32 value)
>> ?extern bool bcma_core_is_enabled(struct bcma_device *core);
>> ?extern void bcma_core_disable(struct bcma_device *core, u32 flags);
>> ?extern int bcma_core_enable(struct bcma_device *core, u32 flags);
>> -
>> +extern void bcma_core_set_clockmode(struct bcma_device *core,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? enum bcma_clkmode clkmode);
>>
>> ?#endif /* LINUX_BCMA_H_ */
>> --
>> 1.7.3.4
--
Rafa?
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2/4] bcma: allow setting FAST clockmode for a core
2011-07-19 20:50 ` Rafał Miłecki
@ 2011-07-19 20:54 ` Rafał Miłecki
2011-07-19 21:09 ` John W. Linville
0 siblings, 1 reply; 8+ messages in thread
From: Rafał Miłecki @ 2011-07-19 20:54 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, b43-dev
W dniu 19 lipca 2011 22:50 u?ytkownik Rafa? Mi?ecki <zajec5@gmail.com> napisa?:
> W dniu 19 lipca 2011 22:42 u?ytkownik John W. Linville
> <linville@tuxdriver.com> napisa?:
>> ?CC [M] ?drivers/bcma/core.o
>> drivers/bcma/core.c: In function ?bcma_core_set_clockmode?:
>> drivers/bcma/core.c:65:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
>> drivers/bcma/core.c:65:22: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/bcma/core.c:65:73: error: ?BCMA_CLKCTLST_FORCEHT? undeclared (first use in this function)
>> drivers/bcma/core.c:69:8: error: ?BCMA_CLKCTLST_HAVEHT? undeclared (first use in this function)
>> drivers/bcma/core.c: In function ?bcma_core_pll_ctl?:
>> drivers/bcma/core.c:89:35: error: ?BCMA_CLKCTLST_EXTRESREQ? undeclared (first use in this function)
>> drivers/bcma/core.c:90:38: error: ?BCMA_CLKCTLST_EXTRESST? undeclared (first use in this function)
>> drivers/bcma/core.c:93:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
>> make[2]: *** [drivers/bcma/core.o] Error 1
>> make[1]: *** [drivers/bcma] Error 2
>> make: *** [drivers] Error 2
>
> I'm sorry, that's quite normal you could lost order&dependency with
> the amount of patches I've sent.
>
> As nobody objected, please apply
> [RFC][PATCH] bcma: move define of BCMA_CLKCTLST register
> It should be applied before this one.
Could I do something to avoid such a problems in the future?
Should I put info about dependency in cover-letter? Should I create
own git tree? Should I slow down with sending patches (doing more of
them before sending)?
--
Rafa?
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/4] bcma: allow setting FAST clockmode for a core
2011-07-19 20:54 ` Rafał Miłecki
@ 2011-07-19 21:09 ` John W. Linville
0 siblings, 0 replies; 8+ messages in thread
From: John W. Linville @ 2011-07-19 21:09 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: linux-wireless, b43-dev
On Tue, Jul 19, 2011 at 10:54:32PM +0200, Rafa? Mi?ecki wrote:
> W dniu 19 lipca 2011 22:50 u?ytkownik Rafa? Mi?ecki <zajec5@gmail.com> napisa?:
> > W dniu 19 lipca 2011 22:42 u?ytkownik John W. Linville
> > <linville@tuxdriver.com> napisa?:
> >> ?CC [M] ?drivers/bcma/core.o
> >> drivers/bcma/core.c: In function ?bcma_core_set_clockmode?:
> >> drivers/bcma/core.c:65:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
> >> drivers/bcma/core.c:65:22: note: each undeclared identifier is reported only once for each function it appears in
> >> drivers/bcma/core.c:65:73: error: ?BCMA_CLKCTLST_FORCEHT? undeclared (first use in this function)
> >> drivers/bcma/core.c:69:8: error: ?BCMA_CLKCTLST_HAVEHT? undeclared (first use in this function)
> >> drivers/bcma/core.c: In function ?bcma_core_pll_ctl?:
> >> drivers/bcma/core.c:89:35: error: ?BCMA_CLKCTLST_EXTRESREQ? undeclared (first use in this function)
> >> drivers/bcma/core.c:90:38: error: ?BCMA_CLKCTLST_EXTRESST? undeclared (first use in this function)
> >> drivers/bcma/core.c:93:22: error: ?BCMA_CLKCTLST? undeclared (first use in this function)
> >> make[2]: *** [drivers/bcma/core.o] Error 1
> >> make[1]: *** [drivers/bcma] Error 2
> >> make: *** [drivers] Error 2
> >
> > I'm sorry, that's quite normal you could lost order&dependency with
> > the amount of patches I've sent.
> >
> > As nobody objected, please apply
> > [RFC][PATCH] bcma: move define of BCMA_CLKCTLST register
> > It should be applied before this one.
>
> Could I do something to avoid such a problems in the future?
>
> Should I put info about dependency in cover-letter? Should I create
> own git tree? Should I slow down with sending patches (doing more of
> them before sending)?
It is always good to indicate dependencies, especially on patches
posted in a different series or when the dependency is on a patch
posted as RFC.
John
--
John W. Linville Someday the world will need a hero, and you
linville at tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] bcma: allow enabling PLL
2011-07-16 23:06 [PATCH 1/4] bcma: trivial: add helpers for masking/setting Rafał Miłecki
2011-07-16 23:06 ` [PATCH 2/4] bcma: allow setting FAST clockmode for a core Rafał Miłecki
@ 2011-07-16 23:06 ` Rafał Miłecki
2011-07-16 23:06 ` [PATCH 4/4] b43: bcma: implement full core reset Rafał Miłecki
2 siblings, 0 replies; 8+ messages in thread
From: Rafał Miłecki @ 2011-07-16 23:06 UTC (permalink / raw)
To: linux-wireless, John W. Linville; +Cc: b43-dev, Rafał Miłecki
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
drivers/bcma/core.c | 25 +++++++++++++++++++++++++
include/linux/bcma/bcma.h | 2 ++
2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 0686b1b..2d8506d 100644
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -81,3 +81,28 @@ void bcma_core_set_clockmode(struct bcma_device *core,
}
}
EXPORT_SYMBOL_GPL(bcma_core_set_clockmode);
+
+void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on)
+{
+ u16 i;
+
+ WARN_ON(req & ~BCMA_CLKCTLST_EXTRESREQ);
+ WARN_ON(status & ~BCMA_CLKCTLST_EXTRESST);
+
+ if (on) {
+ bcma_set32(core, BCMA_CLKCTLST, req);
+ for (i = 0; i < 10000; i++) {
+ if ((bcma_read32(core, BCMA_CLKCTLST) & status) ==
+ status) {
+ i = 0;
+ break;
+ }
+ udelay(10);
+ }
+ if (i)
+ pr_err("PLL enable timeout\n");
+ } else {
+ pr_warn("Disabling PLL not supported yet!\n");
+ }
+}
+EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 37017c1..cc1582d 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -260,5 +260,7 @@ extern void bcma_core_disable(struct bcma_device *core, u32 flags);
extern int bcma_core_enable(struct bcma_device *core, u32 flags);
extern void bcma_core_set_clockmode(struct bcma_device *core,
enum bcma_clkmode clkmode);
+extern void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status,
+ bool on);
#endif /* LINUX_BCMA_H_ */
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/4] b43: bcma: implement full core reset
2011-07-16 23:06 [PATCH 1/4] bcma: trivial: add helpers for masking/setting Rafał Miłecki
2011-07-16 23:06 ` [PATCH 2/4] bcma: allow setting FAST clockmode for a core Rafał Miłecki
2011-07-16 23:06 ` [PATCH 3/4] bcma: allow enabling PLL Rafał Miłecki
@ 2011-07-16 23:06 ` Rafał Miłecki
2 siblings, 0 replies; 8+ messages in thread
From: Rafał Miłecki @ 2011-07-16 23:06 UTC (permalink / raw)
To: linux-wireless, John W. Linville; +Cc: b43-dev, Rafał Miłecki
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
drivers/net/wireless/b43/main.c | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 22f20e1..46a0f92 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1156,17 +1156,37 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
}
#ifdef CONFIG_B43_BCMA
-static void b43_bcma_wireless_core_reset(struct b43_wldev *dev, bool gmode)
+static void b43_bcma_phy_reset(struct b43_wldev *dev)
{
- u32 flags = 0;
+ u32 flags;
- if (gmode)
- flags = B43_BCMA_IOCTL_GMODE;
- flags |= B43_BCMA_IOCTL_PHY_CLKEN;
+ /* Put PHY into reset */
+ flags = bcma_aread32(dev->dev->bdev, BCMA_IOCTL);
+ flags |= B43_BCMA_IOCTL_PHY_RESET;
flags |= B43_BCMA_IOCTL_PHY_BW_20MHZ; /* Make 20 MHz def */
- b43_device_enable(dev, flags);
+ bcma_awrite32(dev->dev->bdev, BCMA_IOCTL, flags);
+ udelay(2);
+
+ /* Take PHY out of reset */
+ flags = bcma_aread32(dev->dev->bdev, BCMA_IOCTL);
+ flags &= ~B43_BCMA_IOCTL_PHY_RESET;
+ flags |= BCMA_IOCTL_FGC;
+ bcma_awrite32(dev->dev->bdev, BCMA_IOCTL, flags);
+ udelay(1);
- /* TODO: reset PHY */
+ /* Do not force clock anymore */
+ flags = bcma_aread32(dev->dev->bdev, BCMA_IOCTL);
+ flags &= ~BCMA_IOCTL_FGC;
+ bcma_awrite32(dev->dev->bdev, BCMA_IOCTL, flags);
+ udelay(1);
+}
+
+static void b43_bcma_wireless_core_reset(struct b43_wldev *dev, bool gmode)
+{
+ b43_device_enable(dev, B43_BCMA_IOCTL_PHY_CLKEN);
+ bcma_core_set_clockmode(dev->dev->bdev, BCMA_CLKMODE_FAST);
+ b43_bcma_phy_reset(dev);
+ bcma_core_pll_ctl(dev->dev->bdev, 0x300, 0x3000000, true);
}
#endif
--
1.7.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-07-19 21:09 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-16 23:06 [PATCH 1/4] bcma: trivial: add helpers for masking/setting Rafał Miłecki
2011-07-16 23:06 ` [PATCH 2/4] bcma: allow setting FAST clockmode for a core Rafał Miłecki
2011-07-19 20:42 ` John W. Linville
2011-07-19 20:50 ` Rafał Miłecki
2011-07-19 20:54 ` Rafał Miłecki
2011-07-19 21:09 ` John W. Linville
2011-07-16 23:06 ` [PATCH 3/4] bcma: allow enabling PLL Rafał Miłecki
2011-07-16 23:06 ` [PATCH 4/4] b43: bcma: implement full core reset Rafał Miłecki
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).