Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753254Ab3GGVnu (ORCPT ); Sun, 7 Jul 2013 17:43:50 -0400 Received: from arrakis.dune.hu ([78.24.191.176]:47664 "EHLO arrakis.dune.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753127Ab3GGVns (ORCPT ); Sun, 7 Jul 2013 17:43:48 -0400 Date: Sun, 7 Jul 2013 23:43:41 +0200 From: Jonas Gorski To: Sebastian Hesselbarth Cc: Lennert Buytenhek , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] net: mv643xx_eth: fix DT port device name Message-ID: <20130707234341.0000721b@unknown> In-Reply-To: <1373229231-8838-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1373229231-8838-1-git-send-email-sebastian.hesselbarth@gmail.com> Organization: OpenWrt X-Mailer: Claws Mail 3.9.0cvs12 (GTK+ 2.16.6; i586-pc-mingw32msvc) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2511 Lines: 74 On Sun, 7 Jul 2013 22:33:51 +0200 Sebastian Hesselbarth wrote: > Device tree support added to Marvell MV643xx ethernet driver registers > port devices from port device nodes found on the corresponding controller > node. The current port device name will cause the second controller to > fail on registration because of two identical device names. This fixes > the issue by taking the device node's name also as port device name. > > Signed-off-by: Sebastian Hesselbarth > Reported-by: Jonas Gorski > --- > Cc: Lennert Buytenhek > Cc: Jonas Gorski > Cc: netdev@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c > index 6495bea..1f3a03d 100644 > --- a/drivers/net/ethernet/marvell/mv643xx_eth.c > +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c > @@ -2521,7 +2521,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, > of_property_read_u32(pnp, "duplex", &ppd.duplex); > } > > - ppdev = platform_device_alloc(MV643XX_ETH_NAME, ppd.port_number); > + ppdev = platform_device_alloc(pnp->name, ppd.port_number); > if (!ppdev) > return -ENOMEM; > ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); This breaks ethernet completely, as there is no platform driver registered for pnp->name ("ethernetX-port"), only for MV643XX_ETH_NAME. Also since I didn't see a patch for it and no mentioning of it: There's still one further issue from having two ethernet-ports with port_number 0, it causes a device leak: static struct platform_device *port_platdev[3]; mv643xx_eth_shared_of_add_port() { ... port_platdev[ppd.port_number] = ppdev; ... } The second port at 0 will overwrite the first and thus will never be deleted in mv643xx_eth_shared_of_remove() { ... for (n = 0; n < 3; n++) { platform_device_del(port_platdev[n]); port_platdev[n] = NULL; } } I doubt a insmod-rmmod-insmod will go well in that case ;-) Regards Jonas -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/