2012-12-11 10:10:52

by Daniel Golle

[permalink] [raw]

Subject: [PATCH 2/3] rt2x00: allow disabling bands through platform_data

---

Signed-off-by: Daniel Golle <[email protected]>

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 355cff5..c67e769 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -426,6 +426,7 @@ struct hw_mode_spec {
unsigned int supported_bands;
#define SUPPORT_BAND_2GHZ 0x00000001
#define SUPPORT_BAND_5GHZ 0x00000002
+#define SUPPORT_BAND_BOTH (SUPPORT_BAND_2GHZ | SUPPORT_BAND_5GHZ)

unsigned int supported_rates;
#define SUPPORT_RATE_CCK 0x00000001
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index d454488..b7856bf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -835,6 +835,22 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
unsigned int num_rates;
unsigned int i;

+ if (rt2x00dev->dev->platform_data) {
+ struct rt2x00_platform_data *pdata;
+
+ pdata = rt2x00dev->dev->platform_data;
+ if (pdata->disable_2ghz)
+ spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
+ if (pdata->disable_5ghz)
+ spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
+ }
+
+ if ((spec->supported_bands & SUPPORT_BAND_BOTH) == 0) {
+ ERROR(rt2x00dev, "No supported bands\n");
+ return -EINVAL;
+ }
+
+
num_rates = 0;
if (spec->supported_rates & SUPPORT_RATE_CCK)
num_rates += 4;
diff --git a/include/linux/rt2x00_platform.h b/include/linux/rt2x00_platform.h
index 80effa7..b4c7768 100644
--- a/include/linux/rt2x00_platform.h
+++ b/include/linux/rt2x00_platform.h
@@ -14,6 +14,9 @@

struct rt2x00_platform_data {
char *eeprom_file_name;
+
+ int disable_2ghz;
+ int disable_5ghz;
};

#endif /* _RT2X00_PLATFORM_H */
--
1.8.0.1

---

Attachments:

(No filename) (1.70 kB)
(No filename) (836.00 B)
Download all attachments

2012-12-12 19:24:44

by Gabor Juhos

[permalink] [raw]

Subject: Re: [PATCH 2/3] rt2x00: allow disabling bands through platform_data

---

2012.12.11. 22:46 keltez?ssel, Gertjan van Wingerde ?rta:
> Hi Daniel,
>
> On 11 dec. 2012, at 11:04, Daniel Golle <[email protected]> wrote:
>
>>
>> Signed-off-by: Daniel Golle <[email protected]>
>
> Again we need a proper patch description here.
>
> Also, can you explain why the enabling / disabling of individual bands needs
> to be done via platform data, as opposed to letting user space handle this?

The patch should have been skipped for now. The explanation can be found here:

> http://rt2x00.serialmonkey.com/pipermail/users_rt2x00.serialmonkey.com/2012-November/005468.html

-Gabor

2012-12-11 21:46:15

by Gertjan van Wingerde

[permalink] [raw]

Subject: Re: [PATCH 2/3] rt2x00: allow disabling bands through platform_data

---

Hi Daniel,

On 11 dec. 2012, at 11:04, Daniel Golle <[email protected]> wrote:

>
> Signed-off-by: Daniel Golle <[email protected]>

Again we need a proper patch description here.

Also, can you explain why the enabling / disabling of individual bands needs to be done via platform data, as opposed to letting user space handle this?

>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 355cff5..c67e769 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -426,6 +426,7 @@ struct hw_mode_spec {
> unsigned int supported_bands;
> #define SUPPORT_BAND_2GHZ 0x00000001
> #define SUPPORT_BAND_5GHZ 0x00000002
> +#define SUPPORT_BAND_BOTH (SUPPORT_BAND_2GHZ | SUPPORT_BAND_5GHZ)
>
> unsigned int supported_rates;
> #define SUPPORT_RATE_CCK 0x00000001
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index d454488..b7856bf 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -835,6 +835,22 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
> unsigned int num_rates;
> unsigned int i;
>
> + if (rt2x00dev->dev->platform_data) {
> + struct rt2x00_platform_data *pdata;
> +
> + pdata = rt2x00dev->dev->platform_data;
> + if (pdata->disable_2ghz)
> + spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
> + if (pdata->disable_5ghz)
> + spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
> + }
> +
> + if ((spec->supported_bands & SUPPORT_BAND_BOTH) == 0) {
> + ERROR(rt2x00dev, "No supported bands\n");
> + return -EINVAL;
> + }
> +
> +
> num_rates = 0;
> if (spec->supported_rates & SUPPORT_RATE_CCK)
> num_rates += 4;
> diff --git a/include/linux/rt2x00_platform.h b/include/linux/rt2x00_platform.h
> index 80effa7..b4c7768 100644
> --- a/include/linux/rt2x00_platform.h
> +++ b/include/linux/rt2x00_platform.h
> @@ -14,6 +14,9 @@
>
> struct rt2x00_platform_data {
> char *eeprom_file_name;
> +
> + int disable_2ghz;
> + int disable_5ghz;
> };
>
> #endif /* _RT2X00_PLATFORM_H */
> --
> 1.8.0.1
>