sym2 version 2.1.18n
PATCH 1/1 sym2 version 2.1.18n
sym2 version 2.1.18n:
- Prevent querying for DT clocking on a single ended bus
- Check the U3EN bit instead of the ULTRA3 bit
- Only use PPR if SDTR is incapable of negotiating the desired options or speed
- minsync bugfix (James Bottomley)
- Always calculate what negotiation to perform inside sym_prepare_nego()
- Delete unused SYM_OPT_HANDLE_IO_TIMEOUT and SYM_CONF_TIMEOUT_ORDER_MAX code (Christoph Hellwig)
- Use SCSI-3 message names instead of SCSI-2 names
- Remove private definitions of PCI IDs
- Reorganise DMA mask setup
- Fix comment tpyo
- Make some needlessly global code static (Adrian Bunk)
- Reorder some functions to eliminate predeclaration
- Use memset instead of bzero
- Consolidate and abstract SPARC's special IRQ printing
- Convert hcb_p to struct sym_hcb *
- Remove cam_ccb_p and cam_scsiio_p typedefs
- Treat PA-RISC firmware as if it were a type of NVRAM
drivers/scsi/sym53c8xx_2/sym_conf.h +0 -8
@@ -79,14 +79,6 @@/* #define SYM_CONF_IARB_SUPPORT */ /* -* Number of lists for the optimization of the IO timeout handling. -* Not used under FreeBSD and Linux. -*/ -#ifndef SYM_CONF_TIMEOUT_ORDER_MAX -#define SYM_CONF_TIMEOUT_ORDER_MAX (8) -#endif - -/* * Only relevant if IARB support configured. * - Max number of successive settings of IARB hints. * - Set IARB on arbitration lost.
drivers/scsi/sym53c8xx_2/sym_defs.h +7 -27
@@ -40,30 +40,10 @@#ifndef SYM_DEFS_H #define SYM_DEFS_H -#define SYM_VERSION "2.1.18m" +#define SYM_VERSION "2.1.18n"#define SYM_DRIVER_NAME "sym-" SYM_VERSION/* -* PCI device identifier of SYMBIOS chips. -*/ -#define PCI_ID_SYM53C810 PCI_DEVICE_ID_NCR_53C810 -#define PCI_ID_SYM53C810AP PCI_DEVICE_ID_LSI_53C810AP -#define PCI_ID_SYM53C815 PCI_DEVICE_ID_NCR_53C815 -#define PCI_ID_SYM53C820 PCI_DEVICE_ID_NCR_53C820 -#define PCI_ID_SYM53C825 PCI_DEVICE_ID_NCR_53C825 -#define PCI_ID_SYM53C860 PCI_DEVICE_ID_NCR_53C860 -#define PCI_ID_SYM53C875 PCI_DEVICE_ID_NCR_53C875 -#define PCI_ID_SYM53C875_2 PCI_DEVICE_ID_NCR_53C875J -#define PCI_ID_SYM53C885 PCI_DEVICE_ID_NCR_53C885 -#define PCI_ID_SYM53C895 PCI_DEVICE_ID_NCR_53C895 -#define PCI_ID_SYM53C896 PCI_DEVICE_ID_NCR_53C896 -#define PCI_ID_SYM53C895A PCI_DEVICE_ID_LSI_53C895A -#define PCI_ID_SYM53C875A PCI_DEVICE_ID_LSI_53C875A -#define PCI_ID_LSI53C1010_33 PCI_DEVICE_ID_LSI_53C1010_33 -#define PCI_ID_LSI53C1010_66 PCI_DEVICE_ID_LSI_53C1010_66 -#define PCI_ID_LSI53C1510D PCI_DEVICE_ID_LSI_53C1510 - -/* * SYM53C8XX device features descriptor. */ struct sym_pci_chip {
@@ -764,27 +744,27 @@ struct sym_tblsel {#define M_RESTORE_DP RESTORE_POINTERS#define M_DISCONNECT DISCONNECT#define M_ID_ERROR INITIATOR_ERROR -#define M_ABORT ABORT +#define M_ABORT ABORT_TASK_SET#define M_REJECT MESSAGE_REJECT#define M_NOOP NOP#define M_PARITY MSG_PARITY_ERROR#define M_LCOMPLETE LINKED_CMD_COMPLETE#define M_FCOMPLETE LINKED_FLG_CMD_COMPLETE -#define M_RESET BUS_DEVICE_RESET -#define M_ABORT_TAG (0x0d) -#define M_CLEAR_QUEUE (0x0e) +#define M_RESET TARGET_RESET +#define M_ABORT_TAG ABORT_TASK +#define M_CLEAR_QUEUE CLEAR_TASK_SET#define M_INIT_REC INITIATE_RECOVERY#define M_REL_REC RELEASE_RECOVERY#define M_TERMINATE (0x11)#define M_SIMPLE_TAG SIMPLE_QUEUE_TAG#define M_HEAD_TAG HEAD_OF_QUEUE_TAG#define M_ORDERED_TAG ORDERED_QUEUE_TAG -#define M_IGN_RESIDUE (0x23) +#define M_IGN_RESIDUE IGNORE_WIDE_RESIDUE#define M_X_MODIFY_DP EXTENDED_MODIFY_DATA_POINTER#define M_X_SYNC_REQ EXTENDED_SDTR#define M_X_WIDE_REQ EXTENDED_WDTR -#define M_X_PPR_REQ (0x04) +#define M_X_PPR_REQ EXTENDED_PPR/* * PPR protocol options
drivers/scsi/sym53c8xx_2/sym_fw.c +2 -2
@@ -223,13 +223,13 @@ sym_fw2_patch(struct sym_hcb *np)* Remove a couple of work-arounds specific to C1010 if * they are not desirable. See `sym_fw2.h' for more details. */ -if (!(np->device_id ==PCI_ID_LSI53C1010_66 && +if (!(np->device_id ==PCI_DEVICE_ID_LSI_53C1010_66 && np->revision_id <0x1 && np->pciclk_khz <60000 )) { scripta0->datao_phase[0 ] =cpu_to_scr (SCR_NO_OP ); scripta0->datao_phase[1 ] =cpu_to_scr (0 ); } -if (!(np->device_id ==PCI_ID_LSI53C1010_33 && +if (!(np->device_id ==PCI_DEVICE_ID_LSI_53C1010_33 &&/* np->revision_id < 0xff */ 1 )) { scripta0->sel_done[0 ] =cpu_to_scr (SCR_NO_OP ); scripta0->sel_done[1 ] =cpu_to_scr (0 );
drivers/scsi/sym53c8xx_2/sym_glue.c +30 -53
156 lines not on this page · raw message
drivers/scsi/sym53c8xx_2/sym_glue.h +9 -25
@@ -58,13 +58,6 @@#include <scsi/scsi_device.h> #include <scsi/scsi_host.h> -#ifndef bzero -#define bzero (d, n) memset((d), 0, (n)) -#endif - -/* -* General driver includes. -*/ #include "sym_conf.h" #include "sym_defs.h" #include "sym_misc.h"
@@ -123,14 +116,6 @@typedef struct sym_tcb *tcb_p ;typedef struct sym_lcb *lcb_p ;typedef struct sym_ccb *ccb_p ; -typedef struct sym_hcb *hcb_p ; - -/* -* Define a reference to the O/S dependent IO request. -*/ -typedef struct scsi_cmnd *cam_ccb_p ;/* Generic */ -typedef struct scsi_cmnd *cam_scsiio_p ;/* SCSI I/O */ -/* * IO functions definition for big/little endian CPU support.
@@ -525,7 +510,7 @@ sym_get_cam_status(struct scsi_cmnd *ccb/* * Async handler for negotiations. */ -void sym_xpt_async_nego_wide (hcb_p np,int target); +void sym_xpt_async_nego_wide (struct sym_hcb *np,int target);#define sym_xpt_async_nego_sync (np, target) \ sym_announce_transfer_rate(np, target)#define sym_xpt_async_nego_ppr (np, target) \
@@ -534,14 +519,14 @@ void sym_xpt_async_nego_wide(hcb_p np, i/* * Build CAM result for a successful IO and for a failed IO. */ -static __inlinevoid sym_set_cam_result_ok (hcb_p np,ccb_p cp,int resid) +static __inlinevoid sym_set_cam_result_ok (struct sym_hcb *np,ccb_p cp,int resid) {struct scsi_cmnd *cmd = cp->cam_ccb; cmd->resid = resid; cmd->result = (((DID_OK ) <<16 ) + ((cp->ssss_status) &0x7f )); } -void sym_set_cam_result_error (hcb_p np,ccb_p cp,int resid); +void sym_set_cam_result_error (struct sym_hcb *np,ccb_p cp,int resid);/* * Other O/S specific methods.
@@ -549,13 +534,12 @@ void sym_set_cam_result_error(hcb_p np,#define sym_cam_target_id (ccb) (ccb)->target#define sym_cam_target_lun (ccb) (ccb)->lun#define sym_freeze_cam_ccb (ccb) do { ; } while (0) -void sym_xpt_done (hcb_p np,cam_ccb_p ccb); -void sym_xpt_done2 (hcb_p np,cam_ccb_p ccb,int cam_status); +void sym_xpt_done (struct sym_hcb *np,struct scsi_cmnd *ccb);void sym_print_addr (ccb_p cp); -void sym_xpt_async_bus_reset (hcb_p np); -void sym_xpt_async_sent_bdr (hcb_p np,int target); -int sym_setup_data_and_start (hcb_p np,cam_scsiio_p csio,ccb_p cp); -void sym_log_bus_error (hcb_p np); -void sym_sniff_inquiry (hcb_p np,struct scsi_cmnd *cmd,int resid); +void sym_xpt_async_bus_reset (struct sym_hcb *np); +void sym_xpt_async_sent_bdr (struct sym_hcb *np,int target); +int sym_setup_data_and_start (struct sym_hcb *np,struct scsi_cmnd *csio,ccb_p cp); +void sym_log_bus_error (struct sym_hcb *np); +void sym_sniff_inquiry (struct sym_hcb *np,struct scsi_cmnd *cmd,int resid);#endif /* SYM_GLUE_H */
drivers/scsi/sym53c8xx_2/sym_hipd.c +193 -276
1,140 lines not on this page · raw message
drivers/scsi/sym53c8xx_2/sym_hipd.h +22 -50
125 lines not on this page · raw message
drivers/scsi/sym53c8xx_2/sym_malloc.c +1 -1
@@ -170,7 +170,7 @@ static void *__sym_calloc2(m_pool_p mp, }if (p) -bzero (p, size); +memset (p,0 , size);else if (uflags &SYM_MEM_WARN )printf ("__sym_calloc2: failed to allocate %s[%d]\n" , name, size);return p;
drivers/scsi/sym53c8xx_2/sym_misc.c +1 -97
110 lines not on this page · raw message
drivers/scsi/sym53c8xx_2/sym_nvram.c +38 -1
@@ -68,6 +68,21 @@ void sym_nvram_setup_host(struct sym_hcbcase SYM_TEKRAM_NVRAM : np->myaddr = nvram->data.Tekram.host_id &0x0f ;break ; +#ifdef CONFIG_PARISC +case SYM_PARISC_PDC : +if (nvram->data.parisc.host_id !=-1 ) + np->myaddr = nvram->data.parisc.host_id; +if (nvram->data.parisc.factor !=-1 ) + np->minsync = nvram->data.parisc.factor; +if (nvram->data.parisc.width !=-1 ) + np->maxwide = nvram->data.parisc.width; +switch (nvram->data.parisc.mode) { +case 0 : np->scsi_mode =SMODE_SE ;break ; +case 1 : np->scsi_mode =SMODE_HVD ;break ; +case 2 : np->scsi_mode =SMODE_LVD ;break ; +default :break ; + } +#endif default :break ; }
@@ -702,6 +717,28 @@ static int sym_read_Tekram_nvram (structreturn 0 ; } +#ifdef CONFIG_PARISC +/* +* Host firmware (PDC) keeps a table for altering SCSI capabilities. +* Many newer machines export one channel of 53c896 chip as SE, 50-pin HD. +* Also used for Multi-initiator SCSI clusters to set the SCSI Initiator ID. +*/ +static int sym_read_parisc_pdc (struct sym_device *np,struct pdc_initiator *pdc) +{ +struct hardware_path hwpath; +get_pci_node_path (np->pdev, &hwpath); +if (!pdc_get_initiator (&hwpath, pdc)) +return 0 ; + +return SYM_PARISC_PDC ; +} +#else +static int sym_read_parisc_pdc (struct sym_device *np,struct pdc_initiator *x) +{ +return 0 ; +} +#endif +/* * Try reading Symbios or Tekram NVRAM */
@@ -714,7 +751,7 @@ int sym_read_nvram(struct sym_device *np nvp->type =SYM_TEKRAM_NVRAM ;sym_display_Tekram_nvram (np, &nvp->data.Tekram); }else { - nvp->type =0 ; + nvp->type =sym_read_parisc_pdc (np, &nvp->data.parisc); }return nvp->type; }
drivers/scsi/sym53c8xx_2/sym_nvram.h +6 -0
@@ -171,6 +171,10 @@ struct Tekram_nvram {typedef struct Tekram_nvram Tekram_nvram ;typedef struct Tekram_target Tekram_target ; +#ifndef CONFIG_PARISC +struct pdc_initiator {int dummy; }; +#endif +/* * Union of supported NVRAM formats. */
@@ -178,10 +182,12 @@ struct sym_nvram {int type;#define SYM_SYMBIOS_NVRAM (1)#define SYM_TEKRAM_NVRAM (2) +#define SYM_PARISC_PDC (3)#if SYM_CONF_NVRAM_SUPPORT union {Symbios_nvram Symbios;Tekram_nvram Tekram; +struct pdc_initiator parisc; } data;#endif };
Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain