From patchwork Tue Nov 25 15:45:12 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Olsson X-Patchwork-Id: 10650 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id D9595DDE19 for ; Wed, 26 Nov 2008 02:45:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751832AbYKYPpP (ORCPT ); Tue, 25 Nov 2008 10:45:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751449AbYKYPpP (ORCPT ); Tue, 25 Nov 2008 10:45:15 -0500 Received: from robur.slu.se ([130.238.98.12]:54766 "EHLO robur.slu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287AbYKYPpO (ORCPT ); Tue, 25 Nov 2008 10:45:14 -0500 Received: by robur.slu.se (Postfix, from userid 1000) id 4064EEC04C; Tue, 25 Nov 2008 16:45:12 +0100 (CET) From: Robert Olsson MIME-Version: 1.0 Message-ID: <18732.7560.67492.918339@robur.slu.se> Date: Tue, 25 Nov 2008 16:45:12 +0100 To: David Miller Cc: netdev@vger.kernel.org, Robert.Olsson@data.slu.se Subject: [PATCH] Naming interrupt vectors/niu X-Mailer: VM 7.19 under Emacs 22.2.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, A patch to put names on the niu interrupt vectors according the syntax below. This is needed to assign correct affinity. > So on a multiqueue card with 2 RX queues and 2 TX queues we'd > have names like: > > eth0-rx-0 > eth0-rx-1 > eth0-tx-0 > eth0-tx-1 Signed-off-by: Robert Olsson Tested-by: Jesper Dangaard Brouer --- 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 diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 1b6f548..9798312 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c @@ -5849,17 +5849,43 @@ static void niu_stop_hw(struct niu *np) niu_reset_rx_channels(np); } +static void niu_set_irq_name(struct niu *np) +{ + int i, j = 1; + int port = np->port; + + sprintf(np->irq_name[0], "%s:MAC", np->dev->name); + + if(port == 0) { + sprintf(np->irq_name[1], "%s:MIF", np->dev->name); + sprintf(np->irq_name[2], "%s:SYSERR", np->dev->name); + j = 3; + } + + for (i = 0; i < np->num_ldg-j; i++) { + + if(i < np->num_rx_rings) + sprintf(np->irq_name[i+j], "%s-rx-%d", np->dev->name, i); + + else if(i < np->num_tx_rings + np->num_rx_rings) + sprintf(np->irq_name[i+j], "%s-tx-%d", np->dev->name, + i - np->num_rx_rings); + } +} + static int niu_request_irq(struct niu *np) { int i, j, err; + niu_set_irq_name(np); + err = 0; for (i = 0; i < np->num_ldg; i++) { struct niu_ldg *lp = &np->ldg[i]; err = request_irq(lp->irq, niu_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, - np->dev->name, lp); + np->irq_name[i], lp); if (err) goto out_free_irqs; diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 180ca8a..cf449aa 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h @@ -3243,6 +3243,7 @@ struct niu { #define NIU_FLAGS_XMAC 0x00010000 /* 0=BMAC 1=XMAC */ u32 msg_enable; + char irq_name[NIU_NUM_RXCHAN+NIU_NUM_TXCHAN+3][IFNAMSIZ + 6]; /* Protects hw programming, and ring state. */ spinlock_t lock;