>From a82800cbd4f2ff34a4a03c8caa688149b8770ab7 Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Tue, 19 Mar 2013 15:11:48 +0100 Subject: [PATCH] net: mvneta: convert to local interrupt Since commit 3a6f08a37 "arm: mvebu: Add support for local interrupt", the mvneta interrupt is now managed as a local interrupt. That means that the driver have to use the request_percpu_irq() function instead of request_irq(). Signed-off-by: Gregory CLEMENT --- drivers/net/ethernet/marvell/mvneta.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index cd345b8..ad64a50 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -256,6 +256,8 @@ struct mvneta_port { unsigned int link; unsigned int duplex; unsigned int speed; + + struct mvneta_port __percpu **percpu_pp; }; /* The mvneta_tx_desc and mvneta_rx_desc structures describe the @@ -1799,7 +1801,7 @@ static void mvneta_set_rx_mode(struct net_device *dev) /* Interrupt handling - the callback for request_irq() */ static irqreturn_t mvneta_isr(int irq, void *dev_id) { - struct mvneta_port *pp = (struct mvneta_port *)dev_id; + struct mvneta_port *pp = *(struct mvneta_port **)dev_id; /* Mask all interrupts */ mvreg_write(pp, MVNETA_INTR_NEW_MASK, 0); @@ -2371,8 +2373,19 @@ static void mvneta_mdio_remove(struct mvneta_port *pp) static int mvneta_open(struct net_device *dev) { struct mvneta_port *pp = netdev_priv(dev); + int ret; + /* As the mvneta interrupts are locals, we need to create a + * percpu variable + */ + pp->percpu_pp = alloc_percpu(struct mvneta_port *); + if (!pp) { + ret = -ENOMEM; + goto err_percpu_alloc; + } + *__this_cpu_ptr(pp->percpu_pp) = pp; + mvneta_mac_addr_set(pp, dev->dev_addr, rxq_def); pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu); @@ -2385,13 +2398,15 @@ static int mvneta_open(struct net_device *dev) if (ret) goto err_cleanup_rxqs; + /* Connect to port interrupt line */ - ret = request_irq(pp->dev->irq, mvneta_isr, 0, - MVNETA_DRIVER_NAME, pp); + ret = request_percpu_irq(pp->dev->irq, mvneta_isr, + MVNETA_DRIVER_NAME, pp->percpu_pp); if (ret) { netdev_err(pp->dev, "cannot request irq %d\n", pp->dev->irq); goto err_cleanup_txqs; } + enable_percpu_irq(pp->dev->irq, 0); /* In default link is down */ netif_carrier_off(pp->dev); @@ -2407,11 +2422,13 @@ static int mvneta_open(struct net_device *dev) return 0; err_free_irq: + free_percpu(pp->percpu_pp); free_irq(pp->dev->irq, pp); err_cleanup_txqs: mvneta_cleanup_txqs(pp); err_cleanup_rxqs: mvneta_cleanup_rxqs(pp); +err_percpu_alloc: return ret; } @@ -2422,7 +2439,8 @@ static int mvneta_stop(struct net_device *dev) mvneta_stop_dev(pp); mvneta_mdio_remove(pp); - free_irq(dev->irq, pp); + free_percpu(pp->percpu_pp); + free_percpu_irq(dev->irq, pp); mvneta_cleanup_rxqs(pp); mvneta_cleanup_txqs(pp); del_timer(&pp->tx_done_timer); -- 1.7.9.5