Home » Mailing list archives » linux-netdev » 2010 » June » 25

[PATCH net-next 2/6] cnic: Unify IRQ code for all hardware types.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Michael Chan
Subject: [PATCH net-next 2/6] cnic: Unify IRQ code for all hardware types.
Date: Thursday, June 24, 2010 - 5:58 pm

By creating a common cnic_doirq().

Signed-off-by: Michael Chan <mchan@broadcom.com>
---
 drivers/net/cnic.c |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 23395fa..bd92a24 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -2188,6 +2188,9 @@ static void cnic_chk_pkt_rings(struct cnic_local *cp)
 	u16 tx_cons = *cp->tx_cons_ptr;
 	int comp = 0;
 
+	if (!test_bit(CNIC_F_CNIC_UP, &cp->dev->flags))
+		return;
+
 	if (cp->tx_cons != tx_cons || cp->rx_cons != rx_cons) {
 		if (test_bit(CNIC_LCL_FL_L2_WAIT, &cp->cnic_local_flags))
 			comp = cnic_l2_completion(cp);
@@ -2284,20 +2287,28 @@ done:
 		BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx);
 }
 
+static void cnic_doirq(struct cnic_dev *dev)
+{
+	struct cnic_local *cp = dev->cnic_priv;
+	u16 prod = cp->kcq_prod_idx & MAX_KCQ_IDX;
+
+	if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
+		prefetch(cp->status_blk.gen);
+		prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);
+
+		tasklet_schedule(&cp->cnic_irq_task);
+	}
+}
+
 static irqreturn_t cnic_irq(int irq, void *dev_instance)
 {
 	struct cnic_dev *dev = dev_instance;
 	struct cnic_local *cp = dev->cnic_priv;
-	u16 prod = cp->kcq_prod_idx & MAX_KCQ_IDX;
 
 	if (cp->ack_int)
 		cp->ack_int(dev);
 
-	prefetch(cp->status_blk.gen);
-	prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);
-
-	if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags)))
-		tasklet_schedule(&cp->cnic_irq_task);
+	cnic_doirq(dev);
 
 	return IRQ_HANDLED;
 }
@@ -2373,15 +2384,11 @@ static int cnic_service_bnx2x(void *data, void *status_blk)
 {
 	struct cnic_dev *dev = data;
 	struct cnic_local *cp = dev->cnic_priv;
-	u16 prod = cp->kcq_prod_idx & MAX_KCQ_IDX;
 
-	if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
-		prefetch(cp->status_blk.bnx2x);
-		prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);
+	if (!(cp->ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX))
+		cnic_doirq(dev);
 
-		tasklet_schedule(&cp->cnic_irq_task);
-		cnic_chk_pkt_rings(cp);
-	}
+	cnic_chk_pkt_rings(cp);
 
 	return 0;
 }
-- 
1.6.4.GIT


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH net-next 2/6] cnic: Unify IRQ code for all hardware ..., Michael Chan, (Thu Jun 24, 5:58 pm)
[PATCH net-next 3/6] cnic: Unify kcq allocation for all de ..., Michael Chan, (Thu Jun 24, 5:58 pm)
[PATCH net-next 4/6] cnic: Restructure kcq processing., Michael Chan, (Thu Jun 24, 5:58 pm)
[PATCH net-next 5/6] cnic: Further unify kcq handling code., Michael Chan, (Thu Jun 24, 5:58 pm)
[PATCH net-next 6/6] cnic: Update version to 2.1.3., Michael Chan, (Thu Jun 24, 5:58 pm)
Re: [PATCH net-next 2/6] cnic: Unify IRQ code for all hard ..., David Miller, (Fri Jun 25, 9:07 pm)
Re: [PATCH net-next 3/6] cnic: Unify kcq allocation for al ..., David Miller, (Fri Jun 25, 9:07 pm)
Re: [PATCH net-next 4/6] cnic: Restructure kcq processing., David Miller, (Fri Jun 25, 9:07 pm)
Re: [PATCH net-next 5/6] cnic: Further unify kcq handling ..., David Miller, (Fri Jun 25, 9:07 pm)
Re: [PATCH net-next 6/6] cnic: Update version to 2.1.3., David Miller, (Fri Jun 25, 9:08 pm)