Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 15:37:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: dc2114x: Clean up init code

Browse source 
Clean up the driver init code to bring it up to standards with
U-Boot coding style, no functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Marek Vasut 2020-04-19 03:09:47 +02:00 committed by marex
parent 69529c9120
commit ca5cb04b7f
1 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
drivers/net/dc2114x.c
View file

@ -167,33 +167,30 @@ static struct pci_device_id supported[] = {
int dc21x4x_initialize(bd_t *bis) int dc21x4x_initialize(bd_t *bis)
{ {
int idx=0; struct eth_device *dev;
int card_number = 0; unsigned short status;
unsigned int cfrv; unsigned char timer;
unsigned char timer; unsigned int iobase;
pci_dev_t devbusfn; int card_number = 0;
unsigned int iobase; pci_dev_t devbusfn;
unsigned short status; unsigned int cfrv;
struct eth_device* dev; int idx = 0;
while(1) { while (1) {
devbusfn = pci_find_devices(supported, idx++); devbusfn = pci_find_devices(supported, idx++);
if (devbusfn == -1) { if (devbusfn == -1)
break; break;
}
/* Get the chip configuration revision register. */ /* Get the chip configuration revision register. */
pci_read_config_dword(devbusfn, PCI_REVISION_ID, &cfrv); pci_read_config_dword(devbusfn, PCI_REVISION_ID, &cfrv);
if ((cfrv & CFRV_RN) < DC2114x_BRK ) { if ((cfrv & CFRV_RN) < DC2114x_BRK) {
printf("Error: The chip is not DC21143.\n"); printf("Error: The chip is not DC21143.\n");
continue; continue;
} }
pci_read_config_word(devbusfn, PCI_COMMAND, &status); pci_read_config_word(devbusfn, PCI_COMMAND, &status);
status |= status |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER;
pci_write_config_word(devbusfn, PCI_COMMAND, status); pci_write_config_word(devbusfn, PCI_COMMAND, status);
pci_read_config_word(devbusfn, PCI_COMMAND, &status); pci_read_config_word(devbusfn, PCI_COMMAND, &status);
@ -211,30 +208,31 @@ int dc21x4x_initialize(bd_t *bis)
pci_read_config_byte(devbusfn, PCI_LATENCY_TIMER, &timer); pci_read_config_byte(devbusfn, PCI_LATENCY_TIMER, &timer);
if (timer < 0x60) { if (timer < 0x60) {
pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, 0x60); pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER,
0x60);
} }
/* read BAR for memory space access */ /* read BAR for memory space access */
pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &iobase); pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &iobase);
iobase &= PCI_BASE_ADDRESS_MEM_MASK; iobase &= PCI_BASE_ADDRESS_MEM_MASK;
debug ("dc21x4x: DEC 21142 PCI Device @0x%x\n", iobase); debug("dc21x4x: DEC 21142 PCI Device @0x%x\n", iobase);
dev = (struct eth_device*) malloc(sizeof *dev);
dev = (struct eth_device *)malloc(sizeof(*dev));
if (!dev) { if (!dev) {
printf("Can not allocalte memory of dc21x4x\n"); printf("Can not allocalte memory of dc21x4x\n");
break; break;
} }
memset(dev, 0, sizeof(*dev)); memset(dev, 0, sizeof(*dev));
sprintf(dev->name, "dc21x4x#%d", card_number); sprintf(dev->name, "dc21x4x#%d", card_number);
dev->iobase = pci_mem_to_phys(devbusfn, iobase); dev->iobase = pci_mem_to_phys(devbusfn, iobase);
dev->priv = (void*) devbusfn; dev->priv = (void *)devbusfn;
dev->init = dc21x4x_init; dev->init = dc21x4x_init;
dev->halt = dc21x4x_halt; dev->halt = dc21x4x_halt;
dev->send = dc21x4x_send; dev->send = dc21x4x_send;
dev->recv = dc21x4x_recv; dev->recv = dc21x4x_recv;
/* Ensure we're not sleeping. */ /* Ensure we're not sleeping. */
pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP); pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP);
@ -251,10 +249,10 @@ int dc21x4x_initialize(bd_t *bis)
return card_number; return card_number;
} }
static int dc21x4x_init(struct eth_device* dev, bd_t* bis) static int dc21x4x_init(struct eth_device *dev, bd_t *bis)
{ {
int i; int i;
int devbusfn = (int) dev->priv; int devbusfn = (int)dev->priv;
/* Ensure we're not sleeping. */ /* Ensure we're not sleeping. */
pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP); pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP);
@ -271,12 +269,12 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
for (i = 0; i < NUM_RX_DESC; i++) { for (i = 0; i < NUM_RX_DESC; i++) {
rx_ring[i].status = cpu_to_le32(R_OWN); rx_ring[i].status = cpu_to_le32(R_OWN);
rx_ring[i].des1 = cpu_to_le32(RX_BUFF_SZ); rx_ring[i].des1 = cpu_to_le32(RX_BUFF_SZ);
rx_ring[i].buf = cpu_to_le32( rx_ring[i].buf =
phys_to_bus((u32)net_rx_packets[i])); cpu_to_le32(phys_to_bus((u32)net_rx_packets[i]));
rx_ring[i].next = 0; rx_ring[i].next = 0;
} }
for (i=0; i < NUM_TX_DESC; i++) { for (i = 0; i < NUM_TX_DESC; i++) {
tx_ring[i].status = 0; tx_ring[i].status = 0;
tx_ring[i].des1 = 0; tx_ring[i].des1 = 0;
tx_ring[i].buf = 0; tx_ring[i].buf = 0;
@ -291,8 +289,8 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
tx_ring[txRingSize - 1].des1 |= cpu_to_le32(TD_TER); tx_ring[txRingSize - 1].des1 |= cpu_to_le32(TD_TER);
/* Tell the adapter where the TX/RX rings are located. */ /* Tell the adapter where the TX/RX rings are located. */
OUTL(dev, phys_to_bus((u32) &rx_ring), DE4X5_RRBA); OUTL(dev, phys_to_bus((u32)&rx_ring), DE4X5_RRBA);
OUTL(dev, phys_to_bus((u32) &tx_ring), DE4X5_TRBA); OUTL(dev, phys_to_bus((u32)&tx_ring), DE4X5_TRBA);
START_DE4X5(dev); START_DE4X5(dev);