[PATCH][NET] several cleanups and bugfixes for fec.c: don't munge MAC address from platform data

Shawn Guo shawn.guo at freescale.com
Wed Dec 7 03:57:03 EST 2011


On Tue, Dec 06, 2011 at 02:44:44PM +0100, Lothar Waßmann wrote:
> Hi,
> 
> Baruch Siach writes:
> > Hi Lothar,
> > 
> > On Tue, Dec 06, 2011 at 11:27:13AM +0100, Lothar Waßmann wrote:
> > > When the MAC address is supplied via platform_data it should be OK as
> > > it is and should not be modified in case of a dual FEC setup.
> > > Also copying the MAC from platform_data to the single 'macaddr'
> > > variable will overwrite the MAC for the first interface in case of a
> > > dual FEC setup.
> > > 
> > > Signed-off-by: Lothar Waßmann <LW at KARO-electronics.de>
> > > ---
> > >  drivers/net/ethernet/freescale/fec.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
> > > index e2b5ce6..11534b9 100644
> > > --- a/drivers/net/ethernet/freescale/fec.c
> > > +++ b/drivers/net/ethernet/freescale/fec.c
> > > @@ -818,7 +818,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev)
> > >  			iap = (unsigned char *)FEC_FLASHMAC;
> > >  #else
> > >  		if (pdata)
> > > -			memcpy(iap, pdata->mac, ETH_ALEN);
> > > +			iap = (unsigned char *)&pdata->mac;
> > 
> > Since pdata might point to __initdata struct, you must hold a copy of its 
> > content.
> > 

As iap will anyway be copied to ndev->dev_addr after that, it may still
be fine to take this patch, for obviously for different reason.

> No. platform_data must be present during the life time of a driver
> using it and thus must never be __initdata!
> 
Then we need to fix a lot of imx/mxc platform codes, mach-mx28evk.c
is the one for this case.

-- 
Regards,
Shawn




More information about the linux-arm-kernel mailing list