oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report resources to the kernel.

Browse Source
This commit is contained in:
Philip Homburg 2006-01-27 13:18:07 +00:00
parent 8036f12f47
commit cf7db577ae
3 changed files with 80 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/main.c
View File

@ -279,7 +279,7 @@ message *mp;
devind= mp->m1_i1; devind= mp->m1_i1;
pci_reserve2(devind, names[i].name); pci_reserve3(devind, mp->m_source, names[i].name);
mp->m_type= OK; mp->m_type= OK;
r= send(mp->m_source, mp); r= send(mp->m_source, mp);
if (r != 0) if (r != 0)

82
drivers/pci/pci.c
View File

@ -292,16 +292,74 @@ u16_t *didp;
} }
/*===========================================================================* /*===========================================================================*
* pci_reserve2 * * pci_reserve3 *
*===========================================================================*/ *===========================================================================*/
PUBLIC void pci_reserve2(devind, name) PUBLIC void pci_reserve3(devind, proc, name)
int devind; int devind;
int proc;
char *name; char *name;
{ {
int i, r;
u8_t ilr;
struct io_range ior;
struct mem_range mr;
assert(devind <= nr_pcidev); assert(devind <= nr_pcidev);
assert(!pcidev[devind].pd_inuse); assert(!pcidev[devind].pd_inuse);
pcidev[devind].pd_inuse= 1; pcidev[devind].pd_inuse= 1;
strcpy(pcidev[devind].pd_name, name); strcpy(pcidev[devind].pd_name, name);
for (i= 0; i<pcidev[devind].pd_bar_nr; i++)
{
if (pcidev[devind].pd_bar[i].pb_flags & PBF_INCOMPLETE)
{
printf("pci_reserve3: BAR %d is incomplete\n", i);
continue;
}
if (pcidev[devind].pd_bar[i].pb_flags & PBF_IO)
{
ior.ior_base= pcidev[devind].pd_bar[i].pb_base;
ior.ior_limit= ior.ior_base +
pcidev[devind].pd_bar[i].pb_size-1;
printf(
"pci_reserve3: for proc %d, adding I/O range [0x%x..0x%x]\n",
proc, ior.ior_base, ior.ior_limit);
r= sys_privctl(proc, SYS_PRIV_ADD_IO, 0, &ior);
if (r != OK)
{
printf("sys_privctl failed for proc %d: %d\n",
proc, r);
}
}
else
{
mr.mr_base= pcidev[devind].pd_bar[i].pb_base;
mr.mr_limit= mr.mr_base +
pcidev[devind].pd_bar[i].pb_size-1;
printf(
"pci_reserve3: for proc %d, should add memory range [0x%x..0x%x]\n",
proc, mr.mr_base, mr.mr_limit);
r= sys_privctl(proc, SYS_PRIV_ADD_MEM, 0, &mr);
if (r != OK)
{
printf("sys_privctl failed for proc %d: %d\n",
proc, r);
}
}
}
ilr= pcidev[devind].pd_ilr;
if (ilr != PCI_ILR_UNKNOWN)
{
printf("pci_reserve3: adding IRQ %d\n", ilr);
r= sys_privctl(proc, SYS_PRIV_ADD_IRQ, ilr, NULL);
if (r != OK)
{
printf("sys_privctl failed for proc %d: %d\n",
proc, r);
}
}
} }
/*===========================================================================* /*===========================================================================*
@ -630,7 +688,15 @@ printf("probe_bus(%d)\n", busind);
#endif #endif
if (vid == NO_VID) if (vid == NO_VID)
break; /* Nothing here */ {
if (func == 0)
break; /* Nothing here */
/* Scan all functions of a multifunction
* device.
*/
continue;
}
if (sts & (PSR_SSE|PSR_RMAS|PSR_RTAS)) if (sts & (PSR_SSE|PSR_RMAS|PSR_RTAS))
{ {
@ -641,7 +707,15 @@ printf("probe_bus(%d)\n", busind);
sts & (PSR_SSE|PSR_RMAS|PSR_RTAS)); sts & (PSR_SSE|PSR_RMAS|PSR_RTAS));
} }
else else
break; {
if (func == 0)
break; /* Nothing here */
/* Scan all functions of a
* multifunction device.
*/
continue;
}
} }
dstr= pci_dev_name(vid, did); dstr= pci_dev_name(vid, did);

2
drivers/pci/pci.h
View File

@ -80,7 +80,7 @@ extern struct pci_isabridge pci_isabridge[];
extern struct pci_pcibridge pci_pcibridge[]; extern struct pci_pcibridge pci_pcibridge[];
/* Utility functions */ /* Utility functions */
_PROTOTYPE( void pci_reserve2, (int devind, char name[M3_STRING]) ); _PROTOTYPE( void pci_reserve3, (int devind, int proc, char name[M3_STRING]));
_PROTOTYPE( void pci_release, (char name[M3_STRING]) ); _PROTOTYPE( void pci_release, (char name[M3_STRING]) );
/* /*