Commit 6c8dc12c authored by Michael Ellerman's avatar Michael Ellerman Committed by David S. Miller
Browse files

net: apple: mace: Fix build since dev_addr constification 



Since commit adeef3e3 ("net: constify netdev->dev_addr") the mace
driver no longer builds with various errors (pmac32_defconfig):

  linux/drivers/net/ethernet/apple/mace.c: In function ‘mace_probe’:
  linux/drivers/net/ethernet/apple/mace.c:170:20: error: assignment of read-only location ‘*(dev->dev_addr + (sizetype)j)’
    170 |   dev->dev_addr[j] = rev ? bitrev8(addr[j]): addr[j];
        |                    ^
  linux/drivers/net/ethernet/apple/mace.c: In function ‘mace_reset’:
  linux/drivers/net/ethernet/apple/mace.c:349:32: warning: passing argument 2 of ‘__mace_set_address’ discards ‘const’ qualifier from pointer target type
    349 |     __mace_set_address(dev, dev->dev_addr);
        |                             ~~~^~~~~~~~~~
  linux/drivers/net/ethernet/apple/mace.c:93:62: note: expected ‘void *’ but argument is of type ‘const unsigned char *’
     93 | static void __mace_set_address(struct net_device *dev, void *addr);
        |                                                        ~~~~~~^~~~
  linux/drivers/net/ethernet/apple/mace.c: In function ‘__mace_set_address’:
  linux/drivers/net/ethernet/apple/mace.c:388:36: error: assignment of read-only location ‘*(dev->dev_addr + (sizetype)i)’
    388 |  out_8(&mb->padr, dev->dev_addr[i] = p[i]);
        |                                    ^

Fix it by making the modifications to a local macaddr variable and then
passing that to eth_hw_addr_set(), as well as adding some missing const
qualifiers.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22556341

drivers/net/ethernet/apple/mace.c

+11 −5
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void mace_set_timeout(struct net_device *dev); 
static void mace_tx_timeout(struct timer_list *t);

static inline void dbdma_reset(volatile struct dbdma_regs __iomem *dma);

static inline void mace_clean_rings(struct mace_data *mp);

static void __mace_set_address(struct net_device *dev, void *addr);

static void __mace_set_address(struct net_device *dev, const void *addr);



/*

 * If we can't get a skbuff when we need it, we use this area for DMA.
@@ -112,6 +112,7 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	struct net_device *dev;

	struct mace_data *mp;

	const unsigned char *addr;

	u8 macaddr[ETH_ALEN];

	int j, rev, rc = -EBUSY;



	if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
@@ -167,8 +168,9 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match) 


	rev = addr[0] == 0 && addr[1] == 0xA0;

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

		dev->dev_addr[j] = rev ? bitrev8(addr[j]): addr[j];

		macaddr[j] = rev ? bitrev8(addr[j]): addr[j];

	}

	eth_hw_addr_set(dev, macaddr);

	mp->chipid = (in_8(&mp->mace->chipid_hi) << 8) |

			in_8(&mp->mace->chipid_lo);
@@ -369,11 +371,12 @@ static void mace_reset(struct net_device *dev) 
	out_8(&mb->plscc, PORTSEL_GPSI + ENPLSIO);

}



static void __mace_set_address(struct net_device *dev, void *addr)

static void __mace_set_address(struct net_device *dev, const void *addr)

{

    struct mace_data *mp = netdev_priv(dev);

    volatile struct mace __iomem *mb = mp->mace;

    unsigned char *p = addr;

    const unsigned char *p = addr;

    u8 macaddr[ETH_ALEN];

    int i;



    /* load up the hardware address */
@@ -385,7 +388,10 @@ static void __mace_set_address(struct net_device *dev, void *addr) 
	    ;

    }

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

	out_8(&mb->padr, dev->dev_addr[i] = p[i]);

        out_8(&mb->padr, macaddr[i] = p[i]);



    eth_hw_addr_set(dev, macaddr);



    if (mp->chipid != BROKEN_ADDRCHG_REV)

        out_8(&mb->iac, 0);

}