mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
qed: convert tasklets to use new tasklet_setup() API
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly. Signed-off-by: Romain Perier <romain.perier@gmail.com> Signed-off-by: Allen Pais <apais@linux.microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f246d129fe
commit
b5f0a3bfc1
4 changed files with 12 additions and 33 deletions
|
@ -572,7 +572,7 @@ struct qed_hwfn {
|
|||
struct qed_consq *p_consq;
|
||||
|
||||
/* Slow-Path definitions */
|
||||
struct tasklet_struct *sp_dpc;
|
||||
struct tasklet_struct sp_dpc;
|
||||
bool b_sp_dpc_enabled;
|
||||
|
||||
struct qed_ptt *p_main_ptt;
|
||||
|
|
|
@ -1216,9 +1216,9 @@ static void qed_sb_ack_attn(struct qed_hwfn *p_hwfn,
|
|||
barrier();
|
||||
}
|
||||
|
||||
void qed_int_sp_dpc(unsigned long hwfn_cookie)
|
||||
void qed_int_sp_dpc(struct tasklet_struct *t)
|
||||
{
|
||||
struct qed_hwfn *p_hwfn = (struct qed_hwfn *)hwfn_cookie;
|
||||
struct qed_hwfn *p_hwfn = from_tasklet(p_hwfn, t, sp_dpc);
|
||||
struct qed_pi_info *pi_info = NULL;
|
||||
struct qed_sb_attn_info *sb_attn;
|
||||
struct qed_sb_info *sb_info;
|
||||
|
@ -2285,34 +2285,14 @@ u64 qed_int_igu_read_sisr_reg(struct qed_hwfn *p_hwfn)
|
|||
|
||||
static void qed_int_sp_dpc_setup(struct qed_hwfn *p_hwfn)
|
||||
{
|
||||
tasklet_init(p_hwfn->sp_dpc,
|
||||
qed_int_sp_dpc, (unsigned long)p_hwfn);
|
||||
tasklet_setup(&p_hwfn->sp_dpc, qed_int_sp_dpc);
|
||||
p_hwfn->b_sp_dpc_enabled = true;
|
||||
}
|
||||
|
||||
static int qed_int_sp_dpc_alloc(struct qed_hwfn *p_hwfn)
|
||||
{
|
||||
p_hwfn->sp_dpc = kmalloc(sizeof(*p_hwfn->sp_dpc), GFP_KERNEL);
|
||||
if (!p_hwfn->sp_dpc)
|
||||
return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void qed_int_sp_dpc_free(struct qed_hwfn *p_hwfn)
|
||||
{
|
||||
kfree(p_hwfn->sp_dpc);
|
||||
p_hwfn->sp_dpc = NULL;
|
||||
}
|
||||
|
||||
int qed_int_alloc(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
rc = qed_int_sp_dpc_alloc(p_hwfn);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
rc = qed_int_sp_sb_alloc(p_hwfn, p_ptt);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
@ -2326,7 +2306,6 @@ void qed_int_free(struct qed_hwfn *p_hwfn)
|
|||
{
|
||||
qed_int_sp_sb_free(p_hwfn);
|
||||
qed_int_sb_attn_free(p_hwfn);
|
||||
qed_int_sp_dpc_free(p_hwfn);
|
||||
}
|
||||
|
||||
void qed_int_setup(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
|
||||
|
|
|
@ -140,7 +140,7 @@ int qed_int_sb_release(struct qed_hwfn *p_hwfn,
|
|||
* @param p_hwfn - pointer to hwfn
|
||||
*
|
||||
*/
|
||||
void qed_int_sp_dpc(unsigned long hwfn_cookie);
|
||||
void qed_int_sp_dpc(struct tasklet_struct *t);
|
||||
|
||||
/**
|
||||
* @brief qed_int_get_num_sbs - get the number of status
|
||||
|
|
|
@ -734,7 +734,7 @@ static irqreturn_t qed_single_int(int irq, void *dev_instance)
|
|||
|
||||
/* Slowpath interrupt */
|
||||
if (unlikely(status & 0x1)) {
|
||||
tasklet_schedule(hwfn->sp_dpc);
|
||||
tasklet_schedule(&hwfn->sp_dpc);
|
||||
status &= ~0x1;
|
||||
rc = IRQ_HANDLED;
|
||||
}
|
||||
|
@ -780,7 +780,7 @@ int qed_slowpath_irq_req(struct qed_hwfn *hwfn)
|
|||
id, cdev->pdev->bus->number,
|
||||
PCI_SLOT(cdev->pdev->devfn), hwfn->abs_pf_id);
|
||||
rc = request_irq(cdev->int_params.msix_table[id].vector,
|
||||
qed_msix_sp_int, 0, hwfn->name, hwfn->sp_dpc);
|
||||
qed_msix_sp_int, 0, hwfn->name, &hwfn->sp_dpc);
|
||||
} else {
|
||||
unsigned long flags = 0;
|
||||
|
||||
|
@ -812,8 +812,8 @@ static void qed_slowpath_tasklet_flush(struct qed_hwfn *p_hwfn)
|
|||
* enable function makes this sequence a flush-like operation.
|
||||
*/
|
||||
if (p_hwfn->b_sp_dpc_enabled) {
|
||||
tasklet_disable(p_hwfn->sp_dpc);
|
||||
tasklet_enable(p_hwfn->sp_dpc);
|
||||
tasklet_disable(&p_hwfn->sp_dpc);
|
||||
tasklet_enable(&p_hwfn->sp_dpc);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -842,7 +842,7 @@ static void qed_slowpath_irq_free(struct qed_dev *cdev)
|
|||
break;
|
||||
synchronize_irq(cdev->int_params.msix_table[i].vector);
|
||||
free_irq(cdev->int_params.msix_table[i].vector,
|
||||
cdev->hwfns[i].sp_dpc);
|
||||
&cdev->hwfns[i].sp_dpc);
|
||||
}
|
||||
} else {
|
||||
if (QED_LEADING_HWFN(cdev)->b_int_requested)
|
||||
|
@ -861,11 +861,11 @@ static int qed_nic_stop(struct qed_dev *cdev)
|
|||
struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
|
||||
|
||||
if (p_hwfn->b_sp_dpc_enabled) {
|
||||
tasklet_disable(p_hwfn->sp_dpc);
|
||||
tasklet_disable(&p_hwfn->sp_dpc);
|
||||
p_hwfn->b_sp_dpc_enabled = false;
|
||||
DP_VERBOSE(cdev, NETIF_MSG_IFDOWN,
|
||||
"Disabled sp tasklet [hwfn %d] at %p\n",
|
||||
i, p_hwfn->sp_dpc);
|
||||
i, &p_hwfn->sp_dpc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue