Commit 31a5bb04 authored by Scott Wood's avatar Scott Wood Committed by David S. Miller
Browse files

fs_enet: sparse fixes 



Mostly a bunch of __iomem annotations.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2b5b3a60

drivers/net/fs_enet/fs_enet-main.c

+9 −9
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ MODULE_DESCRIPTION("Freescale Ethernet Driver"); 
MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_MODULE_VERSION);



int fs_enet_debug = -1;		/* -1 == use FS_ENET_DEF_MSG_ENABLE as value */

static int fs_enet_debug = -1; /* -1 == use FS_ENET_DEF_MSG_ENABLE as value */

module_param(fs_enet_debug, int, 0);

MODULE_PARM_DESC(fs_enet_debug,

		 "Freescale bitmapped debugging message enable value");
@@ -90,7 +90,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget) 
	struct fs_enet_private *fep = container_of(napi, struct fs_enet_private, napi);

	struct net_device *dev = to_net_dev(fep->dev);

	const struct fs_platform_info *fpi = fep->fpi;

	cbd_t *bdp;

	cbd_t __iomem *bdp;

	struct sk_buff *skb, *skbn, *skbt;

	int received = 0;

	u16 pkt_len, sc;
@@ -230,7 +230,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev) 
{

	struct fs_enet_private *fep = netdev_priv(dev);

	const struct fs_platform_info *fpi = fep->fpi;

	cbd_t *bdp;

	cbd_t __iomem *bdp;

	struct sk_buff *skb, *skbn, *skbt;

	int received = 0;

	u16 pkt_len, sc;
@@ -355,7 +355,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev) 
static void fs_enet_tx(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	cbd_t *bdp;

	cbd_t __iomem *bdp;

	struct sk_buff *skb;

	int dirtyidx, do_wake, do_restart;

	u16 sc;
@@ -503,7 +503,7 @@ fs_enet_interrupt(int irq, void *dev_id) 
void fs_init_bds(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	cbd_t *bdp;

	cbd_t __iomem *bdp;

	struct sk_buff *skb;

	int i;
@@ -557,7 +557,7 @@ void fs_cleanup_bds(struct net_device *dev) 
{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct sk_buff *skb;

	cbd_t *bdp;

	cbd_t __iomem *bdp;

	int i;



	/*
@@ -598,7 +598,7 @@ void fs_cleanup_bds(struct net_device *dev) 
static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	cbd_t *bdp;

	cbd_t __iomem *bdp;

	int curidx;

	u16 sc;

	unsigned long flags;
@@ -1121,7 +1121,7 @@ static int fs_cleanup_instance(struct net_device *ndev) 
	unregister_netdev(ndev);



	dma_free_coherent(fep->dev, (fpi->tx_ring + fpi->rx_ring) * sizeof(cbd_t),

			  fep->ring_base, fep->ring_mem_addr);

			  (void __force *)fep->ring_base, fep->ring_mem_addr);



	/* reset it */

	(*fep->ops->cleanup_data)(ndev);
@@ -1141,7 +1141,7 @@ static int fs_cleanup_instance(struct net_device *ndev) 
/**************************************************************************************/



/* handy pointer to the immap */

void *fs_enet_immap = NULL;

void __iomem *fs_enet_immap = NULL;



static int setup_immap(void)

{

drivers/net/fs_enet/fs_enet.h

+15 −15
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/commproc.h>



struct fec_info {

	fec_t *fecp;

	fec_t __iomem *fecp;

	u32 mii_speed;

};

#endif
@@ -81,14 +81,14 @@ struct fs_enet_private { 
	const struct fs_ops *ops;

	int rx_ring, tx_ring;

	dma_addr_t ring_mem_addr;

	void *ring_base;

	void __iomem *ring_base;

	struct sk_buff **rx_skbuff;

	struct sk_buff **tx_skbuff;

	cbd_t *rx_bd_base;	/* Address of Rx and Tx buffers.    */

	cbd_t *tx_bd_base;

	cbd_t *dirty_tx;	/* ring entries to be free()ed.     */

	cbd_t *cur_rx;

	cbd_t *cur_tx;

	cbd_t __iomem *rx_bd_base;	/* Address of Rx and Tx buffers.    */

	cbd_t __iomem *tx_bd_base;

	cbd_t __iomem *dirty_tx;	/* ring entries to be free()ed.     */

	cbd_t __iomem *cur_rx;

	cbd_t __iomem *cur_tx;

	int tx_free;

	struct net_device_stats stats;

	struct timer_list phy_timer_list;
@@ -113,23 +113,23 @@ struct fs_enet_private { 
	union {

		struct {

			int idx;		/* FEC1 = 0, FEC2 = 1  */

			void *fecp;		/* hw registers        */

			void __iomem *fecp;	/* hw registers        */

			u32 hthi, htlo;		/* state for multicast */

		} fec;



		struct {

			int idx;		/* FCC1-3 = 0-2	       */

			void *fccp;		/* hw registers	       */

			void *ep;		/* parameter ram       */

			void *fcccp;		/* hw registers cont.  */

			void *mem;		/* FCC DPRAM */

			void __iomem *fccp;	/* hw registers	       */

			void __iomem *ep;	/* parameter ram       */

			void __iomem *fcccp;	/* hw registers cont.  */

			void __iomem *mem;	/* FCC DPRAM */

			u32 gaddrh, gaddrl;	/* group address       */

		} fcc;



		struct {

			int idx;		/* FEC1 = 0, FEC2 = 1  */

			void *sccp;		/* hw registers        */

			void *ep;		/* parameter ram       */

			void __iomem *sccp;	/* hw registers        */

			void __iomem *ep;	/* parameter ram       */

			u32 hthi, htlo;		/* state for multicast */

		} scc;
@@ -200,7 +200,7 @@ extern const struct fs_ops fs_scc_ops; 
/*******************************************************************/



/* handy pointer to the immap */

extern void *fs_enet_immap;

extern void __iomem *fs_enet_immap;



/*******************************************************************/

drivers/net/fs_enet/mac-fcc.c

+39 −32
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ 
static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)

{

	const struct fs_platform_info *fpi = fep->fpi;

	cpm2_map_t *immap = fs_enet_immap;

	cpm_cpm2_t *cpmp = &immap->im_cpm;

	int i;



	W32(cpmp, cp_cpcr, fpi->cp_command | op | CPM_CR_FLG);
@@ -118,8 +116,8 @@ static int do_pd_setup(struct fs_enet_private *fep) 
	if (!fep->fcc.fcccp)

		goto out_ep;



	fep->fcc.mem = (void *)cpm_dpalloc(128, 8);

	fpi->dpram_offset = (u32)cpm2_immr;

	fep->fcc.mem = (void __iomem *)cpm2_immr;

	fpi->dpram_offset = cpm_dpalloc(128, 8);

	if (IS_ERR_VALUE(fpi->dpram_offset)) {

		ret = fpi->dpram_offset;

		goto out_fcccp;
@@ -146,29 +144,28 @@ static int do_pd_setup(struct fs_enet_private *fep) 


	/* Attach the memory for the FCC Parameter RAM */

	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fcc_pram");

	fep->fcc.ep = (void *)ioremap(r->start, r->end - r->start + 1);

	fep->fcc.ep = ioremap(r->start, r->end - r->start + 1);

	if (fep->fcc.ep == NULL)

		return -EINVAL;



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fcc_regs");

	fep->fcc.fccp = (void *)ioremap(r->start, r->end - r->start + 1);

	fep->fcc.fccp = ioremap(r->start, r->end - r->start + 1);

	if (fep->fcc.fccp == NULL)

		return -EINVAL;



	if (fep->fpi->fcc_regs_c) {



		fep->fcc.fcccp = (void *)fep->fpi->fcc_regs_c;

		fep->fcc.fcccp = (void __iomem *)fep->fpi->fcc_regs_c;

	} else {

		r = platform_get_resource_byname(pdev, IORESOURCE_MEM,

				"fcc_regs_c");

		fep->fcc.fcccp = (void *)ioremap(r->start,

		fep->fcc.fcccp = ioremap(r->start,

				r->end - r->start + 1);

	}



	if (fep->fcc.fcccp == NULL)

		return -EINVAL;



	fep->fcc.mem = (void *)fep->fpi->mem_offset;

	fep->fcc.mem = (void __iomem *)fep->fpi->mem_offset;

	if (fep->fcc.mem == NULL)

		return -EINVAL;
@@ -212,7 +209,7 @@ static int allocate_bd(struct net_device *dev) 
	struct fs_enet_private *fep = netdev_priv(dev);

	const struct fs_platform_info *fpi = fep->fpi;



	fep->ring_base = dma_alloc_coherent(fep->dev,

	fep->ring_base = (void __iomem __force *)dma_alloc_coherent(fep->dev,

					    (fpi->tx_ring + fpi->rx_ring) *

					    sizeof(cbd_t), &fep->ring_mem_addr,

					    GFP_KERNEL);
@@ -230,7 +227,7 @@ static void free_bd(struct net_device *dev) 
	if (fep->ring_base)

		dma_free_coherent(fep->dev,

			(fpi->tx_ring + fpi->rx_ring) * sizeof(cbd_t),

			fep->ring_base, fep->ring_mem_addr);

			(void __force *)fep->ring_base, fep->ring_mem_addr);

}



static void cleanup_data(struct net_device *dev)
@@ -241,7 +238,7 @@ static void cleanup_data(struct net_device *dev) 
static void set_promiscuous_mode(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	S32(fccp, fcc_fpsmr, FCC_PSMR_PRO);

}
@@ -249,7 +246,7 @@ static void set_promiscuous_mode(struct net_device *dev) 
static void set_multicast_start(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_enet_t *ep = fep->fcc.ep;

	fcc_enet_t __iomem *ep = fep->fcc.ep;



	W32(ep, fen_gaddrh, 0);

	W32(ep, fen_gaddrl, 0);
@@ -258,7 +255,7 @@ static void set_multicast_start(struct net_device *dev) 
static void set_multicast_one(struct net_device *dev, const u8 *mac)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_enet_t *ep = fep->fcc.ep;

	fcc_enet_t __iomem *ep = fep->fcc.ep;

	u16 taddrh, taddrm, taddrl;



	taddrh = ((u16)mac[5] << 8) | mac[4];
@@ -274,8 +271,8 @@ static void set_multicast_one(struct net_device *dev, const u8 *mac) 
static void set_multicast_finish(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_enet_t *ep = fep->fcc.ep;

	fcc_t __iomem *fccp = fep->fcc.fccp;

	fcc_enet_t __iomem *ep = fep->fcc.ep;



	/* clear promiscuous always */

	C32(fccp, fcc_fpsmr, FCC_PSMR_PRO);
@@ -310,12 +307,14 @@ static void restart(struct net_device *dev) 
{

	struct fs_enet_private *fep = netdev_priv(dev);

	const struct fs_platform_info *fpi = fep->fpi;

	fcc_t *fccp = fep->fcc.fccp;

	fcc_c_t *fcccp = fep->fcc.fcccp;

	fcc_enet_t *ep = fep->fcc.ep;

	fcc_t __iomem *fccp = fep->fcc.fccp;

	fcc_c_t __iomem *fcccp = fep->fcc.fcccp;

	fcc_enet_t __iomem *ep = fep->fcc.ep;

	dma_addr_t rx_bd_base_phys, tx_bd_base_phys;

	u16 paddrh, paddrm, paddrl;

#ifndef CONFIG_PPC_CPM_NEW_BINDING

	u16 mem_addr;

#endif

	const unsigned char *mac;

	int i;
@@ -347,14 +346,22 @@ static void restart(struct net_device *dev) 
	 * this area.

	 */



#ifdef CONFIG_PPC_CPM_NEW_BINDING

	W16(ep, fen_genfcc.fcc_riptr, fpi->dpram_offset);

	W16(ep, fen_genfcc.fcc_tiptr, fpi->dpram_offset + 32);



	W16(ep, fen_padptr, fpi->dpram_offset + 64);

#else

	mem_addr = (u32) fep->fcc.mem;	/* de-fixup dpram offset */



	W16(ep, fen_genfcc.fcc_riptr, (mem_addr & 0xffff));

	W16(ep, fen_genfcc.fcc_tiptr, ((mem_addr + 32) & 0xffff));



	W16(ep, fen_padptr, mem_addr + 64);

#endif



	/* fill with special symbol...  */

	memset(fep->fcc.mem + fpi->dpram_offset + 64, 0x88, 32);

	memset_io(fep->fcc.mem + fpi->dpram_offset + 64, 0x88, 32);



	W32(ep, fen_genfcc.fcc_rbptr, 0);

	W32(ep, fen_genfcc.fcc_tbptr, 0);
@@ -470,7 +477,7 @@ static void restart(struct net_device *dev) 
static void stop(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	/* stop ethernet */

	C32(fccp, fcc_gfmr, FCC_GFMR_ENR | FCC_GFMR_ENT);
@@ -497,7 +504,7 @@ static void post_free_irq(struct net_device *dev, int irq) 
static void napi_clear_rx_event(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	W16(fccp, fcc_fcce, FCC_NAPI_RX_EVENT_MSK);

}
@@ -505,7 +512,7 @@ static void napi_clear_rx_event(struct net_device *dev) 
static void napi_enable_rx(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	S16(fccp, fcc_fccm, FCC_NAPI_RX_EVENT_MSK);

}
@@ -513,7 +520,7 @@ static void napi_enable_rx(struct net_device *dev) 
static void napi_disable_rx(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	C16(fccp, fcc_fccm, FCC_NAPI_RX_EVENT_MSK);

}
@@ -526,7 +533,7 @@ static void rx_bd_done(struct net_device *dev) 
static void tx_kickstart(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	S16(fccp, fcc_ftodr, 0x8000);

}
@@ -534,7 +541,7 @@ static void tx_kickstart(struct net_device *dev) 
static u32 get_int_events(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	return (u32)R16(fccp, fcc_fcce);

}
@@ -542,7 +549,7 @@ static u32 get_int_events(struct net_device *dev) 
static void clear_int_events(struct net_device *dev, u32 int_events)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	W16(fccp, fcc_fcce, int_events & 0xffff);

}
@@ -553,7 +560,7 @@ static void ev_error(struct net_device *dev, u32 int_events) 
	       ": %s FS_ENET ERROR(s) 0x%x\n", dev->name, int_events);

}



int get_regs(struct net_device *dev, void *p, int *sizep)

static int get_regs(struct net_device *dev, void *p, int *sizep)

{

	struct fs_enet_private *fep = netdev_priv(dev);
@@ -570,7 +577,7 @@ int get_regs(struct net_device *dev, void *p, int *sizep) 
	return 0;

}



int get_regs_len(struct net_device *dev)

static int get_regs_len(struct net_device *dev)

{

	return sizeof(fcc_t) + sizeof(fcc_enet_t) + 1;

}
@@ -583,10 +590,10 @@ int get_regs_len(struct net_device *dev) 
 * CPM37, we must disable and then re-enable the transmitter

 * following a Late Collision, Underrun, or Retry Limit error.

 */

void tx_restart(struct net_device *dev)

static void tx_restart(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fcc_t *fccp = fep->fcc.fccp;

	fcc_t __iomem *fccp = fep->fcc.fccp;



	C32(fccp, fcc_gfmr, FCC_GFMR_ENT);

	udelay(10);

drivers/net/fs_enet/mac-fec.c

+17 −17
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
 */

#define FEC_RESET_DELAY		50



static int whack_reset(fec_t * fecp)

static int whack_reset(fec_t __iomem *fecp)

{

	int i;
@@ -159,7 +159,7 @@ static int allocate_bd(struct net_device *dev) 
	struct fs_enet_private *fep = netdev_priv(dev);

	const struct fs_platform_info *fpi = fep->fpi;



	fep->ring_base = dma_alloc_coherent(fep->dev,

	fep->ring_base = (void __force __iomem *)dma_alloc_coherent(fep->dev,

					    (fpi->tx_ring + fpi->rx_ring) *

					    sizeof(cbd_t), &fep->ring_mem_addr,

					    GFP_KERNEL);
@@ -177,7 +177,7 @@ static void free_bd(struct net_device *dev) 
	if(fep->ring_base)

		dma_free_coherent(fep->dev, (fpi->tx_ring + fpi->rx_ring)

					* sizeof(cbd_t),

					fep->ring_base,

					(void __force *)fep->ring_base,

					fep->ring_mem_addr);

}
@@ -189,7 +189,7 @@ static void cleanup_data(struct net_device *dev) 
static void set_promiscuous_mode(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	FS(fecp, r_cntrl, FEC_RCNTRL_PROM);

}
@@ -237,7 +237,7 @@ static void set_multicast_one(struct net_device *dev, const u8 *mac) 
static void set_multicast_finish(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	/* if all multi or too many multicasts; just enable all */

	if ((dev->flags & IFF_ALLMULTI) != 0 ||
@@ -271,7 +271,7 @@ static void restart(struct net_device *dev) 
	u32 cptr;

#endif

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;

	const struct fs_platform_info *fpi = fep->fpi;

	dma_addr_t rx_bd_base_phys, tx_bd_base_phys;

	int r;
@@ -399,7 +399,7 @@ static void stop(struct net_device *dev) 
{

	struct fs_enet_private *fep = netdev_priv(dev);

	const struct fs_platform_info *fpi = fep->fpi;

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	struct fec_info* feci= fep->phydev->bus->priv;
@@ -461,7 +461,7 @@ static void post_free_irq(struct net_device *dev, int irq) 
static void napi_clear_rx_event(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	FW(fecp, ievent, FEC_NAPI_RX_EVENT_MSK);

}
@@ -469,7 +469,7 @@ static void napi_clear_rx_event(struct net_device *dev) 
static void napi_enable_rx(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	FS(fecp, imask, FEC_NAPI_RX_EVENT_MSK);

}
@@ -477,7 +477,7 @@ static void napi_enable_rx(struct net_device *dev) 
static void napi_disable_rx(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	FC(fecp, imask, FEC_NAPI_RX_EVENT_MSK);

}
@@ -485,7 +485,7 @@ static void napi_disable_rx(struct net_device *dev) 
static void rx_bd_done(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	FW(fecp, r_des_active, 0x01000000);

}
@@ -493,7 +493,7 @@ static void rx_bd_done(struct net_device *dev) 
static void tx_kickstart(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	FW(fecp, x_des_active, 0x01000000);

}
@@ -501,7 +501,7 @@ static void tx_kickstart(struct net_device *dev) 
static u32 get_int_events(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	return FR(fecp, ievent) & FR(fecp, imask);

}
@@ -509,7 +509,7 @@ static u32 get_int_events(struct net_device *dev) 
static void clear_int_events(struct net_device *dev, u32 int_events)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	fec_t *fecp = fep->fec.fecp;

	fec_t __iomem *fecp = fep->fec.fecp;



	FW(fecp, ievent, int_events);

}
@@ -520,7 +520,7 @@ static void ev_error(struct net_device *dev, u32 int_events) 
	       ": %s FEC ERROR(s) 0x%x\n", dev->name, int_events);

}



int get_regs(struct net_device *dev, void *p, int *sizep)

static int get_regs(struct net_device *dev, void *p, int *sizep)

{

	struct fs_enet_private *fep = netdev_priv(dev);
@@ -532,12 +532,12 @@ int get_regs(struct net_device *dev, void *p, int *sizep) 
	return 0;

}



int get_regs_len(struct net_device *dev)

static int get_regs_len(struct net_device *dev)

{

	return sizeof(fec_t);

}



void tx_restart(struct net_device *dev)

static void tx_restart(struct net_device *dev)

{

	/* nothing */

}

drivers/net/fs_enet/mac-scc.c

+19 −18
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ static int allocate_bd(struct net_device *dev) 
	if (IS_ERR_VALUE(fep->ring_mem_addr))

		return -ENOMEM;



	fep->ring_base = cpm_dpram_addr(fep->ring_mem_addr);

	fep->ring_base = (void __iomem __force*)

		cpm_dpram_addr(fep->ring_mem_addr);



	return 0;

}
@@ -212,7 +213,7 @@ static void cleanup_data(struct net_device *dev) 
static void set_promiscuous_mode(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_t __iomem *sccp = fep->scc.sccp;



	S16(sccp, scc_psmr, SCC_PSMR_PRO);

}
@@ -220,7 +221,7 @@ static void set_promiscuous_mode(struct net_device *dev) 
static void set_multicast_start(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_enet_t *ep = fep->scc.ep;

	scc_enet_t __iomem *ep = fep->scc.ep;



	W16(ep, sen_gaddr1, 0);

	W16(ep, sen_gaddr2, 0);
@@ -231,7 +232,7 @@ static void set_multicast_start(struct net_device *dev) 
static void set_multicast_one(struct net_device *dev, const u8 * mac)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_enet_t *ep = fep->scc.ep;

	scc_enet_t __iomem *ep = fep->scc.ep;

	u16 taddrh, taddrm, taddrl;



	taddrh = ((u16) mac[5] << 8) | mac[4];
@@ -247,8 +248,8 @@ static void set_multicast_one(struct net_device *dev, const u8 * mac) 
static void set_multicast_finish(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_enet_t *ep = fep->scc.ep;

	scc_t __iomem *sccp = fep->scc.sccp;

	scc_enet_t __iomem *ep = fep->scc.ep;



	/* clear promiscuous always */

	C16(sccp, scc_psmr, SCC_PSMR_PRO);
@@ -285,8 +286,8 @@ static void set_multicast_list(struct net_device *dev) 
static void restart(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_enet_t *ep = fep->scc.ep;

	scc_t __iomem *sccp = fep->scc.sccp;

	scc_enet_t __iomem *ep = fep->scc.ep;

	const struct fs_platform_info *fpi = fep->fpi;

	u16 paddrh, paddrm, paddrl;

	const unsigned char *mac;
@@ -296,7 +297,7 @@ static void restart(struct net_device *dev) 


	/* clear everything (slow & steady does it) */

	for (i = 0; i < sizeof(*ep); i++)

		__fs_out8((char *)ep + i, 0);

		__fs_out8((u8 __iomem *)ep + i, 0);



	/* point to bds */

	W16(ep, sen_genscc.scc_rbase, fep->ring_mem_addr);
@@ -397,7 +398,7 @@ static void restart(struct net_device *dev) 
static void stop(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_t __iomem *sccp = fep->scc.sccp;

	int i;



	for (i = 0; (R16(sccp, scc_sccm) == 0) && i < SCC_RESET_DELAY; i++)
@@ -441,7 +442,7 @@ static void post_free_irq(struct net_device *dev, int irq) 
static void napi_clear_rx_event(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_t __iomem *sccp = fep->scc.sccp;



	W16(sccp, scc_scce, SCC_NAPI_RX_EVENT_MSK);

}
@@ -449,7 +450,7 @@ static void napi_clear_rx_event(struct net_device *dev) 
static void napi_enable_rx(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_t __iomem *sccp = fep->scc.sccp;



	S16(sccp, scc_sccm, SCC_NAPI_RX_EVENT_MSK);

}
@@ -457,7 +458,7 @@ static void napi_enable_rx(struct net_device *dev) 
static void napi_disable_rx(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_t __iomem *sccp = fep->scc.sccp;



	C16(sccp, scc_sccm, SCC_NAPI_RX_EVENT_MSK);

}
@@ -475,7 +476,7 @@ static void tx_kickstart(struct net_device *dev) 
static u32 get_int_events(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_t __iomem *sccp = fep->scc.sccp;



	return (u32) R16(sccp, scc_scce);

}
@@ -483,7 +484,7 @@ static u32 get_int_events(struct net_device *dev) 
static void clear_int_events(struct net_device *dev, u32 int_events)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	scc_t *sccp = fep->scc.sccp;

	scc_t __iomem *sccp = fep->scc.sccp;



	W16(sccp, scc_scce, int_events & 0xffff);

}
@@ -498,20 +499,20 @@ static int get_regs(struct net_device *dev, void *p, int *sizep) 
{

	struct fs_enet_private *fep = netdev_priv(dev);



	if (*sizep < sizeof(scc_t) + sizeof(scc_enet_t))

	if (*sizep < sizeof(scc_t) + sizeof(scc_enet_t __iomem *))

		return -EINVAL;



	memcpy_fromio(p, fep->scc.sccp, sizeof(scc_t));

	p = (char *)p + sizeof(scc_t);



	memcpy_fromio(p, fep->scc.ep, sizeof(scc_enet_t));

	memcpy_fromio(p, fep->scc.ep, sizeof(scc_enet_t __iomem *));



	return 0;

}



static int get_regs_len(struct net_device *dev)

{

	return sizeof(scc_t) + sizeof(scc_enet_t);

	return sizeof(scc_t) + sizeof(scc_enet_t __iomem *);

}



static void tx_restart(struct net_device *dev)