Commit 8fc72cb5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'xilinx_emaclite-w-1-fixes' 

Andrew Lunn says:

====================
xilinx_emaclite W=1 fixes

kerneldoc, pointer issues, and add COMPILE_TEST support to easy
finding future issues via build testing.

v2:
 - Use uintptr_t instead of long
 - Added Acked-by's.
====================

Link: https://lore.kernel.org/r/20201110024024.1479741-1-andrew@lunn.ch


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 95530a59 03dfd157

drivers/net/ethernet/xilinx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ if NET_VENDOR_XILINX 


config XILINX_EMACLITE

	tristate "Xilinx 10/100 Ethernet Lite support"

	depends on PPC32 || MICROBLAZE || ARCH_ZYNQ || MIPS

	depends on PPC32 || MICROBLAZE || ARCH_ZYNQ || MIPS || COMPILE_TEST

	select PHYLIB

	help

	  This driver supports the 10/100 Ethernet Lite from Xilinx.

drivers/net/ethernet/xilinx/xilinx_emaclite.c

+8 −6
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
#define ALIGNMENT		4



/* BUFFER_ALIGN(adr) calculates the number of bytes to the next alignment. */

#define BUFFER_ALIGN(adr) ((ALIGNMENT - ((u32)adr)) % ALIGNMENT)

#define BUFFER_ALIGN(adr) ((ALIGNMENT - ((uintptr_t)adr)) % ALIGNMENT)



#ifdef __BIG_ENDIAN

#define xemaclite_readl		ioread32be
@@ -338,7 +338,7 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, 
		 * if it is configured in HW

		 */



		addr = (void __iomem __force *)((u32 __force)addr ^

		addr = (void __iomem __force *)((uintptr_t __force)addr ^

						 XEL_BUFFER_OFFSET);

		reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET);
@@ -399,7 +399,8 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) 
		 * will correct on subsequent calls

		 */

		if (drvdata->rx_ping_pong != 0)

			addr = (void __iomem __force *)((u32 __force)addr ^

			addr = (void __iomem __force *)

				((uintptr_t __force)addr ^

				 XEL_BUFFER_OFFSET);

		else

			return 0;	/* No data was available */
@@ -518,6 +519,7 @@ static int xemaclite_set_mac_address(struct net_device *dev, void *address) 
/**

 * xemaclite_tx_timeout - Callback for Tx Timeout

 * @dev:	Pointer to the network device

 * @txqueue:	Unused

 *

 * This function is called when Tx time out occurs for Emaclite device.

 */
@@ -1191,9 +1193,9 @@ static int xemaclite_of_probe(struct platform_device *ofdev) 
	}



	dev_info(dev,

		 "Xilinx EmacLite at 0x%08X mapped to 0x%08X, irq=%d\n",

		 "Xilinx EmacLite at 0x%08X mapped to 0x%08lX, irq=%d\n",

		 (unsigned int __force)ndev->mem_start,

		 (unsigned int __force)lp->base_addr, ndev->irq);

		 (unsigned long __force)lp->base_addr, ndev->irq);

	return 0;



error:

CRA Git | Maintained and supported by SUSTech CRA and CCSE