redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

board/evb64260/zuma_pbb_mbox.c: CodingStyle cleanup 

Make (mostly) checkpatch-clean

Signed-off-by: Wolfgang Denk <wd@denx.de>
utp
Wolfgang Denk 2011-11-09 09:29:00 +00:00
parent b191c70162
commit 827320724c
1 changed files with 121 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
board/evb64260/zuma_pbb_mbox.c
View File

@ -12,57 +12,62 @@ struct _zuma_mbox_dev zuma_mbox_dev;
static int zuma_mbox_write(struct _zuma_mbox_dev *dev, unsigned int data) static int zuma_mbox_write(struct _zuma_mbox_dev *dev, unsigned int data)
{ {
unsigned int status, count = 0, i; unsigned int status, count = 0, i;
status = (volatile int)le32_to_cpu(dev->sip->mbox_status); status = (volatile int) le32_to_cpu(dev->sip->mbox_status);
while((status & OUT_PENDING) && count < 1000) { while ((status & OUT_PENDING) && count < 1000) {
count++; count++;
for(i=0;i<1000;i++); for (i = 0; i < 1000; i++)
status = (volatile int)le32_to_cpu(dev->sip->mbox_status); ;
} status = (volatile int) le32_to_cpu(dev->sip->mbox_status);
if(count < 1000) { }
/* if SET it means msg pending */ if (count < 1000) {
/* printf("mbox real write %08x\n",data); */ /* if SET it means msg pending */
dev->sip->mbox_out = cpu_to_le32(data); /* printf("mbox real write %08x\n",data); */
return 4; dev->sip->mbox_out = cpu_to_le32(data);
} return 4;
}
printf("mbox tx timeout\n"); printf("mbox tx timeout\n");
return 0; return 0;
} }
static int zuma_mbox_read(struct _zuma_mbox_dev *dev, unsigned int *data) static int zuma_mbox_read(struct _zuma_mbox_dev *dev, unsigned int *data)
{ {
unsigned int status, count = 0, i; unsigned int status, count = 0, i;
status = (volatile int)le32_to_cpu(dev->sip->mbox_status); status = (volatile int) le32_to_cpu(dev->sip->mbox_status);
while(!(status & IN_VALID) && count < 1000) { while (!(status & IN_VALID) && count < 1000) {
count++; count++;
for(i=0;i<1000;i++); for (i = 0; i < 1000; i++)
status = (volatile int)le32_to_cpu(dev->sip->mbox_status); ;
} status = (volatile int) le32_to_cpu(dev->sip->mbox_status);
if(count < 1000) { }
/* if SET it means msg pending */ if (count < 1000) {
*data=le32_to_cpu(dev->sip->mbox_in); /* if SET it means msg pending */
/*printf("mbox real read %08x\n", *data); */ *data = le32_to_cpu(dev->sip->mbox_in);
return 4; /*printf("mbox real read %08x\n", *data); */
} return 4;
printf("mbox rx timeout\n"); }
return 0; printf("mbox rx timeout\n");
return 0;
} }
static int zuma_mbox_do_one_mailbox(unsigned int out, unsigned int *in) static int zuma_mbox_do_one_mailbox(unsigned int out, unsigned int *in)
{ {
int ret; int ret;
ret=zuma_mbox_write(&zuma_mbox_dev,out);
/*printf("write 0x%08x (%d bytes)\n", out, ret); */ ret = zuma_mbox_write(&zuma_mbox_dev, out);
if(ret!=4) return -1; /*printf("write 0x%08x (%d bytes)\n", out, ret); */
ret=zuma_mbox_read(&zuma_mbox_dev,in); if (ret != 4)
/*printf("read 0x%08x (%d bytes)\n", *in, ret); */ return -1;
if(ret!=4) return -1; ret = zuma_mbox_read(&zuma_mbox_dev, in);
return 0; /*printf("read 0x%08x (%d bytes)\n", *in, ret); */
if (ret != 4)
return -1;
return 0;
} }
@ -70,81 +75,82 @@ static int zuma_mbox_do_one_mailbox(unsigned int out, unsigned int *in)
static int zuma_mbox_do_all_mailbox(void) static int zuma_mbox_do_all_mailbox(void)
{ {
unsigned int data_in; unsigned int data_in;
unsigned short sdata_in; unsigned short sdata_in;
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_START, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_START, &data_in));
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_MACL, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_MACL, &data_in));
memcpy(zuma_acc_mac+2,&data_in,4); memcpy(zuma_acc_mac + 2, &data_in, 4);
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_MACH, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_MACH, &data_in));
sdata_in=data_in&0xffff; sdata_in = data_in & 0xffff;
memcpy(zuma_acc_mac,&sdata_in,2); memcpy(zuma_acc_mac, &sdata_in, 2);
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_IP, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_IP, &data_in));
zuma_ip=data_in; zuma_ip = data_in;
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_SLOT, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_SLOT, &data_in));
zuma_slot_bac=data_in>>3; zuma_slot_bac = data_in >> 3;
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_BAUD, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_BAUD, &data_in));
zuma_console_baud = data_in & 0xffff; zuma_console_baud = data_in & 0xffff;
zuma_debug_baud = data_in >> 16; zuma_debug_baud = data_in >> 16;
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_ENG_PRV_MACL, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox
memcpy(zuma_prv_mac+2,&data_in,4); (ZUMA_MBOXMSG_ENG_PRV_MACL, &data_in));
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_ENG_PRV_MACH, &data_in)); memcpy(zuma_prv_mac + 2, &data_in, 4);
sdata_in=data_in&0xffff; RET_IF_FAILED(zuma_mbox_do_one_mailbox
memcpy(zuma_prv_mac,&sdata_in,2); (ZUMA_MBOXMSG_ENG_PRV_MACH, &data_in));
sdata_in = data_in & 0xffff;
memcpy(zuma_prv_mac, &sdata_in, 2);
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_DONE, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_DONE, &data_in));
return 0; return 0;
} }
static void static void zuma_mbox_dump(void)
zuma_mbox_dump(void)
{ {
printf("ACC MAC=%04x%08x\n",*(unsigned short *)(&zuma_acc_mac),*(unsigned int *)((char *)&zuma_acc_mac+2)); printf("ACC MAC=%04x%08x\n", *(unsigned short *) (&zuma_acc_mac),
printf("PRV MAC=%04x%08x\n",*(unsigned short *)(&zuma_prv_mac),*(unsigned int *)((char *)&zuma_prv_mac+2)); *(unsigned int *) ((char *) &zuma_acc_mac + 2));
printf("slot:bac=%d:%d\n",(zuma_slot_bac>>2)&0xf, zuma_slot_bac & 0x3); printf("PRV MAC=%04x%08x\n", *(unsigned short *) (&zuma_prv_mac),
printf("BAUD1=%d BAUD2=%d\n",zuma_console_baud,zuma_debug_baud); *(unsigned int *) ((char *) &zuma_prv_mac + 2));
printf("slot:bac=%d:%d\n", (zuma_slot_bac >> 2) & 0xf,
zuma_slot_bac & 0x3);
printf("BAUD1=%d BAUD2=%d\n", zuma_console_baud, zuma_debug_baud);
} }
static void static void zuma_mbox_setenv(void)
zuma_mbox_setenv(void)
{ {
char *data, buf[32]; char *data, buf[32];
unsigned char save = 0; unsigned char save = 0;
data = getenv("baudrate"); data = getenv("baudrate");
if(!data || (zuma_console_baud != simple_strtoul(data, NULL, 10))) { if (!data || (zuma_console_baud != simple_strtoul(data, NULL, 10))) {
sprintf(buf, "%6d", zuma_console_baud); sprintf(buf, "%6d", zuma_console_baud);
setenv("baudrate", buf); setenv("baudrate", buf);
save=1; save = 1;
printf("baudrate doesn't match from mbox\n"); printf("baudrate doesn't match from mbox\n");
} }
ip_to_string(zuma_ip, buf); ip_to_string(zuma_ip, buf);
setenv("ipaddr", buf); setenv("ipaddr", buf);
sprintf(buf,"%02x:%02x:%02x:%02x:%02x:%02x", sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",
zuma_prv_mac[0], zuma_prv_mac[0],
zuma_prv_mac[1], zuma_prv_mac[1],
zuma_prv_mac[2], zuma_prv_mac[2],
zuma_prv_mac[3], zuma_prv_mac[3], zuma_prv_mac[4], zuma_prv_mac[5]);
zuma_prv_mac[4], setenv("ethaddr", buf);
zuma_prv_mac[5]);
setenv("ethaddr", buf);
sprintf(buf,"%02x",zuma_slot_bac); sprintf(buf, "%02x", zuma_slot_bac);
setenv("bacslot", buf); setenv("bacslot", buf);
if(save) if (save)
saveenv(); saveenv();
} }
/** /**
@ -153,37 +159,39 @@ zuma_mbox_setenv(void)
int zuma_mbox_init(void) int zuma_mbox_init(void)
{ {
unsigned int iobase; unsigned int iobase;
memset(&zuma_mbox_dev, 0, sizeof(struct _zuma_mbox_dev));
zuma_mbox_dev.dev = pci_find_device(VENDOR_ID_ZUMA, DEVICE_ID_ZUMA_PBB, 0); memset(&zuma_mbox_dev, 0, sizeof(struct _zuma_mbox_dev));
if(zuma_mbox_dev.dev == -1) { zuma_mbox_dev.dev =
printf("no zuma pbb\n"); pci_find_device(VENDOR_ID_ZUMA, DEVICE_ID_ZUMA_PBB, 0);
return -1;
}
pci_read_config_dword(zuma_mbox_dev.dev, PCI_BASE_ADDRESS_0, &iobase); if (zuma_mbox_dev.dev == -1) {
printf("no zuma pbb\n");
return -1;
}
iobase &= PCI_BASE_ADDRESS_MEM_MASK; pci_read_config_dword(zuma_mbox_dev.dev, PCI_BASE_ADDRESS_0, &iobase);
zuma_mbox_dev.sip = (PBB_DMA_REG_MAP *)iobase; iobase &= PCI_BASE_ADDRESS_MEM_MASK;
zuma_mbox_dev.sip->int_mask.word=0; zuma_mbox_dev.sip = (PBB_DMA_REG_MAP *) iobase;
printf("pbb @ %p v%d.%d, timestamp %08x\n", zuma_mbox_dev.sip, zuma_mbox_dev.sip->int_mask.word = 0;
zuma_mbox_dev.sip->version.pci_bits.rev_major,
zuma_mbox_dev.sip->version.pci_bits.rev_minor,
zuma_mbox_dev.sip->timestamp);
if (zuma_mbox_do_all_mailbox() == -1) { printf("pbb @ %p v%d.%d, timestamp %08x\n", zuma_mbox_dev.sip,
printf("mailbox failed.. no ACC?\n"); zuma_mbox_dev.sip->version.pci_bits.rev_major,
return -1; zuma_mbox_dev.sip->version.pci_bits.rev_minor,
} zuma_mbox_dev.sip->timestamp);
zuma_mbox_dump(); if (zuma_mbox_do_all_mailbox() == -1) {
printf("mailbox failed.. no ACC?\n");
return -1;
}
zuma_mbox_setenv(); zuma_mbox_dump();
return 0; zuma_mbox_setenv();
return 0;
} }