@@ -2737,7 +2737,7 @@ static const char *reset_reason_to_string(enum ibmvnic_reset_reason reason)
/*
* Initialize the init_done completion and return code values. We
* can get a transport event just after registering the CRQ and the
- * tasklet will use this to communicate the transport event. To ensure
+ * bh work will use this to communicate the transport event. To ensure
* we don't miss the notification/error, initialize these _before_
* regisering the CRQ.
*/
@@ -4447,7 +4447,7 @@ static void send_request_cap(struct ibmvnic_adapter *adapter, int retry)
int cap_reqs;
/* We send out 6 or 7 REQUEST_CAPABILITY CRQs below (depending on
- * the PROMISC flag). Initialize this count upfront. When the tasklet
+ * the PROMISC flag). Initialize this count upfront. When the bh work
* receives a response to all of these, it will send the next protocol
* message (QUERY_IP_OFFLOAD).
*/
@@ -4983,7 +4983,7 @@ static void send_query_cap(struct ibmvnic_adapter *adapter)
int cap_reqs;
/* We send out 25 QUERY_CAPABILITY CRQs below. Initialize this count
- * upfront. When the tasklet receives a response to all of these, it
+ * upfront. When the bh work receives a response to all of these, it
* can send out the next protocol messaage (REQUEST_CAPABILITY).
*/
cap_reqs = 25;
@@ -5495,7 +5495,7 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq,
int i;
/* CHECK: Test/set of login_pending does not need to be atomic
- * because only ibmvnic_tasklet tests/clears this.
+ * because only ibmvnic_bh_work tests/clears this.
*/
if (!adapter->login_pending) {
netdev_warn(netdev, "Ignoring unexpected login response\n");
@@ -6081,13 +6081,13 @@ static irqreturn_t ibmvnic_interrupt(int irq, void *instance)
{
struct ibmvnic_adapter *adapter = instance;
- tasklet_schedule(&adapter->tasklet);
+ queue_work(system_bh_wq, &adapter->bh_work);
return IRQ_HANDLED;
}
-static void ibmvnic_tasklet(struct tasklet_struct *t)
+static void ibmvnic_bh_work(struct work_struct *work)
{
- struct ibmvnic_adapter *adapter = from_tasklet(adapter, t, tasklet);
+ struct ibmvnic_adapter *adapter = from_work(adapter, work, bh_work);
struct ibmvnic_crq_queue *queue = &adapter->crq;
union ibmvnic_crq *crq;
unsigned long flags;
@@ -6168,7 +6168,7 @@ static void release_crq_queue(struct ibmvnic_adapter *adapter)
netdev_dbg(adapter->netdev, "Releasing CRQ\n");
free_irq(vdev->irq, adapter);
- tasklet_kill(&adapter->tasklet);
+ cancel_work_sync(&adapter->bh_work);
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
} while (rc == H_BUSY || H_IS_LONG_BUSY(rc));
@@ -6219,7 +6219,7 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter)
retrc = 0;
- tasklet_setup(&adapter->tasklet, (void *)ibmvnic_tasklet);
+ INIT_WORK(&adapter->bh_work, (void *)ibmvnic_bh_work);
netdev_dbg(adapter->netdev, "registering irq 0x%x\n", vdev->irq);
snprintf(crq->name, sizeof(crq->name), "ibmvnic-%x",
@@ -6241,12 +6241,12 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter)
spin_lock_init(&crq->lock);
/* process any CRQs that were queued before we enabled interrupts */
- tasklet_schedule(&adapter->tasklet);
+ queue_work(system_bh_wq, &adapter->bh_work);
return retrc;
req_irq_failed:
- tasklet_kill(&adapter->tasklet);
+ cancel_work_sync(&adapter->bh_work);
do {
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
} while (rc == H_BUSY || H_IS_LONG_BUSY(rc));
@@ -6639,7 +6639,7 @@ static int ibmvnic_resume(struct device *dev)
if (adapter->state != VNIC_OPEN)
return 0;
- tasklet_schedule(&adapter->tasklet);
+ queue_work(system_bh_wq, &adapter->bh_work);
return 0;
}
@@ -1036,7 +1036,7 @@ struct ibmvnic_adapter {
u32 cur_rx_buf_sz;
u32 prev_rx_buf_sz;
- struct tasklet_struct tasklet;
+ struct work_struct bh_work;
enum vnic_state state;
/* Used for serialization of state field. When taking both state
* and rwi locks, take state lock first.
Migrate tasklet APIs to the new bottom half workqueue mechanism. It replaces all occurrences of tasklet usage with the appropriate workqueue APIs throughout the ibmvnic driver. This transition ensures compatibility with the latest design and enhances performance. Signed-off-by: Allen Pais <allen.lkml@gmail.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 24 ++++++++++++------------ drivers/net/ethernet/ibm/ibmvnic.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-)