Import version 3.60.03.006 of the TWA driver:

This patch does the following:

- Remove un-necessary code that is not even compiling into the driver
 under TW_OSL_NON_DMA_MEM_ALLOC_PER_REQUEST defines.
- Remove bundled firmware image and associated "files" entry for tw_cl_fwimg.c
- Remove bundled firmware flashing routines. We now have tw_update userspace
 FreeBSD controller flash utility.
- Fix driver crash on load due to shared interrupt.
- Fix 2 lock leaks for Giant lock.
- Fix CCB leak.
- Add support for 9650SE controllers.

Many thanks to 3Ware/AMCC for continuing to support FreeBSD.

1 files changed, 2 insertions, 29 deletions

diff --git a/sys/modules/twa/Makefile b/sys/modules/twa/Makefile
index 49f8ba1..e5539e1 100644
--- a/sys/modules/twa/Makefile
+++ b/sys/modules/twa/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 #
-# Copyright (c) 2004 Applied Micro Circuits Corporation.
+# Copyright (c) 2004-06 Applied Micro Circuits Corporation.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,31 +29,9 @@
 # 3ware driver for 9000 series storage controllers.
 #
 # Author: Vinod Kashyap
+# Modifications by: Adam Radford
 #
 
-
-
-#
-# In the line following this comment, a value of 0 on the right hand
-# side will not cause firmware to be bundled.  Change this value to 1
-# to bundle the firmware with the driver, which may be flashed onto
-# the controller, if the firmware on the controller is older than the
-# one bundled, and needs to be upgraded.  The size of the driver will
-# increase significantly (to over 500kB) if this option is selected.
-# Typically, the firmware image bundled (in tw_cl_fwimg.c) corresponds
-# to the latest controller architecture as of the date of the release.
-# If the firmware for an earlier controller architecture needs to be
-# flashed, the (older) driver with the appropriate firmware image
-# bundled can be downloaded from the 3ware website, used to flash the
-# firmware, and then the newer driver can be switched to.  Alternatively,
-# the appropriate firmware image (tw_cl_fwimg.c) from the older driver can
-# be used to re-build the newer driver.  In this case, the branch
-# (TWA_CURRENT_FW_BRANCH_*) and build (TWA_CURRENT_FW_BUILD_*) numbers for
-# the bundled firmware need to be appropriately updated in tw_cl_fwif.h
-# before building the driver.
-#
-TWA_FLASH_FIRMWARE?=0
-
 KMOD = twa
 .PATH: ${.CURDIR}/../../dev/${KMOD}
 SRCS=  tw_osl_freebsd.c tw_osl_cam.c \
@@ -66,9 +44,4 @@ SRCS=  tw_osl_freebsd.c tw_osl_cam.c \
 #CFLAGS+= -DTWA_DEBUG=0
 CFLAGS+= -I${.CURDIR}/../../dev/${KMOD}
 
-.if $(TWA_FLASH_FIRMWARE) != 0
-CFLAGS+= -DTWA_FLASH_FIRMWARE
-SRCS+= tw_cl_fwimg.c
-.endif
-
 .include <bsd.kmod.mk>