Sync up drivers/scsi/aic7xxx

@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#34 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#35 $
  */
 
 #ifdef __linux__

@@ -64,7 +64,7 @@
 static int aic7770_resume(struct ahc_softc *ahc);
 static int aha2840_load_seeprom(struct ahc_softc *ahc);
 static ahc_device_setup_t ahc_aic7770_VL_setup;
-static ahc_device_setup_t ahc_aic7770_EISA_setup;;
+static ahc_device_setup_t ahc_aic7770_EISA_setup;
 static ahc_device_setup_t ahc_aic7770_setup;
 
 struct aic7770_identity aic7770_ident_table[] =

@@ -36,7 +36,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7770_osm.c#19 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7770_osm.c#20 $
  */
 
 #include "aic7xxx_osm.h"

@@ -151,10 +151,8 @@
 ahc_linux_eisa_exit(void)
 {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-	if (aic7xxx_probe_eisa_vl == 0)
-		return;
-
-	if (aic7770_driver.id_table != NULL) {
+	if (aic7xxx_probe_eisa_vl != 0
+	 && aic7770_driver.id_table != NULL) {
 		eisa_driver_unregister(&aic7770_driver);
 		free(aic7770_driver.id_table, M_DEVBUF);
 	}

@@ -1,7 +1,7 @@
 /*
  * Core definitions and data structures shareable across OS platforms.
  *
- * Copyright (c) 1994-2002 Justin T. Gibbs.
+ * Copyright (c) 1994-2001 Justin T. Gibbs.
  * Copyright (c) 2000-2002 Adaptec Inc.
  * All rights reserved.
  *

@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#108 $
  *
  * $FreeBSD$
  */

122 lines not on this page · raw message

@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#57 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#58 $
  *
  * $FreeBSD$
  */

@@ -1,7 +1,7 @@
 /*
  * Adaptec AIC79xx device driver for Linux.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#209 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#213 $
  *
  * --------------------------------------------------------------------------
  * Copyright (c) 1994-2000 Justin T. Gibbs.

@@ -430,7 +430,7 @@
  */
 static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n";
 
-MODULE_AUTHOR("Maintainer: Justin T. Gibbs <[email protected]>");
+MODULE_AUTHOR("Maintainer: Luben Tuikov <[email protected]>");
 MODULE_DESCRIPTION("Adaptec Aic790X U320 SCSI Host Bus Adapter driver");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("Dual BSD/GPL");

@@ -778,6 +778,7 @@
 	sprintf(current->comm, "ahd_recovery_%d", ahd->unit);
 #else
 	daemonize("ahd_recovery_%d", ahd->unit);
+	current->flags |= PF_FREEZE;
 #endif
 	unlock_kernel();
 

@@ -968,11 +969,9 @@
 	 */
 	ahd_list_lockinit();
 
-#ifdef CONFIG_PCI
 	ahd_init_status = ahd_linux_pci_init();
 	if (ahd_init_status != 0)
 		goto done;
-#endif
 
 	/*
 	 * Register with the SCSI layer all

@@ -2022,6 +2021,7 @@
 	host->max_id = (ahd->features & AHD_WIDE) ? 16 : 8;
 	host->max_lun = AHD_NUM_LUNS;
 	host->max_channel = 0;
+	host->max_cmd_len = MAX_CDB_LEN;
 	host->sg_tablesize = AHD_NSEG;
 	ahd_set_unit(ahd, ahd_linux_next_unit());
 	sprintf(buf, "scsi%d", host->host_no);

@@ -2543,6 +2543,7 @@
 	sprintf(current->comm, "ahd_dv_%d", ahd->unit);
 #else
 	daemonize("ahd_dv_%d", ahd->unit);
+	current->flags |= PF_FREEZE;
 #endif
 	unlock_kernel();
 

@@ -4071,10 +4072,11 @@
 
 		if ((dev->flags & (AIC_DEV_Q_TAGGED|AIC_DEV_Q_BASIC)) != 0) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-			int	msg_bytes;
+			int	msg_bytes = 0;
 			uint8_t tag_msgs[2];
 
-			msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
+			if (cmd->request)
+				msg_bytes =scsi_populate_tag_msg(cmd,tag_msgs);
 			if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
 				hscb->control |= tag_msgs[0];
 				if (tag_msgs[0] == MSG_ORDERED_TASK)

@@ -36,7 +36,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#161 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#164 $
  *
  */
 #ifndef _AIC79XX_LINUX_H_

@@ -94,7 +94,7 @@
 #include <linux/smp.h>
 #endif
 
-#define AIC79XX_DRIVER_VERSION "2.0.10"
+#define AIC79XX_DRIVER_VERSION "2.0.13"
 
 /********************* Definitions Required by the Core ***********************/
 /*

@@ -2,7 +2,7 @@
  * Product specific probe and attach routines for:
  *	aic7901 and aic7902 SCSI controllers
  *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
+ * Copyright (c) 1994-2000 Justin T. Gibbs.
  * Copyright (c) 2000-2002 Adaptec Inc.
  * All rights reserved.
  *

@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#88 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#89 $
  */
 
 #ifdef __linux__

@@ -1,7 +1,7 @@
 /*
  * Adaptec AIC7xxx device driver for Linux.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#271 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#276 $
  *
  * Copyright (c) 1994 John Aycock
  *   The University of Calgary Department of Computer Science.

@@ -450,7 +450,7 @@
  */
 static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n";
 
-MODULE_AUTHOR("Maintainer: Justin T. Gibbs <[email protected]>");
+MODULE_AUTHOR("Maintainer: Luben Tuikov <[email protected]>");
 MODULE_DESCRIPTION("Adaptec Aic77XX/78XX SCSI Host Bus Adapter driver");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("Dual BSD/GPL");

@@ -793,6 +793,7 @@
 	sprintf(current->comm, "ahc_recovery_%d", ahc->unit);
 #else
 	daemonize("ahc_recovery_%d", ahc->unit);
+	current->flags |= PF_FREEZE;
 #endif
 	unlock_kernel();
 

@@ -979,23 +980,18 @@
 	 */
 	ahc_list_lockinit();
 
-#ifdef CONFIG_PCI
 	ahc_init_status = ahc_linux_pci_init();
 	if (ahc_init_status != 0)
 		goto done;
-#endif
 
-#ifdef CONFIG_EISA
 	ahc_init_status = ahc_linux_eisa_init();
 	if (ahc_init_status != 0)
 		goto done;
-#endif
 
 	/*
 	 * Register with the SCSI layer all
 	 * controllers we've found.
 	 */
-	found = 0;
 	TAILQ_FOREACH(ahc, &ahc_tailq, links) {
 
 		if (ahc_linux_register_host(ahc, template) == 0)

@@ -1672,6 +1668,7 @@
 	host->max_id = (ahc->features & AHC_WIDE) ? 16 : 8;
 	host->max_lun = AHC_NUM_LUNS;
 	host->max_channel = (ahc->features & AHC_TWIN) ? 1 : 0;
+	host->max_cmd_len = MAX_CDB_LEN;
 	host->sg_tablesize = AHC_NSEG;
 	ahc_set_unit(ahc, ahc_linux_next_unit());
 	sprintf(buf, "scsi%d", host->host_no);

@@ -2265,6 +2262,7 @@
 	sprintf(current->comm, "ahc_dv_%d", ahc->unit);
 #else
 	daemonize("ahc_dv_%d", ahc->unit);
+	current->flags |= PF_FREEZE;
 #endif
 	unlock_kernel();
 

@@ -5303,12 +5301,8 @@
 	 */
 	scsi_unregister_module(MODULE_SCSI_HA, &aic7xxx_driver_template);
 #endif
-#ifdef CONFIG_PCI
 	ahc_linux_pci_exit();
-#endif
-#ifdef CONFIG_EISA
 	ahc_linux_eisa_exit();
-#endif
 	aic_remove_sysrq(ahc_sysrq_key, &ahc_sysrq_op);
 }
 

@@ -53,7 +53,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#172 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#176 $
  *
  */
 #ifndef _AIC7XXX_LINUX_H_

@@ -113,7 +113,7 @@
 #include <linux/smp.h>
 #endif
 
-#define AIC7XXX_DRIVER_VERSION "6.3.8"
+#define AIC7XXX_DRIVER_VERSION "6.3.10"
 
 /********************* Definitions Required by the Core ***********************/
 /*

@@ -255,6 +255,9 @@
 int			 aic7770_map_registers(struct ahc_softc *ahc,
 					       u_int port);
 int			 aic7770_map_int(struct ahc_softc *ahc, u_int irq);
+#else
+#define	ahc_linux_eisa_init() (0)
+#define	ahc_linux_eisa_exit() while(0)
 #endif
 
 /******************************* PCI Routines *********************************/

@@ -263,6 +266,9 @@
 void			 ahc_linux_pci_exit(void);
 int			 ahc_pci_map_registers(struct ahc_softc *ahc);
 int			 ahc_pci_map_int(struct ahc_softc *ahc);
+#else
+#define	ahc_linux_pci_init() (0)
+#define	ahc_linux_pci_exit() while(0)
 #endif
 
 /**************************** Proc FS Support *********************************/

@@ -36,7 +36,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c#56 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c#57 $
  */
 
 #include "aic7xxx_osm.h"

@@ -321,11 +321,12 @@
 	if (maddr == NULL) {
 
 		error = ahc_linux_pci_reserve_io_region(ahc, &base);
+		ahc->tag = BUS_SPACE_PIO;
+		ahc->bsh.ioport = base;
 		if (error == 0 && ahc_pci_test_register_access(ahc) == 0) {
-			ahc->tag = BUS_SPACE_PIO;
-			ahc->bsh.ioport = base;
 			command |= PCIM_CMD_PORTEN;
 		} else {
+			ahc->bsh.ioport = 0;
 			printf("aic7xxx: PCI%d:%d:%d IO region 0x%lx[0..255] "
 			       "unavailable. Cannot map device.\n",
 			       aic_get_pci_bus(ahc->dev_softc),

@@ -3,7 +3,7 @@
  *      3940, 2940, aic7895, aic7890, aic7880,
  *	aic7870, aic7860 and aic7850 SCSI controllers
  *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
+ * Copyright (c) 1994-2000 Justin T. Gibbs.
  * Copyright (c) 2000-2001 Adaptec Inc.
  * All rights reserved.
  *

@@ -39,7 +39,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#78 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#79 $
  */
 
 #ifdef __linux__

@@ -1519,8 +1519,10 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 	aic_set_dma_mask(aic, aic->platform_data->hw_dma_mask);
 #endif
-	if (*vaddr == NULL)
+	if (*vaddr == NULL) {
+		free(map, M_DEVBUF);
 		return (ENOMEM);
+	}
 	*mapp = map;
 	return(0);
 }

@@ -76,7 +76,11 @@
 #include <linux/blkdev.h>
 
 #include "scsi.h"
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,6)
+#include <scsi/scsi_host.h>
+#else
 #include "hosts.h"
+#endif
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD