diff options
| author | Doug Ambrisko <ambrisko@FreeBSD.org> | 2012-04-02 19:13:02 +0000 |
|---|---|---|
| committer | Doug Ambrisko <ambrisko@FreeBSD.org> | 2012-04-02 19:13:02 +0000 |
| commit | 7e4dd9e112e51d274464b82cb190c0d0d2b50eb6 (patch) | |
| tree | eadeb025509e6311278f517fd4977d2d44b0a64e /sys/dev/mfi | |
| parent | b867b16dc9ae142206621c6d185574f1c5d021fa (diff) | |
Notes
Diffstat (limited to 'sys/dev/mfi')
| -rw-r--r-- | sys/dev/mfi/mfi_ioctl.h | 7 | ||||
| -rw-r--r-- | sys/dev/mfi/mfi_tbolt.c | 2 | ||||
| -rw-r--r-- | sys/dev/mfi/mfivar.h | 12 |
3 files changed, 10 insertions, 11 deletions
diff --git a/sys/dev/mfi/mfi_ioctl.h b/sys/dev/mfi/mfi_ioctl.h index e42001732944..da62ad9d82a9 100644 --- a/sys/dev/mfi/mfi_ioctl.h +++ b/sys/dev/mfi/mfi_ioctl.h @@ -28,19 +28,12 @@ __FBSDID("$FreeBSD$"); #include <dev/mfi/mfireg.h> -#include <machine/bus.h> struct iovec32 { u_int32_t iov_base; int iov_len; }; -struct megasas_sge -{ - bus_addr_t phys_addr; - uint32_t length; -}; - #define MFIQ_FREE 0 #define MFIQ_BIO 1 #define MFIQ_READY 2 diff --git a/sys/dev/mfi/mfi_tbolt.c b/sys/dev/mfi/mfi_tbolt.c index aa9fb77edf05..c4a6fe2d0c2a 100644 --- a/sys/dev/mfi/mfi_tbolt.c +++ b/sys/dev/mfi/mfi_tbolt.c @@ -520,7 +520,7 @@ int mfi_tbolt_reset(struct mfi_softc *sc) uint32_t fw_state; mtx_lock(&sc->mfi_io_lock); - if (atomic_read(&sc->fw_reset_no_pci_access)) { + if (mfi_atomic_read(&sc->fw_reset_no_pci_access)) { device_printf(sc->mfi_dev, "NO PCI ACCESS\n"); mtx_unlock(&sc->mfi_io_lock); return 1; diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h index d825dfd25c65..858f498a00d3 100644 --- a/sys/dev/mfi/mfivar.h +++ b/sys/dev/mfi/mfivar.h @@ -155,13 +155,19 @@ struct mfi_skinny_dma_info { int noofmaps; }; +struct megasas_sge +{ + bus_addr_t phys_addr; + uint32_t length; +}; + struct mfi_cmd_tbolt; struct mfi_atomic { volatile unsigned int val; }; -#define atomic_read(v) ((v)->val) -#define atomic_set(v,i) ((v)->val - (i)) +#define mfi_atomic_read(v) ((v)->val) +#define mfi_atomic_set(v,i) ((v)->val - (i)) struct mfi_softc { device_t mfi_dev; @@ -582,7 +588,7 @@ SYSCTL_DECL(_hw_mfi); #define MFI_CMD_TIMEOUT 30 #define MFI_SYS_PD_IO 0 #define MFI_LD_IO 1 -#define SKINNY_MEMORY 0x02000000 +#define MFI_SKINNY_MEMORY 0x02000000 #define MFI_MAXPHYS (128 * 1024) #ifdef MFI_DEBUG |