net: apple: mace: Fix build since dev_addr constification
Subsystems (5)
Sasha Levin
maintainerPATCH 1/3 net: apple: mace: Fix build since dev_addr constification
From: Michael Ellerman <[email protected]>
[ Upstream commit 6c8dc12cd925e5fa8c152633338b2b35c4c89258 ]
Since commit adeef3e32146 ("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.
--- drivers/net/ethernet/apple/mace.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/apple/mace.c +11 -5
@@ -89,7 +89,7 @@ static void mace_set_timeout(struct net_device *dev);static void mace_tx_timeout (unsigned long data);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 ); }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 2/3 net: apple: bmac: Fix build since dev_addr constification
From: Michael Ellerman <[email protected]>
[ Upstream commit ea938248557a52e231a31f338eac4baee36a8626 ]
Since commit adeef3e32146 ("net: constify netdev->dev_addr") the bmac driver no longer builds with the following errors (pmac32_defconfig):
linux/drivers/net/ethernet/apple/bmac.c: In function ‘bmac_probe’:
linux/drivers/net/ethernet/apple/bmac.c:1287:20: error: assignment of read-only location ‘*(dev->dev_addr + (sizetype)j)’
1287 | dev->dev_addr[j] = rev ? bitrev8(addr[j]): addr[j];
| ^
Fix it by making the modifications to a local macaddr variable and then passing that to eth_hw_addr_set().
We don't use the existing addr variable because the bitrev8() would mutate it, but it is already used unreversed later in the function.
--- drivers/net/ethernet/apple/bmac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/apple/bmac.c +4 -1
@@ -1247,6 +1247,7 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)struct bmac_data *bp;const unsigned char *prop_addr;unsigned char addr[6 ]; +u8 macaddr[6 ];struct net_device *dev;int is_bmac_plus = ((int )match->data) !=0 ;
@@ -1294,7 +1295,9 @@ static int bmac_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);/* Enable chip without interrupts for now */ bmac_enable_and_reset_chip (dev);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 3/3 vhost/test: fix memory leak of vhost virtqueues
In reply to Sasha LevinFrom: Xianting Tian <[email protected]>
[ Upstream commit 080063920777af65105e5953e2851e036376e3ea ]
We need free the vqs in .release(), which are allocated in .open().
--- drivers/vhost/test.c | 1 + 1 file changed, 1 insertion(+)
drivers/vhost/test.c +1 -0
@@ -166,6 +166,7 @@ static int vhost_test_release(struct inode *inode, struct file *f)/* We do an extra flush before freeing memory, * since jobs can re-queue themselves. */ vhost_test_flush (n); +kfree (n->dev.vqs);kfree (n);return 0 ; }
Signature · 6 lines
2.34.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization