From: Felipe Balbi <balbi@ti.com> To: <davem@davemloft.net> Cc: Tony Lindgren <tony@atomide.com>, Linux OMAP Mailing List <linux-omap@vger.kernel.org>, <mugunthanvnm@ti.com>, <netdev@vger.kernel.org>, Felipe Balbi <balbi@ti.com> Subject: [patch-net-next v2 3/3] net: ethernet: cpsw: don't requests IRQs we don't use Date: Wed, 14 Jan 2015 10:58:49 -0600 [thread overview] Message-ID: <1421254729-10602-3-git-send-email-balbi@ti.com> (raw) In-Reply-To: <1421254729-10602-1-git-send-email-balbi@ti.com> CPSW never uses RX_THRESHOLD or MISC interrupts. In fact, they are always kept masked in their appropriate IRQ Enable register. Instead of allocating an IRQ that never fires, it's best to remove that code altogether and let future patches implement it if anybody needs those. Signed-off-by: Felipe Balbi <balbi@ti.com> --- drivers/net/ethernet/ti/cpsw.c | 55 ++++++++++++------------------------------ 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c6c483f3e49f..ba09ff3c1695 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -754,16 +754,6 @@ requeue: dev_kfree_skb_any(new_skb); } -static irqreturn_t cpsw_dummy_interrupt(int irq, void *dev_id) -{ - struct cpsw_priv *priv = dev_id; - int value = irq - priv->irqs_table[0]; - - cpdma_ctlr_eoi(priv->dma, value); - - return IRQ_HANDLED; -} - static irqreturn_t cpsw_tx_interrupt(int irq, void *dev_id) { struct cpsw_priv *priv = dev_id; @@ -1635,8 +1625,8 @@ static void cpsw_ndo_poll_controller(struct net_device *ndev) cpsw_intr_disable(priv); cpdma_ctlr_int_ctrl(priv->dma, false); - cpsw_rx_interrupt(priv->irq[1], priv); - cpsw_tx_interrupt(priv->irq[2], priv); + cpsw_rx_interrupt(priv->irq[0], priv); + cpsw_tx_interrupt(priv->irq[1], priv); cpdma_ctlr_int_ctrl(priv->dma, true); cpsw_intr_enable(priv); } @@ -2358,30 +2348,27 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_dma_ret; } - ndev->irq = platform_get_irq(pdev, 0); + ndev->irq = platform_get_irq(pdev, 1); if (ndev->irq < 0) { dev_err(priv->dev, "error getting irq resource\n"); ret = -ENOENT; goto clean_ale_ret; } - irq = platform_get_irq(pdev, 0); - if (irq < 0) - goto clean_ale_ret; - - priv->irqs_table[0] = irq; - ret = devm_request_irq(&pdev->dev, irq, cpsw_dummy_interrupt, - 0, dev_name(&pdev->dev), priv); - if (ret < 0) { - dev_err(priv->dev, "error attaching irq (%d)\n", ret); - goto clean_ale_ret; - } + /* Grab RX and TX IRQs. Note that we also have RX_THRESHOLD and + * MISC IRQs which are always kept disabled with this driver so + * we will not request them. + * + * If anyone wants to implement support for those, make sure to + * first request and append them to irqs_table array. + */ + /* RX IRQ */ irq = platform_get_irq(pdev, 1); if (irq < 0) goto clean_ale_ret; - priv->irqs_table[1] = irq; + priv->irqs_table[0] = irq; ret = devm_request_irq(&pdev->dev, irq, cpsw_rx_interrupt, 0, dev_name(&pdev->dev), priv); if (ret < 0) { @@ -2389,31 +2376,19 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_ale_ret; } + /* TX IRQ */ irq = platform_get_irq(pdev, 2); if (irq < 0) goto clean_ale_ret; - priv->irqs_table[2] = irq; + priv->irqs_table[1] = irq; ret = devm_request_irq(&pdev->dev, irq, cpsw_tx_interrupt, 0, dev_name(&pdev->dev), priv); if (ret < 0) { dev_err(priv->dev, "error attaching irq (%d)\n", ret); goto clean_ale_ret; } - - irq = platform_get_irq(pdev, 3); - if (irq < 0) - goto clean_ale_ret; - - priv->irqs_table[3] = irq; - ret = devm_request_irq(&pdev->dev, irq, cpsw_dummy_interrupt, - 0, dev_name(&pdev->dev), priv); - if (ret < 0) { - dev_err(priv->dev, "error attaching irq (%d)\n", ret); - goto clean_ale_ret; - } - - priv->num_irqs = 4; + priv->num_irqs = 2; ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; -- 2.2.0
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi@ti.com> To: davem@davemloft.net Cc: Tony Lindgren <tony@atomide.com>, Linux OMAP Mailing List <linux-omap@vger.kernel.org>, mugunthanvnm@ti.com, netdev@vger.kernel.org, Felipe Balbi <balbi@ti.com> Subject: [patch-net-next v2 3/3] net: ethernet: cpsw: don't requests IRQs we don't use Date: Wed, 14 Jan 2015 10:58:49 -0600 [thread overview] Message-ID: <1421254729-10602-3-git-send-email-balbi@ti.com> (raw) In-Reply-To: <1421254729-10602-1-git-send-email-balbi@ti.com> CPSW never uses RX_THRESHOLD or MISC interrupts. In fact, they are always kept masked in their appropriate IRQ Enable register. Instead of allocating an IRQ that never fires, it's best to remove that code altogether and let future patches implement it if anybody needs those. Signed-off-by: Felipe Balbi <balbi@ti.com> --- drivers/net/ethernet/ti/cpsw.c | 55 ++++++++++++------------------------------ 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c6c483f3e49f..ba09ff3c1695 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -754,16 +754,6 @@ requeue: dev_kfree_skb_any(new_skb); } -static irqreturn_t cpsw_dummy_interrupt(int irq, void *dev_id) -{ - struct cpsw_priv *priv = dev_id; - int value = irq - priv->irqs_table[0]; - - cpdma_ctlr_eoi(priv->dma, value); - - return IRQ_HANDLED; -} - static irqreturn_t cpsw_tx_interrupt(int irq, void *dev_id) { struct cpsw_priv *priv = dev_id; @@ -1635,8 +1625,8 @@ static void cpsw_ndo_poll_controller(struct net_device *ndev) cpsw_intr_disable(priv); cpdma_ctlr_int_ctrl(priv->dma, false); - cpsw_rx_interrupt(priv->irq[1], priv); - cpsw_tx_interrupt(priv->irq[2], priv); + cpsw_rx_interrupt(priv->irq[0], priv); + cpsw_tx_interrupt(priv->irq[1], priv); cpdma_ctlr_int_ctrl(priv->dma, true); cpsw_intr_enable(priv); } @@ -2358,30 +2348,27 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_dma_ret; } - ndev->irq = platform_get_irq(pdev, 0); + ndev->irq = platform_get_irq(pdev, 1); if (ndev->irq < 0) { dev_err(priv->dev, "error getting irq resource\n"); ret = -ENOENT; goto clean_ale_ret; } - irq = platform_get_irq(pdev, 0); - if (irq < 0) - goto clean_ale_ret; - - priv->irqs_table[0] = irq; - ret = devm_request_irq(&pdev->dev, irq, cpsw_dummy_interrupt, - 0, dev_name(&pdev->dev), priv); - if (ret < 0) { - dev_err(priv->dev, "error attaching irq (%d)\n", ret); - goto clean_ale_ret; - } + /* Grab RX and TX IRQs. Note that we also have RX_THRESHOLD and + * MISC IRQs which are always kept disabled with this driver so + * we will not request them. + * + * If anyone wants to implement support for those, make sure to + * first request and append them to irqs_table array. + */ + /* RX IRQ */ irq = platform_get_irq(pdev, 1); if (irq < 0) goto clean_ale_ret; - priv->irqs_table[1] = irq; + priv->irqs_table[0] = irq; ret = devm_request_irq(&pdev->dev, irq, cpsw_rx_interrupt, 0, dev_name(&pdev->dev), priv); if (ret < 0) { @@ -2389,31 +2376,19 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_ale_ret; } + /* TX IRQ */ irq = platform_get_irq(pdev, 2); if (irq < 0) goto clean_ale_ret; - priv->irqs_table[2] = irq; + priv->irqs_table[1] = irq; ret = devm_request_irq(&pdev->dev, irq, cpsw_tx_interrupt, 0, dev_name(&pdev->dev), priv); if (ret < 0) { dev_err(priv->dev, "error attaching irq (%d)\n", ret); goto clean_ale_ret; } - - irq = platform_get_irq(pdev, 3); - if (irq < 0) - goto clean_ale_ret; - - priv->irqs_table[3] = irq; - ret = devm_request_irq(&pdev->dev, irq, cpsw_dummy_interrupt, - 0, dev_name(&pdev->dev), priv); - if (ret < 0) { - dev_err(priv->dev, "error attaching irq (%d)\n", ret); - goto clean_ale_ret; - } - - priv->num_irqs = 4; + priv->num_irqs = 2; ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; -- 2.2.0
next prev parent reply other threads:[~2015-01-14 16:59 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-14 16:58 [patch-net-next v2 1/3] net: ethernet: cpsw: unroll IRQ request loop Felipe Balbi 2015-01-14 16:58 ` Felipe Balbi 2015-01-14 16:58 ` [patch-net-next v2 2/3] net: ethernet: cpsw: split out IRQ handler Felipe Balbi 2015-01-14 16:58 ` Felipe Balbi 2015-01-14 16:58 ` Felipe Balbi [this message] 2015-01-14 16:58 ` [patch-net-next v2 3/3] net: ethernet: cpsw: don't requests IRQs we don't use Felipe Balbi 2015-01-15 7:49 ` Mugunthan V N 2015-01-15 7:49 ` Mugunthan V N 2015-01-15 15:20 ` Felipe Balbi 2015-01-15 15:20 ` Felipe Balbi 2015-01-15 23:16 ` David Miller 2015-01-16 1:28 ` Felipe Balbi 2015-01-16 1:28 ` Felipe Balbi 2015-01-16 4:36 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1421254729-10602-3-git-send-email-balbi@ti.com \ --to=balbi@ti.com \ --cc=davem@davemloft.net \ --cc=linux-omap@vger.kernel.org \ --cc=mugunthanvnm@ti.com \ --cc=netdev@vger.kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.