Commit ca879317 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethernet: tulip: remove direct netdev->dev_addr writes 



Consify the casts of netdev->dev_addr.

Convert pointless to eth_hw_addr_set() where possible.

Use local buffers in a number of places.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a04436b2

drivers/net/ethernet/dec/tulip/de2104x.c

+8 −7
Original line number Diff line number Diff line
@@ -666,8 +666,8 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev) 
	struct de_private *de = netdev_priv(dev);

	u16 hash_table[32];

	struct netdev_hw_addr *ha;

	const u16 *eaddrs;

	int i;

	u16 *eaddrs;



	memset(hash_table, 0, sizeof(hash_table));

	__set_bit_le(255, hash_table);			/* Broadcast entry */
@@ -685,7 +685,7 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev) 
	setup_frm = &de->setup_frame[13*6];



	/* Fill the final entry with our physical address. */

	eaddrs = (u16 *)dev->dev_addr;

	eaddrs = (const u16 *)dev->dev_addr;

	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];

	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];

	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];
@@ -695,7 +695,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev) 
{

	struct de_private *de = netdev_priv(dev);

	struct netdev_hw_addr *ha;

	u16 *eaddrs;

	const u16 *eaddrs;



	/* We have <= 14 addresses so we can use the wonderful

	   16 address perfect filtering of the Tulip. */
@@ -710,7 +710,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev) 
	setup_frm = &de->setup_frame[15*6];



	/* Fill the final entry with our physical address. */

	eaddrs = (u16 *)dev->dev_addr;

	eaddrs = (const u16 *)dev->dev_addr;

	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];

	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];

	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];
@@ -1713,6 +1713,7 @@ static const struct ethtool_ops de_ethtool_ops = { 


static void de21040_get_mac_address(struct de_private *de)

{

	u8 addr[ETH_ALEN];

	unsigned i;



	dw32 (ROMCmd, 0);	/* Reset the pointer with a dummy write. */
@@ -1724,12 +1725,13 @@ static void de21040_get_mac_address(struct de_private *de) 
			value = dr32(ROMCmd);

			rmb();

		} while (value < 0 && --boguscnt > 0);

		de->dev->dev_addr[i] = value;

		addr[i] = value;

		udelay(1);

		if (boguscnt <= 0)

			pr_warn("timeout reading 21040 MAC address byte %u\n",

				i);

	}

	eth_hw_addr_set(de->dev, addr);

}



static void de21040_get_media_info(struct de_private *de)
@@ -1821,8 +1823,7 @@ static void de21041_get_srom_info(struct de_private *de) 
#endif



	/* store MAC address */

	for (i = 0; i < 6; i ++)

		de->dev->dev_addr[i] = ee_data[i + sa_offset];

	eth_hw_addr_set(de->dev, &ee_data[i + sa_offset]);



	/* get offset of controller 0 info leaf.  ignore 2nd byte. */

	ofs = ee_data[SROMC0InfoLeaf];

drivers/net/ethernet/dec/tulip/de4x5.c

+17 −18
Original line number Diff line number Diff line
@@ -4031,6 +4031,7 @@ get_hw_addr(struct net_device *dev) 
    int broken, i, k, tmp, status = 0;

    u_short j,chksum;

    struct de4x5_private *lp = netdev_priv(dev);

    u8 addr[ETH_ALEN];



    broken = de4x5_bad_srom(lp);
@@ -4042,28 +4043,30 @@ get_hw_addr(struct net_device *dev) 
	    if (lp->chipset == DC21040) {

		while ((tmp = inl(DE4X5_APROM)) < 0);

		k += (u_char) tmp;

		dev->dev_addr[i++] = (u_char) tmp;

		addr[i++] = (u_char) tmp;

		while ((tmp = inl(DE4X5_APROM)) < 0);

		k += (u_short) (tmp << 8);

		dev->dev_addr[i++] = (u_char) tmp;

		addr[i++] = (u_char) tmp;

	    } else if (!broken) {

		dev->dev_addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;

		dev->dev_addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;

		addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;

		addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;

	    } else if ((broken == SMC) || (broken == ACCTON)) {

		dev->dev_addr[i] = *((u_char *)&lp->srom + i); i++;

		dev->dev_addr[i] = *((u_char *)&lp->srom + i); i++;

		addr[i] = *((u_char *)&lp->srom + i); i++;

		addr[i] = *((u_char *)&lp->srom + i); i++;

	    }

	} else {

	    k += (u_char) (tmp = inb(EISA_APROM));

	    dev->dev_addr[i++] = (u_char) tmp;

	    addr[i++] = (u_char) tmp;

	    k += (u_short) ((tmp = inb(EISA_APROM)) << 8);

	    dev->dev_addr[i++] = (u_char) tmp;

	    addr[i++] = (u_char) tmp;

	}



	if (k > 0xffff) k-=0xffff;

    }

    if (k == 0xffff) k=0;



    eth_hw_addr_set(dev, addr);



    if (lp->bus == PCI) {

	if (lp->chipset == DC21040) {

	    while ((tmp = inl(DE4X5_APROM)) < 0);
@@ -4095,8 +4098,9 @@ get_hw_addr(struct net_device *dev) 
		    int x = dev->dev_addr[i];

		    x = ((x & 0xf) << 4) + ((x & 0xf0) >> 4);

		    x = ((x & 0x33) << 2) + ((x & 0xcc) >> 2);

		    dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1);

		    addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1);

	    }

	    eth_hw_addr_set(dev, addr);

    }

#endif /* CONFIG_PPC_PMAC */
@@ -4158,12 +4162,9 @@ test_bad_enet(struct net_device *dev, int status) 
    if ((tmp == 0) || (tmp == 0x5fa)) {

	if ((lp->chipset == last.chipset) &&

	    (lp->bus_num == last.bus) && (lp->bus_num > 0)) {

	    for (i=0; i<ETH_ALEN; i++) dev->dev_addr[i] = last.addr[i];

	    for (i=ETH_ALEN-1; i>2; --i) {

		dev->dev_addr[i] += 1;

		if (dev->dev_addr[i] != 0) break;

	    }

	    for (i=0; i<ETH_ALEN; i++) last.addr[i] = dev->dev_addr[i];

	    eth_addr_inc(last.addr);

	    eth_hw_addr_set(dev, last.addr);



	    if (!an_exception(lp)) {

		dev->irq = last.irq;

	    }
@@ -5391,9 +5392,7 @@ de4x5_siocdevprivate(struct net_device *dev, struct ifreq *rq, void __user *data 
	if (netif_queue_stopped(dev))

		return -EBUSY;

	netif_stop_queue(dev);

	for (i=0; i<ETH_ALEN; i++) {

	    dev->dev_addr[i] = tmp.addr[i];

	}

	eth_hw_addr_set(dev, tmp.addr);

	build_setup_frame(dev, PHYS_ADDR_ONLY);

	/* Set up the descriptor and give ownership to the card */

	load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |

drivers/net/ethernet/dec/tulip/dmfe.c

+4 −5
Original line number Diff line number Diff line
@@ -476,8 +476,7 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* Set Node address */

	for (i = 0; i < 6; i++)

		dev->dev_addr[i] = db->srom[20 + i];

	eth_hw_addr_set(dev, &db->srom[20 + i]);



	err = register_netdev (dev);

	if (err)
@@ -1436,9 +1435,9 @@ static void update_cr6(u32 cr6_data, void __iomem *ioaddr) 


static void dm9132_id_table(struct net_device *dev)

{

	const u16 *addrptr = (const u16 *)dev->dev_addr;

	struct dmfe_board_info *db = netdev_priv(dev);

	void __iomem *ioaddr = db->ioaddr + 0xc0;

	u16 *addrptr = (u16 *)dev->dev_addr;

	struct netdev_hw_addr *ha;

	u16 i, hash_table[4];
@@ -1477,7 +1476,7 @@ static void send_filter_frame(struct net_device *dev) 
	struct dmfe_board_info *db = netdev_priv(dev);

	struct netdev_hw_addr *ha;

	struct tx_desc *txptr;

	u16 * addrptr;

	const u16 * addrptr;

	u32 * suptr;

	int i;
@@ -1487,7 +1486,7 @@ static void send_filter_frame(struct net_device *dev) 
	suptr = (u32 *) txptr->tx_buf_ptr;



	/* Node address */

	addrptr = (u16 *) dev->dev_addr;

	addrptr = (const u16 *) dev->dev_addr;

	*suptr++ = addrptr[0];

	*suptr++ = addrptr[1];

	*suptr++ = addrptr[2];

drivers/net/ethernet/dec/tulip/tulip_core.c

+22 −15
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void tulip_up(struct net_device *dev) 
		}

	} else {

		/* This is set_rx_mode(), but without starting the transmitter. */

		u16 *eaddrs = (u16 *)dev->dev_addr;

		const u16 *eaddrs = (const u16 *)dev->dev_addr;

		u16 *setup_frm = &tp->setup_frame[15*6];

		dma_addr_t mapping;
@@ -1001,8 +1001,8 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev) 
	struct tulip_private *tp = netdev_priv(dev);

	u16 hash_table[32];

	struct netdev_hw_addr *ha;

	const u16 *eaddrs;

	int i;

	u16 *eaddrs;



	memset(hash_table, 0, sizeof(hash_table));

	__set_bit_le(255, hash_table);			/* Broadcast entry */
@@ -1019,7 +1019,7 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev) 
	setup_frm = &tp->setup_frame[13*6];



	/* Fill the final entry with our physical address. */

	eaddrs = (u16 *)dev->dev_addr;

	eaddrs = (const u16 *)dev->dev_addr;

	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];

	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];

	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];
@@ -1029,7 +1029,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev) 
{

	struct tulip_private *tp = netdev_priv(dev);

	struct netdev_hw_addr *ha;

	u16 *eaddrs;

	const u16 *eaddrs;



	/* We have <= 14 addresses so we can use the wonderful

	   16 address perfect filtering of the Tulip. */
@@ -1044,7 +1044,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev) 
	setup_frm = &tp->setup_frame[15*6];



	/* Fill the final entry with our physical address. */

	eaddrs = (u16 *)dev->dev_addr;

	eaddrs = (const u16 *)dev->dev_addr;

	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];

	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];

	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];
@@ -1305,6 +1305,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	int chip_idx = ent->driver_data;

	const char *chip_name = tulip_tbl[chip_idx].chip_name;

	unsigned int eeprom_missing = 0;

	u8 addr[ETH_ALEN] __aligned(2);

	unsigned int force_csr0 = 0;



	board_idx++;
@@ -1506,13 +1507,15 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
			do {

				value = ioread32(ioaddr + CSR9);

			} while (value < 0  && --boguscnt > 0);

			put_unaligned_le16(value, ((__le16 *)dev->dev_addr) + i);

			put_unaligned_le16(value, ((__le16 *)addr) + i);

			sum += value & 0xffff;

		}

		eth_hw_addr_set(dev, addr);

	} else if (chip_idx == COMET) {

		/* No need to read the EEPROM. */

		put_unaligned_le32(ioread32(ioaddr + 0xA4), dev->dev_addr);

		put_unaligned_le16(ioread32(ioaddr + 0xA8), dev->dev_addr + 4);

		put_unaligned_le32(ioread32(ioaddr + 0xA4), addr);

		put_unaligned_le16(ioread32(ioaddr + 0xA8), addr + 4);

		eth_hw_addr_set(dev, addr);

		for (i = 0; i < 6; i ++)

			sum += dev->dev_addr[i];

	} else {
@@ -1575,20 +1578,23 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
#endif



		for (i = 0; i < 6; i ++) {

			dev->dev_addr[i] = ee_data[i + sa_offset];

			addr[i] = ee_data[i + sa_offset];

			sum += ee_data[i + sa_offset];

		}

		eth_hw_addr_set(dev, addr);

	}

	/* Lite-On boards have the address byte-swapped. */

	if ((dev->dev_addr[0] == 0xA0 ||

	     dev->dev_addr[0] == 0xC0 ||

	     dev->dev_addr[0] == 0x02) &&

	    dev->dev_addr[1] == 0x00)

	    dev->dev_addr[1] == 0x00) {

		for (i = 0; i < 6; i+=2) {

			char tmp = dev->dev_addr[i];

			dev->dev_addr[i] = dev->dev_addr[i+1];

			dev->dev_addr[i+1] = tmp;

			addr[i] = dev->dev_addr[i+1];

			addr[i+1] = dev->dev_addr[i];

		}

		eth_hw_addr_set(dev, addr);

	}



	/* On the Zynx 315 Etherarray and other multiport boards only the

	   first Tulip has an EEPROM.

	   On Sparc systems the mac address is held in the OBP property
@@ -1604,8 +1610,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
#endif

		eeprom_missing = 1;

		for (i = 0; i < 5; i++)

			dev->dev_addr[i] = last_phys_addr[i];

		dev->dev_addr[i] = last_phys_addr[i] + 1;

			addr[i] = last_phys_addr[i];

		addr[i] = last_phys_addr[i] + 1;

		eth_hw_addr_set(dev, addr);

#if defined(CONFIG_SPARC)

		addr = of_get_property(dp, "local-mac-address", &len);

		if (addr && len == ETH_ALEN)

drivers/net/ethernet/dec/tulip/uli526x.c

+7 −4
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ static int uli526x_init_one(struct pci_dev *pdev, 
	struct uli526x_board_info *db;	/* board information structure */

	struct net_device *dev;

	void __iomem *ioaddr;

	u8 addr[ETH_ALEN];

	int i, err;



	ULI526X_DBUG(0, "uli526x_init_one()", 0);
@@ -379,7 +380,7 @@ static int uli526x_init_one(struct pci_dev *pdev, 
		uw32(DCR13, 0x1b0);	//Select ID Table access port

		//Read MAC address from CR14

		for (i = 0; i < 6; i++)

			dev->dev_addr[i] = ur32(DCR14);

			addr[i] = ur32(DCR14);

		//Read end

		uw32(DCR13, 0);		//Clear CR13

		uw32(DCR0, 0);		//Clear CR0
@@ -388,8 +389,10 @@ static int uli526x_init_one(struct pci_dev *pdev, 
	else		/*Exist SROM*/

	{

		for (i = 0; i < 6; i++)

			dev->dev_addr[i] = db->srom[20 + i];

			addr[i] = db->srom[20 + i];

	}

	eth_hw_addr_set(dev, addr);



	err = register_netdev (dev);

	if (err)

		goto err_out_unmap;
@@ -1343,7 +1346,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt) 
	void __iomem *ioaddr = db->ioaddr;

	struct netdev_hw_addr *ha;

	struct tx_desc *txptr;

	u16 * addrptr;

	const u16 * addrptr;

	u32 * suptr;

	int i;
@@ -1353,7 +1356,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt) 
	suptr = (u32 *) txptr->tx_buf_ptr;



	/* Node address */

	addrptr = (u16 *) dev->dev_addr;

	addrptr = (const u16 *) dev->dev_addr;

	*suptr++ = addrptr[0] << FLT_SHIFT;

	*suptr++ = addrptr[1] << FLT_SHIFT;

	*suptr++ = addrptr[2] << FLT_SHIFT;