Menu
▾
▴
[Linux-mips-commits]CVS: linux/drivers/scsi Config.in,1.1.1.1,1.2 dec_esp.c,1.1.1.1,1.2 ncr53c8xx.c,1.1,1.2 sym53c8xx_defs.h,1.1.1.1,1.2
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/scsi
Modified Files:
Config.in dec_esp.c ncr53c8xx.c sym53c8xx_defs.h
Log Message:
Sync to 2.4.7
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/Config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Config.in 2001/06/22 02:29:32 1.1.1.1
--- Config.in 2001/08/25 02:19:28 1.2
***************
*** 102,106 ****
fi
if [ "$CONFIG_X86" = "y" ]; then
! dep_tristate 'IBM ServeRAID support' CONFIG_SCSI_IPS $CONFIG_SCSI
fi
dep_tristate 'Initio 9100U(W) support' CONFIG_SCSI_INITIO $CONFIG_SCSI $CONFIG_PCI
--- 102,106 ----
fi
if [ "$CONFIG_X86" = "y" ]; then
! dep_tristate 'IBM ServeRAID support' CONFIG_SCSI_IPS $CONFIG_SCSI $CONFIG_PCI
fi
dep_tristate 'Initio 9100U(W) support' CONFIG_SCSI_INITIO $CONFIG_SCSI $CONFIG_PCI
***************
*** 197,200 ****
--- 197,224 ----
if [ "$CONFIG_MIPS_JAZZ" = "y" ]; then
bool 'MIPS JAZZ FAS216 SCSI support' CONFIG_JAZZ_ESP
+ fi
+
+ if [ "$CONFIG_AMIGA" = "y" ]; then
+ dep_tristate 'A3000 WD33C93A support' CONFIG_A3000_SCSI $CONFIG_SCSI
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ bool 'A4000T SCSI support (EXPERIMENTAL)' CONFIG_A4000T_SCSI
+ fi
+ fi
+ if [ "$CONFIG_ZORRO" = "y" ]; then
+ dep_tristate 'A2091/A590 WD33C93A support' CONFIG_A2091_SCSI $CONFIG_SCSI
+ dep_tristate 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI $CONFIG_SCSI
+ dep_tristate 'CyberStorm SCSI support' CONFIG_CYBERSTORM_SCSI $CONFIG_SCSI
+ dep_tristate 'CyberStorm Mk II SCSI support' CONFIG_CYBERSTORMII_SCSI $CONFIG_SCSI
+ dep_tristate 'Blizzard 2060 SCSI support' CONFIG_BLZ2060_SCSI $CONFIG_SCSI
+ dep_tristate 'Blizzard 1230IV/1260 SCSI support' CONFIG_BLZ1230_SCSI $CONFIG_SCSI
+ dep_tristate 'Fastlane SCSI support' CONFIG_FASTLANE_SCSI $CONFIG_SCSI
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ bool 'A4091 SCSI support (EXPERIMENTAL)' CONFIG_A4091_SCSI
+ bool 'WarpEngine SCSI support (EXPERIMENTAL)' CONFIG_WARPENGINE_SCSI
+ bool 'Blizzard PowerUP 603e+ SCSI (EXPERIMENTAL)' CONFIG_BLZ603EPLUS_SCSI
+ dep_tristate 'BSC Oktagon SCSI support (EXPERIMENTAL)' CONFIG_OKTAGON_SCSI $CONFIG_SCSI
+ # bool 'Cyberstorm Mk III SCSI support (EXPERIMENTAL)' CONFIG_CYBERSTORMIII_SCSI
+ # bool 'GVP Turbo 040/060 SCSI support (EXPERIMENTAL)' CONFIG_GVP_TURBO_SCSI
+ fi
fi
Index: dec_esp.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/dec_esp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dec_esp.c 2001/06/22 02:29:32 1.1.1.1
--- dec_esp.c 2001/08/25 02:19:28 1.2
***************
*** 189,198 ****
esp_initialize(esp);
! if (request_irq(esp->irq, esp_intr, SA_INTERRUPT,
! "NCR 53C94 SCSI", NULL))
! goto err_dealloc;
! if (request_irq(SCSI_DMA_INT, scsi_dma_int, SA_INTERRUPT,
! "JUNKIO SCSI DMA", NULL))
! goto err_free_irq;
}
--- 189,198 ----
esp_initialize(esp);
! if (request_irq(esp->irq, esp_intr, SA_INTERRUPT,
! "NCR 53C94 SCSI", NULL))
! goto err_dealloc;
! if (request_irq(SCSI_DMA_INT, scsi_dma_int, SA_INTERRUPT,
! "JUNKIO SCSI DMA", NULL))
! goto err_free_irq;
}
Index: ncr53c8xx.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/ncr53c8xx.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ncr53c8xx.c 2001/07/09 21:55:49 1.1
--- ncr53c8xx.c 2001/08/25 02:19:28 1.2
***************
*** 104,108 ****
** Name and version of the driver
*/
! #define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3-20010212"
#define SCSI_NCR_DEBUG_FLAGS (0)
--- 104,108 ----
** Name and version of the driver
*/
! #define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3b-20010512"
#define SCSI_NCR_DEBUG_FLAGS (0)
***************
*** 3088,3092 ****
/*
! ** Print something which allows to retrieve the controler type, unit,
** target, lun concerned by a kernel message.
*/
--- 3088,3092 ----
/*
! ** Print something which allows to retrieve the controller type, unit,
** target, lun concerned by a kernel message.
*/
***************
*** 4325,4329 ****
**----------------------------------------------------
*/
! #if 0 /* This stuff was only usefull for linux-1.2.13 */
if (lp && !lp->numtags && cmd->device && cmd->device->tagged_queue) {
lp->numtags = tp->usrtags;
--- 4325,4329 ----
**----------------------------------------------------
*/
! #if 0 /* This stuff was only useful for linux-1.2.13 */
if (lp && !lp->numtags && cmd->device && cmd->device->tagged_queue) {
lp->numtags = tp->usrtags;
***************
*** 5727,5731 ****
fak = (kpc - 1) / div_10M[div] + 1;
! #if 0 /* This optimization does not seem very usefull */
per = (fak * div_10M[div]) / clk;
--- 5727,5731 ----
fak = (kpc - 1) / div_10M[div] + 1;
! #if 0 /* This optimization does not seem very useful */
per = (fak * div_10M[div]) / clk;
***************
*** 6673,6677 ****
/*
! ** The data in the dma fifo has not been transfered to
** the target -> add the amount to the rest
** and clear the data.
--- 6673,6677 ----
/*
! ** The data in the dma fifo has not been transferred to
** the target -> add the amount to the rest
** and clear the data.
***************
*** 7183,7187 ****
**
** We try to negotiate sync and wide transfer only after
! ** a successfull inquire command. We look at byte 7 of the
** inquire data to determine the capabilities of the target.
**
--- 7183,7187 ----
**
** We try to negotiate sync and wide transfer only after
! ** a successful inquire command. We look at byte 7 of the
** inquire data to determine the capabilities of the target.
**
***************
*** 7580,7584 ****
**
**
! ** Aquire a control block
**
**
--- 7580,7584 ----
**
**
! ** Acquire a control block
**
**
Index: sym53c8xx_defs.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/sym53c8xx_defs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sym53c8xx_defs.h 2001/06/22 02:29:32 1.1.1.1
--- sym53c8xx_defs.h 2001/08/25 02:19:28 1.2
***************
*** 173,178 ****
/*
! * Use normal IO if configured. Forced for alpha and powerpc.
! * Powerpc fails copying to on-chip RAM using memcpy_toio().
*/
#if defined(CONFIG_SCSI_NCR53C8XX_IOMAPPED)
--- 173,177 ----
/*
! * Use normal IO if configured. Forced for alpha.
*/
#if defined(CONFIG_SCSI_NCR53C8XX_IOMAPPED)
***************
*** 181,186 ****
--- 180,187 ----
#define SCSI_NCR_IOMAPPED
#elif defined(__powerpc__)
+ #if LINUX_VERSION_CODE <= LinuxVersionCode(2,4,3)
#define SCSI_NCR_IOMAPPED
#define SCSI_NCR_PCI_MEM_NOT_SUPPORTED
+ #endif
#elif defined(__sparc__)
#undef SCSI_NCR_IOMAPPED
***************
*** 748,752 ****
#define FE_LDSTR (1<<13) /* Load/Store supported */
#define FE_RAM (1<<14) /* On chip RAM present */
! #define FE_VARCLK (1<<15) /* SCSI lock may vary */
#define FE_RAM8K (1<<16) /* On chip RAM sized 8Kb */
#define FE_64BIT (1<<17) /* Have a 64-bit PCI interface */
--- 749,753 ----
#define FE_LDSTR (1<<13) /* Load/Store supported */
#define FE_RAM (1<<14) /* On chip RAM present */
! #define FE_VARCLK (1<<15) /* SCSI clock may vary */
#define FE_RAM8K (1<<16) /* On chip RAM sized 8Kb */
#define FE_64BIT (1<<17) /* Have a 64-bit PCI interface */
***************
*** 758,761 ****
--- 759,763 ----
#define FE_66MHZ (1<<23) /* 66MHz PCI Support */
#define FE_DAC (1<<24) /* Support DAC cycles (64 bit addressing) */
+ #define FE_ISTAT1 (1<<25) /* Have ISTAT1, MBOX0, MBOX1 registers */
#define FE_CACHE_SET (FE_ERL|FE_CLSE|FE_WRIE|FE_ERMP)
***************
*** 822,826 ****
{PCI_DEVICE_ID_NCR_53C896, 0xff, "896", 6, 31, 7, \
FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
! FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC} \
, \
{PCI_DEVICE_ID_NCR_53C895A, 0xff, "895a", 6, 31, 7, \
--- 824,828 ----
{PCI_DEVICE_ID_NCR_53C896, 0xff, "896", 6, 31, 7, \
FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
! FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ISTAT1} \
, \
{PCI_DEVICE_ID_NCR_53C895A, 0xff, "895a", 6, 31, 7, \
***************
*** 837,845 ****
, \
{PCI_DEVICE_ID_LSI_53C1010, 0xff, "1010-33", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3} \
, \
{PCI_DEVICE_ID_LSI_53C1010_66, 0xff, "1010-66", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3| \
FE_66MHZ} \
--- 839,847 ----
, \
{PCI_DEVICE_ID_LSI_53C1010, 0xff, "1010-33", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN|FE_ISTAT1| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3} \
, \
{PCI_DEVICE_ID_LSI_53C1010_66, 0xff, "1010-66", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN|FE_ISTAT1| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3| \
FE_66MHZ} \
***************
*** 1193,1199 ****
#define DIP 0x01 /* sta: host/script interrupt */
! /*15*/ u_char nc_istat1; /* 896 only */
! /*16*/ u_char nc_mbox0; /* 896 only */
! /*17*/ u_char nc_mbox1; /* 896 only */
/*18*/ u_char nc_ctest0;
--- 1195,1205 ----
#define DIP 0x01 /* sta: host/script interrupt */
! /*15*/ u_char nc_istat1; /* 896 and later cores only */
! #define FLSH 0x04 /* sta: chip is flushing */
! #define SRUN 0x02 /* sta: scripts are running */
! #define SIRQD 0x01 /* r/w: disable INT pin */
!
! /*16*/ u_char nc_mbox0; /* 896 and later cores only */
! /*17*/ u_char nc_mbox1; /* 896 and later cores only */
/*18*/ u_char nc_ctest0;
|
