[PATCH 0/7 2] smsc911x: runtime configuration improvement

mail archive of the barebox mailing list
 help / color / mirror / Atom feed

* [PATCH 0/7 2] smsc911x: runtime configuration improvement
@ 2012-08-29  4:27 Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 1 reply; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  4:27 UTC (permalink / raw)
  To: barebox

Hi,

	v2:
	  update 16/32bit callback

please pull
The following changes since commit 3f96b4938c4046590be8a38fb114148c4bf1ca8e:

  Merge tag 'bootm_fix' of git://git.jcrosoft.org/barebox (2012-08-13 20:37:53 +0200)

are available in the git repository at:


  git://git.jcrosoft.org/barebox.git tags/smc911x_improve

for you to fetch changes up to 58957dad540642eecbd79ab581e120e0e1ccbae1:

  smm911x: check if the device is ready before using it (2012-08-26 06:19:10 +0800)

----------------------------------------------------------------
smsc911x: runtime configuration improvement

 This patch series allow to detect and configure the drivers at the runtime

 - Check if the device is ready before using it
 - Update chip detection (take from the kernel 3.5)
 - improve detection handle to detect bus configuration and swap
 - add support to pass the shift via platform data
 - add 16bit bus width support
 - introduce read/write ops
 - move register define to smc911x.h

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (7):
      smc911x: move register define to smc911x.h
      smc911x: introduce read/write ops
      smc911x: add 16bit bus width support
      smc911x: add support to pass the shift via platform data
      smc911x: improve detection handle
      smc911x: update chip detection
      smm911x: check if the device is ready before using it

 arch/blackfin/boards/ipe337/ipe337.c |    7 +-
 drivers/net/Kconfig                  |    6 --
 drivers/net/smc911x.c                |  590 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------
 drivers/net/smc911x.h                |  342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/smc911x.h                    |   18 ++++
 5 files changed, 566 insertions(+), 397 deletions(-)
 create mode 100644 drivers/net/smc911x.h
 create mode 100644 include/smc911x.h

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 1/7] smc911x: move register define to smc911x.h
  2012-08-29  4:27 [PATCH 0/7 2] smsc911x: runtime configuration improvement Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  5:06 ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 2/7] smc911x: introduce read/write ops Jean-Christophe PLAGNIOL-VILLARD
                     ` (5 more replies)
  0 siblings, 6 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  5:06 UTC (permalink / raw)
  To: barebox

this make the driver more readable

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c                |  329 +--------------------------
 drivers/net/{smc911x.c => smc911x.h} |  406 ----------------------------------
 2 files changed, 2 insertions(+), 733 deletions(-)
 copy drivers/net/{smc911x.c => smc911x.h} (60%)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 7dddbbc..9c488c7 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -38,334 +38,9 @@
 #include <clock.h>
 #include <io.h>
 
-#define AS CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT
 
-/* Below are the register offsets and bit definitions
- * of the Lan911x memory space
- */
-#define RX_DATA_FIFO		 (0x00 << AS)
-
-#define TX_DATA_FIFO		 (0x20 << AS)
-#define	TX_CMD_A_INT_ON_COMP			0x80000000
-#define	TX_CMD_A_INT_BUF_END_ALGN		0x03000000
-#define	TX_CMD_A_INT_4_BYTE_ALGN		0x00000000
-#define	TX_CMD_A_INT_16_BYTE_ALGN		0x01000000
-#define	TX_CMD_A_INT_32_BYTE_ALGN		0x02000000
-#define	TX_CMD_A_INT_DATA_OFFSET		0x001F0000
-#define	TX_CMD_A_INT_FIRST_SEG			0x00002000
-#define	TX_CMD_A_INT_LAST_SEG			0x00001000
-#define	TX_CMD_A_BUF_SIZE			0x000007FF
-#define	TX_CMD_B_PKT_TAG			0xFFFF0000
-#define	TX_CMD_B_ADD_CRC_DISABLE		0x00002000
-#define	TX_CMD_B_DISABLE_PADDING		0x00001000
-#define	TX_CMD_B_PKT_BYTE_LENGTH		0x000007FF
-
-#define RX_STATUS_FIFO		(0x40 << AS)
-#define	RX_STS_PKT_LEN				0x3FFF0000
-#define	RX_STS_ES				0x00008000
-#define	RX_STS_BCST				0x00002000
-#define	RX_STS_LEN_ERR				0x00001000
-#define	RX_STS_RUNT_ERR				0x00000800
-#define	RX_STS_MCAST				0x00000400
-#define	RX_STS_TOO_LONG				0x00000080
-#define	RX_STS_COLL				0x00000040
-#define	RX_STS_ETH_TYPE				0x00000020
-#define	RX_STS_WDOG_TMT				0x00000010
-#define	RX_STS_MII_ERR				0x00000008
-#define	RX_STS_DRIBBLING			0x00000004
-#define	RX_STS_CRC_ERR				0x00000002
-#define RX_STATUS_FIFO_PEEK 	(0x44 << AS)
-#define TX_STATUS_FIFO		(0x48 << AS)
-#define	TX_STS_TAG				0xFFFF0000
-#define	TX_STS_ES				0x00008000
-#define	TX_STS_LOC				0x00000800
-#define	TX_STS_NO_CARR				0x00000400
-#define	TX_STS_LATE_COLL			0x00000200
-#define	TX_STS_MANY_COLL			0x00000100
-#define	TX_STS_COLL_CNT				0x00000078
-#define	TX_STS_MANY_DEFER			0x00000004
-#define	TX_STS_UNDERRUN				0x00000002
-#define	TX_STS_DEFERRED				0x00000001
-#define TX_STATUS_FIFO_PEEK	(0x4C << AS)
-#define ID_REV			(0x50 << AS)
-#define	ID_REV_CHIP_ID				0xFFFF0000  /* RO */
-#define	ID_REV_REV_ID				0x0000FFFF  /* RO */
-
-#define INT_CFG			(0x54 << AS)
-#define	INT_CFG_INT_DEAS			0xFF000000  /* R/W */
-#define	INT_CFG_INT_DEAS_CLR			0x00004000
-#define	INT_CFG_INT_DEAS_STS			0x00002000
-#define	INT_CFG_IRQ_INT				0x00001000  /* RO */
-#define	INT_CFG_IRQ_EN				0x00000100  /* R/W */
-#define	INT_CFG_IRQ_POL				0x00000010  /* R/W Not Affected by SW Reset */
-#define	INT_CFG_IRQ_TYPE			0x00000001  /* R/W Not Affected by SW Reset */
-
-#define INT_STS			(0x58 << AS)
-#define	INT_STS_SW_INT				0x80000000  /* R/WC */
-#define	INT_STS_TXSTOP_INT			0x02000000  /* R/WC */
-#define	INT_STS_RXSTOP_INT			0x01000000  /* R/WC */
-#define	INT_STS_RXDFH_INT			0x00800000  /* R/WC */
-#define	INT_STS_RXDF_INT			0x00400000  /* R/WC */
-#define	INT_STS_TX_IOC				0x00200000  /* R/WC */
-#define	INT_STS_RXD_INT				0x00100000  /* R/WC */
-#define	INT_STS_GPT_INT				0x00080000  /* R/WC */
-#define	INT_STS_PHY_INT				0x00040000  /* RO */
-#define	INT_STS_PME_INT				0x00020000  /* R/WC */
-#define	INT_STS_TXSO				0x00010000  /* R/WC */
-#define	INT_STS_RWT				0x00008000  /* R/WC */
-#define	INT_STS_RXE				0x00004000  /* R/WC */
-#define	INT_STS_TXE				0x00002000  /* R/WC */
-//#define	INT_STS_ERX		0x00001000  /* R/WC */
-#define	INT_STS_TDFU				0x00000800  /* R/WC */
-#define	INT_STS_TDFO				0x00000400  /* R/WC */
-#define	INT_STS_TDFA				0x00000200  /* R/WC */
-#define	INT_STS_TSFF				0x00000100  /* R/WC */
-#define	INT_STS_TSFL				0x00000080  /* R/WC */
-//#define	INT_STS_RXDF		0x00000040  /* R/WC */
-#define	INT_STS_RDFO				0x00000040  /* R/WC */
-#define	INT_STS_RDFL				0x00000020  /* R/WC */
-#define	INT_STS_RSFF				0x00000010  /* R/WC */
-#define	INT_STS_RSFL				0x00000008  /* R/WC */
-#define	INT_STS_GPIO2_INT			0x00000004  /* R/WC */
-#define	INT_STS_GPIO1_INT			0x00000002  /* R/WC */
-#define	INT_STS_GPIO0_INT			0x00000001  /* R/WC */
-#define INT_EN			(0x5C << AS)
-#define	INT_EN_SW_INT_EN			0x80000000  /* R/W */
-#define	INT_EN_TXSTOP_INT_EN			0x02000000  /* R/W */
-#define	INT_EN_RXSTOP_INT_EN			0x01000000  /* R/W */
-#define	INT_EN_RXDFH_INT_EN			0x00800000  /* R/W */
-//#define	INT_EN_RXDF_INT_EN		0x00400000  /* R/W */
-#define	INT_EN_TIOC_INT_EN			0x00200000  /* R/W */
-#define	INT_EN_RXD_INT_EN			0x00100000  /* R/W */
-#define	INT_EN_GPT_INT_EN			0x00080000  /* R/W */
-#define	INT_EN_PHY_INT_EN			0x00040000  /* R/W */
-#define	INT_EN_PME_INT_EN			0x00020000  /* R/W */
-#define	INT_EN_TXSO_EN				0x00010000  /* R/W */
-#define	INT_EN_RWT_EN				0x00008000  /* R/W */
-#define	INT_EN_RXE_EN				0x00004000  /* R/W */
-#define	INT_EN_TXE_EN				0x00002000  /* R/W */
-//#define	INT_EN_ERX_EN			0x00001000  /* R/W */
-#define	INT_EN_TDFU_EN				0x00000800  /* R/W */
-#define	INT_EN_TDFO_EN				0x00000400  /* R/W */
-#define	INT_EN_TDFA_EN				0x00000200  /* R/W */
-#define	INT_EN_TSFF_EN				0x00000100  /* R/W */
-#define	INT_EN_TSFL_EN				0x00000080  /* R/W */
-//#define	INT_EN_RXDF_EN			0x00000040  /* R/W */
-#define	INT_EN_RDFO_EN				0x00000040  /* R/W */
-#define	INT_EN_RDFL_EN				0x00000020  /* R/W */
-#define	INT_EN_RSFF_EN				0x00000010  /* R/W */
-#define	INT_EN_RSFL_EN				0x00000008  /* R/W */
-#define	INT_EN_GPIO2_INT			0x00000004  /* R/W */
-#define	INT_EN_GPIO1_INT			0x00000002  /* R/W */
-#define	INT_EN_GPIO0_INT			0x00000001  /* R/W */
-
-#define BYTE_TEST		(0x64 << AS)
-#define FIFO_INT		(0x68 << AS)
-#define	FIFO_INT_TX_AVAIL_LEVEL			0xFF000000  /* R/W */
-#define	FIFO_INT_TX_STS_LEVEL			0x00FF0000  /* R/W */
-#define	FIFO_INT_RX_AVAIL_LEVEL			0x0000FF00  /* R/W */
-#define	FIFO_INT_RX_STS_LEVEL			0x000000FF  /* R/W */
-
-#define RX_CFG			(0x6C << AS)
-#define	RX_CFG_RX_END_ALGN			0xC0000000  /* R/W */
-#define		RX_CFG_RX_END_ALGN4		0x00000000  /* R/W */
-#define		RX_CFG_RX_END_ALGN16		0x40000000  /* R/W */
-#define		RX_CFG_RX_END_ALGN32		0x80000000  /* R/W */
-#define	RX_CFG_RX_DMA_CNT			0x0FFF0000  /* R/W */
-#define	RX_CFG_RX_DUMP				0x00008000  /* R/W */
-#define	RX_CFG_RXDOFF				0x00001F00  /* R/W */
-//#define	RX_CFG_RXBAD			0x00000001  /* R/W */
-
-#define TX_CFG			(0x70 << AS)
-//#define	TX_CFG_TX_DMA_LVL		0xE0000000	 /* R/W */
-//#define	TX_CFG_TX_DMA_CNT		0x0FFF0000	 /* R/W Self Clearing */
-#define	TX_CFG_TXS_DUMP				0x00008000  /* Self Clearing */
-#define	TX_CFG_TXD_DUMP				0x00004000  /* Self Clearing */
-#define	TX_CFG_TXSAO				0x00000004  /* R/W */
-#define	TX_CFG_TX_ON				0x00000002  /* R/W */
-#define	TX_CFG_STOP_TX				0x00000001  /* Self Clearing */
-
-#define HW_CFG			(0x74 << AS)
-#define	HW_CFG_TTM				0x00200000  /* R/W */
-#define	HW_CFG_SF				0x00100000  /* R/W */
-#define	HW_CFG_TX_FIF_SZ			0x000F0000  /* R/W */
-#define	HW_CFG_TR				0x00003000  /* R/W */
-#define	HW_CFG_PHY_CLK_SEL			0x00000060  /* R/W */
-#define	HW_CFG_PHY_CLK_SEL_INT_PHY 		0x00000000  /* R/W */
-#define	HW_CFG_PHY_CLK_SEL_EXT_PHY 		0x00000020  /* R/W */
-#define	HW_CFG_PHY_CLK_SEL_CLK_DIS 		0x00000040  /* R/W */
-#define	HW_CFG_SMI_SEL				0x00000010  /* R/W */
-#define	HW_CFG_EXT_PHY_DET			0x00000008  /* RO */
-#define	HW_CFG_EXT_PHY_EN			0x00000004  /* R/W */
-#define	HW_CFG_32_16_BIT_MODE			0x00000004  /* RO */
-#define	HW_CFG_SRST_TO				0x00000002  /* RO */
-#define	HW_CFG_SRST				0x00000001  /* Self Clearing */
-
-#define RX_DP_CTRL		(0x78 << AS)
-#define	RX_DP_CTRL_RX_FFWD			0x80000000  /* R/W */
-#define	RX_DP_CTRL_FFWD_BUSY			0x80000000  /* RO */
-
-#define RX_FIFO_INF		(0x7C << AS)
-#define	 RX_FIFO_INF_RXSUSED			0x00FF0000  /* RO */
-#define	 RX_FIFO_INF_RXDUSED			0x0000FFFF  /* RO */
-
-#define TX_FIFO_INF		(0x80 << AS)
-#define	TX_FIFO_INF_TSUSED			0x00FF0000  /* RO */
-#define	TX_FIFO_INF_TDFREE			0x0000FFFF  /* RO */
-
-#define PMT_CTRL		(0x84 << AS)
-#define	PMT_CTRL_PM_MODE			0x00003000  /* Self Clearing */
-#define	PMT_CTRL_PHY_RST			0x00000400  /* Self Clearing */
-#define	PMT_CTRL_WOL_EN				0x00000200  /* R/W */
-#define	PMT_CTRL_ED_EN				0x00000100  /* R/W */
-#define	PMT_CTRL_PME_TYPE			0x00000040  /* R/W Not Affected by SW Reset */
-#define	PMT_CTRL_WUPS				0x00000030  /* R/WC */
-#define	PMT_CTRL_WUPS_NOWAKE			0x00000000  /* R/WC */
-#define	PMT_CTRL_WUPS_ED			0x00000010  /* R/WC */
-#define	PMT_CTRL_WUPS_WOL			0x00000020  /* R/WC */
-#define	PMT_CTRL_WUPS_MULTI			0x00000030  /* R/WC */
-#define	PMT_CTRL_PME_IND			0x00000008  /* R/W */
-#define	PMT_CTRL_PME_POL			0x00000004  /* R/W */
-#define	PMT_CTRL_PME_EN				0x00000002  /* R/W Not Affected by SW Reset */
-#define	PMT_CTRL_READY				0x00000001  /* RO */
-
-#define GPIO_CFG		(0x88 << AS)
-#define	GPIO_CFG_LED3_EN			0x40000000  /* R/W */
-#define	GPIO_CFG_LED2_EN			0x20000000  /* R/W */
-#define	GPIO_CFG_LED1_EN			0x10000000  /* R/W */
-#define	GPIO_CFG_GPIO2_INT_POL			0x04000000  /* R/W */
-#define	GPIO_CFG_GPIO1_INT_POL			0x02000000  /* R/W */
-#define	GPIO_CFG_GPIO0_INT_POL			0x01000000  /* R/W */
-#define	GPIO_CFG_EEPR_EN			0x00700000  /* R/W */
-#define	GPIO_CFG_GPIOBUF2			0x00040000  /* R/W */
-#define	GPIO_CFG_GPIOBUF1			0x00020000  /* R/W */
-#define	GPIO_CFG_GPIOBUF0			0x00010000  /* R/W */
-#define	GPIO_CFG_GPIODIR2			0x00000400  /* R/W */
-#define	GPIO_CFG_GPIODIR1			0x00000200  /* R/W */
-#define	GPIO_CFG_GPIODIR0			0x00000100  /* R/W */
-#define	GPIO_CFG_GPIOD4				0x00000010  /* R/W */
-#define	GPIO_CFG_GPIOD3				0x00000008  /* R/W */
-#define	GPIO_CFG_GPIOD2				0x00000004  /* R/W */
-#define	GPIO_CFG_GPIOD1				0x00000002  /* R/W */
-#define	GPIO_CFG_GPIOD0				0x00000001  /* R/W */
-
-#define GPT_CFG			(0x8C << AS)
-#define	GPT_CFG_TIMER_EN			0x20000000  /* R/W */
-#define	GPT_CFG_GPT_LOAD			0x0000FFFF  /* R/W */
-
-#define GPT_CNT			(0x90 << AS)
-#define	GPT_CNT_GPT_CNT				0x0000FFFF  /* RO */
-
-#define ENDIAN			(0x98 << AS)
-#define FREE_RUN		(0x9C << AS)
-#define RX_DROP			(0xA0 << AS)
-#define MAC_CSR_CMD		(0xA4 << AS)
-#define	 MAC_CSR_CMD_CSR_BUSY			0x80000000  /* Self Clearing */
-#define	 MAC_CSR_CMD_R_NOT_W			0x40000000  /* R/W */
-#define	 MAC_CSR_CMD_CSR_ADDR			0x000000FF  /* R/W */
-
-#define MAC_CSR_DATA		(0xA8 << AS)
-#define AFC_CFG			(0xAC << AS)
-#define		AFC_CFG_AFC_HI			0x00FF0000  /* R/W */
-#define		AFC_CFG_AFC_LO			0x0000FF00  /* R/W */
-#define		AFC_CFG_BACK_DUR		0x000000F0  /* R/W */
-#define		AFC_CFG_FCMULT			0x00000008  /* R/W */
-#define		AFC_CFG_FCBRD			0x00000004  /* R/W */
-#define		AFC_CFG_FCADD			0x00000002  /* R/W */
-#define		AFC_CFG_FCANY			0x00000001  /* R/W */
-
-#define E2P_CMD			(0xB0 << AS)
-#define		E2P_CMD_EPC_BUSY		0x80000000  /* Self Clearing */
-#define		E2P_CMD_EPC_CMD			0x70000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_READ		0x00000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_EWDS		0x10000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_EWEN		0x20000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_WRITE		0x30000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_WRAL		0x40000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_ERASE		0x50000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_ERAL		0x60000000  /* R/W */
-#define		E2P_CMD_EPC_CMD_RELOAD		0x70000000  /* R/W */
-#define		E2P_CMD_EPC_TIMEOUT		0x00000200  /* RO */
-#define		E2P_CMD_MAC_ADDR_LOADED		0x00000100  /* RO */
-#define		E2P_CMD_EPC_ADDR		0x000000FF  /* R/W */
-
-#define E2P_DATA		(0xB4 << AS)
-#define	E2P_DATA_EEPROM_DATA			0x000000FF  /* R/W */
-/* end of LAN register offsets and bit definitions */
-
-/* MAC Control and Status registers */
-#define MAC_CR			0x01  /* R/W */
-
-/* MAC_CR - MAC Control Register */
-#define MAC_CR_RXALL			0x80000000
-// TODO: delete this bit? It is not described in the data sheet.
-#define MAC_CR_HBDIS			0x10000000
-#define MAC_CR_RCVOWN			0x00800000
-#define MAC_CR_LOOPBK			0x00200000
-#define MAC_CR_FDPX			0x00100000
-#define MAC_CR_MCPAS			0x00080000
-#define MAC_CR_PRMS			0x00040000
-#define MAC_CR_INVFILT			0x00020000
-#define MAC_CR_PASSBAD			0x00010000
-#define MAC_CR_HFILT			0x00008000
-#define MAC_CR_HPFILT			0x00002000
-#define MAC_CR_LCOLL			0x00001000
-#define MAC_CR_BCAST			0x00000800
-#define MAC_CR_DISRTY			0x00000400
-#define MAC_CR_PADSTR			0x00000100
-#define MAC_CR_BOLMT_MASK		0x000000C0
-#define MAC_CR_DFCHK			0x00000020
-#define MAC_CR_TXEN			0x00000008
-#define MAC_CR_RXEN			0x00000004
-
-#define ADDRH			0x02	  /* R/W mask 0x0000FFFFUL */
-#define ADDRL			0x03	  /* R/W mask 0xFFFFFFFFUL */
-#define HASHH			0x04	  /* R/W */
-#define HASHL			0x05	  /* R/W */
-
-#define MII_ACC			0x06	  /* R/W */
-#define MII_ACC_PHY_ADDR		0x0000F800
-#define MII_ACC_MIIRINDA		0x000007C0
-#define MII_ACC_MII_WRITE		0x00000002
-#define MII_ACC_MII_BUSY		0x00000001
-
-#define MII_DATA		0x07	  /* R/W mask 0x0000FFFFUL */
-
-#ifdef FLOW
-#undef FLOW	/* clashed with include/asm/cpu/defBF561.h:1654 */
-#endif
-
-#define FLOW			0x08	  /* R/W */
-#define FLOW_FCPT			0xFFFF0000
-#define FLOW_FCPASS			0x00000004
-#define FLOW_FCEN			0x00000002
-#define FLOW_FCBSY			0x00000001
-
-#define VLAN1			0x09	  /* R/W mask 0x0000FFFFUL */
-#define VLAN1_VTI1			0x0000ffff
-
-#define VLAN2			0x0A	  /* R/W mask 0x0000FFFFUL */
-#define VLAN2_VTI2			0x0000ffff
-
-#define WUFF			0x0B	  /* WO */
-
-#define WUCSR			0x0C	  /* R/W */
-#define WUCSR_GUE			0x00000200
-#define WUCSR_WUFR			0x00000040
-#define WUCSR_MPR			0x00000020
-#define WUCSR_WAKE_EN			0x00000004
-#define WUCSR_MPEN			0x00000002
-
-/* Chip ID values */
-#define CHIP_9115	0x115
-#define CHIP_9116	0x116
-#define CHIP_9117	0x117
-#define CHIP_9118	0x118
-#define CHIP_9215	0x115a
-#define CHIP_9216	0x116a
-#define CHIP_9217	0x117a
-#define CHIP_9218	0x118a
-#define CHIP_9221	0x9221
+#define AS CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT
+#include "smc911x.h"
 
 struct smc911x_priv {
 	struct eth_device edev;
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.h
similarity index 60%
copy from drivers/net/smc911x.c
copy to drivers/net/smc911x.h
index 7dddbbc..68f6590 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.h
@@ -22,24 +22,6 @@
  * MA 02111-1307 USA
  */
 
-#ifdef CONFIG_ENABLE_DEVICE_NOISE
-# define DEBUG
-#endif
-
-#include <common.h>
-
-#include <command.h>
-#include <net.h>
-#include <miidev.h>
-#include <malloc.h>
-#include <init.h>
-#include <xfuncs.h>
-#include <errno.h>
-#include <clock.h>
-#include <io.h>
-
-#define AS CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT
-
 /* Below are the register offsets and bit definitions
  * of the Lan911x memory space
  */
@@ -367,392 +349,4 @@
 #define CHIP_9218	0x118a
 #define CHIP_9221	0x9221
 
-struct smc911x_priv {
-	struct eth_device edev;
-	struct mii_device miidev;
-	void __iomem *base;
-};
-
-struct chip_id {
-	u16 id;
-	char *name;
-};
-
-static const struct chip_id chip_ids[] =  {
-	{ CHIP_9115, "LAN9115" },
-	{ CHIP_9116, "LAN9116" },
-	{ CHIP_9117, "LAN9117" },
-	{ CHIP_9118, "LAN9118" },
-	{ CHIP_9215, "LAN9215" },
-	{ CHIP_9216, "LAN9216" },
-	{ CHIP_9217, "LAN9217" },
-	{ CHIP_9218, "LAN9218" },
-	{ CHIP_9221, "LAN9221" },
-	{ 0, NULL },
-};
-
-#define DRIVERNAME "smc911x"
-
-static int smc911x_mac_wait_busy(struct smc911x_priv *priv)
-{
-	uint64_t start = get_time_ns();
-
-	while (!is_timeout(start, MSECOND)) {
-		if (!(readl(priv->base + MAC_CSR_CMD) & MAC_CSR_CMD_CSR_BUSY))
-			return 0;
-	}
-
-	printf("%s: mac timeout\n", __FUNCTION__);
-	return -1;
-}
-
-static u32 smc911x_get_mac_csr(struct eth_device *edev, u8 reg)
-{
-	struct smc911x_priv *priv = edev->priv;
-	ulong val;
-
-	smc911x_mac_wait_busy(priv);
-
-	writel(MAC_CSR_CMD_CSR_BUSY | MAC_CSR_CMD_R_NOT_W | reg,
-			priv->base + MAC_CSR_CMD);
-
-	smc911x_mac_wait_busy(priv);
-
-	val = readl(priv->base + MAC_CSR_DATA);
-
-	return val;
-}
-
-static void smc911x_set_mac_csr(struct eth_device *edev, u8 reg, u32 data)
-{
-	struct smc911x_priv *priv = edev->priv;
-
-	smc911x_mac_wait_busy(priv);
-
-	writel(data, priv->base + MAC_CSR_DATA);
-	writel(MAC_CSR_CMD_CSR_BUSY | reg, priv->base + MAC_CSR_CMD);
-
-	smc911x_mac_wait_busy(priv);
-}
-
-static int smc911x_get_ethaddr(struct eth_device *edev, unsigned char *m)
-{
-	unsigned long addrh, addrl;
-
-	addrh = smc911x_get_mac_csr(edev, ADDRH);
-	addrl = smc911x_get_mac_csr(edev, ADDRL);
-
-	m[0] = (addrl       ) & 0xff;
-	m[1] = (addrl >>  8 ) & 0xff;
-	m[2] = (addrl >> 16 ) & 0xff;
-	m[3] = (addrl >> 24 ) & 0xff;
-	m[4] = (addrh       ) & 0xff;
-	m[5] = (addrh >>  8 ) & 0xff;
-
-	/* we get 0xff when there is no eeprom connected */
-	if ((m[0] & m[1] & m[2] & m[3] & m[4] & m[5]) == 0xff)
-		return -1;
-
-	return 0;
-}
-
-static int smc911x_set_ethaddr(struct eth_device *edev, unsigned char *m)
-{
-	unsigned long addrh, addrl;
-
-	addrl = m[0] | m[1] << 8 | m[2] << 16 | m[3] << 24;
-	addrh = m[4] | m[5] << 8;
-	smc911x_set_mac_csr(edev, ADDRH, addrh);
-	smc911x_set_mac_csr(edev, ADDRL, addrl);
-
-	return 0;
-}
-
-static int smc911x_phy_read(struct mii_device *mdev, int phy_addr, int reg)
-{
-	struct eth_device *edev = mdev->edev;
-
-	while (smc911x_get_mac_csr(edev, MII_ACC) & MII_ACC_MII_BUSY);
-
-	smc911x_set_mac_csr(edev, MII_ACC, phy_addr << 11 | reg << 6 |
-			MII_ACC_MII_BUSY);
-
-	while (smc911x_get_mac_csr(edev, MII_ACC) & MII_ACC_MII_BUSY);
-
-	return smc911x_get_mac_csr(edev, MII_DATA);
-}
-
-static int smc911x_phy_write(struct mii_device *mdev, int phy_addr,
-	int reg, int val)
-{
-	struct eth_device *edev = mdev->edev;
-
-	while (smc911x_get_mac_csr(edev, MII_ACC) & MII_ACC_MII_BUSY);
-
-	smc911x_set_mac_csr(edev, MII_DATA, val);
-	smc911x_set_mac_csr(edev, MII_ACC,
-		phy_addr << 11 | reg << 6 | MII_ACC_MII_BUSY |
-		MII_ACC_MII_WRITE);
-
-	while (smc911x_get_mac_csr(edev, MII_ACC) & MII_ACC_MII_BUSY);
-
-	return 0;
-}
-
-static int smc911x_phy_reset(struct eth_device *edev)
-{
-	struct smc911x_priv *priv = edev->priv;
-	u32 reg;
-
-	reg = readl(priv->base + PMT_CTRL);
-	reg &= 0xfcf;
-	reg |= PMT_CTRL_PHY_RST;
-	writel(reg, priv->base + PMT_CTRL);
-
-	mdelay(100);
-
-	return 0;
-}
-
-static void smc911x_reset(struct eth_device *edev)
-{
-	struct smc911x_priv *priv = edev->priv;
-	uint64_t start;
-
-	/* Take out of PM setting first */
-	if (readl(priv->base + PMT_CTRL) & PMT_CTRL_READY) {
-		/* Write to the bytetest will take out of powerdown */
-		writel(0, priv->base + BYTE_TEST);
-
-		start = get_time_ns();
-		while(1) {
-			if ((readl(priv->base + PMT_CTRL) & PMT_CTRL_READY))
-				break;
-			if (is_timeout(start, 100 * USECOND)) {
-				dev_err(&edev->dev,
-						"timeout waiting for PM restore\n");
-				return;
-			}
-		}
-	}
-
-	/* Disable interrupts */
-	writel(0, priv->base + INT_EN);
-
-	writel(HW_CFG_SRST, priv->base + HW_CFG);
-
-	start = get_time_ns();
-	while(1) {
-		if (!(readl(priv->base + E2P_CMD) & E2P_CMD_EPC_BUSY))
-			break;
-		if (is_timeout(start, 10 * MSECOND)) {
-			dev_err(&edev->dev, "reset timeout\n");
-			return;
-		}
-	}
-
-	/* Reset the FIFO level and flow control settings */
-	smc911x_set_mac_csr(edev, FLOW, FLOW_FCPT | FLOW_FCEN);
-
-	writel(0x0050287F, priv->base + AFC_CFG);
-
-	/* Set to LED outputs */
-	writel(0x70070000, priv->base + GPIO_CFG);
-}
-
-static void smc911x_enable(struct eth_device *edev)
-{
-	struct smc911x_priv *priv = edev->priv;
-
-	/* Enable TX */
-	writel(8 << 16 | HW_CFG_SF, priv->base + HW_CFG);
-
-	writel(GPT_CFG_TIMER_EN | 10000, priv->base + GPT_CFG);
-
-	writel(TX_CFG_TX_ON, priv->base + TX_CFG);
-
-	/* no padding to start of packets */
-	writel(RX_CFG_RX_DUMP, priv->base + RX_CFG);
-}
-
-static int smc911x_eth_open(struct eth_device *edev)
-{
-	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
-
-	miidev_wait_aneg(&priv->miidev);
-	miidev_print_status(&priv->miidev);
-
-	/* Turn on Tx + Rx */
-	smc911x_enable(edev);
-	return 0;
-}
-
-static int smc911x_eth_send(struct eth_device *edev, void *packet, int length)
-{
-	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
-	u32 *data = (u32*)packet;
-	u32 tmplen;
-	u32 status;
-	uint64_t start;
-
-	writel(TX_CMD_A_INT_FIRST_SEG | TX_CMD_A_INT_LAST_SEG | length,
-			priv->base + TX_DATA_FIFO);
-	writel(length, priv->base + TX_DATA_FIFO);
-
-	tmplen = (length + 3) / 4;
-
-	while(tmplen--)
-		writel(*data++, priv->base + TX_DATA_FIFO);
-
-	/* wait for transmission */
-	start = get_time_ns();
-	while (1) {
-		if ((readl(priv->base + TX_FIFO_INF) &
-					TX_FIFO_INF_TSUSED) >> 16)
-			break;
-		if (is_timeout(start, 100 * MSECOND)) {
-			dev_err(&edev->dev, "TX timeout\n");
-			return -1;
-		}
-	}
-
-	/* get status. Ignore 'no carrier' error, it has no meaning for
-	 * full duplex operation
-	 */
-	status = readl(priv->base + TX_STATUS_FIFO) & (TX_STS_LOC |
-		TX_STS_LATE_COLL | TX_STS_MANY_COLL | TX_STS_MANY_DEFER |
-		TX_STS_UNDERRUN);
-
-	if(!status)
-		return 0;
-
-	dev_err(&edev->dev, "failed to send packet: %s%s%s%s%s\n",
-		status & TX_STS_LOC ? "TX_STS_LOC " : "",
-		status & TX_STS_LATE_COLL ? "TX_STS_LATE_COLL " : "",
-		status & TX_STS_MANY_COLL ? "TX_STS_MANY_COLL " : "",
-		status & TX_STS_MANY_DEFER ? "TX_STS_MANY_DEFER " : "",
-		status & TX_STS_UNDERRUN ? "TX_STS_UNDERRUN" : "");
-
-	return -1;
-}
-
-static void smc911x_eth_halt(struct eth_device *edev)
-{
-	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
-
-	/* Disable TX */
-	writel(TX_CFG_STOP_TX, priv->base + TX_CFG);
-
-//	smc911x_reset(edev);
-}
-
-static int smc911x_eth_rx(struct eth_device *edev)
-{
-	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
-	u32 *data = (u32 *)NetRxPackets[0];
-	u32 pktlen, tmplen;
-	u32 status;
-
-	if((readl(priv->base + RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) {
-		status = readl(priv->base + RX_STATUS_FIFO);
-		pktlen = (status & RX_STS_PKT_LEN) >> 16;
-
-		writel(0, priv->base + RX_CFG);
-
-		tmplen = (pktlen + 2 + 3) / 4;
-		while(tmplen--)
-			*data++ = readl(priv->base + RX_DATA_FIFO);
-
-		if(status & RX_STS_ES)
-			dev_err(&edev->dev, "dropped bad packet. Status: 0x%08x\n",
-				status);
-		else
-			net_receive(NetRxPackets[0], pktlen);
-	}
-
-	return 0;
-}
-
-static int smc911x_init_dev(struct eth_device *edev)
-{
-	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
-
-	smc911x_set_mac_csr(edev, MAC_CR, MAC_CR_TXEN | MAC_CR_RXEN |
-			MAC_CR_HBDIS);
-
-	miidev_restart_aneg(&priv->miidev);
-
-	return 0;
-}
-
-static int smc911x_probe(struct device_d *dev)
-{
-	struct eth_device *edev;
-	struct smc911x_priv *priv;
-	uint32_t val;
-	int i;
-	void __iomem *base;
-
-	base = dev_request_mem_region(dev, 0);
-
-	val = readl(base + BYTE_TEST);
-	if(val != 0x87654321) {
-		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
-			base, val);
-		return -ENODEV;
-	}
-
-	val = readl(base + ID_REV) >> 16;
-	for(i = 0; chip_ids[i].id != 0; i++) {
-		if (chip_ids[i].id == val) break;
-	}
-	if (!chip_ids[i].id) {
-		dev_err(dev, "Unknown chip ID %04x\n", val);
-		return -ENODEV;
-	}
-
-	dev_info(dev, "detected %s controller\n", chip_ids[i].name);
-
-	priv = xzalloc(sizeof(*priv));
-	edev = &priv->edev;
-	edev->priv = priv;
-
-	edev->init = smc911x_init_dev;
-	edev->open = smc911x_eth_open;
-	edev->send = smc911x_eth_send;
-	edev->recv = smc911x_eth_rx;
-	edev->halt = smc911x_eth_halt;
-	edev->get_ethaddr = smc911x_get_ethaddr;
-	edev->set_ethaddr = smc911x_set_ethaddr;
-	edev->parent = dev;
-
-	priv->miidev.read = smc911x_phy_read;
-	priv->miidev.write = smc911x_phy_write;
-	priv->miidev.address = 1;
-	priv->miidev.flags = 0;
-	priv->miidev.edev = edev;
-	priv->miidev.parent = dev;
-	priv->base = base;
-
-	smc911x_reset(edev);
-	smc911x_phy_reset(edev);
-
-	mii_register(&priv->miidev);
-	eth_register(edev);
-
-        return 0;
-}
-
-static struct driver_d smc911x_driver = {
-        .name  = "smc911x",
-        .probe = smc911x_probe,
-};
-
-static int smc911x_init(void)
-{
-        register_driver(&smc911x_driver);
-        return 0;
-}
-
-device_initcall(smc911x_init);
 
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 2/7] smc911x: introduce read/write ops
  2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  5:06   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 3/7] smc911x: add 16bit bus width support Jean-Christophe PLAGNIOL-VILLARD
                     ` (4 subsequent siblings)
  5 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  5:06 UTC (permalink / raw)
  To: barebox

This will allow to replace them depending on the platform data.
So we can specify shift and reg io witdh (16bit/32bit)

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c |  101 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 63 insertions(+), 38 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 9c488c7..2583235 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -46,6 +46,9 @@ struct smc911x_priv {
 	struct eth_device edev;
 	struct mii_device miidev;
 	void __iomem *base;
+
+	u32 (*reg_read)(struct smc911x_priv *priv, u32 reg);
+	void (*reg_write)(struct smc911x_priv *priv, u32 reg, u32 val);
 };
 
 struct chip_id {
@@ -68,12 +71,34 @@ static const struct chip_id chip_ids[] =  {
 
 #define DRIVERNAME "smc911x"
 
+static inline u32 smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+{
+	return priv->reg_read(priv, reg);
+}
+
+static inline u32 __smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+{
+	return readl(priv->base + reg);
+}
+
+static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+					u32 val)
+{
+	priv->reg_write(priv, reg, val);
+}
+
+static inline void __smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+					u32 val)
+{
+	writel(val, priv->base + reg);
+}
+
 static int smc911x_mac_wait_busy(struct smc911x_priv *priv)
 {
 	uint64_t start = get_time_ns();
 
 	while (!is_timeout(start, MSECOND)) {
-		if (!(readl(priv->base + MAC_CSR_CMD) & MAC_CSR_CMD_CSR_BUSY))
+		if (!(smc911x_reg_read(priv, MAC_CSR_CMD) & MAC_CSR_CMD_CSR_BUSY))
 			return 0;
 	}
 
@@ -88,12 +113,12 @@ static u32 smc911x_get_mac_csr(struct eth_device *edev, u8 reg)
 
 	smc911x_mac_wait_busy(priv);
 
-	writel(MAC_CSR_CMD_CSR_BUSY | MAC_CSR_CMD_R_NOT_W | reg,
-			priv->base + MAC_CSR_CMD);
+	smc911x_reg_write(priv, MAC_CSR_CMD, MAC_CSR_CMD_CSR_BUSY |
+			  MAC_CSR_CMD_R_NOT_W | reg);
 
 	smc911x_mac_wait_busy(priv);
 
-	val = readl(priv->base + MAC_CSR_DATA);
+	val = smc911x_reg_read(priv, MAC_CSR_DATA);
 
 	return val;
 }
@@ -104,8 +129,8 @@ static void smc911x_set_mac_csr(struct eth_device *edev, u8 reg, u32 data)
 
 	smc911x_mac_wait_busy(priv);
 
-	writel(data, priv->base + MAC_CSR_DATA);
-	writel(MAC_CSR_CMD_CSR_BUSY | reg, priv->base + MAC_CSR_CMD);
+	smc911x_reg_write(priv, MAC_CSR_DATA, data);
+	smc911x_reg_write(priv, MAC_CSR_CMD, MAC_CSR_CMD_CSR_BUSY | reg);
 
 	smc911x_mac_wait_busy(priv);
 }
@@ -179,10 +204,10 @@ static int smc911x_phy_reset(struct eth_device *edev)
 	struct smc911x_priv *priv = edev->priv;
 	u32 reg;
 
-	reg = readl(priv->base + PMT_CTRL);
+	reg = smc911x_reg_read(priv, PMT_CTRL);
 	reg &= 0xfcf;
 	reg |= PMT_CTRL_PHY_RST;
-	writel(reg, priv->base + PMT_CTRL);
+	smc911x_reg_write(priv, PMT_CTRL, reg);
 
 	mdelay(100);
 
@@ -195,13 +220,13 @@ static void smc911x_reset(struct eth_device *edev)
 	uint64_t start;
 
 	/* Take out of PM setting first */
-	if (readl(priv->base + PMT_CTRL) & PMT_CTRL_READY) {
+	if (smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) {
 		/* Write to the bytetest will take out of powerdown */
-		writel(0, priv->base + BYTE_TEST);
+		smc911x_reg_write(priv, BYTE_TEST, 0);
 
 		start = get_time_ns();
 		while(1) {
-			if ((readl(priv->base + PMT_CTRL) & PMT_CTRL_READY))
+			if ((smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY))
 				break;
 			if (is_timeout(start, 100 * USECOND)) {
 				dev_err(&edev->dev,
@@ -212,13 +237,13 @@ static void smc911x_reset(struct eth_device *edev)
 	}
 
 	/* Disable interrupts */
-	writel(0, priv->base + INT_EN);
+	smc911x_reg_write(priv, INT_EN, 0);
 
-	writel(HW_CFG_SRST, priv->base + HW_CFG);
+	smc911x_reg_write(priv, HW_CFG, HW_CFG_SRST);
 
 	start = get_time_ns();
 	while(1) {
-		if (!(readl(priv->base + E2P_CMD) & E2P_CMD_EPC_BUSY))
+		if (!(smc911x_reg_read(priv, E2P_CMD) & E2P_CMD_EPC_BUSY))
 			break;
 		if (is_timeout(start, 10 * MSECOND)) {
 			dev_err(&edev->dev, "reset timeout\n");
@@ -229,10 +254,10 @@ static void smc911x_reset(struct eth_device *edev)
 	/* Reset the FIFO level and flow control settings */
 	smc911x_set_mac_csr(edev, FLOW, FLOW_FCPT | FLOW_FCEN);
 
-	writel(0x0050287F, priv->base + AFC_CFG);
+	smc911x_reg_write(priv, AFC_CFG, 0x0050287F);
 
 	/* Set to LED outputs */
-	writel(0x70070000, priv->base + GPIO_CFG);
+	smc911x_reg_write(priv, GPIO_CFG, 0x70070000);
 }
 
 static void smc911x_enable(struct eth_device *edev)
@@ -240,14 +265,14 @@ static void smc911x_enable(struct eth_device *edev)
 	struct smc911x_priv *priv = edev->priv;
 
 	/* Enable TX */
-	writel(8 << 16 | HW_CFG_SF, priv->base + HW_CFG);
+	smc911x_reg_write(priv, HW_CFG, 8 << 16 | HW_CFG_SF);
 
-	writel(GPT_CFG_TIMER_EN | 10000, priv->base + GPT_CFG);
+	smc911x_reg_write(priv, GPT_CFG, GPT_CFG_TIMER_EN | 10000);
 
-	writel(TX_CFG_TX_ON, priv->base + TX_CFG);
+	smc911x_reg_write(priv, TX_CFG, TX_CFG_TX_ON);
 
 	/* no padding to start of packets */
-	writel(RX_CFG_RX_DUMP, priv->base + RX_CFG);
+	smc911x_reg_write(priv, RX_CFG, RX_CFG_RX_DUMP);
 }
 
 static int smc911x_eth_open(struct eth_device *edev)
@@ -270,19 +295,19 @@ static int smc911x_eth_send(struct eth_device *edev, void *packet, int length)
 	u32 status;
 	uint64_t start;
 
-	writel(TX_CMD_A_INT_FIRST_SEG | TX_CMD_A_INT_LAST_SEG | length,
-			priv->base + TX_DATA_FIFO);
-	writel(length, priv->base + TX_DATA_FIFO);
+	smc911x_reg_write(priv, TX_DATA_FIFO,
+		  TX_CMD_A_INT_FIRST_SEG | TX_CMD_A_INT_LAST_SEG | length);
+	smc911x_reg_write(priv, TX_DATA_FIFO, length);
 
 	tmplen = (length + 3) / 4;
 
 	while(tmplen--)
-		writel(*data++, priv->base + TX_DATA_FIFO);
+		smc911x_reg_write(priv, TX_DATA_FIFO, *data++);
 
 	/* wait for transmission */
 	start = get_time_ns();
 	while (1) {
-		if ((readl(priv->base + TX_FIFO_INF) &
+		if ((smc911x_reg_read(priv, TX_FIFO_INF) &
 					TX_FIFO_INF_TSUSED) >> 16)
 			break;
 		if (is_timeout(start, 100 * MSECOND)) {
@@ -294,7 +319,7 @@ static int smc911x_eth_send(struct eth_device *edev, void *packet, int length)
 	/* get status. Ignore 'no carrier' error, it has no meaning for
 	 * full duplex operation
 	 */
-	status = readl(priv->base + TX_STATUS_FIFO) & (TX_STS_LOC |
+	status = smc911x_reg_read(priv, TX_STATUS_FIFO) & (TX_STS_LOC |
 		TX_STS_LATE_COLL | TX_STS_MANY_COLL | TX_STS_MANY_DEFER |
 		TX_STS_UNDERRUN);
 
@@ -316,7 +341,7 @@ static void smc911x_eth_halt(struct eth_device *edev)
 	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
 
 	/* Disable TX */
-	writel(TX_CFG_STOP_TX, priv->base + TX_CFG);
+	smc911x_reg_write(priv, TX_CFG, TX_CFG_STOP_TX);
 
 //	smc911x_reset(edev);
 }
@@ -328,15 +353,15 @@ static int smc911x_eth_rx(struct eth_device *edev)
 	u32 pktlen, tmplen;
 	u32 status;
 
-	if((readl(priv->base + RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) {
-		status = readl(priv->base + RX_STATUS_FIFO);
+	if((smc911x_reg_read(priv, RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) {
+		status = smc911x_reg_read(priv, RX_STATUS_FIFO);
 		pktlen = (status & RX_STS_PKT_LEN) >> 16;
 
-		writel(0, priv->base + RX_CFG);
+		smc911x_reg_write(priv, RX_CFG, 0);
 
 		tmplen = (pktlen + 2 + 3) / 4;
 		while(tmplen--)
-			*data++ = readl(priv->base + RX_DATA_FIFO);
+			*data++ = smc911x_reg_read(priv, RX_DATA_FIFO);
 
 		if(status & RX_STS_ES)
 			dev_err(&edev->dev, "dropped bad packet. Status: 0x%08x\n",
@@ -366,18 +391,20 @@ static int smc911x_probe(struct device_d *dev)
 	struct smc911x_priv *priv;
 	uint32_t val;
 	int i;
-	void __iomem *base;
 
-	base = dev_request_mem_region(dev, 0);
+	priv = xzalloc(sizeof(*priv));
+	priv->base = dev_request_mem_region(dev, 0);
+	priv->reg_read = __smc911x_reg_read;
+	priv->reg_write = __smc911x_reg_write;
 
-	val = readl(base + BYTE_TEST);
+	val = smc911x_reg_read(priv, BYTE_TEST);
 	if(val != 0x87654321) {
 		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
-			base, val);
+			priv->base, val);
 		return -ENODEV;
 	}
 
-	val = readl(base + ID_REV) >> 16;
+	val = smc911x_reg_read(priv, ID_REV) >> 16;
 	for(i = 0; chip_ids[i].id != 0; i++) {
 		if (chip_ids[i].id == val) break;
 	}
@@ -388,7 +415,6 @@ static int smc911x_probe(struct device_d *dev)
 
 	dev_info(dev, "detected %s controller\n", chip_ids[i].name);
 
-	priv = xzalloc(sizeof(*priv));
 	edev = &priv->edev;
 	edev->priv = priv;
 
@@ -407,7 +433,6 @@ static int smc911x_probe(struct device_d *dev)
 	priv->miidev.flags = 0;
 	priv->miidev.edev = edev;
 	priv->miidev.parent = dev;
-	priv->base = base;
 
 	smc911x_reset(edev);
 	smc911x_phy_reset(edev);
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 3/7] smc911x: add 16bit bus width support
  2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 2/7] smc911x: introduce read/write ops Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  5:06   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 4/7] smc911x: add support to pass the shift via platform data Jean-Christophe PLAGNIOL-VILLARD
                     ` (3 subsequent siblings)
  5 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  5:06 UTC (permalink / raw)
  To: barebox

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c |   34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 2583235..917f994 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -76,7 +76,13 @@ static inline u32 smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
 	return priv->reg_read(priv, reg);
 }
 
-static inline u32 __smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+static inline u32 __smc911x_reg_readw(struct smc911x_priv *priv, u32 reg)
+{
+	return ((readw(priv->base + reg) & 0xFFFF) |
+		((readw(priv->base + reg + 2) & 0xFFFF) << 16));
+}
+
+static inline u32 __smc911x_reg_readl(struct smc911x_priv *priv, u32 reg)
 {
 	return readl(priv->base + reg);
 }
@@ -87,7 +93,14 @@ static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
 	priv->reg_write(priv, reg, val);
 }
 
-static inline void __smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+static inline void __smc911x_reg_writew(struct smc911x_priv *priv, u32 reg,
+					u32 val)
+{
+	writew(val & 0xFFFF, priv->base + reg);
+	writew((val >> 16) & 0xFFFF, priv->base + reg + 2);
+}
+
+static inline void __smc911x_reg_writel(struct smc911x_priv *priv, u32 reg,
 					u32 val)
 {
 	writel(val, priv->base + reg);
@@ -390,12 +403,23 @@ static int smc911x_probe(struct device_d *dev)
 	struct eth_device *edev;
 	struct smc911x_priv *priv;
 	uint32_t val;
-	int i;
+	int i, is_32bit;
 
 	priv = xzalloc(sizeof(*priv));
+	is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
+	if (!is_32bit)
+		is_32bit = 1;
+	else
+		is_32bit = is_32bit == IORESOURCE_MEM_32BIT;
 	priv->base = dev_request_mem_region(dev, 0);
-	priv->reg_read = __smc911x_reg_read;
-	priv->reg_write = __smc911x_reg_write;
+
+	if (is_32bit) {
+		priv->reg_read = __smc911x_reg_readl;
+		priv->reg_write = __smc911x_reg_writel;
+	} else {
+		priv->reg_read = __smc911x_reg_readw;
+		priv->reg_write = __smc911x_reg_writew;
+	}
 
 	val = smc911x_reg_read(priv, BYTE_TEST);
 	if(val != 0x87654321) {
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 4/7] smc911x: add support to pass the shift via platform data
  2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 2/7] smc911x: introduce read/write ops Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 3/7] smc911x: add 16bit bus width support Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  5:06   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 5/7] smc911x: improve detection handle Jean-Christophe PLAGNIOL-VILLARD
                     ` (2 subsequent siblings)
  5 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  5:06 UTC (permalink / raw)
  To: barebox

switch ipe337: to it at the same time to do not brake it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/blackfin/boards/ipe337/ipe337.c |    7 +++-
 drivers/net/Kconfig                  |    6 ----
 drivers/net/smc911x.c                |   60 +++++++++++++++++++++++++++++----
 drivers/net/smc911x.h                |   61 +++++++++++++++++-----------------
 include/smc911x.h                    |   18 ++++++++++
 5 files changed, 109 insertions(+), 43 deletions(-)
 create mode 100644 include/smc911x.h

diff --git a/arch/blackfin/boards/ipe337/ipe337.c b/arch/blackfin/boards/ipe337/ipe337.c
index b3f07bb..9c1de2c 100644
--- a/arch/blackfin/boards/ipe337/ipe337.c
+++ b/arch/blackfin/boards/ipe337/ipe337.c
@@ -4,6 +4,11 @@
 #include <asm/cpu/cdefBF561.h>
 #include <partition.h>
 #include <fs.h>
+#include <smc911x.h>
+
+struct smc911x_plat smcplat = {
+	.shift = 1,
+};
 
 static int ipe337_devices_init(void) {
 	add_cfi_flash_device(DEVICE_ID_DYNAMIC, 0x20000000, 32 * 1024 * 1024, 0);
@@ -17,7 +22,7 @@ static int ipe337_devices_init(void) {
 	*pFIO0_FLAG_S = (1<<12);
 
 	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x24000000, 4096,
-			   IORESOURCE_MEM, NULL);
+			   IORESOURCE_MEM, &smcplat);
 
 	devfs_add_partition("nor0", 0x00000, 0x20000, DEVFS_PARTITION_FIXED, "self0");
 	devfs_add_partition("nor0", 0x20000, 0x20000, DEVFS_PARTITION_FIXED, "env0");
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 749ea6a..340839d 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -36,12 +36,6 @@ config DRIVER_NET_SMC911X
 	  This option enables support for the SMSC LAN9[12]1[567]
 	  ethernet chip.
 
-config DRIVER_NET_SMC911X_ADDRESS_SHIFT
-	int
-	depends on DRIVER_NET_SMC911X
-	default 1 if MACH_IPE337
-	default 0
-
 config DRIVER_NET_SMC91111
 	bool "smc91111 ethernet driver"
 	select MIIDEV
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 917f994..75a332e 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -37,9 +37,8 @@
 #include <errno.h>
 #include <clock.h>
 #include <io.h>
+#include <smc911x.h>
 
-
-#define AS CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT
 #include "smc911x.h"
 
 struct smc911x_priv {
@@ -47,6 +46,8 @@ struct smc911x_priv {
 	struct mii_device miidev;
 	void __iomem *base;
 
+	int shift;
+
 	u32 (*reg_read)(struct smc911x_priv *priv, u32 reg);
 	void (*reg_write)(struct smc911x_priv *priv, u32 reg, u32 val);
 };
@@ -71,6 +72,8 @@ static const struct chip_id chip_ids[] =  {
 
 #define DRIVERNAME "smc911x"
 
+#define __smc_shift(priv, reg) ((reg) << ((priv)->shift))
+
 static inline u32 smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
 {
 	return priv->reg_read(priv, reg);
@@ -87,6 +90,22 @@ static inline u32 __smc911x_reg_readl(struct smc911x_priv *priv, u32 reg)
 	return readl(priv->base + reg);
 }
 
+static inline u32
+__smc911x_reg_readw_shift(struct smc911x_priv *priv, u32 reg)
+{
+	return (readw(priv->base +
+			__smc_shift(priv, reg)) & 0xFFFF) |
+		((readw(priv->base +
+		__smc_shift(priv, reg + 2)) & 0xFFFF) << 16);
+
+}
+
+static inline u32
+__smc911x_reg_readl_shift(struct smc911x_priv *priv, u32 reg)
+{
+	return readl(priv->base + __smc_shift(priv, reg));
+}
+
 static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
 					u32 val)
 {
@@ -106,6 +125,21 @@ static inline void __smc911x_reg_writel(struct smc911x_priv *priv, u32 reg,
 	writel(val, priv->base + reg);
 }
 
+static inline void
+__smc911x_reg_writew_shift(struct smc911x_priv *priv, u32 reg, u32 val)
+{
+	writew(val & 0xFFFF,
+		priv->base + __smc_shift(priv, reg));
+	writew((val >> 16) & 0xFFFF,
+		priv->base + __smc_shift(priv, reg + 2));
+}
+
+static inline void
+__smc911x_reg_writel_shift(struct smc911x_priv *priv, u32 reg, u32 val)
+{
+	writel(val, priv->base + __smc_shift(priv, reg));
+}
+
 static int smc911x_mac_wait_busy(struct smc911x_priv *priv)
 {
 	uint64_t start = get_time_ns();
@@ -404,6 +438,7 @@ static int smc911x_probe(struct device_d *dev)
 	struct smc911x_priv *priv;
 	uint32_t val;
 	int i, is_32bit;
+	struct smc911x_plat *pdata = dev->platform_data;
 
 	priv = xzalloc(sizeof(*priv));
 	is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
@@ -413,12 +448,25 @@ static int smc911x_probe(struct device_d *dev)
 		is_32bit = is_32bit == IORESOURCE_MEM_32BIT;
 	priv->base = dev_request_mem_region(dev, 0);
 
+	if (pdata && pdata->shift)
+		priv->shift = pdata->shift;
+
 	if (is_32bit) {
-		priv->reg_read = __smc911x_reg_readl;
-		priv->reg_write = __smc911x_reg_writel;
+		if (pdata->shift) {
+			priv->reg_read = __smc911x_reg_readl_shift;
+			priv->reg_write = __smc911x_reg_writel_shift;
+		} else {
+			priv->reg_read = __smc911x_reg_readl;
+			priv->reg_write = __smc911x_reg_writel;
+		}
 	} else {
-		priv->reg_read = __smc911x_reg_readw;
-		priv->reg_write = __smc911x_reg_writew;
+		if (pdata->shift) {
+			priv->reg_read = __smc911x_reg_readw_shift;
+			priv->reg_write = __smc911x_reg_writew_shift;
+		} else {
+			priv->reg_read = __smc911x_reg_readw;
+			priv->reg_write = __smc911x_reg_writew;
+		}
 	}
 
 	val = smc911x_reg_read(priv, BYTE_TEST);
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 68f6590..baf3598 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -25,9 +25,10 @@
 /* Below are the register offsets and bit definitions
  * of the Lan911x memory space
  */
-#define RX_DATA_FIFO		 (0x00 << AS)
 
-#define TX_DATA_FIFO		 (0x20 << AS)
+#define RX_DATA_FIFO		 0x00
+
+#define TX_DATA_FIFO		 0x20
 #define	TX_CMD_A_INT_ON_COMP			0x80000000
 #define	TX_CMD_A_INT_BUF_END_ALGN		0x03000000
 #define	TX_CMD_A_INT_4_BYTE_ALGN		0x00000000
@@ -42,7 +43,7 @@
 #define	TX_CMD_B_DISABLE_PADDING		0x00001000
 #define	TX_CMD_B_PKT_BYTE_LENGTH		0x000007FF
 
-#define RX_STATUS_FIFO		(0x40 << AS)
+#define RX_STATUS_FIFO		0x40
 #define	RX_STS_PKT_LEN				0x3FFF0000
 #define	RX_STS_ES				0x00008000
 #define	RX_STS_BCST				0x00002000
@@ -56,8 +57,8 @@
 #define	RX_STS_MII_ERR				0x00000008
 #define	RX_STS_DRIBBLING			0x00000004
 #define	RX_STS_CRC_ERR				0x00000002
-#define RX_STATUS_FIFO_PEEK 	(0x44 << AS)
-#define TX_STATUS_FIFO		(0x48 << AS)
+#define RX_STATUS_FIFO_PEEK 	0x44
+#define TX_STATUS_FIFO		0x48
 #define	TX_STS_TAG				0xFFFF0000
 #define	TX_STS_ES				0x00008000
 #define	TX_STS_LOC				0x00000800
@@ -68,12 +69,12 @@
 #define	TX_STS_MANY_DEFER			0x00000004
 #define	TX_STS_UNDERRUN				0x00000002
 #define	TX_STS_DEFERRED				0x00000001
-#define TX_STATUS_FIFO_PEEK	(0x4C << AS)
-#define ID_REV			(0x50 << AS)
+#define TX_STATUS_FIFO_PEEK	0x4C
+#define ID_REV			0x50
 #define	ID_REV_CHIP_ID				0xFFFF0000  /* RO */
 #define	ID_REV_REV_ID				0x0000FFFF  /* RO */
 
-#define INT_CFG			(0x54 << AS)
+#define INT_CFG			0x54
 #define	INT_CFG_INT_DEAS			0xFF000000  /* R/W */
 #define	INT_CFG_INT_DEAS_CLR			0x00004000
 #define	INT_CFG_INT_DEAS_STS			0x00002000
@@ -82,7 +83,7 @@
 #define	INT_CFG_IRQ_POL				0x00000010  /* R/W Not Affected by SW Reset */
 #define	INT_CFG_IRQ_TYPE			0x00000001  /* R/W Not Affected by SW Reset */
 
-#define INT_STS			(0x58 << AS)
+#define INT_STS			0x58
 #define	INT_STS_SW_INT				0x80000000  /* R/WC */
 #define	INT_STS_TXSTOP_INT			0x02000000  /* R/WC */
 #define	INT_STS_RXSTOP_INT			0x01000000  /* R/WC */
@@ -111,7 +112,7 @@
 #define	INT_STS_GPIO2_INT			0x00000004  /* R/WC */
 #define	INT_STS_GPIO1_INT			0x00000002  /* R/WC */
 #define	INT_STS_GPIO0_INT			0x00000001  /* R/WC */
-#define INT_EN			(0x5C << AS)
+#define INT_EN			0x5C
 #define	INT_EN_SW_INT_EN			0x80000000  /* R/W */
 #define	INT_EN_TXSTOP_INT_EN			0x02000000  /* R/W */
 #define	INT_EN_RXSTOP_INT_EN			0x01000000  /* R/W */
@@ -141,14 +142,14 @@
 #define	INT_EN_GPIO1_INT			0x00000002  /* R/W */
 #define	INT_EN_GPIO0_INT			0x00000001  /* R/W */
 
-#define BYTE_TEST		(0x64 << AS)
-#define FIFO_INT		(0x68 << AS)
+#define BYTE_TEST		0x64
+#define FIFO_INT		0x68
 #define	FIFO_INT_TX_AVAIL_LEVEL			0xFF000000  /* R/W */
 #define	FIFO_INT_TX_STS_LEVEL			0x00FF0000  /* R/W */
 #define	FIFO_INT_RX_AVAIL_LEVEL			0x0000FF00  /* R/W */
 #define	FIFO_INT_RX_STS_LEVEL			0x000000FF  /* R/W */
 
-#define RX_CFG			(0x6C << AS)
+#define RX_CFG			0x6C
 #define	RX_CFG_RX_END_ALGN			0xC0000000  /* R/W */
 #define		RX_CFG_RX_END_ALGN4		0x00000000  /* R/W */
 #define		RX_CFG_RX_END_ALGN16		0x40000000  /* R/W */
@@ -158,7 +159,7 @@
 #define	RX_CFG_RXDOFF				0x00001F00  /* R/W */
 //#define	RX_CFG_RXBAD			0x00000001  /* R/W */
 
-#define TX_CFG			(0x70 << AS)
+#define TX_CFG			0x70
 //#define	TX_CFG_TX_DMA_LVL		0xE0000000	 /* R/W */
 //#define	TX_CFG_TX_DMA_CNT		0x0FFF0000	 /* R/W Self Clearing */
 #define	TX_CFG_TXS_DUMP				0x00008000  /* Self Clearing */
@@ -167,7 +168,7 @@
 #define	TX_CFG_TX_ON				0x00000002  /* R/W */
 #define	TX_CFG_STOP_TX				0x00000001  /* Self Clearing */
 
-#define HW_CFG			(0x74 << AS)
+#define HW_CFG			0x74
 #define	HW_CFG_TTM				0x00200000  /* R/W */
 #define	HW_CFG_SF				0x00100000  /* R/W */
 #define	HW_CFG_TX_FIF_SZ			0x000F0000  /* R/W */
@@ -183,19 +184,19 @@
 #define	HW_CFG_SRST_TO				0x00000002  /* RO */
 #define	HW_CFG_SRST				0x00000001  /* Self Clearing */
 
-#define RX_DP_CTRL		(0x78 << AS)
+#define RX_DP_CTRL		0x78
 #define	RX_DP_CTRL_RX_FFWD			0x80000000  /* R/W */
 #define	RX_DP_CTRL_FFWD_BUSY			0x80000000  /* RO */
 
-#define RX_FIFO_INF		(0x7C << AS)
+#define RX_FIFO_INF		0x7C 
 #define	 RX_FIFO_INF_RXSUSED			0x00FF0000  /* RO */
 #define	 RX_FIFO_INF_RXDUSED			0x0000FFFF  /* RO */
 
-#define TX_FIFO_INF		(0x80 << AS)
+#define TX_FIFO_INF		0x80
 #define	TX_FIFO_INF_TSUSED			0x00FF0000  /* RO */
 #define	TX_FIFO_INF_TDFREE			0x0000FFFF  /* RO */
 
-#define PMT_CTRL		(0x84 << AS)
+#define PMT_CTRL		0x84
 #define	PMT_CTRL_PM_MODE			0x00003000  /* Self Clearing */
 #define	PMT_CTRL_PHY_RST			0x00000400  /* Self Clearing */
 #define	PMT_CTRL_WOL_EN				0x00000200  /* R/W */
@@ -211,7 +212,7 @@
 #define	PMT_CTRL_PME_EN				0x00000002  /* R/W Not Affected by SW Reset */
 #define	PMT_CTRL_READY				0x00000001  /* RO */
 
-#define GPIO_CFG		(0x88 << AS)
+#define GPIO_CFG		0x88
 #define	GPIO_CFG_LED3_EN			0x40000000  /* R/W */
 #define	GPIO_CFG_LED2_EN			0x20000000  /* R/W */
 #define	GPIO_CFG_LED1_EN			0x10000000  /* R/W */
@@ -231,23 +232,23 @@
 #define	GPIO_CFG_GPIOD1				0x00000002  /* R/W */
 #define	GPIO_CFG_GPIOD0				0x00000001  /* R/W */
 
-#define GPT_CFG			(0x8C << AS)
+#define GPT_CFG			0x8C
 #define	GPT_CFG_TIMER_EN			0x20000000  /* R/W */
 #define	GPT_CFG_GPT_LOAD			0x0000FFFF  /* R/W */
 
-#define GPT_CNT			(0x90 << AS)
+#define GPT_CNT			0x90
 #define	GPT_CNT_GPT_CNT				0x0000FFFF  /* RO */
 
-#define ENDIAN			(0x98 << AS)
-#define FREE_RUN		(0x9C << AS)
-#define RX_DROP			(0xA0 << AS)
-#define MAC_CSR_CMD		(0xA4 << AS)
+#define ENDIAN			0x98
+#define FREE_RUN		0x9C
+#define RX_DROP			0xA0
+#define MAC_CSR_CMD		0xA4
 #define	 MAC_CSR_CMD_CSR_BUSY			0x80000000  /* Self Clearing */
 #define	 MAC_CSR_CMD_R_NOT_W			0x40000000  /* R/W */
 #define	 MAC_CSR_CMD_CSR_ADDR			0x000000FF  /* R/W */
 
-#define MAC_CSR_DATA		(0xA8 << AS)
-#define AFC_CFG			(0xAC << AS)
+#define MAC_CSR_DATA		0xA8
+#define AFC_CFG			0xAC
 #define		AFC_CFG_AFC_HI			0x00FF0000  /* R/W */
 #define		AFC_CFG_AFC_LO			0x0000FF00  /* R/W */
 #define		AFC_CFG_BACK_DUR		0x000000F0  /* R/W */
@@ -256,7 +257,7 @@
 #define		AFC_CFG_FCADD			0x00000002  /* R/W */
 #define		AFC_CFG_FCANY			0x00000001  /* R/W */
 
-#define E2P_CMD			(0xB0 << AS)
+#define E2P_CMD			0xB0
 #define		E2P_CMD_EPC_BUSY		0x80000000  /* Self Clearing */
 #define		E2P_CMD_EPC_CMD			0x70000000  /* R/W */
 #define		E2P_CMD_EPC_CMD_READ		0x00000000  /* R/W */
@@ -271,7 +272,7 @@
 #define		E2P_CMD_MAC_ADDR_LOADED		0x00000100  /* RO */
 #define		E2P_CMD_EPC_ADDR		0x000000FF  /* R/W */
 
-#define E2P_DATA		(0xB4 << AS)
+#define E2P_DATA		0xB4
 #define	E2P_DATA_EEPROM_DATA			0x000000FF  /* R/W */
 /* end of LAN register offsets and bit definitions */
 
diff --git a/include/smc911x.h b/include/smc911x.h
new file mode 100644
index 0000000..148906b
--- /dev/null
+++ b/include/smc911x.h
@@ -0,0 +1,18 @@
+/*
+ * (C) Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#ifndef __SMC911X_PLATFORM_H_
+#define __SMC911X_PLATFORM_H_
+
+/**
+ * @brief Platform dependent feature:
+ * Pass pointer to this structure as part of device_d -> platform_data
+ */
+struct smc911x_plat {
+	int shift;
+};
+
+#endif /* __SMC911X_PLATFORM_H_ */
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 5/7] smc911x: improve detection handle
  2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
                     ` (2 preceding siblings ...)
  2012-08-29  5:06   ` [PATCH 4/7] smc911x: add support to pass the shift via platform data Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  5:06   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  6:52     ` Sascha Hauer
  2012-08-29  5:06   ` [PATCH 6/7] smc911x: update chip detection Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 7/7] smm911x: check if the device is ready before using it Jean-Christophe PLAGNIOL-VILLARD
  5 siblings, 1 reply; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  5:06 UTC (permalink / raw)
  To: barebox

detect if the bus is swapped and report a 32bit drivers is used on a 16bit bus

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c |   20 +++++++++++++++++++-
 drivers/net/smc911x.h |    2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 75a332e..17f365d 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -470,9 +470,27 @@ static int smc911x_probe(struct device_d *dev)
 	}
 
 	val = smc911x_reg_read(priv, BYTE_TEST);
-	if(val != 0x87654321) {
+	if (val == 0x43218765) {
+		dev_info(dev, "BYTE_TEST looks swapped, "
+			   "applying WORD_SWAP");
+		smc911x_reg_write(priv, WORD_SWAP, 0xffffffff);
+
+		/* 1 dummy read of BYTE_TEST is needed after a write to
+		 * WORD_SWAP before its contents are valid */
+		val = smc911x_reg_read(priv, BYTE_TEST);
+
+		val = smc911x_reg_read(priv, BYTE_TEST);
+	}
+
+	if (val != 0x87654321) {
 		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
 			priv->base, val);
+		if (((val >> 16) & 0xFFFF) == (val & 0xFFFF)) {
+			dev_err(dev, "top 16 bits equal to bottom 16 bits\n");
+			dev_err(dev,
+				   "This may mean the chip is set "
+				   "for 32 bit while the bus is reading 16 bit\n");
+		}
 		return -ENODEV;
 	}
 
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index baf3598..d409247 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -26,6 +26,8 @@
  * of the Lan911x memory space
  */
 
+#define WORD_SWAP		0x98
+
 #define RX_DATA_FIFO		 0x00
 
 #define TX_DATA_FIFO		 0x20
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 6/7] smc911x: update chip detection
  2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
                     ` (3 preceding siblings ...)
  2012-08-29  5:06   ` [PATCH 5/7] smc911x: improve detection handle Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  5:06   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  5:06   ` [PATCH 7/7] smm911x: check if the device is ready before using it Jean-Christophe PLAGNIOL-VILLARD
  5 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  5:06 UTC (permalink / raw)
  To: barebox

Use linux kernel chip detection from 3.5

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c |   60 ++++++++++++++++++++++++++++---------------------
 drivers/net/smc911x.h |   13 -----------
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 17f365d..cfcd83f 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -47,29 +47,12 @@ struct smc911x_priv {
 	void __iomem *base;
 
 	int shift;
+	int generation;
 
 	u32 (*reg_read)(struct smc911x_priv *priv, u32 reg);
 	void (*reg_write)(struct smc911x_priv *priv, u32 reg, u32 val);
 };
 
-struct chip_id {
-	u16 id;
-	char *name;
-};
-
-static const struct chip_id chip_ids[] =  {
-	{ CHIP_9115, "LAN9115" },
-	{ CHIP_9116, "LAN9116" },
-	{ CHIP_9117, "LAN9117" },
-	{ CHIP_9118, "LAN9118" },
-	{ CHIP_9215, "LAN9215" },
-	{ CHIP_9216, "LAN9216" },
-	{ CHIP_9217, "LAN9217" },
-	{ CHIP_9218, "LAN9218" },
-	{ CHIP_9221, "LAN9221" },
-	{ 0, NULL },
-};
-
 #define DRIVERNAME "smc911x"
 
 #define __smc_shift(priv, reg) ((reg) << ((priv)->shift))
@@ -437,7 +420,7 @@ static int smc911x_probe(struct device_d *dev)
 	struct eth_device *edev;
 	struct smc911x_priv *priv;
 	uint32_t val;
-	int i, is_32bit;
+	int is_32bit;
 	struct smc911x_plat *pdata = dev->platform_data;
 
 	priv = xzalloc(sizeof(*priv));
@@ -494,16 +477,41 @@ static int smc911x_probe(struct device_d *dev)
 		return -ENODEV;
 	}
 
-	val = smc911x_reg_read(priv, ID_REV) >> 16;
-	for(i = 0; chip_ids[i].id != 0; i++) {
-		if (chip_ids[i].id == val) break;
-	}
-	if (!chip_ids[i].id) {
-		dev_err(dev, "Unknown chip ID %04x\n", val);
+	val = smc911x_reg_read(priv, ID_REV);
+	switch (val & 0xFFFF0000) {
+	case 0x01180000:
+	case 0x01170000:
+	case 0x01160000:
+	case 0x01150000:
+	case 0x218A0000:
+		/* LAN911[5678] family */
+		priv->generation = val & 0x0000FFFF;
+		break;
+
+	case 0x118A0000:
+	case 0x117A0000:
+	case 0x116A0000:
+	case 0x115A0000:
+		/* LAN921[5678] family */
+		priv->generation = 3;
+		break;
+
+	case 0x92100000:
+	case 0x92110000:
+	case 0x92200000:
+	case 0x92210000:
+		/* LAN9210/LAN9211/LAN9220/LAN9221 */
+		priv->generation = 4;
+		break;
+
+	default:
+		dev_err(dev, "LAN911x not identified, idrev: 0x%08X\n",
+			  val);
 		return -ENODEV;
 	}
 
-	dev_info(dev, "detected %s controller\n", chip_ids[i].name);
+	dev_info(dev, "LAN911x identified, idrev: 0x%08X, generation: %d\n",
+		   val, priv->generation);
 
 	edev = &priv->edev;
 	edev->priv = priv;
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index d409247..572c1f8 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -340,16 +340,3 @@
 #define WUCSR_MPR			0x00000020
 #define WUCSR_WAKE_EN			0x00000004
 #define WUCSR_MPEN			0x00000002
-
-/* Chip ID values */
-#define CHIP_9115	0x115
-#define CHIP_9116	0x116
-#define CHIP_9117	0x117
-#define CHIP_9118	0x118
-#define CHIP_9215	0x115a
-#define CHIP_9216	0x116a
-#define CHIP_9217	0x117a
-#define CHIP_9218	0x118a
-#define CHIP_9221	0x9221
-
-
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 7/7] smm911x: check if the device is ready before using it
  2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
                     ` (4 preceding siblings ...)
  2012-08-29  5:06   ` [PATCH 6/7] smc911x: update chip detection Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  5:06   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  6:53     ` Sascha Hauer
  2012-08-29 10:07     ` Christian Hemp
  5 siblings, 2 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  5:06 UTC (permalink / raw)
  To: barebox

poll the READY bit in PMT_CTRL. Any other access to the device is
forbidden while this bit isn't set. Try for 100ms

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index cfcd83f..3695d32 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -422,6 +422,7 @@ static int smc911x_probe(struct device_d *dev)
 	uint32_t val;
 	int is_32bit;
 	struct smc911x_plat *pdata = dev->platform_data;
+	unsigned int to = 100;
 
 	priv = xzalloc(sizeof(*priv));
 	is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
@@ -452,6 +453,17 @@ static int smc911x_probe(struct device_d *dev)
 		}
 	}
 
+	/*
+	 * poll the READY bit in PMT_CTRL. Any other access to the device is
+	 * forbidden while this bit isn't set. Try for 100ms
+	 */
+	while (!(smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) && --to)
+		udelay(1000);
+	if (to == 0) {
+		dev_err(dev, "Device not READY in 100ms aborting\n");
+		return -ENODEV;
+	}
+
 	val = smc911x_reg_read(priv, BYTE_TEST);
 	if (val == 0x43218765) {
 		dev_info(dev, "BYTE_TEST looks swapped, "
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 5/7] smc911x: improve detection handle
  2012-08-29  5:06   ` [PATCH 5/7] smc911x: improve detection handle Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  6:52     ` Sascha Hauer
  2012-08-29  8:36       ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 1 reply; 17+ messages in thread
From: Sascha Hauer @ 2012-08-29  6:52 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Wed, Aug 29, 2012 at 07:06:16AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> detect if the bus is swapped and report a 32bit drivers is used on a 16bit bus
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  drivers/net/smc911x.c |   20 +++++++++++++++++++-
>  drivers/net/smc911x.h |    2 ++
>  2 files changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> index 75a332e..17f365d 100644
> --- a/drivers/net/smc911x.c
> +++ b/drivers/net/smc911x.c
> @@ -470,9 +470,27 @@ static int smc911x_probe(struct device_d *dev)
>  	}
>  
>  	val = smc911x_reg_read(priv, BYTE_TEST);
> -	if(val != 0x87654321) {
> +	if (val == 0x43218765) {
> +		dev_info(dev, "BYTE_TEST looks swapped, "
> +			   "applying WORD_SWAP");

dev_dbg please. Users shouldn't be interested in this.

> +		smc911x_reg_write(priv, WORD_SWAP, 0xffffffff);
> +
> +		/* 1 dummy read of BYTE_TEST is needed after a write to
> +		 * WORD_SWAP before its contents are valid */
> +		val = smc911x_reg_read(priv, BYTE_TEST);
> +
> +		val = smc911x_reg_read(priv, BYTE_TEST);
> +	}
> +
> +	if (val != 0x87654321) {
>  		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
>  			priv->base, val);
> +		if (((val >> 16) & 0xFFFF) == (val & 0xFFFF)) {
> +			dev_err(dev, "top 16 bits equal to bottom 16 bits\n");
> +			dev_err(dev,
> +				   "This may mean the chip is set "
> +				   "for 32 bit while the bus is reading 16 bit\n");

Please replace the second dev_err with a comment in the source code.
This is developer information only; developers will grep for the source
of the message anyway.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 7/7] smm911x: check if the device is ready before using it
  2012-08-29  5:06   ` [PATCH 7/7] smm911x: check if the device is ready before using it Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  6:53     ` Sascha Hauer
  2012-08-29  8:35       ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29 10:07     ` Christian Hemp
  1 sibling, 1 reply; 17+ messages in thread
From: Sascha Hauer @ 2012-08-29  6:53 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Wed, Aug 29, 2012 at 07:06:18AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> poll the READY bit in PMT_CTRL. Any other access to the device is
> forbidden while this bit isn't set. Try for 100ms
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  drivers/net/smc911x.c |   12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> index cfcd83f..3695d32 100644
> --- a/drivers/net/smc911x.c
> +++ b/drivers/net/smc911x.c
> @@ -422,6 +422,7 @@ static int smc911x_probe(struct device_d *dev)
>  	uint32_t val;
>  	int is_32bit;
>  	struct smc911x_plat *pdata = dev->platform_data;
> +	unsigned int to = 100;
>  
>  	priv = xzalloc(sizeof(*priv));
>  	is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
> @@ -452,6 +453,17 @@ static int smc911x_probe(struct device_d *dev)
>  		}
>  	}
>  
> +	/*
> +	 * poll the READY bit in PMT_CTRL. Any other access to the device is
> +	 * forbidden while this bit isn't set. Try for 100ms
> +	 */
> +	while (!(smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) && --to)
> +		udelay(1000);

please use a regular timeout loop

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 7/7] smm911x: check if the device is ready before using it
  2012-08-29  6:53     ` Sascha Hauer
@ 2012-08-29  8:35       ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  9:04         ` Sascha Hauer
  0 siblings, 1 reply; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  8:35 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 08:53 Wed 29 Aug     , Sascha Hauer wrote:
> On Wed, Aug 29, 2012 at 07:06:18AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > poll the READY bit in PMT_CTRL. Any other access to the device is
> > forbidden while this bit isn't set. Try for 100ms
> > 
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> >  drivers/net/smc911x.c |   12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> > index cfcd83f..3695d32 100644
> > --- a/drivers/net/smc911x.c
> > +++ b/drivers/net/smc911x.c
> > @@ -422,6 +422,7 @@ static int smc911x_probe(struct device_d *dev)
> >  	uint32_t val;
> >  	int is_32bit;
> >  	struct smc911x_plat *pdata = dev->platform_data;
> > +	unsigned int to = 100;
> >  
> >  	priv = xzalloc(sizeof(*priv));
> >  	is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
> > @@ -452,6 +453,17 @@ static int smc911x_probe(struct device_d *dev)
> >  		}
> >  	}
> >  
> > +	/*
> > +	 * poll the READY bit in PMT_CTRL. Any other access to the device is
> > +	 * forbidden while this bit isn't set. Try for 100ms
> > +	 */
> > +	while (!(smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) && --to)
> > +		udelay(1000);
> 
> please use a regular timeout loop
code from the kernel I prefer to keep it as it

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 5/7] smc911x: improve detection handle
  2012-08-29  6:52     ` Sascha Hauer
@ 2012-08-29  8:36       ` Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  9:04         ` Sascha Hauer
  0 siblings, 1 reply; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-29  8:36 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 08:52 Wed 29 Aug     , Sascha Hauer wrote:
> On Wed, Aug 29, 2012 at 07:06:16AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > detect if the bus is swapped and report a 32bit drivers is used on a 16bit bus
> > 
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> >  drivers/net/smc911x.c |   20 +++++++++++++++++++-
> >  drivers/net/smc911x.h |    2 ++
> >  2 files changed, 21 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> > index 75a332e..17f365d 100644
> > --- a/drivers/net/smc911x.c
> > +++ b/drivers/net/smc911x.c
> > @@ -470,9 +470,27 @@ static int smc911x_probe(struct device_d *dev)
> >  	}
> >  
> >  	val = smc911x_reg_read(priv, BYTE_TEST);
> > -	if(val != 0x87654321) {
> > +	if (val == 0x43218765) {
> > +		dev_info(dev, "BYTE_TEST looks swapped, "
> > +			   "applying WORD_SWAP");
> 
> dev_dbg please. Users shouldn't be interested in this.
> 
> > +		smc911x_reg_write(priv, WORD_SWAP, 0xffffffff);
> > +
> > +		/* 1 dummy read of BYTE_TEST is needed after a write to
> > +		 * WORD_SWAP before its contents are valid */
> > +		val = smc911x_reg_read(priv, BYTE_TEST);
> > +
> > +		val = smc911x_reg_read(priv, BYTE_TEST);
> > +	}
> > +
> > +	if (val != 0x87654321) {
> >  		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
> >  			priv->base, val);
> > +		if (((val >> 16) & 0xFFFF) == (val & 0xFFFF)) {
> > +			dev_err(dev, "top 16 bits equal to bottom 16 bits\n");
> > +			dev_err(dev,
> > +				   "This may mean the chip is set "
> > +				   "for 32 bit while the bus is reading 16 bit\n");
> 
> Please replace the second dev_err with a comment in the source code.
> This is developer information only; developers will grep for the source
> of the message anyway.
code from the kernel prefer to keep it as is

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 7/7] smm911x: check if the device is ready before using it
  2012-08-29  8:35       ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  9:04         ` Sascha Hauer
  0 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2012-08-29  9:04 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Wed, Aug 29, 2012 at 10:35:07AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 08:53 Wed 29 Aug     , Sascha Hauer wrote:
> > On Wed, Aug 29, 2012 at 07:06:18AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > poll the READY bit in PMT_CTRL. Any other access to the device is
> > > forbidden while this bit isn't set. Try for 100ms
> > > 
> > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > ---
> > >  drivers/net/smc911x.c |   12 ++++++++++++
> > >  1 file changed, 12 insertions(+)
> > > 
> > > diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> > > index cfcd83f..3695d32 100644
> > > --- a/drivers/net/smc911x.c
> > > +++ b/drivers/net/smc911x.c
> > > @@ -422,6 +422,7 @@ static int smc911x_probe(struct device_d *dev)
> > >  	uint32_t val;
> > >  	int is_32bit;
> > >  	struct smc911x_plat *pdata = dev->platform_data;
> > > +	unsigned int to = 100;
> > >  
> > >  	priv = xzalloc(sizeof(*priv));
> > >  	is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
> > > @@ -452,6 +453,17 @@ static int smc911x_probe(struct device_d *dev)
> > >  		}
> > >  	}
> > >  
> > > +	/*
> > > +	 * poll the READY bit in PMT_CTRL. Any other access to the device is
> > > +	 * forbidden while this bit isn't set. Try for 100ms
> > > +	 */
> > > +	while (!(smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) && --to)
> > > +		udelay(1000);
> > 
> > please use a regular timeout loop
> code from the kernel I prefer to keep it as it

We are not the kernel.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 5/7] smc911x: improve detection handle
  2012-08-29  8:36       ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-29  9:04         ` Sascha Hauer
  0 siblings, 0 replies; 17+ messages in thread
From: Sascha Hauer @ 2012-08-29  9:04 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Wed, Aug 29, 2012 at 10:36:07AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 08:52 Wed 29 Aug     , Sascha Hauer wrote:
> > On Wed, Aug 29, 2012 at 07:06:16AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > detect if the bus is swapped and report a 32bit drivers is used on a 16bit bus
> > > 
> > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > ---
> > >  drivers/net/smc911x.c |   20 +++++++++++++++++++-
> > >  drivers/net/smc911x.h |    2 ++
> > >  2 files changed, 21 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> > > index 75a332e..17f365d 100644
> > > --- a/drivers/net/smc911x.c
> > > +++ b/drivers/net/smc911x.c
> > > @@ -470,9 +470,27 @@ static int smc911x_probe(struct device_d *dev)
> > >  	}
> > >  
> > >  	val = smc911x_reg_read(priv, BYTE_TEST);
> > > -	if(val != 0x87654321) {
> > > +	if (val == 0x43218765) {
> > > +		dev_info(dev, "BYTE_TEST looks swapped, "
> > > +			   "applying WORD_SWAP");
> > 
> > dev_dbg please. Users shouldn't be interested in this.
> > 
> > > +		smc911x_reg_write(priv, WORD_SWAP, 0xffffffff);
> > > +
> > > +		/* 1 dummy read of BYTE_TEST is needed after a write to
> > > +		 * WORD_SWAP before its contents are valid */
> > > +		val = smc911x_reg_read(priv, BYTE_TEST);
> > > +
> > > +		val = smc911x_reg_read(priv, BYTE_TEST);
> > > +	}
> > > +
> > > +	if (val != 0x87654321) {
> > >  		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
> > >  			priv->base, val);
> > > +		if (((val >> 16) & 0xFFFF) == (val & 0xFFFF)) {
> > > +			dev_err(dev, "top 16 bits equal to bottom 16 bits\n");
> > > +			dev_err(dev,
> > > +				   "This may mean the chip is set "
> > > +				   "for 32 bit while the bus is reading 16 bit\n");
> > 
> > Please replace the second dev_err with a comment in the source code.
> > This is developer information only; developers will grep for the source
> > of the message anyway.
> code from the kernel prefer to keep it as is

We are not the kernel.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 7/7] smm911x: check if the device is ready before using it
  2012-08-29  5:06   ` [PATCH 7/7] smm911x: check if the device is ready before using it Jean-Christophe PLAGNIOL-VILLARD
  2012-08-29  6:53     ` Sascha Hauer
@ 2012-08-29 10:07     ` Christian Hemp
  1 sibling, 0 replies; 17+ messages in thread
From: Christian Hemp @ 2012-08-29 10:07 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

Hi Jean-Christophe,

there is a issue in your header
“[PATCH 7/7] smm911x: check if the device is ready before using it”
            
I think smc911x is correct.


Christian

Am Mittwoch, den 29.08.2012, 07:06 +0200 schrieb Jean-Christophe
PLAGNIOL-VILLARD:
> poll the READY bit in PMT_CTRL. Any other access to the device is
> forbidden while this bit isn't set. Try for 100ms
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  drivers/net/smc911x.c |   12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> index cfcd83f..3695d32 100644
> --- a/drivers/net/smc911x.c
> +++ b/drivers/net/smc911x.c
> @@ -422,6 +422,7 @@ static int smc911x_probe(struct device_d *dev)
>  	uint32_t val;
>  	int is_32bit;
>  	struct smc911x_plat *pdata = dev->platform_data;
> +	unsigned int to = 100;
>  
>  	priv = xzalloc(sizeof(*priv));
>  	is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
> @@ -452,6 +453,17 @@ static int smc911x_probe(struct device_d *dev)
>  		}
>  	}
>  
> +	/*
> +	 * poll the READY bit in PMT_CTRL. Any other access to the device is
> +	 * forbidden while this bit isn't set. Try for 100ms
> +	 */
> +	while (!(smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) && --to)
> +		udelay(1000);
> +	if (to == 0) {
> +		dev_err(dev, "Device not READY in 100ms aborting\n");
> +		return -ENODEV;
> +	}
> +
>  	val = smc911x_reg_read(priv, BYTE_TEST);
>  	if (val == 0x43218765) {
>  		dev_info(dev, "BYTE_TEST looks swapped, "



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 2/7] smc911x: introduce read/write ops
  2012-09-01  8:52 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
@ 2012-09-01  8:52   ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-09-01  8:52 UTC (permalink / raw)
  To: barebox

This will allow to replace them depending on the platform data.
So we can specify shift and reg io witdh (16bit/32bit)

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c |  101 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 63 insertions(+), 38 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 9c488c7..2583235 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -46,6 +46,9 @@ struct smc911x_priv {
 	struct eth_device edev;
 	struct mii_device miidev;
 	void __iomem *base;
+
+	u32 (*reg_read)(struct smc911x_priv *priv, u32 reg);
+	void (*reg_write)(struct smc911x_priv *priv, u32 reg, u32 val);
 };
 
 struct chip_id {
@@ -68,12 +71,34 @@ static const struct chip_id chip_ids[] =  {
 
 #define DRIVERNAME "smc911x"
 
+static inline u32 smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+{
+	return priv->reg_read(priv, reg);
+}
+
+static inline u32 __smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+{
+	return readl(priv->base + reg);
+}
+
+static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+					u32 val)
+{
+	priv->reg_write(priv, reg, val);
+}
+
+static inline void __smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+					u32 val)
+{
+	writel(val, priv->base + reg);
+}
+
 static int smc911x_mac_wait_busy(struct smc911x_priv *priv)
 {
 	uint64_t start = get_time_ns();
 
 	while (!is_timeout(start, MSECOND)) {
-		if (!(readl(priv->base + MAC_CSR_CMD) & MAC_CSR_CMD_CSR_BUSY))
+		if (!(smc911x_reg_read(priv, MAC_CSR_CMD) & MAC_CSR_CMD_CSR_BUSY))
 			return 0;
 	}
 
@@ -88,12 +113,12 @@ static u32 smc911x_get_mac_csr(struct eth_device *edev, u8 reg)
 
 	smc911x_mac_wait_busy(priv);
 
-	writel(MAC_CSR_CMD_CSR_BUSY | MAC_CSR_CMD_R_NOT_W | reg,
-			priv->base + MAC_CSR_CMD);
+	smc911x_reg_write(priv, MAC_CSR_CMD, MAC_CSR_CMD_CSR_BUSY |
+			  MAC_CSR_CMD_R_NOT_W | reg);
 
 	smc911x_mac_wait_busy(priv);
 
-	val = readl(priv->base + MAC_CSR_DATA);
+	val = smc911x_reg_read(priv, MAC_CSR_DATA);
 
 	return val;
 }
@@ -104,8 +129,8 @@ static void smc911x_set_mac_csr(struct eth_device *edev, u8 reg, u32 data)
 
 	smc911x_mac_wait_busy(priv);
 
-	writel(data, priv->base + MAC_CSR_DATA);
-	writel(MAC_CSR_CMD_CSR_BUSY | reg, priv->base + MAC_CSR_CMD);
+	smc911x_reg_write(priv, MAC_CSR_DATA, data);
+	smc911x_reg_write(priv, MAC_CSR_CMD, MAC_CSR_CMD_CSR_BUSY | reg);
 
 	smc911x_mac_wait_busy(priv);
 }
@@ -179,10 +204,10 @@ static int smc911x_phy_reset(struct eth_device *edev)
 	struct smc911x_priv *priv = edev->priv;
 	u32 reg;
 
-	reg = readl(priv->base + PMT_CTRL);
+	reg = smc911x_reg_read(priv, PMT_CTRL);
 	reg &= 0xfcf;
 	reg |= PMT_CTRL_PHY_RST;
-	writel(reg, priv->base + PMT_CTRL);
+	smc911x_reg_write(priv, PMT_CTRL, reg);
 
 	mdelay(100);
 
@@ -195,13 +220,13 @@ static void smc911x_reset(struct eth_device *edev)
 	uint64_t start;
 
 	/* Take out of PM setting first */
-	if (readl(priv->base + PMT_CTRL) & PMT_CTRL_READY) {
+	if (smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) {
 		/* Write to the bytetest will take out of powerdown */
-		writel(0, priv->base + BYTE_TEST);
+		smc911x_reg_write(priv, BYTE_TEST, 0);
 
 		start = get_time_ns();
 		while(1) {
-			if ((readl(priv->base + PMT_CTRL) & PMT_CTRL_READY))
+			if ((smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY))
 				break;
 			if (is_timeout(start, 100 * USECOND)) {
 				dev_err(&edev->dev,
@@ -212,13 +237,13 @@ static void smc911x_reset(struct eth_device *edev)
 	}
 
 	/* Disable interrupts */
-	writel(0, priv->base + INT_EN);
+	smc911x_reg_write(priv, INT_EN, 0);
 
-	writel(HW_CFG_SRST, priv->base + HW_CFG);
+	smc911x_reg_write(priv, HW_CFG, HW_CFG_SRST);
 
 	start = get_time_ns();
 	while(1) {
-		if (!(readl(priv->base + E2P_CMD) & E2P_CMD_EPC_BUSY))
+		if (!(smc911x_reg_read(priv, E2P_CMD) & E2P_CMD_EPC_BUSY))
 			break;
 		if (is_timeout(start, 10 * MSECOND)) {
 			dev_err(&edev->dev, "reset timeout\n");
@@ -229,10 +254,10 @@ static void smc911x_reset(struct eth_device *edev)
 	/* Reset the FIFO level and flow control settings */
 	smc911x_set_mac_csr(edev, FLOW, FLOW_FCPT | FLOW_FCEN);
 
-	writel(0x0050287F, priv->base + AFC_CFG);
+	smc911x_reg_write(priv, AFC_CFG, 0x0050287F);
 
 	/* Set to LED outputs */
-	writel(0x70070000, priv->base + GPIO_CFG);
+	smc911x_reg_write(priv, GPIO_CFG, 0x70070000);
 }
 
 static void smc911x_enable(struct eth_device *edev)
@@ -240,14 +265,14 @@ static void smc911x_enable(struct eth_device *edev)
 	struct smc911x_priv *priv = edev->priv;
 
 	/* Enable TX */
-	writel(8 << 16 | HW_CFG_SF, priv->base + HW_CFG);
+	smc911x_reg_write(priv, HW_CFG, 8 << 16 | HW_CFG_SF);
 
-	writel(GPT_CFG_TIMER_EN | 10000, priv->base + GPT_CFG);
+	smc911x_reg_write(priv, GPT_CFG, GPT_CFG_TIMER_EN | 10000);
 
-	writel(TX_CFG_TX_ON, priv->base + TX_CFG);
+	smc911x_reg_write(priv, TX_CFG, TX_CFG_TX_ON);
 
 	/* no padding to start of packets */
-	writel(RX_CFG_RX_DUMP, priv->base + RX_CFG);
+	smc911x_reg_write(priv, RX_CFG, RX_CFG_RX_DUMP);
 }
 
 static int smc911x_eth_open(struct eth_device *edev)
@@ -270,19 +295,19 @@ static int smc911x_eth_send(struct eth_device *edev, void *packet, int length)
 	u32 status;
 	uint64_t start;
 
-	writel(TX_CMD_A_INT_FIRST_SEG | TX_CMD_A_INT_LAST_SEG | length,
-			priv->base + TX_DATA_FIFO);
-	writel(length, priv->base + TX_DATA_FIFO);
+	smc911x_reg_write(priv, TX_DATA_FIFO,
+		  TX_CMD_A_INT_FIRST_SEG | TX_CMD_A_INT_LAST_SEG | length);
+	smc911x_reg_write(priv, TX_DATA_FIFO, length);
 
 	tmplen = (length + 3) / 4;
 
 	while(tmplen--)
-		writel(*data++, priv->base + TX_DATA_FIFO);
+		smc911x_reg_write(priv, TX_DATA_FIFO, *data++);
 
 	/* wait for transmission */
 	start = get_time_ns();
 	while (1) {
-		if ((readl(priv->base + TX_FIFO_INF) &
+		if ((smc911x_reg_read(priv, TX_FIFO_INF) &
 					TX_FIFO_INF_TSUSED) >> 16)
 			break;
 		if (is_timeout(start, 100 * MSECOND)) {
@@ -294,7 +319,7 @@ static int smc911x_eth_send(struct eth_device *edev, void *packet, int length)
 	/* get status. Ignore 'no carrier' error, it has no meaning for
 	 * full duplex operation
 	 */
-	status = readl(priv->base + TX_STATUS_FIFO) & (TX_STS_LOC |
+	status = smc911x_reg_read(priv, TX_STATUS_FIFO) & (TX_STS_LOC |
 		TX_STS_LATE_COLL | TX_STS_MANY_COLL | TX_STS_MANY_DEFER |
 		TX_STS_UNDERRUN);
 
@@ -316,7 +341,7 @@ static void smc911x_eth_halt(struct eth_device *edev)
 	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
 
 	/* Disable TX */
-	writel(TX_CFG_STOP_TX, priv->base + TX_CFG);
+	smc911x_reg_write(priv, TX_CFG, TX_CFG_STOP_TX);
 
 //	smc911x_reset(edev);
 }
@@ -328,15 +353,15 @@ static int smc911x_eth_rx(struct eth_device *edev)
 	u32 pktlen, tmplen;
 	u32 status;
 
-	if((readl(priv->base + RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) {
-		status = readl(priv->base + RX_STATUS_FIFO);
+	if((smc911x_reg_read(priv, RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) {
+		status = smc911x_reg_read(priv, RX_STATUS_FIFO);
 		pktlen = (status & RX_STS_PKT_LEN) >> 16;
 
-		writel(0, priv->base + RX_CFG);
+		smc911x_reg_write(priv, RX_CFG, 0);
 
 		tmplen = (pktlen + 2 + 3) / 4;
 		while(tmplen--)
-			*data++ = readl(priv->base + RX_DATA_FIFO);
+			*data++ = smc911x_reg_read(priv, RX_DATA_FIFO);
 
 		if(status & RX_STS_ES)
 			dev_err(&edev->dev, "dropped bad packet. Status: 0x%08x\n",
@@ -366,18 +391,20 @@ static int smc911x_probe(struct device_d *dev)
 	struct smc911x_priv *priv;
 	uint32_t val;
 	int i;
-	void __iomem *base;
 
-	base = dev_request_mem_region(dev, 0);
+	priv = xzalloc(sizeof(*priv));
+	priv->base = dev_request_mem_region(dev, 0);
+	priv->reg_read = __smc911x_reg_read;
+	priv->reg_write = __smc911x_reg_write;
 
-	val = readl(base + BYTE_TEST);
+	val = smc911x_reg_read(priv, BYTE_TEST);
 	if(val != 0x87654321) {
 		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
-			base, val);
+			priv->base, val);
 		return -ENODEV;
 	}
 
-	val = readl(base + ID_REV) >> 16;
+	val = smc911x_reg_read(priv, ID_REV) >> 16;
 	for(i = 0; chip_ids[i].id != 0; i++) {
 		if (chip_ids[i].id == val) break;
 	}
@@ -388,7 +415,6 @@ static int smc911x_probe(struct device_d *dev)
 
 	dev_info(dev, "detected %s controller\n", chip_ids[i].name);
 
-	priv = xzalloc(sizeof(*priv));
 	edev = &priv->edev;
 	edev->priv = priv;
 
@@ -407,7 +433,6 @@ static int smc911x_probe(struct device_d *dev)
 	priv->miidev.flags = 0;
 	priv->miidev.edev = edev;
 	priv->miidev.parent = dev;
-	priv->base = base;
 
 	smc911x_reset(edev);
 	smc911x_phy_reset(edev);
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 2/7] smc911x: introduce read/write ops
  2012-08-14 17:32 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
@ 2012-08-14 17:32   ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-08-14 17:32 UTC (permalink / raw)
  To: barebox

This will allow to replace them depending on the platform data.
So we can specify shift and reg io witdh (16bit/32bit)

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 drivers/net/smc911x.c |  101 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 63 insertions(+), 38 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 9c488c7..2583235 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -46,6 +46,9 @@ struct smc911x_priv {
 	struct eth_device edev;
 	struct mii_device miidev;
 	void __iomem *base;
+
+	u32 (*reg_read)(struct smc911x_priv *priv, u32 reg);
+	void (*reg_write)(struct smc911x_priv *priv, u32 reg, u32 val);
 };
 
 struct chip_id {
@@ -68,12 +71,34 @@ static const struct chip_id chip_ids[] =  {
 
 #define DRIVERNAME "smc911x"
 
+static inline u32 smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+{
+	return priv->reg_read(priv, reg);
+}
+
+static inline u32 __smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+{
+	return readl(priv->base + reg);
+}
+
+static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+					u32 val)
+{
+	priv->reg_write(priv, reg, val);
+}
+
+static inline void __smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+					u32 val)
+{
+	writel(val, priv->base + reg);
+}
+
 static int smc911x_mac_wait_busy(struct smc911x_priv *priv)
 {
 	uint64_t start = get_time_ns();
 
 	while (!is_timeout(start, MSECOND)) {
-		if (!(readl(priv->base + MAC_CSR_CMD) & MAC_CSR_CMD_CSR_BUSY))
+		if (!(smc911x_reg_read(priv, MAC_CSR_CMD) & MAC_CSR_CMD_CSR_BUSY))
 			return 0;
 	}
 
@@ -88,12 +113,12 @@ static u32 smc911x_get_mac_csr(struct eth_device *edev, u8 reg)
 
 	smc911x_mac_wait_busy(priv);
 
-	writel(MAC_CSR_CMD_CSR_BUSY | MAC_CSR_CMD_R_NOT_W | reg,
-			priv->base + MAC_CSR_CMD);
+	smc911x_reg_write(priv, MAC_CSR_CMD, MAC_CSR_CMD_CSR_BUSY |
+			  MAC_CSR_CMD_R_NOT_W | reg);
 
 	smc911x_mac_wait_busy(priv);
 
-	val = readl(priv->base + MAC_CSR_DATA);
+	val = smc911x_reg_read(priv, MAC_CSR_DATA);
 
 	return val;
 }
@@ -104,8 +129,8 @@ static void smc911x_set_mac_csr(struct eth_device *edev, u8 reg, u32 data)
 
 	smc911x_mac_wait_busy(priv);
 
-	writel(data, priv->base + MAC_CSR_DATA);
-	writel(MAC_CSR_CMD_CSR_BUSY | reg, priv->base + MAC_CSR_CMD);
+	smc911x_reg_write(priv, MAC_CSR_DATA, data);
+	smc911x_reg_write(priv, MAC_CSR_CMD, MAC_CSR_CMD_CSR_BUSY | reg);
 
 	smc911x_mac_wait_busy(priv);
 }
@@ -179,10 +204,10 @@ static int smc911x_phy_reset(struct eth_device *edev)
 	struct smc911x_priv *priv = edev->priv;
 	u32 reg;
 
-	reg = readl(priv->base + PMT_CTRL);
+	reg = smc911x_reg_read(priv, PMT_CTRL);
 	reg &= 0xfcf;
 	reg |= PMT_CTRL_PHY_RST;
-	writel(reg, priv->base + PMT_CTRL);
+	smc911x_reg_write(priv, PMT_CTRL, reg);
 
 	mdelay(100);
 
@@ -195,13 +220,13 @@ static void smc911x_reset(struct eth_device *edev)
 	uint64_t start;
 
 	/* Take out of PM setting first */
-	if (readl(priv->base + PMT_CTRL) & PMT_CTRL_READY) {
+	if (smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY) {
 		/* Write to the bytetest will take out of powerdown */
-		writel(0, priv->base + BYTE_TEST);
+		smc911x_reg_write(priv, BYTE_TEST, 0);
 
 		start = get_time_ns();
 		while(1) {
-			if ((readl(priv->base + PMT_CTRL) & PMT_CTRL_READY))
+			if ((smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY))
 				break;
 			if (is_timeout(start, 100 * USECOND)) {
 				dev_err(&edev->dev,
@@ -212,13 +237,13 @@ static void smc911x_reset(struct eth_device *edev)
 	}
 
 	/* Disable interrupts */
-	writel(0, priv->base + INT_EN);
+	smc911x_reg_write(priv, INT_EN, 0);
 
-	writel(HW_CFG_SRST, priv->base + HW_CFG);
+	smc911x_reg_write(priv, HW_CFG, HW_CFG_SRST);
 
 	start = get_time_ns();
 	while(1) {
-		if (!(readl(priv->base + E2P_CMD) & E2P_CMD_EPC_BUSY))
+		if (!(smc911x_reg_read(priv, E2P_CMD) & E2P_CMD_EPC_BUSY))
 			break;
 		if (is_timeout(start, 10 * MSECOND)) {
 			dev_err(&edev->dev, "reset timeout\n");
@@ -229,10 +254,10 @@ static void smc911x_reset(struct eth_device *edev)
 	/* Reset the FIFO level and flow control settings */
 	smc911x_set_mac_csr(edev, FLOW, FLOW_FCPT | FLOW_FCEN);
 
-	writel(0x0050287F, priv->base + AFC_CFG);
+	smc911x_reg_write(priv, AFC_CFG, 0x0050287F);
 
 	/* Set to LED outputs */
-	writel(0x70070000, priv->base + GPIO_CFG);
+	smc911x_reg_write(priv, GPIO_CFG, 0x70070000);
 }
 
 static void smc911x_enable(struct eth_device *edev)
@@ -240,14 +265,14 @@ static void smc911x_enable(struct eth_device *edev)
 	struct smc911x_priv *priv = edev->priv;
 
 	/* Enable TX */
-	writel(8 << 16 | HW_CFG_SF, priv->base + HW_CFG);
+	smc911x_reg_write(priv, HW_CFG, 8 << 16 | HW_CFG_SF);
 
-	writel(GPT_CFG_TIMER_EN | 10000, priv->base + GPT_CFG);
+	smc911x_reg_write(priv, GPT_CFG, GPT_CFG_TIMER_EN | 10000);
 
-	writel(TX_CFG_TX_ON, priv->base + TX_CFG);
+	smc911x_reg_write(priv, TX_CFG, TX_CFG_TX_ON);
 
 	/* no padding to start of packets */
-	writel(RX_CFG_RX_DUMP, priv->base + RX_CFG);
+	smc911x_reg_write(priv, RX_CFG, RX_CFG_RX_DUMP);
 }
 
 static int smc911x_eth_open(struct eth_device *edev)
@@ -270,19 +295,19 @@ static int smc911x_eth_send(struct eth_device *edev, void *packet, int length)
 	u32 status;
 	uint64_t start;
 
-	writel(TX_CMD_A_INT_FIRST_SEG | TX_CMD_A_INT_LAST_SEG | length,
-			priv->base + TX_DATA_FIFO);
-	writel(length, priv->base + TX_DATA_FIFO);
+	smc911x_reg_write(priv, TX_DATA_FIFO,
+		  TX_CMD_A_INT_FIRST_SEG | TX_CMD_A_INT_LAST_SEG | length);
+	smc911x_reg_write(priv, TX_DATA_FIFO, length);
 
 	tmplen = (length + 3) / 4;
 
 	while(tmplen--)
-		writel(*data++, priv->base + TX_DATA_FIFO);
+		smc911x_reg_write(priv, TX_DATA_FIFO, *data++);
 
 	/* wait for transmission */
 	start = get_time_ns();
 	while (1) {
-		if ((readl(priv->base + TX_FIFO_INF) &
+		if ((smc911x_reg_read(priv, TX_FIFO_INF) &
 					TX_FIFO_INF_TSUSED) >> 16)
 			break;
 		if (is_timeout(start, 100 * MSECOND)) {
@@ -294,7 +319,7 @@ static int smc911x_eth_send(struct eth_device *edev, void *packet, int length)
 	/* get status. Ignore 'no carrier' error, it has no meaning for
 	 * full duplex operation
 	 */
-	status = readl(priv->base + TX_STATUS_FIFO) & (TX_STS_LOC |
+	status = smc911x_reg_read(priv, TX_STATUS_FIFO) & (TX_STS_LOC |
 		TX_STS_LATE_COLL | TX_STS_MANY_COLL | TX_STS_MANY_DEFER |
 		TX_STS_UNDERRUN);
 
@@ -316,7 +341,7 @@ static void smc911x_eth_halt(struct eth_device *edev)
 	struct smc911x_priv *priv = (struct smc911x_priv *)edev->priv;
 
 	/* Disable TX */
-	writel(TX_CFG_STOP_TX, priv->base + TX_CFG);
+	smc911x_reg_write(priv, TX_CFG, TX_CFG_STOP_TX);
 
 //	smc911x_reset(edev);
 }
@@ -328,15 +353,15 @@ static int smc911x_eth_rx(struct eth_device *edev)
 	u32 pktlen, tmplen;
 	u32 status;
 
-	if((readl(priv->base + RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) {
-		status = readl(priv->base + RX_STATUS_FIFO);
+	if((smc911x_reg_read(priv, RX_FIFO_INF) & RX_FIFO_INF_RXSUSED) >> 16) {
+		status = smc911x_reg_read(priv, RX_STATUS_FIFO);
 		pktlen = (status & RX_STS_PKT_LEN) >> 16;
 
-		writel(0, priv->base + RX_CFG);
+		smc911x_reg_write(priv, RX_CFG, 0);
 
 		tmplen = (pktlen + 2 + 3) / 4;
 		while(tmplen--)
-			*data++ = readl(priv->base + RX_DATA_FIFO);
+			*data++ = smc911x_reg_read(priv, RX_DATA_FIFO);
 
 		if(status & RX_STS_ES)
 			dev_err(&edev->dev, "dropped bad packet. Status: 0x%08x\n",
@@ -366,18 +391,20 @@ static int smc911x_probe(struct device_d *dev)
 	struct smc911x_priv *priv;
 	uint32_t val;
 	int i;
-	void __iomem *base;
 
-	base = dev_request_mem_region(dev, 0);
+	priv = xzalloc(sizeof(*priv));
+	priv->base = dev_request_mem_region(dev, 0);
+	priv->reg_read = __smc911x_reg_read;
+	priv->reg_write = __smc911x_reg_write;
 
-	val = readl(base + BYTE_TEST);
+	val = smc911x_reg_read(priv, BYTE_TEST);
 	if(val != 0x87654321) {
 		dev_err(dev, "no smc911x found on 0x%p (byte_test=0x%08x)\n",
-			base, val);
+			priv->base, val);
 		return -ENODEV;
 	}
 
-	val = readl(base + ID_REV) >> 16;
+	val = smc911x_reg_read(priv, ID_REV) >> 16;
 	for(i = 0; chip_ids[i].id != 0; i++) {
 		if (chip_ids[i].id == val) break;
 	}
@@ -388,7 +415,6 @@ static int smc911x_probe(struct device_d *dev)
 
 	dev_info(dev, "detected %s controller\n", chip_ids[i].name);
 
-	priv = xzalloc(sizeof(*priv));
 	edev = &priv->edev;
 	edev->priv = priv;
 
@@ -407,7 +433,6 @@ static int smc911x_probe(struct device_d *dev)
 	priv->miidev.flags = 0;
 	priv->miidev.edev = edev;
 	priv->miidev.parent = dev;
-	priv->base = base;
 
 	smc911x_reset(edev);
 	smc911x_phy_reset(edev);
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2012-09-01  8:52 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-29  4:27 [PATCH 0/7 2] smsc911x: runtime configuration improvement Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  5:06   ` [PATCH 2/7] smc911x: introduce read/write ops Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  5:06   ` [PATCH 3/7] smc911x: add 16bit bus width support Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  5:06   ` [PATCH 4/7] smc911x: add support to pass the shift via platform data Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  5:06   ` [PATCH 5/7] smc911x: improve detection handle Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  6:52     ` Sascha Hauer
2012-08-29  8:36       ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  9:04         ` Sascha Hauer
2012-08-29  5:06   ` [PATCH 6/7] smc911x: update chip detection Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  5:06   ` [PATCH 7/7] smm911x: check if the device is ready before using it Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  6:53     ` Sascha Hauer
2012-08-29  8:35       ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-29  9:04         ` Sascha Hauer
2012-08-29 10:07     ` Christian Hemp
  -- strict thread matches above, loose matches on Subject: below --
2012-09-01  8:47 [PATCH 0/7 v3] smsc911x: runtime configuration improvement Jean-Christophe PLAGNIOL-VILLARD
2012-09-01  8:52 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
2012-09-01  8:52   ` [PATCH 2/7] smc911x: introduce read/write ops Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:25 [PATCH 0/7] smsc911x: runtime configuration improvement Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32   ` [PATCH 2/7] smc911x: introduce read/write ops Jean-Christophe PLAGNIOL-VILLARD

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox