diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-10-01 00:34:08 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-10-01 00:34:08 +0000 |
| commit | 332d2ae57e401d2301f33bfce683ba984b06b168 (patch) | |
| tree | a858d2dc452cb30e6332895d04401c01531ffc74 | |
| parent | d7c0845e173ac1ebe2f2eb8a114e54c55b09d4cc (diff) | |
add the PCI ids for the BCM5722, BCM5756, BCM5906 and BCM5906M chipsets.
the BCM5906/BCM5906M ids are not enabled for now; these chips are quite
a bit different from the others and are currently unsupported.
| -rw-r--r-- | sys/dev/pci/if_bge.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_bgereg.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index d30bc751dcf..d4b59829228 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.182 2006/09/26 23:57:16 brad Exp $ */ +/* $OpenBSD: if_bge.c,v 1.183 2006/10/01 00:34:07 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -233,6 +233,7 @@ const struct pci_matchid bge_devices[] = { { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5715S }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5720 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5721 }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5722 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5750 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5750M }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5751 }, @@ -247,6 +248,7 @@ const struct pci_matchid bge_devices[] = { { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5754M }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5755 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5755M }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5756 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5780 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5780S }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5781 }, @@ -259,6 +261,10 @@ const struct pci_matchid bge_devices[] = { { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5901 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5901A2 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5903M }, +#if 0 + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5906 }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5906M }, +#endif { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9D21 }, @@ -342,6 +348,7 @@ static const struct bge_revision { { BGE_CHIPID_BCM5714_B3, "BCM5714 B3" }, { BGE_CHIPID_BCM5715_A0, "BCM5715 A0" }, { BGE_CHIPID_BCM5715_A1, "BCM5715 A1" }, + { BGE_CHIPID_BCM5906_A1, "BCM5906 A1" }, { 0, NULL } }; @@ -363,6 +370,7 @@ static const struct bge_revision bge_majorrevs[] = { { BGE_ASICREV_BCM5714, "unknown BCM5714" }, { BGE_ASICREV_BCM5755, "unknown BCM5755" }, { BGE_ASICREV_BCM5787, "unknown BCM5787" }, + { BGE_ASICREV_BCM5906, "unknown BCM5906" }, { 0, NULL } }; diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h index f164a77e484..4105a496ec3 100644 --- a/sys/dev/pci/if_bgereg.h +++ b/sys/dev/pci/if_bgereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bgereg.h,v 1.60 2006/09/17 23:31:07 brad Exp $ */ +/* $OpenBSD: if_bgereg.h,v 1.61 2006/10/01 00:34:07 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -276,6 +276,7 @@ #define BGE_CHIPID_BCM5714_B3 0x80030000 #define BGE_CHIPID_BCM5715_A0 0x90000000 #define BGE_CHIPID_BCM5715_A1 0x90010000 +#define BGE_CHIPID_BCM5906_A1 0xc0010000 /* shorthand one */ #define BGE_ASICREV(x) ((x) >> 28) @@ -291,6 +292,7 @@ #define BGE_ASICREV_BCM5714 0x09 /* 5714, 5715 */ #define BGE_ASICREV_BCM5755 0x0a #define BGE_ASICREV_BCM5787 0x0b +#define BGE_ASICREV_BCM5906 0x0c /* chip revisions */ #define BGE_CHIPREV(x) ((x) >> 24) |