diff options
Diffstat (limited to 'sys/dev')
36 files changed, 139 insertions, 3710 deletions
| diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 3913ec612f79..2fadd6cd32ee 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -179,7 +179,7 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context)  	switch (res->Type) {  	case ACPI_RESOURCE_TYPE_START_DEPENDENT:  	case ACPI_RESOURCE_TYPE_END_DEPENDENT: -		panic("host bridge has depenedent resources"); +		panic("host bridge has dependent resources");  	case ACPI_RESOURCE_TYPE_ADDRESS16:  	case ACPI_RESOURCE_TYPE_ADDRESS32:  	case ACPI_RESOURCE_TYPE_ADDRESS64: diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index cee45fa5cc8a..d25f5de282d0 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -2015,7 +2015,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)  		ahd_outb(ahd, CLRINT, CLRSCSIINT);  		ahd_unpause(ahd);  	} else { -		printf("Reseting Channel for LQI Phase error\n"); +		printf("Resetting Channel for LQI Phase error\n");  		AHD_CORRECTABLE_ERROR(ahd);  		ahd_dump_card_state(ahd);  		ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); @@ -8179,7 +8179,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)  					AHD_UNCORRECTABLE_ERROR(ahd);  					break;  				case SIU_PFC_TMF_NOT_SUPPORTED: -					printf("TMF not supportd\n"); +					printf("TMF not supported\n");  					AHD_UNCORRECTABLE_ERROR(ahd);  					break;  				case SIU_PFC_TMF_FAILED: @@ -8313,7 +8313,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)  		break;  	}  	case SCSI_STATUS_OK: -		printf("%s: Interrupted for staus of 0???\n", +		printf("%s: Interrupted for status of 0???\n",  		       ahd_name(ahd));  		/* FALLTHROUGH */  	default: diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 18f68b806948..ce7f8a062b49 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -78,7 +78,7 @@ struct ahc_hard_error_entry {  static struct ahc_hard_error_entry ahc_hard_errors[] = {  	{ ILLHADDR,	"Illegal Host Access" }, -	{ ILLSADDR,	"Illegal Sequencer Address referrenced" }, +	{ ILLSADDR,	"Illegal Sequencer Address referenced" },  	{ ILLOPCODE,	"Illegal Opcode in sequencer program" },  	{ SQPARERR,	"Sequencer Parity Error" },  	{ DPARERR,	"Data-path Parity Error" }, @@ -476,7 +476,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)  		aic_set_scsi_status(scb, hscb->shared_data.status.scsi_status);  		switch (hscb->shared_data.status.scsi_status) {  		case SCSI_STATUS_OK: -			printf("%s: Interrupted for staus of 0???\n", +			printf("%s: Interrupted for status of 0???\n",  			       ahc_name(ahc));  			break;  		case SCSI_STATUS_CMD_TERMINATED: diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index fa2306f1525e..09e0820d2c74 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -813,7 +813,7 @@ ale_sysctl_node(struct ale_softc *sc)  	/* Misc statistics. */  	ALE_SYSCTL_STAT_ADD32(ctx, child, "reset_brk_seq",  	    &stats->reset_brk_seq, -	    "Controller resets due to broken Rx sequnce number"); +	    "Controller resets due to broken Rx sequence number");  	tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats",  	    CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ATE statistics"); diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 0d2455cab399..0c31f4fec16d 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -304,6 +304,12 @@ acpi_gpiobus_attach_aei(struct acpi_gpiobus_softc *sc, ACPI_HANDLE handle)  		devi->gpiobus.pins[i] = pins[i + 1];  	free(pins, M_DEVBUF); +	status = AcpiAttachData(aei_handle, acpi_fake_objhandler, child); +	if (ACPI_FAILURE(status)) { +		printf("WARNING: Unable to attach object data to %s - %s\n", +		    acpi_name(aei_handle), AcpiFormatException(status)); +	} +  	bus_attach_children(sc->super_sc.sc_busdev);  } @@ -427,6 +433,16 @@ acpi_gpiobus_child_location(device_t bus, device_t child, struct sbuf *sb)  	return (0);  } +static void +acpi_gpiobus_child_deleted(device_t bus, device_t child) +{ +	struct acpi_gpiobus_ivar *devi = device_get_ivars(child); + +	if (acpi_get_device(devi->handle) == child) +		AcpiDetachData(devi->handle, acpi_fake_objhandler); +	gpiobus_child_deleted(bus, child); +} +  static device_method_t acpi_gpiobus_methods[] = {  	/* Device interface */  	DEVMETHOD(device_probe,		acpi_gpiobus_probe), @@ -437,6 +453,7 @@ static device_method_t acpi_gpiobus_methods[] = {  	DEVMETHOD(bus_read_ivar,	acpi_gpiobus_read_ivar),  	DEVMETHOD(bus_add_child,	acpi_gpiobus_add_child),  	DEVMETHOD(bus_child_location,	acpi_gpiobus_child_location), +	DEVMETHOD(bus_child_deleted,	acpi_gpiobus_child_deleted),  	DEVMETHOD_END  }; diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 698b5e5fdd01..596e468d35f3 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -618,7 +618,7 @@ gpiobus_detach(device_t dev)  	    ("gpiobus mutex not initialized"));  	GPIOBUS_LOCK_DESTROY(sc); -	if ((err = bus_detach_children(dev)) != 0) +	if ((err = bus_generic_detach(dev)) != 0)  		return (err);  	rman_fini(&sc->sc_intr_rman); @@ -734,7 +734,7 @@ gpiobus_add_child(device_t dev, u_int order, const char *name, int unit)  	    sizeof(struct gpiobus_ivar)));  } -static void +void  gpiobus_child_deleted(device_t dev, device_t child)  {  	struct gpiobus_ivar *devi; diff --git a/sys/dev/gpio/gpiobus_internal.h b/sys/dev/gpio/gpiobus_internal.h index 58f862343403..be76450b2432 100644 --- a/sys/dev/gpio/gpiobus_internal.h +++ b/sys/dev/gpio/gpiobus_internal.h @@ -43,6 +43,7 @@ int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *);  int gpiobus_acquire_pin(device_t, uint32_t);  void gpiobus_release_pin(device_t, uint32_t);  int gpiobus_child_location(device_t, device_t, struct sbuf *); +void gpiobus_child_deleted(device_t, device_t);  device_t gpiobus_add_child_common(device_t, u_int, const char *, int, size_t);  int gpiobus_add_gpioc(device_t); diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c deleted file mode 100644 index 2e7545779b09..000000000000 --- a/sys/dev/hifn/hifn7751.c +++ /dev/null @@ -1,2739 +0,0 @@ -/*	$OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $	*/ - -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Invertex AEON / Hifn 7751 driver - * Copyright (c) 1999 Invertex Inc. All rights reserved. - * Copyright (c) 1999 Theo de Raadt - * Copyright (c) 2000-2001 Network Security Technologies, Inc. - *			http://www.netsec.net - * Copyright (c) 2003 Hifn Inc. - * - * This driver is based on a previous driver by Invertex, for which they - * requested:  Please send any comments, feedback, bug-fixes, or feature - * requests to software@invertex.com. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *   notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *   notice, this list of conditions and the following disclaimer in the - *   documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - *   derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Effort sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F30602-01-2-0537. - */ - -#include <sys/cdefs.h> -/* - * Driver for various Hifn encryption processors. - */ -#include "opt_hifn.h" - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/proc.h> -#include <sys/errno.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/module.h> -#include <sys/mbuf.h> -#include <sys/lock.h> -#include <sys/mutex.h> -#include <sys/sysctl.h> -#include <sys/uio.h> - -#include <vm/vm.h> -#include <vm/pmap.h> - -#include <machine/bus.h> -#include <machine/resource.h> -#include <sys/bus.h> -#include <sys/rman.h> - -#include <opencrypto/cryptodev.h> -#include <opencrypto/xform_auth.h> -#include <sys/random.h> -#include <sys/kobj.h> - -#include "cryptodev_if.h" - -#include <dev/pci/pcivar.h> -#include <dev/pci/pcireg.h> - -#ifdef HIFN_RNDTEST -#include <dev/rndtest/rndtest.h> -#endif -#include <dev/hifn/hifn7751reg.h> -#include <dev/hifn/hifn7751var.h> - -#ifdef HIFN_VULCANDEV -#include <sys/conf.h> -#include <sys/uio.h> - -static struct cdevsw vulcanpk_cdevsw; /* forward declaration */ -#endif - -/* - * Prototypes and count for the pci_device structure - */ -static	int hifn_probe(device_t); -static	int hifn_attach(device_t); -static	int hifn_detach(device_t); -static	int hifn_suspend(device_t); -static	int hifn_resume(device_t); -static	int hifn_shutdown(device_t); - -static	int hifn_probesession(device_t, const struct crypto_session_params *); -static	int hifn_newsession(device_t, crypto_session_t, -    const struct crypto_session_params *); -static	int hifn_process(device_t, struct cryptop *, int); - -static device_method_t hifn_methods[] = { -	/* Device interface */ -	DEVMETHOD(device_probe,		hifn_probe), -	DEVMETHOD(device_attach,	hifn_attach), -	DEVMETHOD(device_detach,	hifn_detach), -	DEVMETHOD(device_suspend,	hifn_suspend), -	DEVMETHOD(device_resume,	hifn_resume), -	DEVMETHOD(device_shutdown,	hifn_shutdown), - -	/* crypto device methods */ -	DEVMETHOD(cryptodev_probesession, hifn_probesession), -	DEVMETHOD(cryptodev_newsession,	hifn_newsession), -	DEVMETHOD(cryptodev_process,	hifn_process), - -	DEVMETHOD_END -}; - -static driver_t hifn_driver = { -	"hifn", -	hifn_methods, -	sizeof (struct hifn_softc) -}; - -DRIVER_MODULE(hifn, pci, hifn_driver, 0, 0); -MODULE_DEPEND(hifn, crypto, 1, 1, 1); -#ifdef HIFN_RNDTEST -MODULE_DEPEND(hifn, rndtest, 1, 1, 1); -#endif - -static	void hifn_reset_board(struct hifn_softc *, int); -static	void hifn_reset_puc(struct hifn_softc *); -static	void hifn_puc_wait(struct hifn_softc *); -static	int hifn_enable_crypto(struct hifn_softc *); -static	void hifn_set_retry(struct hifn_softc *sc); -static	void hifn_init_dma(struct hifn_softc *); -static	void hifn_init_pci_registers(struct hifn_softc *); -static	int hifn_sramsize(struct hifn_softc *); -static	int hifn_dramsize(struct hifn_softc *); -static	int hifn_ramtype(struct hifn_softc *); -static	void hifn_sessions(struct hifn_softc *); -static	void hifn_intr(void *); -static	u_int hifn_write_command(struct hifn_command *, u_int8_t *); -static	u_int32_t hifn_next_signature(u_int32_t a, u_int cnt); -static	void hifn_callback(struct hifn_softc *, struct hifn_command *, u_int8_t *); -static	int hifn_crypto(struct hifn_softc *, struct hifn_command *, struct cryptop *, int); -static	int hifn_readramaddr(struct hifn_softc *, int, u_int8_t *); -static	int hifn_writeramaddr(struct hifn_softc *, int, u_int8_t *); -static	int hifn_dmamap_load_src(struct hifn_softc *, struct hifn_command *); -static	int hifn_dmamap_load_dst(struct hifn_softc *, struct hifn_command *); -static	int hifn_init_pubrng(struct hifn_softc *); -static	void hifn_rng(void *); -static	void hifn_tick(void *); -static	void hifn_abort(struct hifn_softc *); -static	void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *, int *); - -static	void hifn_write_reg_0(struct hifn_softc *, bus_size_t, u_int32_t); -static	void hifn_write_reg_1(struct hifn_softc *, bus_size_t, u_int32_t); - -static __inline u_int32_t -READ_REG_0(struct hifn_softc *sc, bus_size_t reg) -{ -    u_int32_t v = bus_space_read_4(sc->sc_st0, sc->sc_sh0, reg); -    sc->sc_bar0_lastreg = (bus_size_t) -1; -    return (v); -} -#define	WRITE_REG_0(sc, reg, val)	hifn_write_reg_0(sc, reg, val) - -static __inline u_int32_t -READ_REG_1(struct hifn_softc *sc, bus_size_t reg) -{ -    u_int32_t v = bus_space_read_4(sc->sc_st1, sc->sc_sh1, reg); -    sc->sc_bar1_lastreg = (bus_size_t) -1; -    return (v); -} -#define	WRITE_REG_1(sc, reg, val)	hifn_write_reg_1(sc, reg, val) - -static SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, -    "Hifn driver parameters"); - -#ifdef HIFN_DEBUG -static	int hifn_debug = 0; -SYSCTL_INT(_hw_hifn, OID_AUTO, debug, CTLFLAG_RW, &hifn_debug, -	    0, "control debugging msgs"); -#endif - -static	struct hifn_stats hifnstats; -SYSCTL_STRUCT(_hw_hifn, OID_AUTO, stats, CTLFLAG_RD, &hifnstats, -	    hifn_stats, "driver statistics"); -static	int hifn_maxbatch = 1; -SYSCTL_INT(_hw_hifn, OID_AUTO, maxbatch, CTLFLAG_RW, &hifn_maxbatch, -	    0, "max ops to batch w/o interrupt"); - -/* - * Probe for a supported device.  The PCI vendor and device - * IDs are used to detect devices we know how to handle. - */ -static int -hifn_probe(device_t dev) -{ -	if (pci_get_vendor(dev) == PCI_VENDOR_INVERTEX && -	    pci_get_device(dev) == PCI_PRODUCT_INVERTEX_AEON) -		return (BUS_PROBE_DEFAULT); -	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && -	    (pci_get_device(dev) == PCI_PRODUCT_HIFN_7751 || -	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7951 || -	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 || -	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7956 || -	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7811)) -		return (BUS_PROBE_DEFAULT); -	if (pci_get_vendor(dev) == PCI_VENDOR_NETSEC && -	    pci_get_device(dev) == PCI_PRODUCT_NETSEC_7751) -		return (BUS_PROBE_DEFAULT); -	return (ENXIO); -} - -static void -hifn_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) -{ -	bus_addr_t *paddr = (bus_addr_t*) arg; -	*paddr = segs->ds_addr; -} - -static const char* -hifn_partname(struct hifn_softc *sc) -{ -	/* XXX sprintf numbers when not decoded */ -	switch (pci_get_vendor(sc->sc_dev)) { -	case PCI_VENDOR_HIFN: -		switch (pci_get_device(sc->sc_dev)) { -		case PCI_PRODUCT_HIFN_6500:	return "Hifn 6500"; -		case PCI_PRODUCT_HIFN_7751:	return "Hifn 7751"; -		case PCI_PRODUCT_HIFN_7811:	return "Hifn 7811"; -		case PCI_PRODUCT_HIFN_7951:	return "Hifn 7951"; -		case PCI_PRODUCT_HIFN_7955:	return "Hifn 7955"; -		case PCI_PRODUCT_HIFN_7956:	return "Hifn 7956"; -		} -		return "Hifn unknown-part"; -	case PCI_VENDOR_INVERTEX: -		switch (pci_get_device(sc->sc_dev)) { -		case PCI_PRODUCT_INVERTEX_AEON:	return "Invertex AEON"; -		} -		return "Invertex unknown-part"; -	case PCI_VENDOR_NETSEC: -		switch (pci_get_device(sc->sc_dev)) { -		case PCI_PRODUCT_NETSEC_7751:	return "NetSec 7751"; -		} -		return "NetSec unknown-part"; -	} -	return "Unknown-vendor unknown-part"; -} - -static void -default_harvest(struct rndtest_state *rsp, void *buf, u_int count) -{ -	/* MarkM: FIX!! Check that this does not swamp the harvester! */ -	random_harvest_queue(buf, count, RANDOM_PURE_HIFN); -} - -static u_int -checkmaxmin(device_t dev, const char *what, u_int v, u_int min, u_int max) -{ -	if (v > max) { -		device_printf(dev, "Warning, %s %u out of range, " -			"using max %u\n", what, v, max); -		v = max; -	} else if (v < min) { -		device_printf(dev, "Warning, %s %u out of range, " -			"using min %u\n", what, v, min); -		v = min; -	} -	return v; -} - -/* - * Select PLL configuration for 795x parts.  This is complicated in - * that we cannot determine the optimal parameters without user input. - * The reference clock is derived from an external clock through a - * multiplier.  The external clock is either the host bus (i.e. PCI) - * or an external clock generator.  When using the PCI bus we assume - * the clock is either 33 or 66 MHz; for an external source we cannot - * tell the speed. - * - * PLL configuration is done with a string: "pci" for PCI bus, or "ext" - * for an external source, followed by the frequency.  We calculate - * the appropriate multiplier and PLL register contents accordingly. - * When no configuration is given we default to "pci66" since that - * always will allow the card to work.  If a card is using the PCI - * bus clock and in a 33MHz slot then it will be operating at half - * speed until the correct information is provided. - * - * We use a default setting of "ext66" because according to Mike Ham - * of HiFn, almost every board in existence has an external crystal - * populated at 66Mhz. Using PCI can be a problem on modern motherboards, - * because PCI33 can have clocks from 0 to 33Mhz, and some have - * non-PCI-compliant spread-spectrum clocks, which can confuse the pll. - */ -static void -hifn_getpllconfig(device_t dev, u_int *pll) -{ -	const char *pllspec; -	u_int freq, mul, fl, fh; -	u_int32_t pllconfig; -	char *nxt; - -	if (resource_string_value("hifn", device_get_unit(dev), -	    "pllconfig", &pllspec)) -		pllspec = "ext66"; -	fl = 33, fh = 66; -	pllconfig = 0; -	if (strncmp(pllspec, "ext", 3) == 0) { -		pllspec += 3; -		pllconfig |= HIFN_PLL_REF_SEL; -		switch (pci_get_device(dev)) { -		case PCI_PRODUCT_HIFN_7955: -		case PCI_PRODUCT_HIFN_7956: -			fl = 20, fh = 100; -			break; -#ifdef notyet -		case PCI_PRODUCT_HIFN_7954: -			fl = 20, fh = 66; -			break; -#endif -		} -	} else if (strncmp(pllspec, "pci", 3) == 0) -		pllspec += 3; -	freq = strtoul(pllspec, &nxt, 10); -	if (nxt == pllspec) -		freq = 66; -	else -		freq = checkmaxmin(dev, "frequency", freq, fl, fh); -	/* -	 * Calculate multiplier.  We target a Fck of 266 MHz, -	 * allowing only even values, possibly rounded down. -	 * Multipliers > 8 must set the charge pump current. -	 */ -	mul = checkmaxmin(dev, "PLL divisor", (266 / freq) &~ 1, 2, 12); -	pllconfig |= (mul / 2 - 1) << HIFN_PLL_ND_SHIFT; -	if (mul > 8) -		pllconfig |= HIFN_PLL_IS; -	*pll = pllconfig; -} - -/* - * Attach an interface that successfully probed. - */ -static int  -hifn_attach(device_t dev) -{ -	struct hifn_softc *sc = device_get_softc(dev); -	caddr_t kva; -	int rseg, rid; -	char rbase; -	uint16_t rev; - -	sc->sc_dev = dev; - -	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "hifn driver", MTX_DEF); - -	/* XXX handle power management */ - -	/* -	 * The 7951 and 795x have a random number generator and -	 * public key support; note this. -	 */ -	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && -	    (pci_get_device(dev) == PCI_PRODUCT_HIFN_7951 || -	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 || -	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7956)) -		sc->sc_flags = HIFN_HAS_RNG | HIFN_HAS_PUBLIC; -	/* -	 * The 7811 has a random number generator and -	 * we also note it's identity 'cuz of some quirks. -	 */ -	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && -	    pci_get_device(dev) == PCI_PRODUCT_HIFN_7811) -		sc->sc_flags |= HIFN_IS_7811 | HIFN_HAS_RNG; - -	/* -	 * The 795x parts support AES. -	 */ -	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && -	    (pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 || -	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7956)) { -		sc->sc_flags |= HIFN_IS_7956 | HIFN_HAS_AES; -		/* -		 * Select PLL configuration.  This depends on the -		 * bus and board design and must be manually configured -		 * if the default setting is unacceptable. -		 */ -		hifn_getpllconfig(dev, &sc->sc_pllconfig); -	} - -	/* -	 * Setup PCI resources. Note that we record the bus -	 * tag and handle for each register mapping, this is -	 * used by the READ_REG_0, WRITE_REG_0, READ_REG_1, -	 * and WRITE_REG_1 macros throughout the driver. -	 */ -	pci_enable_busmaster(dev); - -	rid = HIFN_BAR0; -	sc->sc_bar0res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, -			 			RF_ACTIVE); -	if (sc->sc_bar0res == NULL) { -		device_printf(dev, "cannot map bar%d register space\n", 0); -		goto fail_pci; -	} -	sc->sc_st0 = rman_get_bustag(sc->sc_bar0res); -	sc->sc_sh0 = rman_get_bushandle(sc->sc_bar0res); -	sc->sc_bar0_lastreg = (bus_size_t) -1; - -	rid = HIFN_BAR1; -	sc->sc_bar1res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, -						RF_ACTIVE); -	if (sc->sc_bar1res == NULL) { -		device_printf(dev, "cannot map bar%d register space\n", 1); -		goto fail_io0; -	} -	sc->sc_st1 = rman_get_bustag(sc->sc_bar1res); -	sc->sc_sh1 = rman_get_bushandle(sc->sc_bar1res); -	sc->sc_bar1_lastreg = (bus_size_t) -1; - -	hifn_set_retry(sc); - -	/* -	 * Setup the area where the Hifn DMA's descriptors -	 * and associated data structures. -	 */ -	if (bus_dma_tag_create(bus_get_dma_tag(dev),	/* PCI parent */ -			       1, 0,			/* alignment,boundary */ -			       BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */ -			       BUS_SPACE_MAXADDR,	/* highaddr */ -			       NULL, NULL,		/* filter, filterarg */ -			       HIFN_MAX_DMALEN,		/* maxsize */ -			       MAX_SCATTER,		/* nsegments */ -			       HIFN_MAX_SEGLEN,		/* maxsegsize */ -			       BUS_DMA_ALLOCNOW,	/* flags */ -			       NULL,			/* lockfunc */ -			       NULL,			/* lockarg */ -			       &sc->sc_dmat)) { -		device_printf(dev, "cannot allocate DMA tag\n"); -		goto fail_io1; -	} -	if (bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &sc->sc_dmamap)) { -		device_printf(dev, "cannot create dma map\n"); -		bus_dma_tag_destroy(sc->sc_dmat); -		goto fail_io1; -	} -	if (bus_dmamem_alloc(sc->sc_dmat, (void**) &kva, BUS_DMA_NOWAIT, &sc->sc_dmamap)) { -		device_printf(dev, "cannot alloc dma buffer\n"); -		bus_dmamap_destroy(sc->sc_dmat, sc->sc_dmamap); -		bus_dma_tag_destroy(sc->sc_dmat); -		goto fail_io1; -	} -	if (bus_dmamap_load(sc->sc_dmat, sc->sc_dmamap, kva, -			     sizeof (*sc->sc_dma), -			     hifn_dmamap_cb, &sc->sc_dma_physaddr, -			     BUS_DMA_NOWAIT)) { -		device_printf(dev, "cannot load dma map\n"); -		bus_dmamem_free(sc->sc_dmat, kva, sc->sc_dmamap); -		bus_dma_tag_destroy(sc->sc_dmat); -		goto fail_io1; -	} -	sc->sc_dma = (struct hifn_dma *)kva; -	bzero(sc->sc_dma, sizeof(*sc->sc_dma)); - -	KASSERT(sc->sc_st0 != 0, ("hifn_attach: null bar0 tag!")); -	KASSERT(sc->sc_sh0 != 0, ("hifn_attach: null bar0 handle!")); -	KASSERT(sc->sc_st1 != 0, ("hifn_attach: null bar1 tag!")); -	KASSERT(sc->sc_sh1 != 0, ("hifn_attach: null bar1 handle!")); - -	/* -	 * Reset the board and do the ``secret handshake'' -	 * to enable the crypto support.  Then complete the -	 * initialization procedure by setting up the interrupt -	 * and hooking in to the system crypto support so we'll -	 * get used for system services like the crypto device, -	 * IPsec, RNG device, etc. -	 */ -	hifn_reset_board(sc, 0); - -	if (hifn_enable_crypto(sc) != 0) { -		device_printf(dev, "crypto enabling failed\n"); -		goto fail_mem; -	} -	hifn_reset_puc(sc); - -	hifn_init_dma(sc); -	hifn_init_pci_registers(sc); - -	/* XXX can't dynamically determine ram type for 795x; force dram */ -	if (sc->sc_flags & HIFN_IS_7956) -		sc->sc_drammodel = 1; -	else if (hifn_ramtype(sc)) -		goto fail_mem; - -	if (sc->sc_drammodel == 0) -		hifn_sramsize(sc); -	else -		hifn_dramsize(sc); - -	/* -	 * Workaround for NetSec 7751 rev A: half ram size because two -	 * of the address lines were left floating -	 */ -	if (pci_get_vendor(dev) == PCI_VENDOR_NETSEC && -	    pci_get_device(dev) == PCI_PRODUCT_NETSEC_7751 && -	    pci_get_revid(dev) == 0x61)	/*XXX???*/ -		sc->sc_ramsize >>= 1; - -	/* -	 * Arrange the interrupt line. -	 */ -	rid = 0; -	sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, -					    RF_SHAREABLE|RF_ACTIVE); -	if (sc->sc_irq == NULL) { -		device_printf(dev, "could not map interrupt\n"); -		goto fail_mem; -	} -	/* -	 * NB: Network code assumes we are blocked with splimp() -	 *     so make sure the IRQ is marked appropriately. -	 */ -	if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, -			   NULL, hifn_intr, sc, &sc->sc_intrhand)) { -		device_printf(dev, "could not setup interrupt\n"); -		goto fail_intr2; -	} - -	hifn_sessions(sc); - -	/* -	 * NB: Keep only the low 16 bits; this masks the chip id -	 *     from the 7951. -	 */ -	rev = READ_REG_1(sc, HIFN_1_REVID) & 0xffff; - -	rseg = sc->sc_ramsize / 1024; -	rbase = 'K'; -	if (sc->sc_ramsize >= (1024 * 1024)) { -		rbase = 'M'; -		rseg /= 1024; -	} -	device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram", -		hifn_partname(sc), rev, -		rseg, rbase, sc->sc_drammodel ? 'd' : 's'); -	if (sc->sc_flags & HIFN_IS_7956) -		printf(", pll=0x%x<%s clk, %ux mult>", -			sc->sc_pllconfig, -			sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci", -			2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11)); -	printf("\n"); - -	WRITE_REG_0(sc, HIFN_0_PUCNFG, -	    READ_REG_0(sc, HIFN_0_PUCNFG) | HIFN_PUCNFG_CHIPID); -	sc->sc_ena = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA; - -	switch (sc->sc_ena) { -	case HIFN_PUSTAT_ENA_2: -	case HIFN_PUSTAT_ENA_1: -		sc->sc_cid = crypto_get_driverid(dev, -		    sizeof(struct hifn_session), CRYPTOCAP_F_HARDWARE); -		if (sc->sc_cid < 0) { -			device_printf(dev, "could not get crypto driver id\n"); -			goto fail_intr; -		} -		break; -	} -		 -	bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - -	if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG)) -		hifn_init_pubrng(sc); - -	callout_init(&sc->sc_tickto, 1); -	callout_reset(&sc->sc_tickto, hz, hifn_tick, sc); - -	return (0); - -fail_intr: -	bus_teardown_intr(dev, sc->sc_irq, sc->sc_intrhand); -fail_intr2: -	/* XXX don't store rid */ -	bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq); -fail_mem: -	bus_dmamap_unload(sc->sc_dmat, sc->sc_dmamap); -	bus_dmamem_free(sc->sc_dmat, sc->sc_dma, sc->sc_dmamap); -	bus_dma_tag_destroy(sc->sc_dmat); - -	/* Turn off DMA polling */ -	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET | -	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE); -fail_io1: -	bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR1, sc->sc_bar1res); -fail_io0: -	bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR0, sc->sc_bar0res); -fail_pci: -	mtx_destroy(&sc->sc_mtx); -	return (ENXIO); -} - -/* - * Detach an interface that successfully probed. - */ -static int  -hifn_detach(device_t dev) -{ -	struct hifn_softc *sc = device_get_softc(dev); - -	KASSERT(sc != NULL, ("hifn_detach: null software carrier!")); - -	/* disable interrupts */ -	WRITE_REG_1(sc, HIFN_1_DMA_IER, 0); - -	/*XXX other resources */ -	callout_stop(&sc->sc_tickto); -	callout_stop(&sc->sc_rngto); -#ifdef HIFN_RNDTEST -	if (sc->sc_rndtest) -		rndtest_detach(sc->sc_rndtest); -#endif - -	/* Turn off DMA polling */ -	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET | -	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE); - -	crypto_unregister_all(sc->sc_cid); - -	bus_teardown_intr(dev, sc->sc_irq, sc->sc_intrhand); -	/* XXX don't store rid */ -	bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq); - -	bus_dmamap_unload(sc->sc_dmat, sc->sc_dmamap); -	bus_dmamem_free(sc->sc_dmat, sc->sc_dma, sc->sc_dmamap); -	bus_dma_tag_destroy(sc->sc_dmat); - -	bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR1, sc->sc_bar1res); -	bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR0, sc->sc_bar0res); - -	mtx_destroy(&sc->sc_mtx); - -	return (0); -} - -/* - * Stop all chip I/O so that the kernel's probe routines don't - * get confused by errant DMAs when rebooting. - */ -static int -hifn_shutdown(device_t dev) -{ -#ifdef notyet -	hifn_stop(device_get_softc(dev)); -#endif -	return (0); -} - -/* - * Device suspend routine.  Stop the interface and save some PCI - * settings in case the BIOS doesn't restore them properly on - * resume. - */ -static int -hifn_suspend(device_t dev) -{ -	struct hifn_softc *sc = device_get_softc(dev); -#ifdef notyet -	hifn_stop(sc); -#endif -	sc->sc_suspended = 1; - -	return (0); -} - -/* - * Device resume routine.  Restore some PCI settings in case the BIOS - * doesn't, re-enable busmastering, and restart the interface if - * appropriate. - */ -static int -hifn_resume(device_t dev) -{ -	struct hifn_softc *sc = device_get_softc(dev); -#ifdef notyet -        /* reinitialize interface if necessary */ -        if (ifp->if_flags & IFF_UP) -                rl_init(sc); -#endif -	sc->sc_suspended = 0; - -	return (0); -} - -static int -hifn_init_pubrng(struct hifn_softc *sc) -{ -	u_int32_t r; -	int i; - -#ifdef HIFN_RNDTEST -	sc->sc_rndtest = rndtest_attach(sc->sc_dev); -	if (sc->sc_rndtest) -		sc->sc_harvest = rndtest_harvest; -	else -		sc->sc_harvest = default_harvest; -#else -	sc->sc_harvest = default_harvest; -#endif -	if ((sc->sc_flags & HIFN_IS_7811) == 0) { -		/* Reset 7951 public key/rng engine */ -		WRITE_REG_1(sc, HIFN_1_PUB_RESET, -		    READ_REG_1(sc, HIFN_1_PUB_RESET) | HIFN_PUBRST_RESET); - -		for (i = 0; i < 100; i++) { -			DELAY(1000); -			if ((READ_REG_1(sc, HIFN_1_PUB_RESET) & -			    HIFN_PUBRST_RESET) == 0) -				break; -		} - -		if (i == 100) { -			device_printf(sc->sc_dev, "public key init failed\n"); -			return (1); -		} -	} - -	/* Enable the rng, if available */ -	if (sc->sc_flags & HIFN_HAS_RNG) { -		if (sc->sc_flags & HIFN_IS_7811) { -			r = READ_REG_1(sc, HIFN_1_7811_RNGENA); -			if (r & HIFN_7811_RNGENA_ENA) { -				r &= ~HIFN_7811_RNGENA_ENA; -				WRITE_REG_1(sc, HIFN_1_7811_RNGENA, r); -			} -			WRITE_REG_1(sc, HIFN_1_7811_RNGCFG, -			    HIFN_7811_RNGCFG_DEFL); -			r |= HIFN_7811_RNGENA_ENA; -			WRITE_REG_1(sc, HIFN_1_7811_RNGENA, r); -		} else -			WRITE_REG_1(sc, HIFN_1_RNG_CONFIG, -			    READ_REG_1(sc, HIFN_1_RNG_CONFIG) | -			    HIFN_RNGCFG_ENA); - -		sc->sc_rngfirst = 1; -		if (hz >= 100) -			sc->sc_rnghz = hz / 100; -		else -			sc->sc_rnghz = 1; -		callout_init(&sc->sc_rngto, 1); -		callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); -	} - -	/* Enable public key engine, if available */ -	if (sc->sc_flags & HIFN_HAS_PUBLIC) { -		WRITE_REG_1(sc, HIFN_1_PUB_IEN, HIFN_PUBIEN_DONE); -		sc->sc_dmaier |= HIFN_DMAIER_PUBDONE; -		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier); -#ifdef HIFN_VULCANDEV -		sc->sc_pkdev = make_dev(&vulcanpk_cdevsw, 0,  -					UID_ROOT, GID_WHEEL, 0666, -					"vulcanpk"); -		sc->sc_pkdev->si_drv1 = sc; -#endif -	} - -	return (0); -} - -static void -hifn_rng(void *vsc) -{ -#define	RANDOM_BITS(n)	(n)*sizeof (u_int32_t), (n)*sizeof (u_int32_t)*NBBY, 0 -	struct hifn_softc *sc = vsc; -	u_int32_t sts, num[2]; -	int i; - -	if (sc->sc_flags & HIFN_IS_7811) { -		/* ONLY VALID ON 7811!!!! */ -		for (i = 0; i < 5; i++) { -			sts = READ_REG_1(sc, HIFN_1_7811_RNGSTS); -			if (sts & HIFN_7811_RNGSTS_UFL) { -				device_printf(sc->sc_dev, -					      "RNG underflow: disabling\n"); -				return; -			} -			if ((sts & HIFN_7811_RNGSTS_RDY) == 0) -				break; - -			/* -			 * There are at least two words in the RNG FIFO -			 * at this point. -			 */ -			num[0] = READ_REG_1(sc, HIFN_1_7811_RNGDAT); -			num[1] = READ_REG_1(sc, HIFN_1_7811_RNGDAT); -			/* NB: discard first data read */ -			if (sc->sc_rngfirst) -				sc->sc_rngfirst = 0; -			else -				(*sc->sc_harvest)(sc->sc_rndtest, -					num, sizeof (num)); -		} -	} else { -		num[0] = READ_REG_1(sc, HIFN_1_RNG_DATA); - -		/* NB: discard first data read */ -		if (sc->sc_rngfirst) -			sc->sc_rngfirst = 0; -		else -			(*sc->sc_harvest)(sc->sc_rndtest, -				num, sizeof (num[0])); -	} - -	callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); -#undef RANDOM_BITS -} - -static void -hifn_puc_wait(struct hifn_softc *sc) -{ -	int i; -	int reg = HIFN_0_PUCTRL; - -	if (sc->sc_flags & HIFN_IS_7956) { -		reg = HIFN_0_PUCTRL2; -	} - -	for (i = 5000; i > 0; i--) { -		DELAY(1); -		if (!(READ_REG_0(sc, reg) & HIFN_PUCTRL_RESET)) -			break; -	} -	if (!i) -		device_printf(sc->sc_dev, "proc unit did not reset\n"); -} - -/* - * Reset the processing unit. - */ -static void -hifn_reset_puc(struct hifn_softc *sc) -{ -	/* Reset processing unit */ -	int reg = HIFN_0_PUCTRL; - -	if (sc->sc_flags & HIFN_IS_7956) { -		reg = HIFN_0_PUCTRL2; -	} -	WRITE_REG_0(sc, reg, HIFN_PUCTRL_DMAENA); - -	hifn_puc_wait(sc); -} - -/* - * Set the Retry and TRDY registers; note that we set them to - * zero because the 7811 locks up when forced to retry (section - * 3.6 of "Specification Update SU-0014-04".  Not clear if we - * should do this for all Hifn parts, but it doesn't seem to hurt. - */ -static void -hifn_set_retry(struct hifn_softc *sc) -{ -	/* NB: RETRY only responds to 8-bit reads/writes */ -	pci_write_config(sc->sc_dev, HIFN_RETRY_TIMEOUT, 0, 1); -	pci_write_config(sc->sc_dev, HIFN_TRDY_TIMEOUT, 0, 1); -} - -/* - * Resets the board.  Values in the registers are left as is - * from the reset (i.e. initial values are assigned elsewhere). - */ -static void -hifn_reset_board(struct hifn_softc *sc, int full) -{ -	u_int32_t reg; - -	/* -	 * Set polling in the DMA configuration register to zero.  0x7 avoids -	 * resetting the board and zeros out the other fields. -	 */ -	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET | -	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE); - -	/* -	 * Now that polling has been disabled, we have to wait 1 ms -	 * before resetting the board. -	 */ -	DELAY(1000); - -	/* Reset the DMA unit */ -	if (full) { -		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MODE); -		DELAY(1000); -	} else { -		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, -		    HIFN_DMACNFG_MODE | HIFN_DMACNFG_MSTRESET); -		hifn_reset_puc(sc); -	} - -	KASSERT(sc->sc_dma != NULL, ("hifn_reset_board: null DMA tag!")); -	bzero(sc->sc_dma, sizeof(*sc->sc_dma)); - -	/* Bring dma unit out of reset */ -	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET | -	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE); - -	hifn_puc_wait(sc); -	hifn_set_retry(sc); - -	if (sc->sc_flags & HIFN_IS_7811) { -		for (reg = 0; reg < 1000; reg++) { -			if (READ_REG_1(sc, HIFN_1_7811_MIPSRST) & -			    HIFN_MIPSRST_CRAMINIT) -				break; -			DELAY(1000); -		} -		if (reg == 1000) -			printf(": cram init timeout\n"); -	} else { -	  /* set up DMA configuration register #2 */ -	  /* turn off all PK and BAR0 swaps */ -	  WRITE_REG_1(sc, HIFN_1_DMA_CNFG2, -		      (3 << HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT)| -		      (3 << HIFN_DMACNFG2_INIT_READ_BURST_SHIFT)| -		      (2 << HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT)| -		      (2 << HIFN_DMACNFG2_TGT_READ_BURST_SHIFT)); -	} -		       -} - -static u_int32_t -hifn_next_signature(u_int32_t a, u_int cnt) -{ -	int i; -	u_int32_t v; - -	for (i = 0; i < cnt; i++) { - -		/* get the parity */ -		v = a & 0x80080125; -		v ^= v >> 16; -		v ^= v >> 8; -		v ^= v >> 4; -		v ^= v >> 2; -		v ^= v >> 1; - -		a = (v & 1) ^ (a << 1); -	} - -	return a; -} - -struct pci2id { -	u_short		pci_vendor; -	u_short		pci_prod; -	char		card_id[13]; -}; -static struct pci2id pci2id[] = { -	{ -		PCI_VENDOR_HIFN, -		PCI_PRODUCT_HIFN_7951, -		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -		  0x00, 0x00, 0x00, 0x00, 0x00 } -	}, { -		PCI_VENDOR_HIFN, -		PCI_PRODUCT_HIFN_7955, -		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -		  0x00, 0x00, 0x00, 0x00, 0x00 } -	}, { -		PCI_VENDOR_HIFN, -		PCI_PRODUCT_HIFN_7956, -		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -		  0x00, 0x00, 0x00, 0x00, 0x00 } -	}, { -		PCI_VENDOR_NETSEC, -		PCI_PRODUCT_NETSEC_7751, -		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -		  0x00, 0x00, 0x00, 0x00, 0x00 } -	}, { -		PCI_VENDOR_INVERTEX, -		PCI_PRODUCT_INVERTEX_AEON, -		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -		  0x00, 0x00, 0x00, 0x00, 0x00 } -	}, { -		PCI_VENDOR_HIFN, -		PCI_PRODUCT_HIFN_7811, -		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -		  0x00, 0x00, 0x00, 0x00, 0x00 } -	}, { -		/* -		 * Other vendors share this PCI ID as well, such as -		 * http://www.powercrypt.com, and obviously they also -		 * use the same key. -		 */ -		PCI_VENDOR_HIFN, -		PCI_PRODUCT_HIFN_7751, -		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -		  0x00, 0x00, 0x00, 0x00, 0x00 } -	}, -}; - -/* - * Checks to see if crypto is already enabled.  If crypto isn't enable, - * "hifn_enable_crypto" is called to enable it.  The check is important, - * as enabling crypto twice will lock the board. - */ -static int  -hifn_enable_crypto(struct hifn_softc *sc) -{ -	u_int32_t dmacfg, ramcfg, encl, addr, i; -	char *offtbl = NULL; - -	for (i = 0; i < nitems(pci2id); i++) { -		if (pci2id[i].pci_vendor == pci_get_vendor(sc->sc_dev) && -		    pci2id[i].pci_prod == pci_get_device(sc->sc_dev)) { -			offtbl = pci2id[i].card_id; -			break; -		} -	} -	if (offtbl == NULL) { -		device_printf(sc->sc_dev, "Unknown card!\n"); -		return (1); -	} - -	ramcfg = READ_REG_0(sc, HIFN_0_PUCNFG); -	dmacfg = READ_REG_1(sc, HIFN_1_DMA_CNFG); - -	/* -	 * The RAM config register's encrypt level bit needs to be set before -	 * every read performed on the encryption level register. -	 */ -	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg | HIFN_PUCNFG_CHIPID); - -	encl = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA; - -	/* -	 * Make sure we don't re-unlock.  Two unlocks kills chip until the -	 * next reboot. -	 */ -	if (encl == HIFN_PUSTAT_ENA_1 || encl == HIFN_PUSTAT_ENA_2) { -#ifdef HIFN_DEBUG -		if (hifn_debug) -			device_printf(sc->sc_dev, -			    "Strong crypto already enabled!\n"); -#endif -		goto report; -	} - -	if (encl != 0 && encl != HIFN_PUSTAT_ENA_0) { -#ifdef HIFN_DEBUG -		if (hifn_debug) -			device_printf(sc->sc_dev, -			      "Unknown encryption level 0x%x\n", encl); -#endif -		return 1; -	} - -	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_UNLOCK | -	    HIFN_DMACNFG_MSTRESET | HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE); -	DELAY(1000); -	addr = READ_REG_1(sc, HIFN_UNLOCK_SECRET1); -	DELAY(1000); -	WRITE_REG_1(sc, HIFN_UNLOCK_SECRET2, 0); -	DELAY(1000); - -	for (i = 0; i <= 12; i++) { -		addr = hifn_next_signature(addr, offtbl[i] + 0x101); -		WRITE_REG_1(sc, HIFN_UNLOCK_SECRET2, addr); - -		DELAY(1000); -	} - -	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg | HIFN_PUCNFG_CHIPID); -	encl = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA; - -#ifdef HIFN_DEBUG -	if (hifn_debug) { -		if (encl != HIFN_PUSTAT_ENA_1 && encl != HIFN_PUSTAT_ENA_2) -			device_printf(sc->sc_dev, "Engine is permanently " -				"locked until next system reset!\n"); -		else -			device_printf(sc->sc_dev, "Engine enabled " -				"successfully!\n"); -	} -#endif - -report: -	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg); -	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, dmacfg); - -	switch (encl) { -	case HIFN_PUSTAT_ENA_1: -	case HIFN_PUSTAT_ENA_2: -		break; -	case HIFN_PUSTAT_ENA_0: -	default: -		device_printf(sc->sc_dev, "disabled"); -		break; -	} - -	return 0; -} - -/* - * Give initial values to the registers listed in the "Register Space" - * section of the HIFN Software Development reference manual. - */ -static void  -hifn_init_pci_registers(struct hifn_softc *sc) -{ -	/* write fixed values needed by the Initialization registers */ -	WRITE_REG_0(sc, HIFN_0_PUCTRL, HIFN_PUCTRL_DMAENA); -	WRITE_REG_0(sc, HIFN_0_FIFOCNFG, HIFN_FIFOCNFG_THRESHOLD); -	WRITE_REG_0(sc, HIFN_0_PUIER, HIFN_PUIER_DSTOVER); - -	/* write all 4 ring address registers */ -	WRITE_REG_1(sc, HIFN_1_DMA_CRAR, sc->sc_dma_physaddr + -	    offsetof(struct hifn_dma, cmdr[0])); -	WRITE_REG_1(sc, HIFN_1_DMA_SRAR, sc->sc_dma_physaddr + -	    offsetof(struct hifn_dma, srcr[0])); -	WRITE_REG_1(sc, HIFN_1_DMA_DRAR, sc->sc_dma_physaddr + -	    offsetof(struct hifn_dma, dstr[0])); -	WRITE_REG_1(sc, HIFN_1_DMA_RRAR, sc->sc_dma_physaddr + -	    offsetof(struct hifn_dma, resr[0])); - -	DELAY(2000); - -	/* write status register */ -	WRITE_REG_1(sc, HIFN_1_DMA_CSR, -	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS | -	    HIFN_DMACSR_S_CTRL_DIS | HIFN_DMACSR_C_CTRL_DIS | -	    HIFN_DMACSR_D_ABORT | HIFN_DMACSR_D_DONE | HIFN_DMACSR_D_LAST | -	    HIFN_DMACSR_D_WAIT | HIFN_DMACSR_D_OVER | -	    HIFN_DMACSR_R_ABORT | HIFN_DMACSR_R_DONE | HIFN_DMACSR_R_LAST | -	    HIFN_DMACSR_R_WAIT | HIFN_DMACSR_R_OVER | -	    HIFN_DMACSR_S_ABORT | HIFN_DMACSR_S_DONE | HIFN_DMACSR_S_LAST | -	    HIFN_DMACSR_S_WAIT | -	    HIFN_DMACSR_C_ABORT | HIFN_DMACSR_C_DONE | HIFN_DMACSR_C_LAST | -	    HIFN_DMACSR_C_WAIT | -	    HIFN_DMACSR_ENGINE | -	    ((sc->sc_flags & HIFN_HAS_PUBLIC) ? -		HIFN_DMACSR_PUBDONE : 0) | -	    ((sc->sc_flags & HIFN_IS_7811) ? -		HIFN_DMACSR_ILLW | HIFN_DMACSR_ILLR : 0)); - -	sc->sc_d_busy = sc->sc_r_busy = sc->sc_s_busy = sc->sc_c_busy = 0; -	sc->sc_dmaier |= HIFN_DMAIER_R_DONE | HIFN_DMAIER_C_ABORT | -	    HIFN_DMAIER_D_OVER | HIFN_DMAIER_R_OVER | -	    HIFN_DMAIER_S_ABORT | HIFN_DMAIER_D_ABORT | HIFN_DMAIER_R_ABORT | -	    ((sc->sc_flags & HIFN_IS_7811) ? -		HIFN_DMAIER_ILLW | HIFN_DMAIER_ILLR : 0); -	sc->sc_dmaier &= ~HIFN_DMAIER_C_WAIT; -	WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier); - - -	if (sc->sc_flags & HIFN_IS_7956) { -		u_int32_t pll; - -		WRITE_REG_0(sc, HIFN_0_PUCNFG, HIFN_PUCNFG_COMPSING | -		    HIFN_PUCNFG_TCALLPHASES | -		    HIFN_PUCNFG_TCDRVTOTEM | HIFN_PUCNFG_BUS32); - -		/* turn off the clocks and insure bypass is set */ -		pll = READ_REG_1(sc, HIFN_1_PLL); -		pll = (pll &~ (HIFN_PLL_PK_CLK_SEL | HIFN_PLL_PE_CLK_SEL)) -		  | HIFN_PLL_BP | HIFN_PLL_MBSET; -		WRITE_REG_1(sc, HIFN_1_PLL, pll); -		DELAY(10*1000);		/* 10ms */ - -		/* change configuration */ -		pll = (pll &~ HIFN_PLL_CONFIG) | sc->sc_pllconfig; -		WRITE_REG_1(sc, HIFN_1_PLL, pll); -		DELAY(10*1000);		/* 10ms */ - -		/* disable bypass */ -		pll &= ~HIFN_PLL_BP; -		WRITE_REG_1(sc, HIFN_1_PLL, pll); -		/* enable clocks with new configuration */ -		pll |= HIFN_PLL_PK_CLK_SEL | HIFN_PLL_PE_CLK_SEL; -		WRITE_REG_1(sc, HIFN_1_PLL, pll); -	} else { -		WRITE_REG_0(sc, HIFN_0_PUCNFG, HIFN_PUCNFG_COMPSING | -		    HIFN_PUCNFG_DRFR_128 | HIFN_PUCNFG_TCALLPHASES | -		    HIFN_PUCNFG_TCDRVTOTEM | HIFN_PUCNFG_BUS32 | -		    (sc->sc_drammodel ? HIFN_PUCNFG_DRAM : HIFN_PUCNFG_SRAM)); -	} - -	WRITE_REG_0(sc, HIFN_0_PUISR, HIFN_PUISR_DSTOVER); -	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET | -	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE | HIFN_DMACNFG_LAST | -	    ((HIFN_POLL_FREQUENCY << 16 ) & HIFN_DMACNFG_POLLFREQ) | -	    ((HIFN_POLL_SCALAR << 8) & HIFN_DMACNFG_POLLINVAL)); -} - -/* - * The maximum number of sessions supported by the card - * is dependent on the amount of context ram, which - * encryption algorithms are enabled, and how compression - * is configured.  This should be configured before this - * routine is called. - */ -static void -hifn_sessions(struct hifn_softc *sc) -{ -	u_int32_t pucnfg; -	int ctxsize; - -	pucnfg = READ_REG_0(sc, HIFN_0_PUCNFG); - -	if (pucnfg & HIFN_PUCNFG_COMPSING) { -		if (pucnfg & HIFN_PUCNFG_ENCCNFG) -			ctxsize = 128; -		else -			ctxsize = 512; -		/* -		 * 7955/7956 has internal context memory of 32K -		 */ -		if (sc->sc_flags & HIFN_IS_7956) -			sc->sc_maxses = 32768 / ctxsize; -		else -			sc->sc_maxses = 1 + -			    ((sc->sc_ramsize - 32768) / ctxsize); -	} else -		sc->sc_maxses = sc->sc_ramsize / 16384; - -	if (sc->sc_maxses > 2048) -		sc->sc_maxses = 2048; -} - -/* - * Determine ram type (sram or dram).  Board should be just out of a reset - * state when this is called. - */ -static int -hifn_ramtype(struct hifn_softc *sc) -{ -	u_int8_t data[8], dataexpect[8]; -	int i; - -	for (i = 0; i < sizeof(data); i++) -		data[i] = dataexpect[i] = 0x55; -	if (hifn_writeramaddr(sc, 0, data)) -		return (-1); -	if (hifn_readramaddr(sc, 0, data)) -		return (-1); -	if (bcmp(data, dataexpect, sizeof(data)) != 0) { -		sc->sc_drammodel = 1; -		return (0); -	} - -	for (i = 0; i < sizeof(data); i++) -		data[i] = dataexpect[i] = 0xaa; -	if (hifn_writeramaddr(sc, 0, data)) -		return (-1); -	if (hifn_readramaddr(sc, 0, data)) -		return (-1); -	if (bcmp(data, dataexpect, sizeof(data)) != 0) { -		sc->sc_drammodel = 1; -		return (0); -	} - -	return (0); -} - -#define	HIFN_SRAM_MAX		(32 << 20) -#define	HIFN_SRAM_STEP_SIZE	16384 -#define	HIFN_SRAM_GRANULARITY	(HIFN_SRAM_MAX / HIFN_SRAM_STEP_SIZE) - -static int -hifn_sramsize(struct hifn_softc *sc) -{ -	u_int32_t a; -	u_int8_t data[8]; -	u_int8_t dataexpect[sizeof(data)]; -	int32_t i; - -	for (i = 0; i < sizeof(data); i++) -		data[i] = dataexpect[i] = i ^ 0x5a; - -	for (i = HIFN_SRAM_GRANULARITY - 1; i >= 0; i--) { -		a = i * HIFN_SRAM_STEP_SIZE; -		bcopy(&i, data, sizeof(i)); -		hifn_writeramaddr(sc, a, data); -	} - -	for (i = 0; i < HIFN_SRAM_GRANULARITY; i++) { -		a = i * HIFN_SRAM_STEP_SIZE; -		bcopy(&i, dataexpect, sizeof(i)); -		if (hifn_readramaddr(sc, a, data) < 0) -			return (0); -		if (bcmp(data, dataexpect, sizeof(data)) != 0) -			return (0); -		sc->sc_ramsize = a + HIFN_SRAM_STEP_SIZE; -	} - -	return (0); -} - -/* - * XXX For dram boards, one should really try all of the - * HIFN_PUCNFG_DSZ_*'s.  This just assumes that PUCNFG - * is already set up correctly. - */ -static int -hifn_dramsize(struct hifn_softc *sc) -{ -	u_int32_t cnfg; - -	if (sc->sc_flags & HIFN_IS_7956) { -		/* -		 * 7955/7956 have a fixed internal ram of only 32K. -		 */ -		sc->sc_ramsize = 32768; -	} else { -		cnfg = READ_REG_0(sc, HIFN_0_PUCNFG) & -		    HIFN_PUCNFG_DRAMMASK; -		sc->sc_ramsize = 1 << ((cnfg >> 13) + 18); -	} -	return (0); -} - -static void -hifn_alloc_slot(struct hifn_softc *sc, int *cmdp, int *srcp, int *dstp, int *resp) -{ -	struct hifn_dma *dma = sc->sc_dma; - -	if (sc->sc_cmdi == HIFN_D_CMD_RSIZE) { -		sc->sc_cmdi = 0; -		dma->cmdr[HIFN_D_CMD_RSIZE].l = htole32(HIFN_D_VALID | -		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ); -		HIFN_CMDR_SYNC(sc, HIFN_D_CMD_RSIZE, -		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); -	} -	*cmdp = sc->sc_cmdi++; -	sc->sc_cmdk = sc->sc_cmdi; - -	if (sc->sc_srci == HIFN_D_SRC_RSIZE) { -		sc->sc_srci = 0; -		dma->srcr[HIFN_D_SRC_RSIZE].l = htole32(HIFN_D_VALID | -		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ); -		HIFN_SRCR_SYNC(sc, HIFN_D_SRC_RSIZE, -		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); -	} -	*srcp = sc->sc_srci++; -	sc->sc_srck = sc->sc_srci; - -	if (sc->sc_dsti == HIFN_D_DST_RSIZE) { -		sc->sc_dsti = 0; -		dma->dstr[HIFN_D_DST_RSIZE].l = htole32(HIFN_D_VALID | -		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ); -		HIFN_DSTR_SYNC(sc, HIFN_D_DST_RSIZE, -		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); -	} -	*dstp = sc->sc_dsti++; -	sc->sc_dstk = sc->sc_dsti; - -	if (sc->sc_resi == HIFN_D_RES_RSIZE) { -		sc->sc_resi = 0; -		dma->resr[HIFN_D_RES_RSIZE].l = htole32(HIFN_D_VALID | -		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ); -		HIFN_RESR_SYNC(sc, HIFN_D_RES_RSIZE, -		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); -	} -	*resp = sc->sc_resi++; -	sc->sc_resk = sc->sc_resi; -} - -static int -hifn_writeramaddr(struct hifn_softc *sc, int addr, u_int8_t *data) -{ -	struct hifn_dma *dma = sc->sc_dma; -	hifn_base_command_t wc; -	const u_int32_t masks = HIFN_D_VALID | HIFN_D_LAST | HIFN_D_MASKDONEIRQ; -	int r, cmdi, resi, srci, dsti; - -	wc.masks = htole16(3 << 13); -	wc.session_num = htole16(addr >> 14); -	wc.total_source_count = htole16(8); -	wc.total_dest_count = htole16(addr & 0x3fff); - -	hifn_alloc_slot(sc, &cmdi, &srci, &dsti, &resi); - -	WRITE_REG_1(sc, HIFN_1_DMA_CSR, -	    HIFN_DMACSR_C_CTRL_ENA | HIFN_DMACSR_S_CTRL_ENA | -	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA); - -	/* build write command */ -	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND); -	*(hifn_base_command_t *)dma->command_bufs[cmdi] = wc; -	bcopy(data, &dma->test_src, sizeof(dma->test_src)); - -	dma->srcr[srci].p = htole32(sc->sc_dma_physaddr -	    + offsetof(struct hifn_dma, test_src)); -	dma->dstr[dsti].p = htole32(sc->sc_dma_physaddr -	    + offsetof(struct hifn_dma, test_dst)); - -	dma->cmdr[cmdi].l = htole32(16 | masks); -	dma->srcr[srci].l = htole32(8 | masks); -	dma->dstr[dsti].l = htole32(4 | masks); -	dma->resr[resi].l = htole32(4 | masks); - -	bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - -	for (r = 10000; r >= 0; r--) { -		DELAY(10); -		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); -		if ((dma->resr[resi].l & htole32(HIFN_D_VALID)) == 0) -			break; -		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -	} -	if (r == 0) { -		device_printf(sc->sc_dev, "writeramaddr -- " -		    "result[%d](addr %d) still valid\n", resi, addr); -		r = -1; -		return (-1); -	} else -		r = 0; - -	WRITE_REG_1(sc, HIFN_1_DMA_CSR, -	    HIFN_DMACSR_C_CTRL_DIS | HIFN_DMACSR_S_CTRL_DIS | -	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS); - -	return (r); -} - -static int -hifn_readramaddr(struct hifn_softc *sc, int addr, u_int8_t *data) -{ -	struct hifn_dma *dma = sc->sc_dma; -	hifn_base_command_t rc; -	const u_int32_t masks = HIFN_D_VALID | HIFN_D_LAST | HIFN_D_MASKDONEIRQ; -	int r, cmdi, srci, dsti, resi; - -	rc.masks = htole16(2 << 13); -	rc.session_num = htole16(addr >> 14); -	rc.total_source_count = htole16(addr & 0x3fff); -	rc.total_dest_count = htole16(8); - -	hifn_alloc_slot(sc, &cmdi, &srci, &dsti, &resi); - -	WRITE_REG_1(sc, HIFN_1_DMA_CSR, -	    HIFN_DMACSR_C_CTRL_ENA | HIFN_DMACSR_S_CTRL_ENA | -	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA); - -	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND); -	*(hifn_base_command_t *)dma->command_bufs[cmdi] = rc; - -	dma->srcr[srci].p = htole32(sc->sc_dma_physaddr + -	    offsetof(struct hifn_dma, test_src)); -	dma->test_src = 0; -	dma->dstr[dsti].p =  htole32(sc->sc_dma_physaddr + -	    offsetof(struct hifn_dma, test_dst)); -	dma->test_dst = 0; -	dma->cmdr[cmdi].l = htole32(8 | masks); -	dma->srcr[srci].l = htole32(8 | masks); -	dma->dstr[dsti].l = htole32(8 | masks); -	dma->resr[resi].l = htole32(HIFN_MAX_RESULT | masks); - -	bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - -	for (r = 10000; r >= 0; r--) { -		DELAY(10); -		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); -		if ((dma->resr[resi].l & htole32(HIFN_D_VALID)) == 0) -			break; -		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -	} -	if (r == 0) { -		device_printf(sc->sc_dev, "readramaddr -- " -		    "result[%d](addr %d) still valid\n", resi, addr); -		r = -1; -	} else { -		r = 0; -		bcopy(&dma->test_dst, data, sizeof(dma->test_dst)); -	} - -	WRITE_REG_1(sc, HIFN_1_DMA_CSR, -	    HIFN_DMACSR_C_CTRL_DIS | HIFN_DMACSR_S_CTRL_DIS | -	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS); - -	return (r); -} - -/* - * Initialize the descriptor rings. - */ -static void  -hifn_init_dma(struct hifn_softc *sc) -{ -	struct hifn_dma *dma = sc->sc_dma; -	int i; - -	hifn_set_retry(sc); - -	/* initialize static pointer values */ -	for (i = 0; i < HIFN_D_CMD_RSIZE; i++) -		dma->cmdr[i].p = htole32(sc->sc_dma_physaddr + -		    offsetof(struct hifn_dma, command_bufs[i][0])); -	for (i = 0; i < HIFN_D_RES_RSIZE; i++) -		dma->resr[i].p = htole32(sc->sc_dma_physaddr + -		    offsetof(struct hifn_dma, result_bufs[i][0])); - -	dma->cmdr[HIFN_D_CMD_RSIZE].p = -	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, cmdr[0])); -	dma->srcr[HIFN_D_SRC_RSIZE].p = -	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, srcr[0])); -	dma->dstr[HIFN_D_DST_RSIZE].p = -	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, dstr[0])); -	dma->resr[HIFN_D_RES_RSIZE].p = -	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, resr[0])); - -	sc->sc_cmdu = sc->sc_srcu = sc->sc_dstu = sc->sc_resu = 0; -	sc->sc_cmdi = sc->sc_srci = sc->sc_dsti = sc->sc_resi = 0; -	sc->sc_cmdk = sc->sc_srck = sc->sc_dstk = sc->sc_resk = 0; -} - -/* - * Writes out the raw command buffer space.  Returns the - * command buffer size. - */ -static u_int -hifn_write_command(struct hifn_command *cmd, u_int8_t *buf) -{ -	struct cryptop *crp; -	u_int8_t *buf_pos; -	hifn_base_command_t *base_cmd; -	hifn_mac_command_t *mac_cmd; -	hifn_crypt_command_t *cry_cmd; -	int using_mac, using_crypt, ivlen; -	u_int32_t dlen, slen; - -	crp = cmd->crp; -	buf_pos = buf; -	using_mac = cmd->base_masks & HIFN_BASE_CMD_MAC; -	using_crypt = cmd->base_masks & HIFN_BASE_CMD_CRYPT; - -	base_cmd = (hifn_base_command_t *)buf_pos; -	base_cmd->masks = htole16(cmd->base_masks); -	slen = cmd->src_mapsize; -	if (cmd->sloplen) -		dlen = cmd->dst_mapsize - cmd->sloplen + sizeof(u_int32_t); -	else -		dlen = cmd->dst_mapsize; -	base_cmd->total_source_count = htole16(slen & HIFN_BASE_CMD_LENMASK_LO); -	base_cmd->total_dest_count = htole16(dlen & HIFN_BASE_CMD_LENMASK_LO); -	dlen >>= 16; -	slen >>= 16; -	base_cmd->session_num = htole16( -	    ((slen << HIFN_BASE_CMD_SRCLEN_S) & HIFN_BASE_CMD_SRCLEN_M) | -	    ((dlen << HIFN_BASE_CMD_DSTLEN_S) & HIFN_BASE_CMD_DSTLEN_M)); -	buf_pos += sizeof(hifn_base_command_t); - -	if (using_mac) { -		mac_cmd = (hifn_mac_command_t *)buf_pos; -		dlen = crp->crp_aad_length + crp->crp_payload_length; -		mac_cmd->source_count = htole16(dlen & 0xffff); -		dlen >>= 16; -		mac_cmd->masks = htole16(cmd->mac_masks | -		    ((dlen << HIFN_MAC_CMD_SRCLEN_S) & HIFN_MAC_CMD_SRCLEN_M)); -		if (crp->crp_aad_length != 0) -			mac_cmd->header_skip = htole16(crp->crp_aad_start); -		else -			mac_cmd->header_skip = htole16(crp->crp_payload_start); -		mac_cmd->reserved = 0; -		buf_pos += sizeof(hifn_mac_command_t); -	} - -	if (using_crypt) { -		cry_cmd = (hifn_crypt_command_t *)buf_pos; -		dlen = crp->crp_payload_length; -		cry_cmd->source_count = htole16(dlen & 0xffff); -		dlen >>= 16; -		cry_cmd->masks = htole16(cmd->cry_masks | -		    ((dlen << HIFN_CRYPT_CMD_SRCLEN_S) & HIFN_CRYPT_CMD_SRCLEN_M)); -		cry_cmd->header_skip = htole16(crp->crp_payload_length); -		cry_cmd->reserved = 0; -		buf_pos += sizeof(hifn_crypt_command_t); -	} - -	if (using_mac && cmd->mac_masks & HIFN_MAC_CMD_NEW_KEY) { -		bcopy(cmd->mac, buf_pos, HIFN_MAC_KEY_LENGTH); -		buf_pos += HIFN_MAC_KEY_LENGTH; -	} - -	if (using_crypt && cmd->cry_masks & HIFN_CRYPT_CMD_NEW_KEY) { -		switch (cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) { -		case HIFN_CRYPT_CMD_ALG_AES: -			/* -			 * AES keys are variable 128, 192 and -			 * 256 bits (16, 24 and 32 bytes). -			 */ -			bcopy(cmd->ck, buf_pos, cmd->cklen); -			buf_pos += cmd->cklen; -			break; -		} -	} - -	if (using_crypt && cmd->cry_masks & HIFN_CRYPT_CMD_NEW_IV) { -		switch (cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) { -		case HIFN_CRYPT_CMD_ALG_AES: -			ivlen = HIFN_AES_IV_LENGTH; -			break; -		default: -			ivlen = HIFN_IV_LENGTH; -			break; -		} -		bcopy(cmd->iv, buf_pos, ivlen); -		buf_pos += ivlen; -	} - -	if ((cmd->base_masks & (HIFN_BASE_CMD_MAC|HIFN_BASE_CMD_CRYPT)) == 0) { -		bzero(buf_pos, 8); -		buf_pos += 8; -	} - -	return (buf_pos - buf); -} - -static int -hifn_dmamap_aligned(struct hifn_operand *op) -{ -	int i; - -	for (i = 0; i < op->nsegs; i++) { -		if (op->segs[i].ds_addr & 3) -			return (0); -		if ((i != (op->nsegs - 1)) && (op->segs[i].ds_len & 3)) -			return (0); -	} -	return (1); -} - -static __inline int -hifn_dmamap_dstwrap(struct hifn_softc *sc, int idx) -{ -	struct hifn_dma *dma = sc->sc_dma; - -	if (++idx == HIFN_D_DST_RSIZE) { -		dma->dstr[idx].l = htole32(HIFN_D_VALID | HIFN_D_JUMP | -		    HIFN_D_MASKDONEIRQ); -		HIFN_DSTR_SYNC(sc, idx, -		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -		idx = 0; -	} -	return (idx); -} - -static int -hifn_dmamap_load_dst(struct hifn_softc *sc, struct hifn_command *cmd) -{ -	struct hifn_dma *dma = sc->sc_dma; -	struct hifn_operand *dst = &cmd->dst; -	u_int32_t p, l; -	int idx, used = 0, i; - -	idx = sc->sc_dsti; -	for (i = 0; i < dst->nsegs - 1; i++) { -		dma->dstr[idx].p = htole32(dst->segs[i].ds_addr); -		dma->dstr[idx].l = htole32(HIFN_D_VALID | -		    HIFN_D_MASKDONEIRQ | dst->segs[i].ds_len); -		HIFN_DSTR_SYNC(sc, idx, -		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -		used++; - -		idx = hifn_dmamap_dstwrap(sc, idx); -	} - -	if (cmd->sloplen == 0) { -		p = dst->segs[i].ds_addr; -		l = HIFN_D_VALID | HIFN_D_MASKDONEIRQ | HIFN_D_LAST | -		    dst->segs[i].ds_len; -	} else { -		p = sc->sc_dma_physaddr + -		    offsetof(struct hifn_dma, slop[cmd->slopidx]); -		l = HIFN_D_VALID | HIFN_D_MASKDONEIRQ | HIFN_D_LAST | -		    sizeof(u_int32_t); - -		if ((dst->segs[i].ds_len - cmd->sloplen) != 0) { -			dma->dstr[idx].p = htole32(dst->segs[i].ds_addr); -			dma->dstr[idx].l = htole32(HIFN_D_VALID | -			    HIFN_D_MASKDONEIRQ | -			    (dst->segs[i].ds_len - cmd->sloplen)); -			HIFN_DSTR_SYNC(sc, idx, -			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -			used++; - -			idx = hifn_dmamap_dstwrap(sc, idx); -		} -	} -	dma->dstr[idx].p = htole32(p); -	dma->dstr[idx].l = htole32(l); -	HIFN_DSTR_SYNC(sc, idx, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -	used++; - -	idx = hifn_dmamap_dstwrap(sc, idx); - -	sc->sc_dsti = idx; -	sc->sc_dstu += used; -	return (idx); -} - -static __inline int -hifn_dmamap_srcwrap(struct hifn_softc *sc, int idx) -{ -	struct hifn_dma *dma = sc->sc_dma; - -	if (++idx == HIFN_D_SRC_RSIZE) { -		dma->srcr[idx].l = htole32(HIFN_D_VALID | -		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ); -		HIFN_SRCR_SYNC(sc, HIFN_D_SRC_RSIZE, -		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); -		idx = 0; -	} -	return (idx); -} - -static int -hifn_dmamap_load_src(struct hifn_softc *sc, struct hifn_command *cmd) -{ -	struct hifn_dma *dma = sc->sc_dma; -	struct hifn_operand *src = &cmd->src; -	int idx, i; -	u_int32_t last = 0; - -	idx = sc->sc_srci; -	for (i = 0; i < src->nsegs; i++) { -		if (i == src->nsegs - 1) -			last = HIFN_D_LAST; - -		dma->srcr[idx].p = htole32(src->segs[i].ds_addr); -		dma->srcr[idx].l = htole32(src->segs[i].ds_len | -		    HIFN_D_VALID | HIFN_D_MASKDONEIRQ | last); -		HIFN_SRCR_SYNC(sc, idx, -		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); - -		idx = hifn_dmamap_srcwrap(sc, idx); -	} -	sc->sc_srci = idx; -	sc->sc_srcu += src->nsegs; -	return (idx); -}  - -static void -hifn_op_cb(void* arg, bus_dma_segment_t *seg, int nsegs, int error) -{ -	struct hifn_operand *op = arg; - -	KASSERT(nsegs <= MAX_SCATTER, -		("hifn_op_cb: too many DMA segments (%u > %u) " -		 "returned when mapping operand", nsegs, MAX_SCATTER)); -	op->nsegs = nsegs; -	bcopy(seg, op->segs, nsegs * sizeof (seg[0])); -} - -static int  -hifn_crypto( -	struct hifn_softc *sc, -	struct hifn_command *cmd, -	struct cryptop *crp, -	int hint) -{ -	struct	hifn_dma *dma = sc->sc_dma; -	u_int32_t cmdlen, csr; -	int cmdi, resi, err = 0; - -	/* -	 * need 1 cmd, and 1 res -	 * -	 * NB: check this first since it's easy. -	 */ -	HIFN_LOCK(sc); -	if ((sc->sc_cmdu + 1) > HIFN_D_CMD_RSIZE || -	    (sc->sc_resu + 1) > HIFN_D_RES_RSIZE) { -#ifdef HIFN_DEBUG -		if (hifn_debug) { -			device_printf(sc->sc_dev, -				"cmd/result exhaustion, cmdu %u resu %u\n", -				sc->sc_cmdu, sc->sc_resu); -		} -#endif -		hifnstats.hst_nomem_cr++; -		HIFN_UNLOCK(sc); -		return (ERESTART); -	} - -	if (bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &cmd->src_map)) { -		hifnstats.hst_nomem_map++; -		HIFN_UNLOCK(sc); -		return (ENOMEM); -	} - -	if (bus_dmamap_load_crp(sc->sc_dmat, cmd->src_map, crp, hifn_op_cb, -	    &cmd->src, BUS_DMA_NOWAIT)) { -		hifnstats.hst_nomem_load++; -		err = ENOMEM; -		goto err_srcmap1; -	} -	cmd->src_mapsize = crypto_buffer_len(&crp->crp_buf); - -	if (hifn_dmamap_aligned(&cmd->src)) { -		cmd->sloplen = cmd->src_mapsize & 3; -		cmd->dst = cmd->src; -	} else if (crp->crp_buf.cb_type == CRYPTO_BUF_MBUF) { -		int totlen, len; -		struct mbuf *m, *m0, *mlast; - -		KASSERT(cmd->dst_m == NULL, -		    ("hifn_crypto: dst_m initialized improperly")); -		hifnstats.hst_unaligned++; - -		/* -		 * Source is not aligned on a longword boundary. -		 * Copy the data to insure alignment.  If we fail -		 * to allocate mbufs or clusters while doing this -		 * we return ERESTART so the operation is requeued -		 * at the crypto later, but only if there are -		 * ops already posted to the hardware; otherwise we -		 * have no guarantee that we'll be re-entered. -		 */ -		totlen = cmd->src_mapsize; -		if (crp->crp_buf.cb_mbuf->m_flags & M_PKTHDR) { -			len = MHLEN; -			MGETHDR(m0, M_NOWAIT, MT_DATA); -			if (m0 && !m_dup_pkthdr(m0, crp->crp_buf.cb_mbuf, -			    M_NOWAIT)) { -				m_free(m0); -				m0 = NULL; -			} -		} else { -			len = MLEN; -			MGET(m0, M_NOWAIT, MT_DATA); -		} -		if (m0 == NULL) { -			hifnstats.hst_nomem_mbuf++; -			err = sc->sc_cmdu ? ERESTART : ENOMEM; -			goto err_srcmap; -		} -		if (totlen >= MINCLSIZE) { -			if (!(MCLGET(m0, M_NOWAIT))) { -				hifnstats.hst_nomem_mcl++; -				err = sc->sc_cmdu ? ERESTART : ENOMEM; -				m_freem(m0); -				goto err_srcmap; -			} -			len = MCLBYTES; -		} -		totlen -= len; -		m0->m_pkthdr.len = m0->m_len = len; -		mlast = m0; - -		while (totlen > 0) { -			MGET(m, M_NOWAIT, MT_DATA); -			if (m == NULL) { -				hifnstats.hst_nomem_mbuf++; -				err = sc->sc_cmdu ? ERESTART : ENOMEM; -				m_freem(m0); -				goto err_srcmap; -			} -			len = MLEN; -			if (totlen >= MINCLSIZE) { -				if (!(MCLGET(m, M_NOWAIT))) { -					hifnstats.hst_nomem_mcl++; -					err = sc->sc_cmdu ? ERESTART : ENOMEM; -					mlast->m_next = m; -					m_freem(m0); -					goto err_srcmap; -				} -				len = MCLBYTES; -			} - -			m->m_len = len; -			m0->m_pkthdr.len += len; -			totlen -= len; - -			mlast->m_next = m; -			mlast = m; -		} -		cmd->dst_m = m0; - -		if (bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, -		    &cmd->dst_map)) { -			hifnstats.hst_nomem_map++; -			err = ENOMEM; -			goto err_srcmap; -		} - -		if (bus_dmamap_load_mbuf_sg(sc->sc_dmat, cmd->dst_map, m0, -		    cmd->dst_segs, &cmd->dst_nsegs, 0)) { -			hifnstats.hst_nomem_map++; -			err = ENOMEM; -			goto err_dstmap1; -		} -		cmd->dst_mapsize = m0->m_pkthdr.len; -	} else { -		err = EINVAL; -		goto err_srcmap; -	} - -#ifdef HIFN_DEBUG -	if (hifn_debug) { -		device_printf(sc->sc_dev, -		    "Entering cmd: stat %8x ien %8x u %d/%d/%d/%d n %d/%d\n", -		    READ_REG_1(sc, HIFN_1_DMA_CSR), -		    READ_REG_1(sc, HIFN_1_DMA_IER), -		    sc->sc_cmdu, sc->sc_srcu, sc->sc_dstu, sc->sc_resu, -		    cmd->src_nsegs, cmd->dst_nsegs); -	} -#endif - -	if (cmd->src_map == cmd->dst_map) { -		bus_dmamap_sync(sc->sc_dmat, cmd->src_map, -		    BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); -	} else { -		bus_dmamap_sync(sc->sc_dmat, cmd->src_map, -		    BUS_DMASYNC_PREWRITE); -		bus_dmamap_sync(sc->sc_dmat, cmd->dst_map, -		    BUS_DMASYNC_PREREAD); -	} - -	/* -	 * need N src, and N dst -	 */ -	if ((sc->sc_srcu + cmd->src_nsegs) > HIFN_D_SRC_RSIZE || -	    (sc->sc_dstu + cmd->dst_nsegs + 1) > HIFN_D_DST_RSIZE) { -#ifdef HIFN_DEBUG -		if (hifn_debug) { -			device_printf(sc->sc_dev, -				"src/dst exhaustion, srcu %u+%u dstu %u+%u\n", -				sc->sc_srcu, cmd->src_nsegs, -				sc->sc_dstu, cmd->dst_nsegs); -		} -#endif -		hifnstats.hst_nomem_sd++; -		err = ERESTART; -		goto err_dstmap; -	} - -	if (sc->sc_cmdi == HIFN_D_CMD_RSIZE) { -		sc->sc_cmdi = 0; -		dma->cmdr[HIFN_D_CMD_RSIZE].l = htole32(HIFN_D_VALID | -		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ); -		HIFN_CMDR_SYNC(sc, HIFN_D_CMD_RSIZE, -		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); -	} -	cmdi = sc->sc_cmdi++; -	cmdlen = hifn_write_command(cmd, dma->command_bufs[cmdi]); -	HIFN_CMD_SYNC(sc, cmdi, BUS_DMASYNC_PREWRITE); - -	/* .p for command/result already set */ -	dma->cmdr[cmdi].l = htole32(cmdlen | HIFN_D_VALID | HIFN_D_LAST | -	    HIFN_D_MASKDONEIRQ); -	HIFN_CMDR_SYNC(sc, cmdi, -	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); -	sc->sc_cmdu++; - -	/* -	 * We don't worry about missing an interrupt (which a "command wait" -	 * interrupt salvages us from), unless there is more than one command -	 * in the queue. -	 */ -	if (sc->sc_cmdu > 1) { -		sc->sc_dmaier |= HIFN_DMAIER_C_WAIT; -		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier); -	} - -	hifnstats.hst_ipackets++; -	hifnstats.hst_ibytes += cmd->src_mapsize; - -	hifn_dmamap_load_src(sc, cmd); - -	/* -	 * Unlike other descriptors, we don't mask done interrupt from -	 * result descriptor. -	 */ -#ifdef HIFN_DEBUG -	if (hifn_debug) -		printf("load res\n"); -#endif -	if (sc->sc_resi == HIFN_D_RES_RSIZE) { -		sc->sc_resi = 0; -		dma->resr[HIFN_D_RES_RSIZE].l = htole32(HIFN_D_VALID | -		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ); -		HIFN_RESR_SYNC(sc, HIFN_D_RES_RSIZE, -		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -	} -	resi = sc->sc_resi++; -	KASSERT(sc->sc_hifn_commands[resi] == NULL, -		("hifn_crypto: command slot %u busy", resi)); -	sc->sc_hifn_commands[resi] = cmd; -	HIFN_RES_SYNC(sc, resi, BUS_DMASYNC_PREREAD); -	if ((hint & CRYPTO_HINT_MORE) && sc->sc_curbatch < hifn_maxbatch) { -		dma->resr[resi].l = htole32(HIFN_MAX_RESULT | -		    HIFN_D_VALID | HIFN_D_LAST | HIFN_D_MASKDONEIRQ); -		sc->sc_curbatch++; -		if (sc->sc_curbatch > hifnstats.hst_maxbatch) -			hifnstats.hst_maxbatch = sc->sc_curbatch; -		hifnstats.hst_totbatch++; -	} else { -		dma->resr[resi].l = htole32(HIFN_MAX_RESULT | -		    HIFN_D_VALID | HIFN_D_LAST); -		sc->sc_curbatch = 0; -	} -	HIFN_RESR_SYNC(sc, resi, -	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -	sc->sc_resu++; - -	if (cmd->sloplen) -		cmd->slopidx = resi; - -	hifn_dmamap_load_dst(sc, cmd); - -	csr = 0; -	if (sc->sc_c_busy == 0) { -		csr |= HIFN_DMACSR_C_CTRL_ENA; -		sc->sc_c_busy = 1; -	} -	if (sc->sc_s_busy == 0) { -		csr |= HIFN_DMACSR_S_CTRL_ENA; -		sc->sc_s_busy = 1; -	} -	if (sc->sc_r_busy == 0) { -		csr |= HIFN_DMACSR_R_CTRL_ENA; -		sc->sc_r_busy = 1; -	} -	if (sc->sc_d_busy == 0) { -		csr |= HIFN_DMACSR_D_CTRL_ENA; -		sc->sc_d_busy = 1; -	} -	if (csr) -		WRITE_REG_1(sc, HIFN_1_DMA_CSR, csr); - -#ifdef HIFN_DEBUG -	if (hifn_debug) { -		device_printf(sc->sc_dev, "command: stat %8x ier %8x\n", -		    READ_REG_1(sc, HIFN_1_DMA_CSR), -		    READ_REG_1(sc, HIFN_1_DMA_IER)); -	} -#endif - -	sc->sc_active = 5; -	HIFN_UNLOCK(sc); -	KASSERT(err == 0, ("hifn_crypto: success with error %u", err)); -	return (err);		/* success */ - -err_dstmap: -	if (cmd->src_map != cmd->dst_map) -		bus_dmamap_unload(sc->sc_dmat, cmd->dst_map); -err_dstmap1: -	if (cmd->src_map != cmd->dst_map) -		bus_dmamap_destroy(sc->sc_dmat, cmd->dst_map); -err_srcmap: -	if (crp->crp_buf.cb_type == CRYPTO_BUF_MBUF) { -		if (cmd->dst_m != NULL) -			m_freem(cmd->dst_m); -	} -	bus_dmamap_unload(sc->sc_dmat, cmd->src_map); -err_srcmap1: -	bus_dmamap_destroy(sc->sc_dmat, cmd->src_map); -	HIFN_UNLOCK(sc); -	return (err); -} - -static void -hifn_tick(void* vsc) -{ -	struct hifn_softc *sc = vsc; - -	HIFN_LOCK(sc); -	if (sc->sc_active == 0) { -		u_int32_t r = 0; - -		if (sc->sc_cmdu == 0 && sc->sc_c_busy) { -			sc->sc_c_busy = 0; -			r |= HIFN_DMACSR_C_CTRL_DIS; -		} -		if (sc->sc_srcu == 0 && sc->sc_s_busy) { -			sc->sc_s_busy = 0; -			r |= HIFN_DMACSR_S_CTRL_DIS; -		} -		if (sc->sc_dstu == 0 && sc->sc_d_busy) { -			sc->sc_d_busy = 0; -			r |= HIFN_DMACSR_D_CTRL_DIS; -		} -		if (sc->sc_resu == 0 && sc->sc_r_busy) { -			sc->sc_r_busy = 0; -			r |= HIFN_DMACSR_R_CTRL_DIS; -		} -		if (r) -			WRITE_REG_1(sc, HIFN_1_DMA_CSR, r); -	} else -		sc->sc_active--; -	HIFN_UNLOCK(sc); -	callout_reset(&sc->sc_tickto, hz, hifn_tick, sc); -} - -static void  -hifn_intr(void *arg) -{ -	struct hifn_softc *sc = arg; -	struct hifn_dma *dma; -	u_int32_t dmacsr, restart; -	int i, u; - -	dmacsr = READ_REG_1(sc, HIFN_1_DMA_CSR); - -	/* Nothing in the DMA unit interrupted */ -	if ((dmacsr & sc->sc_dmaier) == 0) -		return; - -	HIFN_LOCK(sc); - -	dma = sc->sc_dma; - -#ifdef HIFN_DEBUG -	if (hifn_debug) { -		device_printf(sc->sc_dev, -		    "irq: stat %08x ien %08x damier %08x i %d/%d/%d/%d k %d/%d/%d/%d u %d/%d/%d/%d\n", -		    dmacsr, READ_REG_1(sc, HIFN_1_DMA_IER), sc->sc_dmaier, -		    sc->sc_cmdi, sc->sc_srci, sc->sc_dsti, sc->sc_resi, -		    sc->sc_cmdk, sc->sc_srck, sc->sc_dstk, sc->sc_resk, -		    sc->sc_cmdu, sc->sc_srcu, sc->sc_dstu, sc->sc_resu); -	} -#endif - -	WRITE_REG_1(sc, HIFN_1_DMA_CSR, dmacsr & sc->sc_dmaier); - -	if ((sc->sc_flags & HIFN_HAS_PUBLIC) && -	    (dmacsr & HIFN_DMACSR_PUBDONE)) -		WRITE_REG_1(sc, HIFN_1_PUB_STATUS, -		    READ_REG_1(sc, HIFN_1_PUB_STATUS) | HIFN_PUBSTS_DONE); - -	restart = dmacsr & (HIFN_DMACSR_D_OVER | HIFN_DMACSR_R_OVER); -	if (restart) -		device_printf(sc->sc_dev, "overrun %x\n", dmacsr); - -	if (sc->sc_flags & HIFN_IS_7811) { -		if (dmacsr & HIFN_DMACSR_ILLR) -			device_printf(sc->sc_dev, "illegal read\n"); -		if (dmacsr & HIFN_DMACSR_ILLW) -			device_printf(sc->sc_dev, "illegal write\n"); -	} - -	restart = dmacsr & (HIFN_DMACSR_C_ABORT | HIFN_DMACSR_S_ABORT | -	    HIFN_DMACSR_D_ABORT | HIFN_DMACSR_R_ABORT); -	if (restart) { -		device_printf(sc->sc_dev, "abort, resetting.\n"); -		hifnstats.hst_abort++; -		hifn_abort(sc); -		HIFN_UNLOCK(sc); -		return; -	} - -	if ((dmacsr & HIFN_DMACSR_C_WAIT) && (sc->sc_cmdu == 0)) { -		/* -		 * If no slots to process and we receive a "waiting on -		 * command" interrupt, we disable the "waiting on command" -		 * (by clearing it). -		 */ -		sc->sc_dmaier &= ~HIFN_DMAIER_C_WAIT; -		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier); -	} - -	/* clear the rings */ -	i = sc->sc_resk; u = sc->sc_resu; -	while (u != 0) { -		HIFN_RESR_SYNC(sc, i, -		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); -		if (dma->resr[i].l & htole32(HIFN_D_VALID)) { -			HIFN_RESR_SYNC(sc, i, -			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -			break; -		} - -		if (i != HIFN_D_RES_RSIZE) { -			struct hifn_command *cmd; -			u_int8_t *macbuf = NULL; - -			HIFN_RES_SYNC(sc, i, BUS_DMASYNC_POSTREAD); -			cmd = sc->sc_hifn_commands[i]; -			KASSERT(cmd != NULL, -				("hifn_intr: null command slot %u", i)); -			sc->sc_hifn_commands[i] = NULL; - -			if (cmd->base_masks & HIFN_BASE_CMD_MAC) { -				macbuf = dma->result_bufs[i]; -				macbuf += 12; -			} - -			hifn_callback(sc, cmd, macbuf); -			hifnstats.hst_opackets++; -			u--; -		} - -		if (++i == (HIFN_D_RES_RSIZE + 1)) -			i = 0; -	} -	sc->sc_resk = i; sc->sc_resu = u; - -	i = sc->sc_srck; u = sc->sc_srcu; -	while (u != 0) { -		if (i == HIFN_D_SRC_RSIZE) -			i = 0; -		HIFN_SRCR_SYNC(sc, i, -		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); -		if (dma->srcr[i].l & htole32(HIFN_D_VALID)) { -			HIFN_SRCR_SYNC(sc, i, -			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -			break; -		} -		i++, u--; -	} -	sc->sc_srck = i; sc->sc_srcu = u; - -	i = sc->sc_cmdk; u = sc->sc_cmdu; -	while (u != 0) { -		HIFN_CMDR_SYNC(sc, i, -		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); -		if (dma->cmdr[i].l & htole32(HIFN_D_VALID)) { -			HIFN_CMDR_SYNC(sc, i, -			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -			break; -		} -		if (i != HIFN_D_CMD_RSIZE) { -			u--; -			HIFN_CMD_SYNC(sc, i, BUS_DMASYNC_POSTWRITE); -		} -		if (++i == (HIFN_D_CMD_RSIZE + 1)) -			i = 0; -	} -	sc->sc_cmdk = i; sc->sc_cmdu = u; - -	HIFN_UNLOCK(sc); - -	if (sc->sc_needwakeup) {		/* XXX check high watermark */ -		int wakeup = sc->sc_needwakeup & CRYPTO_SYMQ; -#ifdef HIFN_DEBUG -		if (hifn_debug) -			device_printf(sc->sc_dev, -				"wakeup crypto (%x) u %d/%d/%d/%d\n", -				sc->sc_needwakeup, -				sc->sc_cmdu, sc->sc_srcu, sc->sc_dstu, sc->sc_resu); -#endif -		sc->sc_needwakeup &= ~wakeup; -		crypto_unblock(sc->sc_cid, wakeup); -	} -} - -static bool -hifn_auth_supported(struct hifn_softc *sc, -    const struct crypto_session_params *csp) -{ - -	switch (sc->sc_ena) { -	case HIFN_PUSTAT_ENA_2: -	case HIFN_PUSTAT_ENA_1: -		break; -	default: -		return (false); -	} -		 -	switch (csp->csp_auth_alg) { -	case CRYPTO_SHA1: -		break; -	case CRYPTO_SHA1_HMAC: -		if (csp->csp_auth_klen > HIFN_MAC_KEY_LENGTH) -			return (false); -		break; -	default: -		return (false); -	} - -	return (true);	 -} - -static bool -hifn_cipher_supported(struct hifn_softc *sc, -    const struct crypto_session_params *csp) -{ - -	if (csp->csp_cipher_klen == 0) -		return (false); -	if (csp->csp_ivlen > HIFN_MAX_IV_LENGTH) -		return (false); -	switch (sc->sc_ena) { -	case HIFN_PUSTAT_ENA_2: -		switch (csp->csp_cipher_alg) { -		case CRYPTO_AES_CBC: -			if ((sc->sc_flags & HIFN_HAS_AES) == 0) -				return (false); -			switch (csp->csp_cipher_klen) { -			case 128: -			case 192: -			case 256: -				break; -			default: -				return (false); -			} -			return (true); -		} -	} -	return (false); -} - -static int -hifn_probesession(device_t dev, const struct crypto_session_params *csp) -{ -	struct hifn_softc *sc; - -	sc = device_get_softc(dev); -	if (csp->csp_flags != 0) -		return (EINVAL); -	switch (csp->csp_mode) { -	case CSP_MODE_DIGEST: -		if (!hifn_auth_supported(sc, csp)) -			return (EINVAL); -		break; -	case CSP_MODE_CIPHER: -		if (!hifn_cipher_supported(sc, csp)) -			return (EINVAL); -		break; -	case CSP_MODE_ETA: -		if (!hifn_auth_supported(sc, csp) || -		    !hifn_cipher_supported(sc, csp)) -			return (EINVAL); -		break; -	default: -		return (EINVAL); -	} - -	return (CRYPTODEV_PROBE_HARDWARE); -} - -/* - * Allocate a new 'session'. - */ -static int -hifn_newsession(device_t dev, crypto_session_t cses, -    const struct crypto_session_params *csp) -{ -	struct hifn_session *ses; - -	ses = crypto_get_driver_session(cses); - -	if (csp->csp_auth_alg != 0) { -		if (csp->csp_auth_mlen == 0) -			ses->hs_mlen = crypto_auth_hash(csp)->hashsize; -		else -			ses->hs_mlen = csp->csp_auth_mlen; -	} - -	return (0); -} - -/* - * XXX freesession routine should run a zero'd mac/encrypt key into context - * ram.  to blow away any keys already stored there. - */ - -static int -hifn_process(device_t dev, struct cryptop *crp, int hint) -{ -	const struct crypto_session_params *csp; -	struct hifn_softc *sc = device_get_softc(dev); -	struct hifn_command *cmd = NULL; -	const void *mackey; -	int err, keylen; -	struct hifn_session *ses; - -	ses = crypto_get_driver_session(crp->crp_session); - -	cmd = malloc(sizeof(struct hifn_command), M_DEVBUF, M_NOWAIT | M_ZERO); -	if (cmd == NULL) { -		hifnstats.hst_nomem++; -		err = ENOMEM; -		goto errout; -	} - -	csp = crypto_get_params(crp->crp_session); - -	/* -	 * The driver only supports ETA requests where there is no -	 * gap between the AAD and payload. -	 */ -	if (csp->csp_mode == CSP_MODE_ETA && crp->crp_aad_length != 0 && -	    crp->crp_aad_start + crp->crp_aad_length != -	    crp->crp_payload_start) { -		err = EINVAL; -		goto errout; -	} - -	switch (csp->csp_mode) { -	case CSP_MODE_CIPHER: -	case CSP_MODE_ETA: -		if (!CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) -			cmd->base_masks |= HIFN_BASE_CMD_DECODE; -		cmd->base_masks |= HIFN_BASE_CMD_CRYPT; -		switch (csp->csp_cipher_alg) { -		case CRYPTO_AES_CBC: -			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_AES | -			    HIFN_CRYPT_CMD_MODE_CBC | -			    HIFN_CRYPT_CMD_NEW_IV; -			break; -		default: -			err = EINVAL; -			goto errout; -		} -		crypto_read_iv(crp, cmd->iv); - -		if (crp->crp_cipher_key != NULL) -			cmd->ck = crp->crp_cipher_key; -		else -			cmd->ck = csp->csp_cipher_key; -		cmd->cklen = csp->csp_cipher_klen; -		cmd->cry_masks |= HIFN_CRYPT_CMD_NEW_KEY; - -		/*  -		 * Need to specify the size for the AES key in the masks. -		 */ -		if ((cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) == -		    HIFN_CRYPT_CMD_ALG_AES) { -			switch (cmd->cklen) { -			case 16: -				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_128; -				break; -			case 24: -				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_192; -				break; -			case 32: -				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_256; -				break; -			default: -				err = EINVAL; -				goto errout; -			} -		} -		break; -	} - -	switch (csp->csp_mode) { -	case CSP_MODE_DIGEST: -	case CSP_MODE_ETA: -		cmd->base_masks |= HIFN_BASE_CMD_MAC; - -		switch (csp->csp_auth_alg) { -		case CRYPTO_SHA1: -			cmd->mac_masks |= HIFN_MAC_CMD_ALG_SHA1 | -			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HASH | -			    HIFN_MAC_CMD_POS_IPSEC; -			break; -		case CRYPTO_SHA1_HMAC: -			cmd->mac_masks |= HIFN_MAC_CMD_ALG_SHA1 | -			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HMAC | -			    HIFN_MAC_CMD_POS_IPSEC | HIFN_MAC_CMD_TRUNC; -			break; -		} - -		if (csp->csp_auth_alg == CRYPTO_SHA1_HMAC) { -			cmd->mac_masks |= HIFN_MAC_CMD_NEW_KEY; -			if (crp->crp_auth_key != NULL) -				mackey = crp->crp_auth_key; -			else -				mackey = csp->csp_auth_key; -			keylen = csp->csp_auth_klen; -			bcopy(mackey, cmd->mac, keylen); -			bzero(cmd->mac + keylen, HIFN_MAC_KEY_LENGTH - keylen); -		} -	} - -	cmd->crp = crp; -	cmd->session = ses; -	cmd->softc = sc; - -	err = hifn_crypto(sc, cmd, crp, hint); -	if (!err) { -		return 0; -	} else if (err == ERESTART) { -		/* -		 * There weren't enough resources to dispatch the request -		 * to the part.  Notify the caller so they'll requeue this -		 * request and resubmit it again soon. -		 */ -#ifdef HIFN_DEBUG -		if (hifn_debug) -			device_printf(sc->sc_dev, "requeue request\n"); -#endif -		free(cmd, M_DEVBUF); -		sc->sc_needwakeup |= CRYPTO_SYMQ; -		return (err); -	} - -errout: -	if (cmd != NULL) -		free(cmd, M_DEVBUF); -	if (err == EINVAL) -		hifnstats.hst_invalid++; -	else -		hifnstats.hst_nomem++; -	crp->crp_etype = err; -	crypto_done(crp); -	return (0); -} - -static void -hifn_abort(struct hifn_softc *sc) -{ -	struct hifn_dma *dma = sc->sc_dma; -	struct hifn_command *cmd; -	struct cryptop *crp; -	int i, u; - -	i = sc->sc_resk; u = sc->sc_resu; -	while (u != 0) { -		cmd = sc->sc_hifn_commands[i]; -		KASSERT(cmd != NULL, ("hifn_abort: null command slot %u", i)); -		sc->sc_hifn_commands[i] = NULL; -		crp = cmd->crp; - -		if ((dma->resr[i].l & htole32(HIFN_D_VALID)) == 0) { -			/* Salvage what we can. */ -			u_int8_t *macbuf; - -			if (cmd->base_masks & HIFN_BASE_CMD_MAC) { -				macbuf = dma->result_bufs[i]; -				macbuf += 12; -			} else -				macbuf = NULL; -			hifnstats.hst_opackets++; -			hifn_callback(sc, cmd, macbuf); -		} else { -			if (cmd->src_map == cmd->dst_map) { -				bus_dmamap_sync(sc->sc_dmat, cmd->src_map, -				    BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); -			} else { -				bus_dmamap_sync(sc->sc_dmat, cmd->src_map, -				    BUS_DMASYNC_POSTWRITE); -				bus_dmamap_sync(sc->sc_dmat, cmd->dst_map, -				    BUS_DMASYNC_POSTREAD); -			} - -			if (cmd->dst_m != NULL) { -				m_freem(cmd->dst_m); -			} - -			/* non-shared buffers cannot be restarted */ -			if (cmd->src_map != cmd->dst_map) { -				/* -				 * XXX should be EAGAIN, delayed until -				 * after the reset. -				 */ -				crp->crp_etype = ENOMEM; -				bus_dmamap_unload(sc->sc_dmat, cmd->dst_map); -				bus_dmamap_destroy(sc->sc_dmat, cmd->dst_map); -			} else -				crp->crp_etype = ENOMEM; - -			bus_dmamap_unload(sc->sc_dmat, cmd->src_map); -			bus_dmamap_destroy(sc->sc_dmat, cmd->src_map); - -			free(cmd, M_DEVBUF); -			if (crp->crp_etype != EAGAIN) -				crypto_done(crp); -		} - -		if (++i == HIFN_D_RES_RSIZE) -			i = 0; -		u--; -	} -	sc->sc_resk = i; sc->sc_resu = u; - -	hifn_reset_board(sc, 1); -	hifn_init_dma(sc); -	hifn_init_pci_registers(sc); -} - -static void -hifn_callback(struct hifn_softc *sc, struct hifn_command *cmd, u_int8_t *macbuf) -{ -	struct hifn_dma *dma = sc->sc_dma; -	struct cryptop *crp = cmd->crp; -	uint8_t macbuf2[SHA1_HASH_LEN]; -	struct mbuf *m; -	int totlen, i, u; - -	if (cmd->src_map == cmd->dst_map) { -		bus_dmamap_sync(sc->sc_dmat, cmd->src_map, -		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); -	} else { -		bus_dmamap_sync(sc->sc_dmat, cmd->src_map, -		    BUS_DMASYNC_POSTWRITE); -		bus_dmamap_sync(sc->sc_dmat, cmd->dst_map, -		    BUS_DMASYNC_POSTREAD); -	} - -	if (crp->crp_buf.cb_type == CRYPTO_BUF_MBUF) { -		if (cmd->dst_m != NULL) { -			totlen = cmd->src_mapsize; -			for (m = cmd->dst_m; m != NULL; m = m->m_next) { -				if (totlen < m->m_len) { -					m->m_len = totlen; -					totlen = 0; -				} else -					totlen -= m->m_len; -			} -			cmd->dst_m->m_pkthdr.len = -			    crp->crp_buf.cb_mbuf->m_pkthdr.len; -			m_freem(crp->crp_buf.cb_mbuf); -			crp->crp_buf.cb_mbuf = cmd->dst_m; -		} -	} - -	if (cmd->sloplen != 0) { -		crypto_copyback(crp, cmd->src_mapsize - cmd->sloplen, -		    cmd->sloplen, &dma->slop[cmd->slopidx]); -	} - -	i = sc->sc_dstk; u = sc->sc_dstu; -	while (u != 0) { -		if (i == HIFN_D_DST_RSIZE) -			i = 0; -		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); -		if (dma->dstr[i].l & htole32(HIFN_D_VALID)) { -			bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, -			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -			break; -		} -		i++, u--; -	} -	sc->sc_dstk = i; sc->sc_dstu = u; - -	hifnstats.hst_obytes += cmd->dst_mapsize; - -	if (macbuf != NULL) { -		if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) { -			crypto_copydata(crp, crp->crp_digest_start, -			    cmd->session->hs_mlen, macbuf2); -			if (timingsafe_bcmp(macbuf, macbuf2, -			    cmd->session->hs_mlen) != 0) -				crp->crp_etype = EBADMSG; -		} else -			crypto_copyback(crp, crp->crp_digest_start, -			    cmd->session->hs_mlen, macbuf); -	} - -	if (cmd->src_map != cmd->dst_map) { -		bus_dmamap_unload(sc->sc_dmat, cmd->dst_map); -		bus_dmamap_destroy(sc->sc_dmat, cmd->dst_map); -	} -	bus_dmamap_unload(sc->sc_dmat, cmd->src_map); -	bus_dmamap_destroy(sc->sc_dmat, cmd->src_map); -	free(cmd, M_DEVBUF); -	crypto_done(crp); -} - -/* - * 7811 PB3 rev/2 parts lock-up on burst writes to Group 0 - * and Group 1 registers; avoid conditions that could create - * burst writes by doing a read in between the writes. - * - * NB: The read we interpose is always to the same register; - *     we do this because reading from an arbitrary (e.g. last) - *     register may not always work. - */ -static void -hifn_write_reg_0(struct hifn_softc *sc, bus_size_t reg, u_int32_t val) -{ -	if (sc->sc_flags & HIFN_IS_7811) { -		if (sc->sc_bar0_lastreg == reg - 4) -			bus_space_read_4(sc->sc_st0, sc->sc_sh0, HIFN_0_PUCNFG); -		sc->sc_bar0_lastreg = reg; -	} -	bus_space_write_4(sc->sc_st0, sc->sc_sh0, reg, val); -} - -static void -hifn_write_reg_1(struct hifn_softc *sc, bus_size_t reg, u_int32_t val) -{ -	if (sc->sc_flags & HIFN_IS_7811) { -		if (sc->sc_bar1_lastreg == reg - 4) -			bus_space_read_4(sc->sc_st1, sc->sc_sh1, HIFN_1_REVID); -		sc->sc_bar1_lastreg = reg; -	} -	bus_space_write_4(sc->sc_st1, sc->sc_sh1, reg, val); -} - -#ifdef HIFN_VULCANDEV -/* - * this code provides support for mapping the PK engine's register - * into a userspace program. - * - */ -static int -vulcanpk_mmap(struct cdev *dev, vm_ooffset_t offset, -	      vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr) -{ -	struct hifn_softc *sc; -	vm_paddr_t pd; -	void *b; - -	sc = dev->si_drv1; - -	pd = rman_get_start(sc->sc_bar1res); -	b = rman_get_virtual(sc->sc_bar1res); - -#if 0 -	printf("vpk mmap: %p(%016llx) offset=%lld\n", b, -	    (unsigned long long)pd, offset); -	hexdump(b, HIFN_1_PUB_MEMEND, "vpk", 0); -#endif - -	if (offset == 0) { -		*paddr = pd; -		return (0); -	} -	return (-1); -} - -static struct cdevsw vulcanpk_cdevsw = { -	.d_version =	D_VERSION, -	.d_mmap =	vulcanpk_mmap, -	.d_name =	"vulcanpk", -}; -#endif /* HIFN_VULCANDEV */ diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h deleted file mode 100644 index 9660e306a643..000000000000 --- a/sys/dev/hifn/hifn7751reg.h +++ /dev/null @@ -1,542 +0,0 @@ -/*	$OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $	*/ - -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Invertex AEON / Hifn 7751 driver - * Copyright (c) 1999 Invertex Inc. All rights reserved. - * Copyright (c) 1999 Theo de Raadt - * Copyright (c) 2000-2001 Network Security Technologies, Inc. - *			http://www.netsec.net - * - * Please send any comments, feedback, bug-fixes, or feature requests to - * software@invertex.com. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *    notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *    notice, this list of conditions and the following disclaimer in the - *    documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - *    derived from this software without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Effort sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F30602-01-2-0537. - * - */ -#ifndef __HIFN_H__ -#define	__HIFN_H__ - -#include <sys/endian.h> - -/* - * Some PCI configuration space offset defines.  The names were made - * identical to the names used by the Linux kernel. - */ -#define	HIFN_BAR0		PCIR_BAR(0)	/* PUC register map */ -#define	HIFN_BAR1		PCIR_BAR(1)	/* DMA register map */ -#define	HIFN_TRDY_TIMEOUT	0x40 -#define	HIFN_RETRY_TIMEOUT	0x41 - -/* - * PCI vendor and device identifiers - * (the names are preserved from their OpenBSD source). - */ -#define	PCI_VENDOR_HIFN		0x13a3		/* Hifn */ -#define	PCI_PRODUCT_HIFN_7751	0x0005		/* 7751 */ -#define	PCI_PRODUCT_HIFN_6500	0x0006		/* 6500 */ -#define	PCI_PRODUCT_HIFN_7811	0x0007		/* 7811 */ -#define	PCI_PRODUCT_HIFN_7951	0x0012		/* 7951 */ -#define	PCI_PRODUCT_HIFN_7955	0x0020		/* 7954/7955 */ -#define	PCI_PRODUCT_HIFN_7956	0x001d		/* 7956 */ - -#define	PCI_VENDOR_INVERTEX	0x14e1		/* Invertex */ -#define	PCI_PRODUCT_INVERTEX_AEON 0x0005	/* AEON */ - -#define	PCI_VENDOR_NETSEC	0x1660		/* NetSec */ -#define	PCI_PRODUCT_NETSEC_7751	0x7751		/* 7751 */ - -/* - * The values below should multiple of 4 -- and be large enough to handle - * any command the driver implements. - * - * MAX_COMMAND = base command + mac command + encrypt command + - *			mac-key + rc4-key - * MAX_RESULT  = base result + mac result + mac + encrypt result - *			 - * - */ -#define	HIFN_MAX_COMMAND	(8 + 8 + 8 + 64 + 260) -#define	HIFN_MAX_RESULT		(8 + 4 + 20 + 4) - -/* - * hifn_desc_t - * - * Holds an individual descriptor for any of the rings. - */ -typedef struct hifn_desc { -	volatile u_int32_t l;		/* length and status bits */ -	volatile u_int32_t p; -} hifn_desc_t; - -/* - * Masks for the "length" field of struct hifn_desc. - */ -#define	HIFN_D_LENGTH		0x0000ffff	/* length bit mask */ -#define	HIFN_D_MASKDONEIRQ	0x02000000	/* mask the done interrupt */ -#define	HIFN_D_DESTOVER		0x04000000	/* destination overflow */ -#define	HIFN_D_OVER		0x08000000	/* overflow */ -#define	HIFN_D_LAST		0x20000000	/* last descriptor in chain */ -#define	HIFN_D_JUMP		0x40000000	/* jump descriptor */ -#define	HIFN_D_VALID		0x80000000	/* valid bit */ - - -/* - * Processing Unit Registers (offset from BASEREG0) - */ -#define	HIFN_0_PUDATA		0x00	/* Processing Unit Data */ -#define	HIFN_0_PUCTRL		0x04	/* Processing Unit Control */ -#define	HIFN_0_PUISR		0x08	/* Processing Unit Interrupt Status */ -#define	HIFN_0_PUCNFG		0x0c	/* Processing Unit Configuration */ -#define	HIFN_0_PUIER		0x10	/* Processing Unit Interrupt Enable */ -#define	HIFN_0_PUSTAT		0x14	/* Processing Unit Status/Chip ID */ -#define	HIFN_0_FIFOSTAT		0x18	/* FIFO Status */ -#define	HIFN_0_FIFOCNFG		0x1c	/* FIFO Configuration */ -#define	HIFN_0_PUCTRL2		0x28	/* Processing Unit Control (2nd map) */ -#define	HIFN_0_MUTE1		0x80 -#define	HIFN_0_MUTE2		0x90 -#define	HIFN_0_SPACESIZE	0x100	/* Register space size */ - -/* Processing Unit Control Register (HIFN_0_PUCTRL) */ -#define	HIFN_PUCTRL_CLRSRCFIFO	0x0010	/* clear source fifo */ -#define	HIFN_PUCTRL_STOP	0x0008	/* stop pu */ -#define	HIFN_PUCTRL_LOCKRAM	0x0004	/* lock ram */ -#define	HIFN_PUCTRL_DMAENA	0x0002	/* enable dma */ -#define	HIFN_PUCTRL_RESET	0x0001	/* Reset processing unit */ - -/* Processing Unit Interrupt Status Register (HIFN_0_PUISR) */ -#define	HIFN_PUISR_CMDINVAL	0x8000	/* Invalid command interrupt */ -#define	HIFN_PUISR_DATAERR	0x4000	/* Data error interrupt */ -#define	HIFN_PUISR_SRCFIFO	0x2000	/* Source FIFO ready interrupt */ -#define	HIFN_PUISR_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */ -#define	HIFN_PUISR_DSTOVER	0x0200	/* Destination overrun interrupt */ -#define	HIFN_PUISR_SRCCMD	0x0080	/* Source command interrupt */ -#define	HIFN_PUISR_SRCCTX	0x0040	/* Source context interrupt */ -#define	HIFN_PUISR_SRCDATA	0x0020	/* Source data interrupt */ -#define	HIFN_PUISR_DSTDATA	0x0010	/* Destination data interrupt */ -#define	HIFN_PUISR_DSTRESULT	0x0004	/* Destination result interrupt */ - -/* Processing Unit Configuration Register (HIFN_0_PUCNFG) */ -#define	HIFN_PUCNFG_DRAMMASK	0xe000	/* DRAM size mask */ -#define	HIFN_PUCNFG_DSZ_256K	0x0000	/* 256k dram */ -#define	HIFN_PUCNFG_DSZ_512K	0x2000	/* 512k dram */ -#define	HIFN_PUCNFG_DSZ_1M	0x4000	/* 1m dram */ -#define	HIFN_PUCNFG_DSZ_2M	0x6000	/* 2m dram */ -#define	HIFN_PUCNFG_DSZ_4M	0x8000	/* 4m dram */ -#define	HIFN_PUCNFG_DSZ_8M	0xa000	/* 8m dram */ -#define	HIFN_PUNCFG_DSZ_16M	0xc000	/* 16m dram */ -#define	HIFN_PUCNFG_DSZ_32M	0xe000	/* 32m dram */ -#define	HIFN_PUCNFG_DRAMREFRESH	0x1800	/* DRAM refresh rate mask */ -#define	HIFN_PUCNFG_DRFR_512	0x0000	/* 512 divisor of ECLK */ -#define	HIFN_PUCNFG_DRFR_256	0x0800	/* 256 divisor of ECLK */ -#define	HIFN_PUCNFG_DRFR_128	0x1000	/* 128 divisor of ECLK */ -#define	HIFN_PUCNFG_TCALLPHASES	0x0200	/* your guess is as good as mine... */ -#define	HIFN_PUCNFG_TCDRVTOTEM	0x0100	/* your guess is as good as mine... */ -#define	HIFN_PUCNFG_BIGENDIAN	0x0080	/* DMA big endian mode */ -#define	HIFN_PUCNFG_BUS32	0x0040	/* Bus width 32bits */ -#define	HIFN_PUCNFG_BUS16	0x0000	/* Bus width 16 bits */ -#define	HIFN_PUCNFG_CHIPID	0x0020	/* Allow chipid from PUSTAT */ -#define	HIFN_PUCNFG_DRAM	0x0010	/* Context RAM is DRAM */ -#define	HIFN_PUCNFG_SRAM	0x0000	/* Context RAM is SRAM */ -#define	HIFN_PUCNFG_COMPSING	0x0004	/* Enable single compression context */ -#define	HIFN_PUCNFG_ENCCNFG	0x0002	/* Encryption configuration */ - -/* Processing Unit Interrupt Enable Register (HIFN_0_PUIER) */ -#define	HIFN_PUIER_CMDINVAL	0x8000	/* Invalid command interrupt */ -#define	HIFN_PUIER_DATAERR	0x4000	/* Data error interrupt */ -#define	HIFN_PUIER_SRCFIFO	0x2000	/* Source FIFO ready interrupt */ -#define	HIFN_PUIER_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */ -#define	HIFN_PUIER_DSTOVER	0x0200	/* Destination overrun interrupt */ -#define	HIFN_PUIER_SRCCMD	0x0080	/* Source command interrupt */ -#define	HIFN_PUIER_SRCCTX	0x0040	/* Source context interrupt */ -#define	HIFN_PUIER_SRCDATA	0x0020	/* Source data interrupt */ -#define	HIFN_PUIER_DSTDATA	0x0010	/* Destination data interrupt */ -#define	HIFN_PUIER_DSTRESULT	0x0004	/* Destination result interrupt */ - -/* Processing Unit Status Register/Chip ID (HIFN_0_PUSTAT) */ -#define	HIFN_PUSTAT_CMDINVAL	0x8000	/* Invalid command interrupt */ -#define	HIFN_PUSTAT_DATAERR	0x4000	/* Data error interrupt */ -#define	HIFN_PUSTAT_SRCFIFO	0x2000	/* Source FIFO ready interrupt */ -#define	HIFN_PUSTAT_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */ -#define	HIFN_PUSTAT_DSTOVER	0x0200	/* Destination overrun interrupt */ -#define	HIFN_PUSTAT_SRCCMD	0x0080	/* Source command interrupt */ -#define	HIFN_PUSTAT_SRCCTX	0x0040	/* Source context interrupt */ -#define	HIFN_PUSTAT_SRCDATA	0x0020	/* Source data interrupt */ -#define	HIFN_PUSTAT_DSTDATA	0x0010	/* Destination data interrupt */ -#define	HIFN_PUSTAT_DSTRESULT	0x0004	/* Destination result interrupt */ -#define	HIFN_PUSTAT_CHIPREV	0x00ff	/* Chip revision mask */ -#define	HIFN_PUSTAT_CHIPENA	0xff00	/* Chip enabled mask */ -#define	HIFN_PUSTAT_ENA_2	0x1100	/* Level 2 enabled */ -#define	HIFN_PUSTAT_ENA_1	0x1000	/* Level 1 enabled */ -#define	HIFN_PUSTAT_ENA_0	0x3000	/* Level 0 enabled */ -#define	HIFN_PUSTAT_REV_2	0x0020	/* 7751 PT6/2 */ -#define	HIFN_PUSTAT_REV_3	0x0030	/* 7751 PT6/3 */ - -/* FIFO Status Register (HIFN_0_FIFOSTAT) */ -#define	HIFN_FIFOSTAT_SRC	0x7f00	/* Source FIFO available */ -#define	HIFN_FIFOSTAT_DST	0x007f	/* Destination FIFO available */ - -/* FIFO Configuration Register (HIFN_0_FIFOCNFG) */ -#define	HIFN_FIFOCNFG_THRESHOLD	0x0400	/* must be written as this value */ - -/* - * DMA Interface Registers (offset from BASEREG1) - */ -#define	HIFN_1_DMA_CRAR		0x0c	/* DMA Command Ring Address */ -#define	HIFN_1_DMA_SRAR		0x1c	/* DMA Source Ring Address */ -#define	HIFN_1_DMA_RRAR		0x2c	/* DMA Result Ring Address */ -#define	HIFN_1_DMA_DRAR		0x3c	/* DMA Destination Ring Address */ -#define	HIFN_1_DMA_CSR		0x40	/* DMA Status and Control */ -#define	HIFN_1_DMA_IER		0x44	/* DMA Interrupt Enable */ -#define	HIFN_1_DMA_CNFG		0x48	/* DMA Configuration */ -#define	HIFN_1_PLL		0x4c	/* 7955/7956: PLL config */ -#define	HIFN_1_7811_RNGENA	0x60	/* 7811: rng enable */ -#define	HIFN_1_7811_RNGCFG	0x64	/* 7811: rng config */ -#define	HIFN_1_7811_RNGDAT	0x68	/* 7811: rng data */ -#define	HIFN_1_7811_RNGSTS	0x6c	/* 7811: rng status */ -#define	HIFN_1_DMA_CNFG2	0x6c	/* 7955/7956: dma config #2 */ -#define	HIFN_1_7811_MIPSRST	0x94	/* 7811: MIPS reset */ -#define	HIFN_1_REVID		0x98	/* Revision ID */ - -#define	HIFN_1_PUB_RESET	0x204	/* Public/RNG Reset */ -#define	HIFN_1_PUB_BASE		0x300	/* Public Base Address */ -#define	HIFN_1_PUB_OPLEN	0x304	/* 7951-compat Public Operand Length */ -#define	HIFN_1_PUB_OP		0x308	/* 7951-compat Public Operand */ -#define	HIFN_1_PUB_STATUS	0x30c	/* 7951-compat Public Status */ -#define	HIFN_1_PUB_IEN		0x310	/* Public Interrupt enable */ -#define	HIFN_1_RNG_CONFIG	0x314	/* RNG config */ -#define	HIFN_1_RNG_DATA		0x318	/* RNG data */ -#define	HIFN_1_PUB_MODE		0x320	/* PK mode */ -#define	HIFN_1_PUB_FIFO_OPLEN	0x380	/* first element of oplen fifo */ -#define	HIFN_1_PUB_FIFO_OP	0x384	/* first element of op fifo */ -#define	HIFN_1_PUB_MEM		0x400	/* start of Public key memory */ -#define	HIFN_1_PUB_MEMEND	0xbff	/* end of Public key memory */ - -/* DMA Status and Control Register (HIFN_1_DMA_CSR) */ -#define	HIFN_DMACSR_D_CTRLMASK	0xc0000000	/* Destinition Ring Control */ -#define	HIFN_DMACSR_D_CTRL_NOP	0x00000000	/* Dest. Control: no-op */ -#define	HIFN_DMACSR_D_CTRL_DIS	0x40000000	/* Dest. Control: disable */ -#define	HIFN_DMACSR_D_CTRL_ENA	0x80000000	/* Dest. Control: enable */ -#define	HIFN_DMACSR_D_ABORT	0x20000000	/* Destinition Ring PCIAbort */ -#define	HIFN_DMACSR_D_DONE	0x10000000	/* Destinition Ring Done */ -#define	HIFN_DMACSR_D_LAST	0x08000000	/* Destinition Ring Last */ -#define	HIFN_DMACSR_D_WAIT	0x04000000	/* Destinition Ring Waiting */ -#define	HIFN_DMACSR_D_OVER	0x02000000	/* Destinition Ring Overflow */ -#define	HIFN_DMACSR_R_CTRL	0x00c00000	/* Result Ring Control */ -#define	HIFN_DMACSR_R_CTRL_NOP	0x00000000	/* Result Control: no-op */ -#define	HIFN_DMACSR_R_CTRL_DIS	0x00400000	/* Result Control: disable */ -#define	HIFN_DMACSR_R_CTRL_ENA	0x00800000	/* Result Control: enable */ -#define	HIFN_DMACSR_R_ABORT	0x00200000	/* Result Ring PCI Abort */ -#define	HIFN_DMACSR_R_DONE	0x00100000	/* Result Ring Done */ -#define	HIFN_DMACSR_R_LAST	0x00080000	/* Result Ring Last */ -#define	HIFN_DMACSR_R_WAIT	0x00040000	/* Result Ring Waiting */ -#define	HIFN_DMACSR_R_OVER	0x00020000	/* Result Ring Overflow */ -#define	HIFN_DMACSR_S_CTRL	0x0000c000	/* Source Ring Control */ -#define	HIFN_DMACSR_S_CTRL_NOP	0x00000000	/* Source Control: no-op */ -#define	HIFN_DMACSR_S_CTRL_DIS	0x00004000	/* Source Control: disable */ -#define	HIFN_DMACSR_S_CTRL_ENA	0x00008000	/* Source Control: enable */ -#define	HIFN_DMACSR_S_ABORT	0x00002000	/* Source Ring PCI Abort */ -#define	HIFN_DMACSR_S_DONE	0x00001000	/* Source Ring Done */ -#define	HIFN_DMACSR_S_LAST	0x00000800	/* Source Ring Last */ -#define	HIFN_DMACSR_S_WAIT	0x00000400	/* Source Ring Waiting */ -#define	HIFN_DMACSR_ILLW	0x00000200	/* Illegal write (7811 only) */ -#define	HIFN_DMACSR_ILLR	0x00000100	/* Illegal read (7811 only) */ -#define	HIFN_DMACSR_C_CTRL	0x000000c0	/* Command Ring Control */ -#define	HIFN_DMACSR_C_CTRL_NOP	0x00000000	/* Command Control: no-op */ -#define	HIFN_DMACSR_C_CTRL_DIS	0x00000040	/* Command Control: disable */ -#define	HIFN_DMACSR_C_CTRL_ENA	0x00000080	/* Command Control: enable */ -#define	HIFN_DMACSR_C_ABORT	0x00000020	/* Command Ring PCI Abort */ -#define	HIFN_DMACSR_C_DONE	0x00000010	/* Command Ring Done */ -#define	HIFN_DMACSR_C_LAST	0x00000008	/* Command Ring Last */ -#define	HIFN_DMACSR_C_WAIT	0x00000004	/* Command Ring Waiting */ -#define	HIFN_DMACSR_PUBDONE	0x00000002	/* Public op done (7951 only) */ -#define	HIFN_DMACSR_ENGINE	0x00000001	/* Command Ring Engine IRQ */ - -/* DMA Interrupt Enable Register (HIFN_1_DMA_IER) */ -#define	HIFN_DMAIER_D_ABORT	0x20000000	/* Destination Ring PCIAbort */ -#define	HIFN_DMAIER_D_DONE	0x10000000	/* Destination Ring Done */ -#define	HIFN_DMAIER_D_LAST	0x08000000	/* Destination Ring Last */ -#define	HIFN_DMAIER_D_WAIT	0x04000000	/* Destination Ring Waiting */ -#define	HIFN_DMAIER_D_OVER	0x02000000	/* Destination Ring Overflow */ -#define	HIFN_DMAIER_R_ABORT	0x00200000	/* Result Ring PCI Abort */ -#define	HIFN_DMAIER_R_DONE	0x00100000	/* Result Ring Done */ -#define	HIFN_DMAIER_R_LAST	0x00080000	/* Result Ring Last */ -#define	HIFN_DMAIER_R_WAIT	0x00040000	/* Result Ring Waiting */ -#define	HIFN_DMAIER_R_OVER	0x00020000	/* Result Ring Overflow */ -#define	HIFN_DMAIER_S_ABORT	0x00002000	/* Source Ring PCI Abort */ -#define	HIFN_DMAIER_S_DONE	0x00001000	/* Source Ring Done */ -#define	HIFN_DMAIER_S_LAST	0x00000800	/* Source Ring Last */ -#define	HIFN_DMAIER_S_WAIT	0x00000400	/* Source Ring Waiting */ -#define	HIFN_DMAIER_ILLW	0x00000200	/* Illegal write (7811 only) */ -#define	HIFN_DMAIER_ILLR	0x00000100	/* Illegal read (7811 only) */ -#define	HIFN_DMAIER_C_ABORT	0x00000020	/* Command Ring PCI Abort */ -#define	HIFN_DMAIER_C_DONE	0x00000010	/* Command Ring Done */ -#define	HIFN_DMAIER_C_LAST	0x00000008	/* Command Ring Last */ -#define	HIFN_DMAIER_C_WAIT	0x00000004	/* Command Ring Waiting */ -#define	HIFN_DMAIER_PUBDONE	0x00000002	/* public op done (7951 only) */ -#define	HIFN_DMAIER_ENGINE	0x00000001	/* Engine IRQ */ - -/* DMA Configuration Register (HIFN_1_DMA_CNFG) */ -#define	HIFN_DMACNFG_BIGENDIAN	0x10000000	/* big endian mode */ -#define	HIFN_DMACNFG_POLLFREQ	0x00ff0000	/* Poll frequency mask */ -#define	HIFN_DMACNFG_UNLOCK	0x00000800 -#define	HIFN_DMACNFG_POLLINVAL	0x00000700	/* Invalid Poll Scalar */ -#define	HIFN_DMACNFG_LAST	0x00000010	/* Host control LAST bit */ -#define	HIFN_DMACNFG_MODE	0x00000004	/* DMA mode */ -#define	HIFN_DMACNFG_DMARESET	0x00000002	/* DMA Reset # */ -#define	HIFN_DMACNFG_MSTRESET	0x00000001	/* Master Reset # */ - -/* DMA Configuration Register (HIFN_1_DMA_CNFG2) */ -#define	HIFN_DMACNFG2_PKSWAP32	(1 << 19)	/* swap the OPLEN/OP reg */ -#define	HIFN_DMACNFG2_PKSWAP8	(1 << 18)	/* swap the bits of OPLEN/OP */ -#define	HIFN_DMACNFG2_BAR0_SWAP32 (1<<17)	/* swap the bytes of BAR0 */ -#define	HIFN_DMACNFG2_BAR1_SWAP8 (1<<16)	/* swap the bits  of BAR0 */ -#define	HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT 12 -#define	HIFN_DMACNFG2_INIT_READ_BURST_SHIFT 8 -#define	HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT 4 -#define	HIFN_DMACNFG2_TGT_READ_BURST_SHIFT  0 - -/* 7811 RNG Enable Register (HIFN_1_7811_RNGENA) */ -#define	HIFN_7811_RNGENA_ENA	0x00000001	/* enable RNG */ - -/* 7811 RNG Config Register (HIFN_1_7811_RNGCFG) */ -#define	HIFN_7811_RNGCFG_PRE1	0x00000f00	/* first prescalar */ -#define	HIFN_7811_RNGCFG_OPRE	0x00000080	/* output prescalar */ -#define	HIFN_7811_RNGCFG_DEFL	0x00000f80	/* 2 words/ 1/100 sec */ - -/* 7811 RNG Status Register (HIFN_1_7811_RNGSTS) */ -#define	HIFN_7811_RNGSTS_RDY	0x00004000	/* two numbers in FIFO */ -#define	HIFN_7811_RNGSTS_UFL	0x00001000	/* rng underflow */ - -/* 7811 MIPS Reset Register (HIFN_1_7811_MIPSRST) */ -#define	HIFN_MIPSRST_BAR2SIZE	0xffff0000	/* sdram size */ -#define	HIFN_MIPSRST_GPRAMINIT	0x00008000	/* gpram can be accessed */ -#define	HIFN_MIPSRST_CRAMINIT	0x00004000	/* ctxram can be accessed */ -#define	HIFN_MIPSRST_LED2	0x00000400	/* external LED2 */ -#define	HIFN_MIPSRST_LED1	0x00000200	/* external LED1 */ -#define	HIFN_MIPSRST_LED0	0x00000100	/* external LED0 */ -#define	HIFN_MIPSRST_MIPSDIS	0x00000004	/* disable MIPS */ -#define	HIFN_MIPSRST_MIPSRST	0x00000002	/* warm reset MIPS */ -#define	HIFN_MIPSRST_MIPSCOLD	0x00000001	/* cold reset MIPS */ - -/* Public key reset register (HIFN_1_PUB_RESET) */ -#define	HIFN_PUBRST_RESET	0x00000001	/* reset public/rng unit */ - -/* Public operation register (HIFN_1_PUB_OP) */ -#define	HIFN_PUBOP_AOFFSET	0x0000003e	/* A offset */ -#define	HIFN_PUBOP_BOFFSET	0x00000fc0	/* B offset */ -#define	HIFN_PUBOP_MOFFSET	0x0003f000	/* M offset */ -#define	HIFN_PUBOP_OP_MASK	0x003c0000	/* Opcode: */ -#define	HIFN_PUBOP_OP_NOP	0x00000000	/*  NOP */ -#define	HIFN_PUBOP_OP_ADD	0x00040000	/*  ADD */ -#define	HIFN_PUBOP_OP_ADDC	0x00080000	/*  ADD w/carry */ -#define	HIFN_PUBOP_OP_SUB	0x000c0000	/*  SUB */ -#define	HIFN_PUBOP_OP_SUBC	0x00100000	/*  SUB w/carry */ -#define	HIFN_PUBOP_OP_MODADD	0x00140000	/*  Modular ADD */ -#define	HIFN_PUBOP_OP_MODSUB	0x00180000	/*  Modular SUB */ -#define	HIFN_PUBOP_OP_INCA	0x001c0000	/*  INC A */ -#define	HIFN_PUBOP_OP_DECA	0x00200000	/*  DEC A */ -#define	HIFN_PUBOP_OP_MULT	0x00240000	/*  MULT */ -#define	HIFN_PUBOP_OP_MODMULT	0x00280000	/*  Modular MULT */ -#define	HIFN_PUBOP_OP_MODRED	0x002c0000	/*  Modular Red */ -#define	HIFN_PUBOP_OP_MODEXP	0x00300000	/*  Modular Exp */ - -/* Public operand length register (HIFN_1_PUB_OPLEN) */ -#define	HIFN_PUBOPLEN_MODLEN	0x0000007f -#define	HIFN_PUBOPLEN_EXPLEN	0x0003ff80 -#define	HIFN_PUBOPLEN_REDLEN	0x003c0000 - -/* Public status register (HIFN_1_PUB_STATUS) */ -#define	HIFN_PUBSTS_DONE	0x00000001	/* operation done */ -#define	HIFN_PUBSTS_CARRY	0x00000002	/* carry */ -#define	HIFN_PUBSTS_FIFO_EMPTY	0x00000100	/* fifo empty */ -#define	HIFN_PUBSTS_FIFO_FULL	0x00000200	/* fifo full */ -#define	HIFN_PUBSTS_FIFO_OVFL	0x00000400	/* fifo overflow */ -#define	HIFN_PUBSTS_FIFO_WRITE	0x000f0000	/* fifo write */ -#define	HIFN_PUBSTS_FIFO_READ	0x0f000000	/* fifo read */ - -/* Public interrupt enable register (HIFN_1_PUB_IEN) */ -#define	HIFN_PUBIEN_DONE	0x00000001	/* operation done interrupt */ - -/* Random number generator config register (HIFN_1_RNG_CONFIG) */ -#define	HIFN_RNGCFG_ENA		0x00000001	/* enable rng */ - -/* - * Register offsets in register set 1 - */ - -#define	HIFN_UNLOCK_SECRET1	0xf4 -#define	HIFN_UNLOCK_SECRET2	0xfc - -/* - * PLL config register - * - * This register is present only on 7954/7955/7956 parts. It must be - * programmed according to the bus interface method used by the h/w. - * Note that the parts require a stable clock.  Since the PCI clock - * may vary the reference clock must usually be used.  To avoid - * overclocking the core logic, setup must be done carefully, refer - * to the driver for details.  The exact multiplier required varies - * by part and system configuration; refer to the Hifn documentation. - */ -#define	HIFN_PLL_REF_SEL	0x00000001	/* REF/HBI clk selection */ -#define	HIFN_PLL_BP		0x00000002	/* bypass (used during setup) */ -/* bit 2 reserved */ -#define	HIFN_PLL_PK_CLK_SEL	0x00000008	/* public key clk select */ -#define	HIFN_PLL_PE_CLK_SEL	0x00000010	/* packet engine clk select */ -/* bits 5-9 reserved */ -#define	HIFN_PLL_MBSET		0x00000400	/* must be set to 1 */ -#define	HIFN_PLL_ND		0x00003800	/* Fpll_ref multiplier select */ -#define	HIFN_PLL_ND_SHIFT	11 -#define	HIFN_PLL_ND_2		0x00000000	/* 2x */ -#define	HIFN_PLL_ND_4		0x00000800	/* 4x */ -#define	HIFN_PLL_ND_6		0x00001000	/* 6x */ -#define	HIFN_PLL_ND_8		0x00001800	/* 8x */ -#define	HIFN_PLL_ND_10		0x00002000	/* 10x */ -#define	HIFN_PLL_ND_12		0x00002800	/* 12x */ -/* bits 14-15 reserved */ -#define	HIFN_PLL_IS		0x00010000	/* charge pump current select */ -/* bits 17-31 reserved */ - -/* - * Board configuration specifies only these bits. - */ -#define	HIFN_PLL_CONFIG		(HIFN_PLL_IS|HIFN_PLL_ND|HIFN_PLL_REF_SEL) - -/* - * Public Key Engine Mode Register - */ -#define	HIFN_PKMODE_HOSTINVERT	(1 << 0)	/* HOST INVERT */ -#define	HIFN_PKMODE_ENHANCED	(1 << 1)	/* Enable enhanced mode */ - - -/********************************************************************* - * Structs for board commands  - * - *********************************************************************/ - -/* - * Structure to help build up the command data structure. - */ -typedef struct hifn_base_command { -	volatile u_int16_t masks; -	volatile u_int16_t session_num; -	volatile u_int16_t total_source_count; -	volatile u_int16_t total_dest_count; -} hifn_base_command_t; - -#define	HIFN_BASE_CMD_MAC		0x0400 -#define	HIFN_BASE_CMD_CRYPT		0x0800 -#define	HIFN_BASE_CMD_DECODE		0x2000 -#define	HIFN_BASE_CMD_SRCLEN_M		0xc000 -#define	HIFN_BASE_CMD_SRCLEN_S		14 -#define	HIFN_BASE_CMD_DSTLEN_M		0x3000 -#define	HIFN_BASE_CMD_DSTLEN_S		12 -#define	HIFN_BASE_CMD_LENMASK_HI	0x30000 -#define	HIFN_BASE_CMD_LENMASK_LO	0x0ffff - -/* - * Structure to help build up the command data structure. - */ -typedef struct hifn_crypt_command { -	volatile u_int16_t masks; -	volatile u_int16_t header_skip; -	volatile u_int16_t source_count; -	volatile u_int16_t reserved; -} hifn_crypt_command_t; - -#define	HIFN_CRYPT_CMD_ALG_MASK		0x0003		/* algorithm: */ -#define	HIFN_CRYPT_CMD_ALG_DES		0x0000		/*   DES */ -#define	HIFN_CRYPT_CMD_ALG_3DES		0x0001		/*   3DES */ -#define	HIFN_CRYPT_CMD_ALG_RC4		0x0002		/*   RC4 */ -#define	HIFN_CRYPT_CMD_ALG_AES		0x0003		/*   AES */ -#define	HIFN_CRYPT_CMD_MODE_MASK	0x0018		/* Encrypt mode: */ -#define	HIFN_CRYPT_CMD_MODE_ECB		0x0000		/*   ECB */ -#define	HIFN_CRYPT_CMD_MODE_CBC		0x0008		/*   CBC */ -#define	HIFN_CRYPT_CMD_MODE_CFB		0x0010		/*   CFB */ -#define	HIFN_CRYPT_CMD_MODE_OFB		0x0018		/*   OFB */ -#define	HIFN_CRYPT_CMD_CLR_CTX		0x0040		/* clear context */ -#define	HIFN_CRYPT_CMD_NEW_KEY		0x0800		/* expect new key */ -#define	HIFN_CRYPT_CMD_NEW_IV		0x1000		/* expect new iv */ - -#define	HIFN_CRYPT_CMD_SRCLEN_M		0xc000 -#define	HIFN_CRYPT_CMD_SRCLEN_S		14 - -#define	HIFN_CRYPT_CMD_KSZ_MASK		0x0600		/* AES key size: */ -#define	HIFN_CRYPT_CMD_KSZ_128		0x0000		/*   128 bit */ -#define	HIFN_CRYPT_CMD_KSZ_192		0x0200		/*   192 bit */ -#define	HIFN_CRYPT_CMD_KSZ_256		0x0400		/*   256 bit */ - -/* - * Structure to help build up the command data structure. - */ -typedef struct hifn_mac_command { -	volatile u_int16_t masks; -	volatile u_int16_t header_skip; -	volatile u_int16_t source_count; -	volatile u_int16_t reserved; -} hifn_mac_command_t; - -#define	HIFN_MAC_CMD_ALG_MASK		0x0001 -#define	HIFN_MAC_CMD_ALG_SHA1		0x0000 -#define	HIFN_MAC_CMD_ALG_MD5		0x0001 -#define	HIFN_MAC_CMD_MODE_MASK		0x000c -#define	HIFN_MAC_CMD_MODE_HMAC		0x0000 -#define	HIFN_MAC_CMD_MODE_SSL_MAC	0x0004 -#define	HIFN_MAC_CMD_MODE_HASH		0x0008 -#define	HIFN_MAC_CMD_MODE_FULL		0x0004 -#define	HIFN_MAC_CMD_TRUNC		0x0010 -#define	HIFN_MAC_CMD_RESULT		0x0020 -#define	HIFN_MAC_CMD_APPEND		0x0040 -#define	HIFN_MAC_CMD_SRCLEN_M		0xc000 -#define	HIFN_MAC_CMD_SRCLEN_S		14 - -/* - * MAC POS IPsec initiates authentication after encryption on encodes - * and before decryption on decodes. - */ -#define	HIFN_MAC_CMD_POS_IPSEC		0x0200 -#define	HIFN_MAC_CMD_NEW_KEY		0x0800 - -/* - * The poll frequency and poll scalar defines are unshifted values used - * to set fields in the DMA Configuration Register. - */ -#ifndef HIFN_POLL_FREQUENCY -#define	HIFN_POLL_FREQUENCY	0x1 -#endif - -#ifndef HIFN_POLL_SCALAR -#define	HIFN_POLL_SCALAR	0x0 -#endif - -#define	HIFN_MAX_SEGLEN 	0xffff		/* maximum dma segment len */ -#define	HIFN_MAX_DMALEN		0x3ffff		/* maximum dma length */ -#endif /* __HIFN_H__ */ diff --git a/sys/dev/hifn/hifn7751var.h b/sys/dev/hifn/hifn7751var.h deleted file mode 100644 index 3ba3022c3caf..000000000000 --- a/sys/dev/hifn/hifn7751var.h +++ /dev/null @@ -1,346 +0,0 @@ -/*	$OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $	*/ - -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Invertex AEON / Hifn 7751 driver - * Copyright (c) 1999 Invertex Inc. All rights reserved. - * Copyright (c) 1999 Theo de Raadt - * Copyright (c) 2000-2001 Network Security Technologies, Inc. - *			http://www.netsec.net - * - * Please send any comments, feedback, bug-fixes, or feature requests to - * software@invertex.com. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *    notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *    notice, this list of conditions and the following disclaimer in the - *    documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - *    derived from this software without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Effort sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F30602-01-2-0537. - * - */ - -#ifndef __HIFN7751VAR_H__ -#define __HIFN7751VAR_H__ - -#ifdef _KERNEL - -/* - * Some configurable values for the driver.  By default command+result - * descriptor rings are the same size.  The src+dst descriptor rings - * are sized at 3.5x the number of potential commands.  Slower parts - * (e.g. 7951) tend to run out of src descriptors; faster parts (7811) - * src+cmd/result descriptors.  It's not clear that increasing the size - * of the descriptor rings helps performance significantly as other - * factors tend to come into play (e.g. copying misaligned packets). - */ -#define	HIFN_D_CMD_RSIZE	24	/* command descriptors */ -#define	HIFN_D_SRC_RSIZE	((HIFN_D_CMD_RSIZE * 7) / 2)	/* source descriptors */ -#define	HIFN_D_RES_RSIZE	HIFN_D_CMD_RSIZE	/* result descriptors */ -#define	HIFN_D_DST_RSIZE	HIFN_D_SRC_RSIZE	/* destination descriptors */ - -/* - *  Length values for cryptography - */ -#define HIFN_DES_KEY_LENGTH		8 -#define HIFN_3DES_KEY_LENGTH		24 -#define HIFN_MAX_CRYPT_KEY_LENGTH	HIFN_3DES_KEY_LENGTH -#define HIFN_IV_LENGTH			8 -#define	HIFN_AES_IV_LENGTH		16 -#define HIFN_MAX_IV_LENGTH		HIFN_AES_IV_LENGTH - -/* - *  Length values for authentication - */ -#define HIFN_MAC_KEY_LENGTH		64 -#define HIFN_MD5_LENGTH			16 -#define HIFN_SHA1_LENGTH		20 -#define HIFN_MAC_TRUNC_LENGTH		12 - -#define MAX_SCATTER 64 - -/* - * Data structure to hold all 4 rings and any other ring related data - * that should reside in DMA. - */ -struct hifn_dma { -	/* -	 *  Descriptor rings.  We add +1 to the size to accomidate the -	 *  jump descriptor. -	 */ -	struct hifn_desc	cmdr[HIFN_D_CMD_RSIZE+1]; -	struct hifn_desc	srcr[HIFN_D_SRC_RSIZE+1]; -	struct hifn_desc	dstr[HIFN_D_DST_RSIZE+1]; -	struct hifn_desc	resr[HIFN_D_RES_RSIZE+1]; - - -	u_char			command_bufs[HIFN_D_CMD_RSIZE][HIFN_MAX_COMMAND]; -	u_char			result_bufs[HIFN_D_CMD_RSIZE][HIFN_MAX_RESULT]; -	u_int32_t		slop[HIFN_D_CMD_RSIZE]; -	u_int64_t		test_src, test_dst; -} ; - - -struct hifn_session { -	int hs_mlen; -}; - -#define	HIFN_RING_SYNC(sc, r, i, f)					\ -	bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) - -#define	HIFN_CMDR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), cmdr, (i), (f)) -#define	HIFN_RESR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), resr, (i), (f)) -#define	HIFN_SRCR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), srcr, (i), (f)) -#define	HIFN_DSTR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), dstr, (i), (f)) - -#define	HIFN_CMD_SYNC(sc, i, f)						\ -	bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) - -#define	HIFN_RES_SYNC(sc, i, f)						\ -	bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) - -/* - * Holds data specific to a single HIFN board. - */ -struct hifn_softc { -	device_t		sc_dev;		/* device backpointer */ -	struct mtx		sc_mtx;		/* per-instance lock */ -	bus_dma_tag_t		sc_dmat;	/* parent DMA tag descriptor */ -	struct resource		*sc_bar0res; -	bus_space_handle_t	sc_sh0;		/* bar0 bus space handle */ -	bus_space_tag_t		sc_st0;		/* bar0 bus space tag */ -	bus_size_t		sc_bar0_lastreg;/* bar0 last reg written */ -	struct resource		*sc_bar1res; -	bus_space_handle_t	sc_sh1;		/* bar1 bus space handle */ -	bus_space_tag_t		sc_st1;		/* bar1 bus space tag */ -	bus_size_t		sc_bar1_lastreg;/* bar1 last reg written */ -	struct resource		*sc_irq; -	void			*sc_intrhand;	/* interrupt handle */ - -	u_int32_t		sc_dmaier; -	u_int32_t		sc_drammodel;	/* 1=dram, 0=sram */ -	u_int32_t		sc_pllconfig;	/* 7954/7955/7956 PLL config */ - -	struct hifn_dma		*sc_dma; -	bus_dmamap_t		sc_dmamap; -	bus_dma_segment_t 	sc_dmasegs[1]; -	bus_addr_t		sc_dma_physaddr;/* physical address of sc_dma */ -	int			sc_dmansegs; -	struct hifn_command	*sc_hifn_commands[HIFN_D_RES_RSIZE]; -	/* -	 *  Our current positions for insertion and removal from the desriptor -	 *  rings.  -	 */ -	int			sc_cmdi, sc_srci, sc_dsti, sc_resi; -	volatile int		sc_cmdu, sc_srcu, sc_dstu, sc_resu; -	int			sc_cmdk, sc_srck, sc_dstk, sc_resk; - -	int32_t			sc_cid; -	uint16_t		sc_ena; -	int			sc_maxses; -	int			sc_ramsize; -	int			sc_flags; -#define	HIFN_HAS_RNG		0x1	/* includes random number generator */ -#define	HIFN_HAS_PUBLIC		0x2	/* includes public key support */ -#define	HIFN_HAS_AES		0x4	/* includes AES support */ -#define	HIFN_IS_7811		0x8	/* Hifn 7811 part */ -#define	HIFN_IS_7956		0x10	/* Hifn 7956/7955 don't have SDRAM */ -	struct callout		sc_rngto;	/* for polling RNG */ -	struct callout		sc_tickto;	/* for managing DMA */ -	int			sc_rngfirst; -	int			sc_rnghz;	/* RNG polling frequency */ -	struct rndtest_state	*sc_rndtest;	/* RNG test state */ -	void			(*sc_harvest)(struct rndtest_state *, -					void *, u_int); -	int			sc_c_busy;	/* command ring busy */ -	int			sc_s_busy;	/* source data ring busy */ -	int			sc_d_busy;	/* destination data ring busy */ -	int			sc_r_busy;	/* result ring busy */ -	int			sc_active;	/* for initial countdown */ -	int			sc_needwakeup;	/* ops q'd wating on resources */ -	int			sc_curbatch;	/* # ops submitted w/o int */ -	int			sc_suspended; -#ifdef HIFN_VULCANDEV -	struct cdev            *sc_pkdev; -#endif -}; - -#define	HIFN_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx) -#define	HIFN_UNLOCK(_sc)	mtx_unlock(&(_sc)->sc_mtx) - -/* - *  hifn_command_t - * - *  This is the control structure used to pass commands to hifn_encrypt(). - * - *  flags - *  ----- - *  Flags is the bitwise "or" values for command configuration.  A single - *  encrypt direction needs to be set: - * - *	HIFN_ENCODE or HIFN_DECODE - * - *  To use cryptography, a single crypto algorithm must be included: - * - *	HIFN_CRYPT_3DES or HIFN_CRYPT_DES - * - *  To use authentication is used, a single MAC algorithm must be included: - * - *	HIFN_MAC_MD5 or HIFN_MAC_SHA1 - * - *  By default MD5 uses a 16 byte hash and SHA-1 uses a 20 byte hash. - *  If the value below is set, hash values are truncated or assumed - *  truncated to 12 bytes: - * - *	HIFN_MAC_TRUNC - * - *  Keys for encryption and authentication can be sent as part of a command, - *  or the last key value used with a particular session can be retrieved - *  and used again if either of these flags are not specified. - * - *	HIFN_CRYPT_NEW_KEY, HIFN_MAC_NEW_KEY - * - *  session_num - *  ----------- - *  A number between 0 and 2048 (for DRAM models) or a number between  - *  0 and 768 (for SRAM models).  Those who don't want to use session - *  numbers should leave value at zero and send a new crypt key and/or - *  new MAC key on every command.  If you use session numbers and - *  don't send a key with a command, the last key sent for that same - *  session number will be used. - * - *  Warning:  Using session numbers and multiboard at the same time - *            is currently broken. - * - *  mbuf - *  ---- - *  Either fill in the mbuf pointer and npa=0 or - *	 fill packp[] and packl[] and set npa to > 0 - *  - *  mac_header_skip - *  --------------- - *  The number of bytes of the source_buf that are skipped over before - *  authentication begins.  This must be a number between 0 and 2^16-1 - *  and can be used by IPsec implementers to skip over IP headers. - *  *** Value ignored if authentication not used *** - * - *  crypt_header_skip - *  ----------------- - *  The number of bytes of the source_buf that are skipped over before - *  the cryptographic operation begins.  This must be a number between 0 - *  and 2^16-1.  For IPsec, this number will always be 8 bytes larger - *  than the auth_header_skip (to skip over the ESP header). - *  *** Value ignored if cryptography not used *** - * - */ -struct hifn_operand { -	bus_dmamap_t	map; -	bus_size_t	mapsize; -	int		nsegs; -	bus_dma_segment_t segs[MAX_SCATTER]; -}; -struct hifn_command { -	struct hifn_session *session; -	u_int16_t base_masks, cry_masks, mac_masks; -	u_int8_t iv[HIFN_MAX_IV_LENGTH], mac[HIFN_MAC_KEY_LENGTH]; -	const uint8_t *ck; -	int cklen; -	int sloplen, slopidx; - -	struct hifn_operand src; -	struct hifn_operand dst; -	struct mbuf *dst_m; - -	struct hifn_softc *softc; -	struct cryptop *crp; -}; - -#define	src_map		src.map -#define	src_mapsize	src.mapsize -#define	src_segs	src.segs -#define	src_nsegs	src.nsegs - -#define	dst_map		dst.map -#define	dst_mapsize	dst.mapsize -#define	dst_segs	dst.segs -#define	dst_nsegs	dst.nsegs - -/* - *  Return values for hifn_crypto() - */ -#define HIFN_CRYPTO_SUCCESS	0 -#define HIFN_CRYPTO_BAD_INPUT	(-1) -#define HIFN_CRYPTO_RINGS_FULL	(-2) - -/************************************************************************** - * - *  Function:  hifn_crypto - * - *  Purpose:   Called by external drivers to begin an encryption on the - *             HIFN board. - * - *  Blocking/Non-blocking Issues - *  ============================ - *  The driver cannot block in hifn_crypto (no calls to tsleep) currently. - *  hifn_crypto() returns HIFN_CRYPTO_RINGS_FULL if there is not enough - *  room in any of the rings for the request to proceed. - * - *  Return Values - *  ============= - *  0 for success, negative values on error - * - *  Defines for negative error codes are: - *   - *    HIFN_CRYPTO_BAD_INPUT  :  The passed in command had invalid settings. - *    HIFN_CRYPTO_RINGS_FULL :  All DMA rings were full and non-blocking - *                              behaviour was requested. - * - *************************************************************************/ -#endif /* _KERNEL */ - -struct hifn_stats { -	u_int64_t hst_ibytes; -	u_int64_t hst_obytes; -	u_int32_t hst_ipackets; -	u_int32_t hst_opackets; -	u_int32_t hst_invalid; -	u_int32_t hst_nomem;		/* malloc or one of hst_nomem_* */ -	u_int32_t hst_abort; -	u_int32_t hst_noirq;		/* IRQ for no reason */ -	u_int32_t hst_totbatch;		/* ops submitted w/o interrupt */ -	u_int32_t hst_maxbatch;		/* max ops submitted together */ -	u_int32_t hst_unaligned;	/* unaligned src caused copy */ -	/* -	 * The following divides hst_nomem into more specific buckets. -	 */ -	u_int32_t hst_nomem_map;	/* bus_dmamap_create failed */ -	u_int32_t hst_nomem_load;	/* bus_dmamap_load_* failed */ -	u_int32_t hst_nomem_mbuf;	/* MGET* failed */ -	u_int32_t hst_nomem_mcl;	/* MCLGET* failed */ -	u_int32_t hst_nomem_cr;		/* out of command/result descriptor */ -	u_int32_t hst_nomem_sd;		/* out of src/dst descriptors */ -}; - -#endif /* __HIFN7751VAR_H__ */ diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index ab7671025107..b23c0d76115d 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3574,7 +3574,7 @@ hn_rxpkt(struct hn_rx_ring *rxr)  	}  	/* -	 * If VF is activated (tranparent/non-transparent mode does not +	 * If VF is activated (transparent/non-transparent mode does not  	 * matter here).  	 *  	 * - Disable LRO @@ -3591,7 +3591,7 @@ hn_rxpkt(struct hn_rx_ring *rxr)  		do_lro = 0;  	/* -	 * If VF is activated (tranparent/non-transparent mode does not +	 * If VF is activated (transparent/non-transparent mode does not  	 * matter here), do _not_ mess with unsupported hash types or  	 * functions.  	 */ @@ -7600,7 +7600,7 @@ hn_sysinit(void *arg __unused)  	 */  	if (hn_xpnt_vf && hn_use_if_start) {  		hn_use_if_start = 0; -		printf("hn: tranparent VF mode, if_transmit will be used, " +		printf("hn: transparent VF mode, if_transmit will be used, "  		    "instead of if_start\n");  	}  #endif diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index 29a88e76a579..63ac93a8773c 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -2088,7 +2088,7 @@ create_storvsc_request(union ccb *ccb, struct hv_storvsc_request *reqp)  		break;  	}  	default: -		printf("Unknow flags: %d\n", ccb->ccb_h.flags); +		printf("Unknown flags: %d\n", ccb->ccb_h.flags);  		return(EINVAL);  	} diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c index 60bade869b49..d8ab583d69fa 100644 --- a/sys/dev/hyperv/utilities/hv_kvp.c +++ b/sys/dev/hyperv/utilities/hv_kvp.c @@ -621,7 +621,7 @@ hv_kvp_process_request(void *context, int pending)  		} else {  			if (!sc->daemon_busy) { -				hv_kvp_log_info("%s: issuing qury to daemon\n", __func__); +				hv_kvp_log_info("%s: issuing query to daemon\n", __func__);  				mtx_lock(&sc->pending_mutex);  				sc->req_timed_out = false;  				sc->daemon_busy = true; diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index ec1664fac701..9d246d7c78fd 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -60,12 +60,13 @@  #include "opt_geom.h"  #include "opt_md.h" -#include <sys/param.h>  #include <sys/systm.h>  #include <sys/bio.h>  #include <sys/buf.h> +#include <sys/bus.h>  #include <sys/conf.h>  #include <sys/devicestat.h> +#include <sys/disk.h>  #include <sys/fcntl.h>  #include <sys/kernel.h>  #include <sys/kthread.h> @@ -76,11 +77,11 @@  #include <sys/mdioctl.h>  #include <sys/mount.h>  #include <sys/mutex.h> -#include <sys/sx.h>  #include <sys/namei.h>  #include <sys/proc.h>  #include <sys/queue.h>  #include <sys/rwlock.h> +#include <sys/sx.h>  #include <sys/sbuf.h>  #include <sys/sched.h>  #include <sys/sf_buf.h> @@ -88,9 +89,6 @@  #include <sys/uio.h>  #include <sys/unistd.h>  #include <sys/vnode.h> -#include <sys/disk.h> -#include <sys/param.h> -#include <sys/bus.h>  #include <geom/geom.h>  #include <geom/geom_int.h> diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index f212759a5500..e607667decf5 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1762,9 +1762,14 @@ noadminq:  		bus_release_resource(ctrlr->dev, SYS_RES_IRQ,  		    rman_get_rid(ctrlr->res), ctrlr->res); -	if (ctrlr->bar4_resource != NULL) { +	if (ctrlr->msix_table_resource != NULL) {  		bus_release_resource(dev, SYS_RES_MEMORY, -		    ctrlr->bar4_resource_id, ctrlr->bar4_resource); +		    ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); +	} + +	if (ctrlr->msix_pba_resource != NULL) { +		bus_release_resource(dev, SYS_RES_MEMORY, +		    ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource);  	}  	bus_release_resource(dev, SYS_RES_MEMORY, diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index a759181a8c16..f4a588373c98 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -142,10 +142,6 @@ nvme_ns_strategy_done(void *arg, const struct nvme_completion *cpl)  {  	struct bio *bp = arg; -	/* -	 * TODO: add more extensive translation of NVMe status codes -	 *  to different bio error codes (i.e. EIO, EINVAL, etc.) -	 */  	if (nvme_completion_is_error(cpl)) {  		bp->bio_error = EIO;  		bp->bio_flags |= BIO_ERROR; diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index c07a68d2f0dc..cecb05ca0a92 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -152,11 +152,15 @@ static int  nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr)  {  	ctrlr->resource_id = PCIR_BAR(0); +	ctrlr->msix_table_resource_id = -1; +	ctrlr->msix_table_resource = NULL; +	ctrlr->msix_pba_resource_id = -1; +	ctrlr->msix_pba_resource = NULL;  	ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY,  	    &ctrlr->resource_id, RF_ACTIVE); -	if(ctrlr->resource == NULL) { +	if (ctrlr->resource == NULL) {  		nvme_printf(ctrlr, "unable to allocate pci resource\n");  		return (ENOMEM);  	} @@ -166,15 +170,32 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr)  	ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle;  	/* -	 * The NVMe spec allows for the MSI-X table to be placed behind -	 *  BAR 4/5, separate from the control/doorbell registers.  Always -	 *  try to map this bar, because it must be mapped prior to calling -	 *  pci_alloc_msix().  If the table isn't behind BAR 4/5, -	 *  bus_alloc_resource() will just return NULL which is OK. +	 * The NVMe spec allows for the MSI-X tables to be placed behind +	 *  BAR 4 and/or 5, separate from the control/doorbell registers.  	 */ -	ctrlr->bar4_resource_id = PCIR_BAR(4); -	ctrlr->bar4_resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, -	    &ctrlr->bar4_resource_id, RF_ACTIVE); + +	ctrlr->msix_table_resource_id = pci_msix_table_bar(ctrlr->dev); +	ctrlr->msix_pba_resource_id = pci_msix_pba_bar(ctrlr->dev); + +	if (ctrlr->msix_table_resource_id >= 0 && +	    ctrlr->msix_table_resource_id != ctrlr->resource_id) { +		ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, +		    SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); +		if (ctrlr->msix_table_resource == NULL) { +			nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); +			return (ENOMEM); +		} +	} +	if (ctrlr->msix_pba_resource_id >= 0 && +	    ctrlr->msix_pba_resource_id != ctrlr->resource_id && +	    ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { +		ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, +		    SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); +		if (ctrlr->msix_pba_resource == NULL) { +			nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); +			return (ENOMEM); +		} +	}  	return (0);  } @@ -200,9 +221,14 @@ bad:  		    ctrlr->resource_id, ctrlr->resource);  	} -	if (ctrlr->bar4_resource != NULL) { +	if (ctrlr->msix_table_resource != NULL) { +		bus_release_resource(dev, SYS_RES_MEMORY, +		    ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); +	} + +	if (ctrlr->msix_pba_resource != NULL) {  		bus_release_resource(dev, SYS_RES_MEMORY, -		    ctrlr->bar4_resource_id, ctrlr->bar4_resource); +		    ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource);  	}  	if (ctrlr->tag) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 04a47d799350..dd45e1acd0aa 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -235,8 +235,10 @@ struct nvme_controller {  	 *  separate from the control registers which are in BAR 0/1.  These  	 *  members track the mapping of BAR 4/5 for that reason.  	 */ -	int			bar4_resource_id; -	struct resource		*bar4_resource; +	int			msix_table_resource_id; +	struct resource		*msix_table_resource; +	int			msix_pba_resource_id; +	struct resource		*msix_pba_resource;  	int			msi_count;  	uint32_t		enable_aborts; diff --git a/sys/dev/nvmf/controller/nvmft_controller.c b/sys/dev/nvmf/controller/nvmft_controller.c index 390467534ca2..e618972f46cf 100644 --- a/sys/dev/nvmf/controller/nvmft_controller.c +++ b/sys/dev/nvmf/controller/nvmft_controller.c @@ -31,7 +31,7 @@ nvmft_printf(struct nvmft_controller *ctrlr, const char *fmt, ...)  	va_list ap;  	size_t retval; -	sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); +	sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL);  	sbuf_set_drain(&sb, sbuf_printf_drain, &retval);  	sbuf_printf(&sb, "nvmft%u: ", ctrlr->cntlid); diff --git a/sys/dev/ocs_fc/ocs_device.c b/sys/dev/ocs_fc/ocs_device.c index 7f0c5526b1c3..d9c283541d3c 100644 --- a/sys/dev/ocs_fc/ocs_device.c +++ b/sys/dev/ocs_fc/ocs_device.c @@ -825,7 +825,7 @@ __ocs_d_init(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg)  			ocs_node_transition(node, __ocs_d_wait_topology_notify, NULL);  			break;  		default: -			node_printf(node, "received PLOGI, with unexpectd topology %d\n", +			node_printf(node, "received PLOGI, with unexpected topology %d\n",  				    node->sport->topology);  			ocs_assert(FALSE, NULL);  			break; diff --git a/sys/dev/ocs_fc/ocs_els.c b/sys/dev/ocs_fc/ocs_els.c index c62f71d4eb4f..cf4f01477f69 100644 --- a/sys/dev/ocs_fc/ocs_els.c +++ b/sys/dev/ocs_fc/ocs_els.c @@ -314,7 +314,7 @@ _ocs_els_io_free(void *arg)  			ocs_list_remove(&node->els_io_pend_list, els);  			els->els_pend = 0;  		} else { -			ocs_log_err(ocs, "assertion failed: niether els->els_pend nor els->active set\n"); +			ocs_log_err(ocs, "assertion failed: neither els->els_pend nor els->active set\n");  			ocs_unlock(&node->active_ios_lock);  			return;  		} @@ -363,7 +363,7 @@ ocs_els_make_active(ocs_io_t *els)  		} else {  			/* must be retrying; make sure it's already active */  			if (!els->els_active) { -				ocs_log_err(node->ocs, "assertion failed: niether els->els_pend nor els->active set\n"); +				ocs_log_err(node->ocs, "assertion failed: neither els->els_pend nor els->active set\n");  			}  		}  	ocs_unlock(&node->active_ios_lock); diff --git a/sys/dev/ocs_fc/ocs_gendump.c b/sys/dev/ocs_fc/ocs_gendump.c index 83155d90c3a3..6a1abfefadfc 100644 --- a/sys/dev/ocs_fc/ocs_gendump.c +++ b/sys/dev/ocs_fc/ocs_gendump.c @@ -153,7 +153,7 @@ ocs_gen_dump(ocs_t *ocs)  			ocs_log_test(ocs, "Failed to see dump after 30 secs\n");  			rc = -1;  		} else { -			ocs_log_debug(ocs, "sucessfully generated dump\n"); +			ocs_log_debug(ocs, "successfully generated dump\n");  		}  		/* now reset port */ @@ -219,7 +219,7 @@ ocs_fdb_dump(ocs_t *ocs)  			return -1;  		} -		ocs_log_debug(ocs, "sucessfully generated dump\n"); +		ocs_log_debug(ocs, "successfully generated dump\n");  	} else {  		ocs_log_err(ocs, "dump request to hw failed\n"); diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 71ba17d5f72a..d3cea434b2be 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -796,7 +796,7 @@ ocs_sys_fwupgrade(SYSCTL_HANDLER_ARGS)                                  break;                          default:                                  ocs_log_warn(ocs, -                                        "Unexected value change_status: %d\n", +                                        "Unexpected value change_status: %d\n",                                          fw_change_status);                                  break;                  } diff --git a/sys/dev/ocs_fc/ocs_scsi.c b/sys/dev/ocs_fc/ocs_scsi.c index af9fc798b01c..1bbf60b9014b 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -720,7 +720,7 @@ ocs_scsi_build_sgls(ocs_hw_t *hw, ocs_hw_io_t *hio, ocs_hw_dif_info_t *hw_dif, o  			case OCS_HW_DIF_BK_SIZE_520:	blocksize = 520; break;  			case OCS_HW_DIF_BK_SIZE_4104:	blocksize = 4104; break;  			default: -				ocs_log_test(hw->os, "Inavlid hw_dif blocksize %d\n", hw_dif->blk_size); +				ocs_log_test(hw->os, "Invalid hw_dif blocksize %d\n", hw_dif->blk_size);  				return -1;  			}  			for (i = 0; i < sgl_count; i++) { diff --git a/sys/dev/ocs_fc/ocs_xport.c b/sys/dev/ocs_fc/ocs_xport.c index d997ea245132..9e69bf0ed98f 100644 --- a/sys/dev/ocs_fc/ocs_xport.c +++ b/sys/dev/ocs_fc/ocs_xport.c @@ -482,12 +482,12 @@ ocs_xport_initialize(ocs_xport_t *xport)  	 /* Setup persistent topology based on topology mod-param value */          rc = ocs_topology_setup(ocs);          if (rc) { -                ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); +                ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc);                  return -1;          }  	if (ocs_hw_set(&ocs->hw, OCS_HW_TOPOLOGY, ocs->topology) != OCS_HW_RTN_SUCCESS) { -		ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); +		ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc);  		return -1;  	}  	ocs_hw_set(&ocs->hw, OCS_HW_RQ_DEFAULT_BUFFER_SIZE, OCS_FC_RQ_SIZE_DEFAULT); diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 858069035572..8e63b345a1bd 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -173,9 +173,6 @@ static const struct fxrng_ent_char {  	[RANDOM_PURE_GLXSB] = {  		.entc_cls = &fxrng_hi_push,  	}, -	[RANDOM_PURE_HIFN] = { -		.entc_cls = &fxrng_hi_push, -	},  	[RANDOM_PURE_RDRAND] = {  		.entc_cls = &fxrng_hi_pull,  	}, diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index e38fd38c310b..643dbac1fc8b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -663,7 +663,6 @@ static const char *random_source_descr[ENTROPYSOURCE] = {  	[RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */  	[RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */  	[RANDOM_PURE_GLXSB] = "PURE_GLXSB", -	[RANDOM_PURE_HIFN] = "PURE_HIFN",  	[RANDOM_PURE_RDRAND] = "PURE_RDRAND",  	[RANDOM_PURE_RDSEED] = "PURE_RDSEED",  	[RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", diff --git a/sys/dev/thunderbolt/nhi.c b/sys/dev/thunderbolt/nhi.c index 205e69c16253..30a72652535a 100644 --- a/sys/dev/thunderbolt/nhi.c +++ b/sys/dev/thunderbolt/nhi.c @@ -322,6 +322,7 @@ nhi_detach(struct nhi_softc *sc)  	tbdev_remove_interface(sc);  	nhi_pci_disable_interrupts(sc); +	nhi_pci_free_interrupts(sc);  	nhi_free_ring0(sc); diff --git a/sys/dev/thunderbolt/nhi_pci.c b/sys/dev/thunderbolt/nhi_pci.c index 7dacff523cef..865963e275ec 100644 --- a/sys/dev/thunderbolt/nhi_pci.c +++ b/sys/dev/thunderbolt/nhi_pci.c @@ -67,7 +67,7 @@ static int	nhi_pci_suspend(device_t);  static int	nhi_pci_resume(device_t);  static void	nhi_pci_free(struct nhi_softc *);  static int	nhi_pci_allocate_interrupts(struct nhi_softc *); -static void	nhi_pci_free_interrupts(struct nhi_softc *); +static void	nhi_pci_free_resources(struct nhi_softc *);  static int	nhi_pci_icl_poweron(struct nhi_softc *);  static device_method_t nhi_methods[] = { @@ -253,7 +253,7 @@ static void  nhi_pci_free(struct nhi_softc *sc)  { -	nhi_pci_free_interrupts(sc); +	nhi_pci_free_resources(sc);  	if (sc->parent_dmat != NULL) {  		bus_dma_tag_destroy(sc->parent_dmat); @@ -307,7 +307,7 @@ nhi_pci_allocate_interrupts(struct nhi_softc *sc)  	return (error);  } -static void +void  nhi_pci_free_interrupts(struct nhi_softc *sc)  {  	int i; @@ -319,7 +319,11 @@ nhi_pci_free_interrupts(struct nhi_softc *sc)  	}  	pci_release_msi(sc->dev); +} +static void +nhi_pci_free_resources(struct nhi_softc *sc) +{  	if (sc->irq_table != NULL) {  		bus_release_resource(sc->dev, SYS_RES_MEMORY,  		    sc->irq_table_rid, sc->irq_table); diff --git a/sys/dev/thunderbolt/nhi_var.h b/sys/dev/thunderbolt/nhi_var.h index 2b9e878af47d..e79ecc954c1f 100644 --- a/sys/dev/thunderbolt/nhi_var.h +++ b/sys/dev/thunderbolt/nhi_var.h @@ -217,6 +217,7 @@ struct nhi_dispatch {  int nhi_pci_configure_interrupts(struct nhi_softc *sc);  void nhi_pci_enable_interrupt(struct nhi_ring_pair *r);  void nhi_pci_disable_interrupts(struct nhi_softc *sc); +void nhi_pci_free_interrupts(struct nhi_softc *sc);  int nhi_pci_get_uuid(struct nhi_softc *sc);  int nhi_read_lc_mailbox(struct nhi_softc *, u_int reg, uint32_t *val);  int nhi_write_lc_mailbox(struct nhi_softc *, u_int reg, uint32_t val); diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 1ab833301b3c..a860cc3e0fa9 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -1174,7 +1174,7 @@ upgt_eeprom_parse_freq3(struct upgt_softc *sc, uint8_t *data, int len)  		sc->sc_eeprom_freq3[channel] = freq3[i]; -		DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", +		DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n",  		    le16toh(sc->sc_eeprom_freq3[channel].freq), channel);  	}  } @@ -1216,7 +1216,7 @@ upgt_eeprom_parse_freq4(struct upgt_softc *sc, uint8_t *data, int len)  			sc->sc_eeprom_freq4[channel][j].pad = 0;  		} -		DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", +		DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n",  		    le16toh(freq4_1[i].freq), channel);  	}  } @@ -1244,7 +1244,7 @@ upgt_eeprom_parse_freq6(struct upgt_softc *sc, uint8_t *data, int len)  		sc->sc_eeprom_freq6[channel] = freq6[i]; -		DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", +		DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n",  		    le16toh(sc->sc_eeprom_freq6[channel].freq), channel);  	}  } diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 7affdcdce089..b7dfc941224d 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -827,7 +827,7 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen,  	if (error)  		device_printf(sc->sc_dev, "command timeout\n");  	STAILQ_REMOVE(&sc->sc_rqh, &rq, zyd_rq, rq); -	DPRINTF(sc, ZYD_DEBUG_CMD, "finsihed cmd %p, error = %d \n", +	DPRINTF(sc, ZYD_DEBUG_CMD, "finished cmd %p, error = %d \n",  	    &rq, error);  	return (error); diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 6f786a450900..668eb170304a 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -547,7 +547,7 @@ vtgpu_create_2d(struct vtgpu_softc *sc)  		return (error);  	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { -		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", +		device_printf(sc->vtgpu_dev, "Invalid response type %x\n",  		    le32toh(s.resp.type));  		return (EINVAL);  	} @@ -586,7 +586,7 @@ vtgpu_attach_backing(struct vtgpu_softc *sc)  		return (error);  	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { -		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", +		device_printf(sc->vtgpu_dev, "Invalid response type %x\n",  		    le32toh(s.resp.type));  		return (EINVAL);  	} @@ -624,7 +624,7 @@ vtgpu_set_scanout(struct vtgpu_softc *sc, uint32_t x, uint32_t y,  		return (error);  	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { -		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", +		device_printf(sc->vtgpu_dev, "Invalid response type %x\n",  		    le32toh(s.resp.type));  		return (EINVAL);  	} @@ -663,7 +663,7 @@ vtgpu_transfer_to_host_2d(struct vtgpu_softc *sc, uint32_t x, uint32_t y,  		return (error);  	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { -		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", +		device_printf(sc->vtgpu_dev, "Invalid response type %x\n",  		    le32toh(s.resp.type));  		return (EINVAL);  	} @@ -700,7 +700,7 @@ vtgpu_resource_flush(struct vtgpu_softc *sc, uint32_t x, uint32_t y,  		return (error);  	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { -		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", +		device_printf(sc->vtgpu_dev, "Invalid response type %x\n",  		    le32toh(s.resp.type));  		return (EINVAL);  	} diff --git a/sys/dev/virtio/scmi/virtio_scmi.c b/sys/dev/virtio/scmi/virtio_scmi.c index f5427756e971..436711dc0ae2 100644 --- a/sys/dev/virtio/scmi/virtio_scmi.c +++ b/sys/dev/virtio/scmi/virtio_scmi.c @@ -386,7 +386,7 @@ virtio_scmi_pdu_get(struct vtscmi_queue *q, void *buf, unsigned int tx_len,  	mtx_unlock_spin(&q->p_mtx);  	if (pdu == NULL) { -		device_printf(q->dev, "Cannnot allocate PDU.\n"); +		device_printf(q->dev, "Cannot allocate PDU.\n");  		return (NULL);  	} diff --git a/sys/dev/vmm/vmm_mem.c b/sys/dev/vmm/vmm_mem.c index 9df31c9ba133..5ae944713c81 100644 --- a/sys/dev/vmm/vmm_mem.c +++ b/sys/dev/vmm/vmm_mem.c @@ -279,8 +279,10 @@ vm_mmap_memseg(struct vm *vm, vm_paddr_t gpa, int segid, vm_ooffset_t first,  	if (seg->object == NULL)  		return (EINVAL); +	if (first + len < first || gpa + len < gpa) +		return (EINVAL);  	last = first + len; -	if (first < 0 || first >= last || last > seg->len) +	if (first >= last || last > seg->len)  		return (EINVAL);  	if ((gpa | first | last) & PAGE_MASK) @@ -298,11 +300,12 @@ vm_mmap_memseg(struct vm *vm, vm_paddr_t gpa, int segid, vm_ooffset_t first,  		return (ENOSPC);  	vmmap = &mem->mem_vmspace->vm_map; -	error = vm_map_find(vmmap, seg->object, first, &gpa, len, 0, -	    VMFS_NO_SPACE, prot, prot, 0); +	vm_map_lock(vmmap); +	error = vm_map_insert(vmmap, seg->object, first, gpa, gpa + len, +	    prot, prot, 0); +	vm_map_unlock(vmmap);  	if (error != KERN_SUCCESS) -		return (EFAULT); - +		return (vm_mmap_to_errno(error));  	vm_object_reference(seg->object);  	if (flags & VM_MEMMAP_F_WIRED) { diff --git a/sys/dev/xilinx/xlnx_pcib.c b/sys/dev/xilinx/xlnx_pcib.c index d549ec445ea9..816b33ec1142 100644 --- a/sys/dev/xilinx/xlnx_pcib.c +++ b/sys/dev/xilinx/xlnx_pcib.c @@ -1,7 +1,7 @@  /*-   * SPDX-License-Identifier: BSD-2-Clause   * - * Copyright (c) 2020 Ruslan Bukin <br@bsdpad.com> + * Copyright (c) 2020-2025 Ruslan Bukin <br@bsdpad.com>   *   * This software was developed by SRI International and the University of   * Cambridge Computer Laboratory (Department of Computer Science and @@ -84,7 +84,7 @@ struct xlnx_pcib_softc {  	struct generic_pcie_fdt_softc	fdt_sc;  	struct resource			*res[4];  	struct mtx			mtx; -	vm_offset_t			msi_page; +	void				*msi_page;  	struct xlnx_pcib_irqsrc		*isrcs;  	device_t			dev;  	void				*intr_cookie[3]; @@ -105,6 +105,12 @@ struct xlnx_pcib_irqsrc {  	u_int			flags;  }; +static struct ofw_compat_data compat_data[] = { +	{ "xlnx,xdma-host-3.00",	1 }, +	{ "xlnx,axi-pcie-host-1.00.a",	1 }, +	{ NULL,				0 }, +}; +  static void  xlnx_pcib_clear_err_interrupts(struct generic_pcie_core_softc *sc)  { @@ -333,12 +339,12 @@ xlnx_pcib_fdt_probe(device_t dev)  	if (!ofw_bus_status_okay(dev))  		return (ENXIO); -	if (ofw_bus_is_compatible(dev, "xlnx,xdma-host-3.00")) { -		device_set_desc(dev, "Xilinx XDMA PCIe Controller"); -		return (BUS_PROBE_DEFAULT); -	} +	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) +		return (ENXIO); + +	device_set_desc(dev, "Xilinx XDMA PCIe Controller"); -	return (ENXIO); +	return (BUS_PROBE_DEFAULT);  }  static int @@ -424,8 +430,8 @@ xlnx_pcib_req_valid(struct generic_pcie_core_softc *sc,  	bus_space_tag_t t;  	uint32_t val; -	t = sc->bst; -	h = sc->bsh; +	t = rman_get_bustag(sc->res); +	h = rman_get_bushandle(sc->res);  	if ((bus < sc->bus_start) || (bus > sc->bus_end))  		return (0); @@ -467,8 +473,8 @@ xlnx_pcib_read_config(device_t dev, u_int bus, u_int slot,  		return (~0U);  	offset = PCIE_ADDR_OFFSET(bus - sc->bus_start, slot, func, reg); -	t = sc->bst; -	h = sc->bsh; +	t = rman_get_bustag(sc->res); +	h = rman_get_bushandle(sc->res);  	data = bus_space_read_4(t, h, offset & ~3); @@ -512,8 +518,8 @@ xlnx_pcib_write_config(device_t dev, u_int bus, u_int slot,  	offset = PCIE_ADDR_OFFSET(bus - sc->bus_start, slot, func, reg); -	t = sc->bst; -	h = sc->bsh; +	t = rman_get_bustag(sc->res); +	h = rman_get_bushandle(sc->res);  	/*  	 * 32-bit access used due to a bug in the Xilinx bridge that | 
