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

Rather than use the residual data to guess that we have a raven pchb, 

note the raven pchb in device_register, and then look that up when
attaching the pcib.
This commit is contained in:
garbled 2007-04-26 19:27:04 +00:00
parent e1cce84524
commit 1d37c1ae36
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/prep/pci/pcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcib.c,v 1.19 2007/04/26 17:39:54 garbled Exp $ */
/* $NetBSD: pcib.c,v 1.20 2007/04/26 19:27:04 garbled Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.19 2007/04/26 17:39:54 garbled Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20 2007/04/26 19:27:04 garbled Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.19 2007/04/26 17:39:54 garbled Exp $");
#include <sys/device.h>
#include <machine/bus.h>
#include <machine/residual.h>
#include <dev/isa/isavar.h>
@ -109,6 +108,7 @@ void
pcibattach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
prop_bool_t rav;
char devinfo[256];
u_int32_t v;
int lvlmask = 0;
@ -157,10 +157,12 @@ pcibattach(struct device *parent, struct device *self, void *aux)
* setting it up differently. Reset it to 0000h.
*/
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SYMPHONY &&
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SYMPHONY_83C553 &&
strcmp(res->VitalProductData.PrintableModel,
"000000000000000000000000000(e2)") == 0) {
rav = prop_dictionary_get(device_properties(parent),
"prep-raven-pchb");
if (rav != NULL && prop_bool_true(rav) &&
PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SYMPHONY &&
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SYMPHONY_83C553) {
prop_dictionary_t dict, devsub;
prop_number_t pinsub;

20
sys/arch/prep/prep/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.19 2006/06/23 03:08:41 garbled Exp $ */
/* $NetBSD: autoconf.c,v 1.20 2007/04/26 19:27:04 garbled Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2006/06/23 03:08:41 garbled Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2007/04/26 19:27:04 garbled Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -57,6 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2006/06/23 03:08:41 garbled Exp $"
#include <machine/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
@ -130,6 +131,21 @@ device_register(struct device *dev, void *aux)
device_is_a(dev, "pms") || device_is_a(dev, "cpu"))
return;
if (device_is_a(dev, "pchb")) {
struct pci_attach_args *pa = aux;
prop_bool_t rav;
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_MOT &&
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MOT_RAVEN) {
rav = prop_bool_create(true);
KASSERT(rav != NULL);
(void) prop_dictionary_set(
device_properties(device_parent(dev)),
"prep-raven-pchb", rav);
prop_object_release(rav);
}
}
if (device_is_a(dev, "mainbus")) {
str1 = prop_string_create_cstring("/");
KASSERT(str1 != NULL);