RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>

Browse Source 
* pci/pcibios.c, pci/pcibios.h: Corrected spacing
	Name modifications for a generic PCI interface
	Added wrapper routines for pci read/write configuration data
This commit is contained in:
Jennifer Averett
2005-05-04 19:24:41 +00:00
parent 7111268193
commit 6266abeb1b
3 changed files with 290 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/i386/shared/ChangeLog
View File

@@ -1,3 +1,9 @@
2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>
* pci/pcibios.c, pci/pcibios.h: Corrected spacing
Name modifications for a generic PCI interface
Added wrapper routines for pci read/write configuration data
2005-05-03 Jennifer Averett <jennifer.averett@oarcorp.com> 2005-05-03 Jennifer Averett <jennifer.averett@oarcorp.com>
* comm/tty_drv.c: Modified to support addition of parameter to ISRs. * comm/tty_drv.c: Modified to support addition of parameter to ISRs.

423
c/src/lib/libbsp/i386/shared/pci/pcibios.c
View File

@@ -11,7 +11,7 @@
#include <bsp.h> #include <bsp.h>
#include <pcibios.h> #include <pcibios.h>
#include <string.h> /* memcpy */ #include <string.h> /* memcpy */
/* /*
* This is simpliest possible PCI BIOS, it assumes that addressing * This is simpliest possible PCI BIOS, it assumes that addressing
@@ -46,39 +46,35 @@ pci_initialize(void)
pcibInitialized = 0; pcibInitialized = 0;
/* First, we have to look for BIOS-32 */ /* First, we have to look for BIOS-32 */
for(ucp=(unsigned char *)0xE0000; ucp < (unsigned char *)0xFFFFF; ucp+=0x10) for (ucp = (unsigned char *)0xE0000;
{ ucp < (unsigned char *)0xFFFFF;
if(memcmp(ucp, "_32_", 4) != 0) ucp += 0x10) {
{ if (memcmp(ucp, "_32_", 4) != 0) {
continue; continue;
} }
/* Got signature, check length */ /* Got signature, check length */
if(*(ucp + 9) != 1) if (*(ucp + 9) != 1) {
{ continue;
continue;
}
/* Verify checksum */
sum = 0;
for(i=0; i<16; i++)
{
sum += *(ucp+i);
}
if(sum == 0)
{
/* found */
break;
}
} }
if(ucp >= (unsigned char *)0xFFFFF) /* Verify checksum */
{ sum = 0;
/* BIOS-32 not found */ for (i=0; i<16; i++) {
return PCIB_ERR_NOTPRESENT; sum += *(ucp+i);
} }
if (sum == 0) {
/* found */
break;
}
}
if (ucp >= (unsigned char *)0xFFFFF) {
/* BIOS-32 not found */
return PCIB_ERR_NOTPRESENT;
}
/* BIOS-32 found, let us find PCI BIOS */ /* BIOS-32 found, let us find PCI BIOS */
ucp += 4; ucp += 4;
@@ -96,11 +92,10 @@ pci_initialize(void)
asm (" movl %edx, pcibExchg+12"); asm (" movl %edx, pcibExchg+12");
asm (" popa"); asm (" popa");
if((pcibExchg[0] & 0xff) != 0) if ((pcibExchg[0] & 0xff) != 0) {
{ /* Not found */
/* Not found */ return PCIB_ERR_NOTPRESENT;
return PCIB_ERR_NOTPRESENT; }
}
/* Found PCI entry point */ /* Found PCI entry point */
pcibEntry = pcibExchg[1] + pcibExchg[3]; pcibEntry = pcibExchg[1] + pcibExchg[3];
@@ -112,7 +107,7 @@ pci_initialize(void)
asm(" movl pcibExchg, %edi"); asm(" movl pcibExchg, %edi");
asm(" movb $0xb1, %ah"); asm(" movb $0xb1, %ah");
asm(" movb $0x01, %al"); asm(" movb $0x01, %al");
asm (" pushl %cs"); asm(" pushl %cs");
asm(" call *%edi"); asm(" call *%edi");
asm(" movl %eax, pcibExchg"); asm(" movl %eax, pcibExchg");
asm(" movl %ebx, pcibExchg+4"); asm(" movl %ebx, pcibExchg+4");
@@ -120,17 +115,15 @@ pci_initialize(void)
asm(" movl %edx, pcibExchg+12"); asm(" movl %edx, pcibExchg+12");
asm(" popa"); asm(" popa");
if((pcibExchg[0] & 0xff00) != 0) if ((pcibExchg[0] & 0xff00) != 0) {
{ /* Not found */
/* Not found */ return PCIB_ERR_NOTPRESENT;
return PCIB_ERR_NOTPRESENT; }
}
if(pcibExchg[3] != 0x20494350) if (pcibExchg[3] != 0x20494350) {
{ /* Signature does not match */
/* Signature does not match */ return PCIB_ERR_NOTPRESENT;
return PCIB_ERR_NOTPRESENT; }
}
/* Success */ /* Success */
@@ -145,10 +138,9 @@ pci_initialize(void)
int int
pcib_find_by_devid(int vendorId, int devId, int idx, int *sig) pcib_find_by_devid(int vendorId, int devId, int idx, int *sig)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = vendorId; pcibExchg[1] = vendorId;
@@ -201,10 +193,9 @@ pci_find_device(
int int
pcib_find_by_class(int classCode, int idx, int *sig) pcib_find_by_class(int classCode, int idx, int *sig)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = classCode; pcibExchg[1] = classCode;
@@ -222,10 +213,9 @@ pcib_find_by_class(int classCode, int idx, int *sig)
asm(" movl %ebx, pcibExchg+4"); asm(" movl %ebx, pcibExchg+4");
asm(" popa"); asm(" popa");
if((pcibExchg[0] & 0xff00) != 0) if ((pcibExchg[0] & 0xff00) != 0) {
{ return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff); }
}
*sig = pcibExchg[1] & 0xffff; *sig = pcibExchg[1] & 0xffff;
@@ -237,47 +227,45 @@ pcib_find_by_class(int classCode, int idx, int *sig)
static unsigned8 ucBusCount = 0xff; static unsigned8 ucBusCount = 0xff;
unsigned char unsigned char
BusCountPCI() pci_bus_count()
{ {
if( ucBusCount == 0xff ) if ( ucBusCount == 0xff ) {
{ unsigned char bus;
unsigned char bus; unsigned char dev;
unsigned char dev; unsigned char hd = 0;
unsigned char hd = 0; unsigned int d = 0;
unsigned int d = 0; int sig;
int sig;
ucBusCount = 0; ucBusCount = 0;
for (bus=0; bus< 0xff; bus++) { for (bus=0; bus< 0xff; bus++) {
for (dev=0; dev<PCI_MAX_DEVICES; dev++) { for (dev=0; dev<PCI_MAX_DEVICES; dev++) {
sig = PCIB_DEVSIG_MAKE(bus,dev,0); sig = PCIB_DEVSIG_MAKE(bus,dev,0);
pcib_conf_read32(sig, PCI_VENDOR_ID, &d); pcib_conf_read32(sig, PCI_VENDOR_ID, &d);
if( d != -1 ) { if ( d != -1 ) {
pcib_conf_read32(sig, PCI_CLASS_REVISION, &d); pcib_conf_read32(sig, PCI_CLASS_REVISION, &d);
if( (d >> 16) == PCI_CLASS_BRIDGE_PCI ) { if ( (d >> 16) == PCI_CLASS_BRIDGE_PCI ) {
pcib_conf_read8(sig, PCI_SUBORDINATE_BUS, &hd); pcib_conf_read8(sig, PCI_SUBORDINATE_BUS, &hd);
if( hd > ucBusCount )
ucBusCount = hd;
}
}
}
if ( hd > ucBusCount )
ucBusCount = hd;
}
}
} }
}
if( ucBusCount == 0 ) { if ( ucBusCount == 0 ) {
printk("BusCountPCI() found 0 busses, assuming 1\n"); printk("pci_bus_count() found 0 busses, assuming 1\n");
ucBusCount = 1; ucBusCount = 1;
} else if( ucBusCount == 0xff ) { } else if ( ucBusCount == 0xff ) {
printk("BusCountPCI() found 0xff busses, assuming 1\n"); printk("pci_bus_count() found 0xff busses, assuming 1\n");
ucBusCount = 1; ucBusCount = 1;
} }
} }
return ucBusCount; return ucBusCount;
} }
@@ -285,72 +273,66 @@ int
BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid, BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
int instance, int *pbus, int *pdev, int *pfun ) int instance, int *pbus, int *pdev, int *pfun )
{ {
int sig; int sig;
unsigned int d = 0; unsigned int d = 0;
unsigned short s = 0; unsigned short s = 0;
unsigned char bus; unsigned char bus;
unsigned char dev; unsigned char dev;
unsigned char fun; unsigned char fun;
unsigned char hd = 0; unsigned char hd = 0;
for (bus=0; bus<BusCountPCI(); bus++) for (bus=0; bus<pci_bus_count(); bus++) {
{ for (dev=0; dev<PCI_MAX_DEVICES; dev++) {
for (dev=0; dev<PCI_MAX_DEVICES; dev++) sig = PCIB_DEVSIG_MAKE(bus,dev,0);
{
sig = PCIB_DEVSIG_MAKE(bus,dev,0);
/* pci_read_config_byte(bus,dev,0, PCI_HEADER_TYPE, &hd); */ /* pci_read_config_byte(bus,dev,0, PCI_HEADER_TYPE, &hd); */
pcib_conf_read8(sig, 0xe, &hd); pcib_conf_read8(sig, 0xe, &hd);
hd = (hd & PCI_MULTI_FUNCTION ? PCI_MAX_FUNCTIONS : 1); hd = (hd & PCI_MULTI_FUNCTION ? PCI_MAX_FUNCTIONS : 1);
for (fun=0; fun<hd; fun++) { for (fun=0; fun<hd; fun++) {
/* /*
* The last devfn id/slot is special; must skip it * The last devfn id/slot is special; must skip it
*/ */
if( PCI_MAX_DEVICES-1 == dev && PCI_MAX_FUNCTIONS-1 == fun ) if ( PCI_MAX_DEVICES-1 == dev && PCI_MAX_FUNCTIONS-1 == fun )
break; break;
/*pci_read_config_dword(bus,dev,fun,PCI_VENDOR_ID,&d); */ /*pci_read_config_dword(bus,dev,fun,PCI_VENDOR_ID,&d); */
pcib_conf_read32(sig, 0, &d); pcib_conf_read32(sig, 0, &d);
if( d == -1 ) if ( d == -1 )
continue; continue;
#ifdef PCI_DEBUG #ifdef PCI_DEBUG
printk("BSP_pciFindDevice: found 0x%08x at %d/%d/%d\n",d,bus,dev,fun); printk("BSP_pciFindDevice: found 0x%08x at %d/%d/%d\n",d,bus,dev,fun);
#endif #endif
/* pci_read_config_word(bus,dev,fun,PCI_VENDOR_ID,&s); */ /* pci_read_config_word(bus,dev,fun,PCI_VENDOR_ID,&s); */
pcib_conf_read16(sig, 0, &s); pcib_conf_read16(sig, 0, &s);
if (vendorid != s) if (vendorid != s)
continue; continue;
/* pci_read_config_word(bus,dev,fun,PCI_DEVICE_ID,&s); */ /* pci_read_config_word(bus,dev,fun,PCI_DEVICE_ID,&s); */
pcib_conf_read16(sig, 0x2, &s); pcib_conf_read16(sig, 0x2, &s);
if (deviceid == s) { if (deviceid == s) {
if (instance--) continue; if (instance--) continue;
*pbus=bus; *pbus=bus;
*pdev=dev; *pdev=dev;
*pfun=fun; *pfun=fun;
return 0; return 0;
} }
}
} }
} }
return -1; }
return -1;
} }
/* /*
* Generate Special Cycle * Generate Special Cycle
*/ */
int int
pcib_special_cycle(int busNo, int data) pcib_special_cycle(int busNo, int data)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = busNo << 8; pcibExchg[1] = busNo << 8;
@@ -378,10 +360,9 @@ pcib_special_cycle(int busNo, int data)
int int
pcib_conf_read8(int sig, int off, unsigned char *data) pcib_conf_read8(int sig, int off, unsigned char *data)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = sig; pcibExchg[1] = sig;
@@ -399,10 +380,9 @@ pcib_conf_read8(int sig, int off, unsigned char *data)
asm(" movl %ecx, pcibExchg+4"); asm(" movl %ecx, pcibExchg+4");
asm(" popa"); asm(" popa");
if((pcibExchg[0] & 0xff00) != 0) if ((pcibExchg[0] & 0xff00) != 0) {
{ return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff); }
}
*data = (unsigned char)pcibExchg[1] & 0xff; *data = (unsigned char)pcibExchg[1] & 0xff;
@@ -416,10 +396,9 @@ pcib_conf_read8(int sig, int off, unsigned char *data)
int int
pcib_conf_read16(int sig, int off, unsigned short *data) pcib_conf_read16(int sig, int off, unsigned short *data)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = sig; pcibExchg[1] = sig;
@@ -437,10 +416,9 @@ pcib_conf_read16(int sig, int off, unsigned short *data)
asm(" movl %ecx, pcibExchg+4"); asm(" movl %ecx, pcibExchg+4");
asm(" popa"); asm(" popa");
if((pcibExchg[0] & 0xff00) != 0) if ((pcibExchg[0] & 0xff00) != 0) {
{ return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff); }
}
*data = (unsigned short)pcibExchg[1] & 0xffff; *data = (unsigned short)pcibExchg[1] & 0xffff;
@@ -454,10 +432,9 @@ pcib_conf_read16(int sig, int off, unsigned short *data)
int int
pcib_conf_read32(int sig, int off, unsigned int *data) pcib_conf_read32(int sig, int off, unsigned int *data)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = sig; pcibExchg[1] = sig;
@@ -475,10 +452,9 @@ pcib_conf_read32(int sig, int off, unsigned int *data)
asm(" movl %ecx, pcibExchg+4"); asm(" movl %ecx, pcibExchg+4");
asm(" popa"); asm(" popa");
if((pcibExchg[0] & 0xff00) != 0) if ((pcibExchg[0] & 0xff00) != 0) {
{ return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff); }
}
*data = (unsigned int)pcibExchg[1]; *data = (unsigned int)pcibExchg[1];
@@ -492,10 +468,9 @@ pcib_conf_read32(int sig, int off, unsigned int *data)
int int
pcib_conf_write8(int sig, int off, unsigned int data) pcib_conf_write8(int sig, int off, unsigned int data)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = sig; pcibExchg[1] = sig;
@@ -523,10 +498,9 @@ pcib_conf_write8(int sig, int off, unsigned int data)
int int
pcib_conf_write16(int sig, int off, unsigned int data) pcib_conf_write16(int sig, int off, unsigned int data)
{ {
if(!pcibInitialized) if (!pcibInitialized) {
{ return PCIB_ERR_UNINITIALIZED;
return PCIB_ERR_UNINITIALIZED; }
}
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = sig; pcibExchg[1] = sig;
@@ -556,10 +530,9 @@ pcib_conf_write16(int sig, int off, unsigned int data)
int int
pcib_conf_write32(int sig, int off, unsigned int data) pcib_conf_write32(int sig, int off, unsigned int data)
{ {
if(!pcibInitialized) if (!pcibInitialized){
{
return PCIB_ERR_UNINITIALIZED; return PCIB_ERR_UNINITIALIZED;
} }
pcibExchg[0] = pcibEntry; pcibExchg[0] = pcibEntry;
pcibExchg[1] = sig; pcibExchg[1] = sig;
@@ -585,8 +558,7 @@ pcib_conf_write32(int sig, int off, unsigned int data)
static int static int
pcib_convert_err(int err) pcib_convert_err(int err)
{ {
switch(err & 0xff) switch(err & 0xff){
{
case 0: case 0:
return PCIB_ERR_SUCCESS; return PCIB_ERR_SUCCESS;
case 0x81: case 0x81:
@@ -599,16 +571,117 @@ pcib_convert_err(int err)
return PCIB_ERR_BADREG; return PCIB_ERR_BADREG;
default: default:
break; break;
} }
return PCIB_ERR_NOFUNC; return PCIB_ERR_NOFUNC;
} }
static int
indirect_pci_read_config_byte(
unsigned char bus,
unsigned char slot,
unsigned char fun,
unsigned char offset,
unsigned char *val
)
{
int sig;
sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
pcib_conf_read8(sig, offset, val);
return PCIBIOS_SUCCESSFUL;
}
static int
indirect_pci_read_config_word(
unsigned char bus,
unsigned char slot,
unsigned char fun,
unsigned char offset,
unsigned short *val
)
{
int sig;
sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
pcib_conf_read16(sig, offset, val);
return PCIBIOS_SUCCESSFUL;
}
static int
indirect_pci_read_config_dword(
unsigned char bus,
unsigned char slot,
unsigned char fun,
unsigned char offset,
unsigned int *val
)
{
int sig;
sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
pcib_conf_read32(sig, offset, val);
return PCIBIOS_SUCCESSFUL;
}
static int
indirect_pci_write_config_byte(
unsigned char bus,
unsigned char slot,
unsigned char fun,
unsigned char offset,
unsigned char val
)
{
int sig;
sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
pcib_conf_write8(sig, offset, val);
return PCIBIOS_SUCCESSFUL;
}
static int
indirect_pci_write_config_word(
unsigned char bus,
unsigned char slot,
unsigned char fun,
unsigned char offset,
unsigned short val
)
{
int sig;
sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
pcib_conf_write16(sig, offset, val);
return PCIBIOS_SUCCESSFUL;
}
static int
indirect_pci_write_config_dword(
unsigned char bus,
unsigned char slot,
unsigned char fun,
unsigned char offset,
unsigned int val
)
{
int sig;
sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
pcib_conf_write32(sig, offset, val);
return PCIBIOS_SUCCESSFUL;
}
const pci_config_access_functions pci_indirect_functions = {
indirect_pci_read_config_byte,
indirect_pci_read_config_word,
indirect_pci_read_config_dword,
indirect_pci_write_config_byte,
indirect_pci_write_config_word,
indirect_pci_write_config_dword
};
pci_config BSP_pci_configuration = {
(volatile unsigned char*)0,
(volatile unsigned char*)0,
&pci_indirect_functions
};

2
c/src/lib/libbsp/i386/shared/pci/pcibios.h
View File

@@ -37,7 +37,7 @@ int pcib_conf_write16(int sig, int off, unsigned int data);
int pcib_conf_write32(int sig, int off, unsigned int data); int pcib_conf_write32(int sig, int off, unsigned int data);
int int
BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid, pci_find_device( unsigned short vendorid, unsigned short deviceid,
int instance, int *pbus, int *pdev, int *pfun ); int instance, int *pbus, int *pdev, int *pfun );
#ifdef __cplusplus #ifdef __cplusplus