Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented an (ugly) implementation for pci_get_resource(). USB init code still hangs.

Browse Source
This commit is contained in:
Markus Fröschle
2013-11-03 13:38:18 +00:00
parent 1d2ff27f68
commit 09c762b143
4 changed files with 96 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
flash_scripts/flash_firebee_bas.bdm
View File

@@ -55,26 +55,51 @@ flash 0xE0000000
# #
# contrary to documentation, it seems we need to erase-wait after each sector # contrary to documentation, it seems we need to erase-wait after each sector
erase 0xE0000000 0x00000 erase 0xE0000000 0x000000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x01000 erase 0xE0000000 0x004000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x02000 erase 0xE0000000 0x008000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x03000 erase 0xE0000000 0x00C000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x04000 erase 0xE0000000 0x00D000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x05000 erase 0xE0000000 0x00E000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x06000 erase 0xE0000000 0x00F000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x07000 erase 0xE0000000 0x010000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x08000 erase 0xE0000000 0x011000
erase-wait 0xE0000000 erase-wait 0xE0000000
erase 0xE0000000 0x10000 erase 0xE0000000 0x012000
erase-wait 0xE0000000 erase-wait 0xE0000000
blank-chk 0xE0000000 0x10000 erase 0xE0000000 0x013000
load -v bas.elf erase-wait 0xE0000000
erase 0xE0000000 0x014000
erase-wait 0xE0000000
erase 0xE0000000 0x015000
erase-wait 0xE0000000
erase 0xE0000000 0x016000
erase-wait 0xE0000000
erase 0xE0000000 0x017000
erase-wait 0xE0000000
erase 0xE0000000 0x018000
erase-wait 0xE0000000
erase 0xE0000000 0x019000
erase-wait 0xE0000000
erase 0xE0000000 0x01a000
erase-wait 0xE0000000
erase 0xE0000000 0x01b000
erase-wait 0xE0000000
erase 0xE0000000 0x01c000
erase-wait 0xE0000000
erase 0xE0000000 0x01d000
erase-wait 0xE0000000
erase 0xE0000000 0x01e000
erase-wait 0xE0000000
erase 0xE0000000 0x01f000
erase-wait 0xE0000000
load -v firebee/bas.elf
wait wait

13
include/pci.h
View File

@@ -199,17 +199,6 @@ extern void init_eport(void);
extern void init_xlbus_arbiter(void); extern void init_xlbus_arbiter(void);
extern void init_pci(void); extern void init_pci(void);
struct resource_descriptor
{
uint16_t next;
uint16_t flags;
uint32_t start;
uint32_t length;
uint32_t offset;
uint32_t dma_offset;
uint8_t private;
} __attribute__ ((packed));
extern int16_t pci_find_device(uint16_t device_id, uint16_t vendor_id, int index); extern int16_t pci_find_device(uint16_t device_id, uint16_t vendor_id, int index);
extern uint32_t pci_read_config_longword(uint16_t handle, uint16_t offset); extern uint32_t pci_read_config_longword(uint16_t handle, uint16_t offset);
@@ -220,7 +209,7 @@ extern void pci_write_config_longword(uint16_t handle, uint16_t offset, uint32_t
extern void pci_write_config_word(uint16_t handle, uint16_t offset, uint16_t value); extern void pci_write_config_word(uint16_t handle, uint16_t offset, uint16_t value);
extern void pci_write_config_byte(uint16_t handle, uint16_t offset, uint8_t value); extern void pci_write_config_byte(uint16_t handle, uint16_t offset, uint8_t value);
extern struct resource_descriptor *pci_get_resource(uint16_t handle); extern PCI_RSC_DESC *pci_get_resource(uint16_t handle);
extern int16_t pci_hook_interrupt(uint16_t handle, void *interrupt_handler, void *parameter); extern int16_t pci_hook_interrupt(uint16_t handle, void *interrupt_handler, void *parameter);
extern int16_t pci_unhook_interrupt(uint16_t handle); extern int16_t pci_unhook_interrupt(uint16_t handle);

2
run_bas.bdm
View File

@@ -62,7 +62,7 @@ write 0xFF000100 0x008D0000 4 # SDMR (write to LMR)
write 0xFF000104 0x710D0F00 4 # SDCR (lock SDMR and enable refresh) write 0xFF000104 0x710D0F00 4 # SDCR (lock SDMR and enable refresh)
sleep 100 sleep 100
load -v ram.elf load -v firebee/ram.elf
write-ctrl 0x80e 0x2700 write-ctrl 0x80e 0x2700
write-ctrl 0x2 0xa50c8120 write-ctrl 0x2 0xa50c8120
dump-register SR dump-register SR

62
sources/pci.c
View File

@@ -59,7 +59,13 @@ static struct pci_class
}; };
static int num_classes = sizeof(pci_classes) / sizeof(struct pci_class); static int num_classes = sizeof(pci_classes) / sizeof(struct pci_class);
static struct resource_descriptor resource_descriptors[16]; static struct handle_index
{
uint16_t handle;
uint16_t index;
} handles[10];
static PCI_RSC_DESC resource_descriptors[10][6]; /* FIXME: fix number of cards */
static char *device_class(int classcode) static char *device_class(int classcode)
{ {
@@ -157,11 +163,17 @@ void pci_write_config_longword(uint16_t handle, uint16_t offset, uint32_t value)
* (volatile uint32_t *) PCI_IO_OFFSET = swpl(value); /* access device */ * (volatile uint32_t *) PCI_IO_OFFSET = swpl(value); /* access device */
} }
struct resource_descriptor *pci_get_resource(uint16_t handle) PCI_RSC_DESC *pci_get_resource(uint16_t handle)
{ {
/* TODO: implement */ int i;
int index = -1;
return (struct resource_descriptor *) 0L; for (i = 0; i < 10; i++)
if (handles[i].handle == handle)
index = i;
if (index == -1)
return NULL;
return resource_descriptors[handles[index].index];
} }
int16_t pci_find_device(uint16_t device_id, uint16_t vendor_id, int index) int16_t pci_find_device(uint16_t device_id, uint16_t vendor_id, int index)
@@ -229,13 +241,32 @@ void pci_device_config(uint16_t bus, uint16_t slot, uint16_t function)
{ {
uint32_t address; uint32_t address;
uint16_t handle; uint16_t handle;
uint16_t index = - 1;
PCI_RSC_DESC *descriptors;
int i; int i;
handle = PCI_HANDLE(bus, slot, function);
for (i = 0; i < 10; i++)
{
if (handles[i].handle == handle)
{
index = i;
break;
}
}
if (index == -1)
{
xprintf("cannot find index for handle %d\r\n", handle);
return;
}
int barnum = 0;
descriptors = resource_descriptors[index];
for (i = 0; i < 6; i++) /* for all bars */ for (i = 0; i < 6; i++) /* for all bars */
{ {
uint32_t value; uint32_t value;
handle = bus << 8 | slot << 5 | function;
value = pci_read_config_longword(handle, 0x10 + i); /* read BAR value */ value = pci_read_config_longword(handle, 0x10 + i); /* read BAR value */
pci_write_config_longword(handle, 0x10 + i, 0xffffffff); /* write all bits */ pci_write_config_longword(handle, 0x10 + i, 0xffffffff); /* write all bits */
address = pci_read_config_longword(handle, 0x10 + i); /* read back value */ address = pci_read_config_longword(handle, 0x10 + i); /* read back value */
@@ -256,7 +287,15 @@ void pci_device_config(uint16_t bus, uint16_t slot, uint16_t function)
pci_write_config_longword(handle, 0x10 + i, mem_address); pci_write_config_longword(handle, 0x10 + i, mem_address);
value = pci_read_config_longword(handle, 0x10 + i); value = pci_read_config_longword(handle, 0x10 + i);
//xprintf("BAR[%d] configured to %08x, size %x\r\n", i, value, size); //xprintf("BAR[%d] configured to %08x, size %x\r\n", i, value, size);
descriptors[barnum].next = sizeof(PCI_RSC_DESC);
descriptors[barnum].flags = 0 | FLG_8BIT | FLG_16BIT | FLG_32BIT | 1;
descriptors[barnum].start = mem_address;
descriptors[barnum].length = size;
descriptors[barnum].offset = 0;
descriptors[barnum].dmaoffset = 0;
mem_address += size; mem_address += size;
barnum++;
} }
else if (IS_PCI_IO_BAR(value)) else if (IS_PCI_IO_BAR(value))
{ {
@@ -266,10 +305,20 @@ void pci_device_config(uint16_t bus, uint16_t slot, uint16_t function)
pci_write_config_longword(handle, 0x10 + i, io_address); pci_write_config_longword(handle, 0x10 + i, io_address);
value = pci_read_config_longword(handle, 0x10 + i); value = pci_read_config_longword(handle, 0x10 + i);
//xprintf("BAR[%d] mapped to %08x, size %x\r\n", i, value, size); //xprintf("BAR[%d] mapped to %08x, size %x\r\n", i, value, size);
descriptors[barnum].next = sizeof(PCI_RSC_DESC);
descriptors[barnum].flags = FLG_IO | FLG_8BIT | FLG_16BIT | FLG_32BIT | 1;
descriptors[barnum].start = io_address;
descriptors[barnum].offset = PCI_MEMORY_OFFSET;
descriptors[barnum].length = size;
descriptors[barnum].dmaoffset = PCI_MEMORY_OFFSET;
io_address += size; io_address += size;
barnum++;
} }
} }
} }
if (barnum > 0)
descriptors[barnum - 1].flags |= FLG_LAST;
} }
void pci_scan(void) void pci_scan(void)
@@ -277,6 +326,7 @@ void pci_scan(void)
uint16_t bus; uint16_t bus;
uint16_t slot; uint16_t slot;
uint16_t function; uint16_t function;
uint16_t index = 0;
uint16_t i; uint16_t i;
xprintf("\r\nPCI bus scan...\r\n\r\n"); xprintf("\r\nPCI bus scan...\r\n\r\n");
@@ -301,6 +351,8 @@ void pci_scan(void)
if (PCI_VENDOR_ID(value) != 0x1057 && PCI_DEVICE_ID(value) != 0x5806) /* do not configure bridge */ if (PCI_VENDOR_ID(value) != 0x1057 && PCI_DEVICE_ID(value) != 0x5806) /* do not configure bridge */
{ {
handles[index].index = index;
handles[index].handle = PCI_HANDLE(bus, slot, function);
pci_device_config(bus, slot, function); pci_device_config(bus, slot, function);
} }