lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 533/545] Revert "mwifiex: fix sleep in atomic context bugs caused by dev_coredumpv"
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    commit 5f8954e099b8ae96e7de1bb95950e00c85bedd40 upstream.

    This reverts commit a52ed4866d2b90dd5e4ae9dabd453f3ed8fa3cbc as it
    causes build problems in linux-next. It needs to be reintroduced in a
    way that can allow the api to evolve and not require a "flag day" to
    catch all users.

    Link: https://lore.kernel.org/r/20220623160723.7a44b573@canb.auug.org.au
    Cc: Duoming Zhou <duoming@zju.edu.cn>
    Cc: Brian Norris <briannorris@chromium.org>
    Cc: Johannes Berg <johannes@sipsolutions.net>
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/marvell/mwifiex/init.c | 9 ++++-----
    drivers/net/wireless/marvell/mwifiex/main.h | 3 +--
    drivers/net/wireless/marvell/mwifiex/sta_event.c | 6 +++---
    3 files changed, 8 insertions(+), 10 deletions(-)

    --- a/drivers/net/wireless/marvell/mwifiex/init.c
    +++ b/drivers/net/wireless/marvell/mwifiex/init.c
    @@ -63,10 +63,9 @@ static void wakeup_timer_fn(struct timer
    adapter->if_ops.card_reset(adapter);
    }

    -static void fw_dump_work(struct work_struct *work)
    +static void fw_dump_timer_fn(struct timer_list *t)
    {
    - struct mwifiex_adapter *adapter =
    - container_of(work, struct mwifiex_adapter, devdump_work.work);
    + struct mwifiex_adapter *adapter = from_timer(adapter, t, devdump_timer);

    mwifiex_upload_device_dump(adapter);
    }
    @@ -322,7 +321,7 @@ static void mwifiex_init_adapter(struct
    adapter->active_scan_triggered = false;
    timer_setup(&adapter->wakeup_timer, wakeup_timer_fn, 0);
    adapter->devdump_len = 0;
    - INIT_DELAYED_WORK(&adapter->devdump_work, fw_dump_work);
    + timer_setup(&adapter->devdump_timer, fw_dump_timer_fn, 0);
    }

    /*
    @@ -401,7 +400,7 @@ static void
    mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
    {
    del_timer(&adapter->wakeup_timer);
    - cancel_delayed_work_sync(&adapter->devdump_work);
    + del_timer_sync(&adapter->devdump_timer);
    mwifiex_cancel_all_pending_cmd(adapter);
    wake_up_interruptible(&adapter->cmd_wait_q.wait);
    wake_up_interruptible(&adapter->hs_activate_wait_q);
    --- a/drivers/net/wireless/marvell/mwifiex/main.h
    +++ b/drivers/net/wireless/marvell/mwifiex/main.h
    @@ -49,7 +49,6 @@
    #include <linux/pm_runtime.h>
    #include <linux/slab.h>
    #include <linux/of_irq.h>
    -#include <linux/workqueue.h>

    #include "decl.h"
    #include "ioctl.h"
    @@ -1054,7 +1053,7 @@ struct mwifiex_adapter {
    /* Device dump data/length */
    void *devdump_data;
    int devdump_len;
    - struct delayed_work devdump_work;
    + struct timer_list devdump_timer;

    bool ignore_btcoex_events;
    };
    --- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
    +++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
    @@ -622,8 +622,8 @@ mwifiex_fw_dump_info_event(struct mwifie
    * transmission event get lost, in this cornel case,
    * user would still get partial of the dump.
    */
    - schedule_delayed_work(&adapter->devdump_work,
    - msecs_to_jiffies(MWIFIEX_TIMER_10S));
    + mod_timer(&adapter->devdump_timer,
    + jiffies + msecs_to_jiffies(MWIFIEX_TIMER_10S));
    }

    /* Overflow check */
    @@ -642,7 +642,7 @@ mwifiex_fw_dump_info_event(struct mwifie
    return;

    upload_dump:
    - cancel_delayed_work_sync(&adapter->devdump_work);
    + del_timer_sync(&adapter->devdump_timer);
    mwifiex_upload_device_dump(adapter);
    }


    \
     
     \ /
      Last update: 2022-08-19 18:52    [W:2.776 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site