Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow pci_init() to be called twice, once just to find the PCI-Host

Browse Source 
bridges and determine the "pci chipset" values (for making PCI tags),
and again to actually map the configuration space registers.
This commit is contained in:
thorpej 1999-05-06 19:16:44 +00:00
parent 375d7c32f2
commit 35df607966
3 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/macppc/include/pci_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.h,v 1.7 1999/05/05 04:26:48 thorpej Exp $ */
/* $NetBSD: pci_machdep.h,v 1.8 1999/05/06 19:16:44 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -58,6 +58,7 @@ struct pci_bridge {
bus_space_tag_t iot;
bus_space_tag_t memt;
pci_chipset_tag_t pc;
int present;
};
struct pci_bridge pci_bridges[2];
@ -84,3 +85,8 @@ const char *pci_intr_string __P((pci_chipset_tag_t, pci_intr_handle_t));
void *pci_intr_establish __P((pci_chipset_tag_t, pci_intr_handle_t,
int, int (*)(void *), void *));
void pci_intr_disestablish __P((pci_chipset_tag_t, void *));
/*
* Internal functions.
*/
void pci_init __P((int));

7
sys/arch/macppc/macppc/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.5 1999/05/05 04:40:00 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.6 1999/05/06 19:16:44 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -49,8 +49,6 @@ struct cfattach mainbus_ca = {
sizeof(struct device), mainbus_match, mainbus_attach
};
void pci_init();
/*
* Probe for the mainbus; always succeeds.
*/
@ -88,7 +86,8 @@ mainbus_attach(parent, self, aux)
ca.ca_name = "cpu";
config_found(self, &ca, NULL);
pci_init();
/* Now can map PCI configuration space registers. */
pci_init(1);
for (n = 0; n < 2; n++) {
if (pci_bridges[n].addr) {

32
sys/arch/macppc/pci/bandit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bandit.c,v 1.10 1999/05/05 08:43:53 tsubai Exp $ */
/* $NetBSD: bandit.c,v 1.11 1999/05/06 19:16:45 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -107,14 +107,15 @@
#define BANDIT_SPECIAL_CYCLE 0xe00000 /* Special Cycle offset */
static void bandit_init __P((pci_chipset_tag_t));
static void scan_pci_devs __P((void));
static void scan_pci_devs __P((int));
static void config_slot __P((int, pci_chipset_tag_t, int));
void
pci_init()
pci_init(canmap)
int canmap;
{
scan_pci_devs();
scan_pci_devs(canmap);
}
static void
@ -138,7 +139,8 @@ bandit_init(pc)
static void
scan_pci_devs()
scan_pci_devs(canmap)
int canmap;
{
int reglen, node, child, n, is_bandit, is_mpc106;
char name[64];
@ -223,6 +225,7 @@ scan_pci_devs()
continue;
pci_bridges[n].bus = reg[0];
pci_bridges[n].present = 1;
/*
* Map the PCI configuration space access registers,
@ -230,19 +233,27 @@ scan_pci_devs()
*/
if (is_bandit) {
/* XXX magic numbers */
if (OF_getprop(node, "reg", reg, sizeof(reg)) != 8)
continue;
pci_bridges[n].addr = mapiodev(reg[0] + 0x800000, 4);
pci_bridges[n].data = mapiodev(reg[0] + 0xc00000, 4);
pci_bridges[n].pc = n;
if (canmap) {
if (OF_getprop(node, "reg", reg,
sizeof(reg)) != 8)
continue;
pci_bridges[n].addr =
mapiodev(reg[0] + 0x800000, 4);
pci_bridges[n].data =
mapiodev(reg[0] + 0xc00000, 4);
bandit_init(n);
}
} else if (is_mpc106) {
/* XXX magic numbers */
pci_bridges[n].pc = PCI_CHIPSET_MPC106; /* for now */
if (canmap) {
pci_bridges[n].addr = mapiodev(0xfec00000, 4);
pci_bridges[n].data = mapiodev(0xfee00000, 4);
pci_bridges[n].pc = PCI_CHIPSET_MPC106; /* for now */
}
}
if (canmap) {
/*
* Configure all of the PCI devices attached to this
* PCI-Host bridge.
@ -252,6 +263,7 @@ scan_pci_devs()
config_slot(child, pci_bridges[n].pc, -1);
child = OF_peer(child);
}
}
/* Bridge found, increment bridge instance. */
n++;