The Low Power DRPw (LPD) mode contains several optimizations
that designed to reduce the solution's consumption. The
purpose is to save current consumption in RX and Listen mode.
LPD setting apply only for wl127x AP mode (not wl128x)
Signed-off-by: Shahar Levi <[email protected]>
---
drivers/net/wireless/wl12xx/boot.c | 5 +++++
drivers/net/wireless/wl12xx/boot.h | 3 +++
drivers/net/wireless/wl12xx/cmd.c | 5 +++++
drivers/net/wireless/wl12xx/conf.h | 10 ++++++++++
drivers/net/wireless/wl12xx/main.c | 7 +++++++
5 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index b07f8b7..9d46965 100644
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -748,6 +748,11 @@ int wl1271_load_firmware(struct wl1271 *wl)
clk |= (wl->ref_clock << 1) << 4;
}
+ if ((wl->conf.boot.lpd) &&
+ (wl->bss_type == BSS_TYPE_AP_BSS) &&
+ (wl->chip.id != CHIP_ID_1283_PG20))
+ clk |= DRPW_SET_SCRATCH;
+
wl1271_write32(wl, DRPW_SCRATCH_START, clk);
wl1271_set_partition(wl, &part_table[PART_WORK]);
diff --git a/drivers/net/wireless/wl12xx/boot.h b/drivers/net/wireless/wl12xx/boot.h
index e8f8255..abf525e 100644
--- a/drivers/net/wireless/wl12xx/boot.h
+++ b/drivers/net/wireless/wl12xx/boot.h
@@ -74,6 +74,9 @@ struct wl1271_static_data {
#define FREF_CLK_POLARITY_BITS 0xfffff8ff
#define CLK_REQ_OUTN_SEL 0x700
+#define DRPW_SET_INI_FILE 0xc0
+#define DRPW_SET_SCRATCH BIT(25)
+
/* PLL configuration algorithm for wl128x */
#define SYS_CLK_CFG_REG 0x2200
/* Bit[0] - 0-TCXO, 1-FREF */
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index b3a4f58..46036da 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -36,6 +36,7 @@
#include "cmd.h"
#include "event.h"
#include "tx.h"
+#include "boot.h"
#define WL1271_CMD_FAST_POLL_COUNT 50
@@ -134,6 +135,10 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
/* Override the REF CLK from the NVS with the one from platform data */
gen_parms->general_params.ref_clock = wl->ref_clock;
+ if ((wl->conf.boot.lpd) && (wl->bss_type == BSS_TYPE_AP_BSS))
+ gen_parms->general_params.general_settings |=
+ DRPW_SET_INI_FILE;
+
ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
if (ret < 0) {
wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
index 510c2f7..0922689 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -1274,6 +1274,15 @@ struct conf_rx_streaming_settings {
u8 always;
};
+struct conf_boot_setting {
+ /*
+ * The Low Power DRPw (LPD) mode contains several optimizations that
+ * designed to reduce the solution's consumption. The purpose is to save
+ * current consumption in RX and Listen mode.
+ */
+ bool lpd;
+};
+
struct conf_drv_settings {
struct conf_sg_settings sg;
struct conf_rx_settings rx;
@@ -1290,6 +1299,7 @@ struct conf_drv_settings {
struct conf_memory_settings mem_wl128x;
struct conf_fm_coex fm_coex;
struct conf_rx_streaming_settings rx_streaming;
+ struct conf_boot_setting boot;
u8 hci_io_ds;
};
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index fb0f764..b129967 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -367,6 +367,13 @@ static struct conf_drv_settings default_conf = {
.interval = 20,
.always = 0,
},
+ .boot = {
+ /*
+ * Low Power DRP setting apply only for wl127x AP mode
+ *(not wl128x)
+ */
+ .lpd = true,
+ },
.hci_io_ds = HCI_IO_DS_6MA,
};
--
1.7.1
Hi Shahar,
On Tue, 2011-05-31 at 10:51 +0300, Shahar Levi wrote:
> The Low Power DRPw (LPD) mode contains several optimizations
> that designed to reduce the solution's consumption. The
> purpose is to save current consumption in RX and Listen mode.
>
> LPD setting apply only for wl127x AP mode (not wl128x)
>
> Signed-off-by: Shahar Levi <[email protected]>
> ---
[...]
> diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
> index b07f8b7..9d46965 100644
> --- a/drivers/net/wireless/wl12xx/boot.c
> +++ b/drivers/net/wireless/wl12xx/boot.c
> @@ -748,6 +748,11 @@ int wl1271_load_firmware(struct wl1271 *wl)
> clk |= (wl->ref_clock << 1) << 4;
> }
>
> + if ((wl->conf.boot.lpd) &&
> + (wl->bss_type == BSS_TYPE_AP_BSS) &&
> + (wl->chip.id != CHIP_ID_1283_PG20))
> + clk |= DRPW_SET_SCRATCH;
> +
> wl1271_write32(wl, DRPW_SCRATCH_START, clk);
>
> wl1271_set_partition(wl, &part_table[PART_WORK]);
> diff --git a/drivers/net/wireless/wl12xx/boot.h b/drivers/net/wireless/wl12xx/boot.h
> index e8f8255..abf525e 100644
> --- a/drivers/net/wireless/wl12xx/boot.h
> +++ b/drivers/net/wireless/wl12xx/boot.h
> @@ -74,6 +74,9 @@ struct wl1271_static_data {
> #define FREF_CLK_POLARITY_BITS 0xfffff8ff
> #define CLK_REQ_OUTN_SEL 0x700
>
> +#define DRPW_SET_INI_FILE 0xc0
> +#define DRPW_SET_SCRATCH BIT(25)
> +
> /* PLL configuration algorithm for wl128x */
> #define SYS_CLK_CFG_REG 0x2200
> /* Bit[0] - 0-TCXO, 1-FREF */
> diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
> index b3a4f58..46036da 100644
> --- a/drivers/net/wireless/wl12xx/cmd.c
> +++ b/drivers/net/wireless/wl12xx/cmd.c
> @@ -36,6 +36,7 @@
> #include "cmd.h"
> #include "event.h"
> #include "tx.h"
> +#include "boot.h"
>
> #define WL1271_CMD_FAST_POLL_COUNT 50
>
> @@ -134,6 +135,10 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
> /* Override the REF CLK from the NVS with the one from platform data */
> gen_parms->general_params.ref_clock = wl->ref_clock;
>
> + if ((wl->conf.boot.lpd) && (wl->bss_type == BSS_TYPE_AP_BSS))
> + gen_parms->general_params.general_settings |=
> + DRPW_SET_INI_FILE;
> +
> ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
> if (ret < 0) {
> wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
> diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
> index 510c2f7..0922689 100644
> --- a/drivers/net/wireless/wl12xx/conf.h
> +++ b/drivers/net/wireless/wl12xx/conf.h
> @@ -1274,6 +1274,15 @@ struct conf_rx_streaming_settings {
> u8 always;
> };
>
> +struct conf_boot_setting {
> + /*
> + * The Low Power DRPw (LPD) mode contains several optimizations that
> + * designed to reduce the solution's consumption. The purpose is to save
> + * current consumption in RX and Listen mode.
> + */
> + bool lpd;
> +};
> +
> struct conf_drv_settings {
> struct conf_sg_settings sg;
> struct conf_rx_settings rx;
> @@ -1290,6 +1299,7 @@ struct conf_drv_settings {
> struct conf_memory_settings mem_wl128x;
> struct conf_fm_coex fm_coex;
> struct conf_rx_streaming_settings rx_streaming;
> + struct conf_boot_setting boot;
> u8 hci_io_ds;
> };
>
> diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
> index fb0f764..b129967 100644
> --- a/drivers/net/wireless/wl12xx/main.c
> +++ b/drivers/net/wireless/wl12xx/main.c
> @@ -367,6 +367,13 @@ static struct conf_drv_settings default_conf = {
> .interval = 20,
> .always = 0,
> },
> + .boot = {
> + /*
> + * Low Power DRP setting apply only for wl127x AP mode
> + *(not wl128x)
> + */
> + .lpd = true,
> + },
> .hci_io_ds = HCI_IO_DS_6MA,
> };
I still think this is not the right way to do it. It doesn't make sense
to have it in the configuration parameters. If you want to make it
configurable, it should be in the NVS file and the driver should clear
it when not in AP mode (and whoever generates the NVS needs to make sure
it's never set for wl128x).
The other solution is to always set this flag when in wl127x in AP-mode,
in which case it doesn't need to be configurable at all. That would be
the simplest solution and you could even use a quirk if it makes it
easier.
--
Cheers,
Luca.
On Tue, May 31, 2011 at 12:16 PM, Luciano Coelho <[email protected]> wrote:
> On Tue, 2011-05-31 at 12:11 +0300, Eliad Peller wrote:
>> On Tue, May 31, 2011 at 11:35 AM, Luciano Coelho <[email protected]> wrote:
>> > On Tue, 2011-05-31 at 10:51 +0300, Shahar Levi wrote:
>> >> The Low Power DRPw (LPD) mode contains several optimizations
>> >> that designed to reduce the solution's consumption. The
>> >> purpose is to save current consumption in RX and Listen mode.
>> >>
>> >> LPD setting apply only for wl127x AP mode (not wl128x)
>> >>
>> >> Signed-off-by: Shahar Levi <[email protected]>
>> >> ---
>> >
>> > [...]
>> >
>> >
>> > I still think this is not the right way to do it. ?It doesn't make sense
>> > to have it in the configuration parameters. ?If you want to make it
>> > configurable, it should be in the NVS file and the driver should clear
>> > it when not in AP mode (and whoever generates the NVS needs to make sure
>> > it's never set for wl128x).
>> >
>> please don't use the "blacklist" approach. it always gets broken at some point.
>
> I totally agree.
>
>
>> > The other solution is to always set this flag when in wl127x in AP-mode,
>> > in which case it doesn't need to be configurable at all. ?That would be
>> > the simplest solution and you could even use a quirk if it makes it
>> > easier.
>> >
>> sounds much better.
>
> Yes, and now we got confirmation that this is really the case. ?It
> should always be set for wl127x in AP-mode and not be set for anything
> else. ?This is a clear case, not a configurable value.
np. will be fix in the quirk way
> --
> Cheers,
> Luca.
Thanks for your review.
All the best,
Shahar
On Tue, May 31, 2011 at 11:35 AM, Luciano Coelho <[email protected]> wrote:
> On Tue, 2011-05-31 at 10:51 +0300, Shahar Levi wrote:
>> The Low Power DRPw (LPD) mode contains several optimizations
>> that designed to reduce the solution's consumption. The
>> purpose is to save current consumption in RX and Listen mode.
>>
>> LPD setting apply only for wl127x AP mode (not wl128x)
>>
>> Signed-off-by: Shahar Levi <[email protected]>
>> ---
>
> [...]
>
>
> I still think this is not the right way to do it. ?It doesn't make sense
> to have it in the configuration parameters. ?If you want to make it
> configurable, it should be in the NVS file and the driver should clear
> it when not in AP mode (and whoever generates the NVS needs to make sure
> it's never set for wl128x).
>
please don't use the "blacklist" approach. it always gets broken at some point.
> The other solution is to always set this flag when in wl127x in AP-mode,
> in which case it doesn't need to be configurable at all. ?That would be
> the simplest solution and you could even use a quirk if it makes it
> easier.
>
sounds much better.
Eliad.
On Tue, 2011-05-31 at 12:11 +0300, Eliad Peller wrote:
> On Tue, May 31, 2011 at 11:35 AM, Luciano Coelho <[email protected]> wrote:
> > On Tue, 2011-05-31 at 10:51 +0300, Shahar Levi wrote:
> >> The Low Power DRPw (LPD) mode contains several optimizations
> >> that designed to reduce the solution's consumption. The
> >> purpose is to save current consumption in RX and Listen mode.
> >>
> >> LPD setting apply only for wl127x AP mode (not wl128x)
> >>
> >> Signed-off-by: Shahar Levi <[email protected]>
> >> ---
> >
> > [...]
> >
> >
> > I still think this is not the right way to do it. It doesn't make sense
> > to have it in the configuration parameters. If you want to make it
> > configurable, it should be in the NVS file and the driver should clear
> > it when not in AP mode (and whoever generates the NVS needs to make sure
> > it's never set for wl128x).
> >
> please don't use the "blacklist" approach. it always gets broken at some point.
I totally agree.
> > The other solution is to always set this flag when in wl127x in AP-mode,
> > in which case it doesn't need to be configurable at all. That would be
> > the simplest solution and you could even use a quirk if it makes it
> > easier.
> >
> sounds much better.
Yes, and now we got confirmation that this is really the case. It
should always be set for wl127x in AP-mode and not be set for anything
else. This is a clear case, not a configurable value.
--
Cheers,
Luca.