brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'net' of https://gitlab.denx.de/u-boot/custodians/u-boot-sh into next 

- Convert pcnet and eepro100 ethernet drivers to DM
This commit is contained in:
Tom Rini 2020-06-20 18:52:51 -04:00
parent 5575f79bda d789a8259e
commit 6ccbd1590f
39 changed files with 1138 additions and 932 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -889,11 +889,6 @@ The following options need to be configured:
Allow generic access to the SPI bus on the Intel 8257x, for
example with the "sspi" command.
CONFIG_EEPRO100
Support for Intel 82557/82559/82559ER chips.
Optional CONFIG_EEPRO100_SROM_WRITE enables EEPROM
write routine for first time initialisation.
CONFIG_TULIP
Support for Digital 2114x chips.

1
configs/MPC8315ERDB_defconfig
View File

@ -147,6 +147,7 @@ CONFIG_PHY_NATSEMI=y
CONFIG_PHY_REALTEK=y
CONFIG_PHY_SMSC=y
CONFIG_PHY_VITESSE=y
CONFIG_EEPRO100=y
CONFIG_MII=y
CONFIG_TSEC_ENET=y
CONFIG_SYS_NS16550=y

1
configs/TQM834x_defconfig
View File

@ -159,6 +159,7 @@ CONFIG_PHY_NATSEMI=y
CONFIG_PHY_REALTEK=y
CONFIG_PHY_SMSC=y
CONFIG_PHY_VITESSE=y
CONFIG_EEPRO100=y
CONFIG_MII=y
CONFIG_TSEC_ENET=y
CONFIG_SYS_NS16550=y

1
configs/integratorap_cm720t_defconfig
View File

@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_EEPRO100=y
CONFIG_PCI=y
CONFIG_BAUDRATE=38400
CONFIG_OF_LIBFDT=y

1
configs/integratorap_cm920t_defconfig
View File

@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_EEPRO100=y
CONFIG_PCI=y
CONFIG_BAUDRATE=38400
CONFIG_OF_LIBFDT=y

1
configs/integratorap_cm926ejs_defconfig
View File

@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_EEPRO100=y
CONFIG_PCI=y
CONFIG_BAUDRATE=38400
CONFIG_OF_LIBFDT=y

1
configs/integratorap_cm946es_defconfig
View File

@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_EEPRO100=y
CONFIG_PCI=y
CONFIG_BAUDRATE=38400
CONFIG_OF_LIBFDT=y

1
configs/malta64_defconfig
View File

@ -27,6 +27,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_PCNET=y
CONFIG_PCI=y
CONFIG_RTC_MC146818=y
CONFIG_SYS_NS16550=y

1
configs/malta64el_defconfig
View File

@ -28,6 +28,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_PCNET=y
CONFIG_PCI=y
CONFIG_RTC_MC146818=y
CONFIG_SYS_NS16550=y

1
configs/malta_defconfig
View File

@ -26,6 +26,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_PCNET=y
CONFIG_PCI=y
CONFIG_RTC_MC146818=y
CONFIG_SYS_NS16550=y

1
configs/maltael_defconfig
View File

@ -27,6 +27,7 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_PCNET=y
CONFIG_PCI=y
CONFIG_RTC_MC146818=y
CONFIG_SYS_NS16550=y

12
drivers/net/Kconfig
View File

@ -193,6 +193,12 @@ config CMD_E1000
used on devices with SPI support you can reprogram the EEPROM from
U-Boot.
config EEPRO100
bool "Intel PRO/100 82557/82559/82559ER Fast Ethernet support"
help
This driver supports Intel(R) PRO/100 82557/82559/82559ER fast
ethernet family of adapters.
config ETH_SANDBOX
depends on DM_ETH && SANDBOX
default y
@ -392,6 +398,12 @@ config MII
help
Enable support of the Media-Independent Interface (MII)
config PCNET
bool "AMD PCnet series Ethernet controller driver"
help
This driver supports AMD PCnet series fast ethernet family of
PCI chipsets/adapters.
config RTL8139
bool "Realtek 8139 series Ethernet controller driver"
help

1397
drivers/net/eepro100.c
View File

File diff suppressed because it is too large Load Diff

618
drivers/net/pcnet.c
View File

@ -9,7 +9,9 @@
#include <common.h>
#include <cpu_func.h>
#include <log.h>
#include <dm.h>
#include <malloc.h>
#include <memalign.h>
#include <net.h>
#include <netdev.h>
#include <asm/cache.h>
@ -74,17 +76,26 @@ struct pcnet_uncached_priv {
struct pcnet_rx_head rx_ring[RX_RING_SIZE];
struct pcnet_tx_head tx_ring[TX_RING_SIZE];
struct pcnet_init_block init_block;
};
} __aligned(ARCH_DMA_MINALIGN);
typedef struct pcnet_priv {
struct pcnet_uncached_priv *uc;
struct pcnet_priv {
struct pcnet_uncached_priv ucp;
/* Receive Buffer space */
unsigned char (*rx_buf)[RX_RING_SIZE][PKT_BUF_SZ + 4];
unsigned char rx_buf[RX_RING_SIZE][PKT_BUF_SZ + 4];
struct pcnet_uncached_priv *uc;
#ifdef CONFIG_DM_ETH
struct udevice *dev;
const char *name;
#else
pci_dev_t dev;
char *name;
#endif
void __iomem *iobase;
u8 *enetaddr;
u16 status;
int cur_rx;
int cur_tx;
} pcnet_priv_t;
static pcnet_priv_t *lp;
};
/* Offsets from base I/O address for WIO mode */
#define PCNET_RDP 0x10
@ -92,172 +103,74 @@ static pcnet_priv_t *lp;
#define PCNET_RESET 0x14
#define PCNET_BDP 0x16
static u16 pcnet_read_csr(struct eth_device *dev, int index)
static u16 pcnet_read_csr(struct pcnet_priv *lp, int index)
{
void __iomem *base = (void __iomem *)dev->iobase;
writew(index, base + PCNET_RAP);
return readw(base + PCNET_RDP);
writew(index, lp->iobase + PCNET_RAP);
return readw(lp->iobase + PCNET_RDP);
}
static void pcnet_write_csr(struct eth_device *dev, int index, u16 val)
static void pcnet_write_csr(struct pcnet_priv *lp, int index, u16 val)
{
void __iomem *base = (void __iomem *)dev->iobase;
writew(index, base + PCNET_RAP);
writew(val, base + PCNET_RDP);
writew(index, lp->iobase + PCNET_RAP);
writew(val, lp->iobase + PCNET_RDP);
}
static u16 pcnet_read_bcr(struct eth_device *dev, int index)
static u16 pcnet_read_bcr(struct pcnet_priv *lp, int index)
{
void __iomem *base = (void __iomem *)dev->iobase;
writew(index, base + PCNET_RAP);
return readw(base + PCNET_BDP);
writew(index, lp->iobase + PCNET_RAP);
return readw(lp->iobase + PCNET_BDP);
}
static void pcnet_write_bcr(struct eth_device *dev, int index, u16 val)
static void pcnet_write_bcr(struct pcnet_priv *lp, int index, u16 val)
{
void __iomem *base = (void __iomem *)dev->iobase;
writew(index, base + PCNET_RAP);
writew(val, base + PCNET_BDP);
writew(index, lp->iobase + PCNET_RAP);
writew(val, lp->iobase + PCNET_BDP);
}
static void pcnet_reset(struct eth_device *dev)
static void pcnet_reset(struct pcnet_priv *lp)
{
void __iomem *base = (void __iomem *)dev->iobase;
readw(base + PCNET_RESET);
readw(lp->iobase + PCNET_RESET);
}
static int pcnet_check(struct eth_device *dev)
static int pcnet_check(struct pcnet_priv *lp)
{
void __iomem *base = (void __iomem *)dev->iobase;
writew(88, base + PCNET_RAP);
return readw(base + PCNET_RAP) == 88;
writew(88, lp->iobase + PCNET_RAP);
return readw(lp->iobase + PCNET_RAP) == 88;
}
static int pcnet_init (struct eth_device *dev, bd_t * bis);
static int pcnet_send(struct eth_device *dev, void *packet, int length);
static int pcnet_recv (struct eth_device *dev);
static void pcnet_halt (struct eth_device *dev);
static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_num);
static inline pci_addr_t pcnet_virt_to_mem(const struct eth_device *dev,
void *addr)
static inline pci_addr_t pcnet_virt_to_mem(struct pcnet_priv *lp, void *addr)
{
pci_dev_t devbusfn = (pci_dev_t)(unsigned long)dev->priv;
void *virt_addr = addr;
return pci_virt_to_mem(devbusfn, virt_addr);
#ifdef CONFIG_DM_ETH
return dm_pci_virt_to_mem(lp->dev, virt_addr);
#else
return pci_virt_to_mem(lp->dev, virt_addr);
#endif
}
static struct pci_device_id supported[] = {
{PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE},
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE) },
{}
};
int pcnet_initialize(bd_t *bis)
{
pci_dev_t devbusfn;
struct eth_device *dev;
u16 command, status;
int dev_nr = 0;
u32 bar;
PCNET_DEBUG1("\npcnet_initialize...\n");
for (dev_nr = 0;; dev_nr++) {
/*
* Find the PCnet PCI device(s).
*/
devbusfn = pci_find_devices(supported, dev_nr);
if (devbusfn < 0)
break;
/*
* Allocate and pre-fill the device structure.
*/
dev = (struct eth_device *)malloc(sizeof(*dev));
if (!dev) {
printf("pcnet: Can not allocate memory\n");
break;
}
memset(dev, 0, sizeof(*dev));
dev->priv = (void *)(unsigned long)devbusfn;
sprintf(dev->name, "pcnet#%d", dev_nr);
/*
* Setup the PCI device.
*/
pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &bar);
dev->iobase = pci_mem_to_phys(devbusfn, bar);
dev->iobase &= ~0xf;
PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%lx: ",
dev->name, devbusfn, (unsigned long)dev->iobase);
command = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
pci_write_config_word(devbusfn, PCI_COMMAND, command);
pci_read_config_word(devbusfn, PCI_COMMAND, &status);
if ((status & command) != command) {
printf("%s: Couldn't enable IO access or Bus Mastering\n",
dev->name);
free(dev);
continue;
}
pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, 0x40);
/*
* Probe the PCnet chip.
*/
if (pcnet_probe(dev, bis, dev_nr) < 0) {
free(dev);
continue;
}
/*
* Setup device structure and register the driver.
*/
dev->init = pcnet_init;
dev->halt = pcnet_halt;
dev->send = pcnet_send;
dev->recv = pcnet_recv;
eth_register(dev);
}
udelay(10 * 1000);
return dev_nr;
}
static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
static int pcnet_probe_common(struct pcnet_priv *lp)
{
int chip_version;
char *chipname;
#ifdef PCNET_HAS_PROM
int i;
#endif
/* Reset the PCnet controller */
pcnet_reset(dev);
pcnet_reset(lp);
/* Check if register access is working */
if (pcnet_read_csr(dev, 0) != 4 || !pcnet_check(dev)) {
printf("%s: CSR register access check failed\n", dev->name);
if (pcnet_read_csr(lp, 0) != 4 || !pcnet_check(lp)) {
printf("%s: CSR register access check failed\n", lp->name);
return -1;
}
/* Identify the chip */
chip_version =
pcnet_read_csr(dev, 88) | (pcnet_read_csr(dev, 89) << 16);
chip_version = pcnet_read_csr(lp, 88) | (pcnet_read_csr(lp, 89) << 16);
if ((chip_version & 0xfff) != 0x003)
return -1;
chip_version = (chip_version >> 12) & 0xffff;
@ -273,13 +186,12 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
break;
default:
printf("%s: PCnet version %#x not supported\n",
dev->name, chip_version);
lp->name, chip_version);
return -1;
}
PCNET_DEBUG1("AMD %s\n", chipname);
#ifdef PCNET_HAS_PROM
/*
* In most chips, after a chip reset, the ethernet address is read from
* the station address PROM at the base address and programmed into the
@ -288,36 +200,35 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
for (i = 0; i < 3; i++) {
unsigned int val;
val = pcnet_read_csr(dev, i + 12) & 0x0ffff;
val = pcnet_read_csr(lp, i + 12) & 0x0ffff;
/* There may be endianness issues here. */
dev->enetaddr[2 * i] = val & 0x0ff;
dev->enetaddr[2 * i + 1] = (val >> 8) & 0x0ff;
lp->enetaddr[2 * i] = val & 0x0ff;
lp->enetaddr[2 * i + 1] = (val >> 8) & 0x0ff;
}
#endif /* PCNET_HAS_PROM */
return 0;
}
static int pcnet_init(struct eth_device *dev, bd_t *bis)
static int pcnet_init_common(struct pcnet_priv *lp)
{
struct pcnet_uncached_priv *uc;
int i, val;
unsigned long addr;
PCNET_DEBUG1("%s: pcnet_init...\n", dev->name);
PCNET_DEBUG1("%s: %s...\n", lp->name, __func__);
/* Switch pcnet to 32bit mode */
pcnet_write_bcr(dev, 20, 2);
pcnet_write_bcr(lp, 20, 2);
/* Set/reset autoselect bit */
val = pcnet_read_bcr(dev, 2) & ~2;
val = pcnet_read_bcr(lp, 2) & ~2;
val |= 2;
pcnet_write_bcr(dev, 2, val);
pcnet_write_bcr(lp, 2, val);
/* Enable auto negotiate, setup, disable fd */
val = pcnet_read_bcr(dev, 32) & ~0x98;
val = pcnet_read_bcr(lp, 32) & ~0x98;
val |= 0x20;
pcnet_write_bcr(dev, 32, val);
pcnet_write_bcr(lp, 32, val);
/*
* Enable NOUFLO on supported controllers, with the transmit
@ -327,36 +238,12 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
* slower devices. Controllers which do not support NOUFLO will
* simply be left with a larger transmit FIFO threshold.
*/
val = pcnet_read_bcr(dev, 18);
val = pcnet_read_bcr(lp, 18);
val |= 1 << 11;
pcnet_write_bcr(dev, 18, val);
val = pcnet_read_csr(dev, 80);
pcnet_write_bcr(lp, 18, val);
val = pcnet_read_csr(lp, 80);
val |= 0x3 << 10;
pcnet_write_csr(dev, 80, val);
/*
* We only maintain one structure because the drivers will never
* be used concurrently. In 32bit mode the RX and TX ring entries
* must be aligned on 16-byte boundaries.
*/
if (lp == NULL) {
addr = (unsigned long)malloc(sizeof(pcnet_priv_t) + 0x10);
addr = (addr + 0xf) & ~0xf;
lp = (pcnet_priv_t *)addr;
addr = (unsigned long)memalign(ARCH_DMA_MINALIGN,
sizeof(*lp->uc));
flush_dcache_range(addr, addr + sizeof(*lp->uc));
addr = (unsigned long)map_physmem(addr,
roundup(sizeof(*lp->uc), ARCH_DMA_MINALIGN),
MAP_NOCACHE);
lp->uc = (struct pcnet_uncached_priv *)addr;
addr = (unsigned long)memalign(ARCH_DMA_MINALIGN,
sizeof(*lp->rx_buf));
flush_dcache_range(addr, addr + sizeof(*lp->rx_buf));
lp->rx_buf = (void *)addr;
}
pcnet_write_csr(lp, 80, val);
uc = lp->uc;
@ -369,7 +256,7 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
*/
lp->cur_rx = 0;
for (i = 0; i < RX_RING_SIZE; i++) {
addr = pcnet_virt_to_mem(dev, (*lp->rx_buf)[i]);
addr = pcnet_virt_to_mem(lp, lp->rx_buf[i]);
uc->rx_ring[i].base = cpu_to_le32(addr);
uc->rx_ring[i].buf_length = cpu_to_le16(-PKT_BUF_SZ);
uc->rx_ring[i].status = cpu_to_le16(0x8000);
@ -395,15 +282,15 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
PCNET_DEBUG1("Init block at 0x%p: MAC", &lp->uc->init_block);
for (i = 0; i < 6; i++) {
lp->uc->init_block.phys_addr[i] = dev->enetaddr[i];
lp->uc->init_block.phys_addr[i] = lp->enetaddr[i];
PCNET_DEBUG1(" %02x", lp->uc->init_block.phys_addr[i]);
}
uc->init_block.tlen_rlen = cpu_to_le16(TX_RING_LEN_BITS |
RX_RING_LEN_BITS);
addr = pcnet_virt_to_mem(dev, uc->rx_ring);
addr = pcnet_virt_to_mem(lp, uc->rx_ring);
uc->init_block.rx_ring = cpu_to_le32(addr);
addr = pcnet_virt_to_mem(dev, uc->tx_ring);
addr = pcnet_virt_to_mem(lp, uc->tx_ring);
uc->init_block.tx_ring = cpu_to_le32(addr);
PCNET_DEBUG1("\ntlen_rlen=0x%x rx_ring=0x%x tx_ring=0x%x\n",
@ -414,34 +301,34 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
* Tell the controller where the Init Block is located.
*/
barrier();
addr = pcnet_virt_to_mem(dev, &lp->uc->init_block);
pcnet_write_csr(dev, 1, addr & 0xffff);
pcnet_write_csr(dev, 2, (addr >> 16) & 0xffff);
addr = pcnet_virt_to_mem(lp, &lp->uc->init_block);
pcnet_write_csr(lp, 1, addr & 0xffff);
pcnet_write_csr(lp, 2, (addr >> 16) & 0xffff);
pcnet_write_csr(dev, 4, 0x0915);
pcnet_write_csr(dev, 0, 0x0001); /* start */
pcnet_write_csr(lp, 4, 0x0915);
pcnet_write_csr(lp, 0, 0x0001); /* start */
/* Wait for Init Done bit */
for (i = 10000; i > 0; i--) {
if (pcnet_read_csr(dev, 0) & 0x0100)
if (pcnet_read_csr(lp, 0) & 0x0100)
break;
udelay(10);
}
if (i <= 0) {
printf("%s: TIMEOUT: controller init failed\n", dev->name);
pcnet_reset(dev);
printf("%s: TIMEOUT: controller init failed\n", lp->name);
pcnet_reset(lp);
return -1;
}
/*
* Finally start network controller operation.
*/
pcnet_write_csr(dev, 0, 0x0002);
pcnet_write_csr(lp, 0, 0x0002);
return 0;
}
static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
static int pcnet_send_common(struct pcnet_priv *lp, void *packet, int pkt_len)
{
int i, status;
u32 addr;
@ -463,7 +350,7 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
}
if (i <= 0) {
printf("%s: TIMEOUT: Tx%d failed (status = 0x%x)\n",
dev->name, lp->cur_tx, status);
lp->name, lp->cur_tx, status);
pkt_len = 0;
goto failure;
}
@ -472,14 +359,14 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
* Setup Tx ring. Caution: the write order is important here,
* set the status with the "ownership" bits last.
*/
addr = pcnet_virt_to_mem(dev, packet);
addr = pcnet_virt_to_mem(lp, packet);
writew(-pkt_len, &entry->length);
writel(0, &entry->misc);
writel(addr, &entry->base);
writew(0x8300, &entry->status);
/* Trigger an immediate send poll. */
pcnet_write_csr(dev, 0, 0x0008);
pcnet_write_csr(lp, 0, 0x0008);
failure:
if (++lp->cur_tx >= TX_RING_SIZE)
@ -489,76 +376,323 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
return pkt_len;
}
static int pcnet_recv (struct eth_device *dev)
static int pcnet_recv_common(struct pcnet_priv *lp, unsigned char **bufp)
{
struct pcnet_rx_head *entry;
unsigned char *buf;
int pkt_len = 0;
u16 status, err_status;
u16 err_status;
while (1) {
entry = &lp->uc->rx_ring[lp->cur_rx];
/*
* If we own the next entry, it's a new packet. Send it up.
*/
status = readw(&entry->status);
if ((status & 0x8000) != 0)
break;
err_status = status >> 8;
entry = &lp->uc->rx_ring[lp->cur_rx];
/*
* If we own the next entry, it's a new packet. Send it up.
*/
lp->status = readw(&entry->status);
if ((lp->status & 0x8000) != 0)
return 0;
err_status = lp->status >> 8;
if (err_status != 0x03) { /* There was an error. */
printf("%s: Rx%d", dev->name, lp->cur_rx);
PCNET_DEBUG1(" (status=0x%x)", err_status);
if (err_status & 0x20)
printf(" Frame");
if (err_status & 0x10)
printf(" Overflow");
if (err_status & 0x08)
printf(" CRC");
if (err_status & 0x04)
printf(" Fifo");
printf(" Error\n");
status &= 0x03ff;
} else {
pkt_len = (readl(&entry->msg_length) & 0xfff) - 4;
if (pkt_len < 60) {
printf("%s: Rx%d: invalid packet length %d\n",
dev->name, lp->cur_rx, pkt_len);
} else {
buf = (*lp->rx_buf)[lp->cur_rx];
invalidate_dcache_range((unsigned long)buf,
(unsigned long)buf + pkt_len);
net_process_received_packet(buf, pkt_len);
PCNET_DEBUG2("Rx%d: %d bytes from 0x%p\n",
lp->cur_rx, pkt_len, buf);
}
}
status |= 0x8000;
writew(status, &entry->status);
if (++lp->cur_rx >= RX_RING_SIZE)
lp->cur_rx = 0;
if (err_status != 0x03) { /* There was an error. */
printf("%s: Rx%d", lp->name, lp->cur_rx);
PCNET_DEBUG1(" (status=0x%x)", err_status);
if (err_status & 0x20)
printf(" Frame");
if (err_status & 0x10)
printf(" Overflow");
if (err_status & 0x08)
printf(" CRC");
if (err_status & 0x04)
printf(" Fifo");
printf(" Error\n");
lp->status &= 0x03ff;
return 0;
}
pkt_len = (readl(&entry->msg_length) & 0xfff) - 4;
if (pkt_len < 60) {
printf("%s: Rx%d: invalid packet length %d\n",
lp->name, lp->cur_rx, pkt_len);
return 0;
}
*bufp = lp->rx_buf[lp->cur_rx];
invalidate_dcache_range((unsigned long)*bufp,
(unsigned long)*bufp + pkt_len);
PCNET_DEBUG2("Rx%d: %d bytes from 0x%p\n",
lp->cur_rx, pkt_len, buf);
return pkt_len;
}
static void pcnet_halt(struct eth_device *dev)
static void pcnet_free_pkt_common(struct pcnet_priv *lp, unsigned int len)
{
struct pcnet_rx_head *entry;
entry = &lp->uc->rx_ring[lp->cur_rx];
lp->status |= 0x8000;
writew(lp->status, &entry->status);
if (++lp->cur_rx >= RX_RING_SIZE)
lp->cur_rx = 0;
}
static void pcnet_halt_common(struct pcnet_priv *lp)
{
int i;
PCNET_DEBUG1("%s: pcnet_halt...\n", dev->name);
PCNET_DEBUG1("%s: %s...\n", lp->name, __func__);
/* Reset the PCnet controller */
pcnet_reset(dev);
pcnet_reset(lp);
/* Wait for Stop bit */
for (i = 1000; i > 0; i--) {
if (pcnet_read_csr(dev, 0) & 0x4)
if (pcnet_read_csr(lp, 0) & 0x4)
break;
udelay(10);
}
if (i <= 0)
printf("%s: TIMEOUT: controller reset failed\n", dev->name);
printf("%s: TIMEOUT: controller reset failed\n", lp->name);
}
#ifndef CONFIG_DM_ETH
static int pcnet_init(struct eth_device *dev, bd_t *bis)
{
struct pcnet_priv *lp = dev->priv;
return pcnet_init_common(lp);
}
static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
{
struct pcnet_priv *lp = dev->priv;
return pcnet_send_common(lp, packet, pkt_len);
}
static int pcnet_recv(struct eth_device *dev)
{
struct pcnet_priv *lp = dev->priv;
uchar *packet;
int ret;
ret = pcnet_recv_common(lp, &packet);
if (ret > 0)
net_process_received_packet(packet, ret);
if (ret)
pcnet_free_pkt_common(lp, ret);
return ret;
}
static void pcnet_halt(struct eth_device *dev)
{
struct pcnet_priv *lp = dev->priv;
pcnet_halt_common(lp);
}
int pcnet_initialize(bd_t *bis)
{
pci_dev_t devbusfn;
struct eth_device *dev;
struct pcnet_priv *lp;
u16 command, status;
int dev_nr = 0;
u32 bar;
PCNET_DEBUG1("\n%s...\n", __func__);
for (dev_nr = 0; ; dev_nr++) {
/*
* Find the PCnet PCI device(s).
*/
devbusfn = pci_find_devices(supported, dev_nr);
if (devbusfn < 0)
break;
/*
* Allocate and pre-fill the device structure.
*/
dev = calloc(1, sizeof(*dev));
if (!dev) {
printf("pcnet: Can not allocate memory\n");
break;
}
/*
* We only maintain one structure because the drivers will
* never be used concurrently. In 32bit mode the RX and TX
* ring entries must be aligned on 16-byte boundaries.
*/
lp = malloc_cache_aligned(sizeof(*lp));
lp->uc = map_physmem((phys_addr_t)&lp->ucp,
sizeof(lp->ucp), MAP_NOCACHE);
lp->dev = devbusfn;
flush_dcache_range((unsigned long)lp,
(unsigned long)lp + sizeof(*lp));
dev->priv = lp;
sprintf(dev->name, "pcnet#%d", dev_nr);
lp->name = dev->name;
lp->enetaddr = dev->enetaddr;
/*
* Setup the PCI device.
*/
pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &bar);
lp->iobase = (void *)(pci_mem_to_phys(devbusfn, bar) & ~0xf);
PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%p: ",
lp->name, devbusfn, lp->iobase);
command = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
pci_write_config_word(devbusfn, PCI_COMMAND, command);
pci_read_config_word(devbusfn, PCI_COMMAND, &status);
if ((status & command) != command) {
printf("%s: Couldn't enable IO access or Bus Mastering\n",
lp->name);
free(dev);
continue;
}
pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, 0x40);
/*
* Probe the PCnet chip.
*/
if (pcnet_probe_common(lp) < 0) {
free(dev);
continue;
}
/*
* Setup device structure and register the driver.
*/
dev->init = pcnet_init;
dev->halt = pcnet_halt;
dev->send = pcnet_send;
dev->recv = pcnet_recv;
eth_register(dev);
}
udelay(10 * 1000);
return dev_nr;
}
#else /* DM_ETH */
static int pcnet_start(struct udevice *dev)
{
struct eth_pdata *plat = dev_get_platdata(dev);
struct pcnet_priv *priv = dev_get_priv(dev);
memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr));
return pcnet_init_common(priv);
}
static void pcnet_stop(struct udevice *dev)
{
struct pcnet_priv *priv = dev_get_priv(dev);
pcnet_halt_common(priv);
}
static int pcnet_send(struct udevice *dev, void *packet, int length)
{
struct pcnet_priv *priv = dev_get_priv(dev);
int ret;
ret = pcnet_send_common(priv, packet, length);
return ret ? 0 : -ETIMEDOUT;
}
static int pcnet_recv(struct udevice *dev, int flags, uchar **packetp)
{
struct pcnet_priv *priv = dev_get_priv(dev);
return pcnet_recv_common(priv, packetp);
}
static int pcnet_free_pkt(struct udevice *dev, uchar *packet, int length)
{
struct pcnet_priv *priv = dev_get_priv(dev);
pcnet_free_pkt_common(priv, length);
return 0;
}
static int pcnet_bind(struct udevice *dev)
{
static int card_number;
char name[16];
sprintf(name, "pcnet#%u", card_number++);
return device_set_name(dev, name);
}
static int pcnet_probe(struct udevice *dev)
{
struct eth_pdata *plat = dev_get_platdata(dev);
struct pcnet_priv *lp = dev_get_priv(dev);
u16 command, status;
u32 iobase;
int ret;
dm_pci_read_config32(dev, PCI_BASE_ADDRESS_1, &iobase);
iobase &= ~0xf;
lp->uc = map_physmem((phys_addr_t)&lp->ucp,
sizeof(lp->ucp), MAP_NOCACHE);
lp->dev = dev;
lp->name = dev->name;
lp->enetaddr = plat->enetaddr;
lp->iobase = (void *)dm_pci_mem_to_phys(dev, iobase);
flush_dcache_range((unsigned long)lp,
(unsigned long)lp + sizeof(*lp));
command = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
dm_pci_write_config16(dev, PCI_COMMAND, command);
dm_pci_read_config16(dev, PCI_COMMAND, &status);
if ((status & command) != command) {
printf("%s: Couldn't enable IO access or Bus Mastering\n",
lp->name);
return -EINVAL;
}
dm_pci_write_config8(dev, PCI_LATENCY_TIMER, 0x20);
ret = pcnet_probe_common(lp);
if (ret)
return ret;
return 0;
}
static const struct eth_ops pcnet_ops = {
.start = pcnet_start,
.send = pcnet_send,
.recv = pcnet_recv,
.stop = pcnet_stop,
.free_pkt = pcnet_free_pkt,
};
U_BOOT_DRIVER(eth_pcnet) = {
.name = "eth_pcnet",
.id = UCLASS_ETH,
.bind = pcnet_bind,
.probe = pcnet_probe,
.ops = &pcnet_ops,
.priv_auto_alloc_size = sizeof(struct pcnet_priv),
.platdata_auto_alloc_size = sizeof(struct eth_pdata),
.flags = DM_UC_FLAG_ALLOC_PRIV_DMA,
};
U_BOOT_PCI_DEVICE(eth_pcnet, supported);
#endif

1
include/configs/MPC8315ERDB.h
View File

@ -239,7 +239,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCIE
#define CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */

1
include/configs/MPC8323ERDB.h
View File

@ -172,7 +172,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCI_SKIP_HOST_BRIDGE
#undef CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */

1
include/configs/MPC832XEMDS.h
View File

@ -196,7 +196,6 @@
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */

1
include/configs/MPC8349EMDS.h
View File

@ -220,7 +220,6 @@
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/MPC8349EMDS_SDRAM.h
View File

@ -275,7 +275,6 @@
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/MPC837XEMDS.h
View File

@ -238,7 +238,6 @@ extern int board_pci_host_broken(void);
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#undef CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
#endif /* CONFIG_PCI */

1
include/configs/MPC8540ADS.h
View File

@ -236,7 +236,6 @@
#define CONFIG_SYS_PCI1_IO_SIZE 0x100000 /* 1M */
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/MPC8541CDS.h
View File

@ -282,7 +282,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_MPC85XX_PCI2
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */

1
include/configs/MPC8544DS.h
View File

@ -258,7 +258,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
#endif
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#ifndef CONFIG_PCI_PNP

1
include/configs/MPC8548CDS.h
View File

@ -380,7 +380,6 @@ extern unsigned long get_clock_freq(void);
#endif
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_DM_PCI)

1
include/configs/MPC8555CDS.h
View File

@ -280,7 +280,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_MPC85XX_PCI2
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */

1
include/configs/MPC8560ADS.h
View File

@ -233,7 +233,6 @@
#define CONFIG_SYS_PCI1_IO_SIZE 0x100000 /* 1M */
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/MPC8568MDS.h
View File

@ -290,7 +290,6 @@ extern unsigned long get_clock_freq(void);
#endif /* CONFIG_QE */
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */

1
include/configs/MPC8569MDS.h
View File

@ -396,7 +396,6 @@ extern unsigned long get_clock_freq(void);
#endif /* CONFIG_QE */
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */

1
include/configs/MPC8572DS.h
View File

@ -443,7 +443,6 @@
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
#endif
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#ifndef CONFIG_PCI_PNP

1
include/configs/MPC8641HPCN.h
View File

@ -334,7 +334,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
/************************************************************

2
include/configs/TQM834x.h
View File

@ -167,8 +167,6 @@
#define CONFIG_SYS_PCI1_IO_PHYS CONFIG_SYS_PCI1_IO_BASE
#define CONFIG_SYS_PCI1_IO_SIZE 0x1000000 /* 16M */
#undef CONFIG_EEPRO100
#define CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/caddy2.h
View File

@ -155,7 +155,6 @@
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/integratorap.h
View File

@ -35,7 +35,6 @@
*/
#define CONFIG_TULIP
#define CONFIG_EEPRO100
#define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
/*-----------------------------------------------------------------------

2
include/configs/malta.h
View File

@ -15,8 +15,6 @@
#define CONFIG_PCI_GT64120
#define CONFIG_PCI_MSC01
#define CONFIG_PCNET
#define PCNET_HAS_PROM
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0

1
include/configs/sbc8349.h
View File

@ -180,7 +180,6 @@
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/sbc8548.h
View File

@ -434,7 +434,6 @@
#endif
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */

1
include/configs/sbc8641d.h
View File

@ -276,7 +276,6 @@
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

1
include/configs/vme8349.h
View File

@ -155,7 +155,6 @@
#if defined(CONFIG_PCI)
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)

2
scripts/config_whitelist.txt
View File

@ -399,8 +399,6 @@ CONFIG_EDB93XX_SDCS0
CONFIG_EDB93XX_SDCS1
CONFIG_EDB93XX_SDCS2
CONFIG_EDB93XX_SDCS3
CONFIG_EEPRO100
CONFIG_EEPRO100_SROM_WRITE
CONFIG_EFLASH_PROTSECTORS
CONFIG_EHCI_DESC_BIG_ENDIAN
CONFIG_EHCI_HCD_INIT_AFTER_RESET