| Message ID | 1376762167-24583-3-git-send-email-juhosg@openwrt.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
2013.08.17. 19:56 keltezéssel, Gabor Juhos írta: > Some chipsets have more than 16KB of shared memory. > Introduce a new rt2800 specific flag to indicate that > and add a helper function which helps to check the > presence of the new flag. > > Also enable the new flag for the RT3593 chipset which > has 24KB of shared memory. The flag can also be used > for other chipsets, but none of those has been tested > yet. > > Signed-off-by: Gabor Juhos <juhosg@openwrt.org> > --- > drivers/net/wireless/rt2x00/rt2800lib.c | 9 +++++++++ > drivers/net/wireless/rt2x00/rt2800lib.h | 13 +++++++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c > index aa6b6b0..2d409e0 100644 > --- a/drivers/net/wireless/rt2x00/rt2800lib.c > +++ b/drivers/net/wireless/rt2x00/rt2800lib.c > @@ -7697,6 +7697,7 @@ static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev) > > int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) > { > + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data; > int retval; > u32 reg; > > @@ -7704,6 +7705,14 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) > if (retval) > return retval; > > + switch (rt2x00dev->chip.rt) { > + case RT3071: > + case RT3593: > + case RT5592: > + __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags); > + break; Erm, this contradicts with the changelog. I will remove 3071 and 5592 and will send an updated set. -Gabor -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index aa6b6b0..2d409e0 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -7697,6 +7697,7 @@ static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev) int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) { + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data; int retval; u32 reg; @@ -7704,6 +7705,14 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) if (retval) return retval; + switch (rt2x00dev->chip.rt) { + case RT3071: + case RT3593: + case RT5592: + __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags); + break; + } + /* * Allocate eeprom data. */ diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h index 9b3e8ef..f89d413 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/rt2x00/rt2800lib.h @@ -22,6 +22,10 @@ #ifndef RT2800LIB_H #define RT2800LIB_H +enum rt2800_flag { + RT2800_HAS_HIGH_SHARED_MEM, +}; + /* RT2800 driver data structure */ struct rt2800_drv_data { u8 calibration_bw20; @@ -31,6 +35,8 @@ struct rt2800_drv_data { u8 txmixer_gain_24g; u8 txmixer_gain_5g; unsigned int tbtt_tick; + + unsigned long rt2800_flags; }; struct rt2800_ops { @@ -63,6 +69,13 @@ struct rt2800_ops { __le32 *(*drv_get_txwi)(struct queue_entry *entry); }; +static inline bool rt2800_has_high_shared_mem(struct rt2x00_dev *rt2x00dev) +{ + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data; + + return test_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags); +} + static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev, const unsigned int offset, u32 *value)
Some chipsets have more than 16KB of shared memory. Introduce a new rt2800 specific flag to indicate that and add a helper function which helps to check the presence of the new flag. Also enable the new flag for the RT3593 chipset which has 24KB of shared memory. The flag can also be used for other chipsets, but none of those has been tested yet. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- drivers/net/wireless/rt2x00/rt2800lib.c | 9 +++++++++ drivers/net/wireless/rt2x00/rt2800lib.h | 13 +++++++++++++ 2 files changed, 22 insertions(+)