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

completely moved PCI initialization outside of sysinit.c

Browse Source
This commit is contained in:
Markus Fröschle
2013-10-26 09:51:29 +00:00
parent a1d6c1720c
commit 5dfb76f1d4
2 changed files with 25 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
BaS_gcc/sources/pci.c
View File

@@ -63,70 +63,35 @@ void init_pci(void)
{ {
xprintf("initializing PCI bridge:"); xprintf("initializing PCI bridge:");
/* MCF_PCIARB_PACR = MCF_PCIARB_PACR_INTMPRI
* assert /PCIRESET (reset cards on bus). FIXME: According to documentation, + MCF_PCIARB_PACR_EXTMPRI(0x1F)
* this should be done last during PCI initialization + MCF_PCIARB_PACR_INTMINTEN
*/ + MCF_PCIARB_PACR_EXTMINTEN(0x1F);
MCF_PCI_PCIGSCR = MCF_PCI_PCIGSCR_PR;
/* // Setup burst parameters
* setup the PCI arbiter. MCF_PCI_PCICR1 = MCF_PCI_PCICR1_CACHELINESIZE(4) + MCF_PCI_PCICR1_LATTIMER(32);
*/ MCF_PCI_PCICR2 = MCF_PCI_PCICR2_MINGNT(16) + MCF_PCI_PCICR2_MAXLAT(16);
/* PCI Arbiter Control Register (PACR) */ // Turn on error signaling
MCF_PCIARB_PACR = MCF_PCIARB_PACR_INTMPRI /* internal master priority level high */ MCF_PCI_PCIICR = MCF_PCI_PCIICR_TAE + MCF_PCI_PCIICR_TAE + MCF_PCI_PCIICR_REE + 32;
+ MCF_PCIARB_PACR_EXTMPRI(0x1f) /* external master priority levels all high */ MCF_PCI_PCIGSCR |= MCF_PCI_PCIGSCR_SEE;
+ MCF_PCIARB_PACR_INTMINTEN /* generate interrupt if internal master timeout */
+ MCF_PCIARB_PACR_EXTMINTEN(0x1f); /* generate interrupt if external master timeout */
/* configure all 5 PCI Bus Grant pins for PCI */
MCF_PAD_PAR_PCIBG = 0x3ff;
/* configure all 5 PCI Bus Request pins for PCI */
MCF_PAD_PAR_PCIBR = 0x3ff;
/* PCI Status/Command Register PCISCR */ /* Configure Initiator Windows */
MCF_PCI_PCISCR = MCF_PCI_PCISCR_M /* recognize memory accesses */ /* initiator window 0 base / translation adress register */
+ MCF_PCI_PCISCR_B /* bus master enable for controller */ MCF_PCI_PCIIW0BTAR = (PCI_MEMORY_OFFSET + ((PCI_MEMORY_SIZE -1) >> 8)) & 0xffff0000;
+ MCF_PCI_PCISCR_MW; /* controller can generate memory write and invalidate command */
/* Configuration 1 Register PCICR1, setup burst parameters */ /* initiator window 1 base / translation adress register */
MCF_PCI_PCICR1 = MCF_PCI_PCICR1_CACHELINESIZE(8) /* cache line size in units of DWORDs */ MCF_PCI_PCIIW1BTAR = (PCI_IO_OFFSET + ((PCI_IO_SIZE - 1) >> 8)) & 0xffff0000;
+ MCF_PCI_PCICR1_LATTIMER(32); /* 256 PCI clocks (?) latency */
/* Configuration 2 Register PCICR2 */
MCF_PCI_PCICR2 = MCF_PCI_PCICR2_MINGNT(1) /* specifies how long the Coldfire processor retains bus ownership as master */
+ MCF_PCI_PCICR2_MAXLAT(1); /* specifies (in units of 1/4 microseconds) how often the Coldfire */
/* processor needs access to the bus as PCI master */
/* Initiator Control Register: turn on error signaling */
MCF_PCI_PCIICR = MCF_PCI_PCIICR_TAE + /* target abort enable: CPU generates an interrupt if target terminates a transaction */
MCF_PCI_PCIICR_IAE /* the same for the initiator */
/* + MCF_PCI_PCIICR_REE */ ; /* the same for retry errors */
/* Global Status/Control Register */
MCF_PCI_PCIGSCR |= MCF_PCI_PCIGSCR_SEE; /* generate interrupt if /PCISERR is asserted (PCI system error) */
/* configure initiator windows */ /* initiator window 2 base / translation address register */
MCF_PCI_PCIIW2BTAR = 0L; /* not used */
/* initiator window configuration register */
MCF_PCI_PCIIWCR = MCF_PCI_PCIIWCR_WINCTRL0_MEMRDLINE + MCF_PCI_PCIIWCR_WINCTRL1_IO;
/* Initiator Window 0 Base / Translation Address Register */ /* reset PCI devices */
#ifdef SAME_CPU_PCI_MEM_ADDR MCF_PCI_PCIGSCR &= ~MCF_PCI_PCIGSCR_PR;
MCF_PCI_PCIIW0BTAR = (PCI_MEMORY_OFFSET + ((PCI_MEMORY_SIZE - 1) >> 8) & 0xFFFF0000) |
(PCI_MEMORY_OFFSET >> 16 & 0xFFFF)
#else
MCF_PCI_PCIIW0BTAR = PCI_MEMORY_OFFSET + (((PCI_MEMORY_SIZE - 1) >> 8) & 0xFFFF0000);
#endif /* SAME_CPU_PCI_MEM_ADDR */
/* Initiator Window 1 Base / Translation Address Register */ xprintf("finished\r\n");
MCF_PCI_PCIIW1BTAR = (PCI_IO_OFFSET + ((PCI_IO_SIZE - 1) >> 8)) & 0xFFFF0000;
/* Initiator Window 2 Base / Translation Address Register */
MCF_PCI_PCIIW2BTAR = 0L; /* not used */
MCF_PCI_PCIIWCR = MCF_PCI_PCIIWCR_WINCTRL0_MEMRDLINE
+ MCF_PCI_PCIIWCR_WINCTRL1_IO;
/* reset PCI devices */
MCF_PCI_PCIGSCR &= ~MCF_PCI_PCIGSCR_PR;
xprintf("finished\r\n");
/* target zones */
} }

44
BaS_gcc/sources/sysinit.c
View File

@@ -480,44 +480,6 @@ void init_video_ddr(void) {
xprintf("finished\r\n"); xprintf("finished\r\n");
} }
/*
* INIT PCI
*/
void init_PCI(void) {
xprintf("PCI BUS controller initialization: ");
MCF_PCIARB_PACR = MCF_PCIARB_PACR_INTMPRI
+ MCF_PCIARB_PACR_EXTMPRI(0x1F)
+ MCF_PCIARB_PACR_INTMINTEN
+ MCF_PCIARB_PACR_EXTMINTEN(0x1F);
// Setup burst parameters
MCF_PCI_PCICR1 = MCF_PCI_PCICR1_CACHELINESIZE(4) + MCF_PCI_PCICR1_LATTIMER(32);
MCF_PCI_PCICR2 = MCF_PCI_PCICR2_MINGNT(16) + MCF_PCI_PCICR2_MAXLAT(16);
// Turn on error signaling
MCF_PCI_PCIICR = MCF_PCI_PCIICR_TAE + MCF_PCI_PCIICR_TAE + MCF_PCI_PCIICR_REE + 32;
MCF_PCI_PCIGSCR |= MCF_PCI_PCIGSCR_SEE;
/* Configure Initiator Windows */
/* initiator window 0 base / translation adress register */
MCF_PCI_PCIIW0BTAR = (PCI_MEMORY_OFFSET + ((PCI_MEMORY_SIZE -1) >> 8)) & 0xffff0000;
/* initiator window 1 base / translation adress register */
MCF_PCI_PCIIW1BTAR = (PCI_IO_OFFSET + ((PCI_IO_SIZE - 1) >> 8)) & 0xffff0000;
/* initiator window 2 base / translation address register */
MCF_PCI_PCIIW2BTAR = 0L; /* not used */
/* initiator window configuration register */
MCF_PCI_PCIIWCR = MCF_PCI_PCIIWCR_WINCTRL0_MEMRDLINE + MCF_PCI_PCIIWCR_WINCTRL1_IO;
/* reset PCI devices */
MCF_PCI_PCIGSCR &= ~MCF_PCI_PCIGSCR_PR;
xprintf("finished\r\n");
}
/* /*
* probe for UPC720101 (USB) * probe for UPC720101 (USB)
@@ -983,9 +945,9 @@ void initialize_hardware(void) {
init_slt(); init_slt();
init_fbcs(); init_fbcs();
init_ddram(); init_ddram();
init_PCI(); init_pci();
//init_eport(); init_eport();
//init_xlbus_arbiter(); init_xlbus_arbiter();
init_fpga(); init_fpga();
init_pll(); init_pll();
init_video_ddr(); init_video_ddr();