diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2003-09-03 15:55:42 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2003-09-03 15:55:42 +0000 |
| commit | c8805578df37c9b0a5195fd57e1302b08999c20e (patch) | |
| tree | 9fd0481f785ad0ee1af28310e573602897ce1413 | |
| parent | 1de10a96d650ae3a708c131f5634dec1483f453b (diff) | |
support for bcm5823; based on patch from Jim Lambert, jlamber at futurex dot com; ok deraadt.
| -rw-r--r-- | share/man/man4/ubsec.4 | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 3 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/ubsec.c | 6 |
4 files changed, 15 insertions, 5 deletions
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4 index 4a92072449b..59387a83dcc 100644 --- a/share/man/man4/ubsec.4 +++ b/share/man/man4/ubsec.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ubsec.4,v 1.25 2003/08/12 19:42:46 jason Exp $ +.\" $OpenBSD: ubsec.4,v 1.26 2003/09/03 15:55:41 jason Exp $ .\" .\" Copyright (c) 2000 Jason L. Wright (jason@thought.net) .\" All rights reserved. @@ -57,6 +57,8 @@ Faster version of the BCM5820. This is the chip found on the Sun Crypto Accelerator 1000. .It Broadcom BCM5822 Faster version of the BCM5820. +.It Broadcom BCM5823 +Faster version of the BCM5822. .El .Pp The @@ -90,3 +92,4 @@ device driver appeared in .Ox 2.8 . .Sh BUGS The BCM5801 and BCM5802 have not actually been tested. +Also, some of the newer chips support AES but it is not supported by the driver. diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 28727f25cdc..dd0b6d5144c 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.665 2003/08/20 06:37:04 mickey Exp + * OpenBSD: pcidevs,v 1.666 2003/09/03 15:53:31 jason Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -707,6 +707,7 @@ #define PCI_PRODUCT_BROADCOM_5820 0x5820 /* 5820 */ #define PCI_PRODUCT_BROADCOM_5821 0x5821 /* 5821 */ #define PCI_PRODUCT_BROADCOM_5822 0x5822 /* 5822 */ +#define PCI_PRODUCT_BROADCOM_5823 0x5823 /* 5823 */ /* Brooktree products */ #define PCI_PRODUCT_BROOKTREE_BT848 0x0350 /* BT848 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index 4b6a19e7876..fd5d1edbe0b 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.665 2003/08/20 06:37:04 mickey Exp + * OpenBSD: pcidevs,v 1.666 2003/09/03 15:53:31 jason Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -1491,6 +1491,10 @@ static const struct pci_known_product pci_known_products[] = { "5822", }, { + PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5823, + "5823", + }, + { PCI_VENDOR_BROOKTREE, PCI_PRODUCT_BROOKTREE_BT848, "BT848", }, diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index b7d0da12975..448aa26ba9e 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsec.c,v 1.130 2003/08/14 15:20:29 jason Exp $ */ +/* $OpenBSD: ubsec.c,v 1.131 2003/09/03 15:55:41 jason Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -134,6 +134,7 @@ const struct pci_matchid ubsec_devices[] = { { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5820 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5821 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5822 }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5823 }, { PCI_VENDOR_SUN, PCI_PRODUCT_SUN_SCA1K }, { PCI_VENDOR_SUN, PCI_PRODUCT_SUN_5821 }, }; @@ -178,7 +179,8 @@ ubsec_attach(struct device *parent, struct device *self, void *aux) if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_BROADCOM && (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_5820 || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_5822)) + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_5822 || + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_5823)) sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG | UBS_FLAGS_LONGCTX | UBS_FLAGS_HWNORM | UBS_FLAGS_BIGKEY; |