2011-11-12 18:17:10

by Gertjan van Wingerde

Subject: [PATCH] rt2x00: Add USB device ID of Buffalo WLI-UC-GNHP.

This is reported to be an RT3070 based device.

Reported-by: Teika Kazura <[email protected]>
Signed-off-by: Gertjan van Wingerde <[email protected]>
---
drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index f156579..3778763 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -919,6 +919,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
{ USB_DEVICE(0x050d, 0x935b) },
/* Buffalo */
{ USB_DEVICE(0x0411, 0x00e8) },
+ { USB_DEVICE(0x0411, 0x0158) },
{ USB_DEVICE(0x0411, 0x016f) },
{ USB_DEVICE(0x0411, 0x01a2) },
/* Corega */
--
1.7.7

2011-11-12 18:17:11

by Gertjan van Wingerde

Subject: [PATCH] rt2x00: Fix sleep-while-atomic bug in powersaving code.

The generic powersaving code that determines after reception of a frame
whether the device should go back to sleep or whether is could stay
awake was calling rt2x00lib_config directly from RX tasklet context.
On a number of the devices this call can actually sleep, due to having
to confirm that the sleeping commands have been executed successfully.

Fix this by moving the call to rt2x00lib_config to a workqueue call.

This fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=731672

Tested-by: Tomas Trnka <[email protected]>
Signed-off-by: Gertjan van Wingerde <[email protected]>
Cc: <[email protected]>
---
drivers/net/wireless/rt2x00/rt2x00.h | 1 +
drivers/net/wireless/rt2x00/rt2x00dev.c | 22 ++++++++++++++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 2ec5c00..99ff12d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -943,6 +943,7 @@ struct rt2x00_dev {
* Powersaving work
*/
struct delayed_work autowakeup_work;
+ struct work_struct sleep_work;

/*
* Data queue arrays for RX, TX, Beacon and ATIM.
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e1fb2a8..edd317f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -465,6 +465,23 @@ static u8 *rt2x00lib_find_ie(u8 *data, unsigned int len, u8 ie)
return NULL;
}

+static void rt2x00lib_sleep(struct work_struct *work)
+{
+ struct rt2x00_dev *rt2x00dev =
+ container_of(work, struct rt2x00_dev, sleep_work);
+
+ if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
+ return;
+
+ /*
+ * Check again is powersaving is enabled, to prevent races from delayed
+ * work execution.
+ */
+ if (!test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
+ rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
+ IEEE80211_CONF_CHANGE_PS);
+}
+
static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
struct sk_buff *skb,
struct rxdone_entry_desc *rxdesc)
@@ -512,8 +529,7 @@ static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
cam |= (tim_ie->bitmap_ctrl & 0x01);

if (!cam && !test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
- rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
- IEEE80211_CONF_CHANGE_PS);
+ queue_work(rt2x00dev->workqueue, &rt2x00dev->sleep_work);
}

static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
@@ -1141,6 +1157,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)

INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
+ INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);

/*
* Let the driver probe the device to detect the capabilities.
@@ -1197,6 +1214,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
*/
cancel_work_sync(&rt2x00dev->intf_work);
cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
+ cancel_work_sync(&rt2x00dev->sleep_work);
if (rt2x00_is_usb(rt2x00dev)) {
del_timer_sync(&rt2x00dev->txstatus_timer);
cancel_work_sync(&rt2x00dev->rxdone_work);
--
1.7.7

2011-11-14 14:44:55

by Ivo Van Doorn

Subject: Re: [rt2x00-users] [PATCH] rt2x00: Add USB device ID of Buffalo WLI-UC-GNHP.

On Sat, Nov 12, 2011 at 7:10 PM, Gertjan van Wingerde
<[email protected]> wrote:
> This is reported to be an RT3070 based device.
>
> Reported-by: Teika Kazura <[email protected]>
> Signed-off-by: Gertjan van Wingerde <[email protected]>

Acked-by: Ivo van Doorn <[email protected]>

> ---
> ?drivers/net/wireless/rt2x00/rt2800usb.c | ? ?1 +
> ?1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index f156579..3778763 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -919,6 +919,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
> ? ? ? ?{ USB_DEVICE(0x050d, 0x935b) },
> ? ? ? ?/* Buffalo */
> ? ? ? ?{ USB_DEVICE(0x0411, 0x00e8) },
> + ? ? ? { USB_DEVICE(0x0411, 0x0158) },
> ? ? ? ?{ USB_DEVICE(0x0411, 0x016f) },
> ? ? ? ?{ USB_DEVICE(0x0411, 0x01a2) },
> ? ? ? ?/* Corega */
> --
> 1.7.7
>
>
> _______________________________________________
> users mailing list
> [email protected]
> http://rt2x00.serialmonkey.com/mailman/listinfo/users_rt2x00.serialmonkey.com
>

2011-11-14 15:18:18

by Ivo Van Doorn

Subject: Re: [rt2x00-users] [PATCH] rt2x00: Fix sleep-while-atomic bug in powersaving code.

On Sat, Nov 12, 2011 at 7:10 PM, Gertjan van Wingerde
<[email protected]> wrote:
> The generic powersaving code that determines after reception of a frame
> whether the device should go back to sleep or whether is could stay
> awake was calling rt2x00lib_config directly from RX tasklet context.
> On a number of the devices this call can actually sleep, due to having
> to confirm that the sleeping commands have been executed successfully.
>
> Fix this by moving the call to rt2x00lib_config to a workqueue call.
>
> This fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=731672
>
> Tested-by: Tomas Trnka <[email protected]>
> Signed-off-by: Gertjan van Wingerde <[email protected]>
> Cc: <[email protected]>

Acked-by: Ivo van Doorn <[email protected]>

> ---
> ?drivers/net/wireless/rt2x00/rt2x00.h ? ?| ? ?1 +
> ?drivers/net/wireless/rt2x00/rt2x00dev.c | ? 22 ++++++++++++++++++++--
> ?2 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 2ec5c00..99ff12d 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -943,6 +943,7 @@ struct rt2x00_dev {
> ? ? ? ? * Powersaving work
> ? ? ? ? */
> ? ? ? ?struct delayed_work autowakeup_work;
> + ? ? ? struct work_struct sleep_work;
>
> ? ? ? ?/*
> ? ? ? ? * Data queue arrays for RX, TX, Beacon and ATIM.
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index e1fb2a8..edd317f 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -465,6 +465,23 @@ static u8 *rt2x00lib_find_ie(u8 *data, unsigned int len, u8 ie)
> ? ? ? ?return NULL;
> ?}
>
> +static void rt2x00lib_sleep(struct work_struct *work)
> +{
> + ? ? ? struct rt2x00_dev *rt2x00dev =
> + ? ? ? ? ? container_of(work, struct rt2x00_dev, sleep_work);
> +
> + ? ? ? if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
> + ? ? ? ? ? ? ? return;
> +
> + ? ? ? /*
> + ? ? ? ?* Check again is powersaving is enabled, to prevent races from delayed
> + ? ? ? ?* work execution.
> + ? ? ? ?*/
> + ? ? ? if (!test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
> + ? ? ? ? ? ? ? rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?IEEE80211_CONF_CHANGE_PS);
> +}
> +
> ?static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct sk_buff *skb,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct rxdone_entry_desc *rxdesc)
> @@ -512,8 +529,7 @@ static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
> ? ? ? ?cam |= (tim_ie->bitmap_ctrl & 0x01);
>
> ? ? ? ?if (!cam && !test_bit(CONFIG_POWERSAVING, &rt2x00dev->flags))
> - ? ? ? ? ? ? ? rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?IEEE80211_CONF_CHANGE_PS);
> + ? ? ? ? ? ? ? queue_work(rt2x00dev->workqueue, &rt2x00dev->sleep_work);
> ?}
>
> ?static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
> @@ -1141,6 +1157,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
>
> ? ? ? ?INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
> ? ? ? ?INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
> + ? ? ? INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
>
> ? ? ? ?/*
> ? ? ? ? * Let the driver probe the device to detect the capabilities.
> @@ -1197,6 +1214,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
> ? ? ? ? */
> ? ? ? ?cancel_work_sync(&rt2x00dev->intf_work);
> ? ? ? ?cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
> + ? ? ? cancel_work_sync(&rt2x00dev->sleep_work);
> ? ? ? ?if (rt2x00_is_usb(rt2x00dev)) {
> ? ? ? ? ? ? ? ?del_timer_sync(&rt2x00dev->txstatus_timer);
> ? ? ? ? ? ? ? ?cancel_work_sync(&rt2x00dev->rxdone_work);
> --
> 1.7.7
>
>
> _______________________________________________
> users mailing list
> [email protected]
> http://rt2x00.serialmonkey.com/mailman/listinfo/users_rt2x00.serialmonkey.com
>