diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2009-04-29 08:24:27 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2009-04-29 08:24:27 +0000 |
| commit | b6386bc64158b986b64606b3027e51c591c9006b (patch) | |
| tree | 7ff0f0c1e7dbb28595d233ca8559ed3ef74267e1 /sys/dev/ic/cissreg.h | |
| parent | 934c8447e8cb3f196b08c9659c19b106bb18a9c7 (diff) | |
Implement the 64bit FIFO modes (based on the OpenCISS Specification
1.06). It is required to run ciss(4) with amd64 bigmem, even when
using the iommu.
Tested by many on 32bit and 64bit low- and bigmem systems
With feedback from mk@ deraadt@
Diffstat (limited to 'sys/dev/ic/cissreg.h')
| -rw-r--r-- | sys/dev/ic/cissreg.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/sys/dev/ic/cissreg.h b/sys/dev/ic/cissreg.h index 2ffe9dc4ee3..5f6a5e5c0b1 100644 --- a/sys/dev/ic/cissreg.h +++ b/sys/dev/ic/cissreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cissreg.h,v 1.9 2007/11/26 19:13:22 dlg Exp $ */ +/* $OpenBSD: cissreg.h,v 1.10 2009/04/29 08:24:26 reyk Exp $ */ /* * Copyright (c) 2005,2006 Michael Shalayeff @@ -30,6 +30,12 @@ #define CISS_CFG_BAR 0xb4 #define CISS_CFG_OFF 0xb8 +/* 64bit FIFO mode input/output post queues */ +#define CISS_INQ64_LO 0xc0 +#define CISS_INQ64_HI 0xc4 +#define CISS_OUTQ64_LO 0xc8 +#define CISS_OUTQ64_HI 0xcc + #define CISS_DRVMAP_SIZE (128 / 8) #define CISS_CMD_CTRL_GET 0x26 @@ -64,10 +70,15 @@ struct ciss_config { #define CISS_SIGNATURE (*(u_int32_t *)"CISS") u_int32_t version; u_int32_t methods; -#define CISS_METH_READY 0x0001 -#define CISS_METH_SIMPL 0x0002 -#define CISS_METH_PERF 0x0004 -#define CISS_METH_EMQ 0x0008 +#define CISS_METH_READY 0x00000001 /* indicate to accept commands */ +#define CISS_METH_SIMPL 0x00000002 /* simple mode */ +#define CISS_METH_PERF 0x00000004 /* performant mode */ +#define CISS_METH_EMQ 0x00000008 /* MEMQ method */ +#define CISS_METH_BIT63 0x08000000 /* address bit 63 is valid */ +#define CISS_METH_FIFO64_RRO 0x10000000 /* 64bit FIFO reverse read order */ +#define CISS_METH_SHORT_TAG 0x20000000 /* short 4 byte tag support */ +#define CISS_METH_MSIX 0x40000000 /* directed MSI-X support */ +#define CISS_METH_FIFO64 0x80000000 /* 64bit FIFO support */ u_int32_t amethod; u_int32_t rmethod; u_int32_t paddr_lim; @@ -465,7 +476,7 @@ struct ciss_error { struct ciss_ccb { TAILQ_ENTRY(ciss_ccb) ccb_link; struct ciss_softc *ccb_sc; - paddr_t ccb_cmdpa; + u_int64_t ccb_cmdpa; enum { CISS_CCB_FREE = 0x01, CISS_CCB_READY = 0x02, |