* [U-Boot] [PATCH 0/4] SPEAr : Network support and misc changes
@ 2010-03-23 8:30 Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Vipin KUMAR
0 siblings, 1 reply; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-23 8:30 UTC (permalink / raw)
To: u-boot
These patches add the following changes
1. A bugfix (SMI write, erase timeout increased)
2. read/write of eth macid placed in CONFIG_CMD_NET
3. Network driver support added
4. macb driver configured for spear310 and spear320
Vipin Kumar (4):
SPEAr : SMI erase and write timeouts increased
SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET
SPEAr : Network driver support added
SPEAr : macb driver support added for spear310 and spear320
board/spear/common/spr_misc.c | 22 ++-
board/spear/spear300/spear300.c | 6 +
board/spear/spear310/spear310.c | 13 +
board/spear/spear320/spear320.c | 10 +
board/spear/spear600/spear600.c | 6 +
drivers/mtd/spr_smi.c | 8 +-
drivers/net/Makefile | 1 +
drivers/net/spr_eth_syn.c | 471 ++++++++++++++++++++++++++++++
include/asm-arm/arch-spear/clk.h | 27 ++
include/asm-arm/arch-spear/hardware.h | 2 +
include/asm-arm/arch-spear/spr_eth_syn.h | 262 +++++++++++++++++
include/asm-arm/arch-spear/spr_smi.h | 6 +-
include/configs/spear-common.h | 24 ++-
include/configs/spear3xx.h | 24 ++
include/netdev.h | 1 +
15 files changed, 870 insertions(+), 13 deletions(-)
create mode 100755 drivers/net/spr_eth_syn.c
create mode 100644 include/asm-arm/arch-spear/clk.h
create mode 100644 include/asm-arm/arch-spear/spr_eth_syn.h
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased
2010-03-23 8:30 [U-Boot] [PATCH 0/4] SPEAr : Network support and misc changes Vipin KUMAR
@ 2010-03-23 8:30 ` Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Vipin KUMAR
2010-03-28 21:51 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Tom
0 siblings, 2 replies; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-23 8:30 UTC (permalink / raw)
To: u-boot
SMI driver fails because of low timeout values. Increasing the erase and write
timeouts to 3 seconds
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
---
drivers/mtd/spr_smi.c | 8 ++++----
include/asm-arm/arch-spear/spr_smi.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/spr_smi.c b/drivers/mtd/spr_smi.c
index 9a70a19..189ee6d 100755
--- a/drivers/mtd/spr_smi.c
+++ b/drivers/mtd/spr_smi.c
@@ -60,11 +60,11 @@ static struct flash_dev flash_ids[] = {
*/
static void smi_wait_xfer_finish(int timeout)
{
- while (timeout--) {
+ do {
if (readl(&smicntl->smi_sr) & TFF)
break;
udelay(1000);
- }
+ } while (timeout--);
}
/*
@@ -215,11 +215,11 @@ static int smi_write_enable(int bank)
/* Restore the CTRL REG1 state */
writel(ctrlreg1, &smicntl->smi_cr1);
- while (timeout--) {
+ do {
if (smi_read_sr(bank) & (1 << (bank + WM_SHIFT)))
break;
udelay(1000);
- }
+ } while (timeout--);
if (timeout)
return 0;
diff --git a/include/asm-arm/arch-spear/spr_smi.h b/include/asm-arm/arch-spear/spr_smi.h
index 06df745..e2e5e8f 100755
--- a/include/asm-arm/arch-spear/spr_smi.h
+++ b/include/asm-arm/arch-spear/spr_smi.h
@@ -108,8 +108,8 @@ struct flash_dev {
ushort sector_count;
};
-#define SFLASH_PAGE_SIZE 0x100 /* flash page size */
-#define XFER_FINISH_TOUT 2 /* xfer finish timeout */
-#define WMODE_TOUT 2 /* write enable timeout */
+#define SFLASH_PAGE_SIZE 0x100 /* flash page size */
+#define XFER_FINISH_TOUT (3 * CONFIG_SYS_HZ)
+#define WMODE_TOUT (3 * CONFIG_SYS_HZ)
#endif
--
1.6.0.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET
2010-03-23 8:30 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Vipin KUMAR
@ 2010-03-23 8:30 ` Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Vipin KUMAR
2010-03-28 22:38 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Tom
2010-03-28 21:51 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Tom
1 sibling, 2 replies; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-23 8:30 UTC (permalink / raw)
To: u-boot
ethaddr can be optionally read from i2c memory. So, chip_config command supports
reading/writing hw mac id into i2c memory. Placing this code within
CONFIG_CMD_NET as this would only be needed when network interface is configured
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
---
board/spear/common/spr_misc.c | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
index e356912..935b2fa 100755
--- a/board/spear/common/spr_misc.c
+++ b/board/spear/common/spr_misc.c
@@ -37,6 +37,9 @@
DECLARE_GLOBAL_DATA_PTR;
static struct chip_data chip_data;
+#if defined(CONFIG_CMD_NET)
+static int i2c_read_mac(uchar *);
+#endif
int dram_init(void)
{
@@ -166,6 +169,7 @@ int spear_board_init(ulong mach_type)
return 0;
}
+#if defined(CONFIG_CMD_NET)
static int i2c_read_mac(uchar *buffer)
{
u8 buf[2];
@@ -205,15 +209,20 @@ static int write_mac(uchar *mac)
puts("I2C EEPROM writing failed \n");
return -1;
}
+#endif
int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
void (*sram_setfreq) (unsigned int, unsigned int);
struct chip_data *chip = &chip_data;
- unsigned char mac[6];
- unsigned int reg, frequency;
+ unsigned int frequency;
+
+#if defined(CONFIG_CMD_NET)
+ unsigned int reg;
char *s, *e;
char i2c_mac[20];
+ unsigned char mac[6];
+#endif
if ((argc > 3) || (argc < 2)) {
cmd_usage(cmdtp);
@@ -244,6 +253,8 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
return 0;
+
+#if defined(CONFIG_CMD_NET)
} else if (!strcmp(argv[1], "ethaddr")) {
s = argv[2];
@@ -255,6 +266,7 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
write_mac(mac);
return 0;
+#endif
} else if (!strcmp(argv[1], "print")) {
if (chip->cpufreq == -1)
@@ -274,13 +286,14 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
else
printf("DDR Type = Not Known\n");
+#if defined(CONFIG_CMD_NET)
if (!i2c_read_mac(mac)) {
sprintf(i2c_mac, "%pM", mac);
printf("Ethaddr (from i2c mem) = %s\n", i2c_mac);
} else {
printf("Ethaddr (from i2c mem) = Not set\n");
}
-
+#endif
printf("Xloader Rev = %s\n", chip->version);
return 0;
@@ -293,4 +306,7 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(chip_config, 3, 1, do_chip_config,
"configure chip",
"chip_config cpufreq/ddrfreq frequency\n"
+#if defined(CONFIG_CMD_NET)
+ "chip_config ethaddr XX:XX:XX:XX:XX:XX"
+#endif
"chip_config print");
--
1.6.0.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/4] SPEAr : Network driver support added
2010-03-23 8:30 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Vipin KUMAR
@ 2010-03-23 8:30 ` Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 4/4] SPEAr : macb driver support added for spear310 and spear320 Vipin KUMAR
2010-03-23 17:39 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Ben Warren
2010-03-28 22:38 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Tom
1 sibling, 2 replies; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-23 8:30 UTC (permalink / raw)
To: u-boot
SPEAr SoCs support a synopsys network peripheral. This patch adds the support
for the same
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
---
board/spear/spear300/spear300.c | 6 +
board/spear/spear310/spear310.c | 6 +
board/spear/spear320/spear320.c | 6 +
board/spear/spear600/spear600.c | 6 +
drivers/net/Makefile | 1 +
drivers/net/spr_eth_syn.c | 471 ++++++++++++++++++++++++++++++
include/asm-arm/arch-spear/hardware.h | 2 +
include/asm-arm/arch-spear/spr_eth_syn.h | 262 +++++++++++++++++
include/configs/spear-common.h | 24 ++-
include/configs/spear3xx.h | 3 +
include/netdev.h | 1 +
11 files changed, 785 insertions(+), 3 deletions(-)
create mode 100755 drivers/net/spr_eth_syn.c
create mode 100644 include/asm-arm/arch-spear/spr_eth_syn.h
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index 60ee544..483fe0c 100755
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
@@ -23,6 +23,7 @@
#include <common.h>
#include <nand.h>
+#include <netdev.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
@@ -56,3 +57,8 @@ int board_nand_init(struct nand_chip *nand)
return -1;
}
+
+int board_eth_init(bd_t *bis)
+{
+ return spear_mii_initialize(0);
+}
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index 03dfe16..2c35a55 100755
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -24,6 +24,7 @@
#include <common.h>
#include <nand.h>
+#include <netdev.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
@@ -57,3 +58,8 @@ int board_nand_init(struct nand_chip *nand)
return -1;
}
+
+int board_eth_init(bd_t *bis)
+{
+ return spear_mii_initialize(0);
+}
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index 2ba2dbb..a804123 100755
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -24,6 +24,7 @@
#include <common.h>
#include <nand.h>
+#include <netdev.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
@@ -57,3 +58,8 @@ int board_nand_init(struct nand_chip *nand)
return -1;
}
+
+int board_eth_init(bd_t *bis)
+{
+ return spear_mii_initialize(0);
+}
diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index eef9a37..f2201a4 100755
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@@ -23,6 +23,7 @@
#include <common.h>
#include <nand.h>
+#include <netdev.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
@@ -51,3 +52,8 @@ int board_nand_init(struct nand_chip *nand)
return -1;
}
+
+int board_eth_init(bd_t *bis)
+{
+ return spear_mii_initialize(0);
+}
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1ec0ba1..b230874 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -68,6 +68,7 @@ COBJS-$(CONFIG_DRIVER_S3C4510_ETH) += s3c4510b_eth.o
COBJS-$(CONFIG_SH_ETHER) += sh_eth.o
COBJS-$(CONFIG_SMC91111) += smc91111.o
COBJS-$(CONFIG_SMC911X) += smc911x.o
+COBJS-$(CONFIG_SPEAR_ETHERNET) += spr_eth_syn.o
COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o
COBJS-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o
COBJS-$(CONFIG_TSEC_ENET) += tsec.o
diff --git a/drivers/net/spr_eth_syn.c b/drivers/net/spr_eth_syn.c
new file mode 100755
index 0000000..ff90572
--- /dev/null
+++ b/drivers/net/spr_eth_syn.c
@@ -0,0 +1,471 @@
+/*
+ * (C) Copyright 2009
+ * Vipin Kumar, ST Micoelectronics, vipin.kumar at st.com.
+ *
+ * (C) Copyright 2008
+ * Deepak Sikri, ST Micoelectronics, deepak.sikri at st.com.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <miiphy.h>
+#include <malloc.h>
+#include <asm/errno.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/spr_eth_syn.h>
+
+static struct eth_dma_regs *dma_p =
+ (struct eth_dma_regs *)CONFIG_SPEAR_ETHDMABASE;
+static struct eth_mac_regs *mac_p =
+ (struct eth_mac_regs *)CONFIG_SPEAR_ETHMACBASE;
+
+static struct eth_device *netdev;
+
+static struct dmamacdescr
+ tx_mac_descrtable[CONFIG_TX_DESCR_NUM] __attribute__ ((aligned(256)));
+static struct dmamacdescr
+ rx_mac_descrtable[CONFIG_RX_DESCR_NUM] __attribute__ ((aligned(256)));
+
+static u32 tx_currdescnum;
+static u32 rx_currdescnum;
+
+static char txbuffs[TX_TOTAL_BUFSIZE] __attribute__ ((aligned(2048)));
+static char rxbuffs[RX_TOTAL_BUFSIZE] __attribute__ ((aligned(2048)));
+
+static void xfer_enable(void)
+{
+ /*
+ * Start/Enable xfer at dma as well as mac level
+ */
+ writel(readl(&dma_p->opmode) | RXSTART, &dma_p->opmode);
+ writel(readl(&dma_p->opmode) | TXSTART, &dma_p->opmode);
+
+ writel(readl(&mac_p->conf) | RXENABLE, &mac_p->conf);
+ writel(readl(&mac_p->conf) | TXENABLE, &mac_p->conf);
+}
+
+static void tx_descs_init(u32 max_desc_num)
+{
+ u32 idx;
+ struct dmamacdescr *desc_p;
+
+ for (idx = 0; idx < max_desc_num; idx++) {
+
+ desc_p = &tx_mac_descrtable[idx];
+ desc_p->dmamac_addr = &txbuffs[idx * CONFIG_ETH_BUFSIZE];
+ desc_p->dmamac_next = &tx_mac_descrtable[idx + 1];
+
+#if defined(CONFIG_SPEAR_ALTDESC)
+ desc_p->txrx_status &= ~(DESC_TXSTS_TXINT | DESC_TXSTS_TXLAST |
+ DESC_TXSTS_TXFIRST | DESC_TXSTS_TXCRCDIS | \
+ DESC_TXSTS_TXCHECKINSCTRL | \
+ DESC_TXSTS_TXRINGEND | DESC_TXSTS_TXPADDIS);
+
+ desc_p->txrx_status |= DESC_TXSTS_TXCHAIN;
+ desc_p->dmamac_cntl = 0;
+ desc_p->txrx_status &= ~(DESC_TXSTS_MSK | DESC_TXSTS_OWNBYDMA);
+#else
+ desc_p->dmamac_cntl = DESC_TXCTRL_TXCHAIN;
+ desc_p->txrx_status = 0;
+#endif
+ }
+
+ /* Correcting the last pointer of the chain */
+ desc_p->dmamac_next = &tx_mac_descrtable[0];
+
+ writel((ulong)&tx_mac_descrtable[0], &dma_p->txdesclistaddr);
+}
+
+static void rx_descs_init(u32 max_desc_num)
+{
+ u32 idx;
+ struct dmamacdescr *desc_p;
+
+ for (idx = 0; idx < max_desc_num; idx++) {
+
+ desc_p = &rx_mac_descrtable[idx];
+ desc_p->dmamac_addr = &rxbuffs[idx * CONFIG_ETH_BUFSIZE];
+ desc_p->dmamac_next = &rx_mac_descrtable[idx + 1];
+
+ desc_p->dmamac_cntl =
+ (MAC_MAX_FRAME_SZ & DESC_RXCTRL_SIZE1MASK) | \
+ DESC_RXCTRL_RXCHAIN;
+
+ desc_p->txrx_status = DESC_RXSTS_OWNBYDMA;
+ }
+
+ /* Correcting the last pointer of the chain */
+ desc_p->dmamac_next = &rx_mac_descrtable[0];
+
+ writel((ulong)&rx_mac_descrtable[0], &dma_p->rxdesclistaddr);
+}
+
+static void descs_init(void)
+{
+ tx_descs_init(CONFIG_TX_DESCR_NUM);
+ rx_descs_init(CONFIG_RX_DESCR_NUM);
+}
+
+static int set_hwaddr(void)
+{
+ u8 mac_id[6];
+ u32 macid_lo, macid_hi;
+
+ if (eth_getenv_enetaddr("ethaddr", mac_id)) {
+ macid_lo = mac_id[0] + (mac_id[1] << 8) + \
+ (mac_id[2] << 16) + (mac_id[3] << 24);
+ macid_hi = mac_id[4] + (mac_id[5] << 8);
+
+ writel(macid_hi, &mac_p->macaddr0hi);
+ writel(macid_lo, &mac_p->macaddr0lo);
+
+ return 0;
+ }
+ return -1;
+}
+
+static void mac_reset(u32 timeout)
+{
+ writel(DMAMAC_SRST, &dma_p->busmode);
+ writel(MII_PORTSELECT, &mac_p->conf);
+
+ do {
+ if (!(readl(&dma_p->busmode) & DMAMAC_SRST))
+ break;
+ udelay(1000);
+ } while (timeout--);
+}
+
+static int spear_eth_init(struct eth_device *dev, bd_t *bis)
+{
+ struct spear_eth_dev *priv = dev->priv;
+ u32 conf;
+
+ /* Reset ethernet hardware */
+ mac_reset(CONFIG_MACRESET_TIMEOUT);
+
+ if (set_hwaddr() < 0)
+ return -1;
+
+ writel(FIXEDBURST | RXHIGHPRIO | BURST_16, &dma_p->busmode);
+
+ writel(FLUSHTXFIFO | readl(&dma_p->opmode), &dma_p->opmode);
+ writel(STOREFORWARD | TXSECONDFRAME, &dma_p->opmode);
+
+ conf = FRAMEBURSTENABLE | DISABLERXOWN;
+
+ if (priv->speed != SPEED_1000M)
+ conf |= MII_PORTSELECT;
+
+ if (priv->duplex == FULL_DUPLEX)
+ conf |= FULLDPLXMODE;
+
+ writel(conf, &mac_p->conf);
+
+ descs_init();
+ xfer_enable();
+
+ return 0;
+}
+
+static int spear_eth_send(struct eth_device *dev, volatile void *packet,
+ int length)
+{
+ struct dmamacdescr *desc_p = &tx_mac_descrtable[tx_currdescnum];
+
+ /* Check if the descriptor is owned by CPU */
+ if (desc_p->txrx_status & DESC_TXSTS_OWNBYDMA) {
+ printf("eth_send : CPU not owner of tx frame\n");
+ return -1;
+ }
+
+ memcpy((void *)desc_p->dmamac_addr, (void *)packet, length);
+
+#if defined(CONFIG_SPEAR_ALTDESC)
+ desc_p->txrx_status |= DESC_TXSTS_TXFIRST | DESC_TXSTS_TXLAST;
+ desc_p->dmamac_cntl |= (length << DESC_TXCTRL_SIZE1SHFT) & \
+ DESC_TXCTRL_SIZE1MASK;
+
+ desc_p->txrx_status &= ~(DESC_TXSTS_MSK);
+ desc_p->txrx_status |= DESC_TXSTS_OWNBYDMA;
+#else
+ desc_p->dmamac_cntl |= ((length << DESC_TXCTRL_SIZE1SHFT) & \
+ DESC_TXCTRL_SIZE1MASK) | DESC_TXCTRL_TXLAST | \
+ DESC_TXCTRL_TXFIRST;
+
+ desc_p->txrx_status = DESC_TXSTS_OWNBYDMA;
+#endif
+
+ /* Test the wrap-around condition. */
+ if (++tx_currdescnum >= CONFIG_TX_DESCR_NUM)
+ tx_currdescnum = 0;
+
+ /* Start the transmission */
+ writel(POLL_DATA, &dma_p->txpolldemand);
+
+ return 0;
+}
+
+static int spear_eth_recv(struct eth_device *dev)
+{
+ struct dmamacdescr *desc_p = &rx_mac_descrtable[rx_currdescnum];
+ u32 status = desc_p->txrx_status;
+ int length = 0;
+
+ /* Check if the owner is the CPU */
+ if (!(status & DESC_RXSTS_OWNBYDMA)) {
+
+ length = (status & DESC_RXSTS_FRMLENMSK) >> \
+ DESC_RXSTS_FRMLENSHFT;
+
+ NetReceive(desc_p->dmamac_addr, length);
+
+ /*
+ * Make the current descriptor valid again and go to
+ * the next one
+ */
+ desc_p->txrx_status |= DESC_RXSTS_OWNBYDMA;
+
+ /* Test the wrap-around condition. */
+ if (++rx_currdescnum >= CONFIG_RX_DESCR_NUM)
+ rx_currdescnum = 0;
+ }
+
+ return length;
+}
+
+static void spear_eth_halt(struct eth_device *dev)
+{
+ mac_reset(CONFIG_MACRESET_TIMEOUT);
+ tx_currdescnum = rx_currdescnum = 0;
+}
+
+static int eth_mdio_read(char *devname, u8 addr, u8 reg, u16 *val)
+{
+ u32 miiaddr;
+ u32 timeout = CONFIG_MDIO_TIMEOUT;
+
+ miiaddr = ((addr << MIIADDRSHIFT) & MII_ADDRMSK) | \
+ ((reg << MIIREGSHIFT) & MII_REGMSK);
+
+ writel(miiaddr | MII_CLKRANGE_150_250M | MII_BUSY, &mac_p->miiaddr);
+
+ do {
+ if (!(readl(&mac_p->miiaddr) & MII_BUSY))
+ break;
+ udelay(1000);
+ } while (timeout--);
+
+ *val = readl(&mac_p->miidata);
+
+ return 0;
+}
+
+static int eth_mdio_write(char *devname, u8 addr, u8 reg, u16 val)
+{
+ u32 miiaddr;
+ u32 timeout = CONFIG_MDIO_TIMEOUT;
+ u16 value;
+
+ writel(val, &mac_p->miidata);
+ miiaddr = ((addr << MIIADDRSHIFT) & MII_ADDRMSK) | \
+ ((reg << MIIREGSHIFT) & MII_REGMSK) | MII_WRITE;
+
+ writel(miiaddr | MII_CLKRANGE_150_250M | MII_BUSY, &mac_p->miiaddr);
+
+ do {
+ if (!(readl(&mac_p->miiaddr) & MII_BUSY))
+ break;
+ udelay(1000);
+ } while (timeout--);
+
+ /* Needed as a fix for ST-Phy */
+ eth_mdio_read(devname, addr, reg, &value);
+
+ return 0;
+}
+
+static u8 find_phy(struct eth_device *dev)
+{
+ u8 phy_addr = 0;
+ u16 ctrl, oldctrl;
+
+ do {
+ eth_mdio_read(dev->name, phy_addr, PHY_BMCR, &ctrl);
+ oldctrl = ctrl & PHY_BMCR_AUTON;
+
+ ctrl ^= PHY_BMCR_AUTON;
+ eth_mdio_write(dev->name, phy_addr, PHY_BMCR, ctrl);
+ eth_mdio_read(dev->name, phy_addr, PHY_BMCR, &ctrl);
+ ctrl &= PHY_BMCR_AUTON;
+
+ if (ctrl == oldctrl) {
+ phy_addr++;
+ } else {
+ ctrl ^= PHY_BMCR_AUTON;
+ eth_mdio_write(dev->name, phy_addr, PHY_BMCR, ctrl);
+ break;
+ }
+ } while (phy_addr < 32);
+
+ return phy_addr;
+}
+
+static void spear_reset_phy(struct eth_device *dev)
+{
+ struct spear_eth_dev *priv = dev->priv;
+ u16 ctrl;
+ u32 timeout = CONFIG_PHYRESET_TIMEOUT;
+ u32 phy_addr = priv->address;
+
+ eth_mdio_write(dev->name, phy_addr, PHY_BMCR, PHY_BMCR_RESET);
+ do {
+ eth_mdio_read(dev->name, phy_addr, PHY_BMCR, &ctrl);
+ if (!(ctrl & PHY_BMCR_RESET))
+ break;
+ udelay(1000);
+ } while (timeout--);
+
+ udelay(CONFIG_PHY_RESET_DELAY);
+}
+
+void reset_phy(void)
+{
+ spear_reset_phy(netdev);
+}
+
+static void configure_phy(struct eth_device *dev)
+{
+ struct spear_eth_dev *priv = dev->priv;
+ char *an, *sp, *du;
+ u8 phy_addr;
+ u16 bmcr, bmsr, ctrl;
+ u32 timeout;
+ u16 anlpar, btsr;
+
+ priv->address = find_phy(dev);
+ phy_addr = priv->address;
+
+ spear_reset_phy(netdev);
+
+ an = getenv("ethautoneg");
+ if ((an != NULL) && strcmp(an, "n")) {
+ bmcr = PHY_BMCR_AUTON | PHY_BMCR_RST_NEG | PHY_BMCR_100MB | \
+ PHY_BMCR_DPLX | PHY_BMCR_1000_MBPS;
+ } else {
+ bmcr = PHY_BMCR_100MB | PHY_BMCR_DPLX;
+
+ sp = getenv("ethspeed");
+ if ((sp != NULL) && (!strcmp(sp, "10M")))
+ bmcr &= ~PHY_BMCR_100MB;
+
+ du = getenv("ethduplex");
+ if ((du != NULL) && (!strcmp(du, "half")))
+ bmcr &= ~PHY_BMCR_DPLX;
+ }
+
+ eth_mdio_write(dev->name, phy_addr, PHY_BMCR, bmcr);
+
+ /* Read the phy status register and populate priv structure */
+ if ((an != NULL) && strcmp(an, "n")) {
+
+ timeout = CONFIG_AUTONEG_TIMEOUT;
+ do {
+ eth_mdio_read(dev->name, phy_addr, PHY_BMSR, &bmsr);
+ if (bmsr & PHY_BMSR_AUTN_COMP)
+ break;
+ udelay(1000);
+ } while (timeout--);
+
+ eth_mdio_read(dev->name, phy_addr, PHY_ANLPAR, &anlpar);
+ eth_mdio_read(dev->name, phy_addr, PHY_1000BTSR, &btsr);
+
+ if (btsr & (PHY_1000BTSR_1000FD | PHY_1000BTSR_1000HD)) {
+ priv->speed = SPEED_1000M;
+ if (btsr & PHY_1000BTSR_1000FD)
+ priv->duplex = FULL_DUPLEX;
+ else
+ priv->duplex = HALF_DUPLEX;
+ } else {
+ if (anlpar & PHY_ANLPAR_100)
+ priv->speed = SPEED_100M;
+ else
+ priv->speed = SPEED_10M;
+
+ if (anlpar & (PHY_ANLPAR_10FD | PHY_ANLPAR_TXFD))
+ priv->duplex = FULL_DUPLEX;
+ else
+ priv->duplex = HALF_DUPLEX;
+ }
+ } else {
+ eth_mdio_read(dev->name, phy_addr, PHY_BMCR, &ctrl);
+
+ if (ctrl & PHY_BMCR_DPLX)
+ priv->duplex = FULL_DUPLEX;
+ else
+ priv->duplex = HALF_DUPLEX;
+
+ if (ctrl & PHY_BMCR_1000_MBPS)
+ priv->speed = SPEED_1000M;
+ else if (ctrl & PHY_BMCR_100_MBPS)
+ priv->speed = SPEED_100M;
+ else
+ priv->speed = SPEED_10M;
+ }
+}
+
+int spear_mii_initialize(u32 id)
+{
+ struct spear_eth_dev *priv;
+
+ netdev = (struct eth_device *) malloc(sizeof(struct eth_device));
+ if (!netdev)
+ return -ENOMEM;
+
+ priv = (struct spear_eth_dev *) malloc(sizeof(struct spear_eth_dev));
+ if (!priv) {
+ free(netdev);
+ return -ENOMEM;
+ }
+
+ memset(netdev, 0, sizeof(struct eth_device));
+ memset(priv, 0, sizeof(struct spear_eth_dev));
+
+ sprintf(netdev->name, "mii%d", id);
+ priv->dev = netdev;
+ netdev->iobase = 0;
+ netdev->priv = priv;
+
+ mac_reset(CONFIG_MACRESET_TIMEOUT);
+ configure_phy(netdev);
+
+ netdev->init = spear_eth_init;
+ netdev->send = spear_eth_send;
+ netdev->recv = spear_eth_recv;
+ netdev->halt = spear_eth_halt;
+
+ eth_register(netdev);
+
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
+ miiphy_register(netdev->name, eth_mdio_read, eth_mdio_write);
+#endif
+ return 0;
+}
diff --git a/include/asm-arm/arch-spear/hardware.h b/include/asm-arm/arch-spear/hardware.h
index 818f36c..7133b3c 100644
--- a/include/asm-arm/arch-spear/hardware.h
+++ b/include/asm-arm/arch-spear/hardware.h
@@ -31,6 +31,8 @@
#define CONFIG_SPEAR_SYSCNTLBASE (0xFCA00000)
#define CONFIG_SPEAR_TIMERBASE (0xFC800000)
#define CONFIG_SPEAR_MISCBASE (0xFCA80000)
+#define CONFIG_SPEAR_ETHMACBASE (0xE0800000)
+#define CONFIG_SPEAR_ETHDMABASE (0xE0801000)
#define CONFIG_SYS_NAND_CLE (1 << 16)
#define CONFIG_SYS_NAND_ALE (1 << 17)
diff --git a/include/asm-arm/arch-spear/spr_eth_syn.h b/include/asm-arm/arch-spear/spr_eth_syn.h
new file mode 100644
index 0000000..3a745ef
--- /dev/null
+++ b/include/asm-arm/arch-spear/spr_eth_syn.h
@@ -0,0 +1,262 @@
+/*
+ * (C) Copyright 2009
+ * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _SPR_ETH_SYN_H
+#define _SPR_ETH_SYN_H
+
+#define CONFIG_TX_DESCR_NUM 16
+#define CONFIG_RX_DESCR_NUM 16
+#define CONFIG_ETH_BUFSIZE 2048
+#define TX_TOTAL_BUFSIZE (CONFIG_ETH_BUFSIZE * CONFIG_TX_DESCR_NUM)
+#define RX_TOTAL_BUFSIZE (CONFIG_ETH_BUFSIZE * CONFIG_RX_DESCR_NUM)
+
+#define CONFIG_MACRESET_TIMEOUT (3 * CONFIG_SYS_HZ)
+#define CONFIG_MDIO_TIMEOUT (3 * CONFIG_SYS_HZ)
+#define CONFIG_PHYRESET_TIMEOUT (3 * CONFIG_SYS_HZ)
+#define CONFIG_AUTONEG_TIMEOUT (5 * CONFIG_SYS_HZ)
+
+struct eth_mac_regs {
+ u32 conf; /* 0x00 */
+ u32 framefilt; /* 0x04 */
+ u32 hashtablehigh; /* 0x08 */
+ u32 hashtablelow; /* 0x0c */
+ u32 miiaddr; /* 0x10 */
+ u32 miidata; /* 0x14 */
+ u32 flowcontrol; /* 0x18 */
+ u32 vlantag; /* 0x1c */
+ u32 version; /* 0x20 */
+ u8 reserved_1[4];
+ u32 intreg; /* 0x28 */
+ u32 intmask; /* 0x2c */
+ u8 reserved_2[0x40 - 0x30];
+ u32 macaddr0hi; /* 0x30 */
+ u32 macaddr0lo; /* 0x34 */
+};
+
+/* MAC configuration register definitions */
+#define FRAMEBURSTENABLE (1 << 21)
+#define MII_PORTSELECT (1 << 15)
+#define DISABLERXOWN (1 << 13)
+#define FULLDPLXMODE (1 << 11)
+#define RXENABLE (1 << 2)
+#define TXENABLE (1 << 3)
+
+/* MII address register definitions */
+#define MII_BUSY (1 << 0)
+#define MII_WRITE (1 << 1)
+#define MII_CLKRANGE_60_100M (0)
+#define MII_CLKRANGE_100_150M (0x4)
+#define MII_CLKRANGE_20_35M (0x8)
+#define MII_CLKRANGE_35_60M (0xC)
+#define MII_CLKRANGE_150_250M (0x10)
+#define MII_CLKRANGE_250_300M (0x14)
+
+#define MIIADDRSHIFT (11)
+#define MIIREGSHIFT (6)
+#define MII_REGMSK (0x1F << 6)
+#define MII_ADDRMSK (0x1F << 11)
+
+
+struct eth_dma_regs {
+ u32 busmode; /* 0x00 */
+ u32 txpolldemand; /* 0x04 */
+ u32 rxpolldemand; /* 0x08 */
+ u32 rxdesclistaddr; /* 0x0c */
+ u32 txdesclistaddr; /* 0x10 */
+ u32 status; /* 0x14 */
+ u32 opmode; /* 0x18 */
+ u32 intenable; /* 0x1c */
+ u8 reserved[0x48 - 0x20];
+ u32 currhosttxdesc; /* 0x48 */
+ u32 currhostrxdesc; /* 0x4c */
+ u32 currhosttxbuffaddr; /* 0x50 */
+ u32 currhostrxbuffaddr; /* 0x54 */
+};
+
+/* Bus mode register definitions */
+#define FIXEDBURST (1 << 16)
+#define BURST_1 (1 << 8)
+#define BURST_2 (2 << 8)
+#define BURST_4 (4 << 8)
+#define BURST_8 (8 << 8)
+#define BURST_16 (16 << 8)
+#define BURST_32 (32 << 8)
+#define RXHIGHPRIO (1 << 1)
+#define DMAMAC_SRST (1 << 0)
+
+/* Poll demand definitions */
+#define POLL_DATA (0xFFFFFFFF)
+
+/* Operation mode definitions */
+#define STOREFORWARD (1 << 21)
+#define FLUSHTXFIFO (1 << 20)
+#define TXSTART (1 << 13)
+#define TXSECONDFRAME (1 << 2)
+#define RXSTART (1 << 1)
+
+/* Descriptior related definitions */
+#define MAC_MAX_FRAME_SZ (1528)
+
+struct dmamacdescr {
+ u32 txrx_status;
+ u32 dmamac_cntl;
+ void *dmamac_addr;
+ struct dmamacdescr *dmamac_next;
+};
+
+/*
+ * txrx_status definitions
+ */
+
+/* tx status bits definitions */
+#if defined(CONFIG_SPEAR_ALTDESC)
+
+#define DESC_TXSTS_OWNBYDMA (1 << 31)
+#define DESC_TXSTS_TXINT (1 << 30)
+#define DESC_TXSTS_TXLAST (1 << 29)
+#define DESC_TXSTS_TXFIRST (1 << 28)
+#define DESC_TXSTS_TXCRCDIS (1 << 27)
+
+#define DESC_TXSTS_TXPADDIS (1 << 26)
+#define DESC_TXSTS_TXCHECKINSCTRL (3 << 22)
+#define DESC_TXSTS_TXRINGEND (1 << 21)
+#define DESC_TXSTS_TXCHAIN (1 << 20)
+#define DESC_TXSTS_MSK (0x1FFFF << 0)
+
+#else
+
+#define DESC_TXSTS_OWNBYDMA (1 << 31)
+#define DESC_TXSTS_MSK (0x1FFFF << 0)
+
+#endif
+
+/* rx status bits definitions */
+#define DESC_RXSTS_OWNBYDMA (1 << 31)
+#define DESC_RXSTS_DAFILTERFAIL (1 << 30)
+#define DESC_RXSTS_FRMLENMSK (0x3FFF << 16)
+#define DESC_RXSTS_FRMLENSHFT (16)
+
+#define DESC_RXSTS_ERROR (1 << 15)
+#define DESC_RXSTS_RXTRUNCATED (1 << 14)
+#define DESC_RXSTS_SAFILTERFAIL (1 << 13)
+#define DESC_RXSTS_RXIPC_GIANTFRAME (1 << 12)
+#define DESC_RXSTS_RXDAMAGED (1 << 11)
+#define DESC_RXSTS_RXVLANTAG (1 << 10)
+#define DESC_RXSTS_RXFIRST (1 << 9)
+#define DESC_RXSTS_RXLAST (1 << 8)
+#define DESC_RXSTS_RXIPC_GIANT (1 << 7)
+#define DESC_RXSTS_RXCOLLISION (1 << 6)
+#define DESC_RXSTS_RXFRAMEETHER (1 << 5)
+#define DESC_RXSTS_RXWATCHDOG (1 << 4)
+#define DESC_RXSTS_RXMIIERROR (1 << 3)
+#define DESC_RXSTS_RXDRIBBLING (1 << 2)
+#define DESC_RXSTS_RXCRC (1 << 1)
+
+/*
+ * dmamac_cntl definitions
+ */
+
+/* tx control bits definitions */
+#if defined(CONFIG_SPEAR_ALTDESC)
+
+#define DESC_TXCTRL_SIZE1MASK (0x1FFF << 0)
+#define DESC_TXCTRL_SIZE1SHFT (0)
+#define DESC_TXCTRL_SIZE2MASK (0x1FFF << 16)
+#define DESC_TXCTRL_SIZE2SHFT (16)
+
+#else
+
+#define DESC_TXCTRL_TXINT (1 << 31)
+#define DESC_TXCTRL_TXLAST (1 << 30)
+#define DESC_TXCTRL_TXFIRST (1 << 29)
+#define DESC_TXCTRL_TXCHECKINSCTRL (3 << 27)
+#define DESC_TXCTRL_TXCRCDIS (1 << 26)
+#define DESC_TXCTRL_TXRINGEND (1 << 25)
+#define DESC_TXCTRL_TXCHAIN (1 << 24)
+
+#define DESC_TXCTRL_SIZE1MASK (0x7FF << 0)
+#define DESC_TXCTRL_SIZE1SHFT (0)
+#define DESC_TXCTRL_SIZE2MASK (0x7FF << 11)
+#define DESC_TXCTRL_SIZE2SHFT (11)
+
+#endif
+
+/* rx control bits definitions */
+#if defined(CONFIG_SPEAR_ALTDESC)
+
+#define DESC_RXCTRL_RXINTDIS (1 << 31)
+#define DESC_RXCTRL_RXRINGEND (1 << 15)
+#define DESC_RXCTRL_RXCHAIN (1 << 14)
+
+#define DESC_RXCTRL_SIZE1MASK (0x1FFF << 0)
+#define DESC_RXCTRL_SIZE1SHFT (0)
+#define DESC_RXCTRL_SIZE2MASK (0x1FFF << 16)
+#define DESC_RXCTRL_SIZE2SHFT (16)
+
+#else
+
+#define DESC_RXCTRL_RXINTDIS (1 << 31)
+#define DESC_RXCTRL_RXRINGEND (1 << 25)
+#define DESC_RXCTRL_RXCHAIN (1 << 24)
+
+#define DESC_RXCTRL_SIZE1MASK (0x7FF << 0)
+#define DESC_RXCTRL_SIZE1SHFT (0)
+#define DESC_RXCTRL_SIZE2MASK (0x7FF << 11)
+#define DESC_RXCTRL_SIZE2SHFT (11)
+
+#endif
+
+/*
+ * dmamac_addr definitions
+ */
+
+/* tx addr register bits definitions */
+
+/* rx addr register bits definitions */
+
+
+/*
+ * dmamac_next definitions
+ */
+
+/* tx next register bits definitions */
+
+/* rx next register bits definitions */
+
+struct spear_eth_dev {
+ u32 address;
+ u32 speed;
+ u32 duplex;
+ struct eth_device *dev;
+};
+
+/* Speed specific definitions */
+#define SPEED_10M 1
+#define SPEED_100M 2
+#define SPEED_1000M 3
+
+/* Duplex mode specific definitions */
+#define HALF_DUPLEX 1
+#define FULL_DUPLEX 2
+
+#endif
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index cc52e39..fe97e94 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -27,6 +27,19 @@
* Common configurations used for both spear3xx as well as spear6xx
*/
+/* Ethernet configuration */
+#define CONFIG_SPEAR_ETHERNET
+#define CONFIG_MII
+#define CONFIG_NET_MULTI
+#define CONFIG_PHY_RESET_DELAY (10000) /* in us */
+#define CONFIG_EXTRA_ENV_AUTONEG "ethautoneg=n\0"
+#define CONFIG_EXTRA_ENV_ETHSPEED "ethspeed=100M\0"
+#define CONFIG_EXTRA_ENV_ETHDUPLEX "ethduplex=full\0"
+#define CONFIG_ETHADDR 00:80:E1:11:22:33
+#define CONFIG_NETMASK 255.255.255.0
+#define CONFIG_IPADDR 192.168.1.10
+#define CONFIG_SERVERIP 192.168.1.1
+
/* USBD driver configuration */
#define CONFIG_SPEARUDC
#define CONFIG_USB_DEVICE
@@ -99,11 +112,13 @@
#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_RUN
#define CONFIG_CMD_SAVES
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <config_cmd_default.h>
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
/*
* Default Environment Varible definitions
@@ -195,7 +210,10 @@
#define CONFIG_SYS_CONSOLE_INFO_QUIET 1
#define CONFIG_SYS_64BIT_VSPRINTF 1
-#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_USBTTY
+#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_USBTTY \
+ CONFIG_EXTRA_ENV_AUTONEG \
+ CONFIG_EXTRA_ENV_ETHSPEED \
+ CONFIG_EXTRA_ENV_ETHDUPLEX
/* Stack sizes */
#define CONFIG_STACKSIZE (128*1024)
diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
index 0248aba..b69e734 100755
--- a/include/configs/spear3xx.h
+++ b/include/configs/spear3xx.h
@@ -41,6 +41,9 @@
#include <configs/spear-common.h>
+/* Ethernet configuration */
+#define CONFIG_SPEAR_ALTDESC
+
/* Serial Configuration (PL011) */
#define CONFIG_SYS_SERIAL0 0xD0000000
diff --git a/include/netdev.h b/include/netdev.h
index 1dd80f0..bd29697 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -79,6 +79,7 @@ int scc_initialize(bd_t *bis);
int skge_initialize(bd_t *bis);
int smc911x_initialize(u8 dev_num, int base_addr);
int smc91111_initialize(u8 dev_num, int base_addr);
+int spear_mii_initialize(u32);
int tsi108_eth_initialize(bd_t *bis);
int uec_initialize(int index);
int uec_standard_init(bd_t *bis);
--
1.6.0.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 4/4] SPEAr : macb driver support added for spear310 and spear320
2010-03-23 8:30 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Vipin KUMAR
@ 2010-03-23 8:30 ` Vipin KUMAR
2010-03-28 22:40 ` Tom
2010-03-23 17:39 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Ben Warren
1 sibling, 1 reply; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-23 8:30 UTC (permalink / raw)
To: u-boot
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
---
board/spear/spear310/spear310.c | 9 ++++++++-
board/spear/spear320/spear320.c | 6 +++++-
include/asm-arm/arch-spear/clk.h | 27 +++++++++++++++++++++++++++
include/configs/spear3xx.h | 21 +++++++++++++++++++++
4 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 include/asm-arm/arch-spear/clk.h
diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index 2c35a55..6f5c52a 100755
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -61,5 +61,12 @@ int board_nand_init(struct nand_chip *nand)
int board_eth_init(bd_t *bis)
{
- return spear_mii_initialize(0);
+ spear_mii_initialize(0);
+
+ macb_eth_initialize(0, (void *)SPR310_MACB0_BASE, SPR310_MACB0_PHY);
+ macb_eth_initialize(1, (void *)SPR310_MACB1_BASE, SPR310_MACB1_PHY);
+ macb_eth_initialize(2, (void *)SPR310_MACB2_BASE, SPR310_MACB2_PHY);
+ macb_eth_initialize(3, (void *)SPR310_MACB3_BASE, SPR310_MACB3_PHY);
+
+ return 0;
}
diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
index a804123..e9d8f9f 100755
--- a/board/spear/spear320/spear320.c
+++ b/board/spear/spear320/spear320.c
@@ -61,5 +61,9 @@ int board_nand_init(struct nand_chip *nand)
int board_eth_init(bd_t *bis)
{
- return spear_mii_initialize(0);
+ spear_mii_initialize(0);
+
+ macb_eth_initialize(0, (void *)SPR320_MACB0_BASE, SPR320_MACB0_PHY);
+
+ return 0;
}
diff --git a/include/asm-arm/arch-spear/clk.h b/include/asm-arm/arch-spear/clk.h
new file mode 100644
index 0000000..343c6ce
--- /dev/null
+++ b/include/asm-arm/arch-spear/clk.h
@@ -0,0 +1,27 @@
+/*
+ * (C) Copyright 2009
+ * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
+{
+ return 83000000;
+}
diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
index b69e734..3bf01b5 100755
--- a/include/configs/spear3xx.h
+++ b/include/configs/spear3xx.h
@@ -44,6 +44,27 @@
/* Ethernet configuration */
#define CONFIG_SPEAR_ALTDESC
+#if defined(CONFIG_SPEAR310)
+#define CONFIG_MACB 1
+#define CONFIG_MACB_SEARCH_PHY 1
+
+#define SPR310_MACB0_BASE 0xB0000000
+#define SPR310_MACB1_BASE 0xB0800000
+#define SPR310_MACB2_BASE 0xB1000000
+#define SPR310_MACB3_BASE 0xB1800000
+#define SPR310_MACB0_PHY 0x01
+#define SPR310_MACB1_PHY 0x03
+#define SPR310_MACB2_PHY 0x05
+#define SPR310_MACB3_PHY 0x07
+
+#elif defined(CONFIG_SPEAR320)
+#define CONFIG_MACB 1
+#define CONFIG_MACB_SEARCH_PHY 1
+
+#define SPR320_MACB0_BASE 0xAA000000
+#define SPR320_MACB0_PHY 0x01
+#endif
+
/* Serial Configuration (PL011) */
#define CONFIG_SYS_SERIAL0 0xD0000000
--
1.6.0.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/4] SPEAr : Network driver support added
2010-03-23 8:30 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 4/4] SPEAr : macb driver support added for spear310 and spear320 Vipin KUMAR
@ 2010-03-23 17:39 ` Ben Warren
2010-03-25 4:48 ` Vipin KUMAR
1 sibling, 1 reply; 15+ messages in thread
From: Ben Warren @ 2010-03-23 17:39 UTC (permalink / raw)
To: u-boot
Hi Vipin,
On 3/23/2010 1:30 AM, Vipin KUMAR wrote:
> SPEAr SoCs support a synopsys network peripheral. This patch adds the support
> for the same
>
>
> Signed-off-by: Vipin Kumar<vipin.kumar@st.com>
> ---
> board/spear/spear300/spear300.c | 6 +
> board/spear/spear310/spear310.c | 6 +
> board/spear/spear320/spear320.c | 6 +
> board/spear/spear600/spear600.c | 6 +
> drivers/net/Makefile | 1 +
> drivers/net/spr_eth_syn.c | 471 ++++++++++++++++++++++++++++++
> include/asm-arm/arch-spear/hardware.h | 2 +
> include/asm-arm/arch-spear/spr_eth_syn.h | 262 +++++++++++++++++
> include/configs/spear-common.h | 24 ++-
> include/configs/spear3xx.h | 3 +
> include/netdev.h | 1 +
> 11 files changed, 785 insertions(+), 3 deletions(-)
> create mode 100755 drivers/net/spr_eth_syn.c
> create mode 100644 include/asm-arm/arch-spear/spr_eth_syn.h
>
>
I'd prefer to see the driver and its associated files submitted as a
single patch, an board support added later, but it's not a big deal.
> diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
> index 60ee544..483fe0c 100755
> --- a/board/spear/spear300/spear300.c
> +++ b/board/spear/spear300/spear300.c
> @@ -23,6 +23,7 @@
>
> #include<common.h>
> #include<nand.h>
> +#include<netdev.h>
> #include<asm/io.h>
> #include<asm/arch/hardware.h>
> #include<asm/arch/spr_defs.h>
> @@ -56,3 +57,8 @@ int board_nand_init(struct nand_chip *nand)
>
> return -1;
> }
> +
> +int board_eth_init(bd_t *bis)
> +{
> + return spear_mii_initialize(0);
> +}
> diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
> index 03dfe16..2c35a55 100755
> --- a/board/spear/spear310/spear310.c
> +++ b/board/spear/spear310/spear310.c
> @@ -24,6 +24,7 @@
>
> #include<common.h>
> #include<nand.h>
> +#include<netdev.h>
> #include<asm/io.h>
> #include<asm/arch/hardware.h>
> #include<asm/arch/spr_defs.h>
> @@ -57,3 +58,8 @@ int board_nand_init(struct nand_chip *nand)
>
> return -1;
> }
> +
> +int board_eth_init(bd_t *bis)
> +{
> + return spear_mii_initialize(0);
> +}
> diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
> index 2ba2dbb..a804123 100755
> --- a/board/spear/spear320/spear320.c
> +++ b/board/spear/spear320/spear320.c
> @@ -24,6 +24,7 @@
>
> #include<common.h>
> #include<nand.h>
> +#include<netdev.h>
> #include<asm/io.h>
> #include<asm/arch/hardware.h>
> #include<asm/arch/spr_defs.h>
> @@ -57,3 +58,8 @@ int board_nand_init(struct nand_chip *nand)
>
> return -1;
> }
> +
> +int board_eth_init(bd_t *bis)
> +{
> + return spear_mii_initialize(0);
> +}
> diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
> index eef9a37..f2201a4 100755
> --- a/board/spear/spear600/spear600.c
> +++ b/board/spear/spear600/spear600.c
> @@ -23,6 +23,7 @@
>
> #include<common.h>
> #include<nand.h>
> +#include<netdev.h>
> #include<asm/io.h>
> #include<asm/arch/hardware.h>
> #include<asm/arch/spr_defs.h>
> @@ -51,3 +52,8 @@ int board_nand_init(struct nand_chip *nand)
>
> return -1;
> }
> +
> +int board_eth_init(bd_t *bis)
> +{
> + return spear_mii_initialize(0);
> +}
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 1ec0ba1..b230874 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -68,6 +68,7 @@ COBJS-$(CONFIG_DRIVER_S3C4510_ETH) += s3c4510b_eth.o
> COBJS-$(CONFIG_SH_ETHER) += sh_eth.o
> COBJS-$(CONFIG_SMC91111) += smc91111.o
> COBJS-$(CONFIG_SMC911X) += smc911x.o
> +COBJS-$(CONFIG_SPEAR_ETHERNET) += spr_eth_syn.o
>
Please ensure that the CONFIG and driver name convey the same
information (these ones don't)
> COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o
> COBJS-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o
> COBJS-$(CONFIG_TSEC_ENET) += tsec.o
> diff --git a/drivers/net/spr_eth_syn.c b/drivers/net/spr_eth_syn.c
> new file mode 100755
> index 0000000..ff90572
> --- /dev/null
> +++ b/drivers/net/spr_eth_syn.c
> @@ -0,0 +1,471 @@
> +/*
> + * (C) Copyright 2009
> + * Vipin Kumar, ST Micoelectronics, vipin.kumar at st.com.
> + *
> + * (C) Copyright 2008
> + * Deepak Sikri, ST Micoelectronics, deepak.sikri at st.com.
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#include<common.h>
> +#include<miiphy.h>
> +#include<malloc.h>
> +#include<asm/errno.h>
> +#include<asm/io.h>
> +#include<asm/arch/hardware.h>
> +#include<asm/arch/spr_eth_syn.h>
> +
> +static struct eth_dma_regs *dma_p =
> + (struct eth_dma_regs *)CONFIG_SPEAR_ETHDMABASE;
> +static struct eth_mac_regs *mac_p =
> + (struct eth_mac_regs *)CONFIG_SPEAR_ETHMACBASE;
> +
>
No globals please. It makes it impossible to have more than one
instance of the driver. Put data in dev->priv instead.
> +static struct eth_device *netdev;
> +
> +static struct dmamacdescr
> + tx_mac_descrtable[CONFIG_TX_DESCR_NUM] __attribute__ ((aligned(256)));
> +static struct dmamacdescr
> + rx_mac_descrtable[CONFIG_RX_DESCR_NUM] __attribute__ ((aligned(256)));
> +
> +static u32 tx_currdescnum;
> +static u32 rx_currdescnum;
> +
> +static char txbuffs[TX_TOTAL_BUFSIZE] __attribute__ ((aligned(2048)));
> +static char rxbuffs[RX_TOTAL_BUFSIZE] __attribute__ ((aligned(2048)));
> +
> +static void xfer_enable(void)
>
All functions should take eth_device * as argument so you can access
private data
> +{
> + /*
> + * Start/Enable xfer at dma as well as mac level
> + */
> + writel(readl(&dma_p->opmode) | RXSTART,&dma_p->opmode);
> + writel(readl(&dma_p->opmode) | TXSTART,&dma_p->opmode);
> +
> + writel(readl(&mac_p->conf) | RXENABLE,&mac_p->conf);
> + writel(readl(&mac_p->conf) | TXENABLE,&mac_p->conf);
> +}
> +
> +static void tx_descs_init(u32 max_desc_num)
> +{
> + u32 idx;
> + struct dmamacdescr *desc_p;
> +
> + for (idx = 0; idx< max_desc_num; idx++) {
> +
> + desc_p =&tx_mac_descrtable[idx];
> + desc_p->dmamac_addr =&txbuffs[idx * CONFIG_ETH_BUFSIZE];
> + desc_p->dmamac_next =&tx_mac_descrtable[idx + 1];
> +
> +#if defined(CONFIG_SPEAR_ALTDESC)
> + desc_p->txrx_status&= ~(DESC_TXSTS_TXINT | DESC_TXSTS_TXLAST |
> + DESC_TXSTS_TXFIRST | DESC_TXSTS_TXCRCDIS | \
> + DESC_TXSTS_TXCHECKINSCTRL | \
> + DESC_TXSTS_TXRINGEND | DESC_TXSTS_TXPADDIS);
> +
> + desc_p->txrx_status |= DESC_TXSTS_TXCHAIN;
> + desc_p->dmamac_cntl = 0;
> + desc_p->txrx_status&= ~(DESC_TXSTS_MSK | DESC_TXSTS_OWNBYDMA);
> +#else
> + desc_p->dmamac_cntl = DESC_TXCTRL_TXCHAIN;
> + desc_p->txrx_status = 0;
> +#endif
> + }
> +
> + /* Correcting the last pointer of the chain */
> + desc_p->dmamac_next =&tx_mac_descrtable[0];
> +
> + writel((ulong)&tx_mac_descrtable[0],&dma_p->txdesclistaddr);
> +}
> +
> +static void rx_descs_init(u32 max_desc_num)
> +{
> + u32 idx;
> + struct dmamacdescr *desc_p;
> +
> + for (idx = 0; idx< max_desc_num; idx++) {
> +
> + desc_p =&rx_mac_descrtable[idx];
> + desc_p->dmamac_addr =&rxbuffs[idx * CONFIG_ETH_BUFSIZE];
> + desc_p->dmamac_next =&rx_mac_descrtable[idx + 1];
> +
> + desc_p->dmamac_cntl =
> + (MAC_MAX_FRAME_SZ& DESC_RXCTRL_SIZE1MASK) | \
> + DESC_RXCTRL_RXCHAIN;
> +
> + desc_p->txrx_status = DESC_RXSTS_OWNBYDMA;
> + }
> +
> + /* Correcting the last pointer of the chain */
> + desc_p->dmamac_next =&rx_mac_descrtable[0];
> +
> + writel((ulong)&rx_mac_descrtable[0],&dma_p->rxdesclistaddr);
> +}
> +
> +static void descs_init(void)
> +{
> + tx_descs_init(CONFIG_TX_DESCR_NUM);
> + rx_descs_init(CONFIG_RX_DESCR_NUM);
> +}
> +
> +static int set_hwaddr(void)
> +{
> + u8 mac_id[6];
> + u32 macid_lo, macid_hi;
> +
> + if (eth_getenv_enetaddr("ethaddr", mac_id)) {
>
Please read the documentation and look at other drivers to see how they
handle the environment. Hint: you get it from the eth_device *.
> + macid_lo = mac_id[0] + (mac_id[1]<< 8) + \
> + (mac_id[2]<< 16) + (mac_id[3]<< 24);
> + macid_hi = mac_id[4] + (mac_id[5]<< 8);
> +
> + writel(macid_hi,&mac_p->macaddr0hi);
> + writel(macid_lo,&mac_p->macaddr0lo);
> +
> + return 0;
> + }
> + return -1;
> +}
> +
> +static void mac_reset(u32 timeout)
> +{
> + writel(DMAMAC_SRST,&dma_p->busmode);
> + writel(MII_PORTSELECT,&mac_p->conf);
> +
> + do {
> + if (!(readl(&dma_p->busmode)& DMAMAC_SRST))
> + break;
> + udelay(1000);
> + } while (timeout--);
> +}
> +
> +static int spear_eth_init(struct eth_device *dev, bd_t *bis)
> +{
> + struct spear_eth_dev *priv = dev->priv;
> + u32 conf;
> +
> + /* Reset ethernet hardware */
> + mac_reset(CONFIG_MACRESET_TIMEOUT);
> +
> + if (set_hwaddr()< 0)
> + return -1;
> +
> + writel(FIXEDBURST | RXHIGHPRIO | BURST_16,&dma_p->busmode);
> +
> + writel(FLUSHTXFIFO | readl(&dma_p->opmode),&dma_p->opmode);
> + writel(STOREFORWARD | TXSECONDFRAME,&dma_p->opmode);
> +
> + conf = FRAMEBURSTENABLE | DISABLERXOWN;
> +
> + if (priv->speed != SPEED_1000M)
> + conf |= MII_PORTSELECT;
> +
> + if (priv->duplex == FULL_DUPLEX)
> + conf |= FULLDPLXMODE;
> +
> + writel(conf,&mac_p->conf);
> +
> + descs_init();
> + xfer_enable();
> +
> + return 0;
> +}
> +
> +static int spear_eth_send(struct eth_device *dev, volatile void *packet,
> + int length)
> +{
> + struct dmamacdescr *desc_p =&tx_mac_descrtable[tx_currdescnum];
> +
> + /* Check if the descriptor is owned by CPU */
> + if (desc_p->txrx_status& DESC_TXSTS_OWNBYDMA) {
> + printf("eth_send : CPU not owner of tx frame\n");
> + return -1;
> + }
> +
> + memcpy((void *)desc_p->dmamac_addr, (void *)packet, length);
> +
> +#if defined(CONFIG_SPEAR_ALTDESC)
> + desc_p->txrx_status |= DESC_TXSTS_TXFIRST | DESC_TXSTS_TXLAST;
> + desc_p->dmamac_cntl |= (length<< DESC_TXCTRL_SIZE1SHFT)& \
> + DESC_TXCTRL_SIZE1MASK;
> +
> + desc_p->txrx_status&= ~(DESC_TXSTS_MSK);
> + desc_p->txrx_status |= DESC_TXSTS_OWNBYDMA;
> +#else
> + desc_p->dmamac_cntl |= ((length<< DESC_TXCTRL_SIZE1SHFT)& \
> + DESC_TXCTRL_SIZE1MASK) | DESC_TXCTRL_TXLAST | \
> + DESC_TXCTRL_TXFIRST;
> +
> + desc_p->txrx_status = DESC_TXSTS_OWNBYDMA;
> +#endif
> +
> + /* Test the wrap-around condition. */
> + if (++tx_currdescnum>= CONFIG_TX_DESCR_NUM)
> + tx_currdescnum = 0;
> +
> + /* Start the transmission */
> + writel(POLL_DATA,&dma_p->txpolldemand);
> +
> + return 0;
> +}
> +
> +static int spear_eth_recv(struct eth_device *dev)
> +{
> + struct dmamacdescr *desc_p =&rx_mac_descrtable[rx_currdescnum];
> + u32 status = desc_p->txrx_status;
> + int length = 0;
> +
> + /* Check if the owner is the CPU */
> + if (!(status& DESC_RXSTS_OWNBYDMA)) {
> +
> + length = (status& DESC_RXSTS_FRMLENMSK)>> \
> + DESC_RXSTS_FRMLENSHFT;
> +
> + NetReceive(desc_p->dmamac_addr, length);
> +
> + /*
> + * Make the current descriptor valid again and go to
> + * the next one
> + */
> + desc_p->txrx_status |= DESC_RXSTS_OWNBYDMA;
> +
> + /* Test the wrap-around condition. */
> + if (++rx_currdescnum>= CONFIG_RX_DESCR_NUM)
> + rx_currdescnum = 0;
> + }
> +
> + return length;
> +}
> +
> +static void spear_eth_halt(struct eth_device *dev)
> +{
> + mac_reset(CONFIG_MACRESET_TIMEOUT);
> + tx_currdescnum = rx_currdescnum = 0;
> +}
> +
> +static int eth_mdio_read(char *devname, u8 addr, u8 reg, u16 *val)
> +{
> + u32 miiaddr;
> + u32 timeout = CONFIG_MDIO_TIMEOUT;
> +
> + miiaddr = ((addr<< MIIADDRSHIFT)& MII_ADDRMSK) | \
> + ((reg<< MIIREGSHIFT)& MII_REGMSK);
> +
> + writel(miiaddr | MII_CLKRANGE_150_250M | MII_BUSY,&mac_p->miiaddr);
> +
> + do {
> + if (!(readl(&mac_p->miiaddr)& MII_BUSY))
> + break;
> + udelay(1000);
> + } while (timeout--);
> +
> + *val = readl(&mac_p->miidata);
> +
> + return 0;
> +}
> +
> +static int eth_mdio_write(char *devname, u8 addr, u8 reg, u16 val)
> +{
> + u32 miiaddr;
> + u32 timeout = CONFIG_MDIO_TIMEOUT;
> + u16 value;
> +
> + writel(val,&mac_p->miidata);
> + miiaddr = ((addr<< MIIADDRSHIFT)& MII_ADDRMSK) | \
> + ((reg<< MIIREGSHIFT)& MII_REGMSK) | MII_WRITE;
> +
> + writel(miiaddr | MII_CLKRANGE_150_250M | MII_BUSY,&mac_p->miiaddr);
> +
> + do {
> + if (!(readl(&mac_p->miiaddr)& MII_BUSY))
> + break;
> + udelay(1000);
> + } while (timeout--);
> +
> + /* Needed as a fix for ST-Phy */
> + eth_mdio_read(devname, addr, reg,&value);
> +
> + return 0;
> +}
> +
> +static u8 find_phy(struct eth_device *dev)
> +{
> + u8 phy_addr = 0;
> + u16 ctrl, oldctrl;
> +
> + do {
> + eth_mdio_read(dev->name, phy_addr, PHY_BMCR,&ctrl);
> + oldctrl = ctrl& PHY_BMCR_AUTON;
> +
> + ctrl ^= PHY_BMCR_AUTON;
> + eth_mdio_write(dev->name, phy_addr, PHY_BMCR, ctrl);
> + eth_mdio_read(dev->name, phy_addr, PHY_BMCR,&ctrl);
> + ctrl&= PHY_BMCR_AUTON;
> +
> + if (ctrl == oldctrl) {
> + phy_addr++;
> + } else {
> + ctrl ^= PHY_BMCR_AUTON;
> + eth_mdio_write(dev->name, phy_addr, PHY_BMCR, ctrl);
> + break;
> + }
> + } while (phy_addr< 32);
> +
> + return phy_addr;
> +}
> +
> +static void spear_reset_phy(struct eth_device *dev)
> +{
> + struct spear_eth_dev *priv = dev->priv;
> + u16 ctrl;
> + u32 timeout = CONFIG_PHYRESET_TIMEOUT;
> + u32 phy_addr = priv->address;
> +
> + eth_mdio_write(dev->name, phy_addr, PHY_BMCR, PHY_BMCR_RESET);
> + do {
> + eth_mdio_read(dev->name, phy_addr, PHY_BMCR,&ctrl);
> + if (!(ctrl& PHY_BMCR_RESET))
> + break;
> + udelay(1000);
> + } while (timeout--);
> +
> + udelay(CONFIG_PHY_RESET_DELAY);
> +}
> +
> +void reset_phy(void)
>
Something with such a generic name should not be public
> +{
> + spear_reset_phy(netdev);
> +}
> +
> +static void configure_phy(struct eth_device *dev)
> +{
> + struct spear_eth_dev *priv = dev->priv;
> + char *an, *sp, *du;
> + u8 phy_addr;
> + u16 bmcr, bmsr, ctrl;
> + u32 timeout;
> + u16 anlpar, btsr;
> +
> + priv->address = find_phy(dev);
> + phy_addr = priv->address;
> +
> + spear_reset_phy(netdev);
> +
> + an = getenv("ethautoneg");
>
Is this a new environment variable? If so, it needs to be interface
#-specific, which is tricky. Does this really need to come from the
environment? Same goes for all of these... Since you're using the
U-boot MII framework, I'd much rather see the common code changed to
support this than a specific driver.
> + if ((an != NULL)&& strcmp(an, "n")) {
> + bmcr = PHY_BMCR_AUTON | PHY_BMCR_RST_NEG | PHY_BMCR_100MB | \
> + PHY_BMCR_DPLX | PHY_BMCR_1000_MBPS;
> + } else {
> + bmcr = PHY_BMCR_100MB | PHY_BMCR_DPLX;
> +
> + sp = getenv("ethspeed");
> + if ((sp != NULL)&& (!strcmp(sp, "10M")))
> + bmcr&= ~PHY_BMCR_100MB;
> +
> + du = getenv("ethduplex");
> + if ((du != NULL)&& (!strcmp(du, "half")))
> + bmcr&= ~PHY_BMCR_DPLX;
> + }
> +
> + eth_mdio_write(dev->name, phy_addr, PHY_BMCR, bmcr);
> +
> + /* Read the phy status register and populate priv structure */
> + if ((an != NULL)&& strcmp(an, "n")) {
> +
> + timeout = CONFIG_AUTONEG_TIMEOUT;
> + do {
> + eth_mdio_read(dev->name, phy_addr, PHY_BMSR,&bmsr);
> + if (bmsr& PHY_BMSR_AUTN_COMP)
> + break;
> + udelay(1000);
> + } while (timeout--);
> +
> + eth_mdio_read(dev->name, phy_addr, PHY_ANLPAR,&anlpar);
> + eth_mdio_read(dev->name, phy_addr, PHY_1000BTSR,&btsr);
> +
> + if (btsr& (PHY_1000BTSR_1000FD | PHY_1000BTSR_1000HD)) {
> + priv->speed = SPEED_1000M;
> + if (btsr& PHY_1000BTSR_1000FD)
> + priv->duplex = FULL_DUPLEX;
> + else
> + priv->duplex = HALF_DUPLEX;
> + } else {
> + if (anlpar& PHY_ANLPAR_100)
> + priv->speed = SPEED_100M;
> + else
> + priv->speed = SPEED_10M;
> +
> + if (anlpar& (PHY_ANLPAR_10FD | PHY_ANLPAR_TXFD))
> + priv->duplex = FULL_DUPLEX;
> + else
> + priv->duplex = HALF_DUPLEX;
> + }
> + } else {
> + eth_mdio_read(dev->name, phy_addr, PHY_BMCR,&ctrl);
> +
> + if (ctrl& PHY_BMCR_DPLX)
> + priv->duplex = FULL_DUPLEX;
> + else
> + priv->duplex = HALF_DUPLEX;
> +
> + if (ctrl& PHY_BMCR_1000_MBPS)
> + priv->speed = SPEED_1000M;
> + else if (ctrl& PHY_BMCR_100_MBPS)
> + priv->speed = SPEED_100M;
> + else
> + priv->speed = SPEED_10M;
> + }
> +}
> +
> +int spear_mii_initialize(u32 id)
>
Please pass in the base address rather than hard coding it. Look how
other drivers do this (CS8900 is a good example)
> +{
> + struct spear_eth_dev *priv;
> +
> + netdev = (struct eth_device *) malloc(sizeof(struct eth_device));
> + if (!netdev)
> + return -ENOMEM;
> +
> + priv = (struct spear_eth_dev *) malloc(sizeof(struct spear_eth_dev));
> + if (!priv) {
> + free(netdev);
> + return -ENOMEM;
> + }
> +
> + memset(netdev, 0, sizeof(struct eth_device));
> + memset(priv, 0, sizeof(struct spear_eth_dev));
> +
> + sprintf(netdev->name, "mii%d", id);
> + priv->dev = netdev;
> + netdev->iobase = 0;
> + netdev->priv = priv;
> +
> + mac_reset(CONFIG_MACRESET_TIMEOUT);
> + configure_phy(netdev);
> +
> + netdev->init = spear_eth_init;
> + netdev->send = spear_eth_send;
> + netdev->recv = spear_eth_recv;
> + netdev->halt = spear_eth_halt;
> +
> + eth_register(netdev);
> +
> +#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
> + miiphy_register(netdev->name, eth_mdio_read, eth_mdio_write);
> +#endif
> + return 0;
> +}
> diff --git a/include/asm-arm/arch-spear/hardware.h b/include/asm-arm/arch-spear/hardware.h
> index 818f36c..7133b3c 100644
> --- a/include/asm-arm/arch-spear/hardware.h
> +++ b/include/asm-arm/arch-spear/hardware.h
> @@ -31,6 +31,8 @@
> #define CONFIG_SPEAR_SYSCNTLBASE (0xFCA00000)
> #define CONFIG_SPEAR_TIMERBASE (0xFC800000)
> #define CONFIG_SPEAR_MISCBASE (0xFCA80000)
> +#define CONFIG_SPEAR_ETHMACBASE (0xE0800000)
> +#define CONFIG_SPEAR_ETHDMABASE (0xE0801000)
>
> #define CONFIG_SYS_NAND_CLE (1<< 16)
> #define CONFIG_SYS_NAND_ALE (1<< 17)
> diff --git a/include/asm-arm/arch-spear/spr_eth_syn.h b/include/asm-arm/arch-spear/spr_eth_syn.h
>
Please put this header in with the driver. You're artificially making
this ARM-specific.
> new file mode 100644
> index 0000000..3a745ef
> --- /dev/null
> +++ b/include/asm-arm/arch-spear/spr_eth_syn.h
> @@ -0,0 +1,262 @@
> +/*
> + * (C) Copyright 2009
> + * Vipin Kumar, ST Micoelectronics, vipin.kumar at st.com.
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef _SPR_ETH_SYN_H
> +#define _SPR_ETH_SYN_H
> +
> +#define CONFIG_TX_DESCR_NUM 16
> +#define CONFIG_RX_DESCR_NUM 16
> +#define CONFIG_ETH_BUFSIZE 2048
> +#define TX_TOTAL_BUFSIZE (CONFIG_ETH_BUFSIZE * CONFIG_TX_DESCR_NUM)
> +#define RX_TOTAL_BUFSIZE (CONFIG_ETH_BUFSIZE * CONFIG_RX_DESCR_NUM)
> +
> +#define CONFIG_MACRESET_TIMEOUT (3 * CONFIG_SYS_HZ)
> +#define CONFIG_MDIO_TIMEOUT (3 * CONFIG_SYS_HZ)
> +#define CONFIG_PHYRESET_TIMEOUT (3 * CONFIG_SYS_HZ)
> +#define CONFIG_AUTONEG_TIMEOUT (5 * CONFIG_SYS_HZ)
> +
> +struct eth_mac_regs {
> + u32 conf; /* 0x00 */
> + u32 framefilt; /* 0x04 */
> + u32 hashtablehigh; /* 0x08 */
> + u32 hashtablelow; /* 0x0c */
> + u32 miiaddr; /* 0x10 */
> + u32 miidata; /* 0x14 */
> + u32 flowcontrol; /* 0x18 */
> + u32 vlantag; /* 0x1c */
> + u32 version; /* 0x20 */
> + u8 reserved_1[4];
> + u32 intreg; /* 0x28 */
> + u32 intmask; /* 0x2c */
> + u8 reserved_2[0x40 - 0x30];
> + u32 macaddr0hi; /* 0x30 */
> + u32 macaddr0lo; /* 0x34 */
> +};
> +
> +/* MAC configuration register definitions */
> +#define FRAMEBURSTENABLE (1<< 21)
> +#define MII_PORTSELECT (1<< 15)
> +#define DISABLERXOWN (1<< 13)
> +#define FULLDPLXMODE (1<< 11)
> +#define RXENABLE (1<< 2)
> +#define TXENABLE (1<< 3)
> +
> +/* MII address register definitions */
> +#define MII_BUSY (1<< 0)
> +#define MII_WRITE (1<< 1)
> +#define MII_CLKRANGE_60_100M (0)
> +#define MII_CLKRANGE_100_150M (0x4)
> +#define MII_CLKRANGE_20_35M (0x8)
> +#define MII_CLKRANGE_35_60M (0xC)
> +#define MII_CLKRANGE_150_250M (0x10)
> +#define MII_CLKRANGE_250_300M (0x14)
> +
> +#define MIIADDRSHIFT (11)
> +#define MIIREGSHIFT (6)
> +#define MII_REGMSK (0x1F<< 6)
> +#define MII_ADDRMSK (0x1F<< 11)
> +
> +
> +struct eth_dma_regs {
> + u32 busmode; /* 0x00 */
> + u32 txpolldemand; /* 0x04 */
> + u32 rxpolldemand; /* 0x08 */
> + u32 rxdesclistaddr; /* 0x0c */
> + u32 txdesclistaddr; /* 0x10 */
> + u32 status; /* 0x14 */
> + u32 opmode; /* 0x18 */
> + u32 intenable; /* 0x1c */
> + u8 reserved[0x48 - 0x20];
> + u32 currhosttxdesc; /* 0x48 */
> + u32 currhostrxdesc; /* 0x4c */
> + u32 currhosttxbuffaddr; /* 0x50 */
> + u32 currhostrxbuffaddr; /* 0x54 */
> +};
> +
> +/* Bus mode register definitions */
> +#define FIXEDBURST (1<< 16)
> +#define BURST_1 (1<< 8)
> +#define BURST_2 (2<< 8)
> +#define BURST_4 (4<< 8)
> +#define BURST_8 (8<< 8)
> +#define BURST_16 (16<< 8)
> +#define BURST_32 (32<< 8)
> +#define RXHIGHPRIO (1<< 1)
> +#define DMAMAC_SRST (1<< 0)
> +
> +/* Poll demand definitions */
> +#define POLL_DATA (0xFFFFFFFF)
> +
> +/* Operation mode definitions */
> +#define STOREFORWARD (1<< 21)
> +#define FLUSHTXFIFO (1<< 20)
> +#define TXSTART (1<< 13)
> +#define TXSECONDFRAME (1<< 2)
> +#define RXSTART (1<< 1)
> +
> +/* Descriptior related definitions */
> +#define MAC_MAX_FRAME_SZ (1528)
> +
> +struct dmamacdescr {
> + u32 txrx_status;
> + u32 dmamac_cntl;
> + void *dmamac_addr;
> + struct dmamacdescr *dmamac_next;
> +};
> +
> +/*
> + * txrx_status definitions
> + */
> +
> +/* tx status bits definitions */
> +#if defined(CONFIG_SPEAR_ALTDESC)
> +
> +#define DESC_TXSTS_OWNBYDMA (1<< 31)
> +#define DESC_TXSTS_TXINT (1<< 30)
> +#define DESC_TXSTS_TXLAST (1<< 29)
> +#define DESC_TXSTS_TXFIRST (1<< 28)
> +#define DESC_TXSTS_TXCRCDIS (1<< 27)
> +
> +#define DESC_TXSTS_TXPADDIS (1<< 26)
> +#define DESC_TXSTS_TXCHECKINSCTRL (3<< 22)
> +#define DESC_TXSTS_TXRINGEND (1<< 21)
> +#define DESC_TXSTS_TXCHAIN (1<< 20)
> +#define DESC_TXSTS_MSK (0x1FFFF<< 0)
> +
> +#else
> +
> +#define DESC_TXSTS_OWNBYDMA (1<< 31)
> +#define DESC_TXSTS_MSK (0x1FFFF<< 0)
> +
> +#endif
> +
> +/* rx status bits definitions */
> +#define DESC_RXSTS_OWNBYDMA (1<< 31)
> +#define DESC_RXSTS_DAFILTERFAIL (1<< 30)
> +#define DESC_RXSTS_FRMLENMSK (0x3FFF<< 16)
> +#define DESC_RXSTS_FRMLENSHFT (16)
> +
> +#define DESC_RXSTS_ERROR (1<< 15)
> +#define DESC_RXSTS_RXTRUNCATED (1<< 14)
> +#define DESC_RXSTS_SAFILTERFAIL (1<< 13)
> +#define DESC_RXSTS_RXIPC_GIANTFRAME (1<< 12)
> +#define DESC_RXSTS_RXDAMAGED (1<< 11)
> +#define DESC_RXSTS_RXVLANTAG (1<< 10)
> +#define DESC_RXSTS_RXFIRST (1<< 9)
> +#define DESC_RXSTS_RXLAST (1<< 8)
> +#define DESC_RXSTS_RXIPC_GIANT (1<< 7)
> +#define DESC_RXSTS_RXCOLLISION (1<< 6)
> +#define DESC_RXSTS_RXFRAMEETHER (1<< 5)
> +#define DESC_RXSTS_RXWATCHDOG (1<< 4)
> +#define DESC_RXSTS_RXMIIERROR (1<< 3)
> +#define DESC_RXSTS_RXDRIBBLING (1<< 2)
> +#define DESC_RXSTS_RXCRC (1<< 1)
> +
> +/*
> + * dmamac_cntl definitions
> + */
> +
> +/* tx control bits definitions */
> +#if defined(CONFIG_SPEAR_ALTDESC)
> +
> +#define DESC_TXCTRL_SIZE1MASK (0x1FFF<< 0)
> +#define DESC_TXCTRL_SIZE1SHFT (0)
> +#define DESC_TXCTRL_SIZE2MASK (0x1FFF<< 16)
> +#define DESC_TXCTRL_SIZE2SHFT (16)
> +
> +#else
> +
> +#define DESC_TXCTRL_TXINT (1<< 31)
> +#define DESC_TXCTRL_TXLAST (1<< 30)
> +#define DESC_TXCTRL_TXFIRST (1<< 29)
> +#define DESC_TXCTRL_TXCHECKINSCTRL (3<< 27)
> +#define DESC_TXCTRL_TXCRCDIS (1<< 26)
> +#define DESC_TXCTRL_TXRINGEND (1<< 25)
> +#define DESC_TXCTRL_TXCHAIN (1<< 24)
> +
> +#define DESC_TXCTRL_SIZE1MASK (0x7FF<< 0)
> +#define DESC_TXCTRL_SIZE1SHFT (0)
> +#define DESC_TXCTRL_SIZE2MASK (0x7FF<< 11)
> +#define DESC_TXCTRL_SIZE2SHFT (11)
> +
> +#endif
> +
> +/* rx control bits definitions */
> +#if defined(CONFIG_SPEAR_ALTDESC)
> +
> +#define DESC_RXCTRL_RXINTDIS (1<< 31)
> +#define DESC_RXCTRL_RXRINGEND (1<< 15)
> +#define DESC_RXCTRL_RXCHAIN (1<< 14)
> +
> +#define DESC_RXCTRL_SIZE1MASK (0x1FFF<< 0)
> +#define DESC_RXCTRL_SIZE1SHFT (0)
> +#define DESC_RXCTRL_SIZE2MASK (0x1FFF<< 16)
> +#define DESC_RXCTRL_SIZE2SHFT (16)
> +
> +#else
> +
> +#define DESC_RXCTRL_RXINTDIS (1<< 31)
> +#define DESC_RXCTRL_RXRINGEND (1<< 25)
> +#define DESC_RXCTRL_RXCHAIN (1<< 24)
> +
> +#define DESC_RXCTRL_SIZE1MASK (0x7FF<< 0)
> +#define DESC_RXCTRL_SIZE1SHFT (0)
> +#define DESC_RXCTRL_SIZE2MASK (0x7FF<< 11)
> +#define DESC_RXCTRL_SIZE2SHFT (11)
> +
> +#endif
> +
> +/*
> + * dmamac_addr definitions
> + */
> +
> +/* tx addr register bits definitions */
> +
> +/* rx addr register bits definitions */
> +
> +
> +/*
> + * dmamac_next definitions
> + */
> +
> +/* tx next register bits definitions */
> +
> +/* rx next register bits definitions */
> +
> +struct spear_eth_dev {
> + u32 address;
> + u32 speed;
> + u32 duplex;
> + struct eth_device *dev;
>
> +};
> +
> +/* Speed specific definitions */
> +#define SPEED_10M 1
> +#define SPEED_100M 2
> +#define SPEED_1000M 3
> +
> +/* Duplex mode specific definitions */
> +#define HALF_DUPLEX 1
> +#define FULL_DUPLEX 2
> +
> +#endif
> diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
> index cc52e39..fe97e94 100644
> --- a/include/configs/spear-common.h
> +++ b/include/configs/spear-common.h
> @@ -27,6 +27,19 @@
> * Common configurations used for both spear3xx as well as spear6xx
> */
>
> +/* Ethernet configuration */
> +#define CONFIG_SPEAR_ETHERNET
> +#define CONFIG_MII
> +#define CONFIG_NET_MULTI
> +#define CONFIG_PHY_RESET_DELAY (10000) /* in us */
> +#define CONFIG_EXTRA_ENV_AUTONEG "ethautoneg=n\0"
> +#define CONFIG_EXTRA_ENV_ETHSPEED "ethspeed=100M\0"
> +#define CONFIG_EXTRA_ENV_ETHDUPLEX "ethduplex=full\0"
> +#define CONFIG_ETHADDR 00:80:E1:11:22:33
> +#define CONFIG_NETMASK 255.255.255.0
> +#define CONFIG_IPADDR 192.168.1.10
> +#define CONFIG_SERVERIP 192.168.1.1
>
Please remove all default addresses/masks
> +
> /* USBD driver configuration */
> #define CONFIG_SPEARUDC
> #define CONFIG_USB_DEVICE
> @@ -99,11 +112,13 @@
> #define CONFIG_CMD_MEMORY
> #define CONFIG_CMD_RUN
> #define CONFIG_CMD_SAVES
> +#define CONFIG_CMD_MII
> +#define CONFIG_CMD_NET
> +#define CONFIG_CMD_PING
> +#define CONFIG_CMD_DHCP
>
> /* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
> #include<config_cmd_default.h>
> -#undef CONFIG_CMD_NET
> -#undef CONFIG_CMD_NFS
>
> /*
> * Default Environment Varible definitions
> @@ -195,7 +210,10 @@
> #define CONFIG_SYS_CONSOLE_INFO_QUIET 1
> #define CONFIG_SYS_64BIT_VSPRINTF 1
>
> -#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_USBTTY
> +#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_USBTTY \
> + CONFIG_EXTRA_ENV_AUTONEG \
> + CONFIG_EXTRA_ENV_ETHSPEED \
> + CONFIG_EXTRA_ENV_ETHDUPLEX
>
> /* Stack sizes */
> #define CONFIG_STACKSIZE (128*1024)
> diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
> index 0248aba..b69e734 100755
> --- a/include/configs/spear3xx.h
> +++ b/include/configs/spear3xx.h
> @@ -41,6 +41,9 @@
>
> #include<configs/spear-common.h>
>
> +/* Ethernet configuration */
> +#define CONFIG_SPEAR_ALTDESC
> +
> /* Serial Configuration (PL011) */
> #define CONFIG_SYS_SERIAL0 0xD0000000
>
> diff --git a/include/netdev.h b/include/netdev.h
> index 1dd80f0..bd29697 100644
> --- a/include/netdev.h
> +++ b/include/netdev.h
> @@ -79,6 +79,7 @@ int scc_initialize(bd_t *bis);
> int skge_initialize(bd_t *bis);
> int smc911x_initialize(u8 dev_num, int base_addr);
> int smc91111_initialize(u8 dev_num, int base_addr);
> +int spear_mii_initialize(u32);
>
Please add a variable name
> int tsi108_eth_initialize(bd_t *bis);
> int uec_initialize(int index);
> int uec_standard_init(bd_t *bis);
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/4] SPEAr : Network driver support added
2010-03-23 17:39 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Ben Warren
@ 2010-03-25 4:48 ` Vipin KUMAR
2010-03-25 5:43 ` Ben Warren
0 siblings, 1 reply; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-25 4:48 UTC (permalink / raw)
To: u-boot
On 3/23/2010 11:09 PM, Ben Warren wrote:
> Hi Vipin,
Hello Ben,
> On 3/23/2010 1:30 AM, Vipin KUMAR wrote:
>> SPEAr SoCs support a synopsys network peripheral. This patch adds the
>> support
>> for the same
>>
>> Signed-off-by: Vipin Kumar<vipin.kumar@st.com>
>> ---
>> board/spear/spear300/spear300.c | 6 +
>> board/spear/spear310/spear310.c | 6 +
>> board/spear/spear320/spear320.c | 6 +
>> board/spear/spear600/spear600.c | 6 +
>> drivers/net/Makefile | 1 +
>> drivers/net/spr_eth_syn.c | 471
>> ++++++++++++++++++++++++++++++
>> include/asm-arm/arch-spear/hardware.h | 2 +
>> include/asm-arm/arch-spear/spr_eth_syn.h | 262 +++++++++++++++++
>> include/configs/spear-common.h | 24 ++-
>> include/configs/spear3xx.h | 3 +
>> include/netdev.h | 1 +
>> 11 files changed, 785 insertions(+), 3 deletions(-)
>> create mode 100755 drivers/net/spr_eth_syn.c
>> create mode 100644 include/asm-arm/arch-spear/spr_eth_syn.h
>>
>>
> I'd prefer to see the driver and its associated files submitted as a
> single patch, an board support added later, but it's not a big deal.
No problem, I would submit 2 patches in v2
1 for network driver support and other for board specific changes
>> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
>> index 1ec0ba1..b230874 100644
>> --- a/drivers/net/Makefile
>> +++ b/drivers/net/Makefile
>> @@ -68,6 +68,7 @@ COBJS-$(CONFIG_DRIVER_S3C4510_ETH) += s3c4510b_eth.o
>> COBJS-$(CONFIG_SH_ETHER) += sh_eth.o
>> COBJS-$(CONFIG_SMC91111) += smc91111.o
>> COBJS-$(CONFIG_SMC911X) += smc911x.o
>> +COBJS-$(CONFIG_SPEAR_ETHERNET) += spr_eth_syn.o
>>
> Please ensure that the CONFIG and driver name convey the same
> information (these ones don't)
OK
>> + */
>> +
>> +#include<common.h>
>> +#include<miiphy.h>
>> +#include<malloc.h>
>> +#include<asm/errno.h>
>> +#include<asm/io.h>
>> +#include<asm/arch/hardware.h>
>> +#include<asm/arch/spr_eth_syn.h>
>> +
>> +static struct eth_dma_regs *dma_p =
>> + (struct eth_dma_regs *)CONFIG_SPEAR_ETHDMABASE;
>> +static struct eth_mac_regs *mac_p =
>> + (struct eth_mac_regs *)CONFIG_SPEAR_ETHMACBASE;
>> +
>>
> No globals please. It makes it impossible to have more than one
> instance of the driver. Put data in dev->priv instead.
OK. I would use allocate memory dynamically for patch version 2
>> +static struct eth_device *netdev;
>> +
>> +static struct dmamacdescr
>> + tx_mac_descrtable[CONFIG_TX_DESCR_NUM] __attribute__
>> ((aligned(256)));
>> +static struct dmamacdescr
>> + rx_mac_descrtable[CONFIG_RX_DESCR_NUM] __attribute__
>> ((aligned(256)));
>> +
>> +static u32 tx_currdescnum;
>> +static u32 rx_currdescnum;
>> +
>> +static char txbuffs[TX_TOTAL_BUFSIZE] __attribute__ ((aligned(2048)));
>> +static char rxbuffs[RX_TOTAL_BUFSIZE] __attribute__ ((aligned(2048)));
>> +
>> +static void xfer_enable(void)
>>
> All functions should take eth_device * as argument so you can access
> private data
OK
>> +}
>> +
>> +static void descs_init(void)
>> +{
>> + tx_descs_init(CONFIG_TX_DESCR_NUM);
>> + rx_descs_init(CONFIG_RX_DESCR_NUM);
>> +}
>> +
>> +static int set_hwaddr(void)
>> +{
>> + u8 mac_id[6];
>> + u32 macid_lo, macid_hi;
>> +
>> + if (eth_getenv_enetaddr("ethaddr", mac_id)) {
>>
> Please read the documentation and look at other drivers to see how they
> handle the environment. Hint: you get it from the eth_device *.
OK
>> +static void spear_reset_phy(struct eth_device *dev)
>> +{
>> + struct spear_eth_dev *priv = dev->priv;
>> + u16 ctrl;
>> + u32 timeout = CONFIG_PHYRESET_TIMEOUT;
>> + u32 phy_addr = priv->address;
>> +
>> + eth_mdio_write(dev->name, phy_addr, PHY_BMCR, PHY_BMCR_RESET);
>> + do {
>> + eth_mdio_read(dev->name, phy_addr, PHY_BMCR,&ctrl);
>> + if (!(ctrl& PHY_BMCR_RESET))
>> + break;
>> + udelay(1000);
>> + } while (timeout--);
>> +
>> + udelay(CONFIG_PHY_RESET_DELAY);
>> +}
>> +
>> +void reset_phy(void)
>>
> Something with such a generic name should not be public
This is a standard global u-boot function which should be defined if
CONFIG_RESET_PHY_R is #defined
>> +{
>> + spear_reset_phy(netdev);
>> +}
>> +
>> +static void configure_phy(struct eth_device *dev)
>> +{
>> + struct spear_eth_dev *priv = dev->priv;
>> + char *an, *sp, *du;
>> + u8 phy_addr;
>> + u16 bmcr, bmsr, ctrl;
>> + u32 timeout;
>> + u16 anlpar, btsr;
>> +
>> + priv->address = find_phy(dev);
>> + phy_addr = priv->address;
>> +
>> + spear_reset_phy(netdev);
>> +
>> + an = getenv("ethautoneg");
>>
> Is this a new environment variable? If so, it needs to be interface
> #-specific, which is tricky. Does this really need to come from the
> environment? Same goes for all of these... Since you're using the
> U-boot MII framework, I'd much rather see the common code changed to
> support this than a specific driver.
Another way is to provide compile time switches.
I wanted to keep this changeable on the board. So that the code does not
need a recompile to change this behavior
I would provide compile switches which can be defined along with board
configuration
>> + if ((an != NULL)&& strcmp(an, "n")) {
>> + bmcr = PHY_BMCR_AUTON | PHY_BMCR_RST_NEG | PHY_BMCR_100MB | \
>> + PHY_BMCR_DPLX | PHY_BMCR_1000_MBPS;
>> + } else {
>> + bmcr = PHY_BMCR_100MB | PHY_BMCR_DPLX;
>> +
>> + sp = getenv("ethspeed");
>> + if ((sp != NULL)&& (!strcmp(sp, "10M")))
>> + bmcr&= ~PHY_BMCR_100MB;
>> +
>> + du = getenv("ethduplex");
>> + if ((du != NULL)&& (!strcmp(du, "half")))
>> + bmcr&= ~PHY_BMCR_DPLX;
>> + }
>> +
>> + eth_mdio_write(dev->name, phy_addr, PHY_BMCR, bmcr);
>> +
>> + /* Read the phy status register and populate priv structure */
>> + if ((an != NULL)&& strcmp(an, "n")) {
>> +
>> + timeout = CONFIG_AUTONEG_TIMEOUT;
>> + do {
>> + eth_mdio_read(dev->name, phy_addr, PHY_BMSR,&bmsr);
>> + if (bmsr& PHY_BMSR_AUTN_COMP)
>> + break;
>> + udelay(1000);
>> + } while (timeout--);
>> +
>> + eth_mdio_read(dev->name, phy_addr, PHY_ANLPAR,&anlpar);
>> + eth_mdio_read(dev->name, phy_addr, PHY_1000BTSR,&btsr);
>> +
>> + if (btsr& (PHY_1000BTSR_1000FD | PHY_1000BTSR_1000HD)) {
>> + priv->speed = SPEED_1000M;
>> + if (btsr& PHY_1000BTSR_1000FD)
>> + priv->duplex = FULL_DUPLEX;
>> + else
>> + priv->duplex = HALF_DUPLEX;
>> + } else {
>> + if (anlpar& PHY_ANLPAR_100)
>> + priv->speed = SPEED_100M;
>> + else
>> + priv->speed = SPEED_10M;
>> +
>> + if (anlpar& (PHY_ANLPAR_10FD | PHY_ANLPAR_TXFD))
>> + priv->duplex = FULL_DUPLEX;
>> + else
>> + priv->duplex = HALF_DUPLEX;
>> + }
>> + } else {
>> + eth_mdio_read(dev->name, phy_addr, PHY_BMCR,&ctrl);
>> +
>> + if (ctrl& PHY_BMCR_DPLX)
>> + priv->duplex = FULL_DUPLEX;
>> + else
>> + priv->duplex = HALF_DUPLEX;
>> +
>> + if (ctrl& PHY_BMCR_1000_MBPS)
>> + priv->speed = SPEED_1000M;
>> + else if (ctrl& PHY_BMCR_100_MBPS)
>> + priv->speed = SPEED_100M;
>> + else
>> + priv->speed = SPEED_10M;
>> + }
>> +}
>> +
>> +int spear_mii_initialize(u32 id)
>>
> Please pass in the base address rather than hard coding it. Look how
> other drivers do this (CS8900 is a good example)
OK
>> +{
>> + struct spear_eth_dev *priv;
>> +
>> + netdev = (struct eth_device *) malloc(sizeof(struct eth_device));
>> + if (!netdev)
>> + return -ENOMEM;
>> +
>> + priv = (struct spear_eth_dev *) malloc(sizeof(struct
>> spear_eth_dev));
>> + if (!priv) {
>> + free(netdev);
>> + return -ENOMEM;
>> + }
>> +
>> + memset(netdev, 0, sizeof(struct eth_device));
>> + memset(priv, 0, sizeof(struct spear_eth_dev));
>> +
>> + sprintf(netdev->name, "mii%d", id);
>> + priv->dev = netdev;
>> + netdev->iobase = 0;
>> + netdev->priv = priv;
>> +
>> + mac_reset(CONFIG_MACRESET_TIMEOUT);
>> + configure_phy(netdev);
>> +
>> + netdev->init = spear_eth_init;
>> + netdev->send = spear_eth_send;
>> + netdev->recv = spear_eth_recv;
>> + netdev->halt = spear_eth_halt;
>> +
>> + eth_register(netdev);
>> +
>> +#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
>> + miiphy_register(netdev->name, eth_mdio_read, eth_mdio_write);
>> +#endif
>> + return 0;
>> +}
>> diff --git a/include/asm-arm/arch-spear/hardware.h
>> b/include/asm-arm/arch-spear/hardware.h
>> index 818f36c..7133b3c 100644
>> --- a/include/asm-arm/arch-spear/hardware.h
>> +++ b/include/asm-arm/arch-spear/hardware.h
>> @@ -31,6 +31,8 @@
>> #define CONFIG_SPEAR_SYSCNTLBASE (0xFCA00000)
>> #define CONFIG_SPEAR_TIMERBASE (0xFC800000)
>> #define CONFIG_SPEAR_MISCBASE (0xFCA80000)
>> +#define CONFIG_SPEAR_ETHMACBASE (0xE0800000)
>> +#define CONFIG_SPEAR_ETHDMABASE (0xE0801000)
>>
>> #define CONFIG_SYS_NAND_CLE (1<< 16)
>> #define CONFIG_SYS_NAND_ALE (1<< 17)
>> diff --git a/include/asm-arm/arch-spear/spr_eth_syn.h
>> b/include/asm-arm/arch-spear/spr_eth_syn.h
>>
> Please put this header in with the driver. You're artificially making
> this ARM-specific.
OK
>> new file mode 100644
>> index 0000000..3a745ef
>> --- /dev/null
>> +++ b/include/asm-arm/arch-spear/spr_eth_syn.h
>> @@ -0,0 +1,262 @@
>> +/*
>> + * (C) Copyright 2009
>> + * Vipin Kumar, ST Micoelectronics, vipin.kumar at st.com.
>> + *
>> + * See file CREDITS for list of people who contributed to this
>> + * project.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License as
>> + * published by the Free Software Foundation; either version 2 of
>> + * the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>> + * MA 02111-1307 USA
>> + */
>> +
>> +#ifndef _SPR_ETH_SYN_H
>> +#define _SPR_ETH_SYN_H
>> +
>> +#define CONFIG_TX_DESCR_NUM 16
>> +#define CONFIG_RX_DESCR_NUM 16
>> +#define CONFIG_ETH_BUFSIZE 2048
>> +#define TX_TOTAL_BUFSIZE (CONFIG_ETH_BUFSIZE * CONFIG_TX_DESCR_NUM)
>> +#define RX_TOTAL_BUFSIZE (CONFIG_ETH_BUFSIZE * CONFIG_RX_DESCR_NUM)
>> +
>> +#define CONFIG_MACRESET_TIMEOUT (3 * CONFIG_SYS_HZ)
>> +#define CONFIG_MDIO_TIMEOUT (3 * CONFIG_SYS_HZ)
>> +#define CONFIG_PHYRESET_TIMEOUT (3 * CONFIG_SYS_HZ)
>> +#define CONFIG_AUTONEG_TIMEOUT (5 * CONFIG_SYS_HZ)
>> +
>> +struct eth_mac_regs {
>> + u32 conf; /* 0x00 */
>> + u32 framefilt; /* 0x04 */
>> + u32 hashtablehigh; /* 0x08 */
>> + u32 hashtablelow; /* 0x0c */
>> + u32 miiaddr; /* 0x10 */
>> + u32 miidata; /* 0x14 */
>> + u32 flowcontrol; /* 0x18 */
>> + u32 vlantag; /* 0x1c */
>> + u32 version; /* 0x20 */
>> + u8 reserved_1[4];
>> + u32 intreg; /* 0x28 */
>> + u32 intmask; /* 0x2c */
>> + u8 reserved_2[0x40 - 0x30];
>> + u32 macaddr0hi; /* 0x30 */
>> + u32 macaddr0lo; /* 0x34 */
>> +};
>> +
>> +/* MAC configuration register definitions */
>> +#define FRAMEBURSTENABLE (1<< 21)
>> +#define MII_PORTSELECT (1<< 15)
>> +#define DISABLERXOWN (1<< 13)
>> +#define FULLDPLXMODE (1<< 11)
>> +#define RXENABLE (1<< 2)
>> +#define TXENABLE (1<< 3)
>> +
>> +/* MII address register definitions */
>> +#define MII_BUSY (1<< 0)
>> +#define MII_WRITE (1<< 1)
>> +#define MII_CLKRANGE_60_100M (0)
>> +#define MII_CLKRANGE_100_150M (0x4)
>> +#define MII_CLKRANGE_20_35M (0x8)
>> +#define MII_CLKRANGE_35_60M (0xC)
>> +#define MII_CLKRANGE_150_250M (0x10)
>> +#define MII_CLKRANGE_250_300M (0x14)
>> +
>> +#define MIIADDRSHIFT (11)
>> +#define MIIREGSHIFT (6)
>> +#define MII_REGMSK (0x1F<< 6)
>> +#define MII_ADDRMSK (0x1F<< 11)
>> +
>> +
>> +struct eth_dma_regs {
>> + u32 busmode; /* 0x00 */
>> + u32 txpolldemand; /* 0x04 */
>> + u32 rxpolldemand; /* 0x08 */
>> + u32 rxdesclistaddr; /* 0x0c */
>> + u32 txdesclistaddr; /* 0x10 */
>> + u32 status; /* 0x14 */
>> + u32 opmode; /* 0x18 */
>> + u32 intenable; /* 0x1c */
>> + u8 reserved[0x48 - 0x20];
>> + u32 currhosttxdesc; /* 0x48 */
>> + u32 currhostrxdesc; /* 0x4c */
>> + u32 currhosttxbuffaddr; /* 0x50 */
>> + u32 currhostrxbuffaddr; /* 0x54 */
>> +};
>> +
>> +/* Bus mode register definitions */
>> +#define FIXEDBURST (1<< 16)
>> +#define BURST_1 (1<< 8)
>> +#define BURST_2 (2<< 8)
>> +#define BURST_4 (4<< 8)
>> +#define BURST_8 (8<< 8)
>> +#define BURST_16 (16<< 8)
>> +#define BURST_32 (32<< 8)
>> +#define RXHIGHPRIO (1<< 1)
>> +#define DMAMAC_SRST (1<< 0)
>> +
>> +/* Poll demand definitions */
>> +#define POLL_DATA (0xFFFFFFFF)
>> +
>> +/* Operation mode definitions */
>> +#define STOREFORWARD (1<< 21)
>> +#define FLUSHTXFIFO (1<< 20)
>> +#define TXSTART (1<< 13)
>> +#define TXSECONDFRAME (1<< 2)
>> +#define RXSTART (1<< 1)
>> +
>> +/* Descriptior related definitions */
>> +#define MAC_MAX_FRAME_SZ (1528)
>> +
>> +struct dmamacdescr {
>> + u32 txrx_status;
>> + u32 dmamac_cntl;
>> + void *dmamac_addr;
>> + struct dmamacdescr *dmamac_next;
>> +};
>> +
>> +/*
>> + * txrx_status definitions
>> + */
>> +
>> +/* tx status bits definitions */
>> +#if defined(CONFIG_SPEAR_ALTDESC)
>> +
>> +#define DESC_TXSTS_OWNBYDMA (1<< 31)
>> +#define DESC_TXSTS_TXINT (1<< 30)
>> +#define DESC_TXSTS_TXLAST (1<< 29)
>> +#define DESC_TXSTS_TXFIRST (1<< 28)
>> +#define DESC_TXSTS_TXCRCDIS (1<< 27)
>> +
>> +#define DESC_TXSTS_TXPADDIS (1<< 26)
>> +#define DESC_TXSTS_TXCHECKINSCTRL (3<< 22)
>> +#define DESC_TXSTS_TXRINGEND (1<< 21)
>> +#define DESC_TXSTS_TXCHAIN (1<< 20)
>> +#define DESC_TXSTS_MSK (0x1FFFF<< 0)
>> +
>> +#else
>> +
>> +#define DESC_TXSTS_OWNBYDMA (1<< 31)
>> +#define DESC_TXSTS_MSK (0x1FFFF<< 0)
>> +
>> +#endif
>> +
>> +/* rx status bits definitions */
>> +#define DESC_RXSTS_OWNBYDMA (1<< 31)
>> +#define DESC_RXSTS_DAFILTERFAIL (1<< 30)
>> +#define DESC_RXSTS_FRMLENMSK (0x3FFF<< 16)
>> +#define DESC_RXSTS_FRMLENSHFT (16)
>> +
>> +#define DESC_RXSTS_ERROR (1<< 15)
>> +#define DESC_RXSTS_RXTRUNCATED (1<< 14)
>> +#define DESC_RXSTS_SAFILTERFAIL (1<< 13)
>> +#define DESC_RXSTS_RXIPC_GIANTFRAME (1<< 12)
>> +#define DESC_RXSTS_RXDAMAGED (1<< 11)
>> +#define DESC_RXSTS_RXVLANTAG (1<< 10)
>> +#define DESC_RXSTS_RXFIRST (1<< 9)
>> +#define DESC_RXSTS_RXLAST (1<< 8)
>> +#define DESC_RXSTS_RXIPC_GIANT (1<< 7)
>> +#define DESC_RXSTS_RXCOLLISION (1<< 6)
>> +#define DESC_RXSTS_RXFRAMEETHER (1<< 5)
>> +#define DESC_RXSTS_RXWATCHDOG (1<< 4)
>> +#define DESC_RXSTS_RXMIIERROR (1<< 3)
>> +#define DESC_RXSTS_RXDRIBBLING (1<< 2)
>> +#define DESC_RXSTS_RXCRC (1<< 1)
>> +
>> +/*
>> + * dmamac_cntl definitions
>> + */
>> +
>> +/* tx control bits definitions */
>> +#if defined(CONFIG_SPEAR_ALTDESC)
>> +
>> +#define DESC_TXCTRL_SIZE1MASK (0x1FFF<< 0)
>> +#define DESC_TXCTRL_SIZE1SHFT (0)
>> +#define DESC_TXCTRL_SIZE2MASK (0x1FFF<< 16)
>> +#define DESC_TXCTRL_SIZE2SHFT (16)
>> +
>> +#else
>> +
>> +#define DESC_TXCTRL_TXINT (1<< 31)
>> +#define DESC_TXCTRL_TXLAST (1<< 30)
>> +#define DESC_TXCTRL_TXFIRST (1<< 29)
>> +#define DESC_TXCTRL_TXCHECKINSCTRL (3<< 27)
>> +#define DESC_TXCTRL_TXCRCDIS (1<< 26)
>> +#define DESC_TXCTRL_TXRINGEND (1<< 25)
>> +#define DESC_TXCTRL_TXCHAIN (1<< 24)
>> +
>> +#define DESC_TXCTRL_SIZE1MASK (0x7FF<< 0)
>> +#define DESC_TXCTRL_SIZE1SHFT (0)
>> +#define DESC_TXCTRL_SIZE2MASK (0x7FF<< 11)
>> +#define DESC_TXCTRL_SIZE2SHFT (11)
>> +
>> +#endif
>> +
>> +/* rx control bits definitions */
>> +#if defined(CONFIG_SPEAR_ALTDESC)
>> +
>> +#define DESC_RXCTRL_RXINTDIS (1<< 31)
>> +#define DESC_RXCTRL_RXRINGEND (1<< 15)
>> +#define DESC_RXCTRL_RXCHAIN (1<< 14)
>> +
>> +#define DESC_RXCTRL_SIZE1MASK (0x1FFF<< 0)
>> +#define DESC_RXCTRL_SIZE1SHFT (0)
>> +#define DESC_RXCTRL_SIZE2MASK (0x1FFF<< 16)
>> +#define DESC_RXCTRL_SIZE2SHFT (16)
>> +
>> +#else
>> +
>> +#define DESC_RXCTRL_RXINTDIS (1<< 31)
>> +#define DESC_RXCTRL_RXRINGEND (1<< 25)
>> +#define DESC_RXCTRL_RXCHAIN (1<< 24)
>> +
>> +#define DESC_RXCTRL_SIZE1MASK (0x7FF<< 0)
>> +#define DESC_RXCTRL_SIZE1SHFT (0)
>> +#define DESC_RXCTRL_SIZE2MASK (0x7FF<< 11)
>> +#define DESC_RXCTRL_SIZE2SHFT (11)
>> +
>> +#endif
>> +
>> +/*
>> + * dmamac_addr definitions
>> + */
>> +
>> +/* tx addr register bits definitions */
>> +
>> +/* rx addr register bits definitions */
>> +
>> +
>> +/*
>> + * dmamac_next definitions
>> + */
>> +
>> +/* tx next register bits definitions */
>> +
>> +/* rx next register bits definitions */
>> +
>> +struct spear_eth_dev {
>> + u32 address;
>> + u32 speed;
>> + u32 duplex;
>> + struct eth_device *dev;
>>
>
>> +};
>> +
>> +/* Speed specific definitions */
>> +#define SPEED_10M 1
>> +#define SPEED_100M 2
>> +#define SPEED_1000M 3
>> +
>> +/* Duplex mode specific definitions */
>> +#define HALF_DUPLEX 1
>> +#define FULL_DUPLEX 2
>> +
>> +#endif
>> diff --git a/include/configs/spear-common.h
>> b/include/configs/spear-common.h
>> index cc52e39..fe97e94 100644
>> --- a/include/configs/spear-common.h
>> +++ b/include/configs/spear-common.h
>> @@ -27,6 +27,19 @@
>> * Common configurations used for both spear3xx as well as spear6xx
>> */
>>
>> +/* Ethernet configuration */
>> +#define CONFIG_SPEAR_ETHERNET
>> +#define CONFIG_MII
>> +#define CONFIG_NET_MULTI
>> +#define CONFIG_PHY_RESET_DELAY (10000) /* in us */
>> +#define CONFIG_EXTRA_ENV_AUTONEG "ethautoneg=n\0"
>> +#define CONFIG_EXTRA_ENV_ETHSPEED "ethspeed=100M\0"
>> +#define CONFIG_EXTRA_ENV_ETHDUPLEX "ethduplex=full\0"
>> +#define CONFIG_ETHADDR 00:80:E1:11:22:33
>> +#define CONFIG_NETMASK 255.255.255.0
>> +#define CONFIG_IPADDR 192.168.1.10
>> +#define CONFIG_SERVERIP 192.168.1.1
>>
> Please remove all default addresses/masks
Could not understand this point. These definitions are needed and are
done in the same way in board configuration files.
Am I missing something ?
>> +
>> /* USBD driver configuration */
>> #define CONFIG_SPEARUDC
>> #define CONFIG_USB_DEVICE
>> @@ -99,11 +112,13 @@
>> #define CONFIG_CMD_MEMORY
>> #define CONFIG_CMD_RUN
>> #define CONFIG_CMD_SAVES
>> +#define CONFIG_CMD_MII
>> +#define CONFIG_CMD_NET
>> +#define CONFIG_CMD_PING
>> +#define CONFIG_CMD_DHCP
>>
>> /* This must be included AFTER the definition of CONFIG_COMMANDS (if
>> any) */
>> #include<config_cmd_default.h>
>> -#undef CONFIG_CMD_NET
>> -#undef CONFIG_CMD_NFS
>>
>> /*
>> * Default Environment Varible definitions
>> @@ -195,7 +210,10 @@
>> #define CONFIG_SYS_CONSOLE_INFO_QUIET 1
>> #define CONFIG_SYS_64BIT_VSPRINTF 1
>>
>> -#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_USBTTY
>> +#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_USBTTY \
>> + CONFIG_EXTRA_ENV_AUTONEG \
>> + CONFIG_EXTRA_ENV_ETHSPEED \
>> + CONFIG_EXTRA_ENV_ETHDUPLEX
>>
>> /* Stack sizes */
>> #define CONFIG_STACKSIZE (128*1024)
>> diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
>> index 0248aba..b69e734 100755
>> --- a/include/configs/spear3xx.h
>> +++ b/include/configs/spear3xx.h
>> @@ -41,6 +41,9 @@
>>
>> #include<configs/spear-common.h>
>>
>> +/* Ethernet configuration */
>> +#define CONFIG_SPEAR_ALTDESC
>> +
>> /* Serial Configuration (PL011) */
>> #define CONFIG_SYS_SERIAL0 0xD0000000
>>
>> diff --git a/include/netdev.h b/include/netdev.h
>> index 1dd80f0..bd29697 100644
>> --- a/include/netdev.h
>> +++ b/include/netdev.h
>> @@ -79,6 +79,7 @@ int scc_initialize(bd_t *bis);
>> int skge_initialize(bd_t *bis);
>> int smc911x_initialize(u8 dev_num, int base_addr);
>> int smc91111_initialize(u8 dev_num, int base_addr);
>> +int spear_mii_initialize(u32);
>>
> Please add a variable name
OK
>> int tsi108_eth_initialize(bd_t *bis);
>> int uec_initialize(int index);
>> int uec_standard_init(bd_t *bis);
>>
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/4] SPEAr : Network driver support added
2010-03-25 4:48 ` Vipin KUMAR
@ 2010-03-25 5:43 ` Ben Warren
0 siblings, 0 replies; 15+ messages in thread
From: Ben Warren @ 2010-03-25 5:43 UTC (permalink / raw)
To: u-boot
Hi Vipin,
On Wed, Mar 24, 2010 at 9:48 PM, Vipin KUMAR <vipin.kumar@st.com> wrote:
> On 3/23/2010 11:09 PM, Ben Warren wrote:
> > Hi Vipin,
>
> Hello Ben,
>
> > On 3/23/2010 1:30 AM, Vipin KUMAR wrote:
> >> SPEAr SoCs support a synopsys network peripheral. This patch adds the
> >> support
> >> for the same
> >>
> >> Signed-off-by: Vipin Kumar<vipin.kumar@st.com>
> >> ---
> >> board/spear/spear300/spear300.c | 6 +
> >> board/spear/spear310/spear310.c | 6 +
> >> board/spear/spear320/spear320.c | 6 +
> >> board/spear/spear600/spear600.c | 6 +
> >> drivers/net/Makefile | 1 +
> >> drivers/net/spr_eth_syn.c | 471
> >> ++++++++++++++++++++++++++++++
> >> include/asm-arm/arch-spear/hardware.h | 2 +
> >> include/asm-arm/arch-spear/spr_eth_syn.h | 262 +++++++++++++++++
> >> include/configs/spear-common.h | 24 ++-
> >> include/configs/spear3xx.h | 3 +
> >> include/netdev.h | 1 +
> >> 11 files changed, 785 insertions(+), 3 deletions(-)
> >> create mode 100755 drivers/net/spr_eth_syn.c
> >> create mode 100644 include/asm-arm/arch-spear/spr_eth_syn.h
> >>
> >>
>
<snip>
> >>
> >> +/* Ethernet configuration */
> >> +#define CONFIG_SPEAR_ETHERNET
> >> +#define CONFIG_MII
> >> +#define CONFIG_NET_MULTI
> >> +#define CONFIG_PHY_RESET_DELAY (10000) /* in us */
> >> +#define CONFIG_EXTRA_ENV_AUTONEG "ethautoneg=n\0"
> >> +#define CONFIG_EXTRA_ENV_ETHSPEED "ethspeed=100M\0"
> >> +#define CONFIG_EXTRA_ENV_ETHDUPLEX "ethduplex=full\0"
> >> +#define CONFIG_ETHADDR 00:80:E1:11:22:33
> >> +#define CONFIG_NETMASK 255.255.255.0
> >> +#define CONFIG_IPADDR 192.168.1.10
> >> +#define CONFIG_SERVERIP 192.168.1.1
> >>
> > Please remove all default addresses/masks
>
> Could not understand this point. These definitions are needed and are
> done in the same way in board configuration files.
> Am I missing something ?
>
> The MAC and IP addresses are not needed. You'll be able to find lots of
discussions on the ML, but here's the deal anyway:
1. MAC addresses must be unique, and this isn't. In addition, the one that
you've specified has been paid for by some organization (maybe yours, but
I'm too lazy to look it up), with the understanding that it will be used on
one physical MAC.
2. IP addresses are specific to a network. More likely than not, the end
user of this device will not use this subnet, so what's the point?
Recommended practice is to program network parameters at first boot-up using
'setenv'.
Thanks for the submission!
Ben
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased
2010-03-23 8:30 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Vipin KUMAR
@ 2010-03-28 21:51 ` Tom
2010-03-29 3:58 ` Vipin KUMAR
1 sibling, 1 reply; 15+ messages in thread
From: Tom @ 2010-03-28 21:51 UTC (permalink / raw)
To: u-boot
Vipin KUMAR wrote:
> SMI driver fails because of low timeout values. Increasing the erase and write
> timeouts to 3 seconds
This is a huge timeout change.
2ms to 3000ms.
If something goes wrong, it will seem like the board is hung.
Is this ok?
>
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
> ---
> drivers/mtd/spr_smi.c | 8 ++++----
> include/asm-arm/arch-spear/spr_smi.h | 6 +++---
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mtd/spr_smi.c b/drivers/mtd/spr_smi.c
> index 9a70a19..189ee6d 100755
> --- a/drivers/mtd/spr_smi.c
> +++ b/drivers/mtd/spr_smi.c
> @@ -60,11 +60,11 @@ static struct flash_dev flash_ids[] = {
> */
> static void smi_wait_xfer_finish(int timeout)
> {
> - while (timeout--) {
> + do {
> if (readl(&smicntl->smi_sr) & TFF)
> break;
> udelay(1000);
> - }
> + } while (timeout--);
This changes the function to wait at least 1ms even if timeout == 0.
Why was the original logic changed?
> }
>
> /*
> @@ -215,11 +215,11 @@ static int smi_write_enable(int bank)
> /* Restore the CTRL REG1 state */
> writel(ctrlreg1, &smicntl->smi_cr1);
>
> - while (timeout--) {
> + do {
> if (smi_read_sr(bank) & (1 << (bank + WM_SHIFT)))
> break;
> udelay(1000);
> - }
> + } while (timeout--);
>
> if (timeout)
> return 0;
> diff --git a/include/asm-arm/arch-spear/spr_smi.h b/include/asm-arm/arch-spear/spr_smi.h
> index 06df745..e2e5e8f 100755
> --- a/include/asm-arm/arch-spear/spr_smi.h
> +++ b/include/asm-arm/arch-spear/spr_smi.h
> @@ -108,8 +108,8 @@ struct flash_dev {
> ushort sector_count;
> };
>
> -#define SFLASH_PAGE_SIZE 0x100 /* flash page size */
> -#define XFER_FINISH_TOUT 2 /* xfer finish timeout */
> -#define WMODE_TOUT 2 /* write enable timeout */
> +#define SFLASH_PAGE_SIZE 0x100 /* flash page size */
> +#define XFER_FINISH_TOUT (3 * CONFIG_SYS_HZ)
> +#define WMODE_TOUT (3 * CONFIG_SYS_HZ)
>
> #endif
Tom
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET
2010-03-23 8:30 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Vipin KUMAR
@ 2010-03-28 22:38 ` Tom
2010-03-29 3:58 ` Vipin KUMAR
1 sibling, 1 reply; 15+ messages in thread
From: Tom @ 2010-03-28 22:38 UTC (permalink / raw)
To: u-boot
Vipin KUMAR wrote:
> ethaddr can be optionally read from i2c memory. So, chip_config command supports
> reading/writing hw mac id into i2c memory. Placing this code within
> CONFIG_CMD_NET as this would only be needed when network interface is configured
>
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
> ---
> board/spear/common/spr_misc.c | 22 +++++++++++++++++++---
> 1 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c
> index e356912..935b2fa 100755
> --- a/board/spear/common/spr_misc.c
> +++ b/board/spear/common/spr_misc.c
> @@ -37,6 +37,9 @@
>
> DECLARE_GLOBAL_DATA_PTR;
> static struct chip_data chip_data;
> +#if defined(CONFIG_CMD_NET)
> +static int i2c_read_mac(uchar *);
> +#endif
>
> int dram_init(void)
> {
> @@ -166,6 +169,7 @@ int spear_board_init(ulong mach_type)
> return 0;
> }
>
> +#if defined(CONFIG_CMD_NET)
> static int i2c_read_mac(uchar *buffer)
> {
> u8 buf[2];
> @@ -205,15 +209,20 @@ static int write_mac(uchar *mac)
> puts("I2C EEPROM writing failed \n");
> return -1;
> }
> +#endif
>
> int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> {
> void (*sram_setfreq) (unsigned int, unsigned int);
> struct chip_data *chip = &chip_data;
> - unsigned char mac[6];
> - unsigned int reg, frequency;
> + unsigned int frequency;
> +
> +#if defined(CONFIG_CMD_NET)
> + unsigned int reg;
> char *s, *e;
> char i2c_mac[20];
> + unsigned char mac[6];
> +#endif
>
> if ((argc > 3) || (argc < 2)) {
> cmd_usage(cmdtp);
> @@ -244,6 +253,8 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> }
>
> return 0;
> +
> +#if defined(CONFIG_CMD_NET)
> } else if (!strcmp(argv[1], "ethaddr")) {
>
> s = argv[2];
> @@ -255,6 +266,7 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> write_mac(mac);
>
> return 0;
> +#endif
> } else if (!strcmp(argv[1], "print")) {
>
> if (chip->cpufreq == -1)
> @@ -274,13 +286,14 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> else
> printf("DDR Type = Not Known\n");
>
> +#if defined(CONFIG_CMD_NET)
> if (!i2c_read_mac(mac)) {
> sprintf(i2c_mac, "%pM", mac);
> printf("Ethaddr (from i2c mem) = %s\n", i2c_mac);
> } else {
> printf("Ethaddr (from i2c mem) = Not set\n");
> }
> -
> +#endif
> printf("Xloader Rev = %s\n", chip->version);
>
> return 0;
> @@ -293,4 +306,7 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> U_BOOT_CMD(chip_config, 3, 1, do_chip_config,
> "configure chip",
> "chip_config cpufreq/ddrfreq frequency\n"
> +#if defined(CONFIG_CMD_NET)
> + "chip_config ethaddr XX:XX:XX:XX:XX:XX"
> +#endif
> "chip_config print");
May want to add '\n''s at end of help strings.
Fine otherwise.
Tom
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 4/4] SPEAr : macb driver support added for spear310 and spear320
2010-03-23 8:30 ` [U-Boot] [PATCH 4/4] SPEAr : macb driver support added for spear310 and spear320 Vipin KUMAR
@ 2010-03-28 22:40 ` Tom
2010-03-29 4:05 ` Vipin KUMAR
0 siblings, 1 reply; 15+ messages in thread
From: Tom @ 2010-03-28 22:40 UTC (permalink / raw)
To: u-boot
Vipin KUMAR wrote:
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
> ---
> board/spear/spear310/spear310.c | 9 ++++++++-
> board/spear/spear320/spear320.c | 6 +++++-
> include/asm-arm/arch-spear/clk.h | 27 +++++++++++++++++++++++++++
> include/configs/spear3xx.h | 21 +++++++++++++++++++++
> 4 files changed, 61 insertions(+), 2 deletions(-)
> create mode 100644 include/asm-arm/arch-spear/clk.h
>
> diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
> index 2c35a55..6f5c52a 100755
> --- a/board/spear/spear310/spear310.c
> +++ b/board/spear/spear310/spear310.c
> @@ -61,5 +61,12 @@ int board_nand_init(struct nand_chip *nand)
>
> int board_eth_init(bd_t *bis)
> {
> - return spear_mii_initialize(0);
> + spear_mii_initialize(0);
> +
> + macb_eth_initialize(0, (void *)SPR310_MACB0_BASE, SPR310_MACB0_PHY);
> + macb_eth_initialize(1, (void *)SPR310_MACB1_BASE, SPR310_MACB1_PHY);
> + macb_eth_initialize(2, (void *)SPR310_MACB2_BASE, SPR310_MACB2_PHY);
> + macb_eth_initialize(3, (void *)SPR310_MACB3_BASE, SPR310_MACB3_PHY);
> +
> + return 0;
> }
> diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c
> index a804123..e9d8f9f 100755
> --- a/board/spear/spear320/spear320.c
> +++ b/board/spear/spear320/spear320.c
> @@ -61,5 +61,9 @@ int board_nand_init(struct nand_chip *nand)
>
> int board_eth_init(bd_t *bis)
> {
> - return spear_mii_initialize(0);
> + spear_mii_initialize(0);
> +
> + macb_eth_initialize(0, (void *)SPR320_MACB0_BASE, SPR320_MACB0_PHY);
> +
> + return 0;
> }
> diff --git a/include/asm-arm/arch-spear/clk.h b/include/asm-arm/arch-spear/clk.h
> new file mode 100644
> index 0000000..343c6ce
> --- /dev/null
> +++ b/include/asm-arm/arch-spear/clk.h
> @@ -0,0 +1,27 @@
> +/*
> + * (C) Copyright 2009
> + * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
> +{
> + return 83000000;
> +}
These seems like overkill but supports the macb driver..
Ok
> diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
> index b69e734..3bf01b5 100755
> --- a/include/configs/spear3xx.h
> +++ b/include/configs/spear3xx.h
> @@ -44,6 +44,27 @@
> /* Ethernet configuration */
> #define CONFIG_SPEAR_ALTDESC
>
> +#if defined(CONFIG_SPEAR310)
> +#define CONFIG_MACB 1
> +#define CONFIG_MACB_SEARCH_PHY 1
> +
> +#define SPR310_MACB0_BASE 0xB0000000
> +#define SPR310_MACB1_BASE 0xB0800000
> +#define SPR310_MACB2_BASE 0xB1000000
> +#define SPR310_MACB3_BASE 0xB1800000
> +#define SPR310_MACB0_PHY 0x01
> +#define SPR310_MACB1_PHY 0x03
> +#define SPR310_MACB2_PHY 0x05
> +#define SPR310_MACB3_PHY 0x07
> +
> +#elif defined(CONFIG_SPEAR320)
> +#define CONFIG_MACB 1
> +#define CONFIG_MACB_SEARCH_PHY 1
> +
> +#define SPR320_MACB0_BASE 0xAA000000
> +#define SPR320_MACB0_PHY 0x01
> +#endif
> +
> /* Serial Configuration (PL011) */
> #define CONFIG_SYS_SERIAL0 0xD0000000
>
The non CONFIG_* #defines should be in asm/arch-spear/hardware.h or
another appropriate arch *.h
Tom
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased
2010-03-28 21:51 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Tom
@ 2010-03-29 3:58 ` Vipin KUMAR
2010-03-29 12:37 ` Tom
0 siblings, 1 reply; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-29 3:58 UTC (permalink / raw)
To: u-boot
On 3/29/2010 3:21 AM, Tom wrote:
> Vipin KUMAR wrote:
>> SMI driver fails because of low timeout values. Increasing the erase
>> and write
>> timeouts to 3 seconds
>
> This is a huge timeout change.
> 2ms to 3000ms.
> If something goes wrong, it will seem like the board is hung.
> Is this ok?
>
2ms timeout itself was a mistake. 3 sec is OK. Offcourse, 3 secs are
required only when something goes wrong
>>
>> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
>> ---
>> drivers/mtd/spr_smi.c | 8 ++++----
>> include/asm-arm/arch-spear/spr_smi.h | 6 +++---
>> 2 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/mtd/spr_smi.c b/drivers/mtd/spr_smi.c
>> index 9a70a19..189ee6d 100755
>> --- a/drivers/mtd/spr_smi.c
>> +++ b/drivers/mtd/spr_smi.c
>> @@ -60,11 +60,11 @@ static struct flash_dev flash_ids[] = {
>> */
>> static void smi_wait_xfer_finish(int timeout)
>> {
>> - while (timeout--) {
>> + do {
>> if (readl(&smicntl->smi_sr) & TFF)
>> break;
>> udelay(1000);
>> - }
>> + } while (timeout--);
>
> This changes the function to wait at least 1ms even if timeout == 0.
> Why was the original logic changed?
>
Earlier a value of 2 was reading the status register only once. This I
felt is more appropriate since the status register is read every ms and
at least once.
>> }
>>
>> /*
>> @@ -215,11 +215,11 @@ static int smi_write_enable(int bank)
>> /* Restore the CTRL REG1 state */
>> writel(ctrlreg1, &smicntl->smi_cr1);
>>
>> - while (timeout--) {
>> + do {
>> if (smi_read_sr(bank) & (1 << (bank + WM_SHIFT)))
>> break;
>> udelay(1000);
>> - }
>> + } while (timeout--);
>>
>> if (timeout)
>> return 0;
>> diff --git a/include/asm-arm/arch-spear/spr_smi.h
>> b/include/asm-arm/arch-spear/spr_smi.h
>> index 06df745..e2e5e8f 100755
>> --- a/include/asm-arm/arch-spear/spr_smi.h
>> +++ b/include/asm-arm/arch-spear/spr_smi.h
>> @@ -108,8 +108,8 @@ struct flash_dev {
>> ushort sector_count;
>> };
>>
>> -#define SFLASH_PAGE_SIZE 0x100 /* flash page size */
>> -#define XFER_FINISH_TOUT 2 /* xfer finish timeout */
>> -#define WMODE_TOUT 2 /* write enable timeout */
>> +#define SFLASH_PAGE_SIZE 0x100 /* flash page size */
>> +#define XFER_FINISH_TOUT (3 * CONFIG_SYS_HZ)
>> +#define WMODE_TOUT (3 * CONFIG_SYS_HZ)
>>
>> #endif
>
> Tom
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET
2010-03-28 22:38 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Tom
@ 2010-03-29 3:58 ` Vipin KUMAR
0 siblings, 0 replies; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-29 3:58 UTC (permalink / raw)
To: u-boot
On 3/29/2010 4:08 AM, Tom wrote:
> Vipin KUMAR wrote:
>> ethaddr can be optionally read from i2c memory. So, chip_config
>> command supports
>> reading/writing hw mac id into i2c memory. Placing this code within
>> CONFIG_CMD_NET as this would only be needed when network interface is
>> configured
>>
>> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
>> ---
>> board/spear/common/spr_misc.c | 22 +++++++++++++++++++---
>> 1 files changed, 19 insertions(+), 3 deletions(-)
>>
>> diff --git a/board/spear/common/spr_misc.c
>> b/board/spear/common/spr_misc.c
>> index e356912..935b2fa 100755
>> --- a/board/spear/common/spr_misc.c
>> +++ b/board/spear/common/spr_misc.c
>> @@ -37,6 +37,9 @@
>>
>> DECLARE_GLOBAL_DATA_PTR;
>> static struct chip_data chip_data;
>> +#if defined(CONFIG_CMD_NET)
>> +static int i2c_read_mac(uchar *);
>> +#endif
>>
>> int dram_init(void)
>> {
>> @@ -166,6 +169,7 @@ int spear_board_init(ulong mach_type)
>> return 0;
>> }
>>
>> +#if defined(CONFIG_CMD_NET)
>> static int i2c_read_mac(uchar *buffer)
>> {
>> u8 buf[2];
>> @@ -205,15 +209,20 @@ static int write_mac(uchar *mac)
>> puts("I2C EEPROM writing failed \n");
>> return -1;
>> }
>> +#endif
>>
>> int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
>> {
>> void (*sram_setfreq) (unsigned int, unsigned int);
>> struct chip_data *chip = &chip_data;
>> - unsigned char mac[6];
>> - unsigned int reg, frequency;
>> + unsigned int frequency;
>> +
>> +#if defined(CONFIG_CMD_NET)
>> + unsigned int reg;
>> char *s, *e;
>> char i2c_mac[20];
>> + unsigned char mac[6];
>> +#endif
>>
>> if ((argc > 3) || (argc < 2)) {
>> cmd_usage(cmdtp);
>> @@ -244,6 +253,8 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int
>> argc, char *argv[])
>> }
>>
>> return 0;
>> +
>> +#if defined(CONFIG_CMD_NET)
>> } else if (!strcmp(argv[1], "ethaddr")) {
>>
>> s = argv[2];
>> @@ -255,6 +266,7 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int
>> argc, char *argv[])
>> write_mac(mac);
>>
>> return 0;
>> +#endif
>> } else if (!strcmp(argv[1], "print")) {
>>
>> if (chip->cpufreq == -1)
>> @@ -274,13 +286,14 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag,
>> int argc, char *argv[])
>> else
>> printf("DDR Type = Not Known\n");
>>
>> +#if defined(CONFIG_CMD_NET)
>> if (!i2c_read_mac(mac)) {
>> sprintf(i2c_mac, "%pM", mac);
>> printf("Ethaddr (from i2c mem) = %s\n", i2c_mac);
>> } else {
>> printf("Ethaddr (from i2c mem) = Not set\n");
>> }
>> -
>> +#endif
>> printf("Xloader Rev = %s\n", chip->version);
>>
>> return 0;
>> @@ -293,4 +306,7 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int
>> argc, char *argv[])
>> U_BOOT_CMD(chip_config, 3, 1, do_chip_config,
>> "configure chip",
>> "chip_config cpufreq/ddrfreq frequency\n"
>> +#if defined(CONFIG_CMD_NET)
>> + "chip_config ethaddr XX:XX:XX:XX:XX:XX"
>> +#endif
>> "chip_config print");
>
> May want to add '\n''s at end of help strings.
> Fine otherwise.
OK. I would incorporate this in patchset v2
Thanks
Regards
Vipin
> Tom
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 4/4] SPEAr : macb driver support added for spear310 and spear320
2010-03-28 22:40 ` Tom
@ 2010-03-29 4:05 ` Vipin KUMAR
0 siblings, 0 replies; 15+ messages in thread
From: Vipin KUMAR @ 2010-03-29 4:05 UTC (permalink / raw)
To: u-boot
On 3/29/2010 4:10 AM, Tom wrote:
> Vipin KUMAR wrote:
>> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
>> ---
>> board/spear/spear310/spear310.c | 9 ++++++++-
>> board/spear/spear320/spear320.c | 6 +++++-
>> include/asm-arm/arch-spear/clk.h | 27 +++++++++++++++++++++++++++
>> include/configs/spear3xx.h | 21 +++++++++++++++++++++
>> 4 files changed, 61 insertions(+), 2 deletions(-)
>> create mode 100644 include/asm-arm/arch-spear/clk.h
>>
>> diff --git a/board/spear/spear310/spear310.c
>> b/board/spear/spear310/spear310.c
>> index 2c35a55..6f5c52a 100755
>> --- a/board/spear/spear310/spear310.c
>> +++ b/board/spear/spear310/spear310.c
>> @@ -61,5 +61,12 @@ int board_nand_init(struct nand_chip *nand)
>>
>> int board_eth_init(bd_t *bis)
>> {
>> - return spear_mii_initialize(0);
>> + spear_mii_initialize(0);
>> +
>> + macb_eth_initialize(0, (void *)SPR310_MACB0_BASE, SPR310_MACB0_PHY);
>> + macb_eth_initialize(1, (void *)SPR310_MACB1_BASE, SPR310_MACB1_PHY);
>> + macb_eth_initialize(2, (void *)SPR310_MACB2_BASE, SPR310_MACB2_PHY);
>> + macb_eth_initialize(3, (void *)SPR310_MACB3_BASE, SPR310_MACB3_PHY);
>> +
>> + return 0;
>> }
>> diff --git a/board/spear/spear320/spear320.c
>> b/board/spear/spear320/spear320.c
>> index a804123..e9d8f9f 100755
>> --- a/board/spear/spear320/spear320.c
>> +++ b/board/spear/spear320/spear320.c
>> @@ -61,5 +61,9 @@ int board_nand_init(struct nand_chip *nand)
>>
>> int board_eth_init(bd_t *bis)
>> {
>> - return spear_mii_initialize(0);
>> + spear_mii_initialize(0);
>> +
>> + macb_eth_initialize(0, (void *)SPR320_MACB0_BASE, SPR320_MACB0_PHY);
>> +
>> + return 0;
>> }
>> diff --git a/include/asm-arm/arch-spear/clk.h
>> b/include/asm-arm/arch-spear/clk.h
>> new file mode 100644
>> index 0000000..343c6ce
>> --- /dev/null
>> +++ b/include/asm-arm/arch-spear/clk.h
>> @@ -0,0 +1,27 @@
>> +/*
>> + * (C) Copyright 2009
>> + * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
>> + *
>> + * See file CREDITS for list of people who contributed to this
>> + * project.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public License as
>> + * published by the Free Software Foundation; either version 2 of
>> + * the License, or (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>> + * MA 02111-1307 USA
>> + */
>> +
>> +static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
>> +{
>> + return 83000000;
>> +}
> These seems like overkill but supports the macb driver..
> Ok
overkill....hmm
actually, there is not clock framework as such that's why had to hard
code the value
>> diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
>> index b69e734..3bf01b5 100755
>> --- a/include/configs/spear3xx.h
>> +++ b/include/configs/spear3xx.h
>> @@ -44,6 +44,27 @@
>> /* Ethernet configuration */
>> #define CONFIG_SPEAR_ALTDESC
>>
>> +#if defined(CONFIG_SPEAR310)
>> +#define CONFIG_MACB 1
>> +#define CONFIG_MACB_SEARCH_PHY 1
>> +
>> +#define SPR310_MACB0_BASE 0xB0000000
>> +#define SPR310_MACB1_BASE 0xB0800000
>> +#define SPR310_MACB2_BASE 0xB1000000
>> +#define SPR310_MACB3_BASE 0xB1800000
>> +#define SPR310_MACB0_PHY 0x01
>> +#define SPR310_MACB1_PHY 0x03
>> +#define SPR310_MACB2_PHY 0x05
>> +#define SPR310_MACB3_PHY 0x07
>> +
>> +#elif defined(CONFIG_SPEAR320)
>> +#define CONFIG_MACB 1
>> +#define CONFIG_MACB_SEARCH_PHY 1
>> +
>> +#define SPR320_MACB0_BASE 0xAA000000
>> +#define SPR320_MACB0_PHY 0x01
>> +#endif
>> +
>> /* Serial Configuration (PL011) */
>> #define CONFIG_SYS_SERIAL0 0xD0000000
>>
> The non CONFIG_* #defines should be in asm/arch-spear/hardware.h or
> another appropriate arch *.h
>
OK, find the changes in patchset v2
Thanks and Regards
Vipin
> Tom
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased
2010-03-29 3:58 ` Vipin KUMAR
@ 2010-03-29 12:37 ` Tom
0 siblings, 0 replies; 15+ messages in thread
From: Tom @ 2010-03-29 12:37 UTC (permalink / raw)
To: u-boot
Vipin KUMAR wrote:
> On 3/29/2010 3:21 AM, Tom wrote:
>> Vipin KUMAR wrote:
>>> SMI driver fails because of low timeout values. Increasing the erase
>>> and write
>>> timeouts to 3 seconds
>> This is a huge timeout change.
>> 2ms to 3000ms.
>> If something goes wrong, it will seem like the board is hung.
>> Is this ok?
>>
>
> 2ms timeout itself was a mistake. 3 sec is OK. Offcourse, 3 secs are
> required only when something goes wrong
OK
>
<snip>
>>> + } while (timeout--);
>> This changes the function to wait at least 1ms even if timeout == 0.
>> Why was the original logic changed?
>>
>
> Earlier a value of 2 was reading the status register only once. This I
> felt is more appropriate since the status register is read every ms and
> at least once.
OK
Tom
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2010-03-29 12:37 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-23 8:30 [U-Boot] [PATCH 0/4] SPEAr : Network support and misc changes Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Vipin KUMAR
2010-03-23 8:30 ` [U-Boot] [PATCH 4/4] SPEAr : macb driver support added for spear310 and spear320 Vipin KUMAR
2010-03-28 22:40 ` Tom
2010-03-29 4:05 ` Vipin KUMAR
2010-03-23 17:39 ` [U-Boot] [PATCH 3/4] SPEAr : Network driver support added Ben Warren
2010-03-25 4:48 ` Vipin KUMAR
2010-03-25 5:43 ` Ben Warren
2010-03-28 22:38 ` [U-Boot] [PATCH 2/4] SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET Tom
2010-03-29 3:58 ` Vipin KUMAR
2010-03-28 21:51 ` [U-Boot] [PATCH 1/4] SPEAr : SMI erase and write timeouts increased Tom
2010-03-29 3:58 ` Vipin KUMAR
2010-03-29 12:37 ` Tom
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.