Advansys updates 2007-09-09
Subsystems (3)
cover Advansys updates 2007-09-09
Here's another mammoth patch series for the advansys driver against scsi-misc. I've tested that it compiles at each stage and that the final result works.
Some important parts to note:
1/22 Essential bugfix. Please apply ASAP.
4/22 Reformat microcode. Boring and large. 6,7,8,9/22 Remove internal queueing from driver
11/22 Allow advansys to accept 16-byte commands for wide boards 13/22 Remove some custom wrappers
15/22 Add DRV_NAME
16/22 Eliminate prototypes. Boring and large.
19/22 Fix simultaneous calls to ->queuecommand
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
PATCH 1/22 advansys: Fix VLB driver name
You can't have two drivers for the same bus type with the same name. Since ISA and VLB are both isa_drivers, rename the VLB one to advansys_vlb.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/advansys.c +1 -1
@@ -16985,7 +16985,7 @@ static struct isa_driver advansys_vlb_driver = { .remove = __devexit_p(advansys_isa_remove), .driver = { .owner = THIS_MODULE, - .name = "advansys", + .name = "advansys_vlb", }, };
Signature · 1 line
1.5.2.4
PATCH 2/22 advansys: Create AdvBuildCarrierFreelist
In reply to Matthew WilcoxSplit AdvBuildCarrierFreelist out of AdvInitAsc3550Driver, AdvInitAsc38C0800Driver and AdvInitAsc38C1600Driver.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 219 +++++++++++----------------------------------- 1 files changed, 53 insertions(+), 166 deletions(-)
drivers/scsi/advansys.c +53 -166
@@ -12881,6 +12881,56 @@ AdvInitGetConfig(struct pci_dev *pdev, ADV_DVC_VAR *asc_dvc)return warn_code; } +static void AdvBuildCarrierFreelist (struct adv_dvc_var *asc_dvc) +{ +ADV_CARR_T *carrp; +ADV_SDCNT buf_size; +ADV_PADDR carr_paddr; + +BUG_ON (!asc_dvc->carrier_buf); + + carrp = (ADV_CARR_T *)ADV_16BALIGN (asc_dvc->carrier_buf); + asc_dvc->carr_freelist =NULL ; +if (carrp == asc_dvc->carrier_buf) { + buf_size =ADV_CARRIER_BUFSIZE ; + }else { + buf_size =ADV_CARRIER_BUFSIZE -sizeof (ADV_CARR_T ); + } + +do { +/* Get physical address of the carrier 'carrp'. */ +ADV_DCNT contig_len =sizeof (ADV_CARR_T ); + carr_paddr =cpu_to_le32 (DvcGetPhyAddr (asc_dvc,NULL , + (uchar *)carrp, + (ADV_SDCNT *)&contig_len, +ADV_IS_CARRIER_FLAG )); + + buf_size -=sizeof (ADV_CARR_T ); + +/* +* If the current carrier is not physically contiguous, then +* maybe there was a page crossing. Try the next carrier +* aligned start address. +*/ +if (contig_len <sizeof (ADV_CARR_T )) { + carrp++; +continue ; + } + + carrp->carr_pa = carr_paddr; + carrp->carr_va =cpu_to_le32 (ADV_VADDR_TO_U32 (carrp)); + +/* +* Insert the carrier at the beginning of the freelist. +*/ + carrp->next_vpa = +cpu_to_le32 (ADV_VADDR_TO_U32 (asc_dvc->carr_freelist)); + asc_dvc->carr_freelist = carrp; + + carrp++; + }while (buf_size >0 ); +} +/* * Initialize the ASC-3550. *
@@ -12902,10 +12952,6 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc)int word;int j;int adv_asc3550_expanded_size; -ADV_CARR_T *carrp; -ADV_DCNT contig_len; -ADV_SDCNT buf_size; -ADV_PADDR carr_paddr;int i;ushort scsi_cfg1;uchar tid;
@@ -13307,57 +13353,7 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc)AdvWriteWordLram (iop_base,ASC_MC_DEFAULT_SEL_MASK ,ADV_TID_TO_TIDMASK (asc_dvc->chip_scsi_id)); -/* -* Build carrier freelist. -* -* Driver must have already allocated memory and set 'carrier_buf'. -*/ -ASC_ASSERT (asc_dvc->carrier_buf !=NULL ); - - carrp = (ADV_CARR_T *)ADV_16BALIGN (asc_dvc->carrier_buf); - asc_dvc->carr_freelist =NULL ; -if (carrp == (ADV_CARR_T *) asc_dvc->carrier_buf) { - buf_size =ADV_CARRIER_BUFSIZE ; - }else { - buf_size =ADV_CARRIER_BUFSIZE -sizeof (ADV_CARR_T ); - } - -do { -/* -* Get physical address of the carrier 'carrp'. -*/ - contig_len =sizeof (ADV_CARR_T ); - carr_paddr = -cpu_to_le32 (DvcGetPhyAddr - (asc_dvc,NULL , (uchar *)carrp, - (ADV_SDCNT *)&contig_len, -ADV_IS_CARRIER_FLAG )); - - buf_size -=sizeof (ADV_CARR_T ); - -/* -* If the current carrier is not physically contiguous, then -* maybe there was a page crossing. Try the next carrier aligned -* start address. -*/ -if (contig_len <sizeof (ADV_CARR_T )) { - carrp++; -continue ; - } - - carrp->carr_pa = carr_paddr; - carrp->carr_va =cpu_to_le32 (ADV_VADDR_TO_U32 (carrp)); - -/* -* Insert the carrier at the beginning of the freelist. -*/ - carrp->next_vpa = -cpu_to_le32 (ADV_VADDR_TO_U32 (asc_dvc->carr_freelist)); - asc_dvc->carr_freelist = carrp; - - carrp++; - } -while (buf_size >0 ); +AdvBuildCarrierFreelist (asc_dvc);/* * Set-up the Host->RISC Initiator Command Queue (ICQ).
@@ -13471,10 +13467,6 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)int word;int j;int adv_asc38C0800_expanded_size; -ADV_CARR_T *carrp; -ADV_DCNT contig_len; -ADV_SDCNT buf_size; -ADV_PADDR carr_paddr;int i;ushort scsi_cfg1;uchar byte;
@@ -13920,57 +13912,7 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)AdvWriteWordLram (iop_base,ASC_MC_DEFAULT_SEL_MASK ,ADV_TID_TO_TIDMASK (asc_dvc->chip_scsi_id)); -/* -* Build the carrier freelist. -* -* Driver must have already allocated memory and set 'carrier_buf'. -*/ -ASC_ASSERT (asc_dvc->carrier_buf !=NULL ); - - carrp = (ADV_CARR_T *)ADV_16BALIGN (asc_dvc->carrier_buf); - asc_dvc->carr_freelist =NULL ; -if (carrp == (ADV_CARR_T *) asc_dvc->carrier_buf) { - buf_size =ADV_CARRIER_BUFSIZE ; - }else { - buf_size =ADV_CARRIER_BUFSIZE -sizeof (ADV_CARR_T ); - } - -do { -/* -* Get physical address for the carrier 'carrp'. -*/ - contig_len =sizeof (ADV_CARR_T ); - carr_paddr = -cpu_to_le32 (DvcGetPhyAddr - (asc_dvc,NULL , (uchar *)carrp, - (ADV_SDCNT *)&contig_len, -ADV_IS_CARRIER_FLAG )); - - buf_size -=sizeof (ADV_CARR_T ); - -/* -* If the current carrier is not physically contiguous, then -* maybe there was a page crossing. Try the next carrier aligned -* start address. -*/ -if (contig_len <sizeof (ADV_CARR_T )) { - carrp++; -continue ; - } - - carrp->carr_pa = carr_paddr; - carrp->carr_va =cpu_to_le32 (ADV_VADDR_TO_U32 (carrp)); - -/* -* Insert the carrier at the beginning of the freelist. -*/ - carrp->next_vpa = -cpu_to_le32 (ADV_VADDR_TO_U32 (asc_dvc->carr_freelist)); - asc_dvc->carr_freelist = carrp; - - carrp++; - } -while (buf_size >0 ); +AdvBuildCarrierFreelist (asc_dvc);/* * Set-up the Host->RISC Initiator Command Queue (ICQ).
@@ -14087,10 +14029,6 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc)long word;int j;int adv_asc38C1600_expanded_size; -ADV_CARR_T *carrp; -ADV_DCNT contig_len; -ADV_SDCNT buf_size; -ADV_PADDR carr_paddr;int i;ushort scsi_cfg1;uchar byte;
@@ -14544,58 +14482,7 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc)AdvWriteWordLram (iop_base,ASC_MC_DEFAULT_SEL_MASK ,ADV_TID_TO_TIDMASK (asc_dvc->chip_scsi_id)); -/* -* Build the carrier freelist. -* -* Driver must have already allocated memory and set 'carrier_buf'. -*/ - -ASC_ASSERT (asc_dvc->carrier_buf !=NULL ); - - carrp = (ADV_CARR_T *)ADV_16BALIGN (asc_dvc->carrier_buf); - asc_dvc->carr_freelist =NULL ; -if (carrp == (ADV_CARR_T *) asc_dvc->carrier_buf) { - buf_size =ADV_CARRIER_BUFSIZE ; - }else { - buf_size =ADV_CARRIER_BUFSIZE -sizeof (ADV_CARR_T ); - } - -do { -/* -* Get physical address for the carrier 'carrp'. -*/ - contig_len =sizeof (ADV_CARR_T ); - carr_paddr = -cpu_to_le32 (DvcGetPhyAddr - (asc_dvc,NULL , (uchar *)carrp, - (ADV_SDCNT *)&contig_len, -ADV_IS_CARRIER_FLAG )); - - buf_size -=sizeof (ADV_CARR_T ); - -/* -* If the current carrier is not physically contiguous, then -* maybe there was a page crossing. Try the next carrier aligned -* start address. -*/ -if (contig_len <sizeof (ADV_CARR_T )) { - carrp++; -continue ; - } - - carrp->carr_pa = carr_paddr; - carrp->carr_va =cpu_to_le32 (ADV_VADDR_TO_U32 (carrp)); - -/* -* Insert the carrier at the beginning of the freelist. -*/ - carrp->next_vpa = -cpu_to_le32 (ADV_VADDR_TO_U32 (asc_dvc->carr_freelist)); - asc_dvc->carr_freelist = carrp; - - carrp++; - } -while (buf_size >0 ); +AdvBuildCarrierFreelist (asc_dvc);/* * Set-up the Host->RISC Initiator Command Queue (ICQ).
Signature · 1 line
1.5.2.4
PATCH 3/22 advansys: Create AdvLoadMicrocode
In reply to Matthew WilcoxSplit AdvLoadMicrocode out of AdvInitAsc3550Driver, AdvInitAsc38C0800Driver and AdvInitAsc38C1600Driver.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 382 +++++++++++++---------------------------------- 1 files changed, 107 insertions(+), 275 deletions(-)
drivers/scsi/advansys.c +107 -275
@@ -12932,6 +12932,78 @@ static void AdvBuildCarrierFreelist(struct adv_dvc_var *asc_dvc) }/* +* Load the Microcode +* +* Write the microcode image to RISC memory starting at address 0. +* +* The microcode is stored compressed in the following format: +* +* 254 word (508 byte) table indexed by byte code followed +* by the following byte codes: +* +* 1-Byte Code: +* 00: Emit word 0 in table. +* 01: Emit word 1 in table. +* . +* FD: Emit word 253 in table. +* +* Multi-Byte Code: +* FE WW WW: (3 byte code) Word to emit is the next word WW WW. +* FF BB WW WW: (4 byte code) Emit BB count times next word WW WW. +* +* Returns 0 or an error if the checksum doesn't match +*/ +static int AdvLoadMicrocode (AdvPortAddr iop_base,unsigned char *buf,int size, +int memsize,int chksum) +{ +int i, j, end, len =0 ; +ADV_DCNT sum; + +AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); + +for (i =253 *2 ; i < size; i++) { +if (buf[i] ==0xff ) { +unsigned short word = (buf[i +3 ] <<8 ) | buf[i +2 ]; +for (j =0 ; j < buf[i +1 ]; j++) { +AdvWriteWordAutoIncLram (iop_base, word); + len +=2 ; + } + i +=3 ; + }else if (buf[i] ==0xfe ) { +unsigned short word = (buf[i +2 ] <<8 ) | buf[i +1 ]; +AdvWriteWordAutoIncLram (iop_base, word); + i +=2 ; + len +=2 ; + }else { +unsigned char off = buf[i] *2 ; +unsigned short word = (buf[off +1 ] <<8 ) | buf[off]; +AdvWriteWordAutoIncLram (iop_base, word); + len +=2 ; + } + } + + end = len; + +while (len < memsize) { +AdvWriteWordAutoIncLram (iop_base,0 ); + len +=2 ; + } + +/* Verify the microcode checksum. */ + sum =0 ; +AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); + +for (len =0 ; len < end; len +=2 ) { + sum +=AdvReadWordAutoIncLram (iop_base); + } + +if (sum != chksum) +return ASC_IERR_MCODE_CHKSUM ; + +return 0 ; +} + +/* * Initialize the ASC-3550. * * On failure set the ADV_DVC_VAR field 'err_code' and return ADV_ERROR.
@@ -12945,13 +13017,10 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc) {AdvPortAddr iop_base;ushort warn_code; -ADV_DCNT sum;int begin_addr;int end_addr;ushort code_sum;int word; -int j; -int adv_asc3550_expanded_size;int i;ushort scsi_cfg1;uchar tid;
@@ -12960,15 +13029,14 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc)uchar max_cmd[ADV_MAX_TID +1 ];/* If there is already an error, don't continue. */ -if (asc_dvc->err_code !=0 ) { +if (asc_dvc->err_code !=0 )return ADV_ERROR ; - }/* * The caller must set 'chip_type' to ADV_CHIP_ASC3550. */ if (asc_dvc->chip_type !=ADV_CHIP_ASC3550 ) { - asc_dvc->err_code |=ASC_IERR_BAD_CHIPTYPE ; + asc_dvc->err_code =ASC_IERR_BAD_CHIPTYPE ;return ADV_ERROR ; }
@@ -13012,84 +13080,11 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc) max_cmd[tid]); } -/* -* Load the Microcode -* -* Write the microcode image to RISC memory starting at address 0. -*/ -AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); -/* Assume the following compressed format of the microcode buffer: -* -* 254 word (508 byte) table indexed by byte code followed -* by the following byte codes: -* -* 1-Byte Code: -* 00: Emit word 0 in table. -* 01: Emit word 1 in table. -* . -* FD: Emit word 253 in table. -* -* Multi-Byte Code: -* FE WW WW: (3 byte code) Word to emit is the next word WW WW. -* FF BB WW WW: (4 byte code) Emit BB count times next word WW WW. -*/ - word =0 ; -for (i =253 *2 ; i < _adv_asc3550_size; i++) { -if (_adv_asc3550_buf[i] ==0xff ) { -for (j =0 ; j < _adv_asc3550_buf[i +1 ]; j++) { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc3550_buf - [i + -3 ] <<8 ) | - _adv_asc3550_buf - [i +2 ])); - word++; - } - i +=3 ; - }else if (_adv_asc3550_buf[i] ==0xfe ) { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc3550_buf[i + -2 ] - <<8 ) | - _adv_asc3550_buf[i + -1 ])); - i +=2 ; - word++; - }else { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc3550_buf[(_adv_asc3550_buf[i] *2 ) +1 ] <<8 ) | _adv_asc3550_buf[_adv_asc3550_buf[i] *2 ])); - word++; - } - } - -/* -* Set 'word' for later use to clear the rest of memory and save -* the expanded mcode size. -*/ - word *=2 ; - adv_asc3550_expanded_size = word; - -/* -* Clear the rest of ASC-3550 Internal RAM (8KB). -*/ -for (; word <ADV_3550_MEMSIZE ; word +=2 ) { -AdvWriteWordAutoIncLram (iop_base,0 ); - } - -/* -* Verify the microcode checksum. -*/ - sum =0 ; -AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); - -for (word =0 ; word < adv_asc3550_expanded_size; word +=2 ) { - sum +=AdvReadWordAutoIncLram (iop_base); - } - -if (sum != _adv_asc3550_chksum) { - asc_dvc->err_code |=ASC_IERR_MCODE_CHKSUM ; + asc_dvc->err_code =AdvLoadMicrocode (iop_base, _adv_asc3550_buf, + _adv_asc3550_size,ADV_3550_MEMSIZE , + _adv_asc3550_chksum); +if (asc_dvc->err_code)return ADV_ERROR ; - }/* * Restore the RISC memory BIOS region.
@@ -13460,13 +13455,10 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) {AdvPortAddr iop_base;ushort warn_code; -ADV_DCNT sum;int begin_addr;int end_addr;ushort code_sum;int word; -int j; -int adv_asc38C0800_expanded_size;int i;ushort scsi_cfg1;uchar byte;
@@ -13476,9 +13468,8 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)uchar max_cmd[ADV_MAX_TID +1 ];/* If there is already an error, don't continue. */ -if (asc_dvc->err_code !=0 ) { +if (asc_dvc->err_code !=0 )return ADV_ERROR ; - }/* * The caller must set 'chip_type' to ADV_CHIP_ASC38C0800.
@@ -13550,7 +13541,7 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) byte =AdvReadByteRegister (iop_base,IOPB_RAM_BIST );if ((byte &RAM_TEST_DONE ) ==0 || (byte &0x0F ) !=PRE_TEST_VALUE ) { - asc_dvc->err_code |=ASC_IERR_BIST_PRE_TEST ; + asc_dvc->err_code =ASC_IERR_BIST_PRE_TEST ;return ADV_ERROR ; }
@@ -13558,7 +13549,7 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)DvcSleepMilliSecond (10 );/* Wait for 10ms before reading back. */ if (AdvReadByteRegister (iop_base,IOPB_RAM_BIST ) !=NORMAL_VALUE ) { - asc_dvc->err_code |=ASC_IERR_BIST_PRE_TEST ; + asc_dvc->err_code =ASC_IERR_BIST_PRE_TEST ;return ADV_ERROR ; } }
@@ -13577,99 +13568,18 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)if ((byte &RAM_TEST_DONE ) ==0 || (byte &RAM_TEST_STATUS ) !=0 ) {/* Get here if Done bit not set or Status not 0. */ asc_dvc->bist_err_code = byte;/* for BIOS display message */ - asc_dvc->err_code |=ASC_IERR_BIST_RAM_TEST ; + asc_dvc->err_code =ASC_IERR_BIST_RAM_TEST ;return ADV_ERROR ; }/* We need to reset back to normal mode after LRAM test passes. */ AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,NORMAL_MODE ); -/* -* Load the Microcode -* -* Write the microcode image to RISC memory starting at address 0. -* -*/ -AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); - -/* Assume the following compressed format of the microcode buffer: -* -* 254 word (508 byte) table indexed by byte code followed -* by the following byte codes: -* -* 1-Byte Code: -* 00: Emit word 0 in table. -* 01: Emit word 1 in table. -* . -* FD: Emit word 253 in table. -* -* Multi-Byte Code: -* FE WW WW: (3 byte code) Word to emit is the next word WW WW. -* FF BB WW WW: (4 byte code) Emit BB count times next word WW WW. -*/ - word =0 ; -for (i =253 *2 ; i < _adv_asc38C0800_size; i++) { -if (_adv_asc38C0800_buf[i] ==0xff ) { -for (j =0 ; j < _adv_asc38C0800_buf[i +1 ]; j++) { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc38C0800_buf - [i + -3 ] <<8 ) | - _adv_asc38C0800_buf - [i +2 ])); - word++; - } - i +=3 ; - }else if (_adv_asc38C0800_buf[i] ==0xfe ) { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc38C0800_buf - [i + -2 ] <<8 ) | - _adv_asc38C0800_buf[i - + -1 ])); - i +=2 ; - word++; - }else { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc38C0800_buf[(_adv_asc38C0800_buf[i] *2 ) +1 ] <<8 ) | _adv_asc38C0800_buf[_adv_asc38C0800_buf[i] *2 ])); - word++; - } - } - -/* -* Set 'word' for later use to clear the rest of memory and save -* the expanded mcode size. -*/ - word *=2 ; - adv_asc38C0800_expanded_size = word; - -/* -* Clear the rest of ASC-38C0800 Internal RAM (16KB). -*/ -for (; word <ADV_38C0800_MEMSIZE ; word +=2 ) { -AdvWriteWordAutoIncLram (iop_base,0 ); - } - -/* -* Verify the microcode checksum. -*/ - sum =0 ; -AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); - -for (word =0 ; word < adv_asc38C0800_expanded_size; word +=2 ) { - sum +=AdvReadWordAutoIncLram (iop_base); - } -ASC_DBG2 (1 ,"AdvInitAsc38C0800Driver: word %d, i %d\n" , word, i); - -ASC_DBG2 (1 , -"AdvInitAsc38C0800Driver: sum 0x%lx, _adv_asc38C0800_chksum 0x%lx\n" , - (ulong )sum, (ulong )_adv_asc38C0800_chksum); - -if (sum != _adv_asc38C0800_chksum) { - asc_dvc->err_code |=ASC_IERR_MCODE_CHKSUM ; + asc_dvc->err_code =AdvLoadMicrocode (iop_base, _adv_asc38C0800_buf, + _adv_asc38C0800_size,ADV_38C0800_MEMSIZE , + _adv_asc38C0800_chksum); +if (asc_dvc->err_code)return ADV_ERROR ; - }/* * Restore the RISC memory BIOS region.
@@ -13807,16 +13717,18 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) }/* -* All kind of combinations of devices attached to one of four connectors -* are acceptable except HVD device attached. For example, LVD device can -* be attached to SE connector while SE device attached to LVD connector. -* If LVD device attached to SE connector, it only runs up to Ultra speed. +* All kind of combinations of devices attached to one of four +* connectors are acceptable except HVD device attached. For example, +* LVD device can be attached to SE connector while SE device attached +* to LVD connector. If LVD device attached to SE connector, it only +* runs up to Ultra speed. * -* If an HVD device is attached to one of LVD connectors, return an error. -* However, there is no way to detect HVD device attached to SE connectors. +* If an HVD device is attached to one of LVD connectors, return an +* error. However, there is no way to detect HVD device attached to +* SE connectors. */ if (scsi_cfg1 &HVD ) { - asc_dvc->err_code |=ASC_IERR_HVD_DEVICE ; + asc_dvc->err_code =ASC_IERR_HVD_DEVICE ;return ADV_ERROR ; }
@@ -13825,8 +13737,8 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)* set the termination value based on a table listed in a_condor.h. * * If manual termination was specified with an EEPROM setting then -* 'termination' was set-up in AdvInitFrom38C0800EEPROM() and is ready to -* be 'ored' into SCSI_CFG1. +* 'termination' was set-up in AdvInitFrom38C0800EEPROM() and is ready +* to be 'ored' into SCSI_CFG1. */ if ((asc_dvc->cfg->termination &TERM_SE ) ==0 ) {/* SE automatic termination control is enabled. */
@@ -13872,9 +13784,9 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) scsi_cfg1 |= (~asc_dvc->cfg->termination &0xF0 );/* -* Clear BIG_ENDIAN, DIS_TERM_DRV, Terminator Polarity and HVD/LVD/SE bits -* and set possibly modified termination control bits in the Microcode -* SCSI_CFG1 Register Value. +* Clear BIG_ENDIAN, DIS_TERM_DRV, Terminator Polarity and HVD/LVD/SE +* bits and set possibly modified termination control bits in the +* Microcode SCSI_CFG1 Register Value. */ scsi_cfg1 &= (~BIG_ENDIAN & ~DIS_TERM_DRV & ~TERM_POL & ~HVD_LVD_SE );
@@ -14022,13 +13934,10 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc) {AdvPortAddr iop_base;ushort warn_code; -ADV_DCNT sum;int begin_addr;int end_addr;ushort code_sum;long word; -int j; -int adv_asc38C1600_expanded_size;int i;ushort scsi_cfg1;uchar byte;
@@ -14113,7 +14022,7 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc) byte =AdvReadByteRegister (iop_base,IOPB_RAM_BIST );if ((byte &RAM_TEST_DONE ) ==0 || (byte &0x0F ) !=PRE_TEST_VALUE ) { - asc_dvc->err_code |=ASC_IERR_BIST_PRE_TEST ; + asc_dvc->err_code =ASC_IERR_BIST_PRE_TEST ;return ADV_ERROR ; }
@@ -14121,7 +14030,7 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc)DvcSleepMilliSecond (10 );/* Wait for 10ms before reading back. */ if (AdvReadByteRegister (iop_base,IOPB_RAM_BIST ) !=NORMAL_VALUE ) { - asc_dvc->err_code |=ASC_IERR_BIST_PRE_TEST ; + asc_dvc->err_code =ASC_IERR_BIST_PRE_TEST ;return ADV_ERROR ; } }
@@ -14140,95 +14049,18 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc)if ((byte &RAM_TEST_DONE ) ==0 || (byte &RAM_TEST_STATUS ) !=0 ) {/* Get here if Done bit not set or Status not 0. */ asc_dvc->bist_err_code = byte;/* for BIOS display message */ - asc_dvc->err_code |=ASC_IERR_BIST_RAM_TEST ; + asc_dvc->err_code =ASC_IERR_BIST_RAM_TEST ;return ADV_ERROR ; }/* We need to reset back to normal mode after LRAM test passes. */ AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,NORMAL_MODE ); -/* -* Load the Microcode -* -* Write the microcode image to RISC memory starting at address 0. -* -*/ -AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); - -/* -* Assume the following compressed format of the microcode buffer: -* -* 254 word (508 byte) table indexed by byte code followed -* by the following byte codes: -* -* 1-Byte Code: -* 00: Emit word 0 in table. -* 01: Emit word 1 in table. -* . -* FD: Emit word 253 in table. -* -* Multi-Byte Code: -* FE WW WW: (3 byte code) Word to emit is the next word WW WW. -* FF BB WW WW: (4 byte code) Emit BB count times next word WW WW. -*/ - word =0 ; -for (i =253 *2 ; i < _adv_asc38C1600_size; i++) { -if (_adv_asc38C1600_buf[i] ==0xff ) { -for (j =0 ; j < _adv_asc38C1600_buf[i +1 ]; j++) { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc38C1600_buf - [i + -3 ] <<8 ) | - _adv_asc38C1600_buf - [i +2 ])); - word++; - } - i +=3 ; - }else if (_adv_asc38C1600_buf[i] ==0xfe ) { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc38C1600_buf - [i + -2 ] <<8 ) | - _adv_asc38C1600_buf[i - + -1 ])); - i +=2 ; - word++; - }else { -AdvWriteWordAutoIncLram (iop_base, (((ushort ) - _adv_asc38C1600_buf[(_adv_asc38C1600_buf[i] *2 ) +1 ] <<8 ) | _adv_asc38C1600_buf[_adv_asc38C1600_buf[i] *2 ])); - word++; - } - } - -/* -* Set 'word' for later use to clear the rest of memory and save -* the expanded mcode size. -*/ - word *=2 ; - adv_asc38C1600_expanded_size = word; - -/* -* Clear the rest of ASC-38C1600 Internal RAM (32KB). -*/ -for (; word <ADV_38C1600_MEMSIZE ; word +=2 ) { -AdvWriteWordAutoIncLram (iop_base,0 ); - } - -/* -* Verify the microcode checksum. -*/ - sum =0 ; -AdvWriteWordRegister (iop_base,IOPW_RAM_ADDR ,0 ); - -for (word =0 ; word < adv_asc38C1600_expanded_size; word +=2 ) { - sum +=AdvReadWordAutoIncLram (iop_base); - } - -if (sum != _adv_asc38C1600_chksum) { - asc_dvc->err_code |=ASC_IERR_MCODE_CHKSUM ; + asc_dvc->err_code =AdvLoadMicrocode (iop_base, _adv_asc38C1600_buf, + _adv_asc38C1600_size,ADV_38C1600_MEMSIZE , + _adv_asc38C1600_chksum); +if (asc_dvc->err_code)return ADV_ERROR ; - }/* * Restore the RISC memory BIOS region.
Signature · 1 line
1.5.2.4
PATCH 4/22 advansys: Reformat microcode
In reply to Matthew WilcoxIt's just data, so format it to something that looks more visually appealing (and saves some lines)
Signed-off-by Matthew Wilcox <[email protected]>
3 lines not shown · raw message
drivers/scsi/advansys.c +1186 -1977
@@ -8111,293 +8111,197 @@ static int AscISR(ASC_DVC_VAR *asc_dvc)/* Microcode buffer is kept after initialization for error recovery. */ static uchar _asc_mcode_buf[] = {0x01 ,0x03 ,0x01 ,0x19 ,0x0F ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 , -0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x0F ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0xC3 ,0x12 ,0x0D ,0x05 ,0x01 ,0x00 ,0x00 ,0x00 , -0x00 ,0xFF ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0xFF ,0x80 ,0xFF ,0xFF ,0x01 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xC3 ,0x12 ,0x0D ,0x05 , +0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0xFF ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0xFF ,0x80 ,0xFF ,0xFF ,0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x23 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x07 ,0x00 ,0xFF , -0x00 ,0x00 ,0x00 ,0x00 , -0xFF ,0xFF ,0xFF ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xE4 ,0x88 , -0x00 ,0x00 ,0x00 ,0x00 , -0x80 ,0x73 ,0x48 ,0x04 ,0x36 ,0x00 ,0x00 ,0xA2 ,0xC2 ,0x00 ,0x80 ,0x73 , -0x03 ,0x23 ,0x36 ,0x40 , +0x00 ,0x00 ,0x00 ,0x00 ,0xFF ,0xFF ,0xFF ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0xE4 ,0x88 ,0x00 ,0x00 ,0x00 ,0x00 ,0x80 ,0x73 ,0x48 ,0x04 , +0x36 ,0x00 ,0x00 ,0xA2 ,0xC2 ,0x00 ,0x80 ,0x73 ,0x03 ,0x23 ,0x36 ,0x40 ,0xB6 ,0x00 ,0x36 ,0x00 ,0x05 ,0xD6 ,0x0C ,0xD2 ,0x12 ,0xDA ,0x00 ,0xA2 , -0xC2 ,0x00 ,0x92 ,0x80 , -0x1E ,0x98 ,0x50 ,0x00 ,0xF5 ,0x00 ,0x48 ,0x98 ,0xDF ,0x23 ,0x36 ,0x60 , -0xB6 ,0x00 ,0x92 ,0x80 , -0x4F ,0x00 ,0xF5 ,0x00 ,0x48 ,0x98 ,0xEF ,0x23 ,0x36 ,0x60 ,0xB6 ,0x00 , -0x92 ,0x80 ,0x80 ,0x62 , +0xC2 ,0x00 ,0x92 ,0x80 ,0x1E ,0x98 ,0x50 ,0x00 ,0xF5 ,0x00 ,0x48 ,0x98 , +0xDF ,0x23 ,0x36 ,0x60 ,0xB6 ,0x00 ,0x92 ,0x80 ,0x4F ,0x00 ,0xF5 ,0x00 , +0x48 ,0x98 ,0xEF ,0x23 ,0x36 ,0x60 ,0xB6 ,0x00 ,0x92 ,0x80 ,0x80 ,0x62 ,0x92 ,0x80 ,0x00 ,0x46 ,0x15 ,0xEE ,0x13 ,0xEA ,0x02 ,0x01 ,0x09 ,0xD8 , -0xCD ,0x04 ,0x4D ,0x00 , -0x00 ,0xA3 ,0xD6 ,0x00 ,0xA6 ,0x97 ,0x7F ,0x23 ,0x04 ,0x61 ,0x84 ,0x01 , -0xE6 ,0x84 ,0xD2 ,0xC1 , -0x80 ,0x73 ,0xCD ,0x04 ,0x4D ,0x00 ,0x00 ,0xA3 ,0xDA ,0x01 ,0xA6 ,0x97 , -0xC6 ,0x81 ,0xC2 ,0x88 , +0xCD ,0x04 ,0x4D ,0x00 ,0x00 ,0xA3 ,0xD6 ,0x00 ,0xA6 ,0x97 ,0x7F ,0x23 , +0x04 ,0x61 ,0x84 ,0x01 ,0xE6 ,0x84 ,0xD2 ,0xC1 ,0x80 ,0x73 ,0xCD ,0x04 , +0x4D ,0x00 ,0x00 ,0xA3 ,0xDA ,0x01 ,0xA6 ,0x97 ,0xC6 ,0x81 ,0xC2 ,0x88 ,0x80 ,0x73 ,0x80 ,0x77 ,0x00 ,0x01 ,0x01 ,0xA1 ,0xFE ,0x00 ,0x4F ,0x00 , -0x84 ,0x97 ,0x07 ,0xA6 , -0x08 ,0x01 ,0x00 ,0x33 ,0x03 ,0x00 ,0xC2 ,0x88 ,0x03 ,0x03 ,0x01 ,0xDE , -0xC2 ,0x88 ,0xCE ,0x00 , -0x69 ,0x60 ,0xCE ,0x00 ,0x02 ,0x03 ,0x4A ,0x60 ,0x00 ,0xA2 ,0x78 ,0x01 , -0x80 ,0x63 ,0x07 ,0xA6 , +0x84 ,0x97 ,0x07 ,0xA6 ,0x08 ,0x01 ,0x00 ,0x33 ,0x03 ,0x00 ,0xC2 ,0x88 , +0x03 ,0x03 ,0x01 ,0xDE ,0xC2 ,0x88 ,0xCE ,0x00 ,0x69 ,0x60 ,0xCE ,0x00 , +0x02 ,0x03 ,0x4A ,0x60 ,0x00 ,0xA2 ,0x78 ,0x01 ,0x80 ,0x63 ,0x07 ,0xA6 ,0x24 ,0x01 ,0x78 ,0x81 ,0x03 ,0x03 ,0x80 ,0x63 ,0xE2 ,0x00 ,0x07 ,0xA6 , -0x34 ,0x01 ,0x00 ,0x33 , -0x04 ,0x00 ,0xC2 ,0x88 ,0x03 ,0x07 ,0x02 ,0x01 ,0x04 ,0xCA ,0x0D ,0x23 , -0x68 ,0x98 ,0x4D ,0x04 , -0x04 ,0x85 ,0x05 ,0xD8 ,0x0D ,0x23 ,0x68 ,0x98 ,0xCD ,0x04 ,0x15 ,0x23 , -0xF8 ,0x88 ,0xFB ,0x23 , +0x34 ,0x01 ,0x00 ,0x33 ,0x04 ,0x00 ,0xC2 ,0x88 ,0x03 ,0x07 ,0x02 ,0x01 , +0x04 ,0xCA ,0x0D ,0x23 ,0x68 ,0x98 ,0x4D ,0x04 ,0x04 ,0x85 ,0x05 ,0xD8 , +0x0D ,0x23 ,0x68 ,0x98 ,0xCD ,0x04 ,0x15 ,0x23 ,0xF8 ,0x88 ,0xFB ,0x23 ,0x02 ,0x61 ,0x82 ,0x01 ,0x80 ,0x63 ,0x02 ,0x03 ,0x06 ,0xA3 ,0x62 ,0x01 , -0x00 ,0x33 ,0x0A ,0x00 , -0xC2 ,0x88 ,0x4E ,0x00 ,0x07 ,0xA3 ,0x6E ,0x01 ,0x00 ,0x33 ,0x0B ,0x00 , -0xC2 ,0x88 ,0xCD ,0x04 , -0x36 ,0x2D ,0x00 ,0x33 ,0x1A ,0x00 ,0xC2 ,0x88 ,0x50 ,0x04 ,0x88 ,0x81 , -0x06 ,0xAB ,0x82 ,0x01 , +0x00 ,0x33 ,0x0A ,0x00 ,0xC2 ,0x88 ,0x4E ,0x00 ,0x07 ,0xA3 ,0x6E ,0x01 , +0x00 ,0x33 ,0x0B ,0x00 ,0xC2 ,0x88 ,0xCD ,0x04 ,0x36 ,0x2D ,0x00 ,0x33 , +0x1A ,0x00 ,0xC2 ,0x88 ,0x50 ,0x04 ,0x88 ,0x81 ,0x06 ,0xAB ,0x82 ,0x01 ,0x88 ,0x81 ,0x4E ,0x00 ,0x07 ,0xA3 ,0x92 ,0x01 ,0x50 ,0x00 ,0x00 ,0xA3 , -0x3C ,0x01 ,0x00 ,0x05 , -0x7C ,0x81 ,0x46 ,0x97 ,0x02 ,0x01 ,0x05 ,0xC6 ,0x04 ,0x23 ,0xA0 ,0x01 , -0x15 ,0x23 ,0xA1 ,0x01 , -0xBE ,0x81 ,0xFD ,0x23 ,0x02 ,0x61 ,0x82 ,0x01 ,0x0A ,0xDA ,0x4A ,0x00 , -0x06 ,0x61 ,0x00 ,0xA0 , +0x3C ,0x01 ,0x00 ,0x05 ,0x7C ,0x81 ,0x46 ,0x97 ,0x02 ,0x01 ,0x05 ,0xC6 , +0x04 ,0x23 ,0xA0 ,0x01 ,0x15 ,0x23 ,0xA1 ,0x01 ,0xBE ,0x81 ,0xFD ,0x23 , +0x02 ,0x61 ,0x82 ,0x01 ,0x0A ,0xDA ,0x4A ,0x00 ,0x06 ,0x61 ,0x00 ,0xA0 ,0xB4 ,0x01 ,0x80 ,0x63 ,0xCD ,0x04 ,0x36 ,0x2D ,0x00 ,0x33 ,0x1B ,0x00 , -0xC2 ,0x88 ,0x06 ,0x23 , -0x68 ,0x98 ,0xCD ,0x04 ,0xE6 ,0x84 ,0x06 ,0x01 ,0x00 ,0xA2 ,0xD4 ,0x01 , -0x57 ,0x60 ,0x00 ,0xA0 , -0xDA ,0x01 ,0xE6 ,0x84 ,0x80 ,0x23 ,0xA0 ,0x01 ,0xE6 ,0x84 ,0x80 ,0x73 , -0x4B ,0x00 ,0x06 ,0x61 , +0xC2 ,0x88 ,0x06 ,0x23 ,0x68 ,0x98 ,0xCD ,0x04 ,0xE6 ,0x84 ,0x06 ,0x01 , +0x00 ,0xA2 ,0xD4 ,0x01 ,0x57 ,0x60 ,0x00 ,0xA0 ,0xDA ,0x01 ,0xE6 ,0x84 , +0x80 ,0x23 ,0xA0 ,0x01 ,0xE6 ,0x84 ,0x80 ,0x73 ,0x4B ,0x00 ,0x06 ,0x61 ,0x00 ,0xA2 ,0x00 ,0x02 ,0x04 ,0x01 ,0x0C ,0xDE ,0x02 ,0x01 ,0x03 ,0xCC , -0x4F ,0x00 ,0x84 ,0x97 , -0xFC ,0x81 ,0x08 ,0x23 ,0x02 ,0x41 ,0x82 ,0x01 ,0x4F ,0x00 ,0x62 ,0x97 , -0x48 ,0x04 ,0x84 ,0x80 , -0xF0 ,0x97 ,0x00 ,0x46 ,0x56 ,0x00 ,0x03 ,0xC0 ,0x01 ,0x23 ,0xE8 ,0x00 , -0x81 ,0x73 ,0x06 ,0x29 , +0x4F ,0x00 ,0x84 ,0x97 ,0xFC ,0x81 ,0x08 ,0x23 ,0x02 ,0x41 ,0x82 ,0x01 , +0x4F ,0x00 ,0x62 ,0x97 ,0x48 ,0x04 ,0x84 ,0x80 ,0xF0 ,0x97 ,0x00 ,0x46 , +0x56 ,0x00 ,0x03 ,0xC0 ,0x01 ,0x23 ,0xE8 ,0x00 ,0x81 ,0x73 ,0x06 ,0x29 ,0x03 ,0x42 ,0x06 ,0xE2 ,0x03 ,0xEE ,0x6B ,0xEB ,0x11 ,0x23 ,0xF8 ,0x88 , -0x04 ,0x98 ,0xF0 ,0x80 , -0x80 ,0x73 ,0x80 ,0x77 ,0x07 ,0xA4 ,0x2A ,0x02 ,0x7C ,0x95 ,0x06 ,0xA6 , -0x34 ,0x02 ,0x03 ,0xA6 , -0x4C ,0x04 ,0x46 ,0x82 ,0x04 ,0x01 ,0x03 ,0xD8 ,0xB4 ,0x98 ,0x6A ,0x96 , -0x46 ,0x82 ,0xFE ,0x95 , +0x04 ,0x98 ,0xF0 ,0x80 ,0x80 ,0x73 ,0x80 ,0x77 ,0x07 ,0xA4 ,0x2A ,0x02 , +0x7C ,0x95 ,0x06 ,0xA6 ,0x34 ,0x02 ,0x03 ,0xA6 ,0x4C ,0x04 ,0x46 ,0x82 , +0x04 ,0x01 ,0x03 ,0xD8 ,0xB4 ,0x98 ,0x6A ,0x96 ,0x46 ,0x82 ,0xFE ,0x95 ,0x80 ,0x67 ,0x83 ,0x03 ,0x80 ,0x63 ,0xB6 ,0x2D ,0x02 ,0xA6 ,0x6C ,0x02 , -0x07 ,0xA6 ,0x5A ,0x02 , -0x06 ,0xA6 ,0x5E ,0x02 ,0x03 ,0xA6 ,0x62 ,0x02 ,0xC2 ,0x88 ,0x7C ,0x95 , -0x48 ,0x82 ,0x60 ,0x96 , -0x48 ,0x82 ,0x04 ,0x23 ,0xA0 ,0x01 ,0x14 ,0x23 ,0xA1 ,0x01 ,0x3C ,0x84 , -0x04 ,0x01 ,0x0C ,0xDC , +0x07 ,0xA6 ,0x5A ,0x02 ,0x06 ,0xA6 ,0x5E ,0x02 ,0x03 ,0xA6 ,0x62 ,0x02 , +0xC2 ,0x88 ,0x7C ,0x95 ,0x48 ,0x82 ,0x60 ,0x96 ,0x48 ,0x82 ,0x04 ,0x23 , +0xA0 ,0x01 ,0x14 ,0x23 ,0xA1 ,0x01 ,0x3C ,0x84 ,0x04 ,0x01 ,0x0C ,0xDC ,0xE0 ,0x23 ,0x25 ,0x61 ,0xEF ,0x00 ,0x14 ,0x01 ,0x4F ,0x04 ,0xA8 ,0x01 , -0x6F ,0x00 ,0xA5 ,0x01 , -0x03 ,0x23 ,0xA4 ,0x01 ,0x06 ,0x23 ,0x9C ,0x01 ,0x24 ,0x2B ,0x1C ,0x01 , -0x02 ,0xA6 ,0xAA ,0x02 , -0x07 ,0xA6 ,0x5A ,0x02 ,0x06 ,0xA6 ,0x5E ,0x02 ,0x03 ,0xA6 ,0x20 ,0x04 , -0x01 ,0xA6 ,0xB4 ,0x02 , +0x6F ,0x00 ,0xA5 ,0x01 ,0x03 ,0x23 ,0xA4 ,0x01 ,0x06 ,0x23 ,0x9C ,0x01 , +0x24 ,0x2B ,0x1C ,0x01 ,0x02 ,0xA6 ,0xAA ,0x02 ,0x07 ,0xA6 ,0x5A ,0x02 , +0x06 ,0xA6 ,0x5E ,0x02 ,0x03 ,0xA6 ,0x20 ,0x04 ,0x01 ,0xA6 ,0xB4 ,0x02 ,0x00 ,0xA6 ,0xB4 ,0x02 ,0x00 ,0x33 ,0x12 ,0x00 ,0xC2 ,0x88 ,0x00 ,0x0E , -0x80 ,0x63 ,0x00 ,0x43 , -0x00 ,0xA0 ,0x8C ,0x02 ,0x4D ,0x04 ,0x04 ,0x01 ,0x0B ,0xDC ,0xE7 ,0x23 , -0x04 ,0x61 ,0x84 ,0x01 , -0x10 ,0x31 ,0x12 ,0x35 ,0x14 ,0x01 ,0xEC ,0x00 ,0x6C ,0x38 ,0x00 ,0x3F , -0x00 ,0x00 ,0xEA ,0x82 , +0x80 ,0x63 ,0x00 ,0x43 ,0x00 ,0xA0 ,0x8C ,0x02 ,0x4D ,0x04 ,0x04 ,0x01 , +0x0B ,0xDC ,0xE7 ,0x23 ,0x04 ,0x61 ,0x84 ,0x01 ,0x10 ,0x31 ,0x12 ,0x35 , +0x14 ,0x01 ,0xEC ,0x00 ,0x6C ,0x38 ,0x00 ,0x3F ,0x00 ,0x00 ,0xEA ,0x82 ,0x18 ,0x23 ,0x04 ,0x61 ,0x18 ,0xA0 ,0xE2 ,0x02 ,0x04 ,0x01 ,0xA2 ,0xC8 , -0x00 ,0x33 ,0x1F ,0x00 , -0xC2 ,0x88 ,0x08 ,0x31 ,0x0A ,0x35 ,0x0C ,0x39 ,0x0E ,0x3D ,0x7E ,0x98 , -0xB6 ,0x2D ,0x01 ,0xA6 , -0x14 ,0x03 ,0x00 ,0xA6 ,0x14 ,0x03 ,0x07 ,0xA6 ,0x0C ,0x03 ,0x06 ,0xA6 , -0x10 ,0x03 ,0x03 ,0xA6 , +0x00 ,0x33 ,0x1F ,0x00 ,0xC2 ,0x88 ,0x08 ,0x31 ,0x0A ,0x35 ,0x0C ,0x39 , +0x0E ,0x3D ,0x7E ,0x98 ,0xB6 ,0x2D ,0x01 ,0xA6 ,0x14 ,0x03 ,0x00 ,0xA6 , +0x14 ,0x03 ,0x07 ,0xA6 ,0x0C ,0x03 ,0x06 ,0xA6 ,0x10 ,0x03 ,0x03 ,0xA6 ,0x20 ,0x04 ,0x02 ,0xA6 ,0x6C ,0x02 ,0x00 ,0x33 ,0x33 ,0x00 ,0xC2 ,0x88 , -0x7C ,0x95 ,0xEE ,0x82 , -0x60 ,0x96 ,0xEE ,0x82 ,0x82 ,0x98 ,0x80 ,0x42 ,0x7E ,0x98 ,0x64 ,0xE4 , -0x04 ,0x01 ,0x2D ,0xC8 , -0x31 ,0x05 ,0x07 ,0x01 ,0x00 ,0xA2 ,0x54 ,0x03 ,0x00 ,0x43 ,0x87 ,0x01 , -0x05 ,0x05 ,0x86 ,0x98 , +0x7C ,0x95 ,0xEE ,0x82 ,0x60 ,0x96 ,0xEE ,0x82 ,0x82 ,0x98 ,0x80 ,0x42 , +0x7E ,0x98 ,0x64 ,0xE4 ,0x04 ,0x01 ,0x2D ,0xC8 ,0x31 ,0x05 ,0x07 ,0x01 , +0x00 ,0xA2 ,0x54 ,0x03 ,0x00 ,0x43 ,0x87 ,0x01 ,0x05 ,0x05 ,0x86 ,0x98 ,0x7E ,0x98 ,0x00 ,0xA6 ,0x16 ,0x03 ,0x07 ,0xA6 ,0x4C ,0x03 ,0x03 ,0xA6 , -0x3C ,0x04 ,0x06 ,0xA6 , -0x50 ,0x03 ,0x01 ,0xA6 ,0x16 ,0x03 ,0x00 ,0x33 ,0x25 ,0x00 ,0xC2 ,0x88 , -0x7C ,0x95 ,0x32 ,0x83 , -0x60 ,0x96 ,0x32 ,0x83 ,0x04 ,0x01 ,0x10 ,0xCE ,0x07 ,0xC8 ,0x05 ,0x05 , -0xEB ,0x04 ,0x00 ,0x33 , +0x3C ,0x04 ,0x06 ,0xA6 ,0x50 ,0x03 ,0x01 ,0xA6 ,0x16 ,0x03 ,0x00 ,0x33 , +0x25 ,0x00 ,0xC2 ,0x88 ,0x7C ,0x95 ,0x32 ,0x83 ,0x60 ,0x96 ,0x32 ,0x83 , +0x04 ,0x01 ,0x10 ,0xCE ,0x07 ,0xC8 ,0x05 ,0x05 ,0xEB ,0x04 ,0x00 ,0x33 ,0x00 ,0x20 ,0xC0 ,0x20 ,0x81 ,0x62 ,0x72 ,0x83 ,0x00 ,0x01 ,0x05 ,0x05 , -0xFF ,0xA2 ,0x7A ,0x03 , -0xB1 ,0x01 ,0x08 ,0x23 ,0xB2 ,0x01 ,0x2E ,0x83 ,0x05 ,0x05 ,0x15 ,0x01 , -0x00 ,0xA2 ,0x9A ,0x03 , -0xEC ,0x00 ,0x6E ,0x00 ,0x95 ,0x01 ,0x6C ,0x38 ,0x00 ,0x3F ,0x00 ,0x00 , -0x01 ,0xA6 ,0x96 ,0x03 , +0xFF ,0xA2 ,0x7A ,0x03 ,0xB1 ,0x01 ,0x08 ,0x23 ,0xB2 ,0x01 ,0x2E ,0x83 , +0x05 ,0x05 ,0x15 ,0x01 ,0x00 ,0xA2 ,0x9A ,0x03 ,0xEC ,0x00 ,0x6E ,0x00 , +0x95 ,0x01 ,0x6C ,0x38 ,0x00 ,0x3F ,0x00 ,0x00 ,0x01 ,0xA6 ,0x96 ,0x03 ,0x00 ,0xA6 ,0x96 ,0x03 ,0x10 ,0x84 ,0x80 ,0x42 ,0x7E ,0x98 ,0x01 ,0xA6 , -0xA4 ,0x03 ,0x00 ,0xA6 , -0xBC ,0x03 ,0x10 ,0x84 ,0xA8 ,0x98 ,0x80 ,0x42 ,0x01 ,0xA6 ,0xA4 ,0x03 , -0x07 ,0xA6 ,0xB2 ,0x03 , -0xD4 ,0x83 ,0x7C ,0x95 ,0xA8 ,0x83 ,0x00 ,0x33 ,0x2F ,0x00 ,0xC2 ,0x88 , -0xA8 ,0x98 ,0x80 ,0x42 , +0xA4 ,0x03 ,0x00 ,0xA6 ,0xBC ,0x03 ,0x10 ,0x84 ,0xA8 ,0x98 ,0x80 ,0x42 , +0x01 ,0xA6 ,0xA4 ,0x03 ,0x07 ,0xA6 ,0xB2 ,0x03 ,0xD4 ,0x83 ,0x7C ,0x95 , +0xA8 ,0x83 ,0x00 ,0x33 ,0x2F ,0x00 ,0xC2 ,0x88 ,0xA8 ,0x98 ,0x80 ,0x42 ,0x00 ,0xA6 ,0xBC ,0x03 ,0x07 ,0xA6 ,0xCA ,0x03 ,0xD4 ,0x83 ,0x7C ,0x95 , -0xC0 ,0x83 ,0x00 ,0x33 , -0x26 ,0x00 ,0xC2 ,0x88 ,0x38 ,0x2B ,0x80 ,0x32 ,0x80 ,0x36 ,0x04 ,0x23 , -0xA0 ,0x01 ,0x12 ,0x23 , -0xA1 ,0x01 ,0x10 ,0x84 ,0x07 ,0xF0 ,0x06 ,0xA4 ,0xF4 ,0x03 ,0x80 ,0x6B , -0x80 ,0x67 ,0x05 ,0x23 , +0xC0 ,0x83 ,0x00 ,0x33 ,0x26 ,0x00 ,0xC2 ,0x88 ,0x38 ,0x2B ,0x80 ,0x32 , +0x80 ,0x36 ,0x04 ,0x23 ,0xA0 ,0x01 ,0x12 ,0x23 ,0xA1 ,0x01 ,0x10 ,0x84 , +0x07 ,0xF0 ,0x06 ,0xA4 ,0xF4 ,0x03 ,0x80 ,0x6B ,0x80 ,0x67 ,0x05 ,0x23 ,0x83 ,0x03 ,0x80 ,0x63 ,0x03 ,0xA6 ,0x0E ,0x04 ,0x07 ,0xA6 ,0x06 ,0x04 , -0x06 ,0xA6 ,0x0A ,0x04 , -0x00 ,0x33 ,0x17 ,0x00 ,0xC2 ,0x88 ,0x7C ,0x95 ,0xF4 ,0x83 ,0x60 ,0x96 , -0xF4 ,0x83 ,0x20 ,0x84 , -0x07 ,0xF0 ,0x06 ,0xA4 ,0x20 ,0x04 ,0x80 ,0x6B ,0x80 ,0x67 ,0x05 ,0x23 , -0x83 ,0x03 ,0x80 ,0x63 , +0x06 ,0xA6 ,0x0A ,0x04 ,0x00 ,0x33 ,0x17 ,0x00 ,0xC2 ,0x88 ,0x7C ,0x95 , +0xF4 ,0x83 ,0x60 ,0x96 ,0xF4 ,0x83 ,0x20 ,0x84 ,0x07 ,0xF0 ,0x06 ,0xA4 , +0x20 ,0x04 ,0x80 ,0x6B ,0x80 ,0x67 ,0x05 ,0x23 ,0x83 ,0x03 ,0x80 ,0x63 ,0xB6 ,0x2D ,0x03 ,0xA6 ,0x3C ,0x04 ,0x07 ,0xA6 ,0x34 ,0x04 ,0x06 ,0xA6 , -0x38 ,0x04 ,0x00 ,0x33 , -0x30 ,0x00 ,0xC2 ,0x88 ,0x7C ,0x95 ,0x20 ,0x84 ,0x60 ,0x96 ,0x20 ,0x84 , -0x1D ,0x01 ,0x06 ,0xCC , -0x00 ,0x33 ,0x00 ,0x84 ,0xC0 ,0x20 ,0x00 ,0x23 ,0xEA ,0x00 ,0x81 ,0x62 , -0xA2 ,0x0D ,0x80 ,0x63 , +0x38 ,0x04 ,0x00 ,0x33 ,0x30 ,0x00 ,0xC2 ,0x88 ,0x7C ,0x95 ,0x20 ,0x84 , +0x60 ,0x96 ,0x20 ,0x84 ,0x1D ,0x01 ,0x06 ,0xCC ,0x00 ,0x33 ,0x00 ,0x84 , +0xC0 ,0x20 ,0x00 ,0x23 ,0xEA ,0x00 ,0x81 ,0x62 ,0xA2 ,0x0D ,0x80 ,0x63 ,0x07 ,0xA6 ,0x5A ,0x04 ,0x00 ,0x33 ,0x18 ,0x00 ,0xC2 ,0x88 ,0x03 ,0x03 , -0x80 ,0x63 ,0xA3 ,0x01 , -0x07 ,0xA4 ,0x64 ,0x04 ,0x23 ,0x01 ,0x00 ,0xA2 ,0x86 ,0x04 ,0x0A ,0xA0 , -0x76 ,0x04 ,0xE0 ,0x00 , -0x00 ,0x33 ,0x1D ,0x00 ,0xC2 ,0x88 ,0x0B ,0xA0 ,0x82 ,0x04 ,0xE0 ,0x00 , -0x00 ,0x33 ,0x1E ,0x00 , +0x80 ,0x63 ,0xA3 ,0x01 ,0x07 ,0xA4 ,0x64 ,0x04 ,0x23 ,0x01 ,0x00 ,0xA2 , +0x86 ,0x04 ,0x0A ,0xA0 ,0x76 ,0x04 ,0xE0 ,0x00 ,0x00 ,0x33 ,0x1D ,0x00 , +0xC2 ,0x88 ,0x0B ,0xA0 ,0x82 ,0x04 ,0xE0 ,0x00 ,0x00 ,0x33 ,0x1E ,0x00 ,0xC2 ,0x88 ,0x42 ,0x23 ,0xF8 ,0x88 ,0x00 ,0x23 ,0x22 ,0xA3 ,0xE6 ,0x04 , -0x08 ,0x23 ,0x22 ,0xA3 , -0xA2 ,0x04 ,0x28 ,0x23 ,0x22 ,0xA3 ,0xAE ,0x04 ,0x02 ,0x23 ,0x22 ,0xA3 , -0xC4 ,0x04 ,0x42 ,0x23 , -0xF8 ,0x88 ,0x4A ,0x00 ,0x06 ,0x61 ,0x00 ,0xA0 ,0xAE ,0x04 ,0x45 ,0x23 , -0xF8 ,0x88 ,0x04 ,0x98 , +0x08 ,0x23 ,0x22 ,0xA3 ,0xA2 ,0x04 ,0x28 ,0x23 ,0x22 ,0xA3 ,0xAE ,0x04 , +0x02 ,0x23 ,0x22 ,0xA3 ,0xC4 ,0x04 ,0x42 ,0x23 ,0xF8 ,0x88 ,0x4A ,0x00 , +0x06 ,0x61 ,0x00 ,0xA0 ,0xAE ,0x04 ,0x45 ,0x23 ,0xF8 ,0x88 ,0x04 ,0x98 ,0x00 ,0xA2 ,0xC0 ,0x04 ,0xB4 ,0x98 ,0x00 ,0x33 ,0x00 ,0x82 ,0xC0 ,0x20 , -0x81 ,0x62 ,0xE8 ,0x81 , -0x47 ,0x23 ,0xF8 ,0x88 ,0x04 ,0x01 ,0x0B ,0xDE ,0x04 ,0x98 ,0xB4 ,0x98 , -0x00 ,0x33 ,0x00 ,0x81 , -0xC0 ,0x20 ,0x81 ,0x62 ,0x14 ,0x01 ,0x00 ,0xA0 ,0x00 ,0x02 ,0x43 ,0x23 , -0xF8 ,0x88 ,0x04 ,0x23 , +0x81 ,0x62 ,0xE8 ,0x81 ,0x47 ,0x23 ,0xF8 ,0x88 ,0x04 ,0x01 ,0x0B ,0xDE , +0x04 ,0x98 ,0xB4 ,0x98 ,0x00 ,0x33 ,0x00 ,0x81 ,0xC0 ,0x20 ,0x81 ,0x62 , +0x14 ,0x01 ,0x00 ,0xA0 ,0x00 ,0x02 ,0x43 ,0x23 ,0xF8 ,0x88 ,0x04 ,0x23 ,0xA0 ,0x01 ,0x44 ,0x23 ,0xA1 ,0x01 ,0x80 ,0x73 ,0x4D ,0x00 ,0x03 ,0xA3 , -0xF4 ,0x04 ,0x00 ,0x33 , -0x27 ,0x00 ,0xC2 ,0x88 ,0x04 ,0x01 ,0x04 ,0xDC ,0x02 ,0x23 ,0xA2 ,0x01 , -0x04 ,0x23 ,0xA0 ,0x01 , -0x04 ,0x98 ,0x26 ,0x95 ,0x4B ,0x00 ,0xF6 ,0x00 ,0x4F ,0x04 ,0x4F ,0x00 , -0x00 ,0xA3 ,0x22 ,0x05 , +0xF4 ,0x04 ,0x00 ,0x33 ,0x27 ,0x00 ,0xC2 ,0x88 ,0x04 ,0x01 ,0x04 ,0xDC , +0x02 ,0x23 ,0xA2 ,0x01 ,0x04 ,0x23 ,0xA0 ,0x01 ,0x04 ,0x98 ,0x26 ,0x95 , +0x4B ,0x00 ,0xF6 ,0x00 ,0x4F ,0x04 ,0x4F ,0x00 ,0x00 ,0xA3 ,0x22 ,0x05 ,0x00 ,0x05 ,0x76 ,0x00 ,0x06 ,0x61 ,0x00 ,0xA2 ,0x1C ,0x05 ,0x0A ,0x85 , -0x46 ,0x97 ,0xCD ,0x04 , -0x24 ,0x85 ,0x48 ,0x04 ,0x84 ,0x80 ,0x02 ,0x01 ,0x03 ,0xDA ,0x80 ,0x23 , -0x82 ,0x01 ,0x34 ,0x85 , -0x02 ,0x23 ,0xA0 ,0x01 ,0x4A ,0x00 ,0x06 ,0x61 ,0x00 ,0xA2 ,0x40 ,0x05 , -0x1D ,0x01 ,0x04 ,0xD6 , +0x46 ,0x97 ,0xCD ,0x04 ,0x24 ,0x85 ,0x48 ,0x04 ,0x84 ,0x80 ,0x02 ,0x01 , +0x03 ,0xDA ,0x80 ,0x23 ,0x82 ,0x01 ,0x34 ,0x85 ,0x02 ,0x23 ,0xA0 ,0x01 , +0x4A ,0x00 ,0x06 ,0x61 ,0x00 ,0xA2 ,0x40 ,0x05 ,0x1D ,0x01 ,0x04 ,0xD6 ,0xFF ,0x23 ,0x86 ,0x41 ,0x4B ,0x60 ,0xCB ,0x00 ,0xFF ,0x23 ,0x80 ,0x01 , -0x49 ,0x00 ,0x81 ,0x01 , -0x04 ,0x01 ,0x02 ,0xC8 ,0x30 ,0x01 ,0x80 ,0x01 ,0xF7 ,0x04 ,0x03 ,0x01 , -0x49 ,0x04 ,0x80 ,0x01 , -0xC9 ,0x00 ,0x00 ,0x05 ,0x00 ,0x01 ,0xFF ,0xA0 ,0x60 ,0x05 ,0x77 ,0x04 , -0x01 ,0x23 ,0xEA ,0x00 , +0x49 ,0x00 ,0x81 ,0x01 ,0x04 ,0x01 ,0x02 ,0xC8 ,0x30 ,0x01 ,0x80 ,0x01 , +0xF7 ,0x04 ,0x03 ,0x01 ,0x49 ,0x04 ,0x80 ,0x01 ,0xC9 ,0x00 ,0x00 ,0x05 , +0x00 ,0x01 ,0xFF ,0xA0 ,0x60 ,0x05 ,0x77 ,0x04 ,0x01 ,0x23 ,0xEA ,0x00 ,0x5D ,0x00 ,0xFE ,0xC7 ,0x00 ,0x62 ,0x00 ,0x23 ,0xEA ,0x00 ,0x00 ,0x63 , -0x07 ,0xA4 ,0xF8 ,0x05 , -0x03 ,0x03 ,0x02 ,0xA0 ,0x8E ,0x05 ,0xF4 ,0x85 ,0x00 ,0x33 ,0x2D ,0x00 , -0xC2 ,0x88 ,0x04 ,0xA0 , -0xB8 ,0x05 ,0x80 ,0x63 ,0x00 ,0x23 ,0xDF ,0x00 ,0x4A ,0x00 ,0x06 ,0x61 , -0x00 ,0xA2 ,0xA4 ,0x05 , +0x07 ,0xA4 ,0xF8 ,0x05 ,0x03 ,0x03 ,0x02 ,0xA0 ,0x8E ,0x05 ,0xF4 ,0x85 , +0x00 ,0x33 ,0x2D ,0x00 ,0xC2 ,0x88 ,0x04 ,0xA0 ,0xB8 ,0x05 ,0x80 ,0x63 , +0x00 ,0x23 ,0xDF ,0x00 ,0x4A ,0x00 ,0x06 ,0x61 ,0x00 ,0xA2 ,0xA4 ,0x05 ,0x1D ,0x01 ,0x06 ,0xD6 ,0x02 ,0x23 ,0x02 ,0x41 ,0x82 ,0x01 ,0x50 ,0x00 , -0x62 ,0x97 ,0x04 ,0x85 , -0x04 ,0x23 ,0x02 ,0x41 ,0x82 ,0x01 ,0x04 ,0x85 ,0x08 ,0xA0 ,0xBE ,0x05 , -0xF4 ,0x85 ,0x03 ,0xA0 , -0xC4 ,0x05 ,0xF4 ,0x85 ,0x01 ,0xA0 ,0xCE ,0x05 ,0x88 ,0x00 ,0x80 ,0x63 , -0xCC ,0x86 ,0x07 ,0xA0 , +0x62 ,0x97 ,0x04 ,0x85 ,0x04 ,0x23 ,0x02 ,0x41 ,0x82 ,0x01 ,0x04 ,0x85 , +0x08 ,0xA0 ,0xBE ,0x05 ,0xF4 ,0x85 ,0x03 ,0xA0 ,0xC4 ,0x05 ,0xF4 ,0x85 , +0x01 ,0xA0 ,0xCE ,0x05 ,0x88 ,0x00 ,0x80 ,0x63 ,0xCC ,0x86 ,0x07 ,0xA0 ,0xEE ,0x05 ,0x5F ,0x00 ,0x00 ,0x2B ,0xDF ,0x08 ,0x00 ,0xA2 ,0xE6 ,0x05 , -0x80 ,0x67 ,0x80 ,0x63 , -0x01 ,0xA2 ,0x7A ,0x06 ,0x7C ,0x85 ,0x06 ,0x23 ,0x68 ,0x98 ,0x48 ,0x23 , -0xF8 ,0x88 ,0x07 ,0x23 , -0x80 ,0x00 ,0x06 ,0x87 ,0x80 ,0x63 ,0x7C ,0x85 ,0x00 ,0x23 ,0xDF ,0x00 , -0x00 ,0x63 ,0x4A ,0x00 , +0x80 ,0x67 ,0x80 ,0x63 ,0x01 ,0xA2 ,0x7A ,0x06 ,0x7C ,0x85 ,0x06 ,0x23 , +0x68 ,0x98 ,0x48 ,0x23 ,0xF8 ,0x88 ,0x07 ,0x23 ,0x80 ,0x00 ,0x06 ,0x87 , +0x80 ,0x63 ,0x7C ,0x85 ,0x00 ,0x23 ,0xDF ,0x00 ,0x00 ,0x63 ,0x4A ,0x00 ,0x06 ,0x61 ,0x00 ,0xA2 ,0x36 ,0x06 ,0x1D ,0x01 ,0x16 ,0xD4 ,0xC0 ,0x23 , -0x07 ,0x41 ,0x83 ,0x03 , -0x80 ,0x63 ,0x06 ,0xA6 ,0x1C ,0x06 ,0x00 ,0x33 ,0x37 ,0x00 ,0xC2 ,0x88 , -0x1D ,0x01 ,0x01 ,0xD6 , -0x20 ,0x23 ,0x63 ,0x60 ,0x83 ,0x03 ,0x80 ,0x63 ,0x02 ,0x23 ,0xDF ,0x00 , -0x07 ,0xA6 ,0x7C ,0x05 , +0x07 ,0x41 ,0x83 ,0x03 ,0x80 ,0x63 ,0x06 ,0xA6 ,0x1C ,0x06 ,0x00 ,0x33 , +0x37 ,0x00 ,0xC2 ,0x88 ,0x1D ,0x01 ,0x01 ,0xD6 ,0x20 ,0x23 ,0x63 ,0x60 , +0x83 ,0x03 ,0x80 ,0x63 ,0x02 ,0x23 ,0xDF ,0x00 ,0x07 ,0xA6 ,0x7C ,0x05 ,0xEF ,0x04 ,0x6F ,0x00 ,0x00 ,0x63 ,0x4B ,0x00 ,0x06 ,0x41 ,0xCB ,0x00 , -0x52 ,0x00 ,0x06 ,0x61 , -0x00 ,0xA2 ,0x4E ,0x06 ,0x1D ,0x01 ,0x03 ,0xCA ,0xC0 ,0x23 ,0x07 ,0x41 , -0x00 ,0x63 ,0x1D ,0x01 , -0x04 ,0xCC ,0x00 ,0x33 ,0x00 ,0x83 ,0xC0 ,0x20 ,0x81 ,0x62 ,0x80 ,0x23 , -0x07 ,0x41 ,0x00 ,0x63 , +0x52 ,0x00 ,0x06 ,0x61 ,0x00 ,0xA2 ,0x4E ,0x06 ,0x1D ,0x01 ,0x03 ,0xCA , +0xC0 ,0x23 ,0x07 ,0x41 ,0x00 ,0x63 ,0x1D ,0x01 ,0x04 ,0xCC ,0x00 ,0x33 , +0x00 ,0x83 ,0xC0 ,0x20 ,0x81 ,0x62 ,0x80 ,0x23 ,0x07 ,0x41 ,0x00 ,0x63 ,0x80 ,0x67 ,0x08 ,0x23 ,0x83 ,0x03 ,0x80 ,0x63 ,0x00 ,0x63 ,0x01 ,0x23 , -0xDF ,0x00 ,0x06 ,0xA6 , -0x84 ,0x06 ,0x07 ,0xA6 ,0x7C ,0x05 ,0x80 ,0x67 ,0x80 ,0x63 ,0x00 ,0x33 , -0x00 ,0x40 ,0xC0 ,0x20 , -0x81 ,0x62 ,0x00 ,0x63 ,0x00 ,0x00 ,0xFE ,0x95 ,0x83 ,0x03 ,0x80 ,0x63 , -0x06 ,0xA6 ,0x94 ,0x06 , +0xDF ,0x00 ,0x06 ,0xA6 ,0x84 ,0x06 ,0x07 ,0xA6 ,0x7C ,0x05 ,0x80 ,0x67 , +0x80 ,0x63 ,0x00 ,0x33 ,0x00 ,0x40 ,0xC0 ,0x20 ,0x81 ,0x62 ,0x00 ,0x63 , +0x00 ,0x00 ,0xFE ,0x95 ,0x83 ,0x03 ,0x80 ,0x63 ,0x06 ,0xA6 ,0x94 ,0x06 ,0x07 ,0xA6 ,0x7C ,0x05 ,0x00 ,0x00 ,0x01 ,0xA0 ,0x14 ,0x07 ,0x00 ,0x2B , -0x40 ,0x0E ,0x80 ,0x63 , -0x01 ,0x00 ,0x06 ,0xA6 ,0xAA ,0x06 ,0x07 ,0xA6 ,0x7C ,0x05 ,0x40 ,0x0E , -0x80 ,0x63 ,0x00 ,0x43 , -0x00 ,0xA0 ,0xA2 ,0x06 ,0x06 ,0xA6 ,0xBC ,0x06 ,0x07 ,0xA6 ,0x7C ,0x05 , -0x80 ,0x67 ,0x40 ,0x0E , +0x40 ,0x0E ,0x80 ,0x63 ,0x01 ,0x00 ,0x06 ,0xA6 ,0xAA ,0x06 ,0x07 ,0xA6 , +0x7C ,0x05 ,0x40 ,0x0E ,0x80 ,0x63 ,0x00 ,0x43 ,0x00 ,0xA0 ,0xA2 ,0x06 , +0x06 ,0xA6 ,0xBC ,0x06 ,0x07 ,0xA6 ,0x7C ,0x05 ,0x80 ,0x67 ,0x40 ,0x0E ,0x80 ,0x63 ,0x07 ,0xA6 ,0x7C ,0x05 ,0x00 ,0x23 ,0xDF ,0x00 ,0x00 ,0x63 , -0x07 ,0xA6 ,0xD6 ,0x06 , -0x00 ,0x33 ,0x2A ,0x00 ,0xC2 ,0x88 ,0x03 ,0x03 ,0x80 ,0x63 ,0x89 ,0x00 , -0x0A ,0x2B ,0x07 ,0xA6 , -0xE8 ,0x06 ,0x00 ,0x33 ,0x29 ,0x00 ,0xC2 ,0x88 ,0x00 ,0x43 ,0x00 ,0xA2 , -0xF4 ,0x06 ,0xC0 ,0x0E , +0x07 ,0xA6 ,0xD6 ,0x06 ,0x00 ,0x33 ,0x2A ,0x00 ,0xC2 ,0x88 ,0x03 ,0x03 , +0x80 ,0x63 ,0x89 ,0x00 ,0x0A ,0x2B ,0x07 ,0xA6 ,0xE8 ,0x06 ,0x00 ,0x33 , +0x29 ,0x00 ,0xC2 ,0x88 ,0x00 ,0x43 ,0x00 ,0xA2 ,0xF4 ,0x06 ,0xC0 ,0x0E ,0x80 ,0x63 ,0xDE ,0x86 ,0xC0 ,0x0E ,0x00 ,0x33 ,0x00 ,0x80 ,0xC0 ,0x20 , -0x81 ,0x62 ,0x04 ,0x01 , -0x02 ,0xDA ,0x80 ,0x63 ,0x7C ,0x85 ,0x80 ,0x7B ,0x80 ,0x63 ,0x06 ,0xA6 , -0x8C ,0x06 ,0x00 ,0x33 , -0x2C ,0x00 ,0xC2 ,0x88 ,0x0C ,0xA2 ,0x2E ,0x07 ,0xFE ,0x95 ,0x83 ,0x03 , -0x80 ,0x63 ,0x06 ,0xA6 , +0x81 ,0x62 ,0x04 ,0x01 ,0x02 ,0xDA ,0x80 ,0x63 ,0x7C ,0x85 ,0x80 ,0x7B , +0x80 ,0x63 ,0x06 ,0xA6 ,0x8C ,0x06 ,0x00 ,0x33 ,0x2C ,0x00 ,0xC2 ,0x88 , +0x0C ,0xA2 ,0x2E ,0x07 ,0xFE ,0x95 ,0x83 ,0x03 ,0x80 ,0x63 ,0x06 ,0xA6 ,0x2C ,0x07 ,0x07 ,0xA6 ,0x7C ,0x05 ,0x00 ,0x33 ,0x3D ,0x00 ,0xC2 ,0x88 , -0x00 ,0x00 ,0x80 ,0x67 , -0x83 ,0x03 ,0x80 ,0x63 ,0x0C ,0xA0 ,0x44 ,0x07 ,0x07 ,0xA6 ,0x7C ,0x05 , -0xBF ,0x23 ,0x04 ,0x61 , -0x84 ,0x01 ,0xE6 ,0x84 ,0x00 ,0x63 ,0xF0 ,0x04 ,0x01 ,0x01 ,0xF1 ,0x00 , -0x00 ,0x01 ,0xF2 ,0x00 , +0x00 ,0x00 ,0x80 ,0x67 ,0x83 ,0x03 ,0x80 ,0x63 ,0x0C ,0xA0 ,0x44 ,0x07 , +0x07 ,0xA6 ,0x7C ,0x05 ,0xBF ,0x23 ,0x04 ,0x61 ,0x84 ,0x01 ,0xE6 ,0x84 , +0x00 ,0x63 ,0xF0 ,0x04 ,0x01 ,0x01 ,0xF1 ,0x00 ,0x00 ,0x01 ,0xF2 ,0x00 ,0x01 ,0x05 ,0x80 ,0x01 ,0x72 ,0x04 ,0x71 ,0x00 ,0x81 ,0x01 ,0x70 ,0x04 , -0x80 ,0x05 ,0x81 ,0x05 , -0x00 ,0x63 ,0xF0 ,0x04 ,0xF2 ,0x00 ,0x72 ,0x04 ,0x01 ,0x01 ,0xF1 ,0x00 , -0x70 ,0x00 ,0x81 ,0x01 , -0x70 ,0x04 ,0x71 ,0x00 ,0x81 ,0x01 ,0x72 ,0x00 ,0x80 ,0x01 ,0x71 ,0x04 , -0x70 ,0x00 ,0x80 ,0x01 , +0x80 ,0x05 ,0x81 ,0x05 ,0x00 ,0x63 ,0xF0 ,0x04 ,0xF2 ,0x00 ,0x72 ,0x04 , +0x01 ,0x01 ,0xF1 ,0x00 ,0x70 ,0x00 ,0x81 ,0x01 ,0x70 ,0x04 ,0x71 ,0x00 , +0x81 ,0x01 ,0x72 ,0x00 ,0x80 ,0x01 ,0x71 ,0x04 ,0x70 ,0x00 ,0x80 ,0x01 ,0x70 ,0x04 ,0x00 ,0x63 ,0xF0 ,0x04 ,0xF2 ,0x00 ,0x72 ,0x04 ,0x00 ,0x01 , -0xF1 ,0x00 ,0x70 ,0x00 , -0x80 ,0x01 ,0x70 ,0x04 ,0x71 ,0x00 ,0x80 ,0x01 ,0x72 ,0x00 ,0x81 ,0x01 , -0x71 ,0x04 ,0x70 ,0x00 , -0x81 ,0x01 ,0x70 ,0x04 ,0x00 ,0x63 ,0x00 ,0x23 ,0xB3 ,0x01 ,0x83 ,0x05 , -0xA3 ,0x01 ,0xA2 ,0x01 , +0xF1 ,0x00 ,0x70 ,0x00 ,0x80 ,0x01 ,0x70 ,0x04 ,0x71 ,0x00 ,0x80 ,0x01 , +0x72 ,0x00 ,0x81 ,0x01 ,0x71 ,0x04 ,0x70 ,0x00 ,0x81 ,0x01 ,0x70 ,0x04 , +0x00 ,0x63 ,0x00 ,0x23 ,0xB3 ,0x01 ,0x83 ,0x05 ,0xA3 ,0x01 ,0xA2 ,0x01 ,0xA1 ,0x01 ,0x01 ,0x23 ,0xA0 ,0x01 ,0x00 ,0x01 ,0xC8 ,0x00 ,0x03 ,0xA1 , -0xC4 ,0x07 ,0x00 ,0x33 , -0x07 ,0x00 ,0xC2 ,0x88 ,0x80 ,0x05 ,0x81 ,0x05 ,0x04 ,0x01 ,0x11 ,0xC8 , -0x48 ,0x00 ,0xB0 ,0x01 , -0xB1 ,0x01 ,0x08 ,0x23 ,0xB2 ,0x01 ,0x05 ,0x01 ,0x48 ,0x04 ,0x00 ,0x43 , -0x00 ,0xA2 ,0xE4 ,0x07 , +0xC4 ,0x07 ,0x00 ,0x33 ,0x07 ,0x00 ,0xC2 ,0x88 ,0x80 ,0x05 ,0x81 ,0x05 , +0x04 ,0x01 ,0x11 ,0xC8 ,0x48 ,0x00 ,0xB0 ,0x01 ,0xB1 ,0x01 ,0x08 ,0x23 , +0xB2 ,0x01 ,0x05 ,0x01 ,0x48 ,0x04 ,0x00 ,0x43 ,0x00 ,0xA2 ,0xE4 ,0x07 ,0x00 ,0x05 ,0xDA ,0x87 ,0x00 ,0x01 ,0xC8 ,0x00 ,0xFF ,0x23 ,0x80 ,0x01 , -0x05 ,0x05 ,0x00 ,0x63 , -0xF7 ,0x04 ,0x1A ,0x09 ,0xF6 ,0x08 ,0x6E ,0x04 ,0x00 ,0x02 ,0x80 ,0x43 , -0x76 ,0x08 ,0x80 ,0x02 , -0x77 ,0x04 ,0x00 ,0x63 ,0xF7 ,0x04 ,0x1A ,0x09 ,0xF6 ,0x08 ,0x6E ,0x04 , -0x00 ,0x02 ,0x00 ,0xA0 , +0x05 ,0x05 ,0x00 ,0x63 ,0xF7 ,0x04 ,0x1A ,0x09 ,0xF6 ,0x08 ,0x6E ,0x04 , +0x00 ,0x02 ,0x80 ,0x43 ,0x76 ,0x08 ,0x80 ,0x02 ,0x77 ,0x04 ,0x00 ,0x63 , +0xF7 ,0x04 ,0x1A ,0x09 ,0xF6 ,0x08 ,0x6E ,0x04 ,0x00 ,0x02 ,0x00 ,0xA0 ,0x14 ,0x08 ,0x16 ,0x88 ,0x00 ,0x43 ,0x76 ,0x08 ,0x80 ,0x02 ,0x77 ,0x04 , -0x00 ,0x63 ,0xF3 ,0x04 , -0x00 ,0x23 ,0xF4 ,0x00 ,0x74 ,0x00 ,0x80 ,0x43 ,0xF4 ,0x00 ,0xCF ,0x40 , -0x00 ,0xA2 ,0x44 ,0x08 , -0x74 ,0x04 ,0x02 ,0x01 ,0xF7 ,0xC9 ,0xF6 ,0xD9 ,0x00 ,0x01 ,0x01 ,0xA1 , -0x24 ,0x08 ,0x04 ,0x98 , +0x00 ,0x63 ,0xF3 ,0x04 ,0x00 ,0x23 ,0xF4 ,0x00 ,0x74 ,0x00 ,0x80 ,0x43 , +0xF4 ,0x00 ,0xCF ,0x40 ,0x00 ,0xA2 ,0x44 ,0x08 ,0x74 ,0x04 ,0x02 ,0x01 , +0xF7 ,0xC9 ,0xF6 ,0xD9 ,0x00 ,0x01 ,0x01 ,0xA1 ,0x24 ,0x08 ,0x04 ,0x98 ,0x26 ,0x95 ,0x24 ,0x88 ,0x73 ,0x04 ,0x00 ,0x63 ,0xF3 ,0x04 ,0x75 ,0x04 , -0x5A ,0x88 ,0x02 ,0x01 , -0x04 ,0xD8 ,0x46 ,0x97 ,0x04 ,0x98 ,0x26 ,0x95 ,0x4A ,0x88 ,0x75 ,0x00 , -0x00 ,0xA3 ,0x64 ,0x08 , -0x00 ,0x05 ,0x4E ,0x88 ,0x73 ,0x04 ,0x00 ,0x63 ,0x80 ,0x7B ,0x80 ,0x63 , -0x06 ,0xA6 ,0x76 ,0x08 , +0x5A ,0x88 ,0x02 ,0x01 ,0x04 ,0xD8 ,0x46 ,0x97 ,0x04 ,0x98 ,0x26 ,0x95 , +0x4A ,0x88 ,0x75 ,0x00 ,0x00 ,0xA3 ,0x64 ,0x08 ,0x00 ,0x05 ,0x4E ,0x88 , +0x73 ,0x04 ,0x00 ,0x63 ,0x80 ,0x7B ,0x80 ,0x63 ,0x06 ,0xA6 ,0x76 ,0x08 ,0x00 ,0x33 ,0x3E ,0x00 ,0xC2 ,0x88 ,0x80 ,0x67 ,0x83 ,0x03 ,0x80 ,0x63 , -0x00 ,0x63 ,0x38 ,0x2B , -0x9C ,0x88 ,0x38 ,0x2B ,0x92 ,0x88 ,0x32 ,0x09 ,0x31 ,0x05 ,0x92 ,0x98 , -0x05 ,0x05 ,0xB2 ,0x09 , -0x00 ,0x63 ,0x00 ,0x32 ,0x00 ,0x36 ,0x00 ,0x3A ,0x00 ,0x3E ,0x00 ,0x63 , -0x80 ,0x32 ,0x80 ,0x36 , +0x00 ,0x63 ,0x38 ,0x2B ,0x9C ,0x88 ,0x38 ,0x2B ,0x92 ,0x88 ,0x32 ,0x09 , +0x31 ,0x05 ,0x92 ,0x98 ,0x05 ,0x05 ,0xB2 ,0x09 ,0x00 ,0x63 ,0x00 ,0x32 , +0x00 ,0x36 ,0x00 ,0x3A ,0x00 ,0x3E ,0x00 ,0x63 ,0x80 ,0x32 ,0x80 ,0x36 ,0x80 ,0x3A ,0x80 ,0x3E ,0xB4 ,0x3D ,0x00 ,0x63 ,0x38 ,0x2B ,0x40 ,0x32 , -0x40 ,0x36 ,0x40 ,0x3A , -0x40 ,0x3E ,0x00 ,0x63 ,0x5A ,0x20 ,0xC9 ,0x40 ,0x00 ,0xA0 ,0xB4 ,0x08 , -0x5D ,0x00 ,0xFE ,0xC3 , -0x00 ,0x63 ,0x80 ,0x73 ,0xE6 ,0x20 ,0x02 ,0x23 ,0xE8 ,0x00 ,0x82 ,0x73 , -0xFF ,0xFD ,0x80 ,0x73 , +0x40 ,0x36 ,0x40 ,0x3A ,0x40 ,0x3E ,0x00 ,0x63 ,0x5A ,0x20 ,0xC9 ,0x40 , +0x00 ,0xA0 ,0xB4 ,0x08 ,0x5D ,0x00 ,0xFE ,0xC3 ,0x00 ,0x63 ,0x80 ,0x73 , +0xE6 ,0x20 ,0x02 ,0x23 ,0xE8 ,0x00 ,0x82 ,0x73 ,0xFF ,0xFD ,0x80 ,0x73 ,0x13 ,0x23 ,0xF8 ,0x88 ,0x66 ,0x20 ,0xC0 ,0x20 ,0x04 ,0x23 ,0xA0 ,0x01 , -0xA1 ,0x23 ,0xA1 ,0x01 , -0x81 ,0x62 ,0xE2 ,0x88 ,0x80 ,0x73 ,0x80 ,0x77 ,0x68 ,0x00 ,0x00 ,0xA2 , -0x80 ,0x00 ,0x03 ,0xC2 , -0xF1 ,0xC7 ,0x41 ,0x23 ,0xF8 ,0x88 ,0x11 ,0x23 ,0xA1 ,0x01 ,0x04 ,0x23 , -0xA0 ,0x01 ,0xE6 ,0x84 , +0xA1 ,0x23 ,0xA1 ,0x01 ,0x81 ,0x62 ,0xE2 ,0x88 ,0x80 ,0x73 ,0x80 ,0x77 , +0x68 ,0x00 ,0x00 ,0xA2 ,0x80 ,0x00 ,0x03 ,0xC2 ,0xF1 ,0xC7 ,0x41 ,0x23 , +0xF8 ,0x88 ,0x11 ,0x23 ,0xA1 ,0x01 ,0x04 ,0x23 ,0xA0 ,0x01 ,0xE6 ,0x84 , };static ushort _asc_mcode_size =sizeof (_asc_mcode_buf);
@@ -10343,633 +10247,424 @@ AscMemWordSetLram(PortAddr iop_base, ushort s_addr, ushort set_wval, int words)/* Microcode buffer is kept after initialization for error recovery. */ static unsigned char _adv_asc3550_buf[] = {0x00 ,0x00 ,0x00 ,0xf2 ,0x00 ,0xf0 ,0x00 ,0x16 ,0x18 ,0xe4 ,0x00 ,0xfc , -0x01 ,0x00 ,0x48 ,0xe4 , -0xbe ,0x18 ,0x18 ,0x80 ,0x03 ,0xf6 ,0x02 ,0x00 ,0x00 ,0xfa ,0xff ,0xff , -0x28 ,0x0e ,0x9e ,0xe7 , -0xff ,0x00 ,0x82 ,0xe7 ,0x00 ,0xea ,0x00 ,0xf6 ,0x01 ,0xe6 ,0x09 ,0xe7 , -0x55 ,0xf0 ,0x01 ,0xf6 , +0x01 ,0x00 ,0x48 ,0xe4 ,0xbe ,0x18 ,0x18 ,0x80 ,0x03 ,0xf6 ,0x02 ,0x00 , +0x00 ,0xfa ,0xff ,0xff ,0x28 ,0x0e ,0x9e ,0xe7 ,0xff ,0x00 ,0x82 ,0xe7 , +0x00 ,0xea ,0x00 ,0xf6 ,0x01 ,0xe6 ,0x09 ,0xe7 ,0x55 ,0xf0 ,0x01 ,0xf6 ,0x01 ,0xfa ,0x08 ,0x00 ,0x03 ,0x00 ,0x04 ,0x00 ,0x18 ,0xf4 ,0x10 ,0x00 , -0x00 ,0xec ,0x85 ,0xf0 , -0xbc ,0x00 ,0xd5 ,0xf0 ,0x8e ,0x0c ,0x38 ,0x54 ,0x00 ,0xe6 ,0x1e ,0xf0 , -0x86 ,0xf0 ,0xb4 ,0x00 , -0x98 ,0x57 ,0xd0 ,0x01 ,0x0c ,0x1c ,0x3e ,0x1c ,0x0c ,0x00 ,0xbb ,0x00 , -0xaa ,0x18 ,0x02 ,0x80 , +0x00 ,0xec ,0x85 ,0xf0 ,0xbc ,0x00 ,0xd5 ,0xf0 ,0x8e ,0x0c ,0x38 ,0x54 , +0x00 ,0xe6 ,0x1e ,0xf0 ,0x86 ,0xf0 ,0xb4 ,0x00 ,0x98 ,0x57 ,0xd0 ,0x01 , +0x0c ,0x1c ,0x3e ,0x1c ,0x0c ,0x00 ,0xbb ,0x00 ,0xaa ,0x18 ,0x02 ,0x80 ,0x32 ,0xf0 ,0x01 ,0xfc ,0x88 ,0x0c ,0xc6 ,0x12 ,0x02 ,0x13 ,0x18 ,0x40 , -0x00 ,0x57 ,0x01 ,0xea , -0x3c ,0x00 ,0x6c ,0x01 ,0x6e ,0x01 ,0x04 ,0x12 ,0x3e ,0x57 ,0x00 ,0x80 , -0x03 ,0xe6 ,0xb6 ,0x00 , -0xc0 ,0x00 ,0x01 ,0x01 ,0x3e ,0x01 ,0xda ,0x0f ,0x22 ,0x10 ,0x08 ,0x12 , -0x02 ,0x4a ,0xb9 ,0x54 , +0x00 ,0x57 ,0x01 ,0xea ,0x3c ,0x00 ,0x6c ,0x01 ,0x6e ,0x01 ,0x04 ,0x12 , +0x3e ,0x57 ,0x00 ,0x80 ,0x03 ,0xe6 ,0xb6 ,0x00 ,0xc0 ,0x00 ,0x01 ,0x01 , +0x3e ,0x01 ,0xda ,0x0f ,0x22 ,0x10 ,0x08 ,0x12 ,0x02 ,0x4a ,0xb9 ,0x54 ,0x03 ,0x58 ,0x1b ,0x80 ,0x30 ,0xe4 ,0x4b ,0xe4 ,0x20 ,0x00 ,0x32 ,0x00 , -0x3e ,0x00 ,0x80 ,0x00 , -0x24 ,0x01 ,0x3c ,0x01 ,0x68 ,0x01 ,0x6a ,0x01 ,0x70 ,0x01 ,0x72 ,0x01 , -0x74 ,0x01 ,0x76 ,0x01 , -0x78 ,0x01 ,0x62 ,0x0a ,0x92 ,0x0c ,0x2c ,0x10 ,0x2e ,0x10 ,0x06 ,0x13 , -0x4c ,0x1c ,0xbb ,0x55 , +0x3e ,0x00 ,0x80 ,0x00 ,0x24 ,0x01 ,0x3c ,0x01 ,0x68 ,0x01 ,0x6a ,0x01 , +0x70 ,0x01 ,0x72 ,0x01 ,0x74 ,0x01 ,0x76 ,0x01 ,0x78 ,0x01 ,0x62 ,0x0a , +0x92 ,0x0c ,0x2c ,0x10 ,0x2e ,0x10 ,0x06 ,0x13 ,0x4c ,0x1c ,0xbb ,0x55 ,0x3c ,0x56 ,0x04 ,0x80 ,0x4a ,0xe4 ,0x02 ,0xee ,0x5b ,0xf0 ,0xb1 ,0xf0 , -0x03 ,0xf7 ,0x06 ,0xf7 , -0x03 ,0xfc ,0x0f ,0x00 ,0x40 ,0x00 ,0xbe ,0x00 ,0x00 ,0x01 ,0xb0 ,0x08 , -0x30 ,0x13 ,0x64 ,0x15 , -0x32 ,0x1c ,0x38 ,0x1c ,0x4e ,0x1c ,0x10 ,0x44 ,0x02 ,0x48 ,0x00 ,0x4c , -0x04 ,0xea ,0x5d ,0xf0 , +0x03 ,0xf7 ,0x06 ,0xf7 ,0x03 ,0xfc ,0x0f ,0x00 ,0x40 ,0x00 ,0xbe ,0x00 , +0x00 ,0x01 ,0xb0 ,0x08 ,0x30 ,0x13 ,0x64 ,0x15 ,0x32 ,0x1c ,0x38 ,0x1c , +0x4e ,0x1c ,0x10 ,0x44 ,0x02 ,0x48 ,0x00 ,0x4c ,0x04 ,0xea ,0x5d ,0xf0 ,0x04 ,0xf6 ,0x02 ,0xfc ,0x05 ,0x00 ,0x34 ,0x00 ,0x36 ,0x00 ,0x98 ,0x00 , -0xcc ,0x00 ,0x20 ,0x01 , -0x4e ,0x01 ,0x4e ,0x0b ,0x1e ,0x0e ,0x0c ,0x10 ,0x0a ,0x12 ,0x04 ,0x13 , -0x40 ,0x13 ,0x30 ,0x1c , -0x00 ,0x4e ,0xbd ,0x56 ,0x06 ,0x83 ,0x00 ,0xdc ,0x05 ,0xf0 ,0x09 ,0xf0 , -0x59 ,0xf0 ,0xa7 ,0xf0 , +0xcc ,0x00 ,0x20 ,0x01 ,0x4e ,0x01 ,0x4e ,0x0b ,0x1e ,0x0e ,0x0c ,0x10 , +0x0a ,0x12 ,0x04 ,0x13 ,0x40 ,0x13 ,0x30 ,0x1c ,0x00 ,0x4e ,0xbd ,0x56 , +0x06 ,0x83 ,0x00 ,0xdc ,0x05 ,0xf0 ,0x09 ,0xf0 ,0x59 ,0xf0 ,0xa7 ,0xf0 ,0xb8 ,0xf0 ,0x0e ,0xf7 ,0x06 ,0x00 ,0x19 ,0x00 ,0x33 ,0x00 ,0x9b ,0x00 , -0xa4 ,0x00 ,0xb5 ,0x00 , -0xba ,0x00 ,0xd0 ,0x00 ,0xe1 ,0x00 ,0xe7 ,0x00 ,0xde ,0x03 ,0x56 ,0x0a , -0x14 ,0x0e ,0x02 ,0x10 , -0x04 ,0x10 ,0x0a ,0x10 ,0x36 ,0x10 ,0x0a ,0x13 ,0x12 ,0x13 ,0x52 ,0x13 , -0x10 ,0x15 ,0x14 ,0x15 , +0xa4 ,0x00 ,0xb5 ,0x00 ,0xba ,0x00 ,0xd0 ,0x00 ,0xe1 ,0x00 ,0xe7 ,0x00 , +0xde ,0x03 ,0x56 ,0x0a ,0x14 ,0x0e ,0x02 ,0x10 ,0x04 ,0x10 ,0x0a ,0x10 , +0x36 ,0x10 ,0x0a ,0x13 ,0x12 ,0x13 ,0x52 ,0x13 ,0x10 ,0x15 ,0x14 ,0x15 ,0xac ,0x16 ,0x20 ,0x1c ,0x34 ,0x1c ,0x36 ,0x1c ,0x08 ,0x44 ,0x38 ,0x44 , -0x91 ,0x44 ,0x0a ,0x45 , -0x48 ,0x46 ,0x01 ,0x48 ,0x68 ,0x54 ,0x83 ,0x55 ,0xb0 ,0x57 ,0x01 ,0x58 , -0x83 ,0x59 ,0x05 ,0xe6 , -0x0b ,0xf0 ,0x0c ,0xf0 ,0x5c ,0xf0 ,0x4b ,0xf4 ,0x04 ,0xf8 ,0x05 ,0xf8 , -0x02 ,0xfa ,0x03 ,0xfa , +0x91 ,0x44 ,0x0a ,0x45 ,0x48 ,0x46 ,0x01 ,0x48 ,0x68 ,0x54 ,0x83 ,0x55 , +0xb0 ,0x57 ,0x01 ,0x58 ,0x83 ,0x59 ,0x05 ,0xe6 ,0x0b ,0xf0 ,0x0c ,0xf0 , +0x5c ,0xf0 ,0x4b ,0xf4 ,0x04 ,0xf8 ,0x05 ,0xf8 ,0x02 ,0xfa ,0x03 ,0xfa ,0x04 ,0xfc ,0x05 ,0xfc ,0x07 ,0x00 ,0x0a ,0x00 ,0x0d ,0x00 ,0x1c ,0x00 , -0x9e ,0x00 ,0xa8 ,0x00 , -0xaa ,0x00 ,0xb9 ,0x00 ,0xe0 ,0x00 ,0x22 ,0x01 ,0x26 ,0x01 ,0x79 ,0x01 , -0x7a ,0x01 ,0xc0 ,0x01 , -0xc2 ,0x01 ,0x7c ,0x02 ,0x5a ,0x03 ,0xea ,0x04 ,0xe8 ,0x07 ,0x68 ,0x08 , -0x69 ,0x08 ,0xba ,0x08 , +0x9e ,0x00 ,0xa8 ,0x00 ,0xaa ,0x00 ,0xb9 ,0x00 ,0xe0 ,0x00 ,0x22 ,0x01 , +0x26 ,0x01 ,0x79 ,0x01 ,0x7a ,0x01 ,0xc0 ,0x01 ,0xc2 ,0x01 ,0x7c ,0x02 , +0x5a ,0x03 ,0xea ,0x04 ,0xe8 ,0x07 ,0x68 ,0x08 ,0x69 ,0x08 ,0xba ,0x08 ,0xe9 ,0x09 ,0x06 ,0x0b ,0x3a ,0x0e ,0x00 ,0x10 ,0x1a ,0x10 ,0xed ,0x10 , -0xf1 ,0x10 ,0x06 ,0x12 , -0x0c ,0x13 ,0x16 ,0x13 ,0x1e ,0x13 ,0x82 ,0x13 ,0x42 ,0x14 ,0xd6 ,0x14 , -0x8a ,0x15 ,0xc6 ,0x17 , -0xd2 ,0x17 ,0x6b ,0x18 ,0x12 ,0x1c ,0x46 ,0x1c ,0x9c ,0x32 ,0x00 ,0x40 , -0x0e ,0x47 ,0x48 ,0x47 , +0xf1 ,0x10 ,0x06 ,0x12 ,0x0c ,0x13 ,0x16 ,0x13 ,0x1e ,0x13 ,0x82 ,0x13 , +0x42 ,0x14 ,0xd6 ,0x14 ,0x8a ,0x15 ,0xc6 ,0x17 ,0xd2 ,0x17 ,0x6b ,0x18 , +0x12 ,0x1c ,0x46 ,0x1c ,0x9c ,0x32 ,0x00 ,0x40 ,0x0e ,0x47 ,0x48 ,0x47 ,0x41 ,0x48 ,0x89 ,0x48 ,0x80 ,0x4c ,0x00 ,0x54 ,0x44 ,0x55 ,0xe5 ,0x55 , -0x14 ,0x56 ,0x77 ,0x57 , -0xbf ,0x57 ,0x40 ,0x5c ,0x06 ,0x80 ,0x08 ,0x90 ,0x03 ,0xa1 ,0xfe ,0x9c , -0xf0 ,0x29 ,0x02 ,0xfe , -0xb8 ,0x0c ,0xff ,0x10 ,0x00 ,0x00 ,0xd0 ,0xfe ,0xcc ,0x18 ,0x00 ,0xcf , -0xfe ,0x80 ,0x01 ,0xff , +0x14 ,0x56 ,0x77 ,0x57 ,0xbf ,0x57 ,0x40 ,0x5c ,0x06 ,0x80 ,0x08 ,0x90 , +0x03 ,0xa1 ,0xfe ,0x9c ,0xf0 ,0x29 ,0x02 ,0xfe ,0xb8 ,0x0c ,0xff ,0x10 , +0x00 ,0x00 ,0xd0 ,0xfe ,0xcc ,0x18 ,0x00 ,0xcf ,0xfe ,0x80 ,0x01 ,0xff ,0x03 ,0x00 ,0x00 ,0xfe ,0x93 ,0x15 ,0xfe ,0x0f ,0x05 ,0xff ,0x38 ,0x00 , -0x00 ,0xfe ,0x57 ,0x24 , -0x00 ,0xfe ,0x48 ,0x00 ,0x4f ,0xff ,0x04 ,0x00 ,0x00 ,0x10 ,0xff ,0x09 , -0x00 ,0x00 ,0xff ,0x08 , -0x01 ,0x01 ,0xff ,0x08 ,0xff ,0xff ,0xff ,0x27 ,0x00 ,0x00 ,0xff ,0x10 , -0xff ,0xff ,0xff ,0x0f , +0x00 ,0xfe ,0x57 ,0x24 ,0x00 ,0xfe ,0x48 ,0x00 ,0x4f ,0xff ,0x04 ,0x00 , +0x00 ,0x10 ,0xff ,0x09 ,0x00 ,0x00 ,0xff ,0x08 ,0x01 ,0x01 ,0xff ,0x08 , +0xff ,0xff ,0xff ,0x27 ,0x00 ,0x00 ,0xff ,0x10 ,0xff ,0xff ,0xff ,0x0f ,0x00 ,0x00 ,0xfe ,0x78 ,0x56 ,0xfe ,0x34 ,0x12 ,0xff ,0x21 ,0x00 ,0x00 , -0xfe ,0x04 ,0xf7 ,0xcf , -0x2a ,0x67 ,0x0b ,0x01 ,0xfe ,0xce ,0x0e ,0xfe ,0x04 ,0xf7 ,0xcf ,0x67 , -0x0b ,0x3c ,0x2a ,0xfe , -0x3d ,0xf0 ,0xfe ,0x02 ,0x02 ,0xfe ,0x20 ,0xf0 ,0x9c ,0xfe ,0x91 ,0xf0 , -0xfe ,0xf0 ,0x01 ,0xfe , +0xfe ,0x04 ,0xf7 ,0xcf ,0x2a ,0x67 ,0x0b ,0x01 ,0xfe ,0xce ,0x0e ,0xfe , +0x04 ,0xf7 ,0xcf ,0x67 ,0x0b ,0x3c ,0x2a ,0xfe ,0x3d ,0xf0 ,0xfe ,0x02 , +0x02 ,0xfe ,0x20 ,0xf0 ,0x9c ,0xfe ,0x91 ,0xf0 ,0xfe ,0xf0 ,0x01 ,0xfe ,0x90 ,0xf0 ,0xfe ,0xf0 ,0x01 ,0xfe ,0x8f ,0xf0 ,0x9c ,0x05 ,0x51 ,0x3b , -0x02 ,0xfe ,0xd4 ,0x0c , -0x01 ,0xfe ,0x44 ,0x0d ,0xfe ,0xdd ,0x12 ,0xfe ,0xfc ,0x10 ,0xfe ,0x28 , -0x1c ,0x05 ,0xfe ,0xa6 , -0x00 ,0xfe ,0xd3 ,0x12 ,0x47 ,0x18 ,0xfe ,0xa6 ,0x00 ,0xb5 ,0xfe ,0x48 , -0xf0 ,0xfe ,0x86 ,0x02 , +0x02 ,0xfe ,0xd4 ,0x0c ,0x01 ,0xfe ,0x44 ,0x0d ,0xfe ,0xdd ,0x12 ,0xfe , +0xfc ,0x10 ,0xfe ,0x28 ,0x1c ,0x05 ,0xfe ,0xa6 ,0x00 ,0xfe ,0xd3 ,0x12 , +0x47 ,0x18 ,0xfe ,0xa6 ,0x00 ,0xb5 ,0xfe ,0x48 ,0xf0 ,0xfe ,0x86 ,0x02 ,0xfe ,0x49 ,0xf0 ,0xfe ,0xa0 ,0x02 ,0xfe ,0x4a ,0xf0 ,0xfe ,0xbe ,0x02 , -0xfe ,0x46 ,0xf0 ,0xfe , -0x50 ,0x02 ,0xfe ,0x47 ,0xf0 ,0xfe ,0x56 ,0x02 ,0xfe ,0x43 ,0xf0 ,0xfe , -0x44 ,0x02 ,0xfe ,0x44 , -0xf0 ,0xfe ,0x48 ,0x02 ,0xfe ,0x45 ,0xf0 ,0xfe ,0x4c ,0x02 ,0x17 ,0x0b , -0xa0 ,0x17 ,0x06 ,0x18 , +0xfe ,0x46 ,0xf0 ,0xfe ,0x50 ,0x02 ,0xfe ,0x47 ,0xf0 ,0xfe ,0x56 ,0x02 , +0xfe ,0x43 ,0xf0 ,0xfe ,0x44 ,0x02 ,0xfe ,0x44 ,0xf0 ,0xfe ,0x48 ,0x02 , +0xfe ,0x45 ,0xf0 ,0xfe ,0x4c ,0x02 ,0x17 ,0x0b ,0xa0 ,0x17 ,0x06 ,0x18 ,0x96 ,0x02 ,0x29 ,0xfe ,0x00 ,0x1c ,0xde ,0xfe ,0x02 ,0x1c ,0xdd ,0xfe , -0x1e ,0x1c ,0xfe ,0xe9 , -0x10 ,0x01 ,0xfe ,0x20 ,0x17 ,0xfe ,0xe7 ,0x10 ,0xfe ,0x06 ,0xfc ,0xc7 , -0x0a ,0x6b ,0x01 ,0x9e , -0x02 ,0x29 ,0x14 ,0x4d ,0x37 ,0x97 ,0x01 ,0xfe ,0x64 ,0x0f ,0x0a ,0x6b , -0x01 ,0x82 ,0xfe ,0xbd , +0x1e ,0x1c ,0xfe ,0xe9 ,0x10 ,0x01 ,0xfe ,0x20 ,0x17 ,0xfe ,0xe7 ,0x10 , +0xfe ,0x06 ,0xfc ,0xc7 ,0x0a ,0x6b ,0x01 ,0x9e ,0x02 ,0x29 ,0x14 ,0x4d , +0x37 ,0x97 ,0x01 ,0xfe ,0x64 ,0x0f ,0x0a ,0x6b ,0x01 ,0x82 ,0xfe ,0xbd ,0x10 ,0x0a ,0x6b ,0x01 ,0x82 ,0xfe ,0xad ,0x10 ,0xfe ,0x16 ,0x1c ,0xfe , -0x58 ,0x1c ,0x17 ,0x06 , -0x18 ,0x96 ,0x2a ,0x25 ,0x29 ,0xfe ,0x3d ,0xf0 ,0xfe ,0x02 ,0x02 ,0x21 , -0xfe ,0x94 ,0x02 ,0xfe , -0x5a ,0x1c ,0xea ,0xfe ,0x14 ,0x1c ,0x14 ,0xfe ,0x30 ,0x00 ,0x37 ,0x97 , -0x01 ,0xfe ,0x54 ,0x0f , +0x58 ,0x1c ,0x17 ,0x06 ,0x18 ,0x96 ,0x2a ,0x25 ,0x29 ,0xfe ,0x3d ,0xf0 , +0xfe ,0x02 ,0x02 ,0x21 ,0xfe ,0x94 ,0x02 ,0xfe ,0x5a ,0x1c ,0xea ,0xfe , +0x14 ,0x1c ,0x14 ,0xfe ,0x30 ,0x00 ,0x37 ,0x97 ,0x01 ,0xfe ,0x54 ,0x0f ,0x17 ,0x06 ,0x18 ,0x96 ,0x02 ,0xd0 ,0x1e ,0x20 ,0x07 ,0x10 ,0x34 ,0xfe , -0x69 ,0x10 ,0x17 ,0x06 , -0x18 ,0x96 ,0xfe ,0x04 ,0xec ,0x20 ,0x46 ,0x3d ,0x12 ,0x20 ,0xfe ,0x05 , -0xf6 ,0xc7 ,0x01 ,0xfe , -0x52 ,0x16 ,0x09 ,0x4a ,0x4c ,0x35 ,0x11 ,0x2d ,0x3c ,0x8a ,0x01 ,0xe6 , -0x02 ,0x29 ,0x0a ,0x40 , +0x69 ,0x10 ,0x17 ,0x06 ,0x18 ,0x96 ,0xfe ,0x04 ,0xec ,0x20 ,0x46 ,0x3d , +0x12 ,0x20 ,0xfe ,0x05 ,0xf6 ,0xc7 ,0x01 ,0xfe ,0x52 ,0x16 ,0x09 ,0x4a , +0x4c ,0x35 ,0x11 ,0x2d ,0x3c ,0x8a ,0x01 ,0xe6 ,0x02 ,0x29 ,0x0a ,0x40 ,0x01 ,0x0e ,0x07 ,0x00 ,0x5d ,0x01 ,0x6f ,0xfe ,0x18 ,0x10 ,0xfe ,0x41 , -0x58 ,0x0a ,0x99 ,0x01 , -0x0e ,0xfe ,0xc8 ,0x54 ,0x64 ,0xfe ,0x0c ,0x03 ,0x01 ,0xe6 ,0x02 ,0x29 , -0x2a ,0x46 ,0xfe ,0x02 , -0xe8 ,0x27 ,0xf8 ,0xfe ,0x9e ,0x43 ,0xf7 ,0xfe ,0x27 ,0xf0 ,0xfe ,0xdc , -0x01 ,0xfe ,0x07 ,0x4b , +0x58 ,0x0a ,0x99 ,0x01 ,0x0e ,0xfe ,0xc8 ,0x54 ,0x64 ,0xfe ,0x0c ,0x03 , +0x01 ,0xe6 ,0x02 ,0x29 ,0x2a ,0x46 ,0xfe ,0x02 ,0xe8 ,0x27 ,0xf8 ,0xfe , +0x9e ,0x43 ,0xf7 ,0xfe ,0x27 ,0xf0 ,0xfe ,0xdc ,0x01 ,0xfe ,0x07 ,0x4b ,0xfe ,0x20 ,0xf0 ,0x9c ,0xfe ,0x40 ,0x1c ,0x25 ,0xd2 ,0xfe ,0x26 ,0xf0 , -0xfe ,0x56 ,0x03 ,0xfe , -0xa0 ,0xf0 ,0xfe ,0x44 ,0x03 ,0xfe ,0x11 ,0xf0 ,0x9c ,0xfe ,0xef ,0x10 , -0xfe ,0x9f ,0xf0 ,0xfe , -0x64 ,0x03 ,0xeb ,0x0f ,0xfe ,0x11 ,0x00 ,0x02 ,0x5a ,0x2a ,0xfe ,0x48 , -0x1c ,0xeb ,0x09 ,0x04 , +0xfe ,0x56 ,0x03 ,0xfe ,0xa0 ,0xf0 ,0xfe ,0x44 ,0x03 ,0xfe ,0x11 ,0xf0 , +0x9c ,0xfe ,0xef ,0x10 ,0xfe ,0x9f ,0xf0 ,0xfe ,0x64 ,0x03 ,0xeb ,0x0f , +0xfe ,0x11 ,0x00 ,0x02 ,0x5a ,0x2a ,0xfe ,0x48 ,0x1c ,0xeb ,0x09 ,0x04 ,0x1d ,0xfe ,0x18 ,0x13 ,0x23 ,0x1e ,0x98 ,0xac ,0x12 ,0x98 ,0x0a ,0x40 , -0x01 ,0x0e ,0xac ,0x75 , -0x01 ,0xfe ,0xbc ,0x15 ,0x11 ,0xca ,0x25 ,0xd2 ,0xfe ,0x01 ,0xf0 ,0xd2 , -0xfe ,0x82 ,0xf0 ,0xfe , -0x92 ,0x03 ,0xec ,0x11 ,0xfe ,0xe4 ,0x00 ,0x65 ,0xfe ,0xa4 ,0x03 ,0x25 , -0x32 ,0x1f ,0xfe ,0xb4 , +0x01 ,0x0e ,0xac ,0x75 ,0x01 ,0xfe ,0xbc ,0x15 ,0x11 ,0xca ,0x25 ,0xd2 , +0xfe ,0x01 ,0xf0 ,0xd2 ,0xfe ,0x82 ,0xf0 ,0xfe ,0x92 ,0x03 ,0xec ,0x11 , +0xfe ,0xe4 ,0x00 ,0x65 ,0xfe ,0xa4 ,0x03 ,0x25 ,0x32 ,0x1f ,0xfe ,0xb4 ,0x03 ,0x01 ,0x43 ,0xfe ,0x06 ,0xf0 ,0xfe ,0xc4 ,0x03 ,0x8d ,0x81 ,0xfe , -0x0a ,0xf0 ,0xfe ,0x7a , -0x06 ,0x02 ,0x22 ,0x05 ,0x6b ,0x28 ,0x16 ,0xfe ,0xf6 ,0x04 ,0x14 ,0x2c , -0x01 ,0x33 ,0x8f ,0xfe , -0x66 ,0x02 ,0x02 ,0xd1 ,0xeb ,0x2a ,0x67 ,0x1a ,0xfe ,0x67 ,0x1b ,0xf8 , -0xf7 ,0xfe ,0x48 ,0x1c , +0x0a ,0xf0 ,0xfe ,0x7a ,0x06 ,0x02 ,0x22 ,0x05 ,0x6b ,0x28 ,0x16 ,0xfe , +0xf6 ,0x04 ,0x14 ,0x2c ,0x01 ,0x33 ,0x8f ,0xfe ,0x66 ,0x02 ,0x02 ,0xd1 , +0xeb ,0x2a ,0x67 ,0x1a ,0xfe ,0x67 ,0x1b ,0xf8 ,0xf7 ,0xfe ,0x48 ,0x1c ,0x70 ,0x01 ,0x6e ,0x87 ,0x0a ,0x40 ,0x01 ,0x0e ,0x07 ,0x00 ,0x16 ,0xd3 , -0x0a ,0xca ,0x01 ,0x0e , -0x74 ,0x60 ,0x59 ,0x76 ,0x27 ,0x05 ,0x6b ,0x28 ,0xfe ,0x10 ,0x12 ,0x14 , -0x2c ,0x01 ,0x33 ,0x8f , -0xfe ,0x66 ,0x02 ,0x02 ,0xd1 ,0xbc ,0x7d ,0xbd ,0x7f ,0x25 ,0x22 ,0x65 , -0xfe ,0x3c ,0x04 ,0x1f , +0x0a ,0xca ,0x01 ,0x0e ,0x74 ,0x60 ,0x59 ,0x76 ,0x27 ,0x05 ,0x6b ,0x28 , +0xfe ,0x10 ,0x12 ,0x14 ,0x2c ,0x01 ,0x33 ,0x8f ,0xfe ,0x66 ,0x02 ,0x02 , +0xd1 ,0xbc ,0x7d ,0xbd ,0x7f ,0x25 ,0x22 ,0x65 ,0xfe ,0x3c ,0x04 ,0x1f ,0xfe ,0x38 ,0x04 ,0x68 ,0xfe ,0xa0 ,0x00 ,0xfe ,0x9b ,0x57 ,0xfe ,0x4e , -0x12 ,0x2b ,0xff ,0x02 , -0x00 ,0x10 ,0x01 ,0x08 ,0x1f ,0xfe ,0xe0 ,0x04 ,0x2b ,0x01 ,0x08 ,0x1f , -0x22 ,0x30 ,0x2e ,0xd5 , -0xfe ,0x4c ,0x44 ,0xfe ,0x4c ,0x12 ,0x60 ,0xfe ,0x44 ,0x48 ,0x13 ,0x2c , -0xfe ,0x4c ,0x54 ,0x64 , +0x12 ,0x2b ,0xff ,0x02 ,0x00 ,0x10 ,0x01 ,0x08 ,0x1f ,0xfe ,0xe0 ,0x04 , +0x2b ,0x01 ,0x08 ,0x1f ,0x22 ,0x30 ,0x2e ,0xd5 ,0xfe ,0x4c ,0x44 ,0xfe , +0x4c ,0x12 ,0x60 ,0xfe ,0x44 ,0x48 ,0x13 ,0x2c ,0xfe ,0x4c ,0x54 ,0x64 ,0xd3 ,0x46 ,0x76 ,0x27 ,0xfa ,0xef ,0xfe ,0x62 ,0x13 ,0x09 ,0x04 ,0x1d , -0xfe ,0x2a ,0x13 ,0x2f , -0x07 ,0x7e ,0xa5 ,0xfe ,0x20 ,0x10 ,0x13 ,0x2c ,0xfe ,0x4c ,0x54 ,0x64 , -0xd3 ,0xfa ,0xef ,0x86 , -0x09 ,0x04 ,0x1d ,0xfe ,0x08 ,0x13 ,0x2f ,0x07 ,0x7e ,0x6e ,0x09 ,0x04 , -0x1d ,0xfe ,0x1c ,0x12 , +0xfe ,0x2a ,0x13 ,0x2f ,0x07 ,0x7e ,0xa5 ,0xfe ,0x20 ,0x10 ,0x13 ,0x2c , +0xfe ,0x4c ,0x54 ,0x64 ,0xd3 ,0xfa ,0xef ,0x86 ,0x09 ,0x04 ,0x1d ,0xfe , +0x08 ,0x13 ,0x2f ,0x07 ,0x7e ,0x6e ,0x09 ,0x04 ,0x1d ,0xfe ,0x1c ,0x12 ,0x14 ,0x92 ,0x09 ,0x04 ,0x06 ,0x3b ,0x14 ,0xc4 ,0x01 ,0x33 ,0x8f ,0xfe , -0x70 ,0x0c ,0x02 ,0x22 , -0x2b ,0x11 ,0xfe ,0xe6 ,0x00 ,0xfe ,0x1c ,0x90 ,0xf9 ,0x03 ,0x14 ,0x92 , -0x01 ,0x33 ,0x02 ,0x29 , -0xfe ,0x42 ,0x5b ,0x67 ,0x1a ,0xfe ,0x46 ,0x59 ,0xf8 ,0xf7 ,0xfe ,0x87 , -0x80 ,0xfe ,0x31 ,0xe4 , +0x70 ,0x0c ,0x02 ,0x22 ,0x2b ,0x11 ,0xfe ,0xe6 ,0x00 ,0xfe ,0x1c ,0x90 , +0xf9 ,0x03 ,0x14 ,0x92 ,0x01 ,0x33 ,0x02 ,0x29 ,0xfe ,0x42 ,0x5b ,0x67 , +0x1a ,0xfe ,0x46 ,0x59 ,0xf8 ,0xf7 ,0xfe ,0x87 ,0x80 ,0xfe ,0x31 ,0xe4 ,0x4f ,0x09 ,0x04 ,0x0b ,0xfe ,0x78 ,0x13 ,0xfe ,0x20 ,0x80 ,0x07 ,0x1a , -0xfe ,0x70 ,0x12 ,0x49 , -0x04 ,0x06 ,0xfe ,0x60 ,0x13 ,0x05 ,0xfe ,0xa2 ,0x00 ,0x28 ,0x16 ,0xfe , -0x80 ,0x05 ,0xfe ,0x31 , -0xe4 ,0x6a ,0x49 ,0x04 ,0x0b ,0xfe ,0x4a ,0x13 ,0x05 ,0xfe ,0xa0 ,0x00 , -0x28 ,0xfe ,0x42 ,0x12 , +0xfe ,0x70 ,0x12 ,0x49 ,0x04 ,0x06 ,0xfe ,0x60 ,0x13 ,0x05 ,0xfe ,0xa2 , +0x00 ,0x28 ,0x16 ,0xfe ,0x80 ,0x05 ,0xfe ,0x31 ,0xe4 ,0x6a ,0x49 ,0x04 , +0x0b ,0xfe ,0x4a ,0x13 ,0x05 ,0xfe ,0xa0 ,0x00 ,0x28 ,0xfe ,0x42 ,0x12 ,0x5e ,0x01 ,0x08 ,0x25 ,0x32 ,0xf1 ,0x01 ,0x08 ,0x26 ,0xfe ,0x98 ,0x05 , -0x11 ,0xfe ,0xe3 ,0x00 , -0x23 ,0x49 ,0xfe ,0x4a ,0xf0 ,0xfe ,0x6a ,0x05 ,0xfe ,0x49 ,0xf0 ,0xfe , -0x64 ,0x05 ,0x83 ,0x24 , -0xfe ,0x21 ,0x00 ,0xa1 ,0x24 ,0xfe ,0x22 ,0x00 ,0xa0 ,0x24 ,0x4c ,0xfe , -0x09 ,0x48 ,0x01 ,0x08 , +0x11 ,0xfe ,0xe3 ,0x00 ,0x23 ,0x49 ,0xfe ,0x4a ,0xf0 ,0xfe ,0x6a ,0x05 , +0xfe ,0x49 ,0xf0 ,0xfe ,0x64 ,0x05 ,0x83 ,0x24 ,0xfe ,0x21 ,0x00 ,0xa1 , +0x24 ,0xfe ,0x22 ,0x00 ,0xa0 ,0x24 ,0x4c ,0xfe ,0x09 ,0x48 ,0x01 ,0x08 ,0x26 ,0xfe ,0x98 ,0x05 ,0xfe ,0xe2 ,0x08 ,0x49 ,0x04 ,0xc5 ,0x3b ,0x01 , -0x86 ,0x24 ,0x06 ,0x12 , -0xcc ,0x37 ,0xfe ,0x27 ,0x01 ,0x09 ,0x04 ,0x1d ,0xfe ,0x22 ,0x12 ,0x47 , -0x01 ,0xa7 ,0x14 ,0x92 , -0x09 ,0x04 ,0x06 ,0x3b ,0x14 ,0xc4 ,0x01 ,0x33 ,0x8f ,0xfe ,0x70 ,0x0c , -0x02 ,0x22 ,0x05 ,0xfe , +0x86 ,0x24 ,0x06 ,0x12 ,0xcc ,0x37 ,0xfe ,0x27 ,0x01 ,0x09 ,0x04 ,0x1d , +0xfe ,0x22 ,0x12 ,0x47 ,0x01 ,0xa7 ,0x14 ,0x92 ,0x09 ,0x04 ,0x06 ,0x3b , +0x14 ,0xc4 ,0x01 ,0x33 ,0x8f ,0xfe ,0x70 ,0x0c ,0x02 ,0x22 ,0x05 ,0xfe ,0x9c ,0x00 ,0x28 ,0xfe ,0x3e ,0x12 ,0x05 ,0x50 ,0x28 ,0xfe ,0x36 ,0x13 , -0x47 ,0x01 ,0xa7 ,0x26 , -0xfe ,0x08 ,0x06 ,0x0a ,0x06 ,0x49 ,0x04 ,0x19 ,0xfe ,0x02 ,0x12 ,0x5f , -0x01 ,0xfe ,0xaa ,0x14 , -0x1f ,0xfe ,0xfe ,0x05 ,0x11 ,0x9a ,0x01 ,0x43 ,0x11 ,0xfe ,0xe5 ,0x00 , -0x05 ,0x50 ,0xb4 ,0x0c , +0x47 ,0x01 ,0xa7 ,0x26 ,0xfe ,0x08 ,0x06 ,0x0a ,0x06 ,0x49 ,0x04 ,0x19 , +0xfe ,0x02 ,0x12 ,0x5f ,0x01 ,0xfe ,0xaa ,0x14 ,0x1f ,0xfe ,0xfe ,0x05 , +0x11 ,0x9a ,0x01 ,0x43 ,0x11 ,0xfe ,0xe5 ,0x00 ,0x05 ,0x50 ,0xb4 ,0x0c ,0x50 ,0x05 ,0xc6 ,0x28 ,0xfe ,0x62 ,0x12 ,0x05 ,0x3f ,0x28 ,0xfe ,0x5a , -0x13 ,0x01 ,0xfe ,0x14 , -0x18 ,0x01 ,0xfe ,0x66 ,0x18 ,0xfe ,0x43 ,0x48 ,0xb7 ,0x19 ,0x13 ,0x6c , -0xff ,0x02 ,0x00 ,0x57 , -0x48 ,0x8b ,0x1c ,0x3d ,0x85 ,0xb7 ,0x69 ,0x47 ,0x01 ,0xa7 ,0x26 ,0xfe , -0x72 ,0x06 ,0x49 ,0x04 , +0x13 ,0x01 ,0xfe ,0x14 ,0x18 ,0x01 ,0xfe ,0x66 ,0x18 ,0xfe ,0x43 ,0x48 , +0xb7 ,0x19 ,0x13 ,0x6c ,0xff ,0x02 ,0x00 ,0x57 ,0x48 ,0x8b ,0x1c ,0x3d , +0x85 ,0xb7 ,0x69 ,0x47 ,0x01 ,0xa7 ,0x26 ,0xfe ,0x72 ,0x06 ,0x49 ,0x04 ,0x1b ,0xdf ,0x89 ,0x0a ,0x4d ,0x01 ,0xfe ,0xd8 ,0x14 ,0x1f ,0xfe ,0x68 , -0x06 ,0x11 ,0x9a ,0x01 , -0x43 ,0x11 ,0xfe ,0xe5 ,0x00 ,0x05 ,0x3f ,0xb4 ,0x0c ,0x3f ,0x17 ,0x06 , -0x01 ,0xa7 ,0xec ,0x72 , -0x70 ,0x01 ,0x6e ,0x87 ,0x11 ,0xfe ,0xe2 ,0x00 ,0x01 ,0x08 ,0x25 ,0x32 , -0xfe ,0x0a ,0xf0 ,0xfe , +0x06 ,0x11 ,0x9a ,0x01 ,0x43 ,0x11 ,0xfe ,0xe5 ,0x00 ,0x05 ,0x3f ,0xb4 , +0x0c ,0x3f ,0x17 ,0x06 ,0x01 ,0xa7 ,0xec ,0x72 ,0x70 ,0x01 ,0x6e ,0x87 , +0x11 ,0xfe ,0xe2 ,0x00 ,0x01 ,0x08 ,0x25 ,0x32 ,0xfe ,0x0a ,0xf0 ,0xfe ,0xa6 ,0x06 ,0x8c ,0xfe ,0x5c ,0x07 ,0xfe ,0x06 ,0xf0 ,0xfe ,0x64 ,0x07 , -0x8d ,0x81 ,0x02 ,0x22 , -0x09 ,0x04 ,0x0b ,0xfe ,0x2e ,0x12 ,0x15 ,0x1a ,0x01 ,0x08 ,0x15 ,0x00 , -0x01 ,0x08 ,0x15 ,0x00 , -0x01 ,0x08 ,0x15 ,0x00 ,0x01 ,0x08 ,0xfe ,0x99 ,0xa4 ,0x01 ,0x08 ,0x15 , -0x00 ,0x02 ,0xfe ,0x32 , +0x8d ,0x81 ,0x02 ,0x22 ,0x09 ,0x04 ,0x0b ,0xfe ,0x2e ,0x12 ,0x15 ,0x1a , +0x01 ,0x08 ,0x15 ,0x00 ,0x01 ,0x08 ,0x15 ,0x00 ,0x01 ,0x08 ,0x15 ,0x00 , +0x01 ,0x08 ,0xfe ,0x99 ,0xa4 ,0x01 ,0x08 ,0x15 ,0x00 ,0x02 ,0xfe ,0x32 ,0x08 ,0x61 ,0x04 ,0x1b ,0xfe ,0x38 ,0x12 ,0x09 ,0x04 ,0x1b ,0x6e ,0x15 , -0xfe ,0x1b ,0x00 ,0x01 , -0x08 ,0x15 ,0x00 ,0x01 ,0x08 ,0x15 ,0x00 ,0x01 ,0x08 ,0x15 ,0x00 ,0x01 , -0x08 ,0x15 ,0x06 ,0x01 , -0x08 ,0x15 ,0x00 ,0x02 ,0xd9 ,0x66 ,0x4c ,0xfe ,0x3a ,0x55 ,0x5f ,0xfe , -0x9a ,0x81 ,0x4b ,0x1d , +0xfe ,0x1b ,0x00 ,0x01 ,0x08 ,0x15 ,0x00 ,0x01 ,0x08 ,0x15 ,0x00 ,0x01 , +0x08 ,0x15 ,0x00 ,0x01 ,0x08 ,0x15 ,0x06 ,0x01 ,0x08 ,0x15 ,0x00 ,0x02 , +0xd9 ,0x66 ,0x4c ,0xfe ,0x3a ,0x55 ,0x5f ,0xfe ,0x9a ,0x81 ,0x4b ,0x1d ,0xba ,0xfe ,0x32 ,0x07 ,0x0a ,0x1d ,0xfe ,0x09 ,0x6f ,0xaf ,0xfe ,0xca , -0x45 ,0xfe ,0x32 ,0x12 , -0x62 ,0x2c ,0x85 ,0x66 ,0x7b ,0x01 ,0x08 ,0x25 ,0x32 ,0xfe ,0x0a ,0xf0 , -0xfe ,0x32 ,0x07 ,0x8d , -0x81 ,0x8c ,0xfe ,0x5c ,0x07 ,0x02 ,0x22 ,0x01 ,0x43 ,0x02 ,0xfe ,0x8a , -0x06 ,0x15 ,0x19 ,0x02 , +0x45 ,0xfe ,0x32 ,0x12 ,0x62 ,0x2c ,0x85 ,0x66 ,0x7b ,0x01 ,0x08 ,0x25 , +0x32 ,0xfe ,0x0a ,0xf0 ,0xfe ,0x32 ,0x07 ,0x8d ,0x81 ,0x8c ,0xfe ,0x5c , +0x07 ,0x02 ,0x22 ,0x01 ,0x43 ,0x02 ,0xfe ,0x8a ,0x06 ,0x15 ,0x19 ,0x02 ,0xfe ,0x8a ,0x06 ,0xfe ,0x9c ,0xf7 ,0xd4 ,0xfe ,0x2c ,0x90 ,0xfe ,0xae , -0x90 ,0x77 ,0xfe ,0xca , -0x07 ,0x0c ,0x54 ,0x18 ,0x55 ,0x09 ,0x4a ,0x6a ,0x35 ,0x1e ,0x20 ,0x07 , -0x10 ,0xfe ,0x0e ,0x12 , -0x74 ,0xfe ,0x80 ,0x80 ,0x37 ,0x20 ,0x63 ,0x27 ,0xfe ,0x06 ,0x10 ,0xfe , -0x83 ,0xe7 ,0xc4 ,0xa1 , +0x90 ,0x77 ,0xfe ,0xca ,0x07 ,0x0c ,0x54 ,0x18 ,0x55 ,0x09 ,0x4a ,0x6a , +0x35 ,0x1e ,0x20 ,0x07 ,0x10 ,0xfe ,0x0e ,0x12 ,0x74 ,0xfe ,0x80 ,0x80 , +0x37 ,0x20 ,0x63 ,0x27 ,0xfe ,0x06 ,0x10 ,0xfe ,0x83 ,0xe7 ,0xc4 ,0xa1 ,0xfe ,0x03 ,0x40 ,0x09 ,0x4a ,0x4f ,0x35 ,0x01 ,0xa8 ,0xad ,0xfe ,0x1f , -0x40 ,0x12 ,0x58 ,0x01 , -0xa5 ,0xfe ,0x08 ,0x50 ,0xfe ,0x8a ,0x50 ,0xfe ,0x44 ,0x51 ,0xfe ,0xc6 , -0x51 ,0x83 ,0xfb ,0xfe , -0x8a ,0x90 ,0x0c ,0x52 ,0x18 ,0x53 ,0xfe ,0x0c ,0x90 ,0xfe ,0x8e ,0x90 , -0xfe ,0x40 ,0x50 ,0xfe , +0x40 ,0x12 ,0x58 ,0x01 ,0xa5 ,0xfe ,0x08 ,0x50 ,0xfe ,0x8a ,0x50 ,0xfe , +0x44 ,0x51 ,0xfe ,0xc6 ,0x51 ,0x83 ,0xfb ,0xfe ,0x8a ,0x90 ,0x0c ,0x52 , +0x18 ,0x53 ,0xfe ,0x0c ,0x90 ,0xfe ,0x8e ,0x90 ,0xfe ,0x40 ,0x50 ,0xfe ,0xc2 ,0x50 ,0x0c ,0x39 ,0x18 ,0x3a ,0xfe ,0x4a ,0x10 ,0x09 ,0x04 ,0x6a , -0xfe ,0x2a ,0x12 ,0xfe , -0x2c ,0x90 ,0xfe ,0xae ,0x90 ,0x0c ,0x54 ,0x18 ,0x55 ,0x09 ,0x04 ,0x4f , -0x85 ,0x01 ,0xa8 ,0xfe , -0x1f ,0x80 ,0x12 ,0x58 ,0xfe ,0x44 ,0x90 ,0xfe ,0xc6 ,0x90 ,0x0c ,0x56 , -0x18 ,0x57 ,0xfb ,0xfe , +0xfe ,0x2a ,0x12 ,0xfe ,0x2c ,0x90 ,0xfe ,0xae ,0x90 ,0x0c ,0x54 ,0x18 , +0x55 ,0x09 ,0x04 ,0x4f ,0x85 ,0x01 ,0xa8 ,0xfe ,0x1f ,0x80 ,0x12 ,0x58 , +0xfe ,0x44 ,0x90 ,0xfe ,0xc6 ,0x90 ,0x0c ,0x56 ,0x18 ,0x57 ,0xfb ,0xfe ,0x8a ,0x90 ,0x0c ,0x52 ,0x18 ,0x53 ,0xfe ,0x40 ,0x90 ,0xfe ,0xc2 ,0x90 , -0x0c ,0x39 ,0x18 ,0x3a , -0x0c ,0x38 ,0x18 ,0x4e ,0x09 ,0x4a ,0x19 ,0x35 ,0x2a ,0x13 ,0xfe ,0x4e , -0x11 ,0x65 ,0xfe ,0x48 , -0x08 ,0xfe ,0x9e ,0xf0 ,0xfe ,0x5c ,0x08 ,0xb1 ,0x16 ,0x32 ,0x2a ,0x73 , -0xdd ,0xb8 ,0xfe ,0x80 , +0x0c ,0x39 ,0x18 ,0x3a ,0x0c ,0x38 ,0x18 ,0x4e ,0x09 ,0x4a ,0x19 ,0x35 , +0x2a ,0x13 ,0xfe ,0x4e ,0x11 ,0x65 ,0xfe ,0x48 ,0x08 ,0xfe ,0x9e ,0xf0 , +0xfe ,0x5c ,0x08 ,0xb1 ,0x16 ,0x32 ,0x2a ,0x73 ,0xdd ,0xb8 ,0xfe ,0x80 ,0x08 ,0xb9 ,0xfe ,0x9e ,0x08 ,0x8c ,0xfe ,0x74 ,0x08 ,0xfe ,0x06 ,0xf0 , -0xfe ,0x7a ,0x08 ,0x8d , -0x81 ,0x02 ,0x22 ,0x01 ,0x43 ,0xfe ,0xc9 ,0x10 ,0x15 ,0x19 ,0xfe ,0xc9 , -0x10 ,0x61 ,0x04 ,0x06 , -0xfe ,0x10 ,0x12 ,0x61 ,0x04 ,0x0b ,0x45 ,0x09 ,0x04 ,0x0b ,0xfe ,0x68 , -0x12 ,0xfe ,0x2e ,0x1c , +0xfe ,0x7a ,0x08 ,0x8d ,0x81 ,0x02 ,0x22 ,0x01 ,0x43 ,0xfe ,0xc9 ,0x10 , +0x15 ,0x19 ,0xfe ,0xc9 ,0x10 ,0x61 ,0x04 ,0x06 ,0xfe ,0x10 ,0x12 ,0x61 , +0x04 ,0x0b ,0x45 ,0x09 ,0x04 ,0x0b ,0xfe ,0x68 ,0x12 ,0xfe ,0x2e ,0x1c ,0x02 ,0xfe ,0x24 ,0x0a ,0x61 ,0x04 ,0x06 ,0x45 ,0x61 ,0x04 ,0x0b ,0xfe , -0x52 ,0x12 ,0xfe ,0x2c , -0x1c ,0xfe ,0xaa ,0xf0 ,0xfe ,0x1e ,0x09 ,0xfe ,0xac ,0xf0 ,0xfe ,0xbe , -0x08 ,0xfe ,0x8a ,0x10 , -0xaa ,0xfe ,0xf3 ,0x10 ,0xfe ,0xad ,0xf0 ,0xfe ,0xca ,0x08 ,0x02 ,0xfe , -0x24 ,0x0a ,0xab ,0xfe , +0x52 ,0x12 ,0xfe ,0x2c ,0x1c ,0xfe ,0xaa ,0xf0 ,0xfe ,0x1e ,0x09 ,0xfe , +0xac ,0xf0 ,0xfe ,0xbe ,0x08 ,0xfe ,0x8a ,0x10 ,0xaa ,0xfe ,0xf3 ,0x10 , +0xfe ,0xad ,0xf0 ,0xfe ,0xca ,0x08 ,0x02 ,0xfe ,0x24 ,0x0a ,0xab ,0xfe ,0xe7 ,0x10 ,0xfe ,0x2b ,0xf0 ,0x9d ,0xe9 ,0x1c ,0xfe ,0x00 ,0xfe ,0xfe , -0x1c ,0x12 ,0xb5 ,0xfe , -0xd2 ,0xf0 ,0x9d ,0xfe ,0x76 ,0x18 ,0x1c ,0x1a ,0x16 ,0x9d ,0x05 ,0xcb , -0x1c ,0x06 ,0x16 ,0x9d , -0xb8 ,0x6d ,0xb9 ,0x6d ,0xaa ,0xab ,0xfe ,0xb1 ,0x10 ,0x70 ,0x5e ,0x2b , -0x14 ,0x92 ,0x01 ,0x33 , +0x1c ,0x12 ,0xb5 ,0xfe ,0xd2 ,0xf0 ,0x9d ,0xfe ,0x76 ,0x18 ,0x1c ,0x1a , +0x16 ,0x9d ,0x05 ,0xcb ,0x1c ,0x06 ,0x16 ,0x9d ,0xb8 ,0x6d ,0xb9 ,0x6d , +0xaa ,0xab ,0xfe ,0xb1 ,0x10 ,0x70 ,0x5e ,0x2b ,0x14 ,0x92 ,0x01 ,0x33 ,0x0f ,0xfe ,0x35 ,0x00 ,0xfe ,0x01 ,0xf0 ,0x5a ,0x0f ,0x7c ,0x02 ,0x5a , -0xfe ,0x74 ,0x18 ,0x1c , -0xfe ,0x00 ,0xf8 ,0x16 ,0x6d ,0x67 ,0x1b ,0x01 ,0xfe ,0x44 ,0x0d ,0x3b , -0x01 ,0xe6 ,0x1e ,0x27 , -0x74 ,0x67 ,0x1a ,0x02 ,0x6d ,0x09 ,0x04 ,0x0b ,0x21 ,0xfe ,0x06 ,0x0a , -0x09 ,0x04 ,0x6a ,0xfe , +0xfe ,0x74 ,0x18 ,0x1c ,0xfe ,0x00 ,0xf8 ,0x16 ,0x6d ,0x67 ,0x1b ,0x01 , +0xfe ,0x44 ,0x0d ,0x3b ,0x01 ,0xe6 ,0x1e ,0x27 ,0x74 ,0x67 ,0x1a ,0x02 , +0x6d ,0x09 ,0x04 ,0x0b ,0x21 ,0xfe ,0x06 ,0x0a ,0x09 ,0x04 ,0x6a ,0xfe ,0x82 ,0x12 ,0x09 ,0x04 ,0x19 ,0xfe ,0x66 ,0x13 ,0x1e ,0x58 ,0xac ,0xfc , -0xfe ,0x83 ,0x80 ,0xfe , -0xc8 ,0x44 ,0xfe ,0x2e ,0x13 ,0xfe ,0x04 ,0x91 ,0xfe ,0x86 ,0x91 ,0x63 , -0x27 ,0xfe ,0x40 ,0x59 , -0xfe ,0xc1 ,0x59 ,0x77 ,0xd7 ,0x05 ,0x54 ,0x31 ,0x55 ,0x0c ,0x7b ,0x18 , -0x7c ,0xbe ,0x54 ,0xbf , +0xfe ,0x83 ,0x80 ,0xfe ,0xc8 ,0x44 ,0xfe ,0x2e ,0x13 ,0xfe ,0x04 ,0x91 , +0xfe ,0x86 ,0x91 ,0x63 ,0x27 ,0xfe ,0x40 ,0x59 ,0xfe ,0xc1 ,0x59 ,0x77 , +0xd7 ,0x05 ,0x54 ,0x31 ,0x55 ,0x0c ,0x7b ,0x18 ,0x7c ,0xbe ,0x54 ,0xbf ,0x55 ,0x01 ,0xa8 ,0xad ,0x63 ,0x27 ,0x12 ,0x58 ,0xc0 ,0x38 ,0xc1 ,0x4e , -0x79 ,0x56 ,0x68 ,0x57 , -0xf4 ,0xf5 ,0xfe ,0x04 ,0xfa ,0x38 ,0xfe ,0x05 ,0xfa ,0x4e ,0x01 ,0xa5 , -0xa2 ,0x23 ,0x0c ,0x7b , -0x0c ,0x7c ,0x79 ,0x56 ,0x68 ,0x57 ,0xfe ,0x12 ,0x10 ,0x09 ,0x04 ,0x19 , -0x16 ,0xd7 ,0x79 ,0x39 , +0x79 ,0x56 ,0x68 ,0x57 ,0xf4 ,0xf5 ,0xfe ,0x04 ,0xfa ,0x38 ,0xfe ,0x05 , +0xfa ,0x4e ,0x01 ,0xa5 ,0xa2 ,0x23 ,0x0c ,0x7b ,0x0c ,0x7c ,0x79 ,0x56 , +0x68 ,0x57 ,0xfe ,0x12 ,0x10 ,0x09 ,0x04 ,0x19 ,0x16 ,0xd7 ,0x79 ,0x39 ,0x68 ,0x3a ,0x09 ,0x04 ,0xfe ,0xf7 ,0x00 ,0x35 ,0x05 ,0x52 ,0x31 ,0x53 , -0xfe ,0x10 ,0x58 ,0xfe , -0x91 ,0x58 ,0xfe ,0x14 ,0x59 ,0xfe ,0x95 ,0x59 ,0x02 ,0x6d ,0x09 ,0x04 , -0x19 ,0x16 ,0xd7 ,0x09 , -0x04 ,0xfe ,0xf7 ,0x00 ,0x35 ,0xfe ,0x3a ,0x55 ,0xfe ,0x19 ,0x81 ,0x5f , -0xfe ,0x10 ,0x90 ,0xfe , +0xfe ,0x10 ,0x58 ,0xfe ,0x91 ,0x58 ,0xfe ,0x14 ,0x59 ,0xfe ,0x95 ,0x59 , +0x02 ,0x6d ,0x09 ,0x04 ,0x19 ,0x16 ,0xd7 ,0x09 ,0x04 ,0xfe ,0xf7 ,0x00 , +0x35 ,0xfe ,0x3a ,0x55 ,0xfe ,0x19 ,0x81 ,0x5f ,0xfe ,0x10 ,0x90 ,0xfe ,0x92 ,0x90 ,0xfe ,0xd7 ,0x10 ,0x2f ,0x07 ,0x9b ,0x16 ,0xfe ,0xc6 ,0x08 , -0x11 ,0x9b ,0x09 ,0x04 , -0x0b ,0xfe ,0x14 ,0x13 ,0x05 ,0x39 ,0x31 ,0x3a ,0x77 ,0xfe ,0xc6 ,0x08 , -0xfe ,0x0c ,0x58 ,0xfe , -0x8d ,0x58 ,0x02 ,0x6d ,0x23 ,0x47 ,0xfe ,0x19 ,0x80 ,0xde ,0x09 ,0x04 , -0x0b ,0xfe ,0x1a ,0x12 , +0x11 ,0x9b ,0x09 ,0x04 ,0x0b ,0xfe ,0x14 ,0x13 ,0x05 ,0x39 ,0x31 ,0x3a , +0x77 ,0xfe ,0xc6 ,0x08 ,0xfe ,0x0c ,0x58 ,0xfe ,0x8d ,0x58 ,0x02 ,0x6d , +0x23 ,0x47 ,0xfe ,0x19 ,0x80 ,0xde ,0x09 ,0x04 ,0x0b ,0xfe ,0x1a ,0x12 ,0xfe ,0x6c ,0x19 ,0xfe ,0x19 ,0x41 ,0xe9 ,0xb5 ,0xfe ,0xd1 ,0xf0 ,0xd9 , -0x14 ,0x7a ,0x01 ,0x33 , -0x0f ,0xfe ,0x44 ,0x00 ,0xfe ,0x8e ,0x10 ,0xfe ,0x6c ,0x19 ,0xbe ,0x39 , -0xfe ,0xed ,0x19 ,0xbf , -0x3a ,0xfe ,0x0c ,0x51 ,0xfe ,0x8e ,0x51 ,0xe9 ,0x1c ,0xfe ,0x00 ,0xff , -0x34 ,0xfe ,0x74 ,0x10 , +0x14 ,0x7a ,0x01 ,0x33 ,0x0f ,0xfe ,0x44 ,0x00 ,0xfe ,0x8e ,0x10 ,0xfe , +0x6c ,0x19 ,0xbe ,0x39 ,0xfe ,0xed ,0x19 ,0xbf ,0x3a ,0xfe ,0x0c ,0x51 , +0xfe ,0x8e ,0x51 ,0xe9 ,0x1c ,0xfe ,0x00 ,0xff ,0x34 ,0xfe ,0x74 ,0x10 ,0xb5 ,0xfe ,0xd2 ,0xf0 ,0xfe ,0xb2 ,0x0a ,0xfe ,0x76 ,0x18 ,0x1c ,0x1a , -0x84 ,0x05 ,0xcb ,0x1c , -0x06 ,0xfe ,0x08 ,0x13 ,0x0f ,0xfe ,0x16 ,0x00 ,0x02 ,0x5a ,0xfe ,0xd1 , -0xf0 ,0xfe ,0xc4 ,0x0a , -0x14 ,0x7a ,0x01 ,0x33 ,0x0f ,0xfe ,0x17 ,0x00 ,0xfe ,0x42 ,0x10 ,0xfe , -0xce ,0xf0 ,0xfe ,0xca , +0x84 ,0x05 ,0xcb ,0x1c ,0x06 ,0xfe ,0x08 ,0x13 ,0x0f ,0xfe ,0x16 ,0x00 , +0x02 ,0x5a ,0xfe ,0xd1 ,0xf0 ,0xfe ,0xc4 ,0x0a ,0x14 ,0x7a ,0x01 ,0x33 , +0x0f ,0xfe ,0x17 ,0x00 ,0xfe ,0x42 ,0x10 ,0xfe ,0xce ,0xf0 ,0xfe ,0xca ,0x0a ,0xfe ,0x3c ,0x10 ,0xfe ,0xcd ,0xf0 ,0xfe ,0xd6 ,0x0a ,0x0f ,0xfe , -0x22 ,0x00 ,0x02 ,0x5a , -0xfe ,0xcb ,0xf0 ,0xfe ,0xe2 ,0x0a ,0x0f ,0xfe ,0x24 ,0x00 ,0x02 ,0x5a , -0xfe ,0xd0 ,0xf0 ,0xfe , -0xec ,0x0a ,0x0f ,0x93 ,0xdc ,0xfe ,0xcf ,0xf0 ,0xfe ,0xf6 ,0x0a ,0x0f , -0x4c ,0xfe ,0x10 ,0x10 , +0x22 ,0x00 ,0x02 ,0x5a ,0xfe ,0xcb ,0xf0 ,0xfe ,0xe2 ,0x0a ,0x0f ,0xfe , +0x24 ,0x00 ,0x02 ,0x5a ,0xfe ,0xd0 ,0xf0 ,0xfe ,0xec ,0x0a ,0x0f ,0x93 , +0xdc ,0xfe ,0xcf ,0xf0 ,0xfe ,0xf6 ,0x0a ,0x0f ,0x4c ,0xfe ,0x10 ,0x10 ,0xfe ,0xcc ,0xf0 ,0xd9 ,0x61 ,0x04 ,0x19 ,0x3b ,0x0f ,0xfe ,0x12 ,0x00 , -0x2a ,0x13 ,0xfe ,0x4e , -0x11 ,0x65 ,0xfe ,0x0c ,0x0b ,0xfe ,0x9e ,0xf0 ,0xfe ,0x20 ,0x0b ,0xb1 , -0x16 ,0x32 ,0x2a ,0x73 , -0xdd ,0xb8 ,0x22 ,0xb9 ,0x22 ,0x2a ,0xec ,0x65 ,0xfe ,0x2c ,0x0b ,0x25 , -0x32 ,0x8c ,0xfe ,0x48 , +0x2a ,0x13 ,0xfe ,0x4e ,0x11 ,0x65 ,0xfe ,0x0c ,0x0b ,0xfe ,0x9e ,0xf0 , +0xfe ,0x20 ,0x0b ,0xb1 ,0x16 ,0x32 ,0x2a ,0x73 ,0xdd ,0xb8 ,0x22 ,0xb9 , +0x22 ,0x2a ,0xec ,0x65 ,0xfe ,0x2c ,0x0b ,0x25 ,0x32 ,0x8c ,0xfe ,0x48 ,0x0b ,0x8d ,0x81 ,0xb8 ,0xd4 ,0xb9 ,0xd4 ,0x02 ,0x22 ,0x01 ,0x43 ,0xfe , -0xdb ,0x10 ,0x11 ,0xfe , -0xe8 ,0x00 ,0xaa ,0xab ,0x70 ,0xbc ,0x7d ,0xbd ,0x7f ,0xfe ,0x89 ,0xf0 , -0x22 ,0x30 ,0x2e ,0xd8 , -0xbc ,0x7d ,0xbd ,0x7f ,0x01 ,0x08 ,0x1f ,0x22 ,0x30 ,0x2e ,0xd6 ,0xb1 , -0x45 ,0x0f ,0xfe ,0x42 , +0xdb ,0x10 ,0x11 ,0xfe ,0xe8 ,0x00 ,0xaa ,0xab ,0x70 ,0xbc ,0x7d ,0xbd , +0x7f ,0xfe ,0x89 ,0xf0 ,0x22 ,0x30 ,0x2e ,0xd8 ,0xbc ,0x7d ,0xbd ,0x7f , +0x01 ,0x08 ,0x1f ,0x22 ,0x30 ,0x2e ,0xd6 ,0xb1 ,0x45 ,0x0f ,0xfe ,0x42 ,0x00 ,0x02 ,0x5a ,0x78 ,0x06 ,0xfe ,0x81 ,0x49 ,0x16 ,0xfe ,0x38 ,0x0c , -0x09 ,0x04 ,0x0b ,0xfe , -0x44 ,0x13 ,0x0f ,0x00 ,0x4b ,0x0b ,0xfe ,0x54 ,0x12 ,0x4b ,0xfe ,0x28 , -0x00 ,0x21 ,0xfe ,0xa6 , -0x0c ,0x0a ,0x40 ,0x01 ,0x0e ,0x07 ,0x00 ,0x5d ,0x3e ,0xfe ,0x28 ,0x00 , -0xfe ,0xe2 ,0x10 ,0x01 , +0x09 ,0x04 ,0x0b ,0xfe ,0x44 ,0x13 ,0x0f ,0x00 ,0x4b ,0x0b ,0xfe ,0x54 , +0x12 ,0x4b ,0xfe ,0x28 ,0x00 ,0x21 ,0xfe ,0xa6 ,0x0c ,0x0a ,0x40 ,0x01 , +0x0e ,0x07 ,0x00 ,0x5d ,0x3e ,0xfe ,0x28 ,0x00 ,0xfe ,0xe2 ,0x10 ,0x01 ,0xe7 ,0x01 ,0xe8 ,0x0a ,0x99 ,0x01 ,0xfe ,0x32 ,0x0e ,0x59 ,0x11 ,0x2d , -0x01 ,0x6f ,0x02 ,0x29 , -0x0f ,0xfe ,0x44 ,0x00 ,0x4b ,0x0b ,0xdf ,0x3e ,0x0b ,0xfe ,0xb4 ,0x10 , -0x01 ,0x86 ,0x3e ,0x0b , -0xfe ,0xaa ,0x10 ,0x01 ,0x86 ,0xfe ,0x19 ,0x82 ,0xfe ,0x34 ,0x46 ,0xa3 , -0x3e ,0x0b ,0x0f ,0xfe , +0x01 ,0x6f ,0x02 ,0x29 ,0x0f ,0xfe ,0x44 ,0x00 ,0x4b ,0x0b ,0xdf ,0x3e , +0x0b ,0xfe ,0xb4 ,0x10 ,0x01 ,0x86 ,0x3e ,0x0b ,0xfe ,0xaa ,0x10 ,0x01 , +0x86 ,0xfe ,0x19 ,0x82 ,0xfe ,0x34 ,0x46 ,0xa3 ,0x3e ,0x0b ,0x0f ,0xfe ,0x43 ,0x00 ,0xfe ,0x96 ,0x10 ,0x09 ,0x4a ,0x0b ,0x35 ,0x01 ,0xe7 ,0x01 , -0xe8 ,0x59 ,0x11 ,0x2d , -0x01 ,0x6f ,0x67 ,0x0b ,0x59 ,0x3c ,0x8a ,0x02 ,0xfe ,0x2a ,0x03 ,0x09 , -0x04 ,0x0b ,0x84 ,0x3e , -0x0b ,0x0f ,0x00 ,0xfe ,0x5c ,0x10 ,0x61 ,0x04 ,0x1b ,0xfe ,0x58 ,0x12 , -0x09 ,0x04 ,0x1b ,0xfe , +0xe8 ,0x59 ,0x11 ,0x2d ,0x01 ,0x6f ,0x67 ,0x0b ,0x59 ,0x3c ,0x8a ,0x02 , +0xfe ,0x2a ,0x03 ,0x09 ,0x04 ,0x0b ,0x84 ,0x3e ,0x0b ,0x0f ,0x00 ,0xfe , +0x5c ,0x10 ,0x61 ,0x04 ,0x1b ,0xfe ,0x58 ,0x12 ,0x09 ,0x04 ,0x1b ,0xfe ,0x50 ,0x13 ,0xfe ,0x1c ,0x1c ,0xfe ,0x9d ,0xf0 ,0xfe ,0x5c ,0x0c ,0xfe , -0x1c ,0x1c ,0xfe ,0x9d , -0xf0 ,0xfe ,0x62 ,0x0c ,0x09 ,0x4a ,0x1b ,0x35 ,0xfe ,0xa9 ,0x10 ,0x0f , -0xfe ,0x15 ,0x00 ,0xfe , -0x04 ,0xe6 ,0x0b ,0x5f ,0x5c ,0x0f ,0xfe ,0x13 ,0x00 ,0xfe ,0x10 ,0x10 , -0x0f ,0xfe ,0x47 ,0x00 , +0x1c ,0x1c ,0xfe ,0x9d ,0xf0 ,0xfe ,0x62 ,0x0c ,0x09 ,0x4a ,0x1b ,0x35 , +0xfe ,0xa9 ,0x10 ,0x0f ,0xfe ,0x15 ,0x00 ,0xfe ,0x04 ,0xe6 ,0x0b ,0x5f , +0x5c ,0x0f ,0xfe ,0x13 ,0x00 ,0xfe ,0x10 ,0x10 ,0x0f ,0xfe ,0x47 ,0x00 ,0xa1 ,0x0f ,0xfe ,0x41 ,0x00 ,0xa0 ,0x0f ,0xfe ,0x24 ,0x00 ,0x87 ,0xaa , -0xab ,0x70 ,0x05 ,0x6b , -0x28 ,0x21 ,0xd1 ,0x5f ,0xfe ,0x04 ,0xe6 ,0x1b ,0xfe ,0x9d ,0x41 ,0xfe , -0x1c ,0x42 ,0x59 ,0x01 , -0xda ,0x02 ,0x29 ,0xea ,0x14 ,0x0b ,0x37 ,0x95 ,0xa9 ,0x14 ,0xfe ,0x31 , -0x00 ,0x37 ,0x97 ,0x01 , +0xab ,0x70 ,0x05 ,0x6b ,0x28 ,0x21 ,0xd1 ,0x5f ,0xfe ,0x04 ,0xe6 ,0x1b , +0xfe ,0x9d ,0x41 ,0xfe ,0x1c ,0x42 ,0x59 ,0x01 ,0xda ,0x02 ,0x29 ,0xea , +0x14 ,0x0b ,0x37 ,0x95 ,0xa9 ,0x14 ,0xfe ,0x31 ,0x00 ,0x37 ,0x97 ,0x01 ,0xfe ,0x54 ,0x0f ,0x02 ,0xd0 ,0x3c ,0xfe ,0x06 ,0xec ,0xc9 ,0xee ,0x3e , -0x1d ,0xfe ,0xce ,0x45 , -0x34 ,0x3c ,0xfe ,0x06 ,0xea ,0xc9 ,0xfe ,0x47 ,0x4b ,0x89 ,0xfe ,0x75 , -0x57 ,0x05 ,0x51 ,0xfe , -0x98 ,0x56 ,0xfe ,0x38 ,0x12 ,0x0a ,0x42 ,0x01 ,0x0e ,0xfe ,0x44 ,0x48 , -0x46 ,0x09 ,0x04 ,0x1d , +0x1d ,0xfe ,0xce ,0x45 ,0x34 ,0x3c ,0xfe ,0x06 ,0xea ,0xc9 ,0xfe ,0x47 , +0x4b ,0x89 ,0xfe ,0x75 ,0x57 ,0x05 ,0x51 ,0xfe ,0x98 ,0x56 ,0xfe ,0x38 , +0x12 ,0x0a ,0x42 ,0x01 ,0x0e ,0xfe ,0x44 ,0x48 ,0x46 ,0x09 ,0x04 ,0x1d ,0xfe ,0x1a ,0x13 ,0x0a ,0x40 ,0x01 ,0x0e ,0x47 ,0xfe ,0x41 ,0x58 ,0x0a , -0x99 ,0x01 ,0x0e ,0xfe , -0x49 ,0x54 ,0x8e ,0xfe ,0x2a ,0x0d ,0x02 ,0xfe ,0x2a ,0x03 ,0x0a ,0x51 , -0xfe ,0xee ,0x14 ,0xee , -0x3e ,0x1d ,0xfe ,0xce ,0x45 ,0x34 ,0x3c ,0xfe ,0xce ,0x47 ,0xfe ,0xad , -0x13 ,0x02 ,0x29 ,0x1e , +0x99 ,0x01 ,0x0e ,0xfe ,0x49 ,0x54 ,0x8e ,0xfe ,0x2a ,0x0d ,0x02 ,0xfe , +0x2a ,0x03 ,0x0a ,0x51 ,0xfe ,0xee ,0x14 ,0xee ,0x3e ,0x1d ,0xfe ,0xce , +0x45 ,0x34 ,0x3c ,0xfe ,0xce ,0x47 ,0xfe ,0xad ,0x13 ,0x02 ,0x29 ,0x1e ,0x20 ,0x07 ,0x10 ,0xfe ,0x9e ,0x12 ,0x23 ,0x12 ,0x4d ,0x12 ,0x94 ,0x12 , -0xce ,0x1e ,0x2d ,0x47 , -0x37 ,0x2d ,0xb1 ,0xe0 ,0xfe ,0xbc ,0xf0 ,0xfe ,0xec ,0x0d ,0x13 ,0x06 , -0x12 ,0x4d ,0x01 ,0xfe , -0xe2 ,0x15 ,0x05 ,0xfe ,0x38 ,0x01 ,0x31 ,0xfe ,0x3a ,0x01 ,0x77 ,0xfe , -0xf0 ,0x0d ,0xfe ,0x02 , +0xce ,0x1e ,0x2d ,0x47 ,0x37 ,0x2d ,0xb1 ,0xe0 ,0xfe ,0xbc ,0xf0 ,0xfe , +0xec ,0x0d ,0x13 ,0x06 ,0x12 ,0x4d ,0x01 ,0xfe ,0xe2 ,0x15 ,0x05 ,0xfe , +0x38 ,0x01 ,0x31 ,0xfe ,0x3a ,0x01 ,0x77 ,0xfe ,0xf0 ,0x0d ,0xfe ,0x02 ,0xec ,0xce ,0x62 ,0x00 ,0x5d ,0xfe ,0x04 ,0xec ,0x20 ,0x46 ,0xfe ,0x05 , -0xf6 ,0xfe ,0x34 ,0x01 , -0x01 ,0xfe ,0x52 ,0x16 ,0xfb ,0xfe ,0x48 ,0xf4 ,0x0d ,0xfe ,0x18 ,0x13 , -0xaf ,0xfe ,0x02 ,0xea , -0xce ,0x62 ,0x7a ,0xfe ,0xc5 ,0x13 ,0x14 ,0x1b ,0x37 ,0x95 ,0xa9 ,0x5c , -0x05 ,0xfe ,0x38 ,0x01 , +0xf6 ,0xfe ,0x34 ,0x01 ,0x01 ,0xfe ,0x52 ,0x16 ,0xfb ,0xfe ,0x48 ,0xf4 , +0x0d ,0xfe ,0x18 ,0x13 ,0xaf ,0xfe ,0x02 ,0xea ,0xce ,0x62 ,0x7a ,0xfe , +0xc5 ,0x13 ,0x14 ,0x1b ,0x37 ,0x95 ,0xa9 ,0x5c ,0x05 ,0xfe ,0x38 ,0x01 ,0x1c ,0xfe ,0xf0 ,0xff ,0x0c ,0xfe ,0x60 ,0x01 ,0x05 ,0xfe ,0x3a ,0x01 , -0x0c ,0xfe ,0x62 ,0x01 , -0x3d ,0x12 ,0x20 ,0x24 ,0x06 ,0x12 ,0x2d ,0x11 ,0x2d ,0x8a ,0x13 ,0x06 , -0x03 ,0x23 ,0x03 ,0x1e , -0x4d ,0xfe ,0xf7 ,0x12 ,0x1e ,0x94 ,0xac ,0x12 ,0x94 ,0x07 ,0x7a ,0xfe , -0x71 ,0x13 ,0xfe ,0x24 , +0x0c ,0xfe ,0x62 ,0x01 ,0x3d ,0x12 ,0x20 ,0x24 ,0x06 ,0x12 ,0x2d ,0x11 , +0x2d ,0x8a ,0x13 ,0x06 ,0x03 ,0x23 ,0x03 ,0x1e ,0x4d ,0xfe ,0xf7 ,0x12 , +0x1e ,0x94 ,0xac ,0x12 ,0x94 ,0x07 ,0x7a ,0xfe ,0x71 ,0x13 ,0xfe ,0x24 ,0x1c ,0x14 ,0x1a ,0x37 ,0x95 ,0xa9 ,0xfe ,0xd9 ,0x10 ,0xb6 ,0xfe ,0x03 , -0xdc ,0xfe ,0x73 ,0x57 , -0xfe ,0x80 ,0x5d ,0x03 ,0xb6 ,0xfe ,0x03 ,0xdc ,0xfe ,0x5b ,0x57 ,0xfe , -0x80 ,0x5d ,0x03 ,0xfe , -0x03 ,0x57 ,0xb6 ,0x23 ,0xfe ,0x00 ,0xcc ,0x03 ,0xfe ,0x03 ,0x57 ,0xb6 , -0x75 ,0x03 ,0x09 ,0x04 , +0xdc ,0xfe ,0x73 ,0x57 ,0xfe ,0x80 ,0x5d ,0x03 ,0xb6 ,0xfe ,0x03 ,0xdc , +0xfe ,0x5b ,0x57 ,0xfe ,0x80 ,0x5d ,0x03 ,0xfe ,0x03 ,0x57 ,0xb6 ,0x23 , +0xfe ,0x00 ,0xcc ,0x03 ,0xfe ,0x03 ,0x57 ,0xb6 ,0x75 ,0x03 ,0x09 ,0x04 ,0x4c ,0xfe ,0x22 ,0x13 ,0xfe ,0x1c ,0x80 ,0x07 ,0x06 ,0xfe ,0x1a ,0x13 , -0xfe ,0x1e ,0x80 ,0xe1 , -0xfe ,0x1d ,0x80 ,0xa4 ,0xfe ,0x0c ,0x90 ,0xfe ,0x0e ,0x13 ,0xfe ,0x0e , -0x90 ,0xa3 ,0xfe ,0x3c , -0x90 ,0xfe ,0x30 ,0xf4 ,0x0b ,0xfe ,0x3c ,0x50 ,0xa0 ,0x01 ,0xfe ,0x82 , -0x16 ,0x2f ,0x07 ,0x2d , +0xfe ,0x1e ,0x80 ,0xe1 ,0xfe ,0x1d ,0x80 ,0xa4 ,0xfe ,0x0c ,0x90 ,0xfe , +0x0e ,0x13 ,0xfe ,0x0e ,0x90 ,0xa3 ,0xfe ,0x3c ,0x90 ,0xfe ,0x30 ,0xf4 , +0x0b ,0xfe ,0x3c ,0x50 ,0xa0 ,0x01 ,0xfe ,0x82 ,0x16 ,0x2f ,0x07 ,0x2d ,0xe0 ,0x01 ,0xfe ,0xbc ,0x15 ,0x09 ,0x04 ,0x1d ,0x45 ,0x01 ,0xe7 ,0x01 , -0xe8 ,0x11 ,0xfe ,0xe9 , -0x00 ,0x09 ,0x04 ,0x4c ,0xfe ,0x2c ,0x13 ,0x01 ,0xfe ,0x14 ,0x16 ,0xfe , -0x1e ,0x1c ,0xfe ,0x14 , -0x90 ,0xfe ,0x96 ,0x90 ,0x0c ,0xfe ,0x64 ,0x01 ,0x18 ,0xfe ,0x66 ,0x01 , -0x09 ,0x04 ,0x4f ,0xfe , +0xe8 ,0x11 ,0xfe ,0xe9 ,0x00 ,0x09 ,0x04 ,0x4c ,0xfe ,0x2c ,0x13 ,0x01 , +0xfe ,0x14 ,0x16 ,0xfe ,0x1e ,0x1c ,0xfe ,0x14 ,0x90 ,0xfe ,0x96 ,0x90 , +0x0c ,0xfe ,0x64 ,0x01 ,0x18 ,0xfe ,0x66 ,0x01 ,0x09 ,0x04 ,0x4f ,0xfe ,0x12 ,0x12 ,0xfe ,0x03 ,0x80 ,0x74 ,0xfe ,0x01 ,0xec ,0x20 ,0xfe ,0x80 , -0x40 ,0x12 ,0x20 ,0x63 , -0x27 ,0x11 ,0xc8 ,0x59 ,0x1e ,0x20 ,0xed ,0x76 ,0x20 ,0x03 ,0xfe ,0x08 , -0x1c ,0x05 ,0xfe ,0xac , -0x00 ,0xfe ,0x06 ,0x58 ,0x05 ,0xfe ,0xae ,0x00 ,0xfe ,0x07 ,0x58 ,0x05 , -0xfe ,0xb0 ,0x00 ,0xfe , +0x40 ,0x12 ,0x20 ,0x63 ,0x27 ,0x11 ,0xc8 ,0x59 ,0x1e ,0x20 ,0xed ,0x76 , +0x20 ,0x03 ,0xfe ,0x08 ,0x1c ,0x05 ,0xfe ,0xac ,0x00 ,0xfe ,0x06 ,0x58 , +0x05 ,0xfe ,0xae ,0x00 ,0xfe ,0x07 ,0x58 ,0x05 ,0xfe ,0xb0 ,0x00 ,0xfe ,0x08 ,0x58 ,0x05 ,0xfe ,0xb2 ,0x00 ,0xfe ,0x09 ,0x58 ,0xfe ,0x0a ,0x1c , -0x24 ,0x69 ,0x12 ,0xc9 , -0x23 ,0x0c ,0x50 ,0x0c ,0x3f ,0x13 ,0x40 ,0x48 ,0x5f ,0x17 ,0x1d ,0xfe , -0x90 ,0x4d ,0xfe ,0x91 , -0x54 ,0x21 ,0xfe ,0x08 ,0x0f ,0x3e ,0x10 ,0x13 ,0x42 ,0x48 ,0x17 ,0x4c , -0xfe ,0x90 ,0x4d ,0xfe , +0x24 ,0x69 ,0x12 ,0xc9 ,0x23 ,0x0c ,0x50 ,0x0c ,0x3f ,0x13 ,0x40 ,0x48 , +0x5f ,0x17 ,0x1d ,0xfe ,0x90 ,0x4d ,0xfe ,0x91 ,0x54 ,0x21 ,0xfe ,0x08 , +0x0f ,0x3e ,0x10 ,0x13 ,0x42 ,0x48 ,0x17 ,0x4c ,0xfe ,0x90 ,0x4d ,0xfe ,0x91 ,0x54 ,0x21 ,0xfe ,0x1e ,0x0f ,0x24 ,0x10 ,0x12 ,0x20 ,0x78 ,0x2c , -0x46 ,0x1e ,0x20 ,0xed , -0x76 ,0x20 ,0x11 ,0xc8 ,0xf6 ,0xfe ,0xd6 ,0xf0 ,0xfe ,0x32 ,0x0f ,0xea , -0x70 ,0xfe ,0x14 ,0x1c , -0xfe ,0x10 ,0x1c ,0xfe ,0x18 ,0x1c ,0x03 ,0x3c ,0xfe ,0x0c ,0x14 ,0xee , -0xfe ,0x07 ,0xe6 ,0x1d , +0x46 ,0x1e ,0x20 ,0xed ,0x76 ,0x20 ,0x11 ,0xc8 ,0xf6 ,0xfe ,0xd6 ,0xf0 , +0xfe ,0x32 ,0x0f ,0xea ,0x70 ,0xfe ,0x14 ,0x1c ,0xfe ,0x10 ,0x1c ,0xfe , +0x18 ,0x1c ,0x03 ,0x3c ,0xfe ,0x0c ,0x14 ,0xee ,0xfe ,0x07 ,0xe6 ,0x1d ,0xfe ,0xce ,0x47 ,0xfe ,0xf5 ,0x13 ,0x03 ,0x01 ,0x86 ,0x78 ,0x2c ,0x46 , -0xfa ,0xef ,0xfe ,0x42 , -0x13 ,0x2f ,0x07 ,0x2d ,0xfe ,0x34 ,0x13 ,0x0a ,0x42 ,0x01 ,0x0e ,0xb0 , -0xfe ,0x36 ,0x12 ,0xf0 , -0xfe ,0x45 ,0x48 ,0x01 ,0xe3 ,0xfe ,0x00 ,0xcc ,0xb0 ,0xfe ,0xf3 ,0x13 , -0x3d ,0x75 ,0x07 ,0x10 , +0xfa ,0xef ,0xfe ,0x42 ,0x13 ,0x2f ,0x07 ,0x2d ,0xfe ,0x34 ,0x13 ,0x0a , +0x42 ,0x01 ,0x0e ,0xb0 ,0xfe ,0x36 ,0x12 ,0xf0 ,0xfe ,0x45 ,0x48 ,0x01 , +0xe3 ,0xfe ,0x00 ,0xcc ,0xb0 ,0xfe ,0xf3 ,0x13 ,0x3d ,0x75 ,0x07 ,0x10 ,0xa3 ,0x0a ,0x80 ,0x01 ,0x0e ,0xfe ,0x80 ,0x5c ,0x01 ,0x6f ,0xfe ,0x0e , -0x10 ,0x07 ,0x7e ,0x45 , -0xf6 ,0xfe ,0xd6 ,0xf0 ,0xfe ,0x6c ,0x0f ,0x03 ,0xfe ,0x44 ,0x58 ,0x74 , -0xfe ,0x01 ,0xec ,0x97 , -0xfe ,0x9e ,0x40 ,0xfe ,0x9d ,0xe7 ,0x00 ,0xfe ,0x9c ,0xe7 ,0x1b ,0x76 , -0x27 ,0x01 ,0xda ,0xfe , +0x10 ,0x07 ,0x7e ,0x45 ,0xf6 ,0xfe ,0xd6 ,0xf0 ,0xfe ,0x6c ,0x0f ,0x03 , +0xfe ,0x44 ,0x58 ,0x74 ,0xfe ,0x01 ,0xec ,0x97 ,0xfe ,0x9e ,0x40 ,0xfe , +0x9d ,0xe7 ,0x00 ,0xfe ,0x9c ,0xe7 ,0x1b ,0x76 ,0x27 ,0x01 ,0xda ,0xfe ,0xdd ,0x10 ,0x2a ,0xbc ,0x7d ,0xbd ,0x7f ,0x30 ,0x2e ,0xd5 ,0x07 ,0x1b , -0xfe ,0x48 ,0x12 ,0x07 , -0x0b ,0xfe ,0x56 ,0x12 ,0x07 ,0x1a ,0xfe ,0x30 ,0x12 ,0x07 ,0xc2 ,0x16 , -0xfe ,0x3e ,0x11 ,0x07 , -0xfe ,0x23 ,0x00 ,0x16 ,0xfe ,0x4a ,0x11 ,0x07 ,0x06 ,0x16 ,0xfe ,0xa8 , -0x11 ,0x07 ,0x19 ,0xfe , +0xfe ,0x48 ,0x12 ,0x07 ,0x0b ,0xfe ,0x56 ,0x12 ,0x07 ,0x1a ,0xfe ,0x30 , +0x12 ,0x07 ,0xc2 ,0x16 ,0xfe ,0x3e ,0x11 ,0x07 ,0xfe ,0x23 ,0x00 ,0x16 , +0xfe ,0x4a ,0x11 ,0x07 ,0x06 ,0x16 ,0xfe ,0xa8 ,0x11 ,0x07 ,0x19 ,0xfe ,0x12 ,0x12 ,0x07 ,0x00 ,0x16 ,0x22 ,0x14 ,0xc2 ,0x01 ,0x33 ,0x9f ,0x2b , -0x01 ,0x08 ,0x8c ,0x43 , -0x03 ,0x2b ,0xfe ,0x62 ,0x08 ,0x0a ,0xca ,0x01 ,0xfe ,0x32 ,0x0e ,0x11 , -0x7e ,0x02 ,0x29 ,0x2b , -0x2f ,0x07 ,0x9b ,0xfe ,0xd9 ,0x13 ,0x79 ,0x39 ,0x68 ,0x3a ,0x77 ,0xfe , -0xfc ,0x10 ,0x09 ,0x04 , +0x01 ,0x08 ,0x8c ,0x43 ,0x03 ,0x2b ,0xfe ,0x62 ,0x08 ,0x0a ,0xca ,0x01 , +0xfe ,0x32 ,0x0e ,0x11 ,0x7e ,0x02 ,0x29 ,0x2b ,0x2f ,0x07 ,0x9b ,0xfe , +0xd9 ,0x13 ,0x79 ,0x39 ,0x68 ,0x3a ,0x77 ,0xfe ,0xfc ,0x10 ,0x09 ,0x04 ,0x6a ,0xfe ,0x72 ,0x12 ,0xc0 ,0x38 ,0xc1 ,0x4e ,0xf4 ,0xf5 ,0x8e ,0xfe , -0xc6 ,0x10 ,0x1e ,0x58 , -0xfe ,0x26 ,0x13 ,0x05 ,0x7b ,0x31 ,0x7c ,0x77 ,0xfe ,0x82 ,0x0c ,0x0c , -0x54 ,0x18 ,0x55 ,0x23 , -0x0c ,0x7b ,0x0c ,0x7c ,0x01 ,0xa8 ,0x24 ,0x69 ,0x73 ,0x12 ,0x58 ,0x01 , -0xa5 ,0xc0 ,0x38 ,0xc1 , +0xc6 ,0x10 ,0x1e ,0x58 ,0xfe ,0x26 ,0x13 ,0x05 ,0x7b ,0x31 ,0x7c ,0x77 , +0xfe ,0x82 ,0x0c ,0x0c ,0x54 ,0x18 ,0x55 ,0x23 ,0x0c ,0x7b ,0x0c ,0x7c , +0x01 ,0xa8 ,0x24 ,0x69 ,0x73 ,0x12 ,0x58 ,0x01 ,0xa5 ,0xc0 ,0x38 ,0xc1 ,0x4e ,0xfe ,0x04 ,0x55 ,0xfe ,0xa5 ,0x55 ,0xfe ,0x04 ,0xfa ,0x38 ,0xfe , -0x05 ,0xfa ,0x4e ,0xfe , -0x91 ,0x10 ,0x05 ,0x56 ,0x31 ,0x57 ,0xfe ,0x40 ,0x56 ,0xfe ,0xe1 ,0x56 , -0x0c ,0x56 ,0x18 ,0x57 , -0x83 ,0xc0 ,0x38 ,0xc1 ,0x4e ,0xf4 ,0xf5 ,0x05 ,0x52 ,0x31 ,0x53 ,0xfe , -0x00 ,0x56 ,0xfe ,0xa1 , +0x05 ,0xfa ,0x4e ,0xfe ,0x91 ,0x10 ,0x05 ,0x56 ,0x31 ,0x57 ,0xfe ,0x40 , +0x56 ,0xfe ,0xe1 ,0x56 ,0x0c ,0x56 ,0x18 ,0x57 ,0x83 ,0xc0 ,0x38 ,0xc1 , +0x4e ,0xf4 ,0xf5 ,0x05 ,0x52 ,0x31 ,0x53 ,0xfe ,0x00 ,0x56 ,0xfe ,0xa1 ,0x56 ,0x0c ,0x52 ,0x18 ,0x53 ,0x09 ,0x04 ,0x6a ,0xfe ,0x1e ,0x12 ,0x1e , -0x58 ,0xfe ,0x1f ,0x40 , -0x05 ,0x54 ,0x31 ,0x55 ,0xfe ,0x2c ,0x50 ,0xfe ,0xae ,0x50 ,0x05 ,0x56 , -0x31 ,0x57 ,0xfe ,0x44 , -0x50 ,0xfe ,0xc6 ,0x50 ,0x05 ,0x52 ,0x31 ,0x53 ,0xfe ,0x08 ,0x50 ,0xfe , -0x8a ,0x50 ,0x05 ,0x39 , +0x58 ,0xfe ,0x1f ,0x40 ,0x05 ,0x54 ,0x31 ,0x55 ,0xfe ,0x2c ,0x50 ,0xfe , +0xae ,0x50 ,0x05 ,0x56 ,0x31 ,0x57 ,0xfe ,0x44 ,0x50 ,0xfe ,0xc6 ,0x50 , +0x05 ,0x52 ,0x31 ,0x53 ,0xfe ,0x08 ,0x50 ,0xfe ,0x8a ,0x50 ,0x05 ,0x39 ,0x31 ,0x3a ,0xfe ,0x40 ,0x50 ,0xfe ,0xc2 ,0x50 ,0x02 ,0x5c ,0x24 ,0x06 , -0x12 ,0xcd ,0x02 ,0x5b , -0x2b ,0x01 ,0x08 ,0x1f ,0x44 ,0x30 ,0x2e ,0xd5 ,0x07 ,0x06 ,0x21 ,0x44 , -0x2f ,0x07 ,0x9b ,0x21 , -0x5b ,0x01 ,0x6e ,0x1c ,0x3d ,0x16 ,0x44 ,0x09 ,0x04 ,0x0b ,0xe2 ,0x79 , -0x39 ,0x68 ,0x3a ,0xfe , +0x12 ,0xcd ,0x02 ,0x5b ,0x2b ,0x01 ,0x08 ,0x1f ,0x44 ,0x30 ,0x2e ,0xd5 , +0x07 ,0x06 ,0x21 ,0x44 ,0x2f ,0x07 ,0x9b ,0x21 ,0x5b ,0x01 ,0x6e ,0x1c , +0x3d ,0x16 ,0x44 ,0x09 ,0x04 ,0x0b ,0xe2 ,0x79 ,0x39 ,0x68 ,0x3a ,0xfe ,0x0a ,0x55 ,0x34 ,0xfe ,0x8b ,0x55 ,0xbe ,0x39 ,0xbf ,0x3a ,0xfe ,0x0c , -0x51 ,0xfe ,0x8e ,0x51 , -0x02 ,0x5b ,0xfe ,0x19 ,0x81 ,0xaf ,0xfe ,0x19 ,0x41 ,0x02 ,0x5b ,0x2b , -0x01 ,0x08 ,0x25 ,0x32 , -0x1f ,0xa2 ,0x30 ,0x2e ,0xd8 ,0x4b ,0x1a ,0xfe ,0xa6 ,0x12 ,0x4b ,0x0b , -0x3b ,0x02 ,0x44 ,0x01 , +0x51 ,0xfe ,0x8e ,0x51 ,0x02 ,0x5b ,0xfe ,0x19 ,0x81 ,0xaf ,0xfe ,0x19 , +0x41 ,0x02 ,0x5b ,0x2b ,0x01 ,0x08 ,0x25 ,0x32 ,0x1f ,0xa2 ,0x30 ,0x2e , +0xd8 ,0x4b ,0x1a ,0xfe ,0xa6 ,0x12 ,0x4b ,0x0b ,0x3b ,0x02 ,0x44 ,0x01 ,0x08 ,0x25 ,0x32 ,0x1f ,0xa2 ,0x30 ,0x2e ,0xd6 ,0x07 ,0x1a ,0x21 ,0x44 , -0x01 ,0x08 ,0x1f ,0xa2 , -0x30 ,0x2e ,0xfe ,0xe8 ,0x09 ,0xfe ,0xc2 ,0x49 ,0x60 ,0x05 ,0xfe ,0x9c , -0x00 ,0x28 ,0x84 ,0x49 , -0x04 ,0x19 ,0x34 ,0x9f ,0xfe ,0xbb ,0x45 ,0x4b ,0x00 ,0x45 ,0x3e ,0x06 , -0x78 ,0x3d ,0xfe ,0xda , +0x01 ,0x08 ,0x1f ,0xa2 ,0x30 ,0x2e ,0xfe ,0xe8 ,0x09 ,0xfe ,0xc2 ,0x49 , +0x60 ,0x05 ,0xfe ,0x9c ,0x00 ,0x28 ,0x84 ,0x49 ,0x04 ,0x19 ,0x34 ,0x9f , +0xfe ,0xbb ,0x45 ,0x4b ,0x00 ,0x45 ,0x3e ,0x06 ,0x78 ,0x3d ,0xfe ,0xda ,0x14 ,0x01 ,0x6e ,0x87 ,0xfe ,0x4b ,0x45 ,0xe2 ,0x2f ,0x07 ,0x9a ,0xe1 , -0x05 ,0xc6 ,0x28 ,0x84 , -0x05 ,0x3f ,0x28 ,0x34 ,0x5e ,0x02 ,0x5b ,0xfe ,0xc0 ,0x5d ,0xfe ,0xf8 , -0x14 ,0xfe ,0x03 ,0x17 , -0x05 ,0x50 ,0xb4 ,0x0c ,0x50 ,0x5e ,0x2b ,0x01 ,0x08 ,0x26 ,0x5c ,0x01 , -0xfe ,0xaa ,0x14 ,0x02 , +0x05 ,0xc6 ,0x28 ,0x84 ,0x05 ,0x3f ,0x28 ,0x34 ,0x5e ,0x02 ,0x5b ,0xfe , +0xc0 ,0x5d ,0xfe ,0xf8 ,0x14 ,0xfe ,0x03 ,0x17 ,0x05 ,0x50 ,0xb4 ,0x0c , +0x50 ,0x5e ,0x2b ,0x01 ,0x08 ,0x26 ,0x5c ,0x01 ,0xfe ,0xaa ,0x14 ,0x02 ,0x5c ,0x01 ,0x08 ,0x25 ,0x32 ,0x1f ,0x44 ,0x30 ,0x2e ,0xd6 ,0x07 ,0x06 , -0x21 ,0x44 ,0x01 ,0xfe , -0x8e ,0x13 ,0xfe ,0x42 ,0x58 ,0xfe ,0x82 ,0x14 ,0xfe ,0xa4 ,0x14 ,0x87 , -0xfe ,0x4a ,0xf4 ,0x0b , -0x16 ,0x44 ,0xfe ,0x4a ,0xf4 ,0x06 ,0xfe ,0x0c ,0x12 ,0x2f ,0x07 ,0x9a , -0x85 ,0x02 ,0x5b ,0x05 , +0x21 ,0x44 ,0x01 ,0xfe ,0x8e ,0x13 ,0xfe ,0x42 ,0x58 ,0xfe ,0x82 ,0x14 , +0xfe ,0xa4 ,0x14 ,0x87 ,0xfe ,0x4a ,0xf4 ,0x0b ,0x16 ,0x44 ,0xfe ,0x4a , +0xf4 ,0x06 ,0xfe ,0x0c ,0x12 ,0x2f ,0x07 ,0x9a ,0x85 ,0x02 ,0x5b ,0x05 ,0x3f ,0xb4 ,0x0c ,0x3f ,0x5e ,0x2b ,0x01 ,0x08 ,0x26 ,0x5c ,0x01 ,0xfe , -0xd8 ,0x14 ,0x02 ,0x5c , -0x13 ,0x06 ,0x65 ,0xfe ,0xca ,0x12 ,0x26 ,0xfe ,0xe0 ,0x12 ,0x72 ,0xf1 , -0x01 ,0x08 ,0x23 ,0x72 , -0x03 ,0x8f ,0xfe ,0xdc ,0x12 ,0x25 ,0xfe ,0xdc ,0x12 ,0x1f ,0xfe ,0xca , -0x12 ,0x5e ,0x2b ,0x01 , +0xd8 ,0x14 ,0x02 ,0x5c ,0x13 ,0x06 ,0x65 ,0xfe ,0xca ,0x12 ,0x26 ,0xfe , +0xe0 ,0x12 ,0x72 ,0xf1 ,0x01 ,0x08 ,0x23 ,0x72 ,0x03 ,0x8f ,0xfe ,0xdc , +0x12 ,0x25 ,0xfe ,0xdc ,0x12 ,0x1f ,0xfe ,0xca ,0x12 ,0x5e ,0x2b ,0x01 ,0x08 ,0xfe ,0xd5 ,0x10 ,0x13 ,0x6c ,0xff ,0x02 ,0x00 ,0x57 ,0x48 ,0x8b , -0x1c ,0xfe ,0xff ,0x7f , -0xfe ,0x30 ,0x56 ,0xfe ,0x00 ,0x5c ,0x03 ,0x13 ,0x6c ,0xff ,0x02 ,0x00 , -0x57 ,0x48 ,0x8b ,0x1c , -0x3d ,0xfe ,0x30 ,0x56 ,0xfe ,0x00 ,0x5c ,0x03 ,0x13 ,0x6c ,0xff ,0x02 , -0x00 ,0x57 ,0x48 ,0x8b , +0x1c ,0xfe ,0xff ,0x7f ,0xfe ,0x30 ,0x56 ,0xfe ,0x00 ,0x5c ,0x03 ,0x13 , +0x6c ,0xff ,0x02 ,0x00 ,0x57 ,0x48 ,0x8b ,0x1c ,0x3d ,0xfe ,0x30 ,0x56 , +0xfe ,0x00 ,0x5c ,0x03 ,0x13 ,0x6c ,0xff ,0x02 ,0x00 ,0x57 ,0x48 ,0x8b ,0x03 ,0x13 ,0x6c ,0xff ,0x02 ,0x00 ,0x57 ,0x48 ,0x8b ,0xfe ,0x0b ,0x58 , -0x03 ,0x0a ,0x50 ,0x01 , -0x82 ,0x0a ,0x3f ,0x01 ,0x82 ,0x03 ,0xfc ,0x1c ,0x10 ,0xff ,0x03 ,0x00 , -0x54 ,0xfe ,0x00 ,0xf4 , -0x19 ,0x48 ,0xfe ,0x00 ,0x7d ,0xfe ,0x01 ,0x7d ,0xfe ,0x02 ,0x7d ,0xfe , -0x03 ,0x7c ,0x63 ,0x27 , +0x03 ,0x0a ,0x50 ,0x01 ,0x82 ,0x0a ,0x3f ,0x01 ,0x82 ,0x03 ,0xfc ,0x1c , +0x10 ,0xff ,0x03 ,0x00 ,0x54 ,0xfe ,0x00 ,0xf4 ,0x19 ,0x48 ,0xfe ,0x00 , +0x7d ,0xfe ,0x01 ,0x7d ,0xfe ,0x02 ,0x7d ,0xfe ,0x03 ,0x7c ,0x63 ,0x27 ,0x0c ,0x52 ,0x18 ,0x53 ,0xbe ,0x56 ,0xbf ,0x57 ,0x03 ,0xfe ,0x62 ,0x08 , -0xfe ,0x82 ,0x4a ,0xfe , -0xe1 ,0x1a ,0xfe ,0x83 ,0x5a ,0x74 ,0x03 ,0x01 ,0xfe ,0x14 ,0x18 ,0xfe , -0x42 ,0x48 ,0x5f ,0x60 , -0x89 ,0x01 ,0x08 ,0x1f ,0xfe ,0xa2 ,0x14 ,0x30 ,0x2e ,0xd8 ,0x01 ,0x08 , -0x1f ,0xfe ,0xa2 ,0x14 , +0xfe ,0x82 ,0x4a ,0xfe ,0xe1 ,0x1a ,0xfe ,0x83 ,0x5a ,0x74 ,0x03 ,0x01 , +0xfe ,0x14 ,0x18 ,0xfe ,0x42 ,0x48 ,0x5f ,0x60 ,0x89 ,0x01 ,0x08 ,0x1f , +0xfe ,0xa2 ,0x14 ,0x30 ,0x2e ,0xd8 ,0x01 ,0x08 ,0x1f ,0xfe ,0xa2 ,0x14 ,0x30 ,0x2e ,0xfe ,0xe8 ,0x0a ,0xfe ,0xc1 ,0x59 ,0x05 ,0xc6 ,0x28 ,0xfe , -0xcc ,0x12 ,0x49 ,0x04 , -0x1b ,0xfe ,0xc4 ,0x13 ,0x23 ,0x62 ,0x1b ,0xe2 ,0x4b ,0xc3 ,0x64 ,0xfe , -0xe8 ,0x13 ,0x3b ,0x13 , -0x06 ,0x17 ,0xc3 ,0x78 ,0xdb ,0xfe ,0x78 ,0x10 ,0xff ,0x02 ,0x83 ,0x55 , -0xa1 ,0xff ,0x02 ,0x83 , +0xcc ,0x12 ,0x49 ,0x04 ,0x1b ,0xfe ,0xc4 ,0x13 ,0x23 ,0x62 ,0x1b ,0xe2 , +0x4b ,0xc3 ,0x64 ,0xfe ,0xe8 ,0x13 ,0x3b ,0x13 ,0x06 ,0x17 ,0xc3 ,0x78 , +0xdb ,0xfe ,0x78 ,0x10 ,0xff ,0x02 ,0x83 ,0x55 ,0xa1 ,0xff ,0x02 ,0x83 ,0x55 ,0x62 ,0x1a ,0xa4 ,0xbb ,0xfe ,0x30 ,0x00 ,0x8e ,0xe4 ,0x17 ,0x2c , -0x13 ,0x06 ,0xfe ,0x56 , -0x10 ,0x62 ,0x0b ,0xe1 ,0xbb ,0xfe ,0x64 ,0x00 ,0x8e ,0xe4 ,0x0a ,0xfe , -0x64 ,0x00 ,0x17 ,0x93 , -0x13 ,0x06 ,0xfe ,0x28 ,0x10 ,0x62 ,0x06 ,0xfe ,0x60 ,0x13 ,0xbb ,0xfe , -0xc8 ,0x00 ,0x8e ,0xe4 , +0x13 ,0x06 ,0xfe ,0x56 ,0x10 ,0x62 ,0x0b ,0xe1 ,0xbb ,0xfe ,0x64 ,0x00 , +0x8e ,0xe4 ,0x0a ,0xfe ,0x64 ,0x00 ,0x17 ,0x93 ,0x13 ,0x06 ,0xfe ,0x28 , +0x10 ,0x62 ,0x06 ,0xfe ,0x60 ,0x13 ,0xbb ,0xfe ,0xc8 ,0x00 ,0x8e ,0xe4 ,0x0a ,0xfe ,0xc8 ,0x00 ,0x17 ,0x4d ,0x13 ,0x06 ,0x83 ,0xbb ,0xfe ,0x90 , -0x01 ,0xba ,0xfe ,0x4e , -0x14 ,0x89 ,0xfe ,0x12 ,0x10 ,0xfe ,0x43 ,0xf4 ,0x94 ,0xfe ,0x56 ,0xf0 , -0xfe ,0x60 ,0x14 ,0xfe , -0x04 ,0xf4 ,0x6c ,0xfe ,0x43 ,0xf4 ,0x93 ,0xfe ,0xf3 ,0x10 ,0xf9 ,0x01 , -0xfe ,0x22 ,0x13 ,0x1c , +0x01 ,0xba ,0xfe ,0x4e ,0x14 ,0x89 ,0xfe ,0x12 ,0x10 ,0xfe ,0x43 ,0xf4 , +0x94 ,0xfe ,0x56 ,0xf0 ,0xfe ,0x60 ,0x14 ,0xfe ,0x04 ,0xf4 ,0x6c ,0xfe , +0x43 ,0xf4 ,0x93 ,0xfe ,0xf3 ,0x10 ,0xf9 ,0x01 ,0xfe ,0x22 ,0x13 ,0x1c ,0x3d ,0xfe ,0x10 ,0x13 ,0xfe ,0x00 ,0x17 ,0xfe ,0x4d ,0xe4 ,0x69 ,0xba , -0xfe ,0x9c ,0x14 ,0xb7 , -0x69 ,0xfe ,0x1c ,0x10 ,0xfe ,0x00 ,0x17 ,0xfe ,0x4d ,0xe4 ,0x19 ,0xba , -0xfe ,0x9c ,0x14 ,0xb7 , -0x19 ,0x83 ,0x60 ,0x23 ,0xfe ,0x4d ,0xf4 ,0x00 ,0xdf ,0x89 ,0x13 ,0x06 , -0xfe ,0xb4 ,0x56 ,0xfe , +0xfe ,0x9c ,0x14 ,0xb7 ,0x69 ,0xfe ,0x1c ,0x10 ,0xfe ,0x00 ,0x17 ,0xfe , +0x4d ,0xe4 ,0x19 ,0xba ,0xfe ,0x9c ,0x14 ,0xb7 ,0x19 ,0x83 ,0x60 ,0x23 , +0xfe ,0x4d ,0xf4 ,0x00 ,0xdf ,0x89 ,0x13 ,0x06 ,0xfe ,0xb4 ,0x56 ,0xfe ,0xc3 ,0x58 ,0x03 ,0x60 ,0x13 ,0x0b ,0x03 ,0x15 ,0x06 ,0x01 ,0x08 ,0x26 , -0xe5 ,0x15 ,0x0b ,0x01 , -0x08 ,0x26 ,0xe5 ,0x15 ,0x1a ,0x01 ,0x08 ,0x26 ,0xe5 ,0x72 ,0xfe ,0x89 , -0x49 ,0x01 ,0x08 ,0x03 , -0x15 ,0x06 ,0x01 ,0x08 ,0x26 ,0xa6 ,0x15 ,0x1a ,0x01 ,0x08 ,0x26 ,0xa6 , -0x15 ,0x06 ,0x01 ,0x08 , +0xe5 ,0x15 ,0x0b ,0x01 ,0x08 ,0x26 ,0xe5 ,0x15 ,0x1a ,0x01 ,0x08 ,0x26 , +0xe5 ,0x72 ,0xfe ,0x89 ,0x49 ,0x01 ,0x08 ,0x03 ,0x15 ,0x06 ,0x01 ,0x08 , +0x26 ,0xa6 ,0x15 ,0x1a ,0x01 ,0x08 ,0x26 ,0xa6 ,0x15 ,0x06 ,0x01 ,0x08 ,0x26 ,0xa6 ,0xfe ,0x89 ,0x49 ,0x01 ,0x08 ,0x26 ,0xa6 ,0x72 ,0xfe ,0x89 , -0x4a ,0x01 ,0x08 ,0x03 , -0x60 ,0x03 ,0x1e ,0xcc ,0x07 ,0x06 ,0xfe ,0x44 ,0x13 ,0xad ,0x12 ,0xcc , -0xfe ,0x49 ,0xf4 ,0x00 , -0x3b ,0x72 ,0x9f ,0x5e ,0xfe ,0x01 ,0xec ,0xfe ,0x27 ,0x01 ,0xf1 ,0x01 , -0x08 ,0x2f ,0x07 ,0xfe , +0x4a ,0x01 ,0x08 ,0x03 ,0x60 ,0x03 ,0x1e ,0xcc ,0x07 ,0x06 ,0xfe ,0x44 , +0x13 ,0xad ,0x12 ,0xcc ,0xfe ,0x49 ,0xf4 ,0x00 ,0x3b ,0x72 ,0x9f ,0x5e , +0xfe ,0x01 ,0xec ,0xfe ,0x27 ,0x01 ,0xf1 ,0x01 ,0x08 ,0x2f ,0x07 ,0xfe ,0xe3 ,0x00 ,0xfe ,0x20 ,0x13 ,0x1f ,0xfe ,0x5a ,0x15 ,0x23 ,0x12 ,0xcd , -0x01 ,0x43 ,0x1e ,0xcd , -0x07 ,0x06 ,0x45 ,0x09 ,0x4a ,0x06 ,0x35 ,0x03 ,0x0a ,0x42 ,0x01 ,0x0e , -0xed ,0x88 ,0x07 ,0x10 , -0xa4 ,0x0a ,0x80 ,0x01 ,0x0e ,0x88 ,0x0a ,0x51 ,0x01 ,0x9e ,0x03 ,0x0a , -0x80 ,0x01 ,0x0e ,0x88 , +0x01 ,0x43 ,0x1e ,0xcd ,0x07 ,0x06 ,0x45 ,0x09 ,0x4a ,0x06 ,0x35 ,0x03 , +0x0a ,0x42 ,0x01 ,0x0e ,0xed ,0x88 ,0x07 ,0x10 ,0xa4 ,0x0a ,0x80 ,0x01 , +0x0e ,0x88 ,0x0a ,0x51 ,0x01 ,0x9e ,0x03 ,0x0a ,0x80 ,0x01 ,0x0e ,0x88 ,0xfe ,0x80 ,0xe7 ,0x10 ,0x07 ,0x10 ,0x84 ,0xfe ,0x45 ,0x58 ,0x01 ,0xe3 , -0x88 ,0x03 ,0x0a ,0x42 , -0x01 ,0x0e ,0x88 ,0x0a ,0x51 ,0x01 ,0x9e ,0x03 ,0x0a ,0x42 ,0x01 ,0x0e , -0xfe ,0x80 ,0x80 ,0xf2 , -0xfe ,0x49 ,0xe4 ,0x10 ,0xa4 ,0x0a ,0x80 ,0x01 ,0x0e ,0xf2 ,0x0a ,0x51 , -0x01 ,0x82 ,0x03 ,0x17 , +0x88 ,0x03 ,0x0a ,0x42 ,0x01 ,0x0e ,0x88 ,0x0a ,0x51 ,0x01 ,0x9e ,0x03 , +0x0a ,0x42 ,0x01 ,0x0e ,0xfe ,0x80 ,0x80 ,0xf2 ,0xfe ,0x49 ,0xe4 ,0x10 , +0xa4 ,0x0a ,0x80 ,0x01 ,0x0e ,0xf2 ,0x0a ,0x51 ,0x01 ,0x82 ,0x03 ,0x17 ,0x10 ,0x71 ,0x66 ,0xfe ,0x60 ,0x01 ,0xfe ,0x18 ,0xdf ,0xfe ,0x19 ,0xde , -0xfe ,0x24 ,0x1c ,0xfe , -0x1d ,0xf7 ,0x1d ,0x90 ,0xfe ,0xf6 ,0x15 ,0x01 ,0xfe ,0xfc ,0x16 ,0xe0 , -0x91 ,0x1d ,0x66 ,0xfe , -0x2c ,0x01 ,0xfe ,0x2f ,0x19 ,0x03 ,0xae ,0x21 ,0xfe ,0xe6 ,0x15 ,0xfe , -0xda ,0x10 ,0x17 ,0x10 , +0xfe ,0x24 ,0x1c ,0xfe ,0x1d ,0xf7 ,0x1d ,0x90 ,0xfe ,0xf6 ,0x15 ,0x01 , +0xfe ,0xfc ,0x16 ,0xe0 ,0x91 ,0x1d ,0x66 ,0xfe ,0x2c ,0x01 ,0xfe ,0x2f , +0x19 ,0x03 ,0xae ,0x21 ,0xfe ,0xe6 ,0x15 ,0xfe ,0xda ,0x10 ,0x17 ,0x10 ,0x71 ,0x05 ,0xfe ,0x64 ,0x01 ,0xfe ,0x00 ,0xf4 ,0x19 ,0xfe ,0x18 ,0x58 , -0x05 ,0xfe ,0x66 ,0x01 , -0xfe ,0x19 ,0x58 ,0x91 ,0x19 ,0xfe ,0x3c ,0x90 ,0xfe ,0x30 ,0xf4 ,0x06 , -0xfe ,0x3c ,0x50 ,0x66 , -0xfe ,0x38 ,0x00 ,0xfe ,0x0f ,0x79 ,0xfe ,0x1c ,0xf7 ,0x19 ,0x90 ,0xfe , -0x40 ,0x16 ,0xfe ,0xb6 , +0x05 ,0xfe ,0x66 ,0x01 ,0xfe ,0x19 ,0x58 ,0x91 ,0x19 ,0xfe ,0x3c ,0x90 , +0xfe ,0x30 ,0xf4 ,0x06 ,0xfe ,0x3c ,0x50 ,0x66 ,0xfe ,0x38 ,0x00 ,0xfe , +0x0f ,0x79 ,0xfe ,0x1c ,0xf7 ,0x19 ,0x90 ,0xfe ,0x40 ,0x16 ,0xfe ,0xb6 ,0x14 ,0x34 ,0x03 ,0xae ,0x21 ,0xfe ,0x18 ,0x16 ,0xfe ,0x9c ,0x10 ,0x17 , -0x10 ,0x71 ,0xfe ,0x83 , -0x5a ,0xfe ,0x18 ,0xdf ,0xfe ,0x19 ,0xde ,0xfe ,0x1d ,0xf7 ,0x38 ,0x90 , -0xfe ,0x62 ,0x16 ,0xfe , -0x94 ,0x14 ,0xfe ,0x10 ,0x13 ,0x91 ,0x38 ,0x66 ,0x1b ,0xfe ,0xaf ,0x19 , -0xfe ,0x98 ,0xe7 ,0x00 , +0x10 ,0x71 ,0xfe ,0x83 ,0x5a ,0xfe ,0x18 ,0xdf ,0xfe ,0x19 ,0xde ,0xfe , +0x1d ,0xf7 ,0x38 ,0x90 ,0xfe ,0x62 ,0x16 ,0xfe ,0x94 ,0x14 ,0xfe ,0x10 , +0x13 ,0x91 ,0x38 ,0x66 ,0x1b ,0xfe ,0xaf ,0x19 ,0xfe ,0x98 ,0xe7 ,0x00 ,0x03 ,0xae ,0x21 ,0xfe ,0x56 ,0x16 ,0xfe ,0x6c ,0x10 ,0x17 ,0x10 ,0x71 , -0xfe ,0x30 ,0xbc ,0xfe , -0xb2 ,0xbc ,0x91 ,0xc5 ,0x66 ,0x1b ,0xfe ,0x0f ,0x79 ,0xfe ,0x1c ,0xf7 , -0xc5 ,0x90 ,0xfe ,0x9a , -0x16 ,0xfe ,0x5c ,0x14 ,0x34 ,0x03 ,0xae ,0x21 ,0xfe ,0x86 ,0x16 ,0xfe , -0x42 ,0x10 ,0xfe ,0x02 , +0xfe ,0x30 ,0xbc ,0xfe ,0xb2 ,0xbc ,0x91 ,0xc5 ,0x66 ,0x1b ,0xfe ,0x0f , +0x79 ,0xfe ,0x1c ,0xf7 ,0xc5 ,0x90 ,0xfe ,0x9a ,0x16 ,0xfe ,0x5c ,0x14 , +0x34 ,0x03 ,0xae ,0x21 ,0xfe ,0x86 ,0x16 ,0xfe ,0x42 ,0x10 ,0xfe ,0x02 ,0xf6 ,0x10 ,0x71 ,0xfe ,0x18 ,0xfe ,0x54 ,0xfe ,0x19 ,0xfe ,0x55 ,0xfc , -0xfe ,0x1d ,0xf7 ,0x4f , -0x90 ,0xfe ,0xc0 ,0x16 ,0xfe ,0x36 ,0x14 ,0xfe ,0x1c ,0x13 ,0x91 ,0x4f , -0x47 ,0xfe ,0x83 ,0x58 , -0xfe ,0xaf ,0x19 ,0xfe ,0x80 ,0xe7 ,0x10 ,0xfe ,0x81 ,0xe7 ,0x10 ,0x11 , -0xfe ,0xdd ,0x00 ,0x63 , +0xfe ,0x1d ,0xf7 ,0x4f ,0x90 ,0xfe ,0xc0 ,0x16 ,0xfe ,0x36 ,0x14 ,0xfe , +0x1c ,0x13 ,0x91 ,0x4f ,0x47 ,0xfe ,0x83 ,0x58 ,0xfe ,0xaf ,0x19 ,0xfe , +0x80 ,0xe7 ,0x10 ,0xfe ,0x81 ,0xe7 ,0x10 ,0x11 ,0xfe ,0xdd ,0x00 ,0x63 ,0x27 ,0x03 ,0x63 ,0x27 ,0xfe ,0x12 ,0x45 ,0x21 ,0xfe ,0xb0 ,0x16 ,0x14 , -0x06 ,0x37 ,0x95 ,0xa9 , -0x02 ,0x29 ,0xfe ,0x39 ,0xf0 ,0xfe ,0x04 ,0x17 ,0x23 ,0x03 ,0xfe ,0x7e , -0x18 ,0x1c ,0x1a ,0x5d , -0x13 ,0x0d ,0x03 ,0x71 ,0x05 ,0xcb ,0x1c ,0x06 ,0xfe ,0xef ,0x12 ,0xfe , -0xe1 ,0x10 ,0x78 ,0x2c , +0x06 ,0x37 ,0x95 ,0xa9 ,0x02 ,0x29 ,0xfe ,0x39 ,0xf0 ,0xfe ,0x04 ,0x17 , +0x23 ,0x03 ,0xfe ,0x7e ,0x18 ,0x1c ,0x1a ,0x5d ,0x13 ,0x0d ,0x03 ,0x71 , +0x05 ,0xcb ,0x1c ,0x06 ,0xfe ,0xef ,0x12 ,0xfe ,0xe1 ,0x10 ,0x78 ,0x2c ,0x46 ,0x2f ,0x07 ,0x2d ,0xfe ,0x3c ,0x13 ,0xfe ,0x82 ,0x14 ,0xfe ,0x42 , -0x13 ,0x3c ,0x8a ,0x0a , -0x42 ,0x01 ,0x0e ,0xb0 ,0xfe ,0x3e ,0x12 ,0xf0 ,0xfe ,0x45 ,0x48 ,0x01 , -0xe3 ,0xfe ,0x00 ,0xcc , -0xb0 ,0xfe ,0xf3 ,0x13 ,0x3d ,0x75 ,0x07 ,0x10 ,0xa3 ,0x0a ,0x80 ,0x01 , -0x0e ,0xf2 ,0x01 ,0x6f , +0x13 ,0x3c ,0x8a ,0x0a ,0x42 ,0x01 ,0x0e ,0xb0 ,0xfe ,0x3e ,0x12 ,0xf0 , +0xfe ,0x45 ,0x48 ,0x01 ,0xe3 ,0xfe ,0x00 ,0xcc ,0xb0 ,0xfe ,0xf3 ,0x13 , +0x3d ,0x75 ,0x07 ,0x10 ,0xa3 ,0x0a ,0x80 ,0x01 ,0x0e ,0xf2 ,0x01 ,0x6f ,0xfe ,0x16 ,0x10 ,0x07 ,0x7e ,0x85 ,0xfe ,0x40 ,0x14 ,0xfe ,0x24 ,0x12 , -0xf6 ,0xfe ,0xd6 ,0xf0 , -0xfe ,0x24 ,0x17 ,0x17 ,0x0b ,0x03 ,0xfe ,0x9c ,0xe7 ,0x0b ,0x0f ,0xfe , -0x15 ,0x00 ,0x59 ,0x76 , -0x27 ,0x01 ,0xda ,0x17 ,0x06 ,0x03 ,0x3c ,0x8a ,0x09 ,0x4a ,0x1d ,0x35 , -0x11 ,0x2d ,0x01 ,0x6f , +0xf6 ,0xfe ,0xd6 ,0xf0 ,0xfe ,0x24 ,0x17 ,0x17 ,0x0b ,0x03 ,0xfe ,0x9c , +0xe7 ,0x0b ,0x0f ,0xfe ,0x15 ,0x00 ,0x59 ,0x76 ,0x27 ,0x01 ,0xda ,0x17 , +0x06 ,0x03 ,0x3c ,0x8a ,0x09 ,0x4a ,0x1d ,0x35 ,0x11 ,0x2d ,0x01 ,0x6f ,0x17 ,0x06 ,0x03 ,0xfe ,0x38 ,0x90 ,0xfe ,0xba ,0x90 ,0x79 ,0xc7 ,0x68 , -0xc8 ,0xfe ,0x48 ,0x55 , -0x34 ,0xfe ,0xc9 ,0x55 ,0x03 ,0x1e ,0x98 ,0x73 ,0x12 ,0x98 ,0x03 ,0x0a , -0x99 ,0x01 ,0x0e ,0xf0 , -0x0a ,0x40 ,0x01 ,0x0e ,0xfe ,0x49 ,0x44 ,0x16 ,0xfe ,0xf0 ,0x17 ,0x73 , -0x75 ,0x03 ,0x0a ,0x42 , +0xc8 ,0xfe ,0x48 ,0x55 ,0x34 ,0xfe ,0xc9 ,0x55 ,0x03 ,0x1e ,0x98 ,0x73 , +0x12 ,0x98 ,0x03 ,0x0a ,0x99 ,0x01 ,0x0e ,0xf0 ,0x0a ,0x40 ,0x01 ,0x0e , +0xfe ,0x49 ,0x44 ,0x16 ,0xfe ,0xf0 ,0x17 ,0x73 ,0x75 ,0x03 ,0x0a ,0x42 ,0x01 ,0x0e ,0x07 ,0x10 ,0x45 ,0x0a ,0x51 ,0x01 ,0x9e ,0x0a ,0x40 ,0x01 , -0x0e ,0x73 ,0x75 ,0x03 , -0xfe ,0x4e ,0xe4 ,0x1a ,0x64 ,0xfe ,0x24 ,0x18 ,0x05 ,0xfe ,0x90 ,0x00 , -0xfe ,0x3a ,0x45 ,0x5b , -0xfe ,0x4e ,0xe4 ,0xc2 ,0x64 ,0xfe ,0x36 ,0x18 ,0x05 ,0xfe ,0x92 ,0x00 , -0xfe ,0x02 ,0xe6 ,0x1b , +0x0e ,0x73 ,0x75 ,0x03 ,0xfe ,0x4e ,0xe4 ,0x1a ,0x64 ,0xfe ,0x24 ,0x18 , +0x05 ,0xfe ,0x90 ,0x00 ,0xfe ,0x3a ,0x45 ,0x5b ,0xfe ,0x4e ,0xe4 ,0xc2 , +0x64 ,0xfe ,0x36 ,0x18 ,0x05 ,0xfe ,0x92 ,0x00 ,0xfe ,0x02 ,0xe6 ,0x1b ,0xdc ,0xfe ,0x4e ,0xe4 ,0xfe ,0x0b ,0x00 ,0x64 ,0xfe ,0x48 ,0x18 ,0x05 , -0xfe ,0x94 ,0x00 ,0xfe , -0x02 ,0xe6 ,0x19 ,0xfe ,0x08 ,0x10 ,0x05 ,0xfe ,0x96 ,0x00 ,0xfe ,0x02 , -0xe6 ,0x2c ,0xfe ,0x4e , -0x45 ,0xfe ,0x0c ,0x12 ,0xaf ,0xff ,0x04 ,0x68 ,0x54 ,0xde ,0x1c ,0x69 , -0x03 ,0x07 ,0x7a ,0xfe , +0xfe ,0x94 ,0x00 ,0xfe ,0x02 ,0xe6 ,0x19 ,0xfe ,0x08 ,0x10 ,0x05 ,0xfe , +0x96 ,0x00 ,0xfe ,0x02 ,0xe6 ,0x2c ,0xfe ,0x4e ,0x45 ,0xfe ,0x0c ,0x12 , +0xaf ,0xff ,0x04 ,0x68 ,0x54 ,0xde ,0x1c ,0x69 ,0x03 ,0x07 ,0x7a ,0xfe ,0x5a ,0xf0 ,0xfe ,0x74 ,0x18 ,0x24 ,0xfe ,0x09 ,0x00 ,0xfe ,0x34 ,0x10 , -0x07 ,0x1b ,0xfe ,0x5a , -0xf0 ,0xfe ,0x82 ,0x18 ,0x24 ,0xc3 ,0xfe ,0x26 ,0x10 ,0x07 ,0x1a ,0x5d , -0x24 ,0x2c ,0xdc ,0x07 , -0x0b ,0x5d ,0x24 ,0x93 ,0xfe ,0x0e ,0x10 ,0x07 ,0x06 ,0x5d ,0x24 ,0x4d , -0x9f ,0xad ,0x03 ,0x14 , +0x07 ,0x1b ,0xfe ,0x5a ,0xf0 ,0xfe ,0x82 ,0x18 ,0x24 ,0xc3 ,0xfe ,0x26 , +0x10 ,0x07 ,0x1a ,0x5d ,0x24 ,0x2c ,0xdc ,0x07 ,0x0b ,0x5d ,0x24 ,0x93 , +0xfe ,0x0e ,0x10 ,0x07 ,0x06 ,0x5d ,0x24 ,0x4d ,0x9f ,0xad ,0x03 ,0x14 ,0xfe ,0x09 ,0x00 ,0x01 ,0x33 ,0xfe ,0x04 ,0xfe ,0x7d ,0x05 ,0x7f ,0xf9 , -0x03 ,0x25 ,0xfe ,0xca , -0x18 ,0xfe ,0x14 ,0xf0 ,0x08 ,0x65 ,0xfe ,0xc6 ,0x18 ,0x03 ,0xff ,0x1a , -0x00 ,0x00 , +0x03 ,0x25 ,0xfe ,0xca ,0x18 ,0xfe ,0x14 ,0xf0 ,0x08 ,0x65 ,0xfe ,0xc6 , +0x18 ,0x03 ,0xff ,0x1a ,0x00 ,0x00 , };static unsigned short _adv_asc3550_size =sizeof (_adv_asc3550_buf);/* 0x13AD */
@@ -10978,672 +10673,449 @@ static ADV_DCNT _adv_asc3550_chksum = 0x04D52DDDUL; /* Expanded little-endian ch/* Microcode buffer is kept after initialization for error recovery. */ static unsigned char _adv_asc38C0800_buf[] = {0x00 ,0x00 ,0x00 ,0xf2 ,0x00 ,0xf0 ,0x00 ,0xfc ,0x00 ,0x16 ,0x18 ,0xe4 , -0x01 ,0x00 ,0x48 ,0xe4 , -0x18 ,0x80 ,0x03 ,0xf6 ,0x02 ,0x00 ,0xce ,0x19 ,0x00 ,0xfa ,0xff ,0xff , -0x1c ,0x0f ,0x00 ,0xf6 , -0x9e ,0xe7 ,0xff ,0x00 ,0x82 ,0xe7 ,0x00 ,0xea ,0x01 ,0xfa ,0x01 ,0xe6 , -0x09 ,0xe7 ,0x55 ,0xf0 , +0x01 ,0x00 ,0x48 ,0xe4 ,0x18 ,0x80 ,0x03 ,0xf6 ,0x02 ,0x00 ,0xce ,0x19 , +0x00 ,0xfa ,0xff ,0xff ,0x1c ,0x0f ,0x00 ,0xf6 ,0x9e ,0xe7 ,0xff ,0x00 , +0x82 ,0xe7 ,0x00 ,0xea ,0x01 ,0xfa ,0x01 ,0xe6 ,0x09 ,0xe7 ,0x55 ,0xf0 ,0x01 ,0xf6 ,0x03 ,0x00 ,0x04 ,0x00 ,0x10 ,0x00 ,0x1e ,0xf0 ,0x85 ,0xf0 , -0x18 ,0xf4 ,0x08 ,0x00 , -0xbc ,0x00 ,0x38 ,0x54 ,0x00 ,0xec ,0xd5 ,0xf0 ,0x82 ,0x0d ,0x00 ,0xe6 , -0x86 ,0xf0 ,0xb1 ,0xf0 , -0x98 ,0x57 ,0x01 ,0xfc ,0xb4 ,0x00 ,0xd4 ,0x01 ,0x0c ,0x1c ,0x3e ,0x1c , -0x3c ,0x00 ,0xbb ,0x00 , +0x18 ,0xf4 ,0x08 ,0x00 ,0xbc ,0x00 ,0x38 ,0x54 ,0x00 ,0xec ,0xd5 ,0xf0 , +0x82 ,0x0d ,0x00 ,0xe6 ,0x86 ,0xf0 ,0xb1 ,0xf0 ,0x98 ,0x57 ,0x01 ,0xfc , +0xb4 ,0x00 ,0xd4 ,0x01 ,0x0c ,0x1c ,0x3e ,0x1c ,0x3c ,0x00 ,0xbb ,0x00 ,0x00 ,0x10 ,0xba ,0x19 ,0x02 ,0x80 ,0x32 ,0xf0 ,0x7c ,0x0d ,0x02 ,0x13 , -0xba ,0x13 ,0x18 ,0x40 , -0x00 ,0x57 ,0x01 ,0xea ,0x02 ,0xfc ,0x03 ,0xfc ,0x3e ,0x00 ,0x6c ,0x01 , -0x6e ,0x01 ,0x74 ,0x01 , -0x76 ,0x01 ,0xb9 ,0x54 ,0x3e ,0x57 ,0x00 ,0x80 ,0x03 ,0xe6 ,0xb6 ,0x00 , -0xc0 ,0x00 ,0x01 ,0x01 , +0xba ,0x13 ,0x18 ,0x40 ,0x00 ,0x57 ,0x01 ,0xea ,0x02 ,0xfc ,0x03 ,0xfc , +0x3e ,0x00 ,0x6c ,0x01 ,0x6e ,0x01 ,0x74 ,0x01 ,0x76 ,0x01 ,0xb9 ,0x54 , +0x3e ,0x57 ,0x00 ,0x80 ,0x03 ,0xe6 ,0xb6 ,0x00 ,0xc0 ,0x00 ,0x01 ,0x01 ,0x3e ,0x01 ,0x7a ,0x01 ,0xca ,0x08 ,0xce ,0x10 ,0x16 ,0x11 ,0x04 ,0x12 , -0x08 ,0x12 ,0x02 ,0x4a , -0xbb ,0x55 ,0x3c ,0x56 ,0x03 ,0x58 ,0x1b ,0x80 ,0x30 ,0xe4 ,0x4b ,0xe4 , -0x5d ,0xf0 ,0x02 ,0xfa , -0x20 ,0x00 ,0x32 ,0x00 ,0x40 ,0x00 ,0x80 ,0x00 ,0x24 ,0x01 ,0x3c ,0x01 , -0x68 ,0x01 ,0x6a ,0x01 , +0x08 ,0x12 ,0x02 ,0x4a ,0xbb ,0x55 ,0x3c ,0x56 ,0x03 ,0x58 ,0x1b ,0x80 , +0x30 ,0xe4 ,0x4b ,0xe4 ,0x5d ,0xf0 ,0x02 ,0xfa ,0x20 ,0x00 ,0x32 ,0x00 , +0x40 ,0x00 ,0x80 ,0x00 ,0x24 ,0x01 ,0x3c ,0x01 ,0x68 ,0x01 ,0x6a ,0x01 ,0x70 ,0x01 ,0x72 ,0x01 ,0x78 ,0x01 ,0x7c ,0x01 ,0x62 ,0x0a ,0x86 ,0x0d , -0x06 ,0x13 ,0x4c ,0x1c , -0x04 ,0x80 ,0x4a ,0xe4 ,0x02 ,0xee ,0x5b ,0xf0 ,0x03 ,0xf7 ,0x0c ,0x00 , -0x0f ,0x00 ,0x47 ,0x00 , -0xbe ,0x00 ,0x00 ,0x01 ,0x20 ,0x11 ,0x5c ,0x16 ,0x32 ,0x1c ,0x38 ,0x1c , -0x4e ,0x1c ,0x10 ,0x44 , +0x06 ,0x13 ,0x4c ,0x1c ,0x04 ,0x80 ,0x4a ,0xe4 ,0x02 ,0xee ,0x5b ,0xf0 , +0x03 ,0xf7 ,0x0c ,0x00 ,0x0f ,0x00 ,0x47 ,0x00 ,0xbe ,0x00 ,0x00 ,0x01 , +0x20 ,0x11 ,0x5c ,0x16 ,0x32 ,0x1c ,0x38 ,0x1c ,0x4e ,0x1c ,0x10 ,0x44 ,0x00 ,0x4c ,0x04 ,0xea ,0x5c ,0xf0 ,0xa7 ,0xf0 ,0x04 ,0xf6 ,0x03 ,0xfa , -0x05 ,0x00 ,0x34 ,0x00 , -0x36 ,0x00 ,0x98 ,0x00 ,0xcc ,0x00 ,0x20 ,0x01 ,0x4e ,0x01 ,0x4a ,0x0b , -0x42 ,0x0c ,0x12 ,0x0f , -0x0c ,0x10 ,0x22 ,0x11 ,0x0a ,0x12 ,0x04 ,0x13 ,0x30 ,0x1c ,0x02 ,0x48 , -0x00 ,0x4e ,0x42 ,0x54 , +0x05 ,0x00 ,0x34 ,0x00 ,0x36 ,0x00 ,0x98 ,0x00 ,0xcc ,0x00 ,0x20 ,0x01 , +0x4e ,0x01 ,0x4a ,0x0b ,0x42 ,0x0c ,0x12 ,0x0f ,0x0c ,0x10 ,0x22 ,0x11 , +0x0a ,0x12 ,0x04 ,0x13 ,0x30 ,0x1c ,0x02 ,0x48 ,0x00 ,0x4e ,0x42 ,0x54 ,0x44 ,0x55 ,0xbd ,0x56 ,0x06 ,0x83 ,0x00 ,0xdc ,0x05 ,0xf0 ,0x09 ,0xf0 , -0x59 ,0xf0 ,0xb8 ,0xf0 , -0x4b ,0xf4 ,0x06 ,0xf7 ,0x0e ,0xf7 ,0x04 ,0xfc ,0x05 ,0xfc ,0x06 ,0x00 , -0x19 ,0x00 ,0x33 ,0x00 , -0x9b ,0x00 ,0xa4 ,0x00 ,0xb5 ,0x00 ,0xba ,0x00 ,0xd0 ,0x00 ,0xe1 ,0x00 , -0xe7 ,0x00 ,0xe2 ,0x03 , +0x59 ,0xf0 ,0xb8 ,0xf0 ,0x4b ,0xf4 ,0x06 ,0xf7 ,0x0e ,0xf7 ,0x04 ,0xfc , +0x05 ,0xfc ,0x06 ,0x00 ,0x19 ,0x00 ,0x33 ,0x00 ,0x9b ,0x00 ,0xa4 ,0x00 , +0xb5 ,0x00 ,0xba ,0x00 ,0xd0 ,0x00 ,0xe1 ,0x00 ,0xe7 ,0x00 ,0xe2 ,0x03 ,0x08 ,0x0f ,0x02 ,0x10 ,0x04 ,0x10 ,0x0a ,0x10 ,0x0a ,0x13 ,0x0c ,0x13 , -0x12 ,0x13 ,0x24 ,0x14 , -0x34 ,0x14 ,0x04 ,0x16 ,0x08 ,0x16 ,0xa4 ,0x17 ,0x20 ,0x1c ,0x34 ,0x1c , -0x36 ,0x1c ,0x08 ,0x44 , -0x38 ,0x44 ,0x91 ,0x44 ,0x0a ,0x45 ,0x48 ,0x46 ,0x01 ,0x48 ,0x68 ,0x54 , -0x3a ,0x55 ,0x83 ,0x55 , +0x12 ,0x13 ,0x24 ,0x14 ,0x34 ,0x14 ,0x04 ,0x16 ,0x08 ,0x16 ,0xa4 ,0x17 , +0x20 ,0x1c ,0x34 ,0x1c ,0x36 ,0x1c ,0x08 ,0x44 ,0x38 ,0x44 ,0x91 ,0x44 , +0x0a ,0x45 ,0x48 ,0x46 ,0x01 ,0x48 ,0x68 ,0x54 ,0x3a ,0x55 ,0x83 ,0x55 ,0xe5 ,0x55 ,0xb0 ,0x57 ,0x01 ,0x58 ,0x83 ,0x59 ,0x05 ,0xe6 ,0x0b ,0xf0 , -0x0c ,0xf0 ,0x04 ,0xf8 , -0x05 ,0xf8 ,0x07 ,0x00 ,0x0a ,0x00 ,0x1c ,0x00 ,0x1e ,0x00 ,0x9e ,0x00 , -0xa8 ,0x00 ,0xaa ,0x00 , -0xb9 ,0x00 ,0xe0 ,0x00 ,0x22 ,0x01 ,0x26 ,0x01 ,0x79 ,0x01 ,0x7e ,0x01 , -0xc4 ,0x01 ,0xc6 ,0x01 , +0x0c ,0xf0 ,0x04 ,0xf8 ,0x05 ,0xf8 ,0x07 ,0x00 ,0x0a ,0x00 ,0x1c ,0x00 , +0x1e ,0x00 ,0x9e ,0x00 ,0xa8 ,0x00 ,0xaa ,0x00 ,0xb9 ,0x00 ,0xe0 ,0x00 , +0x22 ,0x01 ,0x26 ,0x01 ,0x79 ,0x01 ,0x7e ,0x01 ,0xc4 ,0x01 ,0xc6 ,0x01 ,0x80 ,0x02 ,0x5e ,0x03 ,0xee ,0x04 ,0x9a ,0x06 ,0xf8 ,0x07 ,0x62 ,0x08 , -0x68 ,0x08 ,0x69 ,0x08 , -0xd6 ,0x08 ,0xe9 ,0x09 ,0xfa ,0x0b ,0x2e ,0x0f ,0x12 ,0x10 ,0x1a ,0x10 , -0xed ,0x10 ,0xf1 ,0x10 , -0x2a ,0x11 ,0x06 ,0x12 ,0x0c ,0x12 ,0x3e ,0x12 ,0x10 ,0x13 ,0x16 ,0x13 , -0x1e ,0x13 ,0x46 ,0x14 , +0x68 ,0x08 ,0x69 ,0x08 ,0xd6 ,0x08 ,0xe9 ,0x09 ,0xfa ,0x0b ,0x2e ,0x0f , +0x12 ,0x10 ,0x1a ,0x10 ,0xed ,0x10 ,0xf1 ,0x10 ,0x2a ,0x11 ,0x06 ,0x12 , +0x0c ,0x12 ,0x3e ,0x12 ,0x10 ,0x13 ,0x16 ,0x13 ,0x1e ,0x13 ,0x46 ,0x14 ,0x76 ,0x14 ,0x82 ,0x14 ,0x36 ,0x15 ,0xca ,0x15 ,0x6b ,0x18 ,0xbe ,0x18 , -0xca ,0x18 ,0xe6 ,0x19 , -0x12 ,0x1c ,0x46 ,0x1c ,0x9c ,0x32 ,0x00 ,0x40 ,0x0e ,0x47 ,0xfe ,0x9c , -0xf0 ,0x2b ,0x02 ,0xfe , -0xac ,0x0d ,0xff ,0x10 ,0x00 ,0x00 ,0xd7 ,0xfe ,0xe8 ,0x19 ,0x00 ,0xd6 , -0xfe ,0x84 ,0x01 ,0xff , +0xca ,0x18 ,0xe6 ,0x19 ,0x12 ,0x1c ,0x46 ,0x1c ,0x9c ,0x32 ,0x00 ,0x40 , +0x0e ,0x47 ,0xfe ,0x9c ,0xf0 ,0x2b ,0x02 ,0xfe ,0xac ,0x0d ,0xff ,0x10 , +0x00 ,0x00 ,0xd7 ,0xfe ,0xe8 ,0x19 ,0x00 ,0xd6 ,0xfe ,0x84 ,0x01 ,0xff ,0x03 ,0x00 ,0x00 ,0xfe ,0x93 ,0x15 ,0xfe ,0x0f ,0x05 ,0xff ,0x38 ,0x00 , -0x00 ,0xfe ,0x57 ,0x24 , -0x00 ,0xfe ,0x4c ,0x00 ,0x5b ,0xff ,0x04 ,0x00 ,0x00 ,0x11 ,0xff ,0x09 , -0x00 ,0x00 ,0xff ,0x08 , -0x01 ,0x01 ,0xff ,0x08 ,0xff ,0xff ,0xff ,0x27 ,0x00 ,0x00 ,0xff ,0x10 , -0xff ,0xff ,0xff ,0x11 , +0x00 ,0xfe ,0x57 ,0x24 ,0x00 ,0xfe ,0x4c ,0x00 ,0x5b ,0xff ,0x04 ,0x00 , +0x00 ,0x11 ,0xff ,0x09 ,0x00 ,0x00 ,0xff ,0x08 ,0x01 ,0x01 ,0xff ,0x08 , +0xff ,0xff ,0xff ,0x27 ,0x00 ,0x00 ,0xff ,0x10 ,0xff ,0xff ,0xff ,0x11 ,0x00 ,0x00 ,0xfe ,0x78 ,0x56 ,0xfe ,0x34 ,0x12 ,0xff ,0x21 ,0x00 ,0x00 , -0xfe ,0x04 ,0xf7 ,0xd6 , -0x2c ,0x99 ,0x0a ,0x01 ,0xfe ,0xc2 ,0x0f ,0xfe ,0x04 ,0xf7 ,0xd6 ,0x99 , -0x0a ,0x42 ,0x2c ,0xfe , -0x3d ,0xf0 ,0xfe ,0x06 ,0x02 ,0xfe ,0x20 ,0xf0 ,0xa7 ,0xfe ,0x91 ,0xf0 , -0xfe ,0xf4 ,0x01 ,0xfe , +0xfe ,0x04 ,0xf7 ,0xd6 ,0x2c ,0x99 ,0x0a ,0x01 ,0xfe ,0xc2 ,0x0f ,0xfe , +0x04 ,0xf7 ,0xd6 ,0x99 ,0x0a ,0x42 ,0x2c ,0xfe ,0x3d ,0xf0 ,0xfe ,0x06 , +0x02 ,0xfe ,0x20 ,0xf0 ,0xa7 ,0xfe ,0x91 ,0xf0 ,0xfe ,0xf4 ,0x01 ,0xfe ,0x90 ,0xf0 ,0xfe ,0xf4 ,0x01 ,0xfe ,0x8f ,0xf0 ,0xa7 ,0x03 ,0x5d ,0x4d , -0x02 ,0xfe ,0xc8 ,0x0d , -0x01 ,0xfe ,0x38 ,0x0e ,0xfe ,0xdd ,0x12 ,0xfe ,0xfc ,0x10 ,0xfe ,0x28 , -0x1c ,0x03 ,0xfe ,0xa6 , -0x00 ,0xfe ,0xd3 ,0x12 ,0x41 ,0x14 ,0xfe ,0xa6 ,0x00 ,0xc2 ,0xfe ,0x48 , -0xf0 ,0xfe ,0x8a ,0x02 , +0x02 ,0xfe ,0xc8 ,0x0d ,0x01 ,0xfe ,0x38 ,0x0e ,0xfe ,0xdd ,0x12 ,0xfe , +0xfc ,0x10 ,0xfe ,0x28 ,0x1c ,0x03 ,0xfe ,0xa6 ,0x00 ,0xfe ,0xd3 ,0x12 , +0x41 ,0x14 ,0xfe ,0xa6 ,0x00 ,0xc2 ,0xfe ,0x48 ,0xf0 ,0xfe ,0x8a ,0x02 ,0xfe ,0x49 ,0xf0 ,0xfe ,0xa4 ,0x02 ,0xfe ,0x4a ,0xf0 ,0xfe ,0xc2 ,0x02 , -0xfe ,0x46 ,0xf0 ,0xfe , -0x54 ,0x02 ,0xfe ,0x47 ,0xf0 ,0xfe ,0x5a ,0x02 ,0xfe ,0x43 ,0xf0 ,0xfe , -0x48 ,0x02 ,0xfe ,0x44 , -0xf0 ,0xfe ,0x4c ,0x02 ,0xfe ,0x45 ,0xf0 ,0xfe ,0x50 ,0x02 ,0x18 ,0x0a , -0xaa ,0x18 ,0x06 ,0x14 , +0xfe ,0x46 ,0xf0 ,0xfe ,0x54 ,0x02 ,0xfe ,0x47 ,0xf0 ,0xfe ,0x5a ,0x02 , +0xfe ,0x43 ,0xf0 ,0xfe ,0x48 ,0x02 ,0xfe ,0x44 ,0xf0 ,0xfe ,0x4c ,0x02 , +0xfe ,0x45 ,0xf0 ,0xfe ,0x50 ,0x02 ,0x18 ,0x0a ,0xaa ,0x18 ,0x06 ,0x14 ,0xa1 ,0x02 ,0x2b ,0xfe ,0x00 ,0x1c ,0xe7 ,0xfe ,0x02 ,0x1c ,0xe6 ,0xfe , -0x1e ,0x1c ,0xfe ,0xe9 , -0x10 ,0x01 ,0xfe ,0x18 ,0x18 ,0xfe ,0xe7 ,0x10 ,0xfe ,0x06 ,0xfc ,0xce , -0x09 ,0x70 ,0x01 ,0xa8 , -0x02 ,0x2b ,0x15 ,0x59 ,0x39 ,0xa2 ,0x01 ,0xfe ,0x58 ,0x10 ,0x09 ,0x70 , -0x01 ,0x87 ,0xfe ,0xbd , +0x1e ,0x1c ,0xfe ,0xe9 ,0x10 ,0x01 ,0xfe ,0x18 ,0x18 ,0xfe ,0xe7 ,0x10 , +0xfe ,0x06 ,0xfc ,0xce ,0x09 ,0x70 ,0x01 ,0xa8 ,0x02 ,0x2b ,0x15 ,0x59 , +0x39 ,0xa2 ,0x01 ,0xfe ,0x58 ,0x10 ,0x09 ,0x70 ,0x01 ,0x87 ,0xfe ,0xbd ,0x10 ,0x09 ,0x70 ,0x01 ,0x87 ,0xfe ,0xad ,0x10 ,0xfe ,0x16 ,0x1c ,0xfe , -0x58 ,0x1c ,0x18 ,0x06 , -0x14 ,0xa1 ,0x2c ,0x1c ,0x2b ,0xfe ,0x3d ,0xf0 ,0xfe ,0x06 ,0x02 ,0x23 , -0xfe ,0x98 ,0x02 ,0xfe , -0x5a ,0x1c ,0xf8 ,0xfe ,0x14 ,0x1c ,0x15 ,0xfe ,0x30 ,0x00 ,0x39 ,0xa2 , -0x01 ,0xfe ,0x48 ,0x10 , +0x58 ,0x1c ,0x18 ,0x06 ,0x14 ,0xa1 ,0x2c ,0x1c ,0x2b ,0xfe ,0x3d ,0xf0 , +0xfe ,0x06 ,0x02 ,0x23 ,0xfe ,0x98 ,0x02 ,0xfe ,0x5a ,0x1c ,0xf8 ,0xfe , +0x14 ,0x1c ,0x15 ,0xfe ,0x30 ,0x00 ,0x39 ,0xa2 ,0x01 ,0xfe ,0x48 ,0x10 ,0x18 ,0x06 ,0x14 ,0xa1 ,0x02 ,0xd7 ,0x22 ,0x20 ,0x07 ,0x11 ,0x35 ,0xfe , -0x69 ,0x10 ,0x18 ,0x06 , -0x14 ,0xa1 ,0xfe ,0x04 ,0xec ,0x20 ,0x4f ,0x43 ,0x13 ,0x20 ,0xfe ,0x05 , -0xf6 ,0xce ,0x01 ,0xfe , -0x4a ,0x17 ,0x08 ,0x54 ,0x58 ,0x37 ,0x12 ,0x2f ,0x42 ,0x92 ,0x01 ,0xfe , -0x82 ,0x16 ,0x02 ,0x2b , +0x69 ,0x10 ,0x18 ,0x06 ,0x14 ,0xa1 ,0xfe ,0x04 ,0xec ,0x20 ,0x4f ,0x43 , +0x13 ,0x20 ,0xfe ,0x05 ,0xf6 ,0xce ,0x01 ,0xfe ,0x4a ,0x17 ,0x08 ,0x54 , +0x58 ,0x37 ,0x12 ,0x2f ,0x42 ,0x92 ,0x01 ,0xfe ,0x82 ,0x16 ,0x02 ,0x2b ,0x09 ,0x46 ,0x01 ,0x0e ,0x07 ,0x00 ,0x66 ,0x01 ,0x73 ,0xfe ,0x18 ,0x10 , -0xfe ,0x41 ,0x58 ,0x09 , -0xa4 ,0x01 ,0x0e ,0xfe ,0xc8 ,0x54 ,0x6b ,0xfe ,0x10 ,0x03 ,0x01 ,0xfe , -0x82 ,0x16 ,0x02 ,0x2b , -0x2c ,0x4f ,0xfe ,0x02 ,0xe8 ,0x2a ,0xfe ,0xbf ,0x57 ,0xfe ,0x9e ,0x43 , -0xfe ,0x77 ,0x57 ,0xfe , +0xfe ,0x41 ,0x58 ,0x09 ,0xa4 ,0x01 ,0x0e ,0xfe ,0xc8 ,0x54 ,0x6b ,0xfe , +0x10 ,0x03 ,0x01 ,0xfe ,0x82 ,0x16 ,0x02 ,0x2b ,0x2c ,0x4f ,0xfe ,0x02 , +0xe8 ,0x2a ,0xfe ,0xbf ,0x57 ,0xfe ,0x9e ,0x43 ,0xfe ,0x77 ,0x57 ,0xfe ,0x27 ,0xf0 ,0xfe ,0xe0 ,0x01 ,0xfe ,0x07 ,0x4b ,0xfe ,0x20 ,0xf0 ,0xa7 , -0xfe ,0x40 ,0x1c ,0x1c , -0xd9 ,0xfe ,0x26 ,0xf0 ,0xfe ,0x5a ,0x03 ,0xfe ,0xa0 ,0xf0 ,0xfe ,0x48 , -0x03 ,0xfe ,0x11 ,0xf0 , -0xa7 ,0xfe ,0xef ,0x10 ,0xfe ,0x9f ,0xf0 ,0xfe ,0x68 ,0x03 ,0xf9 ,0x10 , -0xfe ,0x11 ,0x00 ,0x02 , +0xfe ,0x40 ,0x1c ,0x1c ,0xd9 ,0xfe ,0x26 ,0xf0 ,0xfe ,0x5a ,0x03 ,0xfe , +0xa0 ,0xf0 ,0xfe ,0x48 ,0x03 ,0xfe ,0x11 ,0xf0 ,0xa7 ,0xfe ,0xef ,0x10 , +0xfe ,0x9f ,0xf0 ,0xfe ,0x68 ,0x03 ,0xf9 ,0x10 ,0xfe ,0x11 ,0x00 ,0x02 ,0x65 ,0x2c ,0xfe ,0x48 ,0x1c ,0xf9 ,0x08 ,0x05 ,0x1b ,0xfe ,0x18 ,0x13 , -0x21 ,0x22 ,0xa3 ,0xb7 , -0x13 ,0xa3 ,0x09 ,0x46 ,0x01 ,0x0e ,0xb7 ,0x78 ,0x01 ,0xfe ,0xb4 ,0x16 , -0x12 ,0xd1 ,0x1c ,0xd9 , -0xfe ,0x01 ,0xf0 ,0xd9 ,0xfe ,0x82 ,0xf0 ,0xfe ,0x96 ,0x03 ,0xfa ,0x12 , -0xfe ,0xe4 ,0x00 ,0x27 , +0x21 ,0x22 ,0xa3 ,0xb7 ,0x13 ,0xa3 ,0x09 ,0x46 ,0x01 ,0x0e ,0xb7 ,0x78 , +0x01 ,0xfe ,0xb4 ,0x16 ,0x12 ,0xd1 ,0x1c ,0xd9 ,0xfe ,0x01 ,0xf0 ,0xd9 , +0xfe ,0x82 ,0xf0 ,0xfe ,0x96 ,0x03 ,0xfa ,0x12 ,0xfe ,0xe4 ,0x00 ,0x27 ,0xfe ,0xa8 ,0x03 ,0x1c ,0x34 ,0x1d ,0xfe ,0xb8 ,0x03 ,0x01 ,0x4b ,0xfe , -0x06 ,0xf0 ,0xfe ,0xc8 , -0x03 ,0x95 ,0x86 ,0xfe ,0x0a ,0xf0 ,0xfe ,0x8a ,0x06 ,0x02 ,0x24 ,0x03 , -0x70 ,0x28 ,0x17 ,0xfe , -0xfa ,0x04 ,0x15 ,0x6d ,0x01 ,0x36 ,0x7b ,0xfe ,0x6a ,0x02 ,0x02 ,0xd8 , -0xf9 ,0x2c ,0x99 ,0x19 , +0x06 ,0xf0 ,0xfe ,0xc8 ,0x03 ,0x95 ,0x86 ,0xfe ,0x0a ,0xf0 ,0xfe ,0x8a , +0x06 ,0x02 ,0x24 ,0x03 ,0x70 ,0x28 ,0x17 ,0xfe ,0xfa ,0x04 ,0x15 ,0x6d , +0x01 ,0x36 ,0x7b ,0xfe ,0x6a ,0x02 ,0x02 ,0xd8 ,0xf9 ,0x2c ,0x99 ,0x19 ,0xfe ,0x67 ,0x1b ,0xfe ,0xbf ,0x57 ,0xfe ,0x77 ,0x57 ,0xfe ,0x48 ,0x1c , -0x74 ,0x01 ,0xaf ,0x8c , -0x09 ,0x46 ,0x01 ,0x0e ,0x07 ,0x00 ,0x17 ,0xda ,0x09 ,0xd1 ,0x01 ,0x0e , -0x8d ,0x51 ,0x64 ,0x79 , -0x2a ,0x03 ,0x70 ,0x28 ,0xfe ,0x10 ,0x12 ,0x15 ,0x6d ,0x01 ,0x36 ,0x7b , -0xfe ,0x6a ,0x02 ,0x02 , +0x74 ,0x01 ,0xaf ,0x8c ,0x09 ,0x46 ,0x01 ,0x0e ,0x07 ,0x00 ,0x17 ,0xda , +0x09 ,0xd1 ,0x01 ,0x0e ,0x8d ,0x51 ,0x64 ,0x79 ,0x2a ,0x03 ,0x70 ,0x28 , +0xfe ,0x10 ,0x12 ,0x15 ,0x6d ,0x01 ,0x36 ,0x7b ,0xfe ,0x6a ,0x02 ,0x02 ,0xd8 ,0xc7 ,0x81 ,0xc8 ,0x83 ,0x1c ,0x24 ,0x27 ,0xfe ,0x40 ,0x04 ,0x1d , -0xfe ,0x3c ,0x04 ,0x3b , -0xfe ,0xa0 ,0x00 ,0xfe ,0x9b ,0x57 ,0xfe ,0x4e ,0x12 ,0x2d ,0xff ,0x02 , -0x00 ,0x10 ,0x01 ,0x0b , -0x1d ,0xfe ,0xe4 ,0x04 ,0x2d ,0x01 ,0x0b ,0x1d ,0x24 ,0x33 ,0x31 ,0xde , -0xfe ,0x4c ,0x44 ,0xfe , +0xfe ,0x3c ,0x04 ,0x3b ,0xfe ,0xa0 ,0x00 ,0xfe ,0x9b ,0x57 ,0xfe ,0x4e , +0x12 ,0x2d ,0xff ,0x02 ,0x00 ,0x10 ,0x01 ,0x0b ,0x1d ,0xfe ,0xe4 ,0x04 , +0x2d ,0x01 ,0x0b ,0x1d ,0x24 ,0x33 ,0x31 ,0xde ,0xfe ,0x4c ,0x44 ,0xfe ,0x4c ,0x12 ,0x51 ,0xfe ,0x44 ,0x48 ,0x0f ,0x6f ,0xfe ,0x4c ,0x54 ,0x6b , -0xda ,0x4f ,0x79 ,0x2a , -0xfe ,0x06 ,0x80 ,0xfe ,0x48 ,0x47 ,0xfe ,0x62 ,0x13 ,0x08 ,0x05 ,0x1b , -0xfe ,0x2a ,0x13 ,0x32 , -0x07 ,0x82 ,0xfe ,0x52 ,0x13 ,0xfe ,0x20 ,0x10 ,0x0f ,0x6f ,0xfe ,0x4c , -0x54 ,0x6b ,0xda ,0xfe , +0xda ,0x4f ,0x79 ,0x2a ,0xfe ,0x06 ,0x80 ,0xfe ,0x48 ,0x47 ,0xfe ,0x62 , +0x13 ,0x08 ,0x05 ,0x1b ,0xfe ,0x2a ,0x13 ,0x32 ,0x07 ,0x82 ,0xfe ,0x52 , +0x13 ,0xfe ,0x20 ,0x10 ,0x0f ,0x6f ,0xfe ,0x4c ,0x54 ,0x6b ,0xda ,0xfe ,0x06 ,0x80 ,0xfe ,0x48 ,0x47 ,0xfe ,0x40 ,0x13 ,0x08 ,0x05 ,0x1b ,0xfe , -0x08 ,0x13 ,0x32 ,0x07 , -0x82 ,0xfe ,0x30 ,0x13 ,0x08 ,0x05 ,0x1b ,0xfe ,0x1c ,0x12 ,0x15 ,0x9d , -0x08 ,0x05 ,0x06 ,0x4d , -0x15 ,0xfe ,0x0d ,0x00 ,0x01 ,0x36 ,0x7b ,0xfe ,0x64 ,0x0d ,0x02 ,0x24 , -0x2d ,0x12 ,0xfe ,0xe6 , +0x08 ,0x13 ,0x32 ,0x07 ,0x82 ,0xfe ,0x30 ,0x13 ,0x08 ,0x05 ,0x1b ,0xfe , +0x1c ,0x12 ,0x15 ,0x9d ,0x08 ,0x05 ,0x06 ,0x4d ,0x15 ,0xfe ,0x0d ,0x00 , +0x01 ,0x36 ,0x7b ,0xfe ,0x64 ,0x0d ,0x02 ,0x24 ,0x2d ,0x12 ,0xfe ,0xe6 ,0x00 ,0xfe ,0x1c ,0x90 ,0xfe ,0x40 ,0x5c ,0x04 ,0x15 ,0x9d ,0x01 ,0x36 , -0x02 ,0x2b ,0xfe ,0x42 , -0x5b ,0x99 ,0x19 ,0xfe ,0x46 ,0x59 ,0xfe ,0xbf ,0x57 ,0xfe ,0x77 ,0x57 , -0xfe ,0x87 ,0x80 ,0xfe , -0x31 ,0xe4 ,0x5b ,0x08 ,0x05 ,0x0a ,0xfe ,0x84 ,0x13 ,0xfe ,0x20 ,0x80 , -0x07 ,0x19 ,0xfe ,0x7c , +0x02 ,0x2b ,0xfe ,0x42 ,0x5b ,0x99 ,0x19 ,0xfe ,0x46 ,0x59 ,0xfe ,0xbf , +0x57 ,0xfe ,0x77 ,0x57 ,0xfe ,0x87 ,0x80 ,0xfe ,0x31 ,0xe4 ,0x5b ,0x08 , +0x05 ,0x0a ,0xfe ,0x84 ,0x13 ,0xfe ,0x20 ,0x80 ,0x07 ,0x19 ,0xfe ,0x7c ,0x12 ,0x53 ,0x05 ,0x06 ,0xfe ,0x6c ,0x13 ,0x03 ,0xfe ,0xa2 ,0x00 ,0x28 , -0x17 ,0xfe ,0x90 ,0x05 , -0xfe ,0x31 ,0xe4 ,0x5a ,0x53 ,0x05 ,0x0a ,0xfe ,0x56 ,0x13 ,0x03 ,0xfe , -0xa0 ,0x00 ,0x28 ,0xfe , -0x4e ,0x12 ,0x67 ,0xff ,0x02 ,0x00 ,0x10 ,0x27 ,0xfe ,0x48 ,0x05 ,0x1c , -0x34 ,0xfe ,0x89 ,0x48 , +0x17 ,0xfe ,0x90 ,0x05 ,0xfe ,0x31 ,0xe4 ,0x5a ,0x53 ,0x05 ,0x0a ,0xfe , +0x56 ,0x13 ,0x03 ,0xfe ,0xa0 ,0x00 ,0x28 ,0xfe ,0x4e ,0x12 ,0x67 ,0xff , +0x02 ,0x00 ,0x10 ,0x27 ,0xfe ,0x48 ,0x05 ,0x1c ,0x34 ,0xfe ,0x89 ,0x48 ,0xff ,0x02 ,0x00 ,0x10 ,0x27 ,0xfe ,0x56 ,0x05 ,0x26 ,0xfe ,0xa8 ,0x05 , -0x12 ,0xfe ,0xe3 ,0x00 , -0x21 ,0x53 ,0xfe ,0x4a ,0xf0 ,0xfe ,0x76 ,0x05 ,0xfe ,0x49 ,0xf0 ,0xfe , -0x70 ,0x05 ,0x88 ,0x25 , -0xfe ,0x21 ,0x00 ,0xab ,0x25 ,0xfe ,0x22 ,0x00 ,0xaa ,0x25 ,0x58 ,0xfe , -0x09 ,0x48 ,0xff ,0x02 , +0x12 ,0xfe ,0xe3 ,0x00 ,0x21 ,0x53 ,0xfe ,0x4a ,0xf0 ,0xfe ,0x76 ,0x05 , +0xfe ,0x49 ,0xf0 ,0xfe ,0x70 ,0x05 ,0x88 ,0x25 ,0xfe ,0x21 ,0x00 ,0xab , +0x25 ,0xfe ,0x22 ,0x00 ,0xaa ,0x25 ,0x58 ,0xfe ,0x09 ,0x48 ,0xff ,0x02 ,0x00 ,0x10 ,0x27 ,0xfe ,0x86 ,0x05 ,0x26 ,0xfe ,0xa8 ,0x05 ,0xfe ,0xe2 , -0x08 ,0x53 ,0x05 ,0xcb , -0x4d ,0x01 ,0xb0 ,0x25 ,0x06 ,0x13 ,0xd3 ,0x39 ,0xfe ,0x27 ,0x01 ,0x08 , -0x05 ,0x1b ,0xfe ,0x22 , -0x12 ,0x41 ,0x01 ,0xb2 ,0x15 ,0x9d ,0x08 ,0x05 ,0x06 ,0x4d ,0x15 ,0xfe , -0x0d ,0x00 ,0x01 ,0x36 , +0x08 ,0x53 ,0x05 ,0xcb ,0x4d ,0x01 ,0xb0 ,0x25 ,0x06 ,0x13 ,0xd3 ,0x39 , +0xfe ,0x27 ,0x01 ,0x08 ,0x05 ,0x1b ,0xfe ,0x22 ,0x12 ,0x41 ,0x01 ,0xb2 , +0x15 ,0x9d ,0x08 ,0x05 ,0x06 ,0x4d ,0x15 ,0xfe ,0x0d ,0x00 ,0x01 ,0x36 ,0x7b ,0xfe ,0x64 ,0x0d ,0x02 ,0x24 ,0x03 ,0xfe ,0x9c ,0x00 ,0x28 ,0xeb , -0x03 ,0x5c ,0x28 ,0xfe , -0x36 ,0x13 ,0x41 ,0x01 ,0xb2 ,0x26 ,0xfe ,0x18 ,0x06 ,0x09 ,0x06 ,0x53 , -0x05 ,0x1f ,0xfe ,0x02 , -0x12 ,0x50 ,0x01 ,0xfe ,0x9e ,0x15 ,0x1d ,0xfe ,0x0e ,0x06 ,0x12 ,0xa5 , -0x01 ,0x4b ,0x12 ,0xfe , +0x03 ,0x5c ,0x28 ,0xfe ,0x36 ,0x13 ,0x41 ,0x01 ,0xb2 ,0x26 ,0xfe ,0x18 , +0x06 ,0x09 ,0x06 ,0x53 ,0x05 ,0x1f ,0xfe ,0x02 ,0x12 ,0x50 ,0x01 ,0xfe , +0x9e ,0x15 ,0x1d ,0xfe ,0x0e ,0x06 ,0x12 ,0xa5 ,0x01 ,0x4b ,0x12 ,0xfe ,0xe5 ,0x00 ,0x03 ,0x5c ,0xc1 ,0x0c ,0x5c ,0x03 ,0xcd ,0x28 ,0xfe ,0x62 , -0x12 ,0x03 ,0x45 ,0x28 , -0xfe ,0x5a ,0x13 ,0x01 ,0xfe ,0x0c ,0x19 ,0x01 ,0xfe ,0x76 ,0x19 ,0xfe , -0x43 ,0x48 ,0xc4 ,0xcc , -0x0f ,0x71 ,0xff ,0x02 ,0x00 ,0x57 ,0x52 ,0x93 ,0x1e ,0x43 ,0x8b ,0xc4 , -0x6e ,0x41 ,0x01 ,0xb2 , +0x12 ,0x03 ,0x45 ,0x28 ,0xfe ,0x5a ,0x13 ,0x01 ,0xfe ,0x0c ,0x19 ,0x01 , +0xfe ,0x76 ,0x19 ,0xfe ,0x43 ,0x48 ,0xc4 ,0xcc ,0x0f ,0x71 ,0xff ,0x02 , +0x00 ,0x57 ,0x52 ,0x93 ,0x1e ,0x43 ,0x8b ,0xc4 ,0x6e ,0x41 ,0x01 ,0xb2 ,0x26 ,0xfe ,0x82 ,0x06 ,0x53 ,0x05 ,0x1a ,0xe9 ,0x91 ,0x09 ,0x59 ,0x01 , -0xfe ,0xcc ,0x15 ,0x1d , -0xfe ,0x78 ,0x06 ,0x12 ,0xa5 ,0x01 ,0x4b ,0x12 ,0xfe ,0xe5 ,0x00 ,0x03 , -0x45 ,0xc1 ,0x0c ,0x45 , -0x18 ,0x06 ,0x01 ,0xb2 ,0xfa ,0x76 ,0x74 ,0x01 ,0xaf ,0x8c ,0x12 ,0xfe , -0xe2 ,0x00 ,0x27 ,0xdb ,
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
1 line not shown · raw message
Parts of this message are not shown here. View the raw message.
PATCH 5/22 advansys: Shrink advansys_board_found a little more
In reply to Matthew WilcoxMove the error reporting into AscInitGetConfig, AdvInitGetConfig and AscInitSetConfig.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 230 +++++++++++++++++++++++------------------------ 1 files changed, 112 insertions(+), 118 deletions(-)
drivers/scsi/advansys.c +112 -118
@@ -9321,13 +9321,14 @@ static uchar __devinit AscGetIsaDmaSpeed(PortAddr iop_base) }#endif /* CONFIG_ISA */ -static ushort __devinit AscInitGetConfig (ASC_DVC_VAR *asc_dvc) +static int __devinit AscInitGetConfig (asc_board_t *boardp) { +ASC_DVC_VAR *asc_dvc = &boardp->dvc_var.asc_dvc_var;unsigned short warn_code =0 ; asc_dvc->init_state =ASC_INIT_STATE_BEG_GET_CFG ;if (asc_dvc->err_code !=0 ) -return (UW_ERR ); +return asc_dvc->err_code;if (AscFindSignature (asc_dvc->iop_base)) { warn_code |=AscInitAscDvcVar (asc_dvc);
@@ -9338,27 +9339,63 @@ static ushort __devinit AscInitGetConfig(ASC_DVC_VAR *asc_dvc) }else { asc_dvc->err_code =ASC_IERR_BAD_SIGNATURE ; } -return warn_code; + +switch (warn_code) { +case 0 :/* No error */ +break ; +case ASC_WARN_IO_PORT_ROTATE : +ASC_PRINT1 ("AscInitGetConfig: board %d: I/O port address " +"modified\n" , boardp->id); +break ; +case ASC_WARN_AUTO_CONFIG : +ASC_PRINT1 ("AscInitGetConfig: board %d: I/O port increment " +"switch enabled\n" , boardp->id); +break ; +case ASC_WARN_EEPROM_CHKSUM : +ASC_PRINT1 ("AscInitGetConfig: board %d: EEPROM checksum " +"error\n" , boardp->id); +break ; +case ASC_WARN_IRQ_MODIFIED : +ASC_PRINT1 ("AscInitGetConfig: board %d: IRQ modified\n" , + boardp->id); +break ; +case ASC_WARN_CMD_QNG_CONFLICT : +ASC_PRINT1 ("AscInitGetConfig: board %d: tag queuing enabled " +"w/o disconnects\n" , boardp->id); +break ; +default : +ASC_PRINT2 ("AscInitGetConfig: board %d: unknown warning: " +"0x%x\n" , boardp->id, warn_code); +break ; + } + +if (asc_dvc->err_code !=0 ) { +ASC_PRINT3 ("AscInitGetConfig: board %d error: init_state 0x%x, " +"err_code 0x%x\n" , boardp->id, asc_dvc->init_state, + asc_dvc->err_code); + } + +return asc_dvc->err_code; } -static unsigned short __devinit -AscInitSetConfig (struct pci_dev *pdev,ASC_DVC_VAR *asc_dvc) +static int __devinit AscInitSetConfig (struct pci_dev *pdev,asc_board_t *boardp) { +ASC_DVC_VAR *asc_dvc = &boardp->dvc_var.asc_dvc_var;PortAddr iop_base = asc_dvc->iop_base;unsigned short cfg_msw;unsigned short warn_code =0 ; asc_dvc->init_state |=ASC_INIT_STATE_BEG_SET_CFG ;if (asc_dvc->err_code !=0 ) -return UW_ERR ; +return asc_dvc->err_code;if (!AscFindSignature (asc_dvc->iop_base)) { asc_dvc->err_code =ASC_IERR_BAD_SIGNATURE ; -return 0 ; +return asc_dvc->err_code; } cfg_msw =AscGetChipCfgMsw (iop_base);if ((cfg_msw &ASC_CFG_MSW_CLR_MASK ) !=0 ) { - cfg_msw &= (~(ASC_CFG_MSW_CLR_MASK )); + cfg_msw &= ~ASC_CFG_MSW_CLR_MASK ; warn_code |=ASC_WARN_CFG_MSW_RECOVER ;AscSetChipCfgMsw (iop_base, cfg_msw); }
@@ -9409,7 +9446,44 @@ AscInitSetConfig(struct pci_dev *pdev, ASC_DVC_VAR *asc_dvc)#endif /* CONFIG_ISA */ asc_dvc->init_state |=ASC_INIT_STATE_END_SET_CFG ; -return warn_code; + +switch (warn_code) { +case 0 :/* No error. */ +break ; +case ASC_WARN_IO_PORT_ROTATE : +ASC_PRINT1 ("AscInitSetConfig: board %d: I/O port address " +"modified\n" , boardp->id); +break ; +case ASC_WARN_AUTO_CONFIG : +ASC_PRINT1 ("AscInitSetConfig: board %d: I/O port increment " +"switch enabled\n" , boardp->id); +break ; +case ASC_WARN_EEPROM_CHKSUM : +ASC_PRINT1 ("AscInitSetConfig: board %d: EEPROM checksum " +"error\n" , boardp->id); +break ; +case ASC_WARN_IRQ_MODIFIED : +ASC_PRINT1 ("AscInitSetConfig: board %d: IRQ modified\n" , + boardp->id); +break ; +case ASC_WARN_CMD_QNG_CONFLICT : +ASC_PRINT1 ("AscInitSetConfig: board %d: tag queuing w/o " +"disconnects\n" , + boardp->id); +break ; +default : +ASC_PRINT2 ("AscInitSetConfig: board %d: unknown warning: " +"0x%x\n" , boardp->id, warn_code); +break ; + } + +if (asc_dvc->err_code !=0 ) { +ASC_PRINT3 ("AscInitSetConfig: board %d error: init_state 0x%x, " +"err_code 0x%x\n" , boardp->id, asc_dvc->init_state, + asc_dvc->err_code); + } + +return asc_dvc->err_code; }static ushort AscInitAsc1000Driver (ASC_DVC_VAR *asc_dvc)
@@ -9596,7 +9670,7 @@ static ushort __devinit AscInitFromEEP(ASC_DVC_VAR *asc_dvc) cfg_msw =AscGetChipCfgMsw (iop_base); cfg_lsw =AscGetChipCfgLsw (iop_base);if ((cfg_msw &ASC_CFG_MSW_CLR_MASK ) !=0 ) { - cfg_msw &= (~(ASC_CFG_MSW_CLR_MASK )); + cfg_msw &= ~ASC_CFG_MSW_CLR_MASK ; warn_code |=ASC_WARN_CFG_MSW_RECOVER ;AscSetChipCfgMsw (iop_base, cfg_msw); }
@@ -12009,6 +12083,7 @@ static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar __devinitdata = 0 /* 63 reserved */ }; +#ifdef CONFIG_PCI /* * Initialize the ADV_DVC_VAR structure. *
@@ -12018,8 +12093,9 @@ static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar __devinitdata =* then 0 is returned. */ static int __devinit -AdvInitGetConfig (struct pci_dev *pdev,ADV_DVC_VAR *asc_dvc) +AdvInitGetConfig (struct pci_dev *pdev,asc_board_t *boardp) { +ADV_DVC_VAR *asc_dvc = &boardp->dvc_var.adv_dvc_var;unsigned short warn_code =0 ;AdvPortAddr iop_base = asc_dvc->iop_base;u16 cmd;
@@ -12087,8 +12163,19 @@ AdvInitGetConfig(struct pci_dev *pdev, ADV_DVC_VAR *asc_dvc) warn_code |= status; } -return warn_code; +if (warn_code !=0 ) { +ASC_PRINT2 ("AdvInitGetConfig: board %d: warning: 0x%x\n" , + boardp->id, warn_code); + } + +if (asc_dvc->err_code) { +ASC_PRINT2 ("AdvInitGetConfig: board %d error: err_code 0x%x\n" , + boardp->id, asc_dvc->err_code); + } + +return asc_dvc->err_code; } +#endif static void AdvBuildCarrierFreelist (struct adv_dvc_var *asc_dvc) {
@@ -15316,22 +15403,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type) share_irq =0 ;break ; } - }else { -/* -* For Wide boards set PCI information before calling -* AdvInitGetConfig(). -*/ -#ifdef CONFIG_PCI - shost->irq = adv_dvc_varp->irq_no = pdev->irq; - shost->unchecked_isa_dma = FALSE; - share_irq =IRQF_SHARED ; -#endif /* CONFIG_PCI */ - } -/* -* Read the board configuration. -*/ -if (ASC_NARROW_BOARD (boardp)) {/* * NOTE: AscInitGetConfig() may change the board's * bus_type value. The bus_type value should no
@@ -15339,60 +15411,20 @@ advansys_board_found(int iop, struct device *dev, int bus_type)* referenced only use the bit-wise AND operator "&". */ ASC_DBG (2 ,"advansys_board_found: AscInitGetConfig()\n" ); -switch (ret =AscInitGetConfig (asc_dvc_varp)) { -case 0 :/* No error */ -break ; -case ASC_WARN_IO_PORT_ROTATE : -ASC_PRINT1 - ("AscInitGetConfig: board %d: I/O port address modified\n" , - boardp->id); -break ; -case ASC_WARN_AUTO_CONFIG : -ASC_PRINT1 - ("AscInitGetConfig: board %d: I/O port increment switch enabled\n" , - boardp->id); -break ; -case ASC_WARN_EEPROM_CHKSUM : -ASC_PRINT1 - ("AscInitGetConfig: board %d: EEPROM checksum error\n" , - boardp->id); -break ; -case ASC_WARN_IRQ_MODIFIED : -ASC_PRINT1 - ("AscInitGetConfig: board %d: IRQ modified\n" , - boardp->id); -break ; -case ASC_WARN_CMD_QNG_CONFLICT : -ASC_PRINT1 - ("AscInitGetConfig: board %d: tag queuing enabled w/o disconnects\n" , - boardp->id); -break ; -default : -ASC_PRINT2 - ("AscInitGetConfig: board %d: unknown warning: 0x%x\n" , - boardp->id, ret); -break ; - } -if ((err_code = asc_dvc_varp->err_code) !=0 ) { -ASC_PRINT3 - ("AscInitGetConfig: board %d error: init_state 0x%x, err_code 0x%x\n" , - boardp->id, - asc_dvc_varp->init_state, asc_dvc_varp->err_code); - } + err_code =AscInitGetConfig (boardp); }else { +#ifdef CONFIG_PCI +/* +* For Wide boards set PCI information before calling +* AdvInitGetConfig(). +*/ + shost->irq = adv_dvc_varp->irq_no = pdev->irq; + shost->unchecked_isa_dma = FALSE; + share_irq =IRQF_SHARED ;ASC_DBG (2 ,"advansys_board_found: AdvInitGetConfig()\n" ); - ret =AdvInitGetConfig (pdev, adv_dvc_varp); -if (ret !=0 ) { -ASC_PRINT2 - ("AdvInitGetConfig: board %d: warning: 0x%x\n" , - boardp->id, ret); - } -if ((err_code = adv_dvc_varp->err_code) !=0 ) { -ASC_PRINT2 - ("AdvInitGetConfig: board %d error: err_code 0x%x\n" , - boardp->id, adv_dvc_varp->err_code); - } + err_code =AdvInitGetConfig (pdev, boardp); +#endif /* CONFIG_PCI */ }if (err_code !=0 )
@@ -15439,47 +15471,9 @@ advansys_board_found(int iop, struct device *dev, int bus_type)* Modify board configuration. */ ASC_DBG (2 ,"advansys_board_found: AscInitSetConfig()\n" ); -switch (ret =AscInitSetConfig (pdev, asc_dvc_varp)) { -case 0 :/* No error. */ -break ; -case ASC_WARN_IO_PORT_ROTATE : -ASC_PRINT1 - ("AscInitSetConfig: board %d: I/O port address modified\n" , - boardp->id); -break ; -case ASC_WARN_AUTO_CONFIG : -ASC_PRINT1 - ("AscInitSetConfig: board %d: I/O port increment switch enabled\n" , - boardp->id); -break ; -case ASC_WARN_EEPROM_CHKSUM : -ASC_PRINT1 - ("AscInitSetConfig: board %d: EEPROM checksum error\n" , - boardp->id); -break ; -case ASC_WARN_IRQ_MODIFIED : -ASC_PRINT1 - ("AscInitSetConfig: board %d: IRQ modified\n" , - boardp->id); -break ; -case ASC_WARN_CMD_QNG_CONFLICT : -ASC_PRINT1 - ("AscInitSetConfig: board %d: tag queuing w/o disconnects\n" , - boardp->id); -break ; -default : -ASC_PRINT2 - ("AscInitSetConfig: board %d: unknown warning: 0x%x\n" , - boardp->id, ret); -break ; - } -if (asc_dvc_varp->err_code !=0 ) { -ASC_PRINT3 - ("AscInitSetConfig: board %d error: init_state 0x%x, err_code 0x%x\n" , - boardp->id, - asc_dvc_varp->init_state, asc_dvc_varp->err_code); + err_code =AscInitSetConfig (pdev, boardp); +if (err_code) goto err_free_proc; - }/* * Finish initializing the 'Scsi_Host' structure.
Signature · 1 line
1.5.2.4
PATCH 6/22 advansys: Remove `waiting' queue
In reply to Matthew WilcoxIf the adapter is busy, return the request to the midlayer rather than queueing it in the driver. asc_execute_queue() and asc_dequeue() become unused, and we don't need to print out stats on the waiting queue any more.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 186 ++-------------------------------------------- 1 files changed, 9 insertions(+), 177 deletions(-)
drivers/scsi/advansys.c +9 -177
@@ -2852,7 +2852,6 @@ typedef struct asc_board { } dvc_cfg;ushort asc_n_io_port;/* Number I/O ports. */ asc_queue_t active;/* Active command queue */ -asc_queue_t waiting;/* Waiting command queue */ asc_queue_t done;/* Done command queue */ ADV_SCSI_BIT_ID_TYPE init_tidmask;/* Target init./valid mask */ struct scsi_device *device[ADV_MAX_TID +1 ];/* Mid-Level Scsi Device */
@@ -2922,10 +2921,8 @@ static int asc_build_req(asc_board_t *, struct scsi_cmnd *);static int adv_build_req (asc_board_t *,struct scsi_cmnd *,ADV_SCSI_REQ_Q **);static int adv_get_sglist (asc_board_t *,adv_req_t *,struct scsi_cmnd *,int );static void asc_enqueue (asc_queue_t *,REQP ,int ); -static REQP asc_dequeue (asc_queue_t *,int );static REQP asc_dequeue_list (asc_queue_t *,REQP *,int );static int asc_rmqueue (asc_queue_t *,REQP ); -static void asc_execute_queue (asc_queue_t *);#ifdef CONFIG_PROC_FS static int asc_proc_copy (off_t ,off_t ,char *,int ,char *,int );static int asc_prt_board_devices (struct Scsi_Host *,char *,int );
@@ -3274,6 +3271,7 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))asc_board_t *boardp;ulong flags;struct scsi_cmnd *done_scp; +int asc_res, result =0 ; shost = scp->device->host; boardp =ASC_BOARDP (shost);
@@ -3302,37 +3300,13 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))return 0 ; } -/* -* Attempt to execute any waiting commands for the board. -*/ -if (!ASC_QUEUE_EMPTY (&boardp->waiting)) { -ASC_DBG (1 , -"advansys_queuecommand: before asc_execute_queue() waiting\n" ); -asc_execute_queue (&boardp->waiting); - } - -/* -* Save the function pointer to Linux mid-level 'done' function -* and attempt to execute the command. -* -* If ASC_NOERROR is returned the request has been added to the -* board's 'active' queue and will be completed by the interrupt -* handler. -* -* If ASC_BUSY is returned add the request to the board's per -* target waiting list. This is the first time the request has -* been tried. Add it to the back of the waiting list. It will be -* retried later. -* -* If an error occurred, the request will have been placed on the -* board's 'done' queue and must be completed before returning. -*/ scp->scsi_done = done; -switch (asc_execute_scsi_cmnd (scp)) { + asc_res =asc_execute_scsi_cmnd (scp); +switch (asc_res) {case ASC_NOERROR :break ;case ASC_BUSY : -asc_enqueue (&boardp->waiting, scp,ASC_BACK ); + result =SCSI_MLQUEUE_HOST_BUSY ;break ;case ASC_ERROR :default :
@@ -3343,7 +3317,7 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *)) }spin_unlock_irqrestore (&boardp->lock, flags); -return 0 ; +return result; }/*
@@ -3488,33 +3462,6 @@ static int advansys_reset(struct scsi_cmnd *scp) } } -/* -* Dequeue all 'waiting' requests and set the request status -* to DID_RESET. -*/ -if (done_scp ==NULL ) { - done_scp =asc_dequeue_list (&boardp->waiting, &last_scp, -ASC_TID_ALL ); -for (tscp = done_scp; tscp; tscp =REQPNEXT (tscp)) { - tscp->result =HOST_BYTE (DID_RESET ); - } - }else { -/* Append to 'done_scp' at the end with 'last_scp'. */ -ASC_ASSERT (last_scp !=NULL ); - last_scp->host_scribble = - (unsigned char *)asc_dequeue_list (&boardp->waiting, - &new_last_scp, -ASC_TID_ALL ); -if (new_last_scp !=NULL ) { -ASC_ASSERT (REQPNEXT (last_scp) !=NULL ); -for (tscp =REQPNEXT (last_scp); tscp; - tscp =REQPNEXT (tscp)) { - tscp->result =HOST_BYTE (DID_RESET ); - } - last_scp = new_last_scp; - } - } -/* Save the time of the most recently completed reset. */ boardp->last_reset = jiffies;
@@ -3650,7 +3597,7 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id) }/* -* Start waiting requests and create a list of completed requests. +* Create a list of completed requests. * * If a reset request is being performed for the board, the reset * handler will complete pending requests after it has completed.
@@ -3659,13 +3606,6 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id)ASC_DBG2 (1 ,"advansys_interrupt: done_scp 0x%p, " "last_scp 0x%p\n" , done_scp, last_scp); -/* Start any waiting commands for the board. */ -if (!ASC_QUEUE_EMPTY (&boardp->waiting)) { -ASC_DBG (1 ,"advansys_interrupt: before " -"asc_execute_queue()\n" ); -asc_execute_queue (&boardp->waiting); - } -/* * Add to the list of requests that must be completed. *
@@ -3986,8 +3926,8 @@ static void asc_scsi_done_list(struct scsi_cmnd *scp)* If this function returns ASC_NOERROR the request has been enqueued * on the board's 'done' queue and must be completed by the caller. * -* If ASC_BUSY is returned the request will be enqueued by the -* caller on the target's waiting queue and re-tried later. +* If ASC_BUSY is returned the request will be returned to the midlayer +* and re-tried later. */ static int asc_execute_scsi_cmnd (struct scsi_cmnd *scp) {
@@ -4043,10 +3983,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) "ASC_NOERROR\n");break ;case ASC_BUSY : -/* -* Caller will enqueue request on the target's waiting -* queue and retry later. -*/ ASC_STATS (scp->device->host, exe_busy);break ;case ASC_ERROR :
@@ -4087,10 +4023,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)ASC_DBG (1 ,"asc_execute_scsi_cmnd: adv_build_req " "ASC_BUSY\n" );/* -* If busy is returned the request has not been -* enqueued. It will be enqueued by the caller on the -* target's waiting queue and retried later. -* * The asc_stats fields 'adv_build_noreq' and * 'adv_build_nosg' count wide board busy conditions. * They are updated in adv_build_req and
@@ -4127,10 +4059,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) "ASC_NOERROR\n");break ;case ASC_BUSY : -/* -* Caller will enqueue request on the target's waiting -* queue and retry later. -*/ ASC_STATS (scp->device->host, exe_busy);break ;case ASC_ERROR :
@@ -5005,39 +4933,6 @@ static void asc_enqueue(asc_queue_t *ascq, REQP reqp, int flag) }/* -* Return first queued 'REQP' on the specified queue for -* the specified target device. Clear the 'tidmask' bit for -* the device if no more commands are left queued for it. -* -* 'REQPNEXT(reqp)' returns reqp's next pointer. -*/ -static REQP asc_dequeue (asc_queue_t *ascq,int tid) -{ -REQP reqp; - -ASC_DBG2 (3 ,"asc_dequeue: ascq 0x%lx, tid %d\n" , (ulong )ascq, tid); -ASC_ASSERT (tid >=0 && tid <=ADV_MAX_TID ); -if ((reqp = ascq->q_first[tid]) !=NULL ) { -ASC_ASSERT (ascq->q_tidmask &ADV_TID_TO_TIDMASK (tid)); - ascq->q_first[tid] =REQPNEXT (reqp); -/* If the queue is empty, clear its bit and the last pointer. */ -if (ascq->q_first[tid] ==NULL ) { - ascq->q_tidmask &= ~ADV_TID_TO_TIDMASK (tid); -ASC_ASSERT (ascq->q_last[tid] == reqp); - ascq->q_last[tid] =NULL ; - } -#ifdef ADVANSYS_STATS -/* Maintain request queue statistics. */ - ascq->q_cur_cnt[tid]--; -ASC_ASSERT (ascq->q_cur_cnt[tid] >=0 ); -REQTIMESTAT ("asc_dequeue" , ascq, reqp, tid); -#endif /* ADVANSYS_STATS */ - } -ASC_DBG1 (3 ,"asc_dequeue: reqp 0x%lx\n" , (ulong )reqp); -return reqp; -} - -/* * Return a pointer to a singly linked list of all the requests queued * for 'tid' on the 'asc_queue_t' pointed to by 'ascq'. *
@@ -5202,45 +5097,6 @@ static int asc_rmqueue(asc_queue_t *ascq, REQP reqp)return ret; } -/* -* Execute as many queued requests as possible for the specified queue. -* -* Calls asc_execute_scsi_cmnd() to execute a REQP/struct scsi_cmnd. -*/ -static void asc_execute_queue (asc_queue_t *ascq) -{ -ADV_SCSI_BIT_ID_TYPE scan_tidmask; -REQP reqp; -int i; - -ASC_DBG1 (1 ,"asc_execute_queue: ascq 0x%lx\n" , (ulong )ascq); -/* -* Execute queued commands for devices attached to -* the current board in round-robin fashion. -*/ - scan_tidmask = ascq->q_tidmask; -do { -for (i =0 ; i <=ADV_MAX_TID ; i++) { -if (scan_tidmask &ADV_TID_TO_TIDMASK (i)) { -if ((reqp =asc_dequeue (ascq, i)) ==NULL ) { - scan_tidmask &= ~ADV_TID_TO_TIDMASK (i); - }else -if (asc_execute_scsi_cmnd - ((struct scsi_cmnd *)reqp) - ==ASC_BUSY ) { - scan_tidmask &= ~ADV_TID_TO_TIDMASK (i); -/* -* The request returned ASC_BUSY. Enqueue at the front of -* target's waiting list to maintain correct ordering. -*/ -asc_enqueue (ascq, reqp,ASC_FRONT ); - } - } - } - }while (scan_tidmask); -return ; -} -#ifdef CONFIG_PROC_FS /* * asc_prt_board_devices()
@@ -6723,7 +6579,6 @@ asc_prt_target_stats(struct Scsi_Host *shost, int tgt_id, char *cp, int cplen)ushort chip_scsi_id;asc_board_t *boardp;asc_queue_t *active; -asc_queue_t *waiting; leftlen = cplen; totlen = len =0 ;
@@ -6732,7 +6587,6 @@ asc_prt_target_stats(struct Scsi_Host *shost, int tgt_id, char *cp, int cplen) s = &boardp->asc_stats; active = &ASC_BOARDP (shost)->active; - waiting = &ASC_BOARDP (shost)->waiting;if (ASC_NARROW_BOARD (boardp)) { chip_scsi_id = boardp->dvc_cfg.asc_dvc_cfg.chip_scsi_id;
@@ -6746,8 +6600,7 @@ asc_prt_target_stats(struct Scsi_Host *shost, int tgt_id, char *cp, int cplen) } do { - if (active->q_tot_cnt[tgt_id] > 0 - || waiting->q_tot_cnt[tgt_id] > 0) { + if (active->q_tot_cnt[tgt_id] > 0) { len = asc_prt_line(cp, leftlen, " target %d\n", tgt_id); ASC_PRT_NEXT();
@@ -6771,27 +6624,6 @@ asc_prt_target_stats(struct Scsi_Host *shost, int tgt_id, char *cp, int cplen) q_tot_cnt [tgt_id]));ASC_PRT_NEXT (); - - len =asc_prt_line (cp, leftlen, -" waiting: cnt [cur %d, max %d, tot %u], time [min %u, max %u, avg %lu.%01lu]\n" , - waiting->q_cur_cnt[tgt_id], - waiting->q_max_cnt[tgt_id], - waiting->q_tot_cnt[tgt_id], - waiting->q_min_tim[tgt_id], - waiting->q_max_tim[tgt_id], - (waiting->q_tot_cnt[tgt_id] == -0 ) ?0 : (waiting-> - q_tot_tim[tgt_id] / - waiting-> - q_tot_cnt[tgt_id]), - (waiting->q_tot_cnt[tgt_id] == -0 ) ?0 :ASC_TENTHS (waiting-> - q_tot_tim - [tgt_id], - waiting-> - q_tot_cnt - [tgt_id])); -ASC_PRT_NEXT (); } }while (0 );
Signature · 1 line
1.5.2.4
PATCH 7/22 advansys: Remove a check for an impossible condition
In reply to Matthew WilcoxThe midlayer guarantees it won't call ->queuecommand for a host which is handling a reset condition.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-)
drivers/scsi/advansys.c +0 -19
@@ -3281,25 +3281,6 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))/* against own ISR */ spin_lock_irqsave (&boardp->lock, flags); -/* -* Block new commands while handling a reset or abort request. -*/ -if (boardp->flags &ASC_HOST_IN_RESET ) { -ASC_DBG1 (1 , -"advansys_queuecommand: scp 0x%lx blocked for reset request\n" , - (ulong )scp); - scp->result =HOST_BYTE (DID_RESET ); - -/* -* Add blocked requests to the board's 'done' queue. The queued -* requests will be completed at the end of the abort or reset -* handling. -*/ -asc_enqueue (&boardp->done, scp,ASC_BACK ); -spin_unlock_irqrestore (&boardp->lock, flags); -return 0 ; - } - scp->scsi_done = done; asc_res =asc_execute_scsi_cmnd (scp);switch (asc_res) {
Signature · 1 line
1.5.2.4
PATCH 8/22 advansys: Remove `done' queue
In reply to Matthew Wilcox - Move the guts of asc_scsi_done_list() into a new function, asc_scsi_done.
- Call asc_scsi_done() in asc_isr_callback() and adv_isr_callback(). The comment was wrong; scsi_done cannot enable interrupts.
- All other places which queued an scp on the done list are error paths for queuecommand, and so we can just call asc_scsi_done() in queuecommand if we receive an error.
- We no longer need to keep a list of done requests in advansys_interrupt
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 120 +++++++++------------------------------------- 1 files changed, 24 insertions(+), 96 deletions(-)
drivers/scsi/advansys.c +24 -96
@@ -2852,7 +2852,6 @@ typedef struct asc_board { } dvc_cfg;ushort asc_n_io_port;/* Number I/O ports. */ asc_queue_t active;/* Active command queue */ -asc_queue_t done;/* Done command queue */ ADV_SCSI_BIT_ID_TYPE init_tidmask;/* Target init./valid mask */ struct scsi_device *device[ADV_MAX_TID +1 ];/* Mid-Level Scsi Device */ ushort reqcnt[ADV_MAX_TID +1 ];/* Starvation request count */
@@ -3258,6 +3257,23 @@ static const char *advansys_info(struct Scsi_Host *shost)return info; } +static void asc_scsi_done (struct scsi_cmnd *scp) +{ +struct asc_board *boardp =ASC_BOARDP (scp->device->host); + +if (scp->use_sg) +dma_unmap_sg (boardp->dev, + (struct scatterlist *)scp->request_buffer, + scp->use_sg, scp->sc_data_direction); +else if (scp->request_bufflen) +dma_unmap_single (boardp->dev, scp->SCp.dma_handle, + scp->request_bufflen, scp->sc_data_direction); + +ASC_STATS (scp->device->host, done); + + scp->scsi_done (scp); +} +/* * advansys_queuecommand() - interrupt-driven I/O entrypoint. *
@@ -3270,7 +3286,6 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))struct Scsi_Host *shost;asc_board_t *boardp;ulong flags; -struct scsi_cmnd *done_scp;int asc_res, result =0 ; shost = scp->device->host;
@@ -3291,9 +3306,8 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))break ;case ASC_ERROR :default : - done_scp =asc_dequeue_list (&boardp->done,NULL ,ASC_TID_ALL );/* Interrupts could be enabled here. */ -asc_scsi_done_list (done_scp); +asc_scsi_done (scp);break ; }spin_unlock_irqrestore (&boardp->lock, flags);
@@ -3410,12 +3424,6 @@ static int advansys_reset(struct scsi_cmnd *scp)/* Board lock is held. */ /* -* Dequeue all board 'done' requests. A pointer to the last request -* is returned in 'last_scp'. -*/ - done_scp =asc_dequeue_list (&boardp->done, &last_scp,ASC_TID_ALL ); - -/* * Dequeue all board 'active' requests for all devices and set * the request status to DID_RESET. A pointer to the last request * is returned in 'last_scp'.
@@ -3548,8 +3556,6 @@ static struct scsi_host_template advansys_template = {static irqreturn_t advansys_interrupt (int irq,void *dev_id) {unsigned long flags; -struct scsi_cmnd *done_scp =NULL , *last_scp =NULL ; -struct scsi_cmnd *new_last_scp;struct Scsi_Host *shost = dev_id;asc_board_t *boardp =ASC_BOARDP (shost);irqreturn_t result =IRQ_NONE ;
@@ -3577,49 +3583,13 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id) } } -/* -* Create a list of completed requests. -* -* If a reset request is being performed for the board, the reset -* handler will complete pending requests after it has completed. -*/ -if ((boardp->flags &ASC_HOST_IN_RESET ) ==0 ) { -ASC_DBG2 (1 ,"advansys_interrupt: done_scp 0x%p, " -"last_scp 0x%p\n" , done_scp, last_scp); - -/* -* Add to the list of requests that must be completed. -* -* 'done_scp' will always be NULL on the first iteration of -* this loop. 'last_scp' is set at the same time as 'done_scp'. -*/ -if (done_scp ==NULL ) { - done_scp =asc_dequeue_list (&boardp->done, - &last_scp,ASC_TID_ALL ); - }else { -ASC_ASSERT (last_scp !=NULL ); - last_scp->host_scribble = - (unsigned char *)asc_dequeue_list (&boardp-> - done, - &new_last_scp, -ASC_TID_ALL ); -if (new_last_scp !=NULL ) { -ASC_ASSERT (REQPNEXT (last_scp) !=NULL ); - last_scp = new_last_scp; - } - } - }spin_unlock_irqrestore (&boardp->lock, flags);/* * If interrupts were enabled on entry, then they * are now enabled here. -* -* Complete all requests on the done list. */ -asc_scsi_done_list (done_scp); -ASC_DBG (1 ,"advansys_interrupt: end\n" );return result; }
@@ -3836,27 +3806,11 @@ static void asc_scsi_done_list(struct scsi_cmnd *scp)ASC_DBG (2 ,"asc_scsi_done_list: begin\n" );while (scp !=NULL ) { -asc_board_t *boardp; -ASC_DBG1 (3 ,"asc_scsi_done_list: scp 0x%lx\n" , (ulong )scp); tscp =REQPNEXT (scp); scp->host_scribble =NULL ; - boardp =ASC_BOARDP (scp->device->host); - -if (scp->use_sg) -dma_unmap_sg (boardp->dev, - (struct scatterlist *)scp->request_buffer, - scp->use_sg, scp->sc_data_direction); -else if (scp->request_bufflen) -dma_unmap_single (boardp->dev, scp->SCp.dma_handle, - scp->request_bufflen, - scp->sc_data_direction); - -ASC_STATS (scp->device->host, done); -ASC_ASSERT (scp->scsi_done !=NULL ); - - scp->scsi_done (scp); +asc_scsi_done (scp); scp = tscp; }
@@ -3904,8 +3858,8 @@ static void asc_scsi_done_list(struct scsi_cmnd *scp)* on the board's 'active' queue and will be completed from the * interrupt handler. * -* If this function returns ASC_NOERROR the request has been enqueued -* on the board's 'done' queue and must be completed by the caller. +* If this function returns ASC_ERROR the host error code has been set, +* and the called must call asc_scsi_done. * * If ASC_BUSY is returned the request will be returned to the midlayer * and re-tried later.
@@ -3972,7 +3926,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) boardp->id, asc_dvc_varp->err_code);ASC_STATS (scp->device->host, exe_error); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );break ;default : ASC_PRINT2("asc_execute_scsi_cmnd: board %d: "
@@ -3980,7 +3933,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) boardp->id, asc_dvc_varp->err_code);ASC_STATS (scp->device->host, exe_unknown); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );break ; } }else {
@@ -4011,11 +3963,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)*/ return ASC_BUSY ;case ASC_ERROR : -/* -* If an error is returned, then the request has been -* queued on the board done queue. It will be completed -* by the caller. -*/ default :ASC_DBG (1 ,"asc_execute_scsi_cmnd: adv_build_req " "ASC_ERROR\n" );
@@ -4048,7 +3995,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) boardp->id, adv_dvc_varp->err_code);ASC_STATS (scp->device->host, exe_error); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );break ;default : ASC_PRINT2("asc_execute_scsi_cmnd: board %d: "
@@ -4056,7 +4002,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp) boardp->id, adv_dvc_varp->err_code);ASC_STATS (scp->device->host, exe_unknown); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );break ; } }
@@ -4071,8 +4016,7 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)* The global structures 'asc_scsi_q' and 'asc_sg_head' are * used to build the request. * -* If an error occurs, then queue the request on the board done -* queue and return ASC_ERROR. +* If an error occurs, then return ASC_ERROR. */ static int asc_build_req (asc_board_t *boardp,struct scsi_cmnd *scp) {
@@ -4098,7 +4042,6 @@ static int asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)"ASC_MAX_CDB_LEN %d\n" , boardp->id, scp->cmd_len, ASC_MAX_CDB_LEN); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );return ASC_ERROR ; } asc_scsi_q.cdbptr = &scp->cmnd[0 ];
@@ -4167,7 +4110,6 @@ static int asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)dma_unmap_sg (boardp->dev, slp, scp->use_sg, scp->sc_data_direction); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );return ASC_ERROR ; }
@@ -4274,7 +4216,6 @@ adv_build_req(asc_board_t *boardp, struct scsi_cmnd *scp, ("adv_build_req: board %d: cmd_len %d > ADV_MAX_CDB_LEN %d\n" , boardp->id, scp->cmd_len,ADV_MAX_CDB_LEN ); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );return ASC_ERROR ; } scsiqp->cdb_len = scp->cmd_len;
@@ -4342,7 +4283,6 @@ adv_build_req(asc_board_t *boardp, struct scsi_cmnd *scp,dma_unmap_sg (boardp->dev, slp, scp->use_sg, scp->sc_data_direction); scp->result =HOST_BYTE (DID_ERROR ); -asc_enqueue (&boardp->done, scp,ASC_BACK );/* * Free the 'adv_req_t' structure by adding it back
@@ -4628,13 +4568,7 @@ static void asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep) boardp->init_tidmask |=ADV_TID_TO_TIDMASK (scp->device->id); } -/* -* Because interrupts may be enabled by the 'struct scsi_cmnd' done -* function, add the command to the end of the board's done queue. -* The done function for the command will be called from -* advansys_interrupt(). -*/ -asc_enqueue (&boardp->done, scp,ASC_BACK ); +asc_scsi_done (scp);return ; }
@@ -4790,13 +4724,7 @@ static void adv_isr_callback(ADV_DVC_VAR *adv_dvc_varp, ADV_SCSI_REQ_Q *scsiqp) boardp->init_tidmask |=ADV_TID_TO_TIDMASK (scp->device->id); } -/* -* Because interrupts may be enabled by the 'struct scsi_cmnd' done -* function, add the command to the end of the board's done queue. -* The done function for the command will be called from -* advansys_interrupt(). -*/ -asc_enqueue (&boardp->done, scp,ASC_BACK ); +asc_scsi_done (scp);/* * Free all 'adv_sgblk_t' structures allocated for the request.
Signature · 1 line
1.5.2.4
PATCH 9/22 advansys: Remove `active' queue and all remaining internal queueing code
In reply to Matthew WilcoxThe `active' list was used in the reset handler -- but the midlayer guarantees that list is empty by the time the reset handler is invoked. It was also checked in the interrupt routines to be sure that this command belonged to this board, but we don't need to check that either. We can then delete the asc_prt_target_stats() function as it will never print anything, along with asc_enqueue(), asc_dequeue_list(), asc_rmqueue(), asc_scsi_done_list(), struct asc_queue, ASC_QUEUE_EMPTY, ASC_TID_ALL, ASC_FRONT, ASC_BACK, and all the REQ* macros. Also remove this item from the todo list.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 504 +---------------------------------------------- 1 files changed, 6 insertions(+), 498 deletions(-)
drivers/scsi/advansys.c +6 -498
@@ -63,11 +63,10 @@* has not occurred then print a message and run in polled mode. * 4. Need to add support for target mode commands, cf. CAM XPT. * 5. check DMA mapping functions for failure -* 6. Remove internal queueing -* 7. Use scsi_transport_spi -* 8. advansys_info is not safe against multiple simultaneous callers -* 9. Kill boardp->id -* 10. Add module_param to override ISA/VLB ioport array +* 6. Use scsi_transport_spi +* 7. advansys_info is not safe against multiple simultaneous callers +* 8. Kill boardp->id +* 9. Add module_param to override ISA/VLB ioport array */ #warning this driver is still not properly converted to the DMA API
@@ -2514,64 +2513,6 @@ do { \#define HOST_BYTE (byte) ((byte) << 16)#define DRIVER_BYTE (byte) ((byte) << 24) -/* -* The following definitions and macros are OS independent interfaces to -* the queue functions: -* REQ - SCSI request structure -* REQP - pointer to SCSI request structure -* REQPTID(reqp) - reqp's target id -* REQPNEXT(reqp) - reqp's next pointer -* REQPNEXTP(reqp) - pointer to reqp's next pointer -* REQPTIME(reqp) - reqp's time stamp value -* REQTIMESTAMP() - system time stamp value -*/ -typedef struct scsi_cmnd REQ , *REQP ; -#define REQPNEXT (reqp) ((REQP) ((reqp)->host_scribble)) -#define REQPNEXTP (reqp) ((REQP *) &((reqp)->host_scribble)) -#define REQPTID (reqp) ((reqp)->device->id) -#define REQPTIME (reqp) ((reqp)->SCp.this_residual) -#define REQTIMESTAMP () (jiffies) - -#define REQTIMESTAT (function, ascq, reqp, tid) \ -{ \ -/* -* If the request time stamp is less than the system time stamp, then \ -* maybe the system time stamp wrapped. Set the request time to zero.\ -*/ \ -if (REQPTIME (reqp) <=REQTIMESTAMP ()) { \ -REQPTIME (reqp) =REQTIMESTAMP () -REQPTIME (reqp); \ - }else { \ -/* Indicate an error occurred with the assertion. */ \ -ASC_ASSERT (REQPTIME (reqp) <=REQTIMESTAMP ()); \ -REQPTIME (reqp) =0 ; \ - } \ -/* Handle first minimum time case without external initialization. */ \ -if (((ascq)->q_tot_cnt[tid] ==1 ) || \ - (REQPTIME (reqp) < (ascq)->q_min_tim[tid])) { \ - (ascq)->q_min_tim[tid] =REQPTIME (reqp); \ -ASC_DBG3 (1 ,"%s: new q_min_tim[%d] %u\n" , \ - (function), (tid), (ascq)->q_min_tim[tid]); \ - } \ -if (REQPTIME (reqp) > (ascq)->q_max_tim[tid]) { \ - (ascq)->q_max_tim[tid] =REQPTIME (reqp); \ -ASC_DBG3 (1 ,"%s: new q_max_tim[%d] %u\n" , \ - (function), tid, (ascq)->q_max_tim[tid]); \ - } \ - (ascq)->q_tot_tim[tid] +=REQPTIME (reqp); \ -/* Reset the time stamp field. */ \ -REQPTIME (reqp) =0 ; \ -} - -/* asc_enqueue() flags */ -#define ASC_FRONT 1 -#define ASC_BACK 2 - -/* asc_dequeue_list() argument */ -#define ASC_TID_ALL (-1) - -/* Return non-zero, if the queue is empty. */ -#define ASC_QUEUE_EMPTY (ascq) ((ascq)->q_tidmask == 0) -#ifndef ADVANSYS_STATS #define ASC_STATS (shost, counter)#define ASC_STATS_ADD (shost, counter, count)
@@ -2784,23 +2725,6 @@ struct asc_stats {#endif /* ADVANSYS_STATS */ /* -* Request queuing structure -*/ -typedef struct asc_queue { -ADV_SCSI_BIT_ID_TYPE q_tidmask;/* queue mask */ -REQP q_first[ADV_MAX_TID +1 ];/* first queued request */ -REQP q_last[ADV_MAX_TID +1 ];/* last queued request */ -#ifdef ADVANSYS_STATS -short q_cur_cnt[ADV_MAX_TID +1 ];/* current queue count */ -short q_max_cnt[ADV_MAX_TID +1 ];/* maximum queue count */ -ADV_DCNT q_tot_cnt[ADV_MAX_TID +1 ];/* total enqueue count */ -ADV_DCNT q_tot_tim[ADV_MAX_TID +1 ];/* total time queued */ -ushort q_max_tim[ADV_MAX_TID +1 ];/* maximum time queued */ -ushort q_min_tim[ADV_MAX_TID +1 ];/* minimum time queued */ -#endif /* ADVANSYS_STATS */ -}asc_queue_t ; - -/* * Adv Library Request Structures * * The following two structures are used to process Wide Board requests.
@@ -2851,7 +2775,6 @@ typedef struct asc_board {ADV_DVC_CFG adv_dvc_cfg;/* Wide board */ } dvc_cfg;ushort asc_n_io_port;/* Number I/O ports. */ -asc_queue_t active;/* Active command queue */ ADV_SCSI_BIT_ID_TYPE init_tidmask;/* Target init./valid mask */ struct scsi_device *device[ADV_MAX_TID +1 ];/* Mid-Level Scsi Device */ ushort reqcnt[ADV_MAX_TID +1 ];/* Starvation request count */
@@ -2914,14 +2837,10 @@ static int asc_dbglvl = 3;*/ static int advansys_slave_configure (struct scsi_device *); -static void asc_scsi_done_list (struct scsi_cmnd *);static int asc_execute_scsi_cmnd (struct scsi_cmnd *);static int asc_build_req (asc_board_t *,struct scsi_cmnd *);static int adv_build_req (asc_board_t *,struct scsi_cmnd *,ADV_SCSI_REQ_Q **);static int adv_get_sglist (asc_board_t *,adv_req_t *,struct scsi_cmnd *,int ); -static void asc_enqueue (asc_queue_t *,REQP ,int ); -static REQP asc_dequeue_list (asc_queue_t *,REQP *,int ); -static int asc_rmqueue (asc_queue_t *,REQP );#ifdef CONFIG_PROC_FS static int asc_proc_copy (off_t ,off_t ,char *,int ,char *,int );static int asc_prt_board_devices (struct Scsi_Host *,char *,int );
@@ -2939,7 +2858,6 @@ static int asc_prt_line(char *, int, char *fmt, ...);#ifdef ADVANSYS_STATS #ifdef CONFIG_PROC_FS static int asc_prt_board_stats (struct Scsi_Host *,char *,int ); -static int asc_prt_target_stats (struct Scsi_Host *,int ,char *,int );#endif /* CONFIG_PROC_FS */ #endif /* ADVANSYS_STATS */
@@ -2991,9 +2909,6 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,int leftlen;char *curbuf;off_t advoffset; -#ifdef ADVANSYS_STATS -int tgt_id; -#endif /* ADVANSYS_STATS */ ASC_DBG (1 ,"advansys_proc_info: begin\n" );
@@ -3123,26 +3038,6 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start, } advoffset += cplen; curbuf += cnt; - -/* -* Display driver statistics for each target. -*/ -for (tgt_id =0 ; tgt_id <=ADV_MAX_TID ; tgt_id++) { - cp = boardp->prtbuf; - cplen =asc_prt_target_stats (shost, tgt_id, cp, -ASC_PRTBUF_SIZE ); -ASC_ASSERT (cplen <=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, - cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; - }#endif /* ADVANSYS_STATS */ /*
@@ -3331,8 +3226,6 @@ static int advansys_reset(struct scsi_cmnd *scp)ASC_DVC_VAR *asc_dvc_varp;ADV_DVC_VAR *adv_dvc_varp;ulong flags; -struct scsi_cmnd *done_scp =NULL , *last_scp =NULL ; -struct scsi_cmnd *tscp, *new_last_scp;int status;int ret =SUCCESS ;
@@ -3423,34 +3316,6 @@ static int advansys_reset(struct scsi_cmnd *scp) }/* Board lock is held. */ -/* -* Dequeue all board 'active' requests for all devices and set -* the request status to DID_RESET. A pointer to the last request -* is returned in 'last_scp'. -*/ -if (done_scp ==NULL ) { - done_scp =asc_dequeue_list (&boardp->active, &last_scp, -ASC_TID_ALL ); -for (tscp = done_scp; tscp; tscp =REQPNEXT (tscp)) { - tscp->result =HOST_BYTE (DID_RESET ); - } - }else { -/* Append to 'done_scp' at the end with 'last_scp'. */ -ASC_ASSERT (last_scp !=NULL ); - last_scp->host_scribble = - (unsigned char *)asc_dequeue_list (&boardp->active, - &new_last_scp, -ASC_TID_ALL ); -if (new_last_scp !=NULL ) { -ASC_ASSERT (REQPNEXT (last_scp) !=NULL ); -for (tscp =REQPNEXT (last_scp); tscp; - tscp =REQPNEXT (tscp)) { - tscp->result =HOST_BYTE (DID_RESET ); - } - last_scp = new_last_scp; - } - } -/* Save the time of the most recently completed reset. */ boardp->last_reset = jiffies;
@@ -3458,12 +3323,6 @@ static int advansys_reset(struct scsi_cmnd *scp) boardp->flags &= ~ASC_HOST_IN_RESET ;spin_unlock_irqrestore (&boardp->lock, flags); -/* -* Complete all the 'done_scp' requests. -*/ -if (done_scp) -asc_scsi_done_list (done_scp); -ASC_DBG1 (1 ,"advansys_reset: ret %d\n" , ret);return ret;
@@ -3795,30 +3654,6 @@ static int advansys_slave_configure(struct scsi_device *sdev) }/* -* Complete all requests on the singly linked list pointed -* to by 'scp'. -* -* Interrupts can be enabled on entry. -*/ -static void asc_scsi_done_list (struct scsi_cmnd *scp) -{ -struct scsi_cmnd *tscp; - -ASC_DBG (2 ,"asc_scsi_done_list: begin\n" ); -while (scp !=NULL ) { -ASC_DBG1 (3 ,"asc_scsi_done_list: scp 0x%lx\n" , (ulong )scp); - tscp =REQPNEXT (scp); - scp->host_scribble =NULL ; - -asc_scsi_done (scp); - - scp = tscp; - } -ASC_DBG (2 ,"asc_scsi_done_list: done\n" ); -return ; -} - -/* * Execute a single 'Scsi_Cmnd'. * * The function 'done' is called when the request has been completed.
@@ -3854,9 +3689,8 @@ static void asc_scsi_done_list(struct scsi_cmnd *scp)* scsi_done - used to save caller's done function * host_scribble - used for pointer to another struct scsi_cmnd * -* If this function returns ASC_NOERROR the request has been enqueued -* on the board's 'active' queue and will be completed from the -* interrupt handler. +* If this function returns ASC_NOERROR the request will be completed +* from the interrupt handler. * * If this function returns ASC_ERROR the host error code has been set, * and the called must call asc_scsi_done.
@@ -3901,10 +3735,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)return ASC_ERROR ; } -/* -* Execute the command. If there is no error, add the command -* to the active queue. -*/ switch (ret =AscExeScsiQueue (asc_dvc_varp, &asc_scsi_q)) {case ASC_NOERROR :ASC_STATS (scp->device->host, exe_noerror);
@@ -3913,7 +3743,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)* successful request counter. Wrapping doesn't matter. */ boardp->reqcnt[scp->device->id]++; -asc_enqueue (&boardp->active, scp,ASC_BACK );ASC_DBG (1 ,"asc_execute_scsi_cmnd: AscExeScsiQueue(), " "ASC_NOERROR\n" );break ;
@@ -3970,10 +3799,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)return ASC_ERROR ; } -/* -* Execute the command. If there is no error, add the command -* to the active queue. -*/ switch (ret =AdvExeScsiQueue (adv_dvc_varp, adv_scsiqp)) {case ASC_NOERROR :ASC_STATS (scp->device->host, exe_noerror);
@@ -3982,7 +3807,6 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)* successful request counter. Wrapping doesn't matter. */ boardp->reqcnt[scp->device->id]++; -asc_enqueue (&boardp->active, scp,ASC_BACK );ASC_DBG (1 ,"asc_execute_scsi_cmnd: AdvExeScsiQueue(), " "ASC_NOERROR\n" );break ;
@@ -4467,19 +4291,8 @@ static void asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep)ASC_STATS (shost, callback);ASC_DBG1 (1 ,"asc_isr_callback: shost 0x%lx\n" , (ulong )shost); -/* -* If the request isn't found on the active queue, it may -* have been removed to handle a reset request. -* Display a message and return. -*/ boardp =ASC_BOARDP (shost);ASC_ASSERT (asc_dvc_varp == &boardp->dvc_var.asc_dvc_var); -if (asc_rmqueue (&boardp->active, scp) ==ASC_FALSE ) { -ASC_PRINT2 - ("asc_isr_callback: board %d: scp 0x%lx not on active queue\n" , - boardp->id, (ulong )scp); -return ; - }/* * 'qdonep' contains the command's ending status.
@@ -4624,21 +4437,8 @@ static void adv_isr_callback(ADV_DVC_VAR *adv_dvc_varp, ADV_SCSI_REQ_Q *scsiqp)ASC_STATS (shost, callback);ASC_DBG1 (1 ,"adv_isr_callback: shost 0x%lx\n" , (ulong )shost); -/* -* If the request isn't found on the active queue, it may have been -* removed to handle a reset request. Display a message and return. -* -* Note: Because the structure may still be in use don't attempt -* to free the adv_req_t and adv_sgblk_t, if any, structures. -*/ boardp =ASC_BOARDP (shost);ASC_ASSERT (adv_dvc_varp == &boardp->dvc_var.adv_dvc_var); -if (asc_rmqueue (&boardp->active, scp) ==ASC_FALSE ) { -ASC_PRINT2 - ("adv_isr_callback: board %d: scp 0x%lx not on active queue\n" , - boardp->id, (ulong )scp); -return ; - }/* * 'done_status' contains the command's ending status.
@@ -4787,225 +4587,6 @@ static void adv_async_callback(ADV_DVC_VAR *adv_dvc_varp, uchar code) } } -/* -* Add a 'REQP' to the end of specified queue. Set 'tidmask' -* to indicate a command is queued for the device. -* -* 'flag' may be either ASC_FRONT or ASC_BACK. -* -* 'REQPNEXT(reqp)' returns reqp's next pointer. -*/ -static void asc_enqueue (asc_queue_t *ascq,REQP reqp,int flag) -{ -int tid; - -ASC_DBG3 (3 ,"asc_enqueue: ascq 0x%lx, reqp 0x%lx, flag %d\n" , - (ulong )ascq, (ulong )reqp, flag); -ASC_ASSERT (reqp !=NULL ); -ASC_ASSERT (flag ==ASC_FRONT || flag ==ASC_BACK ); - tid =REQPTID (reqp); -ASC_ASSERT (tid >=0 && tid <=ADV_MAX_TID ); -if (flag ==ASC_FRONT ) { - reqp->host_scribble = (unsigned char *)ascq->q_first[tid]; - ascq->q_first[tid] = reqp; -/* If the queue was empty, set the last pointer. */ -if (ascq->q_last[tid] ==NULL ) { - ascq->q_last[tid] = reqp; - } - }else {/* ASC_BACK */ -if (ascq->q_last[tid] !=NULL ) { - ascq->q_last[tid]->host_scribble = - (unsigned char *)reqp; - } - ascq->q_last[tid] = reqp; - reqp->host_scribble =NULL ; -/* If the queue was empty, set the first pointer. */ -if (ascq->q_first[tid] ==NULL ) { - ascq->q_first[tid] = reqp; - } - } -/* The queue has at least one entry, set its bit. */ - ascq->q_tidmask |=ADV_TID_TO_TIDMASK (tid); -#ifdef ADVANSYS_STATS -/* Maintain request queue statistics. */ - ascq->q_tot_cnt[tid]++; - ascq->q_cur_cnt[tid]++; -if (ascq->q_cur_cnt[tid] > ascq->q_max_cnt[tid]) { - ascq->q_max_cnt[tid] = ascq->q_cur_cnt[tid]; -ASC_DBG2 (2 ,"asc_enqueue: new q_max_cnt[%d] %d\n" , - tid, ascq->q_max_cnt[tid]); - } -REQPTIME (reqp) =REQTIMESTAMP (); -#endif /* ADVANSYS_STATS */ -ASC_DBG1 (3 ,"asc_enqueue: reqp 0x%lx\n" , (ulong )reqp); -return ; -} - -/* -* Return a pointer to a singly linked list of all the requests queued -* for 'tid' on the 'asc_queue_t' pointed to by 'ascq'. -* -* If 'lastpp' is not NULL, '*lastpp' will be set to point to the -* the last request returned in the singly linked list. -* -* 'tid' should either be a valid target id or if it is ASC_TID_ALL, -* then all queued requests are concatenated into one list and -* returned. -* -* Note: If 'lastpp' is used to append a new list to the end of -* an old list, only change the old list last pointer if '*lastpp' -* (or the function return value) is not NULL, i.e. use a temporary -* variable for 'lastpp' and check its value after the function return -* before assigning it to the list last pointer. -* -* Unfortunately collecting queuing time statistics adds overhead to -* the function that isn't inherent to the function's algorithm. -*/ -static REQP asc_dequeue_list (asc_queue_t *ascq,REQP *lastpp,int tid) -{ -REQP firstp, lastp; -int i; - -ASC_DBG2 (3 ,"asc_dequeue_list: ascq 0x%lx, tid %d\n" , (ulong )ascq, tid); -ASC_ASSERT ((tid ==ASC_TID_ALL ) || (tid >=0 && tid <=ADV_MAX_TID )); - -/* -* If 'tid' is not ASC_TID_ALL, return requests only for -* the specified 'tid'. If 'tid' is ASC_TID_ALL, return all -* requests for all tids. -*/ -if (tid !=ASC_TID_ALL ) { -/* Return all requests for the specified 'tid'. */ -if ((ascq->q_tidmask &ADV_TID_TO_TIDMASK (tid)) ==0 ) { -/* List is empty; Set first and last return pointers to NULL. */ - firstp = lastp =NULL ; - }else { - firstp = ascq->q_first[tid]; - lastp = ascq->q_last[tid]; - ascq->q_first[tid] = ascq->q_last[tid] =NULL ; - ascq->q_tidmask &= ~ADV_TID_TO_TIDMASK (tid); -#ifdef ADVANSYS_STATS - { -REQP reqp; - ascq->q_cur_cnt[tid] =0 ; -for (reqp = firstp; reqp; reqp =REQPNEXT (reqp)) { -REQTIMESTAT ("asc_dequeue_list" , ascq, - reqp, tid); - } - } -#endif /* ADVANSYS_STATS */ - } - }else { -/* Return all requests for all tids. */ - firstp = lastp =NULL ; -for (i =0 ; i <=ADV_MAX_TID ; i++) { -if (ascq->q_tidmask &ADV_TID_TO_TIDMASK (i)) { -if (firstp ==NULL ) { - firstp = ascq->q_first[i]; - lastp = ascq->q_last[i]; - }else { -ASC_ASSERT (lastp !=NULL ); - lastp->host_scribble = - (unsigned char *)ascq->q_first[i]; - lastp = ascq->q_last[i]; - } - ascq->q_first[i] = ascq->q_last[i] =NULL ; - ascq->q_tidmask &= ~ADV_TID_TO_TIDMASK (i); -#ifdef ADVANSYS_STATS - ascq->q_cur_cnt[i] =0 ; -#endif /* ADVANSYS_STATS */ - } - } -#ifdef ADVANSYS_STATS - { -REQP reqp; -for (reqp = firstp; reqp; reqp =REQPNEXT (reqp)) { -REQTIMESTAT ("asc_dequeue_list" , ascq, reqp, - reqp->device->id); - } - } -#endif /* ADVANSYS_STATS */ - } -if (lastpp) { - *lastpp = lastp; - } -ASC_DBG1 (3 ,"asc_dequeue_list: firstp 0x%lx\n" , (ulong )firstp); -return firstp; -} - -/* -* Remove the specified 'REQP' from the specified queue for -* the specified target device. Clear the 'tidmask' bit for the -* device if no more commands are left queued for it. -* -* 'REQPNEXT(reqp)' returns reqp's the next pointer. -* -* Return ASC_TRUE if the command was found and removed, -* otherwise return ASC_FALSE. -*/ -static int asc_rmqueue (asc_queue_t *ascq,REQP reqp) -{ -REQP currp, prevp; -int tid; -int ret =ASC_FALSE ; - -ASC_DBG2 (3 ,"asc_rmqueue: ascq 0x%lx, reqp 0x%lx\n" , - (ulong )ascq, (ulong )reqp); -ASC_ASSERT (reqp !=NULL ); - - tid =REQPTID (reqp); -ASC_ASSERT (tid >=0 && tid <=ADV_MAX_TID ); - -/* -* Handle the common case of 'reqp' being the first -* entry on the queue. -*/ -if (reqp == ascq->q_first[tid]) { - ret =ASC_TRUE ; - ascq->q_first[tid] =REQPNEXT (reqp); -/* If the queue is now empty, clear its bit and the last pointer. */ -if (ascq->q_first[tid] ==NULL ) { - ascq->q_tidmask &= ~ADV_TID_TO_TIDMASK (tid); -ASC_ASSERT (ascq->q_last[tid] == reqp); - ascq->q_last[tid] =NULL ; - } - }else if (ascq->q_first[tid] !=NULL ) { -ASC_ASSERT (ascq->q_last[tid] !=NULL ); -/* -* Because the case of 'reqp' being the first entry has been -* handled above and it is known the queue is not empty, if -* 'reqp' is found on the queue it is guaranteed the queue will -* not become empty and that 'q_first[tid]' will not be changed. -* -* Set 'prevp' to the first entry, 'currp' to the second entry, -* and search for 'reqp'. -*/ -for (prevp = ascq->q_first[tid], currp =REQPNEXT (prevp); - currp; prevp = currp, currp =REQPNEXT (currp)) { -if (currp == reqp) { - ret =ASC_TRUE ; - prevp->host_scribble = - (unsigned char *)REQPNEXT (currp); - reqp->host_scribble =NULL ; -if (ascq->q_last[tid] == reqp) { - ascq->q_last[tid] = prevp; - } -break ; - } - } - } -#ifdef ADVANSYS_STATS -/* Maintain request queue statistics. */ -if (ret ==ASC_TRUE ) { - ascq->q_cur_cnt[tid]--; -REQTIMESTAT ("asc_rmqueue" , ascq, reqp, tid); - } -ASC_ASSERT (ascq->q_cur_cnt[tid] >=0 ); -#endif /* ADVANSYS_STATS */ -ASC_DBG2 (3 ,"asc_rmqueue: reqp 0x%lx, ret %d\n" , (ulong )reqp, ret); -return ret; -} -#ifdef CONFIG_PROC_FS /* * asc_prt_board_devices()
@@ -6465,79 +6046,6 @@ static int asc_prt_board_stats(struct Scsi_Host *shost, char *cp, int cplen)return totlen; } - -/* -* asc_prt_target_stats() -* -* Note: no single line should be greater than ASC_PRTLINE_SIZE, -* cf. asc_prt_line(). -* -* This is separated from asc_prt_board_stats because a full set -* of targets will overflow ASC_PRTBUF_SIZE. -* -* Return the number of characters copied into 'cp'. No more than -* 'cplen' characters will be copied to 'cp'. -*/ -static int -asc_prt_target_stats (struct Scsi_Host *shost,int tgt_id,char *cp,int cplen) -{ -int leftlen; -int totlen; -int len; -struct asc_stats *s; -ushort chip_scsi_id; -asc_board_t *boardp; -asc_queue_t *active; - - leftlen = cplen; - totlen = len =0 ; - - boardp =ASC_BOARDP (shost); - s = &boardp->asc_stats; - - active = &ASC_BOARDP (shost)->active; - -if (ASC_NARROW_BOARD (boardp)) { - chip_scsi_id = boardp->dvc_cfg.asc_dvc_cfg.chip_scsi_id; - }else { - chip_scsi_id = boardp->dvc_var.adv_dvc_var.chip_scsi_id; - } - -if ((chip_scsi_id == tgt_id) || - ((boardp->init_tidmask &ADV_TID_TO_TIDMASK (tgt_id)) ==0 )) { -return 0 ; - } - -do { -if (active->q_tot_cnt[tgt_id] >0 ) { - len =asc_prt_line (cp, leftlen," target %d\n" , tgt_id); -ASC_PRT_NEXT (); - - len =asc_prt_line (cp, leftlen, -" active: cnt [cur %d, max %d, tot %u], time [min %d, max %d, avg %lu.%01lu]\n" , - active->q_cur_cnt[tgt_id], - active->q_max_cnt[tgt_id], - active->q_tot_cnt[tgt_id], - active->q_min_tim[tgt_id], - active->q_max_tim[tgt_id], - (active->q_tot_cnt[tgt_id] == -0 ) ?0 : (active-> - q_tot_tim[tgt_id] / - active-> - q_tot_cnt[tgt_id]), - (active->q_tot_cnt[tgt_id] == -0 ) ?0 :ASC_TENTHS (active-> - q_tot_tim - [tgt_id], - active-> - q_tot_cnt - [tgt_id])); -ASC_PRT_NEXT (); - } - }while (0 ); - -return totlen; -}#endif /* CONFIG_PROC_FS */ #endif /* ADVANSYS_STATS */
Signature · 1 line
1.5.2.4
PATCH 10/22 advansys: Enable interrupts earlier in queuecommand
In reply to Matthew WilcoxMove as much as possible outside the critical section in queuecommand, eg:
- Set the scsi_done field before acquiring the lock
- Call asc_scsi_done after dropping the lock
Also remove a comment suggesting we should enable interrupts (now we do) and do some minor reformatting for readability.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-)
drivers/scsi/advansys.c +11 -12
@@ -3176,23 +3176,24 @@ static void asc_scsi_done(struct scsi_cmnd *scp)* in the 'scp' result field. */ static int -advansys_queuecommand (struct scsi_cmnd *scp,void (*done) (struct scsi_cmnd *)) +advansys_queuecommand (struct scsi_cmnd *scp,void (*done)(struct scsi_cmnd *)) { -struct Scsi_Host *shost; -asc_board_t *boardp; -ulong flags; +struct Scsi_Host *shost = scp->device->host; +asc_board_t *boardp =ASC_BOARDP (shost); +unsigned long flags;int asc_res, result =0 ; - shost = scp->device->host; - boardp =ASC_BOARDP (shost);ASC_STATS (shost, queuecommand); + scp->scsi_done = done; -/* host_lock taken by mid-level prior to call but need to protect */ -/* against own ISR */ +/* +* host_lock taken by mid-level prior to call, but need +* to protect against own ISR +*/ spin_lock_irqsave (&boardp->lock, flags); - - scp->scsi_done = done; asc_res =asc_execute_scsi_cmnd (scp); +spin_unlock_irqrestore (&boardp->lock, flags); +switch (asc_res) {case ASC_NOERROR :break ;
@@ -3201,11 +3202,9 @@ advansys_queuecommand(struct scsi_cmnd *scp, void (*done) (struct scsi_cmnd *))break ;case ASC_ERROR :default : -/* Interrupts could be enabled here. */ asc_scsi_done (scp);break ; } -spin_unlock_irqrestore (&boardp->lock, flags);return result; }
Signature · 1 line
1.5.2.4
PATCH 11/22 advansys: Support 16-byte commands properly
In reply to Matthew WilcoxThe SCSI midlayer won't send commands greater than ->max_cmd_len. So the checks on length in asc_build_req and adv_build_req are obsolete and can be deleted, but also we have to set the max_cmd_len in advansys_board_found(). Also move the length definitions together, and write a helpful comment.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-)
drivers/scsi/advansys.c +10 -29
@@ -210,10 +210,16 @@ typedef unsigned char uchar;#define ASC_SCSI_WIDTH_BIT_SET 0xFF#define ASC_MAX_SENSE_LEN 32#define ASC_MIN_SENSE_LEN 14 -#define ASC_MAX_CDB_LEN 12#define ASC_SCSI_RESET_HOLD_TIME_US 60/* +* Narrow boards only support 12-byte commands, while wide boards +* extend to 16-byte commands. +*/ +#define ASC_MAX_CDB_LEN 12 +#define ADV_MAX_CDB_LEN 16 + +/* * Inquiry SPC-2 SPI Byte 1 EVPD (Enable Vital Product Data) * and CmdDt (Command Support Data) field bit definitions. */
@@ -1190,12 +1196,6 @@ static const char *advansys_info(struct Scsi_Host *shost);#define ADV_CARRIER_COUNT (ASC_DEF_MAX_HOST_QNG + 15)/* -* For wide boards a CDB length maximum of 16 bytes -* is supported. -*/ -#define ADV_MAX_CDB_LEN 16 - -/* * Define total number of simultaneous maximum element scatter-gather * request blocks per wide adapter. ASC_DEF_MAX_HOST_QNG (253) is the * maximum number of outstanding commands per wide host adapter. Each
@@ -3856,17 +3856,7 @@ static int asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)/* * Build the ASC_SCSI_Q request. -* -* For narrow boards a CDB length maximum of 12 bytes -* is supported. */ -if (scp->cmd_len >ASC_MAX_CDB_LEN ) { -ASC_PRINT3 ("asc_build_req: board %d: cmd_len %d > " -"ASC_MAX_CDB_LEN %d\n" , boardp->id, scp->cmd_len, -ASC_MAX_CDB_LEN ); - scp->result =HOST_BYTE (DID_ERROR ); -return ASC_ERROR ; - } asc_scsi_q.cdbptr = &scp->cmnd[0 ]; asc_scsi_q.q2.cdb_len = scp->cmd_len; asc_scsi_q.q1.target_id =ASC_TID_TO_TARGET_ID (scp->device->id);
@@ -4029,18 +4019,7 @@ adv_build_req(asc_board_t *boardp, struct scsi_cmnd *scp,* Build the ADV_SCSI_REQ_Q request. */ -/* -* Set CDB length and copy it to the request structure. -* For wide boards a CDB length maximum of 16 bytes -* is supported. -*/ -if (scp->cmd_len >ADV_MAX_CDB_LEN ) { -ASC_PRINT3 - ("adv_build_req: board %d: cmd_len %d > ADV_MAX_CDB_LEN %d\n" , - boardp->id, scp->cmd_len,ADV_MAX_CDB_LEN ); - scp->result =HOST_BYTE (DID_ERROR ); -return ASC_ERROR ; - } +/* Set CDB length and copy it to the request structure. */ scsiqp->cdb_len = scp->cmd_len;/* Copy first 12 CDB bytes to cdb[]. */ for (i =0 ; i < scp->cmd_len && i <12 ; i++) {
@@ -14834,6 +14813,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type)if (ASC_NARROW_BOARD (boardp)) { shost->max_id =ASC_MAX_TID +1 ; shost->max_lun =ASC_MAX_LUN +1 ; + shost->max_cmd_len =ASC_MAX_CDB_LEN ; shost->io_port = asc_dvc_varp->iop_base; boardp->asc_n_io_port =ASC_IOADR_GAP ;
@@ -14844,6 +14824,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type) }else { shost->max_id =ADV_MAX_TID +1 ; shost->max_lun =ADV_MAX_LUN +1 ; + shost->max_cmd_len =ADV_MAX_CDB_LEN ;/* * Save the I/O Port address and length even though
Signature · 1 line
1.5.2.4
PATCH 12/22 advansys: Remove a check for an impossible condition
In reply to Matthew WilcoxAscExeScsiQueue() has one caller, and it passes the address of a variable; this cannot ever be NULL. This is the only place that ever sets ASCQ_ERR_SCSIQ_NULL_PTR, so delete that error code too, as well as several other unused ASCQ_ERR codes.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-)
drivers/scsi/advansys.c +0 -12
@@ -520,14 +520,6 @@ typedef struct asc_risc_sg_list_q {#define ASCQ_ERR_ISR_RE_ENTRY 0x1A#define ASCQ_ERR_CRITICAL_RE_ENTRY 0x1B#define ASCQ_ERR_ISR_ON_CRITICAL 0x1C -#define ASCQ_ERR_SG_LIST_ODD_ADDRESS 0x1D -#define ASCQ_ERR_XFER_ADDRESS_TOO_BIG 0x1E -#define ASCQ_ERR_SCSIQ_NULL_PTR 0x1F -#define ASCQ_ERR_SCSIQ_BAD_NEXT_PTR 0x20 -#define ASCQ_ERR_GET_NUM_OF_FREE_Q 0x21 -#define ASCQ_ERR_SEND_SCSI_Q 0x22 -#define ASCQ_ERR_HOST_REQ_RISC_HALT 0x23 -#define ASCQ_ERR_RESET_SDTR 0x24/* * Warning code values are set in ASC_DVC_VAR 'warn_code'.
@@ -7578,10 +7570,6 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) sg_head = scsiq->sg_head;if (asc_dvc->err_code !=0 )return (ERR ); -if (scsiq == (ASC_SCSI_Q *)0L ) { -AscSetLibErrorCode (asc_dvc,ASCQ_ERR_SCSIQ_NULL_PTR ); -return (ERR ); - } scsiq->q1.q_no =0 ;if ((scsiq->q2.tag_code &ASC_TAG_FLAG_EXTRA_BYTES ) ==0 ) { scsiq->q1.extra_bytes =0 ;
Signature · 1 line
1.5.2.4
PATCH 13/22 advansys: Remove some custom wrappers
In reply to Matthew Wilcox - Replace ASC_ASSERT() with BUG_ON().
In a few places, get rid of the assertion altogether -- the ensuing crash will tell us all we need to know. Use BUG() where it fits better than BUG_ON(). Also fix a fencepost error in advansys_proc_info().
- Replace DvcSleepMilliSecond with mdelay.
Despite its name using 'sleep', the implementation was a delay. I've marked some places with XXX where we should probably be using msleep instead. They need to be audited to be sure we can sleep in that context.
- Replace DvcDelayMicroSecond with udelay.
- Replace DvcDelayNanoSecond with udelay too.
All callers were multiples of 1000.
- Remove DvcEnterCritical and DvcLeaveCritical.
These functions are no-ops, and as the comments said, the spinlock protects the critical sections.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 213 +++++++++++------------------------------------ 1 files changed, 49 insertions(+), 164 deletions(-)
drivers/scsi/advansys.c +49 -164
@@ -70,9 +70,6 @@*/ #warning this driver is still not properly converted to the DMA API -/* Enable driver assertions. */ -#define ADVANSYS_ASSERT -/* Enable driver /proc statistics. */ #define ADVANSYS_STATS
@@ -1121,10 +1118,6 @@ static uchar AscGetChipScsiCtrl(PortAddr);static uchar AscGetChipVersion (PortAddr ,ushort );static ASC_DCNT AscLoadMicroCode (PortAddr ,ushort ,uchar *,ushort );static void AscToggleIRQAct (PortAddr ); -static inline ulong DvcEnterCritical (void ); -static inline void DvcLeaveCritical (ulong ); -static void DvcSleepMilliSecond (ASC_DCNT ); -static void DvcDelayNanoSecond (ASC_DVC_VAR *,ASC_DCNT );static void DvcPutScsiQ (PortAddr ,ushort ,uchar *,int );static void DvcGetQinfo (PortAddr ,ushort ,uchar *,int );static ushort AscInitAsc1000Driver (ASC_DVC_VAR *);
@@ -2226,15 +2219,8 @@ typedef struct adv_scsi_req_q {#define ADV_HOST_SCSI_BUS_RESET 0x80/* Host Initiated SCSI Bus Reset. */ -/* -* Device drivers must define the following functions. -*/ -static inline ulong DvcEnterCritical (void ); -static inline void DvcLeaveCritical (ulong ); -static void DvcSleepMilliSecond (ADV_DCNT );static ADV_PADDR DvcGetPhyAddr (ADV_DVC_VAR *,ADV_SCSI_REQ_Q *,uchar *,ASC_SDCNT *,int ); -static void DvcDelayMicroSecond (ADV_DVC_VAR *,ushort );/* * Adv Library functions available to drivers.
@@ -2670,24 +2656,6 @@ do { \ASC_DBG_PRT_HEX ((lvl),"INQUIRY" , (uchar *) (inq), (len));#endif /* ADVANSYS_DEBUG */ -#ifndef ADVANSYS_ASSERT -#define ASC_ASSERT (a) -#else /* ADVANSYS_ASSERT */ - -#define ASC_ASSERT (a) \ - { \ - if (!(a)) { \ - printk("ASC_ASSERT() Failure: file %s, line %d\n", \ - __FILE__, __LINE__); \ - } \ - } - -#endif /* ADVANSYS_ASSERT */ - -/* -* --- Driver Structures -*/ -#ifdef ADVANSYS_STATS /* Per board statistics structure */
@@ -2949,7 +2917,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,if (ASC_WIDE_BOARD (boardp)) { cp = boardp->prtbuf; cplen =asc_prt_adv_bios (shost, cp,ASC_PRTBUF_SIZE ); -ASC_ASSERT (cplen <ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); totcnt += cnt;
@@ -2967,7 +2935,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,*/ cp = boardp->prtbuf; cplen =asc_prt_board_devices (shost, cp,ASC_PRTBUF_SIZE ); -ASC_ASSERT (cplen <ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); totcnt += cnt; leftlen -= cnt;
@@ -2987,7 +2955,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start, }else { cplen =asc_prt_adv_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); } -ASC_ASSERT (cplen <ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); totcnt += cnt; leftlen -= cnt;
@@ -3003,7 +2971,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,*/ cp = boardp->prtbuf; cplen =asc_prt_driver_conf (shost, cp,ASC_PRTBUF_SIZE ); -ASC_ASSERT (cplen <ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); totcnt += cnt; leftlen -= cnt;
@@ -3020,7 +2988,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,*/ cp = boardp->prtbuf; cplen =asc_prt_board_stats (shost, cp,ASC_PRTBUF_SIZE ); -ASC_ASSERT (cplen <=ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); totcnt += cnt; leftlen -= cnt;
@@ -3042,7 +3010,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start, }else { cplen =asc_prt_adv_board_info (shost, cp,ASC_PRTBUF_SIZE ); } -ASC_ASSERT (cplen <ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); totcnt += cnt; leftlen -= cnt;
@@ -3139,7 +3107,7 @@ static const char *advansys_info(struct Scsi_Host *shost)ASC_VERSION , widename, (ulong )adv_dvc_varp->iop_base, (ulong)adv_dvc_varp->iop_base + boardp->asc_n_io_port - 1, shost->irq); } -ASC_ASSERT (strlen (info) <ASC_INFO_SIZE ); +BUG_ON (strlen (info) >=ASC_INFO_SIZE );ASC_DBG (1 ,"advansys_info: end\n" );return info; }
@@ -4201,7 +4169,6 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp,* Point the previous ADV_SG_BLOCK structure to * the newly allocated ADV_SG_BLOCK structure. */ -ASC_ASSERT (prev_sg_block !=NULL ); prev_sg_block->sg_ptr =cpu_to_le32 (sg_block_paddr); }
@@ -4262,7 +4229,7 @@ static void asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep)ASC_DBG1 (1 ,"asc_isr_callback: shost 0x%lx\n" , (ulong )shost); boardp =ASC_BOARDP (shost); -ASC_ASSERT (asc_dvc_varp == &boardp->dvc_var.asc_dvc_var); +BUG_ON (asc_dvc_varp != &boardp->dvc_var.asc_dvc_var);/* * 'qdonep' contains the command's ending status.
@@ -4408,7 +4375,7 @@ static void adv_isr_callback(ADV_DVC_VAR *adv_dvc_varp, ADV_SCSI_REQ_Q *scsiqp)ASC_DBG1 (1 ,"adv_isr_callback: shost 0x%lx\n" , (ulong )shost); boardp =ASC_BOARDP (shost); -ASC_ASSERT (adv_dvc_varp == &boardp->dvc_var.adv_dvc_var); +BUG_ON (adv_dvc_varp != &boardp->dvc_var.adv_dvc_var);/* * 'done_status' contains the command's ending status.
@@ -5738,7 +5705,7 @@ static int asc_prt_line(char *buf, int buflen, char *fmt, ...)va_start (args, fmt); ret =vsprintf (s, fmt, args); -ASC_ASSERT (ret <ASC_PRTLINE_SIZE ); +BUG_ON (ret >=ASC_PRTLINE_SIZE );if (buf ==NULL ) { (void )printk (s); ret =0 ;
@@ -5756,36 +5723,6 @@ static int asc_prt_line(char *buf, int buflen, char *fmt, ...)*/ /* -* Delay for 'n' milliseconds. Don't use the 'jiffies' -* global variable which is incremented once every 5 ms -* from a timer interrupt, because this function may be -* called when interrupts are disabled. -*/ -static void DvcSleepMilliSecond (ADV_DCNT n) -{ -ASC_DBG1 (4 ,"DvcSleepMilliSecond: %lu\n" , (ulong )n); -mdelay (n); -} - -/* -* Currently and inline noop but leave as a placeholder. -* Leave DvcEnterCritical() as a noop placeholder. -*/ -static inline ulong DvcEnterCritical (void ) -{ -return 0 ; -} - -/* -* Critical sections are all protected by the board spinlock. -* Leave DvcLeaveCritical() as a noop placeholder. -*/ -static inline void DvcLeaveCritical (ulong flags) -{ -return ; -} - -/* * void * DvcPutScsiQ(PortAddr iop_base, ushort s_addr, uchar *outbuf, int words) *
@@ -6317,10 +6254,9 @@ static void asc_prt_adv_sgblock(int sgblockno, ADV_SG_BLOCK *b) (ulong)b, sgblockno);printk (" sg_cnt %u, sg_ptr 0x%lx\n" , b->sg_cnt, (ulong )le32_to_cpu (b->sg_ptr)); -ASC_ASSERT (b->sg_cnt <=NO_OF_SG_PER_BLOCK ); -if (b->sg_ptr !=0 ) { -ASC_ASSERT (b->sg_cnt ==NO_OF_SG_PER_BLOCK ); - } +BUG_ON (b->sg_cnt >NO_OF_SG_PER_BLOCK ); +if (b->sg_ptr !=0 ) +BUG_ON (b->sg_cnt !=NO_OF_SG_PER_BLOCK );for (i =0 ; i < b->sg_cnt; i++) { printk(" [%u]: sg_addr 0x%lx, sg_count 0x%lx\n", i, (ulong)b->sg_list[i].sg_addr,
@@ -6590,7 +6526,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)uchar scsi_status;asc_board_t *boardp; -ASC_ASSERT (asc_dvc->drv_ptr !=NULL ); +BUG_ON (!asc_dvc->drv_ptr); boardp = asc_dvc->drv_ptr; iop_base = asc_dvc->iop_base;
@@ -7199,7 +7135,7 @@ static int AscIsrQDone(ASC_DVC_VAR *asc_dvc)AscSetChipControl (iop_base, (uchar)(CC_SCSI_RESET |CC_HALT )); -DvcDelayNanoSecond (asc_dvc,60000 ); +udelay (60 );AscSetChipControl (iop_base,CC_HALT );AscSetChipStatus (iop_base,CIW_CLR_SCSI_RESET_INT );
@@ -7276,7 +7212,7 @@ static int AscISR(ASC_DVC_VAR *asc_dvc) saved_ctrl_reg &= (uchar)(~CC_HALT );while ((AscGetChipStatus (iop_base) &CSW_SCSI_RESET_ACTIVE ) && (i-- >0 )) { -DvcSleepMilliSecond (100 ); +mdelay (100 ); }AscSetChipControl (iop_base, (CC_CHIP_RESET |CC_HALT ));AscSetChipControl (iop_base,CC_HALT );
@@ -7549,7 +7485,6 @@ static uchar _syn_offset_one_disable_cmd[ASC_SYN_OFFSET_ONE_DISABLE_LIST] = {static int AscExeScsiQueue (ASC_DVC_VAR *asc_dvc,ASC_SCSI_Q *scsiq) {PortAddr iop_base; -ulong last_int_level;int sta;int n_q_required;int disable_syn_offset_one_fix;
@@ -7593,9 +7528,7 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) scsiq->q1.cntl |= (QC_MSG_OUT |QC_URGENT ); } } - last_int_level =DvcEnterCritical ();if (asc_dvc->in_critical_cnt !=0 ) { -DvcLeaveCritical (last_int_level);AscSetLibErrorCode (asc_dvc,ASCQ_ERR_CRITICAL_RE_ENTRY );return (ERR ); }
@@ -7603,13 +7536,11 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq)if ((scsiq->q1.cntl &QC_SG_HEAD ) !=0 ) {if ((sg_entry_cnt = sg_head->entry_cnt) ==0 ) { asc_dvc->in_critical_cnt--; -DvcLeaveCritical (last_int_level);return (ERR ); }#if !CC_VERY_LONG_SG_LIST if (sg_entry_cnt >ASC_MAX_SG_LIST ) { asc_dvc->in_critical_cnt--; -DvcLeaveCritical (last_int_level);return (ERR ); }#endif /* !CC_VERY_LONG_SG_LIST */
@@ -7724,7 +7655,6 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) AscSendScsiQueue(asc_dvc, scsiq, n_q_required)) == 1) { asc_dvc->in_critical_cnt--; -DvcLeaveCritical (last_int_level);return (sta); } }
@@ -7769,13 +7699,11 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq)if ((sta =AscSendScsiQueue (asc_dvc, scsiq, n_q_required)) ==1 ) { asc_dvc->in_critical_cnt--; -DvcLeaveCritical (last_int_level);return (sta); } } } asc_dvc->in_critical_cnt--; -DvcLeaveCritical (last_int_level);return (sta); }
@@ -8308,7 +8236,7 @@ static int AscHostReqRiscHalt(PortAddr iop_base) sta =1 ;break ; } -DvcSleepMilliSecond (100 ); +mdelay (100 ); }while (count++ <20 );AscWriteLramByte (iop_base,ASCV_STOP_CODE_B , saved_stop_code);return (sta);
@@ -8326,22 +8254,12 @@ static int AscStopQueueExe(PortAddr iop_base) ASC_STOP_ACK_RISC_STOP) {return (1 ); } -DvcSleepMilliSecond (100 ); +mdelay (100 ); }while (count++ <20 ); }return (0 ); } -static void DvcDelayMicroSecond (ADV_DVC_VAR *asc_dvc,ushort micro_sec) -{ -udelay (micro_sec); -} - -static void DvcDelayNanoSecond (ASC_DVC_VAR *asc_dvc,ASC_DCNT nano_sec) -{ -udelay ((nano_sec +999 ) /1000 ); -} -static int AscStartChip (PortAddr iop_base) {AscSetChipControl (iop_base,0 );
@@ -8460,16 +8378,16 @@ static int AscResetChipAndScsiBus(ASC_DVC_VAR *asc_dvc) iop_base = asc_dvc->iop_base;while ((AscGetChipStatus (iop_base) &CSW_SCSI_RESET_ACTIVE ) && (i-- >0 )) { -DvcSleepMilliSecond (100 ); +mdelay (100 ); }AscStopChip (iop_base);AscSetChipControl (iop_base,CC_CHIP_RESET |CC_SCSI_RESET |CC_HALT ); -DvcDelayNanoSecond (asc_dvc,60000 ); +udelay (60 );AscSetChipIH (iop_base,INS_RFLAG_WTM );AscSetChipIH (iop_base,INS_HALT );AscSetChipControl (iop_base,CC_CHIP_RESET |CC_HALT );AscSetChipControl (iop_base,CC_HALT ); -DvcSleepMilliSecond (200 ); +mdelay (200 );AscSetChipStatus (iop_base,CIW_CLR_SCSI_RESET_INT );AscSetChipStatus (iop_base,0 );return (AscIsChipHalted (iop_base));
@@ -8711,8 +8629,7 @@ static ushort AscInitAsc1000Driver(ASC_DVC_VAR *asc_dvc)if ((asc_dvc->dvc_cntl &ASC_CNTL_RESET_SCSI ) && !(asc_dvc->init_state &ASC_INIT_RESET_SCSI_DONE )) {AscResetChipAndScsiBus (asc_dvc); -DvcSleepMilliSecond ((ASC_DCNT ) - ((ushort )asc_dvc->scsi_reset_wait *1000 )); +mdelay (asc_dvc->scsi_reset_wait *1000 );/* XXX: msleep? */ } asc_dvc->init_state |=ASC_INIT_STATE_BEG_LOAD_MC ;if (asc_dvc->err_code !=0 )
@@ -8869,8 +8786,7 @@ static ushort __devinit AscInitFromEEP(ASC_DVC_VAR *asc_dvc) (AscGetChipScsiCtrl(iop_base) != 0)) { asc_dvc->init_state |=ASC_INIT_RESET_SCSI_DONE ;AscResetChipAndScsiBus (asc_dvc); -DvcSleepMilliSecond ((ASC_DCNT ) - ((ushort )asc_dvc->scsi_reset_wait *1000 )); +mdelay (asc_dvc->scsi_reset_wait *1000 );/* XXX: msleep? */ }if (AscIsChipHalted (iop_base) == FALSE) { asc_dvc->err_code |=ASC_IERR_START_STOP_CHIP ;
@@ -9084,7 +9000,7 @@ static int __devinit AscTestExternalLram(ASC_DVC_VAR *asc_dvc) saved_word =AscReadLramWord (iop_base, q_addr);AscSetChipLramAddr (iop_base, q_addr);AscSetChipLramData (iop_base,0x55AA ); -DvcSleepMilliSecond (10 ); +mdelay (10 );AscSetChipLramAddr (iop_base, q_addr);if (AscGetChipLramData (iop_base) ==0x55AA ) { sta =1 ;
@@ -9101,7 +9017,7 @@ static int __devinit AscWriteEEPCmdReg(PortAddr iop_base, uchar cmd_reg) retry =0 ;while (TRUE) {AscSetChipEEPCmd (iop_base, cmd_reg); -DvcSleepMilliSecond (1 ); +mdelay (1 ); read_back =AscGetChipEEPCmd (iop_base);if (read_back == cmd_reg) {return (1 );
@@ -9120,7 +9036,7 @@ static int __devinit AscWriteEEPDataReg(PortAddr iop_base, ushort data_reg) retry =0 ;while (TRUE) {AscSetChipEEPData (iop_base, data_reg); -DvcSleepMilliSecond (1 ); +mdelay (1 ); read_back =AscGetChipEEPData (iop_base);if (read_back == data_reg) {return (1 );
@@ -9133,13 +9049,13 @@ static int __devinit AscWriteEEPDataReg(PortAddr iop_base, ushort data_reg)static void __devinit AscWaitEEPRead (void ) { -DvcSleepMilliSecond (1 ); +mdelay (1 );return ; }static void __devinit AscWaitEEPWrite (void ) { -DvcSleepMilliSecond (20 ); +mdelay (20 );return ; }
@@ -11364,7 +11280,7 @@ AdvInitGetConfig(struct pci_dev *pdev, asc_board_t *boardp)*/ AdvWriteWordRegister (iop_base,IOPW_CTRL_REG ,ADV_CTRL_REG_CMD_RESET ); -DvcSleepMilliSecond (100 ); +mdelay (100 );AdvWriteWordRegister (iop_base,IOPW_CTRL_REG ,ADV_CTRL_REG_CMD_WR_IO_REG );
@@ -12048,7 +11964,7 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)*/ for (i =0 ; i <2 ; i++) {AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,PRE_TEST_MODE ); -DvcSleepMilliSecond (10 );/* Wait for 10ms before reading back. */ +mdelay (10 );/* Wait for 10ms before reading back. */ byte =AdvReadByteRegister (iop_base,IOPB_RAM_BIST );if ((byte &RAM_TEST_DONE ) ==0 || (byte &0x0F ) !=PRE_TEST_VALUE ) {
@@ -12057,7 +11973,7 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) }AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,NORMAL_MODE ); -DvcSleepMilliSecond (10 );/* Wait for 10ms before reading back. */ +mdelay (10 );/* Wait for 10ms before reading back. */ if (AdvReadByteRegister (iop_base,IOPB_RAM_BIST ) !=NORMAL_VALUE ) { asc_dvc->err_code =ASC_IERR_BIST_PRE_TEST ;
@@ -12073,7 +11989,7 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc)* err_code, and return an error. */ AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,RAM_TEST_MODE ); -DvcSleepMilliSecond (10 );/* Wait for 10ms before checking status. */ +mdelay (10 );/* Wait for 10ms before checking status. */ byte =AdvReadByteRegister (iop_base,IOPB_RAM_BIST );if ((byte &RAM_TEST_DONE ) ==0 || (byte &RAM_TEST_STATUS ) !=0 ) {
@@ -12529,7 +12445,7 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc)*/ for (i =0 ; i <2 ; i++) {AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,PRE_TEST_MODE ); -DvcSleepMilliSecond (10 );/* Wait for 10ms before reading back. */ +mdelay (10 );/* Wait for 10ms before reading back. */ byte =AdvReadByteRegister (iop_base,IOPB_RAM_BIST );if ((byte &RAM_TEST_DONE ) ==0 || (byte &0x0F ) !=PRE_TEST_VALUE ) {
@@ -12538,7 +12454,7 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc) }AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,NORMAL_MODE ); -DvcSleepMilliSecond (10 );/* Wait for 10ms before reading back. */ +mdelay (10 );/* Wait for 10ms before reading back. */ if (AdvReadByteRegister (iop_base,IOPB_RAM_BIST ) !=NORMAL_VALUE ) { asc_dvc->err_code =ASC_IERR_BIST_PRE_TEST ;
@@ -12554,7 +12470,7 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc)* err_code, and return an error. */ AdvWriteByteRegister (iop_base,IOPB_RAM_BIST ,RAM_TEST_MODE ); -DvcSleepMilliSecond (10 );/* Wait for 10ms before checking status. */ +mdelay (10 );/* Wait for 10ms before checking status. */ byte =AdvReadByteRegister (iop_base,IOPB_RAM_BIST );if ((byte &RAM_TEST_DONE ) ==0 || (byte &RAM_TEST_STATUS ) !=0 ) {
@@ -13645,12 +13561,11 @@ static void __devinit AdvWaitEEPCmd(AdvPortAddr iop_base) ASC_EEP_CMD_DONE) {break ; } -DvcSleepMilliSecond (1 ); +mdelay (1 ); }if ((AdvReadWordRegister (iop_base,IOPW_EE_CMD ) &ASC_EEP_CMD_DONE ) == -0 ) { -ASC_ASSERT (0 ); - } +0 ) +BUG ();return ; }
@@ -13688,7 +13603,7 @@ AdvSet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)AdvWriteWordRegister (iop_base,IOPW_EE_CMD ,ASC_EEP_CMD_WRITE | addr);AdvWaitEEPCmd (iop_base); -DvcSleepMilliSecond (ADV_EEP_DELAY_MS ); +mdelay (ADV_EEP_DELAY_MS ); }/*
@@ -13756,7 +13671,7 @@ AdvSet38C0800EEPConfig(AdvPortAddr iop_base, ADVEEP_38C0800_CONFIG *cfg_buf)AdvWriteWordRegister (iop_base,IOPW_EE_CMD ,ASC_EEP_CMD_WRITE | addr);AdvWaitEEPCmd (iop_base); -DvcSleepMilliSecond (ADV_EEP_DELAY_MS ); +mdelay (ADV_EEP_DELAY_MS ); }/*
@@ -13824,7 +13739,7 @@ AdvSet38C1600EEPConfig(AdvPortAddr iop_base, ADVEEP_38C1600_CONFIG *cfg_buf)AdvWriteWordRegister (iop_base,IOPW_EE_CMD ,ASC_EEP_CMD_WRITE | addr);AdvWaitEEPCmd (iop_base); -DvcSleepMilliSecond (ADV_EEP_DELAY_MS ); +mdelay (ADV_EEP_DELAY_MS ); }/*
@@ -13882,14 +13797,11 @@ AdvSet38C1600EEPConfig(AdvPortAddr iop_base, ADVEEP_38C1600_CONFIG *cfg_buf)*/ static int AdvExeScsiQueue (ADV_DVC_VAR *asc_dvc,ADV_SCSI_REQ_Q *scsiq) { -ulong last_int_level;AdvPortAddr iop_base;ADV_DCNT req_size;ADV_PADDR req_paddr;ADV_CARR_T *new_carrp; -ASC_ASSERT (scsiq !=NULL );/* 'scsiq' should never be NULL. */ -/* * The ADV_SCSI_REQ_Q 'target_id' field should never exceed ADV_MAX_TID. */
@@ -13901,14 +13813,11 @@ static int AdvExeScsiQueue(ADV_DVC_VAR *asc_dvc, ADV_SCSI_REQ_Q *scsiq) iop_base = asc_dvc->iop_base; - last_int_level =DvcEnterCritical (); -/* * Allocate a carrier ensuring at least one carrier always * remains on the freelist and initialize fields. */ if ((new_carrp = asc_dvc->carr_freelist) ==NULL ) { -DvcLeaveCritical (last_int_level);return ADV_BUSY ; } asc_dvc->carr_freelist = (ADV_CARR_T *)
@@ -13931,8 +13840,8 @@ static int AdvExeScsiQueue(ADV_DVC_VAR *asc_dvc, ADV_SCSI_REQ_Q *scsiq) req_paddr =DvcGetPhyAddr (asc_dvc, scsiq, (uchar *)scsiq, (ADV_SDCNT *)&req_size,ADV_IS_SCSIQ_FLAG ); -ASC_ASSERT (ADV_32BALIGN (req_paddr) == req_paddr); -ASC_ASSERT (req_size >=sizeof (ADV_SCSI_REQ_Q )); +BUG_ON (req_paddr &31 ); +BUG_ON (req_size <sizeof (ADV_SCSI_REQ_Q ));/* Wait for assertion before making little-endian */ req_paddr =cpu_to_le32 (req_paddr);
@@ -13991,8 +13900,6 @@ static int AdvExeScsiQueue(ADV_DVC_VAR *asc_dvc, ADV_SCSI_REQ_Q *scsiq) le32_to_cpu(new_carrp->carr_pa)); } -DvcLeaveCritical (last_int_level); -return ADV_SUCCESS ; }
@@ -14024,7 +13931,7 @@ static int AdvResetSB(ADV_DVC_VAR *asc_dvc)* The hold time delay is done on the host because the RISC has no * microsecond accurate timer. */ -DvcDelayMicroSecond (asc_dvc, (ushort )ASC_SCSI_RESET_HOLD_TIME_US ); +udelay (ASC_SCSI_RESET_HOLD_TIME_US );/* * Send the SCSI Bus Reset end idle command which de-asserts
@@ -14035,7 +13942,7 @@ static int AdvResetSB(ADV_DVC_VAR *asc_dvc)return status; } -DvcSleepMilliSecond ((ADV_DCNT )asc_dvc->scsi_reset_wait *1000 ); +mdelay (asc_dvc->scsi_reset_wait *1000 );/* XXX: msleep? */ return status; }
@@ -14086,7 +13993,7 @@ static int AdvResetChipAndSB(ADV_DVC_VAR *asc_dvc)*/ AdvWriteWordRegister (iop_base,IOPW_RISC_CSR ,ADV_RISC_CSR_STOP );AdvWriteWordRegister (iop_base,IOPW_CTRL_REG ,ADV_CTRL_REG_CMD_RESET ); -DvcSleepMilliSecond (100 ); +mdelay (100 );AdvWriteWordRegister (iop_base,IOPW_CTRL_REG ,ADV_CTRL_REG_CMD_WR_IO_REG );
@@ -14158,11 +14065,8 @@ static int AdvISR(ADV_DVC_VAR *asc_dvc)ushort target_bit;ADV_CARR_T *free_carrp;ADV_VADDR irq_next_vpa; -int flags;ADV_SCSI_REQ_Q *scsiq; - flags =DvcEnterCritical (); - iop_base = asc_dvc->iop_base;/* Reading the register clears the interrupt. */
@@ -14170,7 +14074,6 @@ static int AdvISR(ADV_DVC_VAR *asc_dvc)if ((int_stat & (ADV_INTR_STATUS_INTRA |ADV_INTR_STATUS_INTRB |ADV_INTR_STATUS_INTRC )) ==0 ) { -DvcLeaveCritical (flags);return ADV_FALSE ; }
@@ -14243,7 +14146,6 @@ static int AdvISR(ADV_DVC_VAR *asc_dvc) asc_dvc->carr_freelist = free_carrp; asc_dvc->carr_pending_cnt--; -ASC_ASSERT (scsiq !=NULL ); target_bit =ADV_TID_TO_TIDMASK (scsiq->target_id);/*
@@ -14264,18 +14166,7 @@ static int AdvISR(ADV_DVC_VAR *asc_dvc)* Fall through and continue processing other completed * requests... */ - -/* -* Disable interrupts again in case the driver inadvertently -* enabled interrupts in its callback function. -* -* The DvcEnterCritical() return value is ignored, because -* the 'flags' saved when AdvISR() was first entered will be -* used to restore the interrupt flag on exit. -*/ - (void )DvcEnterCritical (); } -DvcLeaveCritical (flags);return ADV_TRUE ; }
@@ -14297,13 +14188,10 @@ static intAdvSendIdleCmd (ADV_DVC_VAR *asc_dvc, ushort idle_cmd, ADV_DCNT idle_cmd_parameter) { -ulong last_int_level;int result;ADV_DCNT i, j;AdvPortAddr iop_base; - last_int_level =DvcEnterCritical (); - iop_base = asc_dvc->iop_base;/*
@@ -14343,16 +14231,13 @@ AdvSendIdleCmd(ADV_DVC_VAR *asc_dvc,for (j =0 ; j <SCSI_US_PER_MSEC ; j++) {AdvReadWordLram (iop_base,ASC_MC_IDLE_CMD_STATUS , result); -if (result !=0 ) { -DvcLeaveCritical (last_int_level); +if (result !=0 )return result; - } -DvcDelayMicroSecond (asc_dvc, (ushort )1 ); +udelay (1 ); } } -ASC_ASSERT (0 );/* The idle command should never timeout. */ -DvcLeaveCritical (last_int_level); +BUG ();/* The idle command should never timeout. */ return ADV_ERROR ; }
Signature · 1 line
1.5.2.4
PATCH 14/22 advansys: Comment/indentation/macro cleanup
In reply to Matthew Wilcox - Delete comments relating to the previous structure of the driver. I have no intention of honouring them ;-)
- Reformat comments > 80 columns
- Remove now-obsolete comments from advansys_interrupt
- Change adv_get_sglist() from do {} while (1) to for (;;)
- Return void from AscInitQLinkVar()
- Take out a level of indentation in adv_get_sglist()
- Reduce indentation level of AscAsyncFix()
- Remove unused macros
- Refactor AscSendScsiQueue slightly
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 379 +++++++++++++---------------------------------- 1 files changed, 101 insertions(+), 278 deletions(-)
drivers/scsi/advansys.c +101 -278
@@ -76,10 +76,6 @@/* Enable driver tracing. */ /* #define ADVANSYS_DEBUG */ -/* -* --- Asc Library Constants and Macros -*/ -#define ASC_LIB_VERSION_MAJOR 1#define ASC_LIB_VERSION_MINOR 24#define ASC_LIB_SERIAL_NUMBER 123
@@ -118,15 +114,10 @@ typedef unsigned char uchar;#define FALSE (0)#endif -#define EOF (-1)#define ERR (-1)#define UW_ERR (uint)(0xFFFF)#define isodd_word (val) ((((uint)val) & (uint)0x0001) != 0) -#define ASC_DVCLIB_CALL_DONE (1) -#define ASC_DVCLIB_CALL_FAILED (0) -#define ASC_DVCLIB_CALL_ERROR (-1) -#define PCI_VENDOR_ID_ASP 0x10cd#define PCI_DEVICE_ID_ASP_1200A 0x1100#define PCI_DEVICE_ID_ASP_ABP940 0x1200
@@ -164,11 +155,10 @@ typedef unsigned char uchar;#define ASC_IS_PCMCIA (0x0008)#define ASC_IS_MCA (0x0020)#define ASC_IS_VL (0x0040) -#define ASC_ISA_PNP_PORT_ADDR (0x279) -#define ASC_ISA_PNP_PORT_WRITE (ASC_ISA_PNP_PORT_ADDR+0x800)#define ASC_IS_WIDESCSI_16 (0x0100)#define ASC_IS_WIDESCSI_32 (0x0200)#define ASC_IS_BIG_ENDIAN (0x8000) +#define ASC_CHIP_MIN_VER_VL (0x01)#define ASC_CHIP_MAX_VER_VL (0x07)#define ASC_CHIP_MIN_VER_PCI (0x09)
@@ -187,16 +177,9 @@ typedef unsigned char uchar;#define ASC_CHIP_MAX_VER_EISA (0x47)#define ASC_CHIP_VER_EISA_BIT (0x40)#define ASC_CHIP_LATEST_VER_EISA ((ASC_CHIP_MIN_VER_EISA - 1) + 3) -#define ASC_MAX_LIB_SUPPORTED_ISA_CHIP_VER 0x21 -#define ASC_MAX_LIB_SUPPORTED_PCI_CHIP_VER 0x0A -#define ASC_MAX_VL_DMA_ADDR (0x07FFFFFFL)#define ASC_MAX_VL_DMA_COUNT (0x07FFFFFFL) -#define ASC_MAX_PCI_DMA_ADDR (0xFFFFFFFFL)#define ASC_MAX_PCI_DMA_COUNT (0xFFFFFFFFL) -#define ASC_MAX_ISA_DMA_ADDR (0x00FFFFFFL)#define ASC_MAX_ISA_DMA_COUNT (0x00FFFFFFL) -#define ASC_MAX_EISA_DMA_ADDR (0x07FFFFFFL) -#define ASC_MAX_EISA_DMA_COUNT (0x07FFFFFFL)#define ASC_SCSI_ID_BITS 3#define ASC_SCSI_TIX_TYPE uchar
@@ -216,24 +199,6 @@ typedef unsigned char uchar;#define ASC_MAX_CDB_LEN 12#define ADV_MAX_CDB_LEN 16 -/* -* Inquiry SPC-2 SPI Byte 1 EVPD (Enable Vital Product Data) -* and CmdDt (Command Support Data) field bit definitions. -*/ -#define ADV_INQ_RTN_VPD_AND_CMDDT 0x3 -#define ADV_INQ_RTN_CMDDT_FOR_OP_CODE 0x2 -#define ADV_INQ_RTN_VPD_FOR_PG_CODE 0x1 -#define ADV_INQ_RTN_STD_INQUIRY_DATA 0x0 - -#define ASC_SCSIDIR_NOCHK 0x00 -#define ASC_SCSIDIR_T2H 0x08 -#define ASC_SCSIDIR_H2T 0x10 -#define ASC_SCSIDIR_NODATA 0x18 -#define SCSI_ASC_NOMEDIA 0x3A -#define ASC_SRB_HOST (x) ((uchar)((uchar)(x) >> 4)) -#define ASC_SRB_TID (x) ((uchar)((uchar)(x) & (uchar)0x0F)) -#define ASC_SRB_LUN (x) ((uchar)((uint)(x) >> 13)) -#define PUT_CDB1 (x) ((uchar)((uint)(x) >> 8))#define MS_SDTR_LEN 0x03#define MS_WDTR_LEN 0x02
@@ -417,19 +382,6 @@ typedef struct asc_sg_head {ASC_SG_LIST sg_list[ASC_MAX_SG_LIST ]; }ASC_SG_HEAD ; -#define ASC_MIN_SG_LIST 2 - -typedef struct asc_min_sg_head { -ushort entry_cnt; -ushort queue_cnt; -ushort entry_to_copy; -ushort res; -ASC_SG_LIST sg_list[ASC_MIN_SG_LIST ]; -}ASC_MIN_SG_HEAD ; - -#define QCX_SORT (0x0001) -#define QCX_COALEASE (0x0002) - typedef struct asc_scsi_q { ASC_SCSIQ_1 q1; ASC_SCSIQ_2 q2;
@@ -486,34 +438,9 @@ typedef struct asc_risc_sg_list_q {ASC_SG_LIST sg_list[7 ]; }ASC_RISC_SG_LIST_Q ; -#define ASC_EXE_SCSI_IO_MAX_IDLE_LOOP 0x1000000UL -#define ASC_EXE_SCSI_IO_MAX_WAIT_LOOP 1024 -#define ASCQ_ERR_NO_ERROR 0 -#define ASCQ_ERR_IO_NOT_FOUND 1 -#define ASCQ_ERR_LOCAL_MEM 2 -#define ASCQ_ERR_CHKSUM 3 -#define ASCQ_ERR_START_CHIP 4 -#define ASCQ_ERR_INT_TARGET_ID 5 -#define ASCQ_ERR_INT_LOCAL_MEM 6 -#define ASCQ_ERR_HALT_RISC 7 -#define ASCQ_ERR_GET_ASPI_ENTRY 8 -#define ASCQ_ERR_CLOSE_ASPI 9 -#define ASCQ_ERR_HOST_INQUIRY 0x0A -#define ASCQ_ERR_SAVED_SRB_BAD 0x0B -#define ASCQ_ERR_QCNTL_SG_LIST 0x0C#define ASCQ_ERR_Q_STATUS 0x0D -#define ASCQ_ERR_WR_SCSIQ 0x0E -#define ASCQ_ERR_PC_ADDR 0x0F -#define ASCQ_ERR_SYN_OFFSET 0x10 -#define ASCQ_ERR_SYN_XFER_TIME 0x11 -#define ASCQ_ERR_LOCK_DMA 0x12 -#define ASCQ_ERR_UNLOCK_DMA 0x13 -#define ASCQ_ERR_VDS_CHK_INSTALL 0x14 -#define ASCQ_ERR_MICRO_CODE_HALT 0x15 -#define ASCQ_ERR_SET_LRAM_ADDR 0x16#define ASCQ_ERR_CUR_QNG 0x17#define ASCQ_ERR_SG_Q_LINKS 0x18 -#define ASCQ_ERR_SCSIQ_PTR 0x19#define ASCQ_ERR_ISR_RE_ENTRY 0x1A#define ASCQ_ERR_CRITICAL_RE_ENTRY 0x1B#define ASCQ_ERR_ISR_ON_CRITICAL 0x1C
@@ -529,7 +456,6 @@ typedef struct asc_risc_sg_list_q {#define ASC_WARN_CMD_QNG_CONFLICT 0x0010#define ASC_WARN_EEPROM_RECOVER 0x0020#define ASC_WARN_CFG_MSW_RECOVER 0x0040 -#define ASC_WARN_SET_PCI_CONFIG_SPACE 0x0080/* * Error code values are set in ASC_DVC_VAR 'err_code'.
@@ -549,27 +475,21 @@ typedef struct asc_risc_sg_list_q {#define ASC_IERR_SET_SDTR 0x1000#define ASC_IERR_RW_LRAM 0x8000 -#define ASC_DEF_IRQ_NO 10#define ASC_MAX_IRQ_NO 15#define ASC_MIN_IRQ_NO 10 -#define ASC_MIN_REMAIN_Q (0x02)#define ASC_DEF_MAX_TOTAL_QNG (0xF0)#define ASC_MIN_TAG_Q_PER_DVC (0x04) -#define ASC_DEF_TAG_Q_PER_DVC (0x04) -#define ASC_MIN_FREE_Q ASC_MIN_REMAIN_Q +#define ASC_MIN_FREE_Q (0x02)#define ASC_MIN_TOTAL_QNG ((ASC_MAX_SG_QUEUE)+(ASC_MIN_FREE_Q))#define ASC_MAX_TOTAL_QNG 240#define ASC_MAX_PCI_ULTRA_INRAM_TOTAL_QNG 16#define ASC_MAX_PCI_ULTRA_INRAM_TAG_QNG 8#define ASC_MAX_PCI_INRAM_TOTAL_QNG 20#define ASC_MAX_INRAM_TAG_QNG 16 -#define ASC_IOADR_TABLE_MAX_IX 11#define ASC_IOADR_GAP 0x10 -#define ASC_LIB_SCSIQ_WK_SP 256#define ASC_MAX_SYN_XFER_NO 16#define ASC_SYN_MAX_OFFSET 0x0F#define ASC_DEF_SDTR_OFFSET 0x0F -#define ASC_DEF_SDTR_INDEX 0x00#define ASC_SDTR_ULTRA_PCI_10MB_INDEX 0x02#define SYN_XFER_NS_0 25#define SYN_XFER_NS_1 30
@@ -648,7 +568,6 @@ typedef struct asc_dvc_cfg {#define ASC_DEF_DVC_CNTL 0xFFFF#define ASC_DEF_CHIP_SCSI_ID 7#define ASC_DEF_ISA_DMA_SPEED 4 -#define ASC_INIT_STATE_NULL 0x0000#define ASC_INIT_STATE_BEG_GET_CFG 0x0001#define ASC_INIT_STATE_END_GET_CFG 0x0002#define ASC_INIT_STATE_BEG_SET_CFG 0x0004
@@ -740,12 +659,7 @@ typedef struct asc_cap_info_array {#define ASC_EEP_MAX_DVC_ADDR_VL 15#define ASC_EEP_DVC_CFG_BEG 32#define ASC_EEP_MAX_DVC_ADDR 45 -#define ASC_EEP_DEFINED_WORDS 10 -#define ASC_EEP_MAX_ADDR 63 -#define ASC_EEP_RES_WORDS 0#define ASC_EEP_MAX_RETRY 20 -#define ASC_MAX_INIT_BUSY_RETRY 8 -#define ASC_EEP_ISA_PNP_WSIZE 16/* * These macros keep the chip SCSI id and ISA DMA speed
@@ -781,17 +695,11 @@ typedef struct asceep_config {ushort chksum; }ASCEEP_CONFIG ; -#define ASC_PCI_CFG_LSW_SCSI_PARITY 0x0800 -#define ASC_PCI_CFG_LSW_BURST_MODE 0x0080 -#define ASC_PCI_CFG_LSW_INTR_ABLE 0x0020 -#define ASC_EEP_CMD_READ 0x80#define ASC_EEP_CMD_WRITE 0x40#define ASC_EEP_CMD_WRITE_ABLE 0x30#define ASC_EEP_CMD_WRITE_DISABLE 0x00#define ASC_OVERRUN_BSIZE 0x00000048UL -#define ASC_CTRL_BREAK_ONCE 0x0001 -#define ASC_CTRL_BREAK_STAY_IDLE 0x0002#define ASCV_MSGOUT_BEG 0x0000#define ASCV_MSGOUT_SDTR_PERIOD (ASCV_MSGOUT_BEG+3)#define ASCV_MSGOUT_SDTR_OFFSET (ASCV_MSGOUT_BEG+4)
@@ -1105,7 +1013,6 @@ static int AscPutReadySgListQueue(ASC_DVC_VAR *, ASC_SCSI_Q *, uchar);static int AscSetChipSynRegAtID (PortAddr ,uchar ,uchar );static int AscSetRunChipSynRegAtID (PortAddr ,uchar ,uchar );static ushort AscInitLram (ASC_DVC_VAR *); -static ushort AscInitQLinkVar (ASC_DVC_VAR *);static int AscSetLibErrorCode (ASC_DVC_VAR *,ushort );static int AscIsrChipHalted (ASC_DVC_VAR *); static uchar _AscCopyLramScsiDoneQ(PortAddr, ushort,
@@ -1131,10 +1038,6 @@ static void AscEnableIsaDma(uchar);#endif /* CONFIG_ISA */ static const char *advansys_info (struct Scsi_Host *shost); -/* -* --- Adv Library Constants and Macros -*/ -#define ADV_LIB_VERSION_MAJOR 5#define ADV_LIB_VERSION_MINOR 14
@@ -1515,10 +1418,6 @@ typedef struct adveep_38C1600_config {* EEPROM Commands */ #define ASC_EEP_CMD_DONE 0x0200 -#define ASC_EEP_CMD_DONE_ERR 0x0001 - -/* cfg_word */ -#define EEP_CFG_WORD_BIG_ENDIAN 0x8000/* bios_ctrl */ #define BIOS_CTRL_BIOS 0x0001
@@ -1675,8 +1574,6 @@ typedef struct adveep_38C1600_config {#define ADV_CHIP_ID_BYTE 0x25#define ADV_CHIP_ID_WORD 0x04C1 -#define ADV_SC_SCSI_BUS_RESET 0x2000 -#define ADV_INTR_ENABLE_HOST_INTR 0x01#define ADV_INTR_ENABLE_SEL_INTR 0x02#define ADV_INTR_ENABLE_DPR_INTR 0x04
@@ -1716,8 +1613,6 @@ typedef struct adveep_38C1600_config {#define ADV_TICKLE_B 0x02#define ADV_TICKLE_C 0x03 -#define ADV_SCSI_CTRL_RSTOUT 0x2000 -#define AdvIsIntPending (port) \ (AdvReadWordRegister(port, IOPW_CTRL_REG) & ADV_CTRL_REG_HOST_INTR)
@@ -1870,14 +1765,11 @@ typedef struct adveep_38C1600_config {*/ #define INTAB 0x01 -/* a_advlib.h */ -/* * Adv Library Status Definitions */ #define ADV_TRUE 1#define ADV_FALSE 0 -#define ADV_NOERROR 1#define ADV_SUCCESS 1#define ADV_BUSY 0#define ADV_ERROR (-1)
@@ -1888,7 +1780,6 @@ typedef struct adveep_38C1600_config {#define ASC_WARN_BUSRESET_ERROR 0x0001/* SCSI Bus Reset error */ #define ASC_WARN_EEPROM_CHKSUM 0x0002/* EEP check sum error */ #define ASC_WARN_EEPROM_TERMINATION 0x0004/* EEP termination bad field */ -#define ASC_WARN_SET_PCI_CONFIG_SPACE 0x0080/* PCI config space set error */ #define ASC_WARN_ERROR 0xFFFF/* ADV_ERROR return */ #define ADV_MAX_TID 15/* max. target identifier */
@@ -2206,10 +2097,8 @@ typedef struct adv_scsi_req_q {/* * Wait loop time out values. */ -#define SCSI_WAIT_10_SEC 10UL/* 10 seconds */ #define SCSI_WAIT_100_MSEC 100UL/* 100 milliseconds */ #define SCSI_US_PER_MSEC 1000/* microseconds per millisecond */ -#define SCSI_MS_PER_SEC 1000UL/* milliseconds per second */ #define SCSI_MAX_RETRY 10/* retry count */ #define ADV_ASYNC_RDMA_FAILURE 0x01/* Fatal RDMA failure. */
@@ -2443,10 +2332,6 @@ do { \ (sizeof (ADV_SG_BLOCK ) * \ ((ADV_MAX_SG_LIST + (NO_OF_SG_PER_BLOCK -1 ))/NO_OF_SG_PER_BLOCK )) -/* -* --- Driver Constants and Macros -*/ - /* Reference Scsi_Host hostdata */#define ASC_BOARDP (host) ((asc_board_t *) &((host)->hostdata))
@@ -2792,10 +2677,6 @@ static ASC_SG_HEAD asc_sg_head = { 0 };static int asc_dbglvl =3 ;#endif /* ADVANSYS_DEBUG */ -/* -* --- Driver Function Prototypes -*/ -static int advansys_slave_configure (struct scsi_device *);static int asc_execute_scsi_cmnd (struct scsi_cmnd *);static int asc_build_req (asc_board_t *,struct scsi_cmnd *);
@@ -3359,17 +3240,9 @@ static struct scsi_host_template advansys_template = { };/* -* --- Miscellaneous Driver Functions -*/ - -/* * First-level interrupt handler. * -* 'dev_id' is a pointer to the interrupting adapter's asc_board_t. Because -* all boards are currently checked for interrupts on each interrupt, 'dev_id' -* is not referenced. 'dev_id' could be used to identify an interrupt passed -* to the AdvanSys driver which is for a device sharing an interrupt with -* an AdvanSys adapter. +* 'dev_id' is a pointer to the interrupting adapter's Scsi_Host. */ static irqreturn_t advansys_interrupt (int irq,void *dev_id) {
@@ -3381,9 +3254,6 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id)ASC_DBG1 (2 ,"advansys_interrupt: boardp 0x%p\n" , boardp);spin_lock_irqsave (&boardp->lock, flags);if (ASC_NARROW_BOARD (boardp)) { -/* -* Narrow Board -*/ if (AscIsIntPending (shost->io_port)) { result =IRQ_HANDLED ;ASC_STATS (shost, interrupt);
@@ -3391,23 +3261,14 @@ static irqreturn_t advansys_interrupt(int irq, void *dev_id)AscISR (&boardp->dvc_var.asc_dvc_var); } }else { -/* -* Wide Board -*/ ASC_DBG (1 ,"advansys_interrupt: before AdvISR()\n" );if (AdvISR (&boardp->dvc_var.adv_dvc_var)) { result =IRQ_HANDLED ;ASC_STATS (shost, interrupt); } } -spin_unlock_irqrestore (&boardp->lock, flags); -/* -* If interrupts were enabled on entry, then they -* are now enabled here. -*/ -ASC_DBG (1 ,"advansys_interrupt: end\n" );return result; }
@@ -4110,7 +3971,7 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp, prev_sg_block =NULL ; reqp->sgblkp =NULL ; - do { +for (;;) {/* * Allocate a 'adv_sgblk_t' structure from the board free * list. One 'adv_sgblk_t' structure holds NO_OF_SG_PER_BLOCK
@@ -4121,8 +3982,8 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp,ASC_STATS (scp->device->host, adv_build_nosg);/* -* Allocation failed. Free 'adv_sgblk_t' structures already -* allocated for the request. +* Allocation failed. Free 'adv_sgblk_t' structures +* already allocated for the request. */ while ((sgblkp = reqp->sgblkp) !=NULL ) {/* Remove 'sgblkp' from the request list. */
@@ -4133,52 +3994,50 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp, boardp->adv_sgblkp = sgblkp; }return ASC_BUSY ; - }else { -/* Complete 'adv_sgblk_t' board allocation. */ - boardp->adv_sgblkp = sgblkp->next_sgblkp; - sgblkp->next_sgblkp =NULL ; + } + +/* Complete 'adv_sgblk_t' board allocation. */ + boardp->adv_sgblkp = sgblkp->next_sgblkp; + sgblkp->next_sgblkp =NULL ; + +/* +* Get 8 byte aligned virtual and physical addresses +* for the allocated ADV_SG_BLOCK structure. +*/ + sg_block = (ADV_SG_BLOCK *)ADV_8BALIGN (&sgblkp->sg_block); + sg_block_paddr =virt_to_bus (sg_block); + +/* +* Check if this is the first 'adv_sgblk_t' for the +* request. +*/ +if (reqp->sgblkp ==NULL ) { +/* Request's first scatter-gather block. */ + reqp->sgblkp = sgblkp;/* -* Get 8 byte aligned virtual and physical addresses for -* the allocated ADV_SG_BLOCK structure. +* Set ADV_SCSI_REQ_T ADV_SG_BLOCK virtual and physical +* address pointers. */ - sg_block = - (ADV_SG_BLOCK *)ADV_8BALIGN (&sgblkp->sg_block); - sg_block_paddr =virt_to_bus (sg_block); + scsiqp->sg_list_ptr = sg_block; + scsiqp->sg_real_addr =cpu_to_le32 (sg_block_paddr); + }else { +/* Request's second or later scatter-gather block. */ + sgblkp->next_sgblkp = reqp->sgblkp; + reqp->sgblkp = sgblkp;/* -* Check if this is the first 'adv_sgblk_t' for the request. +* Point the previous ADV_SG_BLOCK structure to +* the newly allocated ADV_SG_BLOCK structure. */ -if (reqp->sgblkp ==NULL ) { -/* Request's first scatter-gather block. */ - reqp->sgblkp = sgblkp; - -/* -* Set ADV_SCSI_REQ_T ADV_SG_BLOCK virtual and physical -* address pointers. -*/ - scsiqp->sg_list_ptr = sg_block; - scsiqp->sg_real_addr = -cpu_to_le32 (sg_block_paddr); - }else { -/* Request's second or later scatter-gather block. */ - sgblkp->next_sgblkp = reqp->sgblkp; - reqp->sgblkp = sgblkp; - -/* -* Point the previous ADV_SG_BLOCK structure to -* the newly allocated ADV_SG_BLOCK structure. -*/ - prev_sg_block->sg_ptr = -cpu_to_le32 (sg_block_paddr); - } + prev_sg_block->sg_ptr =cpu_to_le32 (sg_block_paddr); }for (i =0 ; i <NO_OF_SG_PER_BLOCK ; i++) { sg_block->sg_list[i].sg_addr = -cpu_to_le32 (sg_dma_address (slp)); +cpu_to_le32 (sg_dma_address (slp)); sg_block->sg_list[i].sg_count = -cpu_to_le32 (sg_dma_len (slp)); +cpu_to_le32 (sg_dma_len (slp));ASC_STATS_ADD (scp->device->host, sg_xfer,ASC_CEILING (sg_dma_len (slp),512 ));
@@ -4192,8 +4051,6 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp, sg_block->sg_cnt =NO_OF_SG_PER_BLOCK ; prev_sg_block = sg_block; } -while (1 ); -/* NOTREACHED */ }/*
@@ -4264,14 +4121,16 @@ static void asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep)ASC_DBG_PRT_SENSE (2 , scp->sense_buffer,sizeof (scp->sense_buffer));/* -* Note: The 'status_byte()' macro used by target drivers -* defined in scsi.h shifts the status byte returned by -* host drivers right by 1 bit. This is why target drivers -* also use right shifted status byte definitions. For -* instance target drivers use CHECK_CONDITION, defined to -* 0x1, instead of the SCSI defined check condition value -* of 0x2. Host drivers are supposed to return the status -* byte as it is defined by SCSI. +* Note: The 'status_byte()' macro used by +* target drivers defined in scsi.h shifts the +* status byte returned by host drivers right +* by 1 bit. This is why target drivers also +* use right shifted status byte definitions. +* For instance target drivers use +* CHECK_CONDITION, defined to 0x1, instead of +* the SCSI defined check condition value of +* 0x2. Host drivers are supposed to return +* the status byte as it is defined by SCSI. */ scp->result =DRIVER_BYTE (DRIVER_SENSE ) |STATUS_BYTE (qdonep->d3.scsi_stat);
@@ -4411,14 +4270,16 @@ static void adv_isr_callback(ADV_DVC_VAR *adv_dvc_varp, ADV_SCSI_REQ_Q *scsiqp)ASC_DBG_PRT_SENSE (2 , scp->sense_buffer,sizeof (scp->sense_buffer));/* -* Note: The 'status_byte()' macro used by target drivers -* defined in scsi.h shifts the status byte returned by -* host drivers right by 1 bit. This is why target drivers -* also use right shifted status byte definitions. For -* instance target drivers use CHECK_CONDITION, defined to -* 0x1, instead of the SCSI defined check condition value -* of 0x2. Host drivers are supposed to return the status -* byte as it is defined by SCSI. +* Note: The 'status_byte()' macro used by +* target drivers defined in scsi.h shifts the +* status byte returned by host drivers right +* by 1 bit. This is why target drivers also +* use right shifted status byte definitions. +* For instance target drivers use +* CHECK_CONDITION, defined to 0x1, instead of +* the SCSI defined check condition value of +* 0x2. Host drivers are supposed to return +* the status byte as it is defined by SCSI. */ scp->result =DRIVER_BYTE (DRIVER_SENSE ) |STATUS_BYTE (scsiqp->scsi_status);
@@ -5719,10 +5580,6 @@ static int asc_prt_line(char *buf, int buflen, char *fmt, ...)#endif /* CONFIG_PROC_FS */ /* -* --- Functions Required by the Asc Library -*/ - -/* * void * DvcPutScsiQ(PortAddr iop_base, ushort s_addr, uchar *outbuf, int words) *
@@ -5815,10 +5672,6 @@ AscGetChipBiosAddress(PortAddr iop_base, unsigned short bus_type) }/* -* --- Functions Required by the Adv Library -*/ - -/* * DvcGetPhyAddr() * * Return the physical address of 'vaddr' and set '*lenp' to the
@@ -5845,10 +5698,6 @@ DvcGetPhyAddr(ADV_DVC_VAR *asc_dvc, ADV_SCSI_REQ_Q *scsiq,return paddr; } -/* -* --- Tracing and Debugging Functions -*/ -#ifdef ADVANSYS_STATS #ifdef CONFIG_PROC_FS /*
@@ -6322,10 +6171,6 @@ static void asc_prt_hex(char *f, uchar *s, int l) }#endif /* ADVANSYS_DEBUG */ -/* -* --- Asc Library Functions -*/ -static ushort __devinit AscGetEisaChipCfg (PortAddr iop_base) {PortAddr eisa_cfg_iop;
@@ -6537,8 +6382,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc) target_ix =AscReadLramByte (iop_base, (ushort)(halt_q_addr + (ushort )ASC_SCSIQ_B_TARGET_IX )); - q_cntl = -AscReadLramByte (iop_base, + q_cntl =AscReadLramByte (iop_base, (ushort)(halt_q_addr + (ushort )ASC_SCSIQ_B_CNTL )); tid_no =ASC_TIX_TO_TID (target_ix); target_id = (uchar )ASC_TID_TO_TARGET_ID (tid_no);
@@ -6562,7 +6406,6 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)AscWriteLramWord (iop_base,ASCV_HALTCODE_W ,0 );return (0 ); }else if (int_halt_code ==ASC_HALT_EXTMSG_IN ) { - AscMemWordCopyPtrFromLram(iop_base, ASCV_MSGIN_BEG, (uchar *)&ext_msg,
@@ -6793,9 +6636,9 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc) cur_dvc_qng);/* -* Set the device queue depth to the number of -* active requests when the QUEUE FULL condition -* was encountered. +* Set the device queue depth to the +* number of active requests when the +* QUEUE FULL condition was encountered. */ boardp->queue_full |= target_id; boardp->queue_full_cnt[tid_no] =
@@ -6821,9 +6664,8 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)int i; q_no =AscReadLramByte (iop_base, (ushort )ASCV_REQ_SG_LIST_QP ); -if (q_no ==ASC_QLINK_END ) { -return (0 ); - } +if (q_no ==ASC_QLINK_END ) +return 0 ; q_addr =ASC_QNO_TO_QADDR (q_no);
@@ -6875,8 +6717,8 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc) sg_entry_cnt =ASC_MAX_SG_LIST -1 ;/* -* Keep track of remaining number of SG elements that will -* need to be handled on the next interrupt. +* Keep track of remaining number of SG elements that +* will need to be handled on the next interrupt. */ scsiq->remain_sg_entry_cnt -= (ASC_MAX_SG_LIST -1 ); }else {
@@ -7723,36 +7565,28 @@ AscSendScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq, uchar n_q_required) sta =0 ; free_q_head = (uchar )AscGetVarFreeQHead (iop_base);if (n_q_required >1 ) { -if ((next_qp =AscAllocMultipleFreeQueue (iop_base, - free_q_head, (uchar) - (n_q_required))) - != (uchar )ASC_QLINK_END ) { + next_qp =AscAllocMultipleFreeQueue (iop_base, free_q_head, + (uchar )n_q_required); +if (next_qp !=ASC_QLINK_END ) { asc_dvc->last_q_shortage =0 ; scsiq->sg_head->queue_cnt = n_q_required -1 ; scsiq->q1.q_no = free_q_head; -if ((sta =AscPutReadySgListQueue (asc_dvc, scsiq, - free_q_head)) ==1 ) { -AscPutVarFreeQHead (iop_base, next_qp); - asc_dvc->cur_total_qng += (uchar)(n_q_required); - asc_dvc->cur_dvc_qng[tid_no]++; - } -return (sta); + sta =AscPutReadySgListQueue (asc_dvc, scsiq, + free_q_head); } }else if (n_q_required ==1 ) { -if ((next_qp =AscAllocFreeQueue (iop_base, - free_q_head)) != -ASC_QLINK_END ) { + next_qp =AscAllocFreeQueue (iop_base, free_q_head); +if (next_qp !=ASC_QLINK_END ) { scsiq->q1.q_no = free_q_head; -if ((sta =AscPutReadyQueue (asc_dvc, scsiq, - free_q_head)) ==1 ) { -AscPutVarFreeQHead (iop_base, next_qp); - asc_dvc->cur_total_qng++; - asc_dvc->cur_dvc_qng[tid_no]++; - } -return (sta); + sta =AscPutReadyQueue (asc_dvc, scsiq, free_q_head); } } -return (sta); +if (sta ==1 ) { +AscPutVarFreeQHead (iop_base, next_qp); + asc_dvc->cur_total_qng += (uchar)(n_q_required); + asc_dvc->cur_dvc_qng[tid_no]++; + } +return sta; }static int AscSgListToQueue (int sg_list)
@@ -8072,7 +7906,7 @@ static ushort AscInitLram(ASC_DVC_VAR *asc_dvc)return (warn_code); } -static ushort AscInitQLinkVar (ASC_DVC_VAR *asc_dvc) +static void AscInitQLinkVar (ASC_DVC_VAR *asc_dvc) {PortAddr iop_base;int i;
@@ -8099,7 +7933,6 @@ static ushort AscInitQLinkVar(ASC_DVC_VAR *asc_dvc)for (i =0 ; i <32 ; i++, lram_addr +=2 ) {AscWriteLramWord (iop_base, lram_addr,0 ); } -return (0 ); }static int AscSetLibErrorCode (ASC_DVC_VAR *asc_dvc,ushort err_code)
@@ -8396,10 +8229,10 @@ static int AscResetChipAndScsiBus(ASC_DVC_VAR *asc_dvc)static ASC_DCNT __devinit AscGetMaxDmaCount (ushort bus_type) {if (bus_type &ASC_IS_ISA ) -return (ASC_MAX_ISA_DMA_COUNT ); +return ASC_MAX_ISA_DMA_COUNT ;else if (bus_type & (ASC_IS_EISA |ASC_IS_VL )) -return (ASC_MAX_VL_DMA_COUNT ); -return (ASC_MAX_PCI_DMA_COUNT ); +return ASC_MAX_VL_DMA_COUNT ; +return ASC_MAX_PCI_DMA_COUNT ; }#ifdef CONFIG_ISA
@@ -9262,26 +9095,22 @@ static void AscAsyncFix(ASC_DVC_VAR *asc_dvc, struct scsi_device *sdev)char type = sdev->type;ASC_SCSI_BIT_ID_TYPE tid_bits =1 << sdev->id; -if (asc_dvc->bug_fix_cntl &ASC_BUG_FIX_ASYN_USE_SYN ) { -if (!(asc_dvc->init_sdtr & tid_bits)) { -if ((type ==TYPE_ROM ) && - (strncmp (sdev->vendor,"HP " ,3 ) ==0 )) { - asc_dvc->pci_fix_asyn_xfer_always |= tid_bits; - } - asc_dvc->pci_fix_asyn_xfer |= tid_bits; -if ((type ==TYPE_PROCESSOR ) || - (type ==TYPE_SCANNER ) || (type ==TYPE_ROM ) || - (type ==TYPE_TAPE )) { - asc_dvc->pci_fix_asyn_xfer &= ~tid_bits; - } +if (!(asc_dvc->bug_fix_cntl &ASC_BUG_FIX_ASYN_USE_SYN )) +return ; +if (asc_dvc->init_sdtr & tid_bits) +return ; + +if ((type ==TYPE_ROM ) && (strncmp (sdev->vendor,"HP " ,3 ) ==0 )) + asc_dvc->pci_fix_asyn_xfer_always |= tid_bits; + + asc_dvc->pci_fix_asyn_xfer |= tid_bits; +if ((type ==TYPE_PROCESSOR ) || (type ==TYPE_SCANNER ) || + (type ==TYPE_ROM ) || (type ==TYPE_TAPE )) + asc_dvc->pci_fix_asyn_xfer &= ~tid_bits; -if (asc_dvc->pci_fix_asyn_xfer & tid_bits) { -AscSetRunChipSynRegAtID (asc_dvc->iop_base, - sdev->id, +if (asc_dvc->pci_fix_asyn_xfer & tid_bits) +AscSetRunChipSynRegAtID (asc_dvc->iop_base, sdev->id,ASYN_SDTR_DATA_FIX_PCI_REV_AB ); - } - } - } }static uchar AscReadLramByte (PortAddr iop_base,ushort addr)
@@ -9443,12 +9272,6 @@ AscMemWordSetLram(PortAddr iop_base, ushort s_addr, ushort set_wval, int words)return ; } -/* -* --- Adv Library Functions -*/ - -/* a_mcode.h */ -/* Microcode buffer is kept after initialization for error recovery. */ static unsigned char _adv_asc3550_buf[] = {0x00 ,0x00 ,0x00 ,0xf2 ,0x00 ,0xf0 ,0x00 ,0x16 ,0x18 ,0xe4 ,0x00 ,0xfc ,
@@ -13773,7 +13596,6 @@ AdvSet38C1600EEPConfig(AdvPortAddr iop_base, ADVEEP_38C1600_CONFIG *cfg_buf)return ; } -/* a_advlib.c */ /* * AdvExeScsiQueue() - Send a request to the RISC microcode program. *
@@ -14198,7 +14020,6 @@ AdvSendIdleCmd(ADV_DVC_VAR *asc_dvc,* Clear the idle command status which is set by the microcode * to a non-zero value to indicate when the command is completed. * The non-zero result is one of the IDLE_CMD_STATUS_* values -* defined in a_advlib.h. */ AdvWriteWordLram (iop_base,ASC_MC_IDLE_CMD_STATUS , (ushort )0 );
@@ -14921,6 +14742,8 @@ static int advansys_release(struct Scsi_Host *shost)return 0 ; } +#define ASC_IOADR_TABLE_MAX_IX 11 +static PortAddr _asc_def_iop_base[ASC_IOADR_TABLE_MAX_IX ]__devinitdata = {0x100 ,0x0110 ,0x120 ,0x0130 ,0x140 ,0x0150 ,0x0190 ,0x0210 ,0x0230 ,0x0250 ,0x0330
Signature · 1 line
1.5.2.4
PATCH 15/22 advansys: Use DRV_NAME
In reply to Matthew WilcoxFollow the example of some other drivers by defining DRV_NAME to be "advansys". Prevents spelling mistakes.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-)
drivers/scsi/advansys.c +12 -11
@@ -1,3 +1,4 @@ +#define DRV_NAME "advansys"#define ASC_VERSION "3.4"/* AdvanSys Driver Version */ /*
@@ -3213,11 +3214,11 @@ advansys_biosparam(struct scsi_device *sdev, struct block_device *bdev, }static struct scsi_host_template advansys_template = { - .proc_name ="advansys" , + .proc_name =DRV_NAME , #ifdef CONFIG_PROC_FS .proc_info = advansys_proc_info, #endif - .name ="advansys" , + .name =DRV_NAME , .info = advansys_info, .queuecommand = advansys_queuecommand, .eh_bus_reset_handler = advansys_reset,
@@ -14634,7 +14635,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type)/* Register DMA channel for ISA bus. */ if (asc_dvc_varp->bus_type &ASC_IS_ISA ) { shost->dma_channel = asc_dvc_varp->cfg->isa_dma_channel; - ret =request_dma (shost->dma_channel,"advansys" ); + ret =request_dma (shost->dma_channel,DRV_NAME );if (ret) {ASC_PRINT3 ("advansys_board_found: board %d: request_dma() %d failed %d\n",
@@ -14650,7 +14651,7 @@ advansys_board_found(int iop, struct device *dev, int bus_type)ASC_DBG1 (2 ,"advansys_board_found: request_irq() %d\n" , shost->irq); ret =request_irq (shost->irq, advansys_interrupt, share_irq, -"advansys" , shost); +DRV_NAME , shost);if (ret) {if (ret == -EBUSY ) {
@@ -14754,7 +14755,7 @@ static int __devinit advansys_isa_probe(struct device *dev, unsigned int id)PortAddr iop_base = _asc_def_iop_base[id];struct Scsi_Host *shost; -if (!request_region (iop_base,ASC_IOADR_GAP ,"advansys" )) { +if (!request_region (iop_base,ASC_IOADR_GAP ,DRV_NAME )) {ASC_DBG1 (1 ,"advansys_isa_match: I/O port 0x%x busy\n" , iop_base);return -ENODEV ;
@@ -14790,7 +14791,7 @@ static struct isa_driver advansys_isa_driver = { .remove = __devexit_p(advansys_isa_remove), .driver = { .owner = THIS_MODULE, - .name = "advansys", + .name = DRV_NAME, }, };
@@ -14799,7 +14800,7 @@ static int __devinit advansys_vlb_probe(struct device *dev, unsigned int id)PortAddr iop_base = _asc_def_iop_base[id];struct Scsi_Host *shost; -if (!request_region (iop_base,ASC_IOADR_GAP ,"advansys" )) { +if (!request_region (iop_base,ASC_IOADR_GAP ,DRV_NAME )) {ASC_DBG1 (1 ,"advansys_vlb_match: I/O port 0x%x busy\n" , iop_base);return -ENODEV ;
@@ -14867,7 +14868,7 @@ static int __devinit advansys_eisa_probe(struct device *dev) err = -ENODEV ;for (i =0 ; i <2 ; i++, ioport +=0x20 ) { -if (!request_region (ioport,ASC_IOADR_GAP ,"advansys" )) { +if (!request_region (ioport,ASC_IOADR_GAP ,DRV_NAME )) {printk (KERN_WARNING "Region %x-%x busy\n" , ioport, ioport +ASC_IOADR_GAP -1 );continue ;
@@ -14925,7 +14926,7 @@ static __devexit int advansys_eisa_remove(struct device *dev)static struct eisa_driver advansys_eisa_driver = { .id_table = advansys_eisa_table, .driver = { - .name ="advansys" , + .name =DRV_NAME , .probe = advansys_eisa_probe, .remove =__devexit_p (advansys_eisa_remove), }
@@ -14972,7 +14973,7 @@ advansys_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =pci_enable_device (pdev);if (err) goto fail; - err =pci_request_regions (pdev,"advansys" ); + err =pci_request_regions (pdev,DRV_NAME );if (err) goto disable_device;pci_set_master (pdev);
@@ -15007,7 +15008,7 @@ static void __devexit advansys_pci_remove(struct pci_dev *pdev) }static struct pci_driver advansys_pci_driver = { - .name ="advansys" , + .name =DRV_NAME , .id_table = advansys_pci_tbl, .probe = advansys_pci_probe, .remove =__devexit_p (advansys_pci_remove),
Signature · 1 line
1.5.2.4
PATCH 16/22 advansys: Eliminate prototypes
In reply to Matthew WilcoxRearrange a lot of the functions in the file to get rid of all the forward declarations.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c |12277 +++++++++++++++++++++++------------------------ 1 files changed, 6047 insertions(+), 6230 deletions(-)
drivers/scsi/advansys.c +6047 -6230
@@ -878,7 +878,6 @@ typedef struct asceep_config {#define ASC_1000_ID0W_FIX 0x00C1#define ASC_1000_ID1B 0x25#define ASC_EISA_REV_IOP_MASK (0x0C83) -#define ASC_EISA_PID_IOP_MASK (0x0C80)#define ASC_EISA_CFG_IOP_MASK (0x0C86)#define ASC_GET_EISA_SLOT (iop) (PortAddr)((iop) & 0xF000)#define INS_HALTINT (ushort)0x6281
@@ -903,10 +902,10 @@ typedef struct asc_mc_saved {#define AscGetRiscVarDoneQTail (port) AscReadLramByte((port), ASCV_DONENEXT_B)#define AscPutRiscVarFreeQHead (port, val) AscWriteLramByte((port), ASCV_NEXTRDY_B, val)#define AscPutRiscVarDoneQTail (port, val) AscWriteLramByte((port), ASCV_DONENEXT_B, val) -#define AscPutMCodeSDTRDoneAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id), (data)); -#define AscGetMCodeSDTRDoneAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id)); -#define AscPutMCodeInitSDTRAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id), data); -#define AscGetMCodeInitSDTRAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id)); +#define AscPutMCodeSDTRDoneAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id), (data)) +#define AscGetMCodeSDTRDoneAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id)) +#define AscPutMCodeInitSDTRAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id), data) +#define AscGetMCodeInitSDTRAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id))#define AscSynIndexToPeriod (index) (uchar)(asc_dvc->sdtr_period_tbl[ (index) ])#define AscGetChipSignatureByte (port) (uchar)inp((port)+IOP_SIG_BYTE)#define AscGetChipSignatureWord (port) (ushort)inpw((port)+IOP_SIG_WORD)
@@ -962,83 +961,6 @@ typedef struct asc_mc_saved {#define AscReadChipDvcID (port) (uchar)inp((port)+IOP_REG_ID)#define AscWriteChipDvcID (port, data) outp((port)+IOP_REG_ID, data) -static int AscWriteEEPCmdReg (PortAddr iop_base,uchar cmd_reg); -static int AscWriteEEPDataReg (PortAddr iop_base,ushort data_reg); -static void AscWaitEEPRead (void ); -static void AscWaitEEPWrite (void ); -static ushort AscReadEEPWord (PortAddr ,uchar ); -static ushort AscWriteEEPWord (PortAddr ,uchar ,ushort ); -static ushort AscGetEEPConfig (PortAddr ,ASCEEP_CONFIG *,ushort ); -static int AscSetEEPConfigOnce (PortAddr ,ASCEEP_CONFIG *,ushort ); -static int AscSetEEPConfig (PortAddr ,ASCEEP_CONFIG *,ushort ); -static int AscStartChip (PortAddr ); -static int AscStopChip (PortAddr ); -static void AscSetChipIH (PortAddr ,ushort ); -static int AscIsChipHalted (PortAddr ); -static void AscAckInterrupt (PortAddr ); -static void AscDisableInterrupt (PortAddr ); -static void AscEnableInterrupt (PortAddr ); -static void AscSetBank (PortAddr ,uchar ); -static int AscResetChipAndScsiBus (ASC_DVC_VAR *); -#ifdef CONFIG_ISA -static uchar AscGetIsaDmaSpeed (PortAddr ); -#endif /* CONFIG_ISA */ -static uchar AscReadLramByte (PortAddr ,ushort ); -static ushort AscReadLramWord (PortAddr ,ushort ); -#if CC_VERY_LONG_SG_LIST -static ASC_DCNT AscReadLramDWord (PortAddr ,ushort ); -#endif /* CC_VERY_LONG_SG_LIST */ -static void AscWriteLramWord (PortAddr ,ushort ,ushort ); -static void AscWriteLramByte (PortAddr ,ushort ,uchar ); -static ASC_DCNT AscMemSumLramWord (PortAddr ,ushort ,int ); -static void AscMemWordSetLram (PortAddr ,ushort ,ushort ,int ); -static void AscMemWordCopyPtrToLram (PortAddr ,ushort ,uchar *,int ); -static void AscMemDWordCopyPtrToLram (PortAddr ,ushort ,uchar *,int ); -static void AscMemWordCopyPtrFromLram (PortAddr ,ushort ,uchar *,int ); -static ushort AscInitAscDvcVar (ASC_DVC_VAR *); -static ushort AscInitFromEEP (ASC_DVC_VAR *); -static ushort AscInitMicroCodeVar (ASC_DVC_VAR *); -static int AscTestExternalLram (ASC_DVC_VAR *); -static uchar AscMsgOutSDTR (ASC_DVC_VAR *,uchar ,uchar ); -static uchar AscCalSDTRData (ASC_DVC_VAR *,uchar ,uchar ); -static void AscSetChipSDTR (PortAddr ,uchar ,uchar ); -static uchar AscGetSynPeriodIndex (ASC_DVC_VAR *,uchar ); -static uchar AscAllocFreeQueue (PortAddr ,uchar ); -static uchar AscAllocMultipleFreeQueue (PortAddr ,uchar ,uchar ); -static int AscHostReqRiscHalt (PortAddr ); -static int AscStopQueueExe (PortAddr ); -static int AscSendScsiQueue (ASC_DVC_VAR *, -ASC_SCSI_Q *scsiq,uchar n_q_required); -static int AscPutReadyQueue (ASC_DVC_VAR *,ASC_SCSI_Q *,uchar ); -static int AscPutReadySgListQueue (ASC_DVC_VAR *,ASC_SCSI_Q *,uchar ); -static int AscSetChipSynRegAtID (PortAddr ,uchar ,uchar ); -static int AscSetRunChipSynRegAtID (PortAddr ,uchar ,uchar ); -static ushort AscInitLram (ASC_DVC_VAR *); -static int AscSetLibErrorCode (ASC_DVC_VAR *,ushort ); -static int AscIsrChipHalted (ASC_DVC_VAR *); -static uchar _AscCopyLramScsiDoneQ (PortAddr ,ushort , -ASC_QDONE_INFO *,ASC_DCNT ); -static int AscIsrQDone (ASC_DVC_VAR *); -#ifdef CONFIG_ISA -static ushort AscGetEisaChipCfg (PortAddr ); -#endif /* CONFIG_ISA */ -static uchar AscGetChipScsiCtrl (PortAddr ); -static uchar AscGetChipVersion (PortAddr ,ushort ); -static ASC_DCNT AscLoadMicroCode (PortAddr ,ushort ,uchar *,ushort ); -static void AscToggleIRQAct (PortAddr ); -static void DvcPutScsiQ (PortAddr ,ushort ,uchar *,int ); -static void DvcGetQinfo (PortAddr ,ushort ,uchar *,int ); -static ushort AscInitAsc1000Driver (ASC_DVC_VAR *); -static void AscAsyncFix (ASC_DVC_VAR *,struct scsi_device *); -static int AscExeScsiQueue (ASC_DVC_VAR *,ASC_SCSI_Q *); -static int AscISR (ASC_DVC_VAR *); -static uint AscGetNumOfFreeQueue (ASC_DVC_VAR *,uchar ,uchar ); -static int AscSgListToQueue (int ); -#ifdef CONFIG_ISA -static void AscEnableIsaDma (uchar ); -#endif /* CONFIG_ISA */ -static const char *advansys_info (struct Scsi_Host *shost); -#define ADV_LIB_VERSION_MAJOR 5#define ADV_LIB_VERSION_MINOR 14
@@ -2109,36 +2031,6 @@ typedef struct adv_scsi_req_q {#define ADV_HOST_SCSI_BUS_RESET 0x80/* Host Initiated SCSI Bus Reset. */ -static ADV_PADDR DvcGetPhyAddr (ADV_DVC_VAR *,ADV_SCSI_REQ_Q *, -uchar *,ASC_SDCNT *,int ); - -/* -* Adv Library functions available to drivers. -*/ -static int AdvExeScsiQueue (ADV_DVC_VAR *,ADV_SCSI_REQ_Q *); -static int AdvISR (ADV_DVC_VAR *); -static int AdvInitAsc3550Driver (ADV_DVC_VAR *); -static int AdvInitAsc38C0800Driver (ADV_DVC_VAR *); -static int AdvInitAsc38C1600Driver (ADV_DVC_VAR *); -static int AdvResetChipAndSB (ADV_DVC_VAR *); -static int AdvResetSB (ADV_DVC_VAR *asc_dvc); - -/* -* Internal Adv Library functions. -*/ -static int AdvSendIdleCmd (ADV_DVC_VAR *,ushort ,ADV_DCNT ); -static int AdvInitFrom3550EEP (ADV_DVC_VAR *); -static int AdvInitFrom38C0800EEP (ADV_DVC_VAR *); -static int AdvInitFrom38C1600EEP (ADV_DVC_VAR *); -static ushort AdvGet3550EEPConfig (AdvPortAddr ,ADVEEP_3550_CONFIG *); -static void AdvSet3550EEPConfig (AdvPortAddr ,ADVEEP_3550_CONFIG *); -static ushort AdvGet38C0800EEPConfig (AdvPortAddr ,ADVEEP_38C0800_CONFIG *); -static void AdvSet38C0800EEPConfig (AdvPortAddr ,ADVEEP_38C0800_CONFIG *); -static ushort AdvGet38C1600EEPConfig (AdvPortAddr ,ADVEEP_38C1600_CONFIG *); -static void AdvSet38C1600EEPConfig (AdvPortAddr ,ADVEEP_38C1600_CONFIG *); -static void AdvWaitEEPCmd (AdvPortAddr ); -static ushort AdvReadEEPWord (AdvPortAddr ,int ); -/* Read byte from a register. */ #define AdvReadByteRegister (iop_base, reg_off) \ (ADV_MEM_READB((iop_base) + (reg_off)))
@@ -2676,1717 +2568,489 @@ static ASC_SG_HEAD asc_sg_head = { 0 };#ifdef ADVANSYS_DEBUG static int asc_dbglvl =3 ; -#endif /* ADVANSYS_DEBUG */ - -static int advansys_slave_configure (struct scsi_device *); -static int asc_execute_scsi_cmnd (struct scsi_cmnd *); -static int asc_build_req (asc_board_t *,struct scsi_cmnd *); -static int adv_build_req (asc_board_t *,struct scsi_cmnd *,ADV_SCSI_REQ_Q **); -static int adv_get_sglist (asc_board_t *,adv_req_t *,struct scsi_cmnd *,int ); -#ifdef CONFIG_PROC_FS -static int asc_proc_copy (off_t ,off_t ,char *,int ,char *,int ); -static int asc_prt_board_devices (struct Scsi_Host *,char *,int ); -static int asc_prt_adv_bios (struct Scsi_Host *,char *,int ); -static int asc_get_eeprom_string (ushort *serialnum,uchar *cp); -static int asc_prt_asc_board_eeprom (struct Scsi_Host *,char *,int ); -static int asc_prt_adv_board_eeprom (struct Scsi_Host *,char *,int ); -static int asc_prt_driver_conf (struct Scsi_Host *,char *,int ); -static int asc_prt_asc_board_info (struct Scsi_Host *,char *,int ); -static int asc_prt_adv_board_info (struct Scsi_Host *,char *,int ); -static int asc_prt_line (char *,int ,char *fmt, ...); -#endif /* CONFIG_PROC_FS */ - -/* Statistics function prototypes. */ -#ifdef ADVANSYS_STATS -#ifdef CONFIG_PROC_FS -static int asc_prt_board_stats (struct Scsi_Host *,char *,int ); -#endif /* CONFIG_PROC_FS */ -#endif /* ADVANSYS_STATS */ - -/* Debug function prototypes. */ -#ifdef ADVANSYS_DEBUG -static void asc_prt_scsi_host (struct Scsi_Host *); -static void asc_prt_scsi_cmnd (struct scsi_cmnd *); -static void asc_prt_asc_dvc_cfg (ASC_DVC_CFG *); -static void asc_prt_asc_dvc_var (ASC_DVC_VAR *); -static void asc_prt_asc_scsi_q (ASC_SCSI_Q *); -static void asc_prt_asc_qdone_info (ASC_QDONE_INFO *); -static void asc_prt_adv_dvc_cfg (ADV_DVC_CFG *); -static void asc_prt_adv_dvc_var (ADV_DVC_VAR *); -static void asc_prt_adv_scsi_req_q (ADV_SCSI_REQ_Q *); -static void asc_prt_adv_sgblock (int ,ADV_SG_BLOCK *); -static void asc_prt_hex (char *f,uchar *,int ); -#endif /* ADVANSYS_DEBUG */ -#ifdef CONFIG_PROC_FS /* -* advansys_proc_info() - /proc/scsi/advansys/{0,1,2,3,...} -* -* *buffer: I/O buffer -* **start: if inout == FALSE pointer into buffer where user read should start -* offset: current offset into a /proc/scsi/advansys/[0...] file -* length: length of buffer -* hostno: Scsi_Host host_no -* inout: TRUE - user is writing; FALSE - user is reading -* -* Return the number of bytes read from or written to a -* /proc/scsi/advansys/[0...] file. -* -* Note: This function uses the per board buffer 'prtbuf' which is -* allocated when the board is initialized in advansys_detect(). The -* buffer is ASC_PRTBUF_SIZE bytes. The function asc_proc_copy() is -* used to write to the buffer. The way asc_proc_copy() is written -* if 'prtbuf' is too small it will not be overwritten. Instead the -* user just won't get all the available statistics. +* asc_prt_scsi_host() */ -static int -advansys_proc_info (struct Scsi_Host *shost,char *buffer,char **start, -off_t offset,int length,int inout) +static void asc_prt_scsi_host (struct Scsi_Host *s) {asc_board_t *boardp; -char *cp; -int cplen; -int cnt; -int totcnt; -int leftlen; -char *curbuf; -off_t advoffset; - -ASC_DBG (1 ,"advansys_proc_info: begin\n" ); - -/* -* User write not supported. -*/ -if (inout == TRUE) { -return (-ENOSYS ); - } - -/* -* User read of /proc/scsi/advansys/[0...] file. -*/ - boardp =ASC_BOARDP (shost); - -/* Copy read data starting at the beginning of the buffer. */ - *start = buffer; - curbuf = buffer; - advoffset =0 ; - totcnt =0 ; - leftlen = length; - -/* -* Get board configuration information. -* -* advansys_info() returns the board string from its own static buffer. -*/ - cp = (char *)advansys_info (shost); -strcat (cp,"\n" ); - cplen =strlen (cp); -/* Copy board information. */ - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; - -/* -* Display Wide Board BIOS Information. -*/ -if (ASC_WIDE_BOARD (boardp)) { - cp = boardp->prtbuf; - cplen =asc_prt_adv_bios (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, - cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; - } + boardp =ASC_BOARDP (s); -/* -* Display driver information for each device attached to the board. -*/ - cp = boardp->prtbuf; - cplen =asc_prt_board_devices (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; +printk ("Scsi_Host at addr 0x%lx\n" , (ulong )s); +printk (" host_busy %u, host_no %d, last_reset %d,\n" , + s->host_busy, s->host_no, (unsigned )s->last_reset); -/* -* Display EEPROM configuration for the board. -*/ - cp = boardp->prtbuf; -if (ASC_NARROW_BOARD (boardp)) { - cplen =asc_prt_asc_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); - }else { - cplen =asc_prt_adv_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); - } -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; +printk (" base 0x%lx, io_port 0x%lx, irq 0x%x,\n" , + (ulong )s->base, (ulong )s->io_port, s->irq); -/* -* Display driver configuration and information for the board. -*/ - cp = boardp->prtbuf; - cplen =asc_prt_driver_conf (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; +printk (" dma_channel %d, this_id %d, can_queue %d,\n" , + s->dma_channel, s->this_id, s->can_queue); -#ifdef ADVANSYS_STATS -/* -* Display driver statistics for the board. -*/ - cp = boardp->prtbuf; - cplen =asc_prt_board_stats (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; -#endif /* ADVANSYS_STATS */ +printk (" cmd_per_lun %d, sg_tablesize %d, unchecked_isa_dma %d\n" , + s->cmd_per_lun, s->sg_tablesize, s->unchecked_isa_dma); -/* -* Display Asc Library dynamic configuration information -* for the board. -*/ - cp = boardp->prtbuf;if (ASC_NARROW_BOARD (boardp)) { - cplen =asc_prt_asc_board_info (shost, cp,ASC_PRTBUF_SIZE ); +asc_prt_asc_dvc_var (&ASC_BOARDP (s)->dvc_var.asc_dvc_var); +asc_prt_asc_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.asc_dvc_cfg); }else { - cplen =asc_prt_adv_board_info (shost, cp,ASC_PRTBUF_SIZE ); - } -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; +asc_prt_adv_dvc_var (&ASC_BOARDP (s)->dvc_var.adv_dvc_var); +asc_prt_adv_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.adv_dvc_cfg); } - advoffset += cplen; - curbuf += cnt; - -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); - -return totcnt; } -#endif /* CONFIG_PROC_FS */ /* -* advansys_info() -* -* Return suitable for printing on the console with the argument -* adapter's configuration information. -* -* Note: The information line should not exceed ASC_INFO_SIZE bytes, -* otherwise the static 'info' array will be overrun. +* asc_prt_scsi_cmnd() */ -static const char *advansys_info (struct Scsi_Host *shost) -{ -static char info[ASC_INFO_SIZE ]; -asc_board_t *boardp; -ASC_DVC_VAR *asc_dvc_varp; -ADV_DVC_VAR *adv_dvc_varp; -char *busname; -char *widename =NULL ; - - boardp =ASC_BOARDP (shost); -if (ASC_NARROW_BOARD (boardp)) { - asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; -ASC_DBG (1 ,"advansys_info: begin\n" ); -if (asc_dvc_varp->bus_type &ASC_IS_ISA ) { -if ((asc_dvc_varp->bus_type &ASC_IS_ISAPNP ) == -ASC_IS_ISAPNP ) { - busname ="ISA PnP" ; - }else { - busname ="ISA" ; - } -sprintf (info, -"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X, DMA 0x%X" , -ASC_VERSION , busname, - (ulong )shost->io_port, - (ulong )shost->io_port +ASC_IOADR_GAP -1 , - shost->irq, shost->dma_channel); - }else { -if (asc_dvc_varp->bus_type &ASC_IS_VL ) { - busname ="VL" ; - }else if (asc_dvc_varp->bus_type &ASC_IS_EISA ) { - busname ="EISA" ; - }else if (asc_dvc_varp->bus_type &ASC_IS_PCI ) { -if ((asc_dvc_varp->bus_type &ASC_IS_PCI_ULTRA ) - ==ASC_IS_PCI_ULTRA ) { - busname ="PCI Ultra" ; - }else { - busname ="PCI" ; - } - }else { - busname ="?" ; -ASC_PRINT2 ("advansys_info: board %d: unknown " -"bus type %d\n" , boardp->id, - asc_dvc_varp->bus_type); - } -sprintf (info, -"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X" , -ASC_VERSION , busname, (ulong )shost->io_port, - (ulong )shost->io_port +ASC_IOADR_GAP -1 , - shost->irq); - } - }else { -/* -* Wide Adapter Information -* -* Memory-mapped I/O is used instead of I/O space to access -* the adapter, but display the I/O Port range. The Memory -* I/O address is displayed through the driver /proc file. -*/ - adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; -if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC3550 ) { - widename ="Ultra-Wide" ; - }else if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC38C0800 ) { - widename ="Ultra2-Wide" ; - }else { - widename ="Ultra3-Wide" ; - } -sprintf (info, -"AdvanSys SCSI %s: PCI %s: PCIMEM 0x%lX-0x%lX, IRQ 0x%X" , -ASC_VERSION , widename, (ulong )adv_dvc_varp->iop_base, - (ulong )adv_dvc_varp->iop_base + boardp->asc_n_io_port -1 , shost->irq); - } -BUG_ON (strlen (info) >=ASC_INFO_SIZE ); -ASC_DBG (1 ,"advansys_info: end\n" ); -return info; -} - -static void asc_scsi_done (struct scsi_cmnd *scp) +static void asc_prt_scsi_cmnd (struct scsi_cmnd *s) { -struct asc_board *boardp =ASC_BOARDP (scp->device->host); +printk ("struct scsi_cmnd at addr 0x%lx\n" , (ulong )s); -if (scp->use_sg) -dma_unmap_sg (boardp->dev, - (struct scatterlist *)scp->request_buffer, - scp->use_sg, scp->sc_data_direction); -else if (scp->request_bufflen) -dma_unmap_single (boardp->dev, scp->SCp.dma_handle, - scp->request_bufflen, scp->sc_data_direction); +printk (" host 0x%lx, device 0x%lx, target %u, lun %u, channel %u,\n" , + (ulong )s->device->host, (ulong )s->device, s->device->id, + s->device->lun, s->device->channel); -ASC_STATS (scp->device->host, done); +asc_prt_hex (" CDB" , s->cmnd, s->cmd_len); - scp->scsi_done (scp); -} +printk ("sc_data_direction %u, resid %d\n" , + s->sc_data_direction, s->resid); -/* -* advansys_queuecommand() - interrupt-driven I/O entrypoint. -* -* This function always returns 0. Command return status is saved -* in the 'scp' result field. -*/ -static int -advansys_queuecommand (struct scsi_cmnd *scp,void (*done)(struct scsi_cmnd *)) -{ -struct Scsi_Host *shost = scp->device->host; -asc_board_t *boardp =ASC_BOARDP (shost); -unsigned long flags; -int asc_res, result =0 ; +printk (" use_sg %u, sglist_len %u\n" , s->use_sg, s->sglist_len); -ASC_STATS (shost, queuecommand); - scp->scsi_done = done; +printk (" serial_number 0x%x, retries %d, allowed %d\n" , + (unsigned )s->serial_number, s->retries, s->allowed); -/* -* host_lock taken by mid-level prior to call, but need -* to protect against own ISR -*/ -spin_lock_irqsave (&boardp->lock, flags); - asc_res =asc_execute_scsi_cmnd (scp); -spin_unlock_irqrestore (&boardp->lock, flags); +printk (" timeout_per_command %d\n" , s->timeout_per_command); -switch (asc_res) { -case ASC_NOERROR : -break ; -case ASC_BUSY : - result =SCSI_MLQUEUE_HOST_BUSY ; -break ; -case ASC_ERROR : -default : -asc_scsi_done (scp); -break ; - } +printk (" scsi_done 0x%p, done 0x%p, host_scribble 0x%p, result 0x%x\n" , + s->scsi_done, s->done, s->host_scribble, s->result); -return result; +printk (" tag %u, pid %u\n" , (unsigned )s->tag, (unsigned )s->pid); }/* -* advansys_reset() -* -* Reset the bus associated with the command 'scp'. -* -* This function runs its own thread. Interrupts must be blocked but -* sleeping is allowed and no locking other than for host structures is -* required. Returns SUCCESS or FAILED. +* asc_prt_asc_dvc_var() */ -static int advansys_reset (struct scsi_cmnd *scp) +static void asc_prt_asc_dvc_var (ASC_DVC_VAR *h) { -struct Scsi_Host *shost; -asc_board_t *boardp; -ASC_DVC_VAR *asc_dvc_varp; -ADV_DVC_VAR *adv_dvc_varp; -ulong flags; -int status; -int ret =SUCCESS ; - -ASC_DBG1 (1 ,"advansys_reset: 0x%lx\n" , (ulong )scp); - -#ifdef ADVANSYS_STATS -if (scp->device->host !=NULL ) { -ASC_STATS (scp->device->host, reset); - } -#endif /* ADVANSYS_STATS */ - -if ((shost = scp->device->host) ==NULL ) { - scp->result =HOST_BYTE (DID_ERROR ); -return FAILED ; - } - - boardp =ASC_BOARDP (shost); - -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset started...\n" , - boardp->id); -/* -* Check for re-entrancy. -*/ -spin_lock_irqsave (&boardp->lock, flags); -if (boardp->flags &ASC_HOST_IN_RESET ) { -spin_unlock_irqrestore (&boardp->lock, flags); -return FAILED ; - } - boardp->flags |=ASC_HOST_IN_RESET ; -spin_unlock_irqrestore (&boardp->lock, flags); - -if (ASC_NARROW_BOARD (boardp)) { -/* -* Narrow Board -*/ - asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; - -/* -* Reset the chip and SCSI bus. -*/ -ASC_DBG (1 ,"advansys_reset: before AscInitAsc1000Driver()\n" ); - status =AscInitAsc1000Driver (asc_dvc_varp); - -/* Refer to ASC_IERR_* defintions for meaning of 'err_code'. */ -if (asc_dvc_varp->err_code) { -ASC_PRINT2 ("advansys_reset: board %d: SCSI bus reset " -"error: 0x%x\n" , boardp->id, - asc_dvc_varp->err_code); - ret =FAILED ; - }else if (status) { -ASC_PRINT2 ("advansys_reset: board %d: SCSI bus reset " -"warning: 0x%x\n" , boardp->id, status); - }else { -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset " -"successful.\n" , boardp->id); - } - -ASC_DBG (1 ,"advansys_reset: after AscInitAsc1000Driver()\n" ); -spin_lock_irqsave (&boardp->lock, flags); - - }else { -/* -* Wide Board -* -* If the suggest reset bus flags are set, then reset the bus. -* Otherwise only reset the device. -*/ - adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; +printk ("ASC_DVC_VAR at addr 0x%lx\n" , (ulong )h); -/* -* Reset the target's SCSI bus. -*/ -ASC_DBG (1 ,"advansys_reset: before AdvResetChipAndSB()\n" ); -switch (AdvResetChipAndSB (adv_dvc_varp)) { -case ASC_TRUE : -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset " -"successful.\n" , boardp->id); -break ; -case ASC_FALSE : -default : -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset " -"error.\n" , boardp->id); - ret =FAILED ; -break ; - } -spin_lock_irqsave (&boardp->lock, flags); - (void )AdvISR (adv_dvc_varp); - } -/* Board lock is held. */ +printk (" iop_base 0x%x, err_code 0x%x, dvc_cntl 0x%x, bug_fix_cntl " +"%d,\n" , h->iop_base, h->err_code, h->dvc_cntl, h->bug_fix_cntl); -/* Save the time of the most recently completed reset. */ - boardp->last_reset = jiffies; +printk (" bus_type %d, init_sdtr 0x%x,\n" , h->bus_type, + (unsigned )h->init_sdtr); -/* Clear reset flag. */ - boardp->flags &= ~ASC_HOST_IN_RESET ; -spin_unlock_irqrestore (&boardp->lock, flags); +printk (" sdtr_done 0x%x, use_tagged_qng 0x%x, unit_not_ready 0x%x, " +"chip_no 0x%x,\n" , (unsigned )h->sdtr_done, + (unsigned )h->use_tagged_qng, (unsigned )h->unit_not_ready, + (unsigned )h->chip_no); -ASC_DBG1 (1 ,"advansys_reset: ret %d\n" , ret); +printk (" queue_full_or_busy 0x%x, start_motor 0x%x, scsi_reset_wait " +"%u,\n" , (unsigned )h->queue_full_or_busy, + (unsigned )h->start_motor, (unsigned )h->scsi_reset_wait); -return ret; -} +printk (" is_in_int %u, max_total_qng %u, cur_total_qng %u, " +"in_critical_cnt %u,\n" , (unsigned )h->is_in_int, + (unsigned )h->max_total_qng, (unsigned )h->cur_total_qng, + (unsigned )h->in_critical_cnt); -/* -* advansys_biosparam() -* -* Translate disk drive geometry if the "BIOS greater than 1 GB" -* support is enabled for a drive. -* -* ip (information pointer) is an int array with the following definition: -* ip[0]: heads -* ip[1]: sectors -* ip[2]: cylinders -*/ -static int -advansys_biosparam (struct scsi_device *sdev,struct block_device *bdev, -sector_t capacity,int ip[]) -{ -asc_board_t *boardp; +printk (" last_q_shortage %u, init_state 0x%x, no_scam 0x%x, " +"pci_fix_asyn_xfer 0x%x,\n" , (unsigned )h->last_q_shortage, + (unsigned )h->init_state, (unsigned )h->no_scam, + (unsigned )h->pci_fix_asyn_xfer); -ASC_DBG (1 ,"advansys_biosparam: begin\n" ); -ASC_STATS (sdev->host, biosparam); - boardp =ASC_BOARDP (sdev->host); -if (ASC_NARROW_BOARD (boardp)) { -if ((boardp->dvc_var.asc_dvc_var.dvc_cntl & -ASC_CNTL_BIOS_GT_1GB ) && capacity >0x200000 ) { - ip[0 ] =255 ; - ip[1 ] =63 ; - }else { - ip[0 ] =64 ; - ip[1 ] =32 ; - } - }else { -if ((boardp->dvc_var.adv_dvc_var.bios_ctrl & -BIOS_CTRL_EXTENDED_XLAT ) && capacity >0x200000 ) { - ip[0 ] =255 ; - ip[1 ] =63 ; - }else { - ip[0 ] =64 ; - ip[1 ] =32 ; - } - } - ip[2 ] = (unsigned long )capacity / (ip[0 ] * ip[1 ]); -ASC_DBG (1 ,"advansys_biosparam: end\n" ); -return 0 ; +printk (" cfg 0x%lx, irq_no 0x%x\n" , (ulong )h->cfg, (unsigned )h->irq_no); } -static struct scsi_host_template advansys_template = { - .proc_name =DRV_NAME , -#ifdef CONFIG_PROC_FS - .proc_info = advansys_proc_info, -#endif - .name =DRV_NAME , - .info = advansys_info, - .queuecommand = advansys_queuecommand, - .eh_bus_reset_handler = advansys_reset, - .bios_param = advansys_biosparam, - .slave_configure = advansys_slave_configure, -/* -* Because the driver may control an ISA adapter 'unchecked_isa_dma' -* must be set. The flag will be cleared in advansys_board_found -* for non-ISA adapters. -*/ - .unchecked_isa_dma =1 , -/* -* All adapters controlled by this driver are capable of large -* scatter-gather lists. According to the mid-level SCSI documentation -* this obviates any performance gain provided by setting -* 'use_clustering'. But empirically while CPU utilization is increased -* by enabling clustering, I/O throughput increases as well. -*/ - .use_clustering =ENABLE_CLUSTERING , -}; -/* -* First-level interrupt handler. -* -* 'dev_id' is a pointer to the interrupting adapter's Scsi_Host. +* asc_prt_asc_dvc_cfg() */ -static irqreturn_t advansys_interrupt (int irq,void *dev_id) -{ -unsigned long flags; -struct Scsi_Host *shost = dev_id; -asc_board_t *boardp =ASC_BOARDP (shost); -irqreturn_t result =IRQ_NONE ; - -ASC_DBG1 (2 ,"advansys_interrupt: boardp 0x%p\n" , boardp); -spin_lock_irqsave (&boardp->lock, flags); -if (ASC_NARROW_BOARD (boardp)) { -if (AscIsIntPending (shost->io_port)) { - result =IRQ_HANDLED ; -ASC_STATS (shost, interrupt); -ASC_DBG (1 ,"advansys_interrupt: before AscISR()\n" ); -AscISR (&boardp->dvc_var.asc_dvc_var); - } - }else { -ASC_DBG (1 ,"advansys_interrupt: before AdvISR()\n" ); -if (AdvISR (&boardp->dvc_var.adv_dvc_var)) { - result =IRQ_HANDLED ; -ASC_STATS (shost, interrupt); - } - } -spin_unlock_irqrestore (&boardp->lock, flags); - -ASC_DBG (1 ,"advansys_interrupt: end\n" ); -return result; -} - -static void -advansys_narrow_slave_configure (struct scsi_device *sdev,ASC_DVC_VAR *asc_dvc) +static void asc_prt_asc_dvc_cfg (ASC_DVC_CFG *h) { -ASC_SCSI_BIT_ID_TYPE tid_bit =1 << sdev->id; -ASC_SCSI_BIT_ID_TYPE orig_use_tagged_qng = asc_dvc->use_tagged_qng; - -if (sdev->lun ==0 ) { -ASC_SCSI_BIT_ID_TYPE orig_init_sdtr = asc_dvc->init_sdtr; -if ((asc_dvc->cfg->sdtr_enable & tid_bit) && sdev->sdtr) { - asc_dvc->init_sdtr |= tid_bit; - }else { - asc_dvc->init_sdtr &= ~tid_bit; - } - -if (orig_init_sdtr != asc_dvc->init_sdtr) -AscAsyncFix (asc_dvc, sdev); - } - -if (sdev->tagged_supported) { -if (asc_dvc->cfg->cmd_qng_enabled & tid_bit) { -if (sdev->lun ==0 ) { - asc_dvc->cfg->can_tagged_qng |= tid_bit; - asc_dvc->use_tagged_qng |= tid_bit; - } -scsi_adjust_queue_depth (sdev,MSG_ORDERED_TAG , - asc_dvc->max_dvc_qng[sdev->id]); - } - }else { -if (sdev->lun ==0 ) { - asc_dvc->cfg->can_tagged_qng &= ~tid_bit; - asc_dvc->use_tagged_qng &= ~tid_bit; - } -scsi_adjust_queue_depth (sdev,0 , sdev->host->cmd_per_lun); - } - -if ((sdev->lun ==0 ) && - (orig_use_tagged_qng != asc_dvc->use_tagged_qng)) { -AscWriteLramByte (asc_dvc->iop_base,ASCV_DISC_ENABLE_B , - asc_dvc->cfg->disc_enable); -AscWriteLramByte (asc_dvc->iop_base,ASCV_USE_TAGGED_QNG_B , - asc_dvc->use_tagged_qng); -AscWriteLramByte (asc_dvc->iop_base,ASCV_CAN_TAGGED_QNG_B , - asc_dvc->cfg->can_tagged_qng); +printk ("ASC_DVC_CFG at addr 0x%lx\n" , (ulong )h); - asc_dvc->max_dvc_qng[sdev->id] = - asc_dvc->cfg->max_tag_qng[sdev->id]; -AscWriteLramByte (asc_dvc->iop_base, - (ushort)(ASCV_MAX_DVC_QNG_BEG + sdev->id), - asc_dvc->max_dvc_qng[sdev->id]); - } -} +printk (" can_tagged_qng 0x%x, cmd_qng_enabled 0x%x,\n" , + h->can_tagged_qng, h->cmd_qng_enabled); +printk (" disc_enable 0x%x, sdtr_enable 0x%x,\n" , + h->disc_enable, h->sdtr_enable); -/* -* Wide Transfers -* -* If the EEPROM enabled WDTR for the device and the device supports wide -* bus (16 bit) transfers, then turn on the device's 'wdtr_able' bit and -* write the new value to the microcode. -*/ -static void -advansys_wide_enable_wdtr (AdvPortAddr iop_base,unsigned short tidmask) -{ -unsigned short cfg_word; -AdvReadWordLram (iop_base,ASC_MC_WDTR_ABLE , cfg_word); -if ((cfg_word & tidmask) !=0 ) -return ; +printk + (" chip_scsi_id %d, isa_dma_speed %d, isa_dma_channel %d, chip_version %d,\n" , + h->chip_scsi_id, h->isa_dma_speed, h->isa_dma_channel, + h->chip_version); - cfg_word |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_WDTR_ABLE , cfg_word); +printk + (" pci_device_id %d, lib_serial_no %u, lib_version %u, mcode_date 0x%x,\n" , +to_pci_dev (h->dev)->device, h->lib_serial_no, h->lib_version, + h->mcode_date); -/* -* Clear the microcode SDTR and WDTR negotiation done indicators for -* the target to cause it to negotiate with the new setting set above. -* WDTR when accepted causes the target to enter asynchronous mode, so -* SDTR must be negotiated. -*/ -AdvReadWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); - cfg_word &= ~tidmask; -AdvWriteWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); -AdvReadWordLram (iop_base,ASC_MC_WDTR_DONE , cfg_word); - cfg_word &= ~tidmask; -AdvWriteWordLram (iop_base,ASC_MC_WDTR_DONE , cfg_word); +printk (" mcode_version %d, overrun_buf 0x%lx\n" , + h->mcode_version, (ulong )h->overrun_buf); }/* -* Synchronous Transfers -* -* If the EEPROM enabled SDTR for the device and the device -* supports synchronous transfers, then turn on the device's -* 'sdtr_able' bit. Write the new value to the microcode. +* asc_prt_asc_scsi_q() */ -static void -advansys_wide_enable_sdtr (AdvPortAddr iop_base,unsigned short tidmask) +static void asc_prt_asc_scsi_q (ASC_SCSI_Q *q) { -unsigned short cfg_word; -AdvReadWordLram (iop_base,ASC_MC_SDTR_ABLE , cfg_word); -if ((cfg_word & tidmask) !=0 ) -return ; - - cfg_word |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_SDTR_ABLE , cfg_word); - -/* -* Clear the microcode "SDTR negotiation" done indicator for the -* target to cause it to negotiate with the new setting set above. -*/ -AdvReadWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); - cfg_word &= ~tidmask; -AdvWriteWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); -} +ASC_SG_HEAD *sgp; +int i; -/* -* PPR (Parallel Protocol Request) Capable -* -* If the device supports DT mode, then it must be PPR capable. -* The PPR message will be used in place of the SDTR and WDTR -* messages to negotiate synchronous speed and offset, transfer -* width, and protocol options. -*/ -static void advansys_wide_enable_ppr (ADV_DVC_VAR *adv_dvc, -AdvPortAddr iop_base,unsigned short tidmask) -{ -AdvReadWordLram (iop_base,ASC_MC_PPR_ABLE , adv_dvc->ppr_able); - adv_dvc->ppr_able |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_PPR_ABLE , adv_dvc->ppr_able); -} +printk ("ASC_SCSI_Q at addr 0x%lx\n" , (ulong )q); -static void -advansys_wide_slave_configure (struct scsi_device *sdev,ADV_DVC_VAR *adv_dvc) -{ -AdvPortAddr iop_base = adv_dvc->iop_base; -unsigned short tidmask =1 << sdev->id; +printk + (" target_ix 0x%x, target_lun %u, srb_ptr 0x%lx, tag_code 0x%x,\n" , + q->q2.target_ix, q->q1.target_lun, (ulong )q->q2.srb_ptr, + q->q2.tag_code); -if (sdev->lun ==0 ) { -/* -* Handle WDTR, SDTR, and Tag Queuing. If the feature -* is enabled in the EEPROM and the device supports the -* feature, then enable it in the microcode. -*/ +printk + (" data_addr 0x%lx, data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , + (ulong )le32_to_cpu (q->q1.data_addr), + (ulong )le32_to_cpu (q->q1.data_cnt), + (ulong )le32_to_cpu (q->q1.sense_addr), q->q1.sense_len); -if ((adv_dvc->wdtr_able & tidmask) && sdev->wdtr) -advansys_wide_enable_wdtr (iop_base, tidmask); -if ((adv_dvc->sdtr_able & tidmask) && sdev->sdtr) -advansys_wide_enable_sdtr (iop_base, tidmask); -if (adv_dvc->chip_type ==ADV_CHIP_ASC38C1600 && sdev->ppr) -advansys_wide_enable_ppr (adv_dvc, iop_base, tidmask); +printk (" cdbptr 0x%lx, cdb_len %u, sg_head 0x%lx, sg_queue_cnt %u\n" , + (ulong )q->cdbptr, q->q2.cdb_len, + (ulong )q->sg_head, q->q1.sg_queue_cnt); -/* -* Tag Queuing is disabled for the BIOS which runs in polled -* mode and would see no benefit from Tag Queuing. Also by -* disabling Tag Queuing in the BIOS devices with Tag Queuing -* bugs will at least work with the BIOS. -*/ -if ((adv_dvc->tagqng_able & tidmask) && - sdev->tagged_supported) { -unsigned short cfg_word; -AdvReadWordLram (iop_base,ASC_MC_TAGQNG_ABLE , cfg_word); - cfg_word |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_TAGQNG_ABLE , - cfg_word); -AdvWriteByteLram (iop_base, -ASC_MC_NUMBER_OF_MAX_CMD + sdev->id, - adv_dvc->max_dvc_qng); +if (q->sg_head) { + sgp = q->sg_head; +printk ("ASC_SG_HEAD at addr 0x%lx\n" , (ulong )sgp); +printk (" entry_cnt %u, queue_cnt %u\n" , sgp->entry_cnt, + sgp->queue_cnt); +for (i =0 ; i < sgp->entry_cnt; i++) { +printk (" [%u]: addr 0x%lx, bytes %lu\n" , + i, (ulong )le32_to_cpu (sgp->sg_list[i].addr), + (ulong )le32_to_cpu (sgp->sg_list[i].bytes)); } - } -if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported) { -scsi_adjust_queue_depth (sdev,MSG_ORDERED_TAG , - adv_dvc->max_dvc_qng); - }else { -scsi_adjust_queue_depth (sdev,0 , sdev->host->cmd_per_lun); } }/* -* Set the number of commands to queue per device for the -* specified host adapter. +* asc_prt_asc_qdone_info() */ -static int advansys_slave_configure (struct scsi_device *sdev) +static void asc_prt_asc_qdone_info (ASC_QDONE_INFO *q) { -asc_board_t *boardp =ASC_BOARDP (sdev->host); - boardp->flags |=ASC_SELECT_QUEUE_DEPTHS ; - -/* -* Save a pointer to the sdev and set its initial/maximum -* queue depth. Only save the pointer for a lun0 dev though. -*/ -if (sdev->lun ==0 ) - boardp->device[sdev->id] = sdev; - -if (ASC_NARROW_BOARD (boardp)) -advansys_narrow_slave_configure (sdev, - &boardp->dvc_var.asc_dvc_var); -else -advansys_wide_slave_configure (sdev, - &boardp->dvc_var.adv_dvc_var); - -return 0 ; +printk ("ASC_QDONE_INFO at addr 0x%lx\n" , (ulong )q); +printk (" srb_ptr 0x%lx, target_ix %u, cdb_len %u, tag_code %u,\n" , + (ulong )q->d2.srb_ptr, q->d2.target_ix, q->d2.cdb_len, + q->d2.tag_code); +printk + (" done_stat 0x%x, host_stat 0x%x, scsi_stat 0x%x, scsi_msg 0x%x\n" , + q->d3.done_stat, q->d3.host_stat, q->d3.scsi_stat, q->d3.scsi_msg); }/* -* Execute a single 'Scsi_Cmnd'. -* -* The function 'done' is called when the request has been completed. -* -* Scsi_Cmnd: -* -* host - board controlling device -* device - device to send command -* target - target of device -* lun - lun of device -* cmd_len - length of SCSI CDB -* cmnd - buffer for SCSI 8, 10, or 12 byte CDB -* use_sg - if non-zero indicates scatter-gather request with use_sg elements -* -* if (use_sg == 0) { -* request_buffer - buffer address for request -* request_bufflen - length of request buffer -* } else { -* request_buffer - pointer to scatterlist structure -* } -* -* sense_buffer - sense command buffer -* -* result (4 bytes of an int): -* Byte Meaning -* 0 SCSI Status Byte Code -* 1 SCSI One Byte Message Code -* 2 Host Error Code -* 3 Mid-Level Error Code -* -* host driver fields: -* SCp - Scsi_Pointer used for command processing status -* scsi_done - used to save caller's done function -* host_scribble - used for pointer to another struct scsi_cmnd -* -* If this function returns ASC_NOERROR the request will be completed -* from the interrupt handler. -* -* If this function returns ASC_ERROR the host error code has been set, -* and the called must call asc_scsi_done. +* asc_prt_adv_dvc_var() * -* If ASC_BUSY is returned the request will be returned to the midlayer -* and re-tried later. +* Display an ADV_DVC_VAR structure. */ -static int asc_execute_scsi_cmnd (struct scsi_cmnd *scp) +static void asc_prt_adv_dvc_var (ADV_DVC_VAR *h) { -asc_board_t *boardp; -ASC_DVC_VAR *asc_dvc_varp; -ADV_DVC_VAR *adv_dvc_varp; -ADV_SCSI_REQ_Q *adv_scsiqp; -struct scsi_device *device; -int ret; - -ASC_DBG2 (1 ,"asc_execute_scsi_cmnd: scp 0x%lx, done 0x%lx\n" , - (ulong )scp, (ulong )scp->scsi_done); - - boardp =ASC_BOARDP (scp->device->host); - device = boardp->device[scp->device->id]; +printk (" ADV_DVC_VAR at addr 0x%lx\n" , (ulong )h); -if (ASC_NARROW_BOARD (boardp)) { -/* -* Build and execute Narrow Board request. -*/ +printk (" iop_base 0x%lx, err_code 0x%x, ultra_able 0x%x\n" , + (ulong )h->iop_base, h->err_code, (unsigned )h->ultra_able); - asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; +printk (" isr_callback 0x%lx, sdtr_able 0x%x, wdtr_able 0x%x\n" , + (ulong )h->isr_callback, (unsigned )h->sdtr_able, + (unsigned )h->wdtr_able); -/* -* Build Asc Library request structure using the -* global structures 'asc_scsi_req' and 'asc_sg_head'. -* -* If an error is returned, then the request has been -* queued on the board done queue. It will be completed -* by the caller. -* -* asc_build_req() can not return ASC_BUSY. -*/ -if (asc_build_req (boardp, scp) ==ASC_ERROR ) { -ASC_STATS (scp->device->host, build_error); -return ASC_ERROR ; - } +printk (" start_motor 0x%x, scsi_reset_wait 0x%x, irq_no 0x%x,\n" , + (unsigned )h->start_motor, + (unsigned )h->scsi_reset_wait, (unsigned )h->irq_no); -switch (ret =AscExeScsiQueue (asc_dvc_varp, &asc_scsi_q)) { -case ASC_NOERROR : -ASC_STATS (scp->device->host, exe_noerror); -/* -* Increment monotonically increasing per device -* successful request counter. Wrapping doesn't matter. -*/ - boardp->reqcnt[scp->device->id]++; -ASC_DBG (1 ,"asc_execute_scsi_cmnd: AscExeScsiQueue(), " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_STATS (scp->device->host, exe_busy); -break ; -case ASC_ERROR : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AscExeScsiQueue() ASC_ERROR, err_code 0x%x\n" , - boardp->id, asc_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_error); - scp->result =HOST_BYTE (DID_ERROR ); -break ; -default : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AscExeScsiQueue() unknown, err_code 0x%x\n" , - boardp->id, asc_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_unknown); - scp->result =HOST_BYTE (DID_ERROR ); -break ; - } - }else { -/* -* Build and execute Wide Board request. -*/ - adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; +printk (" max_host_qng %u, max_dvc_qng %u, carr_freelist 0x%lxn\n" , + (unsigned )h->max_host_qng, (unsigned )h->max_dvc_qng, + (ulong )h->carr_freelist); -/* -* Build and get a pointer to an Adv Library request structure. -* -* If the request is successfully built then send it below, -* otherwise return with an error. -*/ -switch (adv_build_req (boardp, scp, &adv_scsiqp)) { -case ASC_NOERROR : -ASC_DBG (3 ,"asc_execute_scsi_cmnd: adv_build_req " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_DBG (1 ,"asc_execute_scsi_cmnd: adv_build_req " -"ASC_BUSY\n" ); -/* -* The asc_stats fields 'adv_build_noreq' and -* 'adv_build_nosg' count wide board busy conditions. -* They are updated in adv_build_req and -* adv_get_sglist, respectively. -*/ -return ASC_BUSY ; -case ASC_ERROR : -default : -ASC_DBG (1 ,"asc_execute_scsi_cmnd: adv_build_req " -"ASC_ERROR\n" ); -ASC_STATS (scp->device->host, build_error); -return ASC_ERROR ; - } +printk (" icq_sp 0x%lx, irq_sp 0x%lx\n" , + (ulong )h->icq_sp, (ulong )h->irq_sp); -switch (ret =AdvExeScsiQueue (adv_dvc_varp, adv_scsiqp)) { -case ASC_NOERROR : -ASC_STATS (scp->device->host, exe_noerror); -/* -* Increment monotonically increasing per device -* successful request counter. Wrapping doesn't matter. -*/ - boardp->reqcnt[scp->device->id]++; -ASC_DBG (1 ,"asc_execute_scsi_cmnd: AdvExeScsiQueue(), " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_STATS (scp->device->host, exe_busy); -break ; -case ASC_ERROR : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AdvExeScsiQueue() ASC_ERROR, err_code 0x%x\n" , - boardp->id, adv_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_error); - scp->result =HOST_BYTE (DID_ERROR ); -break ; -default : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AdvExeScsiQueue() unknown, err_code 0x%x\n" , - boardp->id, adv_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_unknown); - scp->result =HOST_BYTE (DID_ERROR ); -break ; - } - } +printk (" no_scam 0x%x, tagqng_able 0x%x\n" , + (unsigned )h->no_scam, (unsigned )h->tagqng_able); -ASC_DBG (1 ,"asc_execute_scsi_cmnd: end\n" ); -return ret; +printk (" chip_scsi_id 0x%x, cfg 0x%lx\n" , + (unsigned )h->chip_scsi_id, (ulong )h->cfg); }/* -* Build a request structure for the Asc Library (Narrow Board). -* -* The global structures 'asc_scsi_q' and 'asc_sg_head' are -* used to build the request. +* asc_prt_adv_dvc_cfg() * -* If an error occurs, then return ASC_ERROR. +* Display an ADV_DVC_CFG structure. */ -static int asc_build_req (asc_board_t *boardp,struct scsi_cmnd *scp) +static void asc_prt_adv_dvc_cfg (ADV_DVC_CFG *h) { -/* -* Mutually exclusive access is required to 'asc_scsi_q' and -* 'asc_sg_head' until after the request is started. -*/ -memset (&asc_scsi_q,0 ,sizeof (ASC_SCSI_Q )); - -/* -* Point the ASC_SCSI_Q to the 'struct scsi_cmnd'. -*/ - asc_scsi_q.q2.srb_ptr =ASC_VADDR_TO_U32 (scp); - -/* -* Build the ASC_SCSI_Q request. -*/ - asc_scsi_q.cdbptr = &scp->cmnd[0 ]; - asc_scsi_q.q2.cdb_len = scp->cmd_len; - asc_scsi_q.q1.target_id =ASC_TID_TO_TARGET_ID (scp->device->id); - asc_scsi_q.q1.target_lun = scp->device->lun; - asc_scsi_q.q2.target_ix = -ASC_TIDLUN_TO_IX (scp->device->id, scp->device->lun); - asc_scsi_q.q1.sense_addr = -cpu_to_le32 (virt_to_bus (&scp->sense_buffer[0 ])); - asc_scsi_q.q1.sense_len =sizeof (scp->sense_buffer); - -/* -* If there are any outstanding requests for the current target, -* then every 255th request send an ORDERED request. This heuristic -* tries to retain the benefit of request sorting while preventing -* request starvation. 255 is the max number of tags or pending commands -* a device may have outstanding. -* -* The request count is incremented below for every successfully -* started request. -* -*/ -if ((boardp->dvc_var.asc_dvc_var.cur_dvc_qng[scp->device->id] >0 ) && - (boardp->reqcnt[scp->device->id] %255 ) ==0 ) { - asc_scsi_q.q2.tag_code =MSG_ORDERED_TAG ; - }else { - asc_scsi_q.q2.tag_code =MSG_SIMPLE_TAG ; - } - -/* -* Build ASC_SCSI_Q for a contiguous buffer or a scatter-gather -* buffer command. -*/ -if (scp->use_sg ==0 ) { -/* -* CDB request of single contiguous buffer. -*/ -ASC_STATS (scp->device->host, cont_cnt); - scp->SCp.dma_handle = scp->request_bufflen ? -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction) :0 ; - asc_scsi_q.q1.data_addr =cpu_to_le32 (scp->SCp.dma_handle); - asc_scsi_q.q1.data_cnt =cpu_to_le32 (scp->request_bufflen); -ASC_STATS_ADD (scp->device->host, cont_xfer, -ASC_CEILING (scp->request_bufflen,512 )); - asc_scsi_q.q1.sg_queue_cnt =0 ; - asc_scsi_q.sg_head =NULL ; - }else { -/* -* CDB scatter-gather request list. -*/ -int sgcnt; -int use_sg; -struct scatterlist *slp; - - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); - -if (use_sg > scp->device->host->sg_tablesize) { -ASC_PRINT3 ("asc_build_req: board %d: use_sg %d > " -"sg_tablesize %d\n" , boardp->id, use_sg, - scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); - scp->result =HOST_BYTE (DID_ERROR ); -return ASC_ERROR ; - } - -ASC_STATS (scp->device->host, sg_cnt); - -/* -* Use global ASC_SG_HEAD structure and set the ASC_SCSI_Q -* structure to point to it. -*/ -memset (&asc_sg_head,0 ,sizeof (ASC_SG_HEAD )); +printk (" ADV_DVC_CFG at addr 0x%lx\n" , (ulong )h); - asc_scsi_q.q1.cntl |=QC_SG_HEAD ; - asc_scsi_q.sg_head = &asc_sg_head; - asc_scsi_q.q1.data_cnt =0 ; - asc_scsi_q.q1.data_addr =0 ; -/* This is a byte value, otherwise it would need to be swapped. */ - asc_sg_head.entry_cnt = asc_scsi_q.q1.sg_queue_cnt = use_sg; -ASC_STATS_ADD (scp->device->host, sg_elem, - asc_sg_head.entry_cnt); +printk (" disc_enable 0x%x, termination 0x%x\n" , + h->disc_enable, h->termination); -/* -* Convert scatter-gather list into ASC_SG_HEAD list. -*/ -for (sgcnt =0 ; sgcnt < use_sg; sgcnt++, slp++) { - asc_sg_head.sg_list[sgcnt].addr = -cpu_to_le32 (sg_dma_address (slp)); - asc_sg_head.sg_list[sgcnt].bytes = -cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer, -ASC_CEILING (sg_dma_len (slp),512 )); - } - } +printk (" chip_version 0x%x, mcode_date 0x%x\n" , + h->chip_version, h->mcode_date); -ASC_DBG_PRT_ASC_SCSI_Q (2 , &asc_scsi_q); -ASC_DBG_PRT_CDB (1 , scp->cmnd, scp->cmd_len); +printk (" mcode_version 0x%x, pci_device_id 0x%x, lib_version %u\n" , + h->mcode_version,to_pci_dev (h->dev)->device, h->lib_version); -return ASC_NOERROR ; +printk (" control_flag 0x%x\n" , h->control_flag); }/* -* Build a request structure for the Adv Library (Wide Board). -* -* If an adv_req_t can not be allocated to issue the request, -* then return ASC_BUSY. If an error occurs, then return ASC_ERROR. +* asc_prt_adv_scsi_req_q() * -* Multi-byte fields in the ASC_SCSI_REQ_Q that are used by the -* microcode for DMA addresses or math operations are byte swapped -* to little-endian order. +* Display an ADV_SCSI_REQ_Q structure. */ -static int -adv_build_req (asc_board_t *boardp,struct scsi_cmnd *scp, -ADV_SCSI_REQ_Q **adv_scsiqpp) +static void asc_prt_adv_scsi_req_q (ADV_SCSI_REQ_Q *q) { -adv_req_t *reqp; -ADV_SCSI_REQ_Q *scsiqp; -int i; -int ret; - -/* -* Allocate an adv_req_t structure from the board to execute -* the command. -*/ -if (boardp->adv_reqp ==NULL ) { -ASC_DBG (1 ,"adv_build_req: no free adv_req_t\n" ); -ASC_STATS (scp->device->host, adv_build_noreq); -return ASC_BUSY ; - }else { - reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp->next_reqp; - reqp->next_reqp =NULL ; - } - -/* -* Get 32-byte aligned ADV_SCSI_REQ_Q and ADV_SG_BLOCK pointers. -*/ - scsiqp = (ADV_SCSI_REQ_Q *)ADV_32BALIGN (&reqp->scsi_req_q); - -/* -* Initialize the structure. -*/ - scsiqp->cntl = scsiqp->scsi_cntl = scsiqp->done_status =0 ; - -/* -* Set the ADV_SCSI_REQ_Q 'srb_ptr' to point to the adv_req_t structure. -*/ - scsiqp->srb_ptr =ASC_VADDR_TO_U32 (reqp); - -/* -* Set the adv_req_t 'cmndp' to point to the struct scsi_cmnd structure. -*/ - reqp->cmndp = scp; - -/* -* Build the ADV_SCSI_REQ_Q request. -*/ - -/* Set CDB length and copy it to the request structure. */ - scsiqp->cdb_len = scp->cmd_len; -/* Copy first 12 CDB bytes to cdb[]. */ -for (i =0 ; i < scp->cmd_len && i <12 ; i++) { - scsiqp->cdb[i] = scp->cmnd[i]; - } -/* Copy last 4 CDB bytes, if present, to cdb16[]. */ -for (; i < scp->cmd_len; i++) { - scsiqp->cdb16[i -12 ] = scp->cmnd[i]; - } - - scsiqp->target_id = scp->device->id; - scsiqp->target_lun = scp->device->lun; - - scsiqp->sense_addr =cpu_to_le32 (virt_to_bus (&scp->sense_buffer[0 ])); - scsiqp->sense_len =sizeof (scp->sense_buffer); +int sg_blk_cnt; +struct asc_sg_block *sg_ptr; -/* -* Build ADV_SCSI_REQ_Q for a contiguous buffer or a scatter-gather -* buffer command. -*/ +printk ("ADV_SCSI_REQ_Q at addr 0x%lx\n" , (ulong )q); - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); - scsiqp->vdata_addr = scp->request_buffer; - scsiqp->data_addr =cpu_to_le32 (virt_to_bus (scp->request_buffer)); +printk (" target_id %u, target_lun %u, srb_ptr 0x%lx, a_flag 0x%x\n" , + q->target_id, q->target_lun, (ulong )q->srb_ptr, q->a_flag); -if (scp->use_sg ==0 ) { -/* -* CDB request of single contiguous buffer. -*/ - reqp->sgblkp =NULL ; - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); -if (scp->request_bufflen) { - scsiqp->vdata_addr = scp->request_buffer; - scp->SCp.dma_handle = -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction); - }else { - scsiqp->vdata_addr =NULL ; - scp->SCp.dma_handle =0 ; - } - scsiqp->data_addr =cpu_to_le32 (scp->SCp.dma_handle); - scsiqp->sg_list_ptr =NULL ; - scsiqp->sg_real_addr =0 ; -ASC_STATS (scp->device->host, cont_cnt); -ASC_STATS_ADD (scp->device->host, cont_xfer, -ASC_CEILING (scp->request_bufflen,512 )); - }else { -/* -* CDB scatter-gather request list. -*/ -struct scatterlist *slp; -int use_sg; +printk (" cntl 0x%x, data_addr 0x%lx, vdata_addr 0x%lx\n" , + q->cntl, (ulong )le32_to_cpu (q->data_addr), (ulong )q->vdata_addr); - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +printk (" data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , + (ulong )le32_to_cpu (q->data_cnt), + (ulong )le32_to_cpu (q->sense_addr), q->sense_len); -if (use_sg >ADV_MAX_SG_LIST ) { -ASC_PRINT3 ("adv_build_req: board %d: use_sg %d > " -"ADV_MAX_SG_LIST %d\n" , boardp->id, use_sg, - scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); - scp->result =HOST_BYTE (DID_ERROR ); +printk + (" cdb_len %u, done_status 0x%x, host_status 0x%x, scsi_status 0x%x\n" , + q->cdb_len, q->done_status, q->host_status, q->scsi_status); -/* -* Free the 'adv_req_t' structure by adding it back -* to the board free list. -*/ - reqp->next_reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp; +printk (" sg_working_ix 0x%x, target_cmd %u\n" , + q->sg_working_ix, q->target_cmd); -return ASC_ERROR ; - } +printk (" scsiq_rptr 0x%lx, sg_real_addr 0x%lx, sg_list_ptr 0x%lx\n" , + (ulong )le32_to_cpu (q->scsiq_rptr), + (ulong )le32_to_cpu (q->sg_real_addr), (ulong )q->sg_list_ptr); - ret =adv_get_sglist (boardp, reqp, scp, use_sg); -if (ret !=ADV_SUCCESS ) { +/* Display the request's ADV_SG_BLOCK structures. */ +if (q->sg_list_ptr !=NULL ) { + sg_blk_cnt =0 ; +while (1 ) {/* -* Free the adv_req_t structure by adding it back to -* the board free list. +* 'sg_ptr' is a physical address. Convert it to a virtual +* address by indexing 'sg_blk_cnt' into the virtual address +* array 'sg_list_ptr'. +* +* XXX - Assumes all SG physical blocks are virtually contiguous. */ - reqp->next_reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp; - -return ret; + sg_ptr = + &(((ADV_SG_BLOCK *)(q->sg_list_ptr))[sg_blk_cnt]); +asc_prt_adv_sgblock (sg_blk_cnt, sg_ptr); +if (sg_ptr->sg_ptr ==0 ) { +break ; + } + sg_blk_cnt++; } - -ASC_STATS (scp->device->host, sg_cnt); -ASC_STATS_ADD (scp->device->host, sg_elem, use_sg); } - -ASC_DBG_PRT_ADV_SCSI_REQ_Q (2 , scsiqp); -ASC_DBG_PRT_CDB (1 , scp->cmnd, scp->cmd_len); - - *adv_scsiqpp = scsiqp; - -return ASC_NOERROR ; }/* -* Build scatter-gather list for Adv Library (Wide Board). -* -* Additional ADV_SG_BLOCK structures will need to be allocated -* if the total number of scatter-gather elements exceeds -* NO_OF_SG_PER_BLOCK (15). The ADV_SG_BLOCK structures are -* assumed to be physically contiguous. +* asc_prt_adv_sgblock() * -* Return: -* ADV_SUCCESS(1) - SG List successfully created -* ADV_ERROR(-1) - SG List creation failed +* Display an ADV_SG_BLOCK structure. */ -static int -adv_get_sglist (asc_board_t *boardp,adv_req_t *reqp,struct scsi_cmnd *scp, -int use_sg) +static void asc_prt_adv_sgblock (int sgblockno,ADV_SG_BLOCK *b) { -adv_sgblk_t *sgblkp; -ADV_SCSI_REQ_Q *scsiqp; -struct scatterlist *slp; -int sg_elem_cnt; -ADV_SG_BLOCK *sg_block, *prev_sg_block; -ADV_PADDR sg_block_paddr;int i; - scsiqp = (ADV_SCSI_REQ_Q *)ADV_32BALIGN (&reqp->scsi_req_q); - slp = (struct scatterlist *)scp->request_buffer; - sg_elem_cnt = use_sg; - prev_sg_block =NULL ; - reqp->sgblkp =NULL ; - -for (;;) { -/* -* Allocate a 'adv_sgblk_t' structure from the board free -* list. One 'adv_sgblk_t' structure holds NO_OF_SG_PER_BLOCK -* (15) scatter-gather elements. -*/ -if ((sgblkp = boardp->adv_sgblkp) ==NULL ) { -ASC_DBG (1 ,"adv_get_sglist: no free adv_sgblk_t\n" ); -ASC_STATS (scp->device->host, adv_build_nosg); - -/* -* Allocation failed. Free 'adv_sgblk_t' structures -* already allocated for the request. -*/ -while ((sgblkp = reqp->sgblkp) !=NULL ) { -/* Remove 'sgblkp' from the request list. */ - reqp->sgblkp = sgblkp->next_sgblkp; - -/* Add 'sgblkp' to the board free list. */ - sgblkp->next_sgblkp = boardp->adv_sgblkp; - boardp->adv_sgblkp = sgblkp; - } -return ASC_BUSY ; - } - -/* Complete 'adv_sgblk_t' board allocation. */ - boardp->adv_sgblkp = sgblkp->next_sgblkp; - sgblkp->next_sgblkp =NULL ; - -/* -* Get 8 byte aligned virtual and physical addresses -* for the allocated ADV_SG_BLOCK structure. -*/ - sg_block = (ADV_SG_BLOCK *)ADV_8BALIGN (&sgblkp->sg_block); - sg_block_paddr =virt_to_bus (sg_block); - -/* -* Check if this is the first 'adv_sgblk_t' for the -* request. -*/ -if (reqp->sgblkp ==NULL ) { -/* Request's first scatter-gather block. */ - reqp->sgblkp = sgblkp; - -/* -* Set ADV_SCSI_REQ_T ADV_SG_BLOCK virtual and physical -* address pointers. -*/ - scsiqp->sg_list_ptr = sg_block; - scsiqp->sg_real_addr =cpu_to_le32 (sg_block_paddr); - }else { -/* Request's second or later scatter-gather block. */ - sgblkp->next_sgblkp = reqp->sgblkp; - reqp->sgblkp = sgblkp; - -/* -* Point the previous ADV_SG_BLOCK structure to -* the newly allocated ADV_SG_BLOCK structure. -*/ - prev_sg_block->sg_ptr =cpu_to_le32 (sg_block_paddr); - } - -for (i =0 ; i <NO_OF_SG_PER_BLOCK ; i++) { - sg_block->sg_list[i].sg_addr = -cpu_to_le32 (sg_dma_address (slp)); - sg_block->sg_list[i].sg_count = -cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer, -ASC_CEILING (sg_dma_len (slp),512 )); - -if (--sg_elem_cnt ==0 ) {/* Last ADV_SG_BLOCK and scatter-gather entry. */ - sg_block->sg_cnt = i +1 ; - sg_block->sg_ptr =0L ;/* Last ADV_SG_BLOCK in list. */ -return ADV_SUCCESS ; - } - slp++; - } - sg_block->sg_cnt =NO_OF_SG_PER_BLOCK ; - prev_sg_block = sg_block; +printk (" ASC_SG_BLOCK at addr 0x%lx (sgblockno %d)\n" , + (ulong )b, sgblockno); +printk (" sg_cnt %u, sg_ptr 0x%lx\n" , + b->sg_cnt, (ulong )le32_to_cpu (b->sg_ptr)); +BUG_ON (b->sg_cnt >NO_OF_SG_PER_BLOCK ); +if (b->sg_ptr !=0 ) +BUG_ON (b->sg_cnt !=NO_OF_SG_PER_BLOCK ); +for (i =0 ; i < b->sg_cnt; i++) { +printk (" [%u]: sg_addr 0x%lx, sg_count 0x%lx\n" , + i, (ulong )b->sg_list[i].sg_addr, + (ulong )b->sg_list[i].sg_count); } }/* -* asc_isr_callback() - Second Level Interrupt Handler called by AscISR(). +* asc_prt_hex() * -* Interrupt callback function for the Narrow SCSI Asc Library. +* Print hexadecimal output in 4 byte groupings 32 bytes +* or 8 double-words per line. */ -static void asc_isr_callback (ASC_DVC_VAR *asc_dvc_varp,ASC_QDONE_INFO *qdonep) +static void asc_prt_hex (char *f,uchar *s,int l) { -asc_board_t *boardp; -struct scsi_cmnd *scp; -struct Scsi_Host *shost; - -ASC_DBG2 (1 ,"asc_isr_callback: asc_dvc_varp 0x%lx, qdonep 0x%lx\n" , - (ulong )asc_dvc_varp, (ulong )qdonep); -ASC_DBG_PRT_ASC_QDONE_INFO (2 , qdonep); - -/* -* Get the struct scsi_cmnd structure and Scsi_Host structure for the -* command that has been completed. -*/ - scp = (struct scsi_cmnd *)ASC_U32_TO_VADDR (qdonep->d2.srb_ptr); -ASC_DBG1 (1 ,"asc_isr_callback: scp 0x%lx\n" , (ulong )scp); - -if (scp ==NULL ) { -ASC_PRINT ("asc_isr_callback: scp is NULL\n" ); -return ; - } -ASC_DBG_PRT_CDB (2 , scp->cmnd, scp->cmd_len); - - shost = scp->device->host; -ASC_STATS (shost, callback); -ASC_DBG1 (1 ,"asc_isr_callback: shost 0x%lx\n" , (ulong )shost); +int i; +int j; +int k; +int m; - boardp =ASC_BOARDP (shost); -BUG_ON (asc_dvc_varp != &boardp->dvc_var.asc_dvc_var); +printk ("%s: (%d bytes)\n" , f, l); -/* -* 'qdonep' contains the command's ending status. -*/ -switch (qdonep->d3.done_stat) { -case QD_NO_ERROR : -ASC_DBG (2 ,"asc_isr_callback: QD_NO_ERROR\n" ); - scp->result =0 ; +for (i =0 ; i < l; i +=32 ) { -/* -* Check for an underrun condition. -* -* If there was no error and an underrun condition, then -* return the number of underrun bytes. -*/ -if (scp->request_bufflen !=0 && qdonep->remain_bytes !=0 && - qdonep->remain_bytes <= scp->request_bufflen) { -ASC_DBG1 (1 , -"asc_isr_callback: underrun condition %u bytes\n" , - (unsigned )qdonep->remain_bytes); - scp->resid = qdonep->remain_bytes; +/* Display a maximum of 8 double-words per line. */ +if ((k = (l - i) /4 ) >=8 ) { + k =8 ; + m =0 ; + }else { + m = (l - i) %4 ; } -break ; -case QD_WITH_ERROR : -ASC_DBG (2 ,"asc_isr_callback: QD_WITH_ERROR\n" ); -switch (qdonep->d3.host_stat) { -case QHSTA_NO_ERROR : -if (qdonep->d3.scsi_stat ==SAM_STAT_CHECK_CONDITION ) { -ASC_DBG (2 , -"asc_isr_callback: SAM_STAT_CHECK_CONDITION\n" ); -ASC_DBG_PRT_SENSE (2 , scp->sense_buffer, -sizeof (scp->sense_buffer)); -/* -* Note: The 'status_byte()' macro used by -* target drivers defined in scsi.h shifts the -* status byte returned by host drivers right -* by 1 bit. This is why target drivers also -* use right shifted status byte definitions. -* For instance target drivers use -* CHECK_CONDITION, defined to 0x1, instead of -* the SCSI defined check condition value of -* 0x2. Host drivers are supposed to return -* the status byte as it is defined by SCSI. -*/ - scp->result =DRIVER_BYTE (DRIVER_SENSE ) | -STATUS_BYTE (qdonep->d3.scsi_stat); - }else { - scp->result =STATUS_BYTE (qdonep->d3.scsi_stat); - } -break ; +for (j =0 ; j < k; j++) { +printk (" %2.2X%2.2X%2.2X%2.2X" , + (unsigned )s[i + (j *4 )], + (unsigned )s[i + (j *4 ) +1 ], + (unsigned )s[i + (j *4 ) +2 ], + (unsigned )s[i + (j *4 ) +3 ]); + } +switch (m) { +case 0 :default : -/* QHSTA error occurred */ -ASC_DBG1 (1 ,"asc_isr_callback: host_stat 0x%x\n" , - qdonep->d3.host_stat); - scp->result =HOST_BYTE (DID_BAD_TARGET ); +break ; +case 1 : +printk (" %2.2X" , (unsigned )s[i + (j *4 )]); +break ; +case 2 : +printk (" %2.2X%2.2X" , + (unsigned )s[i + (j *4 )], + (unsigned )s[i + (j *4 ) +1 ]); +break ; +case 3 : +printk (" %2.2X%2.2X%2.2X" , + (unsigned )s[i + (j *4 ) +1 ], + (unsigned )s[i + (j *4 ) +2 ], + (unsigned )s[i + (j *4 ) +3 ]);break ; } -break ; - -case QD_ABORTED_BY_HOST : -ASC_DBG (1 ,"asc_isr_callback: QD_ABORTED_BY_HOST\n" ); - scp->result = -HOST_BYTE (DID_ABORT ) |MSG_BYTE (qdonep->d3. - scsi_msg) | -STATUS_BYTE (qdonep->d3.scsi_stat); -break ; - -default : -ASC_DBG1 (1 ,"asc_isr_callback: done_stat 0x%x\n" , - qdonep->d3.done_stat); - scp->result = -HOST_BYTE (DID_ERROR ) |MSG_BYTE (qdonep->d3. - scsi_msg) | -STATUS_BYTE (qdonep->d3.scsi_stat); -break ; - } -/* -* If the 'init_tidmask' bit isn't already set for the target and the -* current request finished normally, then set the bit for the target -* to indicate that a device is present. -*/ -if ((boardp->init_tidmask &ADV_TID_TO_TIDMASK (scp->device->id)) ==0 && - qdonep->d3.done_stat ==QD_NO_ERROR && - qdonep->d3.host_stat ==QHSTA_NO_ERROR ) { - boardp->init_tidmask |=ADV_TID_TO_TIDMASK (scp->device->id); +printk ("\n" ); } - -asc_scsi_done (scp); - -return ; } +#endif /* ADVANSYS_DEBUG */ /* -* adv_isr_callback() - Second Level Interrupt Handler called by AdvISR(). +* advansys_info() * -* Callback function for the Wide SCSI Adv Library. +* Return suitable for printing on the console with the argument +* adapter's configuration information. +* +* Note: The information line should not exceed ASC_INFO_SIZE bytes, +* otherwise the static 'info' array will be overrun. */ -static void adv_isr_callback (ADV_DVC_VAR *adv_dvc_varp,ADV_SCSI_REQ_Q *scsiqp) +static const char *advansys_info (struct Scsi_Host *shost) { +static char info[ASC_INFO_SIZE ];asc_board_t *boardp; -adv_req_t *reqp; -adv_sgblk_t *sgblkp; -struct scsi_cmnd *scp; -struct Scsi_Host *shost; -ADV_DCNT resid_cnt; - -ASC_DBG2 (1 ,"adv_isr_callback: adv_dvc_varp 0x%lx, scsiqp 0x%lx\n" , - (ulong )adv_dvc_varp, (ulong )scsiqp); -ASC_DBG_PRT_ADV_SCSI_REQ_Q (2 , scsiqp); - -/* -* Get the adv_req_t structure for the command that has been -* completed. The adv_req_t structure actually contains the -* completed ADV_SCSI_REQ_Q structure. -*/ - reqp = (adv_req_t *)ADV_U32_TO_VADDR (scsiqp->srb_ptr); -ASC_DBG1 (1 ,"adv_isr_callback: reqp 0x%lx\n" , (ulong )reqp); -if (reqp ==NULL ) { -ASC_PRINT ("adv_isr_callback: reqp is NULL\n" ); -return ; - } - -/* -* Get the struct scsi_cmnd structure and Scsi_Host structure for the -* command that has been completed. -* -* Note: The adv_req_t request structure and adv_sgblk_t structure, -* if any, are dropped, because a board structure pointer can not be -* determined. -*/ - scp = reqp->cmndp; -ASC_DBG1 (1 ,"adv_isr_callback: scp 0x%lx\n" , (ulong )scp); -if (scp ==NULL ) { -ASC_PRINT - ("adv_isr_callback: scp is NULL; adv_req_t dropped.\n" ); -return ; - } -ASC_DBG_PRT_CDB (2 , scp->cmnd, scp->cmd_len); - - shost = scp->device->host; -ASC_STATS (shost, callback); -ASC_DBG1 (1 ,"adv_isr_callback: shost 0x%lx\n" , (ulong )shost); +ASC_DVC_VAR *asc_dvc_varp; +ADV_DVC_VAR *adv_dvc_varp; +char *busname; +char *widename =NULL ; boardp =ASC_BOARDP (shost); -BUG_ON (adv_dvc_varp != &boardp->dvc_var.adv_dvc_var); - -/* -* 'done_status' contains the command's ending status. -*/ -switch (scsiqp->done_status) { -case QD_NO_ERROR : -ASC_DBG (2 ,"adv_isr_callback: QD_NO_ERROR\n" ); - scp->result =0 ; - +if (ASC_NARROW_BOARD (boardp)) { + asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; +ASC_DBG (1 ,"advansys_info: begin\n" ); +if (asc_dvc_varp->bus_type &ASC_IS_ISA ) { +if ((asc_dvc_varp->bus_type &ASC_IS_ISAPNP ) == +ASC_IS_ISAPNP ) { + busname ="ISA PnP" ; + }else { + busname ="ISA" ; + } +sprintf (info, +"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X, DMA 0x%X" , +ASC_VERSION , busname, + (ulong )shost->io_port, + (ulong )shost->io_port +ASC_IOADR_GAP -1 , + shost->irq, shost->dma_channel); + }else { +if (asc_dvc_varp->bus_type &ASC_IS_VL ) { + busname ="VL" ; + }else if (asc_dvc_varp->bus_type &ASC_IS_EISA ) { + busname ="EISA" ; + }else if (asc_dvc_varp->bus_type &ASC_IS_PCI ) { +if ((asc_dvc_varp->bus_type &ASC_IS_PCI_ULTRA ) + ==ASC_IS_PCI_ULTRA ) { + busname ="PCI Ultra" ; + }else { + busname ="PCI" ; + } + }else { + busname ="?" ; +ASC_PRINT2 ("advansys_info: board %d: unknown " +"bus type %d\n" , boardp->id, + asc_dvc_varp->bus_type); + } +sprintf (info, +"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X" , +ASC_VERSION , busname, (ulong )shost->io_port, + (ulong )shost->io_port +ASC_IOADR_GAP -1 , + shost->irq); + } + }else {/* -* Check for an underrun condition. +* Wide Adapter Information * -* If there was no error and an underrun condition, then -* then return the number of underrun bytes. +* Memory-mapped I/O is used instead of I/O space to access +* the adapter, but display the I/O Port range. The Memory +* I/O address is displayed through the driver /proc file. */ - resid_cnt =le32_to_cpu (scsiqp->data_cnt); -if (scp->request_bufflen !=0 && resid_cnt !=0 && - resid_cnt <= scp->request_bufflen) { -ASC_DBG1 (1 , -"adv_isr_callback: underrun condition %lu bytes\n" , - (ulong )resid_cnt); - scp->resid = resid_cnt; - } -break ; - -case QD_WITH_ERROR : -ASC_DBG (2 ,"adv_isr_callback: QD_WITH_ERROR\n" ); -switch (scsiqp->host_status) { -case QHSTA_NO_ERROR : -if (scsiqp->scsi_status ==SAM_STAT_CHECK_CONDITION ) { -ASC_DBG (2 , -"adv_isr_callback: SAM_STAT_CHECK_CONDITION\n" ); -ASC_DBG_PRT_SENSE (2 , scp->sense_buffer, -sizeof (scp->sense_buffer)); -/* -* Note: The 'status_byte()' macro used by -* target drivers defined in scsi.h shifts the -* status byte returned by host drivers right -* by 1 bit. This is why target drivers also -* use right shifted status byte definitions. -* For instance target drivers use -* CHECK_CONDITION, defined to 0x1, instead of -* the SCSI defined check condition value of -* 0x2. Host drivers are supposed to return -* the status byte as it is defined by SCSI. -*/ - scp->result =DRIVER_BYTE (DRIVER_SENSE ) | -STATUS_BYTE (scsiqp->scsi_status); - }else { - scp->result =STATUS_BYTE (scsiqp->scsi_status); - } -break ; - -default : -/* Some other QHSTA error occurred. */ -ASC_DBG1 (1 ,"adv_isr_callback: host_status 0x%x\n" , - scsiqp->host_status); - scp->result =HOST_BYTE (DID_BAD_TARGET ); -break ; + adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; +if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC3550 ) { + widename ="Ultra-Wide" ; + }else if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC38C0800 ) { + widename ="Ultra2-Wide" ; + }else { + widename ="Ultra3-Wide" ; } -break ; - -case QD_ABORTED_BY_HOST : -ASC_DBG (1 ,"adv_isr_callback: QD_ABORTED_BY_HOST\n" ); - scp->result = -HOST_BYTE (DID_ABORT ) |STATUS_BYTE (scsiqp->scsi_status); -break ; - -default : -ASC_DBG1 (1 ,"adv_isr_callback: done_status 0x%x\n" , - scsiqp->done_status); - scp->result = -HOST_BYTE (DID_ERROR ) |STATUS_BYTE (scsiqp->scsi_status); -break ; - } - -/* -* If the 'init_tidmask' bit isn't already set for the target and the -* current request finished normally, then set the bit for the target -* to indicate that a device is present. -*/ -if ((boardp->init_tidmask &ADV_TID_TO_TIDMASK (scp->device->id)) ==0 && - scsiqp->done_status ==QD_NO_ERROR && - scsiqp->host_status ==QHSTA_NO_ERROR ) { - boardp->init_tidmask |=ADV_TID_TO_TIDMASK (scp->device->id); - } - -asc_scsi_done (scp); - -/* -* Free all 'adv_sgblk_t' structures allocated for the request. -*/ -while ((sgblkp = reqp->sgblkp) !=NULL ) { -/* Remove 'sgblkp' from the request list. */ - reqp->sgblkp = sgblkp->next_sgblkp; - -/* Add 'sgblkp' to the board free list. */ - sgblkp->next_sgblkp = boardp->adv_sgblkp; - boardp->adv_sgblkp = sgblkp; +sprintf (info, +"AdvanSys SCSI %s: PCI %s: PCIMEM 0x%lX-0x%lX, IRQ 0x%X" , +ASC_VERSION , widename, (ulong )adv_dvc_varp->iop_base, + (ulong )adv_dvc_varp->iop_base + boardp->asc_n_io_port -1 , shost->irq); } - -/* -* Free the adv_req_t structure used with the command by adding -* it back to the board free list. -*/ - reqp->next_reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp; - -ASC_DBG (1 ,"adv_isr_callback: done\n" ); - -return ; +BUG_ON (strlen (info) >=ASC_INFO_SIZE ); +ASC_DBG (1 ,"advansys_info: end\n" ); +return info; } +#ifdef CONFIG_PROC_FS /* -* adv_async_callback() - Adv Library asynchronous event callback function. +* asc_prt_line() +* +* If 'cp' is NULL print to the console, otherwise print to a buffer. +* +* Return 0 if printing to the console, otherwise return the number of +* bytes written to the buffer. +* +* Note: If any single line is greater than ASC_PRTLINE_SIZE bytes the stack +* will be corrupted. 's[]' is defined to be ASC_PRTLINE_SIZE bytes. */ -static void adv_async_callback (ADV_DVC_VAR *adv_dvc_varp,uchar code) +static int asc_prt_line (char *buf,int buflen,char *fmt, ...) { -switch (code) { -case ADV_ASYNC_SCSI_BUS_RESET_DET : -/* -* The firmware detected a SCSI Bus reset. -*/ -ASC_DBG (0 , -"adv_async_callback: ADV_ASYNC_SCSI_BUS_RESET_DET\n" ); -break ; - -case ADV_ASYNC_RDMA_FAILURE : -/* -* Handle RDMA failure by resetting the SCSI Bus and -* possibly the chip if it is unresponsive. Log the error -* with a unique code. -*/ -ASC_DBG (0 ,"adv_async_callback: ADV_ASYNC_RDMA_FAILURE\n" ); -AdvResetChipAndSB (adv_dvc_varp); -break ; - -case ADV_HOST_SCSI_BUS_RESET : -/* -* Host generated SCSI bus reset occurred. -*/ -ASC_DBG (0 ,"adv_async_callback: ADV_HOST_SCSI_BUS_RESET\n" ); -break ; +va_list args; +int ret; +char s[ASC_PRTLINE_SIZE ]; -default : -ASC_DBG1 (0 ,"DvcAsyncCallBack: unknown code 0x%x\n" , code); -break ; +va_start (args, fmt); + ret =vsprintf (s, fmt, args); +BUG_ON (ret >=ASC_PRTLINE_SIZE ); +if (buf ==NULL ) { + (void )printk (s); + ret =0 ; + }else { + ret =min (buflen, ret); +memcpy (buf, s, ret); } +va_end (args); +return ret; } -#ifdef CONFIG_PROC_FS /* * asc_prt_board_devices() *
@@ -5548,159 +4212,7 @@ asc_proc_copy(off_t advoffset, off_t offset, char *curbuf, int leftlen,return cnt; } -/* -* asc_prt_line() -* -* If 'cp' is NULL print to the console, otherwise print to a buffer. -* -* Return 0 if printing to the console, otherwise return the number of -* bytes written to the buffer. -* -* Note: If any single line is greater than ASC_PRTLINE_SIZE bytes the stack -* will be corrupted. 's[]' is defined to be ASC_PRTLINE_SIZE bytes. -*/ -static int asc_prt_line (char *buf,int buflen,char *fmt, ...) -{ -va_list args; -int ret; -char s[ASC_PRTLINE_SIZE ]; - -va_start (args, fmt); - ret =vsprintf (s, fmt, args); -BUG_ON (ret >=ASC_PRTLINE_SIZE ); -if (buf ==NULL ) { - (void )printk (s); - ret =0 ; - }else { - ret =min (buflen, ret); -memcpy (buf, s, ret); - } -va_end (args); -return ret; -} -#endif /* CONFIG_PROC_FS */ - -/* -* void -* DvcPutScsiQ(PortAddr iop_base, ushort s_addr, uchar *outbuf, int words) -* -* Calling/Exit State: -* none -* -* Description: -* Output an ASC_SCSI_Q structure to the chip -*/ -static void -DvcPutScsiQ (PortAddr iop_base,ushort s_addr,uchar *outbuf,int words) -{ -int i; - -ASC_DBG_PRT_HEX (2 ,"DvcPutScsiQ" , outbuf,2 * words); -AscSetChipLramAddr (iop_base, s_addr); -for (i =0 ; i <2 * words; i +=2 ) { -if (i ==4 || i ==20 ) { -continue ; - } -outpw (iop_base +IOP_RAM_DATA , - ((ushort )outbuf[i +1 ] <<8 ) | outbuf[i]); - } -} - -/* -* void -* DvcGetQinfo(PortAddr iop_base, ushort s_addr, uchar *inbuf, int words) -* -* Calling/Exit State: -* none -* -* Description: -* Input an ASC_QDONE_INFO structure from the chip -*/ -static void -DvcGetQinfo (PortAddr iop_base,ushort s_addr,uchar *inbuf,int words) -{ -int i; -ushort word; - -AscSetChipLramAddr (iop_base, s_addr); -for (i =0 ; i <2 * words; i +=2 ) { -if (i ==10 ) { -continue ; - } - word =inpw (iop_base +IOP_RAM_DATA ); - inbuf[i] = word &0xff ; - inbuf[i +1 ] = (word >>8 ) &0xff ; - } -ASC_DBG_PRT_HEX (2 ,"DvcGetQinfo" , inbuf,2 * words); -} - -/* -* Return the BIOS address of the adapter at the specified -* I/O port and with the specified bus type. -*/ -static unsigned short __devinit -AscGetChipBiosAddress (PortAddr iop_base,unsigned short bus_type) -{ -unsigned short cfg_lsw; -unsigned short bios_addr; - -/* -* The PCI BIOS is re-located by the motherboard BIOS. Because -* of this the driver can not determine where a PCI BIOS is -* loaded and executes. -*/ -if (bus_type &ASC_IS_PCI ) -return 0 ; - -#ifdef CONFIG_ISA -if ((bus_type &ASC_IS_EISA ) !=0 ) { - cfg_lsw =AscGetEisaChipCfg (iop_base); - cfg_lsw &=0x000F ; - bios_addr =ASC_BIOS_MIN_ADDR + cfg_lsw *ASC_BIOS_BANK_SIZE ; -return bios_addr; - } -#endif /* CONFIG_ISA */ - - cfg_lsw =AscGetChipCfgLsw (iop_base); - -/* -* ISA PnP uses the top bit as the 32K BIOS flag -*/ -if (bus_type ==ASC_IS_ISAPNP ) - cfg_lsw &=0x7FFF ; - bios_addr =ASC_BIOS_MIN_ADDR + (cfg_lsw >>12 ) *ASC_BIOS_BANK_SIZE ; -return bios_addr; -} - -/* -* DvcGetPhyAddr() -* -* Return the physical address of 'vaddr' and set '*lenp' to the -* number of physically contiguous bytes that follow 'vaddr'. -* 'flag' indicates the type of structure whose physical address -* is being translated. -* -* Note: Because Linux currently doesn't page the kernel and all -* kernel buffers are physically contiguous, leave '*lenp' unchanged. -*/ -ADV_PADDR -DvcGetPhyAddr (ADV_DVC_VAR *asc_dvc,ADV_SCSI_REQ_Q *scsiq, -uchar *vaddr,ADV_SDCNT *lenp,int flag) -{ -ADV_PADDR paddr; - - paddr =virt_to_bus (vaddr); - -ASC_DBG4 (4 , -"DvcGetPhyAddr: vaddr 0x%lx, lenp 0x%lx *lenp %lu, paddr 0x%lx\n" , - (ulong )vaddr, (ulong )lenp, (ulong)*((ulong *)lenp), - (ulong )paddr); - -return paddr; -} -#ifdef ADVANSYS_STATS -#ifdef CONFIG_PROC_FS /* * asc_prt_board_stats() *
@@ -5803,420 +4315,543 @@ static int asc_prt_board_stats(struct Scsi_Host *shost, char *cp, int cplen)return totlen; } -#endif /* CONFIG_PROC_FS */ #endif /* ADVANSYS_STATS */ -#ifdef ADVANSYS_DEBUG /* -* asc_prt_scsi_host() +* advansys_proc_info() - /proc/scsi/advansys/{0,1,2,3,...} +* +* *buffer: I/O buffer +* **start: if inout == FALSE pointer into buffer where user read should start +* offset: current offset into a /proc/scsi/advansys/[0...] file +* length: length of buffer +* hostno: Scsi_Host host_no +* inout: TRUE - user is writing; FALSE - user is reading +* +* Return the number of bytes read from or written to a +* /proc/scsi/advansys/[0...] file. +* +* Note: This function uses the per board buffer 'prtbuf' which is +* allocated when the board is initialized in advansys_detect(). The +* buffer is ASC_PRTBUF_SIZE bytes. The function asc_proc_copy() is +* used to write to the buffer. The way asc_proc_copy() is written +* if 'prtbuf' is too small it will not be overwritten. Instead the +* user just won't get all the available statistics. */ -static void asc_prt_scsi_host (struct Scsi_Host *s) +static int +advansys_proc_info (struct Scsi_Host *shost,char *buffer,char **start, +off_t offset,int length,int inout) {asc_board_t *boardp; +char *cp; +int cplen; +int cnt; +int totcnt; +int leftlen; +char *curbuf; +off_t advoffset; - boardp =ASC_BOARDP (s); +ASC_DBG (1 ,"advansys_proc_info: begin\n" ); -printk ("Scsi_Host at addr 0x%lx\n" , (ulong )s); -printk (" host_busy %u, host_no %d, last_reset %d,\n" , - s->host_busy, s->host_no, (unsigned )s->last_reset); +/* +* User write not supported. +*/ +if (inout == TRUE) { +return (-ENOSYS ); + } -printk (" base 0x%lx, io_port 0x%lx, irq 0x%x,\n" , - (ulong )s->base, (ulong )s->io_port, s->irq); +/* +* User read of /proc/scsi/advansys/[0...] file. +*/ -printk (" dma_channel %d, this_id %d, can_queue %d,\n" , - s->dma_channel, s->this_id, s->can_queue); + boardp =ASC_BOARDP (shost); -printk (" cmd_per_lun %d, sg_tablesize %d, unchecked_isa_dma %d\n" , - s->cmd_per_lun, s->sg_tablesize, s->unchecked_isa_dma); +/* Copy read data starting at the beginning of the buffer. */ + *start = buffer; + curbuf = buffer; + advoffset =0 ; + totcnt =0 ; + leftlen = length; -if (ASC_NARROW_BOARD (boardp)) { -asc_prt_asc_dvc_var (&ASC_BOARDP (s)->dvc_var.asc_dvc_var); -asc_prt_asc_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.asc_dvc_cfg); - }else { -asc_prt_adv_dvc_var (&ASC_BOARDP (s)->dvc_var.adv_dvc_var); -asc_prt_adv_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.adv_dvc_cfg); +/* +* Get board configuration information. +* +* advansys_info() returns the board string from its own static buffer. +*/ + cp = (char *)advansys_info (shost); +strcat (cp,"\n" ); + cplen =strlen (cp); +/* Copy board information. */ + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; } -} - -/* -* asc_prt_scsi_cmnd() -*/ -static void asc_prt_scsi_cmnd (struct scsi_cmnd *s) -{ -printk ("struct scsi_cmnd at addr 0x%lx\n" , (ulong )s); + advoffset += cplen; + curbuf += cnt; -printk (" host 0x%lx, device 0x%lx, target %u, lun %u, channel %u,\n" , - (ulong )s->device->host, (ulong )s->device, s->device->id, - s->device->lun, s->device->channel); +/* +* Display Wide Board BIOS Information. +*/ +if (ASC_WIDE_BOARD (boardp)) { + cp = boardp->prtbuf; + cplen =asc_prt_adv_bios (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, + cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; + } -asc_prt_hex (" CDB" , s->cmnd, s->cmd_len); +/* +* Display driver information for each device attached to the board. +*/ + cp = boardp->prtbuf; + cplen =asc_prt_board_devices (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk ("sc_data_direction %u, resid %d\n" , - s->sc_data_direction, s->resid); +/* +* Display EEPROM configuration for the board. +*/ + cp = boardp->prtbuf; +if (ASC_NARROW_BOARD (boardp)) { + cplen =asc_prt_asc_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); + }else { + cplen =asc_prt_adv_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); + } +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk (" use_sg %u, sglist_len %u\n" , s->use_sg, s->sglist_len); +/* +* Display driver configuration and information for the board. +*/ + cp = boardp->prtbuf; + cplen =asc_prt_driver_conf (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk (" serial_number 0x%x, retries %d, allowed %d\n" , - (unsigned )s->serial_number, s->retries, s->allowed); +#ifdef ADVANSYS_STATS +/* +* Display driver statistics for the board. +*/ + cp = boardp->prtbuf; + cplen =asc_prt_board_stats (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; +#endif /* ADVANSYS_STATS */ -printk (" timeout_per_command %d\n" , s->timeout_per_command); +/* +* Display Asc Library dynamic configuration information +* for the board. +*/ + cp = boardp->prtbuf; +if (ASC_NARROW_BOARD (boardp)) { + cplen =asc_prt_asc_board_info (shost, cp,ASC_PRTBUF_SIZE ); + }else { + cplen =asc_prt_adv_board_info (shost, cp,ASC_PRTBUF_SIZE ); + } +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk (" scsi_done 0x%p, done 0x%p, host_scribble 0x%p, result 0x%x\n" , - s->scsi_done, s->done, s->host_scribble, s->result); +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -printk (" tag %u, pid %u\n" , (unsigned )s->tag, (unsigned )s->pid); +return totcnt; } +#endif /* CONFIG_PROC_FS */ -/* -* asc_prt_asc_dvc_var() -*/ -static void asc_prt_asc_dvc_var (ASC_DVC_VAR *h) +static void asc_scsi_done (struct scsi_cmnd *scp) { -printk ("ASC_DVC_VAR at addr 0x%lx\n" , (ulong )h); - -printk (" iop_base 0x%x, err_code 0x%x, dvc_cntl 0x%x, bug_fix_cntl " -"%d,\n" , h->iop_base, h->err_code, h->dvc_cntl, h->bug_fix_cntl); - -printk (" bus_type %d, init_sdtr 0x%x,\n" , h->bus_type, - (unsigned )h->init_sdtr); +struct asc_board *boardp =ASC_BOARDP (scp->device->host); -printk (" sdtr_done 0x%x, use_tagged_qng 0x%x, unit_not_ready 0x%x, " -"chip_no 0x%x,\n" , (unsigned )h->sdtr_done, - (unsigned )h->use_tagged_qng, (unsigned )h->unit_not_ready, - (unsigned )h->chip_no); +if (scp->use_sg) +dma_unmap_sg (boardp->dev, + (struct scatterlist *)scp->request_buffer, + scp->use_sg, scp->sc_data_direction); +else if (scp->request_bufflen) +dma_unmap_single (boardp->dev, scp->SCp.dma_handle, + scp->request_bufflen, scp->sc_data_direction); -printk (" queue_full_or_busy 0x%x, start_motor 0x%x, scsi_reset_wait " -"%u,\n" , (unsigned )h->queue_full_or_busy, - (unsigned )h->start_motor, (unsigned )h->scsi_reset_wait); +ASC_STATS (scp->device->host, done); -printk (" is_in_int %u, max_total_qng %u, cur_total_qng %u, " -"in_critical_cnt %u,\n" , (unsigned )h->is_in_int, - (unsigned )h->max_total_qng, (unsigned )h->cur_total_qng, - (unsigned )h->in_critical_cnt); + scp->scsi_done (scp); +} -printk (" last_q_shortage %u, init_state 0x%x, no_scam 0x%x, " -"pci_fix_asyn_xfer 0x%x,\n" , (unsigned )h->last_q_shortage, - (unsigned )h->init_state, (unsigned )h->no_scam, - (unsigned )h->pci_fix_asyn_xfer); +static void AscSetBank (PortAddr iop_base,uchar bank) +{ +uchar val; -printk (" cfg 0x%lx, irq_no 0x%x\n" , (ulong )h->cfg, (unsigned )h->irq_no); + val =AscGetChipControl (iop_base) & + (~ + (CC_SINGLE_STEP |CC_TEST |CC_DIAG |CC_SCSI_RESET | +CC_CHIP_RESET )); +if (bank ==1 ) { + val |=CC_BANK_ONE ; + }else if (bank ==2 ) { + val |=CC_DIAG |CC_BANK_ONE ; + }else { + val &= ~CC_BANK_ONE ; + } +AscSetChipControl (iop_base, val); +return ; } -/* -* asc_prt_asc_dvc_cfg() -*/ -static void asc_prt_asc_dvc_cfg (ASC_DVC_CFG *h) +static void AscSetChipIH (PortAddr iop_base,ushort ins_code) { -printk ("ASC_DVC_CFG at addr 0x%lx\n" , (ulong )h); - -printk (" can_tagged_qng 0x%x, cmd_qng_enabled 0x%x,\n" , - h->can_tagged_qng, h->cmd_qng_enabled); -printk (" disc_enable 0x%x, sdtr_enable 0x%x,\n" , - h->disc_enable, h->sdtr_enable); +AscSetBank (iop_base,1 ); +AscWriteChipIH (iop_base, ins_code); +AscSetBank (iop_base,0 ); +return ; +} -printk - (" chip_scsi_id %d, isa_dma_speed %d, isa_dma_channel %d, chip_version %d,\n" , - h->chip_scsi_id, h->isa_dma_speed, h->isa_dma_channel, - h->chip_version); +static int AscStartChip (PortAddr iop_base) +{ +AscSetChipControl (iop_base,0 ); +if ((AscGetChipStatus (iop_base) &CSW_HALTED ) !=0 ) { +return (0 ); + } +return (1 ); +} -printk - (" pci_device_id %d, lib_serial_no %u, lib_version %u, mcode_date 0x%x,\n" , -to_pci_dev (h->dev)->device, h->lib_serial_no, h->lib_version, - h->mcode_date); +static int AscStopChip (PortAddr iop_base) +{ +uchar cc_val; -printk (" mcode_version %d, overrun_buf 0x%lx\n" , - h->mcode_version, (ulong )h->overrun_buf); + cc_val = +AscGetChipControl (iop_base) & + (~(CC_SINGLE_STEP |CC_TEST |CC_DIAG )); +AscSetChipControl (iop_base, (uchar)(cc_val |CC_HALT )); +AscSetChipIH (iop_base,INS_HALT ); +AscSetChipIH (iop_base,INS_RFLAG_WTM ); +if ((AscGetChipStatus (iop_base) &CSW_HALTED ) ==0 ) { +return (0 ); + } +return (1 ); } -/* -* asc_prt_asc_scsi_q() -*/ -static void asc_prt_asc_scsi_q (ASC_SCSI_Q *q) +static int AscIsChipHalted (PortAddr iop_base) { -ASC_SG_HEAD *sgp; -int i; - -printk ("ASC_SCSI_Q at addr 0x%lx\n" , (ulong )q); +if ((AscGetChipStatus (iop_base) &CSW_HALTED ) !=0 ) { +if ((AscGetChipControl (iop_base) &CC_HALT ) !=0 ) { +return (1 ); + } + } +return (0 ); +} -printk - (" target_ix 0x%x, target_lun %u, srb_ptr 0x%lx, tag_code 0x%x,\n" , - q->q2.target_ix, q->q1.target_lun, (ulong )q->q2.srb_ptr, - q->q2.tag_code); +static int AscResetChipAndScsiBus (ASC_DVC_VAR *asc_dvc) +{ +PortAddr iop_base; +int i =10 ; -printk - (" data_addr 0x%lx, data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , - (ulong )le32_to_cpu (q->q1.data_addr), - (ulong )le32_to_cpu (q->q1.data_cnt), - (ulong )le32_to_cpu (q->q1.sense_addr), q->q1.sense_len); + iop_base = asc_dvc->iop_base; +while ((AscGetChipStatus (iop_base) &CSW_SCSI_RESET_ACTIVE ) + && (i-- >0 )) { +mdelay (100 ); + } +AscStopChip (iop_base); +AscSetChipControl (iop_base,CC_CHIP_RESET |CC_SCSI_RESET |CC_HALT ); +udelay (60 ); +AscSetChipIH (iop_base,INS_RFLAG_WTM ); +AscSetChipIH (iop_base,INS_HALT ); +AscSetChipControl (iop_base,CC_CHIP_RESET |CC_HALT ); +AscSetChipControl (iop_base,CC_HALT ); +mdelay (200 ); +AscSetChipStatus (iop_base,CIW_CLR_SCSI_RESET_INT ); +AscSetChipStatus (iop_base,0 ); +return (AscIsChipHalted (iop_base)); +} -printk (" cdbptr 0x%lx, cdb_len %u, sg_head 0x%lx, sg_queue_cnt %u\n" , - (ulong )q->cdbptr, q->q2.cdb_len, - (ulong )q->sg_head, q->q1.sg_queue_cnt); +static int AscFindSignature (PortAddr iop_base) +{ +ushort sig_word; -if (q->sg_head) { - sgp = q->sg_head; -printk ("ASC_SG_HEAD at addr 0x%lx\n" , (ulong )sgp); -printk (" entry_cnt %u, queue_cnt %u\n" , sgp->entry_cnt, - sgp->queue_cnt); -for (i =0 ; i < sgp->entry_cnt; i++) { -printk (" [%u]: addr 0x%lx, bytes %lu\n" , - i, (ulong )le32_to_cpu (sgp->sg_list[i].addr), - (ulong )le32_to_cpu (sgp->sg_list[i].bytes)); +ASC_DBG2 (1 ,"AscFindSignature: AscGetChipSignatureByte(0x%x) 0x%x\n" , + iop_base,AscGetChipSignatureByte (iop_base)); +if (AscGetChipSignatureByte (iop_base) == (uchar )ASC_1000_ID1B ) { +ASC_DBG2 (1 , +"AscFindSignature: AscGetChipSignatureWord(0x%x) 0x%x\n" , + iop_base,AscGetChipSignatureWord (iop_base)); + sig_word =AscGetChipSignatureWord (iop_base); +if ((sig_word == (ushort )ASC_1000_ID0W ) || + (sig_word == (ushort )ASC_1000_ID0W_FIX )) { +return (1 ); } - } +return (0 ); } -/* -* asc_prt_asc_qdone_info() -*/ -static void asc_prt_asc_qdone_info (ASC_QDONE_INFO *q) +static void AscEnableInterrupt (PortAddr iop_base) { -printk ("ASC_QDONE_INFO at addr 0x%lx\n" , (ulong )q); -printk (" srb_ptr 0x%lx, target_ix %u, cdb_len %u, tag_code %u,\n" , - (ulong )q->d2.srb_ptr, q->d2.target_ix, q->d2.cdb_len, - q->d2.tag_code); -printk - (" done_stat 0x%x, host_stat 0x%x, scsi_stat 0x%x, scsi_msg 0x%x\n" , - q->d3.done_stat, q->d3.host_stat, q->d3.scsi_stat, q->d3.scsi_msg); +ushort cfg; + + cfg =AscGetChipCfgLsw (iop_base); +AscSetChipCfgLsw (iop_base, cfg |ASC_CFG0_HOST_INT_ON ); +return ; } -/* -* asc_prt_adv_dvc_var() -* -* Display an ADV_DVC_VAR structure. -*/ -static void asc_prt_adv_dvc_var (ADV_DVC_VAR *h) +static void AscDisableInterrupt (PortAddr iop_base) { -printk (" ADV_DVC_VAR at addr 0x%lx\n" , (ulong )h); +ushort cfg; -printk (" iop_base 0x%lx, err_code 0x%x, ultra_able 0x%x\n" , - (ulong )h->iop_base, h->err_code, (unsigned )h->ultra_able); + cfg =AscGetChipCfgLsw (iop_base); +AscSetChipCfgLsw (iop_base, cfg & (~ASC_CFG0_HOST_INT_ON )); +return ; +} -printk (" isr_callback 0x%lx, sdtr_able 0x%x, wdtr_able 0x%x\n" , - (ulong )h->isr_callback, (unsigned )h->sdtr_able, - (unsigned )h->wdtr_able); +static uchar AscReadLramByte (PortAddr iop_base,ushort addr) +{ +unsigned char byte_data; +unsigned short word_data; -printk (" start_motor 0x%x, scsi_reset_wait 0x%x, irq_no 0x%x,\n" , - (unsigned )h->start_motor, - (unsigned )h->scsi_reset_wait, (unsigned )h->irq_no); +if (isodd_word (addr)) { +AscSetChipLramAddr (iop_base, addr -1 ); + word_data =AscGetChipLramData (iop_base); + byte_data = (word_data >>8 ) &0xFF ; + }else { +AscSetChipLramAddr (iop_base, addr); + word_data =AscGetChipLramData (iop_base); + byte_data = word_data &0xFF ; + } +return byte_data; +} -printk (" max_host_qng %u, max_dvc_qng %u, carr_freelist 0x%lxn\n" , - (unsigned )h->max_host_qng, (unsigned )h->max_dvc_qng, - (ulong )h->carr_freelist); +static ushort AscReadLramWord (PortAddr iop_base,ushort addr) +{ +ushort word_data; -printk (" icq_sp 0x%lx, irq_sp 0x%lx\n" , - (ulong )h->icq_sp, (ulong )h->irq_sp); +AscSetChipLramAddr (iop_base, addr); + word_data =AscGetChipLramData (iop_base); +return (word_data); +} -printk (" no_scam 0x%x, tagqng_able 0x%x\n" , - (unsigned )h->no_scam, (unsigned )h->tagqng_able); +#if CC_VERY_LONG_SG_LIST +static ASC_DCNT AscReadLramDWord (PortAddr iop_base,ushort addr) +{ +ushort val_low, val_high; +ASC_DCNT dword_data; -printk (" chip_scsi_id 0x%x, cfg 0x%lx\n" , - (unsigned )h->chip_scsi_id, (ulong )h->cfg); +AscSetChipLramAddr (iop_base, addr); + val_low =AscGetChipLramData (iop_base); + val_high =AscGetChipLramData (iop_base); + dword_data = ((ASC_DCNT ) val_high <<16 ) | (ASC_DCNT ) val_low; +return (dword_data); } +#endif /* CC_VERY_LONG_SG_LIST */ -/* -* asc_prt_adv_dvc_cfg() -* -* Display an ADV_DVC_CFG structure. -*/ -static void asc_prt_adv_dvc_cfg (ADV_DVC_CFG *h) +static void +AscMemWordSetLram (PortAddr iop_base,ushort s_addr,ushort set_wval,int words) { -printk (" ADV_DVC_CFG at addr 0x%lx\n" , (ulong )h); +int i; -printk (" disc_enable 0x%x, termination 0x%x\n" , - h->disc_enable, h->termination); +AscSetChipLramAddr (iop_base, s_addr); +for (i =0 ; i < words; i++) { +AscSetChipLramData (iop_base, set_wval); + } +} -printk (" chip_version 0x%x, mcode_date 0x%x\n" , - h->chip_version, h->mcode_date); +static void AscWriteLramWord (PortAddr iop_base,ushort addr,ushort word_val) +{ +AscSetChipLramAddr (iop_base, addr); +AscSetChipLramData (iop_base, word_val); +return ; +} -printk (" mcode_version 0x%x, pci_device_id 0x%x, lib_version %u\n" , - h->mcode_version,to_pci_dev (h->dev)->device, h->lib_version); +static void AscWriteLramByte (PortAddr iop_base,ushort addr,uchar byte_val) +{ +ushort word_data; -printk (" control_flag 0x%x\n" , h->control_flag); +if (isodd_word (addr)) { + addr--; + word_data =AscReadLramWord (iop_base, addr); + word_data &=0x00FF ; + word_data |= (((ushort )byte_val <<8 ) &0xFF00 ); + }else { + word_data =AscReadLramWord (iop_base, addr); + word_data &=0xFF00 ; + word_data |= ((ushort )byte_val &0x00FF ); + } +AscWriteLramWord (iop_base, addr, word_data); +return ; }/* -* asc_prt_adv_scsi_req_q() +* Copy 2 bytes to LRAM. * -* Display an ADV_SCSI_REQ_Q structure. +* The source data is assumed to be in little-endian order in memory +* and is maintained in little-endian order when written to LRAM. */ -static void asc_prt_adv_scsi_req_q (ADV_SCSI_REQ_Q *q) +static void +AscMemWordCopyPtrToLram (PortAddr iop_base, +ushort s_addr,uchar *s_buffer,int words) { -int sg_blk_cnt; -struct asc_sg_block *sg_ptr; - -printk ("ADV_SCSI_REQ_Q at addr 0x%lx\n" , (ulong )q); - -printk (" target_id %u, target_lun %u, srb_ptr 0x%lx, a_flag 0x%x\n" , - q->target_id, q->target_lun, (ulong )q->srb_ptr, q->a_flag); - -printk (" cntl 0x%x, data_addr 0x%lx, vdata_addr 0x%lx\n" , - q->cntl, (ulong )le32_to_cpu (q->data_addr), (ulong )q->vdata_addr); - -printk (" data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , - (ulong )le32_to_cpu (q->data_cnt), - (ulong )le32_to_cpu (q->sense_addr), q->sense_len); - -printk - (" cdb_len %u, done_status 0x%x, host_status 0x%x, scsi_status 0x%x\n" , - q->cdb_len, q->done_status, q->host_status, q->scsi_status); - -printk (" sg_working_ix 0x%x, target_cmd %u\n" , - q->sg_working_ix, q->target_cmd); - -printk (" scsiq_rptr 0x%lx, sg_real_addr 0x%lx, sg_list_ptr 0x%lx\n" , - (ulong )le32_to_cpu (q->scsiq_rptr), - (ulong )le32_to_cpu (q->sg_real_addr), (ulong )q->sg_list_ptr); +int i; -/* Display the request's ADV_SG_BLOCK structures. */ -if (q->sg_list_ptr !=NULL ) { - sg_blk_cnt =0 ; -while (1 ) { -/* -* 'sg_ptr' is a physical address. Convert it to a virtual -* address by indexing 'sg_blk_cnt' into the virtual address -* array 'sg_list_ptr'. -* -* XXX - Assumes all SG physical blocks are virtually contiguous. -*/ - sg_ptr = - &(((ADV_SG_BLOCK *)(q->sg_list_ptr))[sg_blk_cnt]); -asc_prt_adv_sgblock (sg_blk_cnt, sg_ptr); -if (sg_ptr->sg_ptr ==0 ) { -break ; - } - sg_blk_cnt++; - } +AscSetChipLramAddr (iop_base, s_addr); +for (i =0 ; i <2 * words; i +=2 ) { +/* +* On a little-endian system the second argument below +* produces a little-endian ushort which is written to +* LRAM in little-endian order. On a big-endian system +* the second argument produces a big-endian ushort which +* is "transparently" byte-swapped by outpw() and written +* in little-endian order to LRAM. +*/ +outpw (iop_base +IOP_RAM_DATA , + ((ushort )s_buffer[i +1 ] <<8 ) | s_buffer[i]); } +return ; }/* -* asc_prt_adv_sgblock() +* Copy 4 bytes to LRAM. * -* Display an ADV_SG_BLOCK structure.
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.2.4
Part of the diff is not shown here. View the raw message.
Re: [PATCH 16/22] advansys: Eliminate prototypes
Quoted 2 lines · Matthew Wilcox
Rearrange a lot of the functions in the file to get rid of all the forward declarations.
What thoughts, if any, have been given to post-patch code arrangement, besides eliminating prototypes?
This always struck me as a counterproductive exercise when taken by itself. Sure, prototypes were eliminated, but was code packed together in an efficient way afterwards? Ideally hot path code should be close together, ditto for various other things like error handling code.
Without further explanation or details about your post-patch analysis, how do we even know the new code arrangement doesn't negatively impact i-cache overall?
Jeff
Re: [PATCH 16/22] advansys: Eliminate prototypes
Quoted 4 lines · Jeff Garzik
What thoughts, if any, have been given to post-patch code arrangement, besides eliminating prototypes?
This always struck me as a counterproductive exercise when taken by itself.
Eliminating prototypes saves me from an extra go round of the edit-compile testcycle when I change the signature of a function. It probably doesn't matter to you, but it adds a small amount of annoyance to my day.
Quoted 3 lines
Sure, prototypes were eliminated, but was code packed together in an efficient way afterwards? Ideally hot path code should be close together, ditto for various other things like error handling code.
I tried to place functions close together that seemed like they were
called together and called from each other. It's hard to know,
of course, because GCC will make its own decisions about inlining, for example. At the end of the day, this is an NP problem. I remmber Nat writing grope and using simulated annealing to solve the problem.
Quoted 3 lines
Without further explanation or details about your post-patch analysis, how do we even know the new code arrangement doesn't negatively impact i-cache overall?
We don't, but the new layout is more likely to be good than bad, given how I did the rearrangement (delete prototypes, try to compile. Move called function to before its first caller. Repeat). Plus, with all the other changes I'm making, there's a serious reduction in driver size. I haven't compared i-cache sizes specifically, but I'm mostly removing code, so it should be better.
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH 16/22] advansys: Eliminate prototypes
In reply to Matthew WilcoxQuoted 3 lines · Matthew Wilcox
Rearrange a lot of the functions in the file to get rid of all the forward
declarations.
I get a compile failure at this point in your patch sequence:
CC [M] drivers/scsi/advansys.odrivers/scsi/advansys.c:72:2: warning: #warning this driver is still not properly converted to the DMA APIdrivers/scsi/advansys.c: In function 'AscGetChipBiosAddress':drivers/scsi/advansys.c:11536: error: implicit declaration of function 'AscGetEisaChipCfg'drivers/scsi/advansys.c: At top level:drivers/scsi/advansys.c:11555: error: conflicting types for 'AscGetEisaChipCfg'drivers/scsi/advansys.c:11536: error: previous implicit declaration of 'AscGetEisaChipCfg' was heredrivers/scsi/advansys.c: In function 'AscSetIsaDmaSpeed':drivers/scsi/advansys.c:11750: error: implicit declaration of function 'AscGetIsaDmaSpeed'drivers/scsi/advansys.c: At top level:drivers/scsi/advansys.c:11754: error: conflicting types for 'AscGetIsaDmaSpeed'drivers/scsi/advansys.c:11750: error: previous implicit declaration of 'AscGetIsaDmaSpeed' was here
make[2]: *** [drivers/scsi/advansys.o] Error 1
make[1]: *** [drivers/scsi] Error 2
make: *** [drivers] Error 2
I've put 1-15 in .. could you rebase against scsi-misc and eliminate this problem?
Thanks,
James
Re: [PATCH 16/22] advansys: Eliminate prototypes
Quoted 1 line · James Bottomley
I get a compile failure at this point in your patch sequence:
Thanks. I'd been compiling with CONFIG_ISA=n, so hadn't spotted these two problems. I've set it back to Y now.
Quoted 2 lines
I've put 1-15 in .. could you rebase against scsi-misc and eliminate this problem?
Yup. I've written some more patches since, and I'll include those too.
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH 16/22] advansys: Eliminate prototypes
Quoted 5 lines · On Sun, 16 Sep 2007 09:31:34 -0600 Matthew Wilcox <[email protected]> wrote:
Quoted 1 line · James Bottomley
I get a compile failure at this point in your patch sequence:
Thanks. I'd been compiling with
CONFIG_ISA=n, so hadn't spotted these two problems. I've set it back to Y now.
If I compile your latest patchset with CONFIG_ISA=n, I got:
drivers/built-in.o: In function `advansys_init':
advansys.c:(.init.text+0x3edc): undefined reference to isa_register_driver' advansys.c:(.init.text+0x3efb): undefined reference to isa_register_driver' advansys.c:(.init.text+0x3f22): undefined reference to isa_unregister_driver' advansys.c:(.init.text+0x3f36): undefined reference to isa_unregister_driver' drivers/built-in.o: In function `advansys_exit':
advansys.c:(.exit.text+0x210): undefined reference to isa_unregister_driver' advansys.c:(.exit.text+0x21a): undefined reference to isa_unregister_driver' make[1]: *** [.tmp_vmlinux1] Error 1
make[1]: Leaving directory `/home/fujita/git/linux-2.6'
make: *** [debian/stamp-build-kernel] Error 2
Is this already fixed like this?
-
From: FUJITA Tomonori <[email protected]>
Subject: [PATCH] isa: add fake isa_register_driver and isa_unregister_driver
add fake isa_register_driver and isa_unregister_driver for !CONFIG_ISA case.
Signed-off-by FUJITA Tomonori <[email protected]>
--- include/linux/isa.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
include/linux/isa.h +10 -0
@@ -22,7 +22,17 @@ struct isa_driver {#define to_isa_driver (x) container_of((x), struct isa_driver, driver) +#ifdef CONFIG_ISA int isa_register_driver (struct isa_driver *,unsigned int );void isa_unregister_driver (struct isa_driver *); +#else +static inline int isa_register_driver (struct isa_driver *idrv,unsigned int n) +{ +return 0 ; +} +static inline void isa_unregister_driver (struct isa_driver *idrv) +{ +} +#endif #endif /* __LINUX_ISA_H */
Signature · 1 line
1.5.2.4
Re: [PATCH 16/22] advansys: Eliminate prototypes
Quoted 6 lines · FUJITA Tomonori
Quoted 3 lines · On Sun, 16 Sep 2007 09:31:34 -0600 Matthew Wilcox <[email protected]> wrote:
Quoted 1 line · James Bottomley
I get a compile failure at this point in your patch sequence:
Quoted 8 lines
Quoted 2 lines
Thanks. I'd been compiling with
CONFIG_ISA=n, so hadn't spotted these two problems. I've set it back to Y now.If I compile your latest patchset with
CONFIG_ISA=n, I got:
drivers/built-in.o: In function `advansys_init':
advansys.c:(.init.text+0x3efb): undefined reference toisa_register_driver' advansys.c:(.init.text+0x3f22): undefined reference toisa_unregister_driver'
Fixed by http://marc.info/?l=linux-kernel&m=118780055118323&w=2 which I thought was in -mm, but I can't find it. I've just reset it to Linus & Andrew. Thanks for mentioning it.
Now I'm back home, I'll add your sg patch to my tree. I'd forgotten about it ...
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH 16/22] advansys: Eliminate prototypes
Quoted 12 lines · On Sun, 16 Sep 2007 17:03:50 -0600 Matthew Wilcox <[email protected]> wrote:
Quoted 11 lines · FUJITA Tomonori
Quoted 5 lines · On Sun, 16 Sep 2007 09:31:34 -0600 Matthew Wilcox <[email protected]> wrote:
Quoted 1 line · James Bottomley
I get a compile failure at this point in your patch sequence:
Thanks. I'd been compiling with
CONFIG_ISA=n, so hadn't spotted these two problems. I've set it back to Y now.If I compile your latest patchset with
CONFIG_ISA=n, I got:
Quoted 7 lines
Quoted 3 lines
drivers/built-in.o: In function `advansys_init':
advansys.c:(.init.text+0x3efb): undefined reference toisa_register_driver' advansys.c:(.init.text+0x3f22): undefined reference toisa_unregister_driver'Fixed by http://marc.info/?l=linux-kernel&m=118780055118323&w=2 which I thought was in -mm, but I can't find it. I've just reset it to Linus & Andrew. Thanks for mentioning it.
Oh, I see.
Quoted 2 lines
Now I'm back home, I'll add your sg patch to my tree. I'd forgotten about it ...
I updated the previous patch for your latest patchset. I removed the sg chaining support so you can send it to scsi-misc now.
Just a one-line patch is necessary for the sg chaining support. It'll be push to mainline via Jens' tree.
From: FUJITA Tomonori <[email protected]>
Subject: [PATCH] advansys: convert to use the data buffer accessors
- remove the unnecessary map_single path.
- convert to use the new accessors for the sg lists and the parameters.
Signed-off-by FUJITA Tomonori <[email protected]>
--- drivers/scsi/advansys.c | 83 +++++++++++++--------------------------------- 1 files changed, 24 insertions(+), 59 deletions(-)
drivers/scsi/advansys.c +24 -59
@@ -4301,15 +4301,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,static void asc_scsi_done (struct scsi_cmnd *scp) { -struct asc_board *boardp =shost_priv (scp->device->host); - -if (scp->use_sg) -dma_unmap_sg (boardp->dev, - (struct scatterlist *)scp->request_buffer, - scp->use_sg, scp->sc_data_direction); -else if (scp->request_bufflen) -dma_unmap_single (boardp->dev, scp->SCp.dma_handle, - scp->request_bufflen, scp->sc_data_direction); +scsi_dma_unmap (scp);ASC_STATS (scp->device->host, done);
@@ -8210,11 +8202,11 @@ static void adv_isr_callback(ADV_DVC_VAR *adv_dvc_varp, ADV_SCSI_REQ_Q *scsiqp)* then return the number of underrun bytes. */ resid_cnt =le32_to_cpu (scsiqp->data_cnt); -if (scp->request_bufflen !=0 && resid_cnt !=0 && - resid_cnt <= scp->request_bufflen) { +if (scsi_bufflen (scp) !=0 && resid_cnt !=0 && + resid_cnt <=scsi_bufflen (scp)) {ASC_DBG (1 ,"underrun condition %lu bytes\n" , (ulong )resid_cnt); - scp->resid = resid_cnt; +scsi_set_resid (scp, resid_cnt); }break ;
@@ -9877,6 +9869,7 @@ static int advansys_slave_configure(struct scsi_device *sdev)static int asc_build_req (struct asc_board *boardp,struct scsi_cmnd *scp,struct asc_scsi_q *asc_scsi_q) { +int use_sg;memset (asc_scsi_q,0 ,sizeof (*asc_scsi_q));/*
@@ -9919,40 +9912,28 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,* Build ASC_SCSI_Q for a contiguous buffer or a scatter-gather * buffer command. */ -if (scp->use_sg ==0 ) { + use_sg =scsi_dma_map (scp); +if (use_sg ==0 ) {/* * CDB request of single contiguous buffer. */ ASC_STATS (scp->device->host, cont_cnt); - scp->SCp.dma_handle = scp->request_bufflen ? -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction) :0 ; - asc_scsi_q->q1.data_addr =cpu_to_le32 (scp->SCp.dma_handle); - asc_scsi_q->q1.data_cnt =cpu_to_le32 (scp->request_bufflen); + scp->SCp.dma_handle =0 ;ASC_STATS_ADD (scp->device->host, cont_xfer,ASC_CEILING (scp->request_bufflen,512 )); - asc_scsi_q->q1.sg_queue_cnt =0 ; - asc_scsi_q->sg_head =NULL ; }else {/* * CDB scatter-gather request list. */ int sgcnt; -int use_sg;struct scatterlist *slp;struct asc_sg_head *asc_sg_head; - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); -if (use_sg > scp->device->host->sg_tablesize) {scmd_printk (KERN_ERR , scp,"use_sg %d > " "sg_tablesize %d\n" , use_sg, scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +scsi_dma_unmap (scp); scp->result =HOST_BYTE (DID_ERROR );return ASC_ERROR ; }
@@ -9962,8 +9943,7 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, asc_sg_head =kzalloc (sizeof (asc_scsi_q->sg_head) + use_sg *sizeof (struct asc_sg_list ),GFP_ATOMIC );if (!asc_sg_head) { -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +scsi_dma_unmap (scp); scp->result =HOST_BYTE (DID_SOFT_ERROR );return ASC_ERROR ; }
@@ -9980,7 +9960,7 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,/* * Convert scatter-gather list into ASC_SG_HEAD list. */ -for (sgcnt =0 ; sgcnt < use_sg; sgcnt++, slp++) { +scsi_for_each_sg (scp, slp, use_sg, sgcnt) { asc_sg_head->sg_list[sgcnt].addr =cpu_to_le32 (sg_dma_address (slp)); asc_sg_head->sg_list[sgcnt].bytes =
@@ -10021,7 +10001,7 @@ adv_get_sglist(struct asc_board *boardp, adv_req_t *reqp, struct scsi_cmnd *scp,int i; scsiqp = (ADV_SCSI_REQ_Q *)ADV_32BALIGN (&reqp->scsi_req_q); - slp = (struct scatterlist *)scp->request_buffer; + slp =scsi_sglist (scp); sg_elem_cnt = use_sg; prev_sg_block =NULL ; reqp->sgblkp =NULL ;
@@ -10126,6 +10106,7 @@ adv_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,ADV_SCSI_REQ_Q *scsiqp;int i;int ret; +int use_sg;/* * Allocate an adv_req_t structure from the board to execute
@@ -10187,49 +10168,33 @@ adv_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,* buffer command. */ - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); - scsiqp->vdata_addr = scp->request_buffer; - scsiqp->data_addr =cpu_to_le32 (virt_to_bus (scp->request_buffer)); - -if (scp->use_sg ==0 ) { + scsiqp->data_cnt =cpu_to_le32 (scsi_bufflen (scp)); + use_sg =scsi_dma_map (scp); +if (use_sg ==0 ) {/* * CDB request of single contiguous buffer. */ reqp->sgblkp =NULL ; - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); -if (scp->request_bufflen) { - scsiqp->vdata_addr = scp->request_buffer; - scp->SCp.dma_handle = -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction); - }else { - scsiqp->vdata_addr =NULL ; - scp->SCp.dma_handle =0 ; - } - scsiqp->data_addr =cpu_to_le32 (scp->SCp.dma_handle); + + scsiqp->data_cnt =0 ; + scsiqp->vdata_addr =NULL ; + scp->SCp.dma_handle =0 ; + + scsiqp->data_addr =0 ; scsiqp->sg_list_ptr =NULL ; scsiqp->sg_real_addr =0 ;ASC_STATS (scp->device->host, cont_cnt); -ASC_STATS_ADD (scp->device->host, cont_xfer, -ASC_CEILING (scp->request_bufflen,512 )); +ASC_STATS_ADD (scp->device->host, cont_xfer,0 ); }else {/* * CDB scatter-gather request list. */ -struct scatterlist *slp; -int use_sg; - - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction);if (use_sg >ADV_MAX_SG_LIST ) {scmd_printk (KERN_ERR , scp,"use_sg %d > " "ADV_MAX_SG_LIST %d\n" , use_sg, scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +scsi_dma_unmap (scp); scp->result =HOST_BYTE (DID_ERROR );/*
Signature · 1 line
1.5.2.4
Re: [PATCH 16/22] advansys: Eliminate prototypes
Quoted 5 lines · FUJITA Tomonori
I updated the previous patch for your latest patchset. I removed the sg chaining support so you can send it to scsi-misc now.
Just a one-line patch is necessary for the sg chaining support. It'll be push to mainline via Jens' tree.
Thanks. I took care of a few other things too .. here's the patch I ended up committing. James, if you want to take this now, that's fine by me, otherwise I'll send it as part of my next round of updates.
commit da1910c08d03b97d98ebefc3b28d1c147e77e02e
Author: Matthew Wilcox <[email protected]> Date: Mon Sep 17 08:18:32 2007 -0400
advansys: convert to use the data buffer accessors
- remove the unnecessary map_single path.
- convert to use the new accessors for the sg lists and the parameters.
Signed-off-by FUJITA Tomonori <[email protected]>
- convert the statistics to not distinguish between single and sg xfers
- replace ASC_CEILING with DIV_ROUND_UP
- remove an obsolete comment
Signed-off-by Matthew Wilcox <[email protected]>
drivers/scsi/advansys.c +52 -184
@@ -2223,8 +2223,6 @@ do { \ (((struct asc_board *) shost_priv(shost))->asc_stats.counter += (count))#endif /* ADVANSYS_STATS */ -#define ASC_CEILING (val, unit) (((val) + ((unit) - 1))/(unit)) -/* If the result wraps when calculating tenths, return 0. */ #define ASC_TENTHS (num, den) \ (((10 * ((num)/(den))) > (((num) * 10)/(den))) ? \
@@ -2356,11 +2354,9 @@ struct asc_stats {ADV_DCNT exe_error;/* # ASC_ERROR returns. */ ADV_DCNT exe_unknown;/* # unknown returns. */ /* Data Transfer Statistics */ -ADV_DCNT cont_cnt;/* # non-scatter-gather I/O requests received */ -ADV_DCNT cont_xfer;/* # contiguous transfer 512-bytes */ -ADV_DCNT sg_cnt;/* # scatter-gather I/O requests received */ -ADV_DCNT sg_elem;/* # scatter-gather elements */ - ADV_DCNT sg_xfer; /* # scatter-gather transfer 512-bytes */ +ADV_DCNT xfer_cnt;/* # I/O requests received */ +ADV_DCNT xfer_elem;/* # scatter-gather elements */ + ADV_DCNT xfer_sect; /* # 512-byte blocks */ };#endif /* ADVANSYS_STATS */
@@ -4057,57 +4053,32 @@ static int asc_prt_board_stats(struct Scsi_Host *shost, char *cp, int cplen)/* * Display data transfer statistics. */ -if (s->cont_cnt >0 ) { - len =asc_prt_line (cp, leftlen," cont_cnt %lu, " , s->cont_cnt); -ASC_PRT_NEXT (); - - len =asc_prt_line (cp, leftlen,"cont_xfer %lu.%01lu kb " , - s->cont_xfer /2 , -ASC_TENTHS (s->cont_xfer,2 )); -ASC_PRT_NEXT (); - -/* Contiguous transfer average size */ - len =asc_prt_line (cp, leftlen,"avg_xfer %lu.%01lu kb\n" , - (s->cont_xfer /2 ) / s->cont_cnt, -ASC_TENTHS ((s->cont_xfer /2 ), s->cont_cnt)); -ASC_PRT_NEXT (); - } - -if (s->sg_cnt >0 ) { - - len =asc_prt_line (cp, leftlen," sg_cnt %lu, sg_elem %lu, " , - s->sg_cnt, s->sg_elem); +if (s->xfer_cnt >0 ) { + len =asc_prt_line (cp, leftlen," xfer_cnt %lu, xfer_elem %lu, " , + s->xfer_cnt, s->xfer_elem);ASC_PRT_NEXT (); - len =asc_prt_line (cp, leftlen,"sg_xfer %lu.%01lu kb\n" , - s->sg_xfer /2 ,ASC_TENTHS (s->sg_xfer,2 )); + len =asc_prt_line (cp, leftlen,"xfer_bytes %lu.%01lu kb\n" , + s->xfer_sect /2 ,ASC_TENTHS (s->xfer_sect,2 ));ASC_PRT_NEXT ();/* Scatter gather transfer statistics */ len =asc_prt_line (cp, leftlen," avg_num_elem %lu.%01lu, " , - s->sg_elem / s->sg_cnt, -ASC_TENTHS (s->sg_elem, s->sg_cnt)); + s->xfer_elem / s->xfer_cnt, +ASC_TENTHS (s->xfer_elem, s->xfer_cnt));ASC_PRT_NEXT (); len =asc_prt_line (cp, leftlen,"avg_elem_size %lu.%01lu kb, " , - (s->sg_xfer /2 ) / s->sg_elem, -ASC_TENTHS ((s->sg_xfer /2 ), s->sg_elem)); + (s->xfer_sect /2 ) / s->xfer_elem, +ASC_TENTHS ((s->xfer_sect /2 ), s->xfer_elem));ASC_PRT_NEXT (); len =asc_prt_line (cp, leftlen,"avg_xfer_size %lu.%01lu kb\n" , - (s->sg_xfer /2 ) / s->sg_cnt, -ASC_TENTHS ((s->sg_xfer /2 ), s->sg_cnt)); + (s->xfer_sect /2 ) / s->xfer_cnt, +ASC_TENTHS ((s->xfer_sect /2 ), s->xfer_cnt));ASC_PRT_NEXT (); } -/* -* Display request queuing statistics. -*/ - len =asc_prt_line (cp, leftlen, -" Active and Waiting Request Queues (Time Unit: %d HZ):\n" , -HZ ); -ASC_PRT_NEXT (); - return totlen; }#endif /* ADVANSYS_STATS */
@@ -4301,18 +4272,8 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start,static void asc_scsi_done (struct scsi_cmnd *scp) { -struct asc_board *boardp =shost_priv (scp->device->host); - -if (scp->use_sg) -dma_unmap_sg (boardp->dev, - (struct scatterlist *)scp->request_buffer, - scp->use_sg, scp->sc_data_direction); -else if (scp->request_bufflen) -dma_unmap_single (boardp->dev, scp->SCp.dma_handle, - scp->request_bufflen, scp->sc_data_direction); - +scsi_dma_unmap (scp);ASC_STATS (scp->device->host, done); - scp->scsi_done (scp); }
@@ -8210,11 +8171,11 @@ static void adv_isr_callback(ADV_DVC_VAR *adv_dvc_varp, ADV_SCSI_REQ_Q *scsiqp)* then return the number of underrun bytes. */ resid_cnt =le32_to_cpu (scsiqp->data_cnt); -if (scp->request_bufflen !=0 && resid_cnt !=0 && - resid_cnt <= scp->request_bufflen) { +if (scsi_bufflen (scp) !=0 && resid_cnt !=0 && + resid_cnt <=scsi_bufflen (scp)) {ASC_DBG (1 ,"underrun condition %lu bytes\n" , (ulong )resid_cnt); - scp->resid = resid_cnt; +scsi_set_resid (scp, resid_cnt); }break ;
@@ -9148,11 +9109,11 @@ static void asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep)* If there was no error and an underrun condition, then * return the number of underrun bytes. */ -if (scp->request_bufflen !=0 && qdonep->remain_bytes !=0 && - qdonep->remain_bytes <= scp->request_bufflen) { +if (scsi_bufflen (scp) !=0 && qdonep->remain_bytes !=0 && + qdonep->remain_bytes <=scsi_bufflen (scp)) {ASC_DBG (1 ,"underrun condition %u bytes\n" , (unsigned )qdonep->remain_bytes); - scp->resid = qdonep->remain_bytes; +scsi_set_resid (scp, qdonep->remain_bytes); }break ;
@@ -9877,6 +9838,8 @@ static int advansys_slave_configure(struct scsi_device *sdev)static int asc_build_req (struct asc_board *boardp,struct scsi_cmnd *scp,struct asc_scsi_q *asc_scsi_q) { +int use_sg; +memset (asc_scsi_q,0 ,sizeof (*asc_scsi_q));/*
@@ -9915,55 +9878,26 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, asc_scsi_q->q2.tag_code =MSG_SIMPLE_TAG ; } -/* -* Build ASC_SCSI_Q for a contiguous buffer or a scatter-gather -* buffer command. -*/ -if (scp->use_sg ==0 ) { -/* -* CDB request of single contiguous buffer. -*/ -ASC_STATS (scp->device->host, cont_cnt); - scp->SCp.dma_handle = scp->request_bufflen ? -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction) :0 ; - asc_scsi_q->q1.data_addr =cpu_to_le32 (scp->SCp.dma_handle); - asc_scsi_q->q1.data_cnt =cpu_to_le32 (scp->request_bufflen); -ASC_STATS_ADD (scp->device->host, cont_xfer, -ASC_CEILING (scp->request_bufflen,512 )); - asc_scsi_q->q1.sg_queue_cnt =0 ; - asc_scsi_q->sg_head =NULL ; - }else { -/* -* CDB scatter-gather request list. -*/ +/* Build ASC_SCSI_Q */ + use_sg =scsi_dma_map (scp); +if (use_sg !=0 ) {int sgcnt; -int use_sg;struct scatterlist *slp;struct asc_sg_head *asc_sg_head; - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); -if (use_sg > scp->device->host->sg_tablesize) {scmd_printk (KERN_ERR , scp,"use_sg %d > " "sg_tablesize %d\n" , use_sg, scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +scsi_dma_unmap (scp); scp->result =HOST_BYTE (DID_ERROR );return ASC_ERROR ; } -ASC_STATS (scp->device->host, sg_cnt); - asc_sg_head =kzalloc (sizeof (asc_scsi_q->sg_head) + use_sg *sizeof (struct asc_sg_list ),GFP_ATOMIC );if (!asc_sg_head) { -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +scsi_dma_unmap (scp); scp->result =HOST_BYTE (DID_SOFT_ERROR );return ASC_ERROR ; }
@@ -9974,22 +9908,24 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, asc_scsi_q->q1.data_addr =0 ;/* This is a byte value, otherwise it would need to be swapped. */ asc_sg_head->entry_cnt = asc_scsi_q->q1.sg_queue_cnt = use_sg; -ASC_STATS_ADD (scp->device->host, sg_elem, +ASC_STATS_ADD (scp->device->host, xfer_elem, asc_sg_head->entry_cnt);/* * Convert scatter-gather list into ASC_SG_HEAD list. */ -for (sgcnt =0 ; sgcnt < use_sg; sgcnt++, slp++) { +scsi_for_each_sg (scp, slp, use_sg, sgcnt) { asc_sg_head->sg_list[sgcnt].addr =cpu_to_le32 (sg_dma_address (slp)); asc_sg_head->sg_list[sgcnt].bytes =cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer, -ASC_CEILING (sg_dma_len (slp),512 )); +ASC_STATS_ADD (scp->device->host, xfer_sect, +DIV_ROUND_UP (sg_dma_len (slp),512 )); } } +ASC_STATS (scp->device->host, xfer_cnt); +ASC_DBG_PRT_ASC_SCSI_Q (2 , asc_scsi_q);ASC_DBG_PRT_CDB (1 , scp->cmnd, scp->cmd_len);
@@ -10021,7 +9957,7 @@ adv_get_sglist(struct asc_board *boardp, adv_req_t *reqp, struct scsi_cmnd *scp,int i; scsiqp = (ADV_SCSI_REQ_Q *)ADV_32BALIGN (&reqp->scsi_req_q); - slp = (struct scatterlist *)scp->request_buffer; + slp =scsi_sglist (scp); sg_elem_cnt = use_sg; prev_sg_block =NULL ; reqp->sgblkp =NULL ;
@@ -10093,8 +10029,8 @@ adv_get_sglist(struct asc_board *boardp, adv_req_t *reqp, struct scsi_cmnd *scp,cpu_to_le32 (sg_dma_address (slp)); sg_block->sg_list[i].sg_count =cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer, -ASC_CEILING (sg_dma_len (slp),512 )); +ASC_STATS_ADD (scp->device->host, xfer_sect, +DIV_ROUND_UP (sg_dma_len (slp),512 ));if (--sg_elem_cnt ==0 ) {/* Last ADV_SG_BLOCK and scatter-gather entry. */ sg_block->sg_cnt = i +1 ;
@@ -10126,6 +10062,7 @@ adv_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,ADV_SCSI_REQ_Q *scsiqp;int i;int ret; +int use_sg;/* * Allocate an adv_req_t structure from the board to execute
@@ -10182,54 +10119,24 @@ adv_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, scsiqp->sense_addr =cpu_to_le32 (virt_to_bus (&scp->sense_buffer[0 ])); scsiqp->sense_len =sizeof (scp->sense_buffer); -/* -* Build ADV_SCSI_REQ_Q for a contiguous buffer or a scatter-gather -* buffer command. -*/ +/* Build ADV_SCSI_REQ_Q */ - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); - scsiqp->vdata_addr = scp->request_buffer; - scsiqp->data_addr =cpu_to_le32 (virt_to_bus (scp->request_buffer)); - -if (scp->use_sg ==0 ) { -/* -* CDB request of single contiguous buffer. -*/ + use_sg =scsi_dma_map (scp); +if (use_sg ==0 ) { +/* Zero-length transfer */ reqp->sgblkp =NULL ; - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); -if (scp->request_bufflen) { - scsiqp->vdata_addr = scp->request_buffer; - scp->SCp.dma_handle = -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction); - }else { - scsiqp->vdata_addr =NULL ; - scp->SCp.dma_handle =0 ; - } - scsiqp->data_addr =cpu_to_le32 (scp->SCp.dma_handle); + scsiqp->data_cnt =0 ; + scsiqp->vdata_addr =NULL ; + + scsiqp->data_addr =0 ; scsiqp->sg_list_ptr =NULL ; scsiqp->sg_real_addr =0 ; -ASC_STATS (scp->device->host, cont_cnt); -ASC_STATS_ADD (scp->device->host, cont_xfer, -ASC_CEILING (scp->request_bufflen,512 )); }else { -/* -* CDB scatter-gather request list. -*/ -struct scatterlist *slp; -int use_sg; - - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); -if (use_sg >ADV_MAX_SG_LIST ) {scmd_printk (KERN_ERR , scp,"use_sg %d > " "ADV_MAX_SG_LIST %d\n" , use_sg, scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +scsi_dma_unmap (scp); scp->result =HOST_BYTE (DID_ERROR );/*
@@ -10242,6 +10149,8 @@ adv_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,return ASC_ERROR ; } + scsiqp->data_cnt =cpu_to_le32 (scsi_bufflen (scp)); + ret =adv_get_sglist (boardp, reqp, scp, use_sg);if (ret !=ADV_SUCCESS ) {/*
@@ -10254,10 +10163,11 @@ adv_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,return ret; } -ASC_STATS (scp->device->host, sg_cnt); -ASC_STATS_ADD (scp->device->host, sg_elem, use_sg); +ASC_STATS_ADD (scp->device->host, xfer_elem, use_sg); } +ASC_STATS (scp->device->host, xfer_cnt); +ASC_DBG_PRT_ADV_SCSI_REQ_Q (2 , scsiqp);ASC_DBG_PRT_CDB (1 , scp->cmnd, scp->cmd_len);
@@ -10955,48 +10865,6 @@ static int AdvExeScsiQueue(ADV_DVC_VAR *asc_dvc, ADV_SCSI_REQ_Q *scsiq)/* * Execute a single 'Scsi_Cmnd'. -* -* The function 'done' is called when the request has been completed. -* -* Scsi_Cmnd: -* -* host - board controlling device -* device - device to send command -* target - target of device -* lun - lun of device -* cmd_len - length of SCSI CDB -* cmnd - buffer for SCSI 8, 10, or 12 byte CDB -* use_sg - if non-zero indicates scatter-gather request with use_sg elements -* -* if (use_sg == 0) { -* request_buffer - buffer address for request -* request_bufflen - length of request buffer -* } else { -* request_buffer - pointer to scatterlist structure -* } -* -* sense_buffer - sense command buffer -* -* result (4 bytes of an int): -* Byte Meaning -* 0 SCSI Status Byte Code -* 1 SCSI One Byte Message Code -* 2 Host Error Code -* 3 Mid-Level Error Code -* -* host driver fields: -* SCp - Scsi_Pointer used for command processing status -* scsi_done - used to save caller's done function -* host_scribble - used for pointer to another struct scsi_cmnd -* -* If this function returns ASC_NOERROR the request will be completed -* from the interrupt handler. -* -* If this function returns ASC_ERROR the host error code has been set, -* and the called must call asc_scsi_done. -* -* If ASC_BUSY is returned the request will be returned to the midlayer -* and re-tried later. */ static int asc_execute_scsi_cmnd (struct scsi_cmnd *scp) {
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
PATCH 1/17 advansys: Eliminate prototypes
In reply to James BottomleyRearrange a lot of the functions in the file to get rid of all the forward declarations.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c |12273 +++++++++++++++++++++++------------------------ 1 files changed, 6043 insertions(+), 6230 deletions(-)
drivers/scsi/advansys.c +6043 -6230
@@ -878,7 +878,6 @@ typedef struct asceep_config {#define ASC_1000_ID0W_FIX 0x00C1#define ASC_1000_ID1B 0x25#define ASC_EISA_REV_IOP_MASK (0x0C83) -#define ASC_EISA_PID_IOP_MASK (0x0C80)#define ASC_EISA_CFG_IOP_MASK (0x0C86)#define ASC_GET_EISA_SLOT (iop) (PortAddr)((iop) & 0xF000)#define INS_HALTINT (ushort)0x6281
@@ -903,10 +902,10 @@ typedef struct asc_mc_saved {#define AscGetRiscVarDoneQTail (port) AscReadLramByte((port), ASCV_DONENEXT_B)#define AscPutRiscVarFreeQHead (port, val) AscWriteLramByte((port), ASCV_NEXTRDY_B, val)#define AscPutRiscVarDoneQTail (port, val) AscWriteLramByte((port), ASCV_DONENEXT_B, val) -#define AscPutMCodeSDTRDoneAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id), (data)); -#define AscGetMCodeSDTRDoneAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id)); -#define AscPutMCodeInitSDTRAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id), data); -#define AscGetMCodeInitSDTRAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id)); +#define AscPutMCodeSDTRDoneAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id), (data)) +#define AscGetMCodeSDTRDoneAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DONE_BEG+(ushort)id)) +#define AscPutMCodeInitSDTRAtID (port, id, data) AscWriteLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id), data) +#define AscGetMCodeInitSDTRAtID (port, id) AscReadLramByte((port), (ushort)((ushort)ASCV_SDTR_DATA_BEG+(ushort)id))#define AscSynIndexToPeriod (index) (uchar)(asc_dvc->sdtr_period_tbl[ (index) ])#define AscGetChipSignatureByte (port) (uchar)inp((port)+IOP_SIG_BYTE)#define AscGetChipSignatureWord (port) (ushort)inpw((port)+IOP_SIG_WORD)
@@ -962,83 +961,6 @@ typedef struct asc_mc_saved {#define AscReadChipDvcID (port) (uchar)inp((port)+IOP_REG_ID)#define AscWriteChipDvcID (port, data) outp((port)+IOP_REG_ID, data) -static int AscWriteEEPCmdReg (PortAddr iop_base,uchar cmd_reg); -static int AscWriteEEPDataReg (PortAddr iop_base,ushort data_reg); -static void AscWaitEEPRead (void ); -static void AscWaitEEPWrite (void ); -static ushort AscReadEEPWord (PortAddr ,uchar ); -static ushort AscWriteEEPWord (PortAddr ,uchar ,ushort ); -static ushort AscGetEEPConfig (PortAddr ,ASCEEP_CONFIG *,ushort ); -static int AscSetEEPConfigOnce (PortAddr ,ASCEEP_CONFIG *,ushort ); -static int AscSetEEPConfig (PortAddr ,ASCEEP_CONFIG *,ushort ); -static int AscStartChip (PortAddr ); -static int AscStopChip (PortAddr ); -static void AscSetChipIH (PortAddr ,ushort ); -static int AscIsChipHalted (PortAddr ); -static void AscAckInterrupt (PortAddr ); -static void AscDisableInterrupt (PortAddr ); -static void AscEnableInterrupt (PortAddr ); -static void AscSetBank (PortAddr ,uchar ); -static int AscResetChipAndScsiBus (ASC_DVC_VAR *); -#ifdef CONFIG_ISA -static uchar AscGetIsaDmaSpeed (PortAddr ); -#endif /* CONFIG_ISA */ -static uchar AscReadLramByte (PortAddr ,ushort ); -static ushort AscReadLramWord (PortAddr ,ushort ); -#if CC_VERY_LONG_SG_LIST -static ASC_DCNT AscReadLramDWord (PortAddr ,ushort ); -#endif /* CC_VERY_LONG_SG_LIST */ -static void AscWriteLramWord (PortAddr ,ushort ,ushort ); -static void AscWriteLramByte (PortAddr ,ushort ,uchar ); -static ASC_DCNT AscMemSumLramWord (PortAddr ,ushort ,int ); -static void AscMemWordSetLram (PortAddr ,ushort ,ushort ,int ); -static void AscMemWordCopyPtrToLram (PortAddr ,ushort ,uchar *,int ); -static void AscMemDWordCopyPtrToLram (PortAddr ,ushort ,uchar *,int ); -static void AscMemWordCopyPtrFromLram (PortAddr ,ushort ,uchar *,int ); -static ushort AscInitAscDvcVar (ASC_DVC_VAR *); -static ushort AscInitFromEEP (ASC_DVC_VAR *); -static ushort AscInitMicroCodeVar (ASC_DVC_VAR *); -static int AscTestExternalLram (ASC_DVC_VAR *); -static uchar AscMsgOutSDTR (ASC_DVC_VAR *,uchar ,uchar ); -static uchar AscCalSDTRData (ASC_DVC_VAR *,uchar ,uchar ); -static void AscSetChipSDTR (PortAddr ,uchar ,uchar ); -static uchar AscGetSynPeriodIndex (ASC_DVC_VAR *,uchar ); -static uchar AscAllocFreeQueue (PortAddr ,uchar ); -static uchar AscAllocMultipleFreeQueue (PortAddr ,uchar ,uchar ); -static int AscHostReqRiscHalt (PortAddr ); -static int AscStopQueueExe (PortAddr ); -static int AscSendScsiQueue (ASC_DVC_VAR *, -ASC_SCSI_Q *scsiq,uchar n_q_required); -static int AscPutReadyQueue (ASC_DVC_VAR *,ASC_SCSI_Q *,uchar ); -static int AscPutReadySgListQueue (ASC_DVC_VAR *,ASC_SCSI_Q *,uchar ); -static int AscSetChipSynRegAtID (PortAddr ,uchar ,uchar ); -static int AscSetRunChipSynRegAtID (PortAddr ,uchar ,uchar ); -static ushort AscInitLram (ASC_DVC_VAR *); -static int AscSetLibErrorCode (ASC_DVC_VAR *,ushort ); -static int AscIsrChipHalted (ASC_DVC_VAR *); -static uchar _AscCopyLramScsiDoneQ (PortAddr ,ushort , -ASC_QDONE_INFO *,ASC_DCNT ); -static int AscIsrQDone (ASC_DVC_VAR *); -#ifdef CONFIG_ISA -static ushort AscGetEisaChipCfg (PortAddr ); -#endif /* CONFIG_ISA */ -static uchar AscGetChipScsiCtrl (PortAddr ); -static uchar AscGetChipVersion (PortAddr ,ushort ); -static ASC_DCNT AscLoadMicroCode (PortAddr ,ushort ,uchar *,ushort ); -static void AscToggleIRQAct (PortAddr ); -static void DvcPutScsiQ (PortAddr ,ushort ,uchar *,int ); -static void DvcGetQinfo (PortAddr ,ushort ,uchar *,int ); -static ushort AscInitAsc1000Driver (ASC_DVC_VAR *); -static void AscAsyncFix (ASC_DVC_VAR *,struct scsi_device *); -static int AscExeScsiQueue (ASC_DVC_VAR *,ASC_SCSI_Q *); -static int AscISR (ASC_DVC_VAR *); -static uint AscGetNumOfFreeQueue (ASC_DVC_VAR *,uchar ,uchar ); -static int AscSgListToQueue (int ); -#ifdef CONFIG_ISA -static void AscEnableIsaDma (uchar ); -#endif /* CONFIG_ISA */ -static const char *advansys_info (struct Scsi_Host *shost); -#define ADV_LIB_VERSION_MAJOR 5#define ADV_LIB_VERSION_MINOR 14
@@ -2109,36 +2031,6 @@ typedef struct adv_scsi_req_q {#define ADV_HOST_SCSI_BUS_RESET 0x80/* Host Initiated SCSI Bus Reset. */ -static ADV_PADDR DvcGetPhyAddr (ADV_DVC_VAR *,ADV_SCSI_REQ_Q *, -uchar *,ASC_SDCNT *,int ); - -/* -* Adv Library functions available to drivers. -*/ -static int AdvExeScsiQueue (ADV_DVC_VAR *,ADV_SCSI_REQ_Q *); -static int AdvISR (ADV_DVC_VAR *); -static int AdvInitAsc3550Driver (ADV_DVC_VAR *); -static int AdvInitAsc38C0800Driver (ADV_DVC_VAR *); -static int AdvInitAsc38C1600Driver (ADV_DVC_VAR *); -static int AdvResetChipAndSB (ADV_DVC_VAR *); -static int AdvResetSB (ADV_DVC_VAR *asc_dvc); - -/* -* Internal Adv Library functions. -*/ -static int AdvSendIdleCmd (ADV_DVC_VAR *,ushort ,ADV_DCNT ); -static int AdvInitFrom3550EEP (ADV_DVC_VAR *); -static int AdvInitFrom38C0800EEP (ADV_DVC_VAR *); -static int AdvInitFrom38C1600EEP (ADV_DVC_VAR *); -static ushort AdvGet3550EEPConfig (AdvPortAddr ,ADVEEP_3550_CONFIG *); -static void AdvSet3550EEPConfig (AdvPortAddr ,ADVEEP_3550_CONFIG *); -static ushort AdvGet38C0800EEPConfig (AdvPortAddr ,ADVEEP_38C0800_CONFIG *); -static void AdvSet38C0800EEPConfig (AdvPortAddr ,ADVEEP_38C0800_CONFIG *); -static ushort AdvGet38C1600EEPConfig (AdvPortAddr ,ADVEEP_38C1600_CONFIG *); -static void AdvSet38C1600EEPConfig (AdvPortAddr ,ADVEEP_38C1600_CONFIG *); -static void AdvWaitEEPCmd (AdvPortAddr ); -static ushort AdvReadEEPWord (AdvPortAddr ,int ); -/* Read byte from a register. */ #define AdvReadByteRegister (iop_base, reg_off) \ (ADV_MEM_READB((iop_base) + (reg_off)))
@@ -2676,1717 +2568,489 @@ static ASC_SG_HEAD asc_sg_head = { 0 };#ifdef ADVANSYS_DEBUG static int asc_dbglvl =3 ; -#endif /* ADVANSYS_DEBUG */ - -static int advansys_slave_configure (struct scsi_device *); -static int asc_execute_scsi_cmnd (struct scsi_cmnd *); -static int asc_build_req (asc_board_t *,struct scsi_cmnd *); -static int adv_build_req (asc_board_t *,struct scsi_cmnd *,ADV_SCSI_REQ_Q **); -static int adv_get_sglist (asc_board_t *,adv_req_t *,struct scsi_cmnd *,int ); -#ifdef CONFIG_PROC_FS -static int asc_proc_copy (off_t ,off_t ,char *,int ,char *,int ); -static int asc_prt_board_devices (struct Scsi_Host *,char *,int ); -static int asc_prt_adv_bios (struct Scsi_Host *,char *,int ); -static int asc_get_eeprom_string (ushort *serialnum,uchar *cp); -static int asc_prt_asc_board_eeprom (struct Scsi_Host *,char *,int ); -static int asc_prt_adv_board_eeprom (struct Scsi_Host *,char *,int ); -static int asc_prt_driver_conf (struct Scsi_Host *,char *,int ); -static int asc_prt_asc_board_info (struct Scsi_Host *,char *,int ); -static int asc_prt_adv_board_info (struct Scsi_Host *,char *,int ); -static int asc_prt_line (char *,int ,char *fmt, ...); -#endif /* CONFIG_PROC_FS */ -/* Statistics function prototypes. */ -#ifdef ADVANSYS_STATS -#ifdef CONFIG_PROC_FS -static int asc_prt_board_stats (struct Scsi_Host *,char *,int ); -#endif /* CONFIG_PROC_FS */ -#endif /* ADVANSYS_STATS */ - -/* Debug function prototypes. */ -#ifdef ADVANSYS_DEBUG -static void asc_prt_scsi_host (struct Scsi_Host *); -static void asc_prt_scsi_cmnd (struct scsi_cmnd *); -static void asc_prt_asc_dvc_cfg (ASC_DVC_CFG *); -static void asc_prt_asc_dvc_var (ASC_DVC_VAR *); -static void asc_prt_asc_scsi_q (ASC_SCSI_Q *); -static void asc_prt_asc_qdone_info (ASC_QDONE_INFO *); -static void asc_prt_adv_dvc_cfg (ADV_DVC_CFG *); -static void asc_prt_adv_dvc_var (ADV_DVC_VAR *); -static void asc_prt_adv_scsi_req_q (ADV_SCSI_REQ_Q *); -static void asc_prt_adv_sgblock (int ,ADV_SG_BLOCK *); -static void asc_prt_hex (char *f,uchar *,int ); -#endif /* ADVANSYS_DEBUG */ - -#ifdef CONFIG_PROC_FS /* -* advansys_proc_info() - /proc/scsi/advansys/{0,1,2,3,...} -* -* *buffer: I/O buffer -* **start: if inout == FALSE pointer into buffer where user read should start -* offset: current offset into a /proc/scsi/advansys/[0...] file -* length: length of buffer -* hostno: Scsi_Host host_no -* inout: TRUE - user is writing; FALSE - user is reading -* -* Return the number of bytes read from or written to a -* /proc/scsi/advansys/[0...] file. -* -* Note: This function uses the per board buffer 'prtbuf' which is -* allocated when the board is initialized in advansys_detect(). The -* buffer is ASC_PRTBUF_SIZE bytes. The function asc_proc_copy() is -* used to write to the buffer. The way asc_proc_copy() is written -* if 'prtbuf' is too small it will not be overwritten. Instead the -* user just won't get all the available statistics. +* asc_prt_scsi_host() */ -static int -advansys_proc_info (struct Scsi_Host *shost,char *buffer,char **start, -off_t offset,int length,int inout) +static void asc_prt_scsi_host (struct Scsi_Host *s) {asc_board_t *boardp; -char *cp; -int cplen; -int cnt; -int totcnt; -int leftlen; -char *curbuf; -off_t advoffset; - -ASC_DBG (1 ,"advansys_proc_info: begin\n" ); - -/* -* User write not supported. -*/ -if (inout == TRUE) { -return (-ENOSYS ); - } - -/* -* User read of /proc/scsi/advansys/[0...] file. -*/ - - boardp =ASC_BOARDP (shost); - -/* Copy read data starting at the beginning of the buffer. */ - *start = buffer; - curbuf = buffer; - advoffset =0 ; - totcnt =0 ; - leftlen = length; - -/* -* Get board configuration information. -* -* advansys_info() returns the board string from its own static buffer. -*/ - cp = (char *)advansys_info (shost); -strcat (cp,"\n" ); - cplen =strlen (cp); -/* Copy board information. */ - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; -/* -* Display Wide Board BIOS Information. -*/ -if (ASC_WIDE_BOARD (boardp)) { - cp = boardp->prtbuf; - cplen =asc_prt_adv_bios (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, - cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; - } + boardp =ASC_BOARDP (s); -/* -* Display driver information for each device attached to the board. -*/ - cp = boardp->prtbuf; - cplen =asc_prt_board_devices (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; +printk ("Scsi_Host at addr 0x%lx\n" , (ulong )s); +printk (" host_busy %u, host_no %d, last_reset %d,\n" , + s->host_busy, s->host_no, (unsigned )s->last_reset); -/* -* Display EEPROM configuration for the board. -*/ - cp = boardp->prtbuf; -if (ASC_NARROW_BOARD (boardp)) { - cplen =asc_prt_asc_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); - }else { - cplen =asc_prt_adv_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); - } -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; +printk (" base 0x%lx, io_port 0x%lx, irq 0x%x,\n" , + (ulong )s->base, (ulong )s->io_port, s->irq); -/* -* Display driver configuration and information for the board. -*/ - cp = boardp->prtbuf; - cplen =asc_prt_driver_conf (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; +printk (" dma_channel %d, this_id %d, can_queue %d,\n" , + s->dma_channel, s->this_id, s->can_queue); -#ifdef ADVANSYS_STATS -/* -* Display driver statistics for the board. -*/ - cp = boardp->prtbuf; - cplen =asc_prt_board_stats (shost, cp,ASC_PRTBUF_SIZE ); -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; - } - advoffset += cplen; - curbuf += cnt; -#endif /* ADVANSYS_STATS */ +printk (" cmd_per_lun %d, sg_tablesize %d, unchecked_isa_dma %d\n" , + s->cmd_per_lun, s->sg_tablesize, s->unchecked_isa_dma); -/* -* Display Asc Library dynamic configuration information -* for the board. -*/ - cp = boardp->prtbuf;if (ASC_NARROW_BOARD (boardp)) { - cplen =asc_prt_asc_board_info (shost, cp,ASC_PRTBUF_SIZE ); +asc_prt_asc_dvc_var (&ASC_BOARDP (s)->dvc_var.asc_dvc_var); +asc_prt_asc_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.asc_dvc_cfg); }else { - cplen =asc_prt_adv_board_info (shost, cp,ASC_PRTBUF_SIZE ); - } -BUG_ON (cplen >=ASC_PRTBUF_SIZE ); - cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); - totcnt += cnt; - leftlen -= cnt; -if (leftlen ==0 ) { -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -return totcnt; +asc_prt_adv_dvc_var (&ASC_BOARDP (s)->dvc_var.adv_dvc_var); +asc_prt_adv_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.adv_dvc_cfg); } - advoffset += cplen; - curbuf += cnt; - -ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); - -return totcnt; } -#endif /* CONFIG_PROC_FS */ /* -* advansys_info() -* -* Return suitable for printing on the console with the argument -* adapter's configuration information. -* -* Note: The information line should not exceed ASC_INFO_SIZE bytes, -* otherwise the static 'info' array will be overrun. +* asc_prt_scsi_cmnd() */ -static const char *advansys_info (struct Scsi_Host *shost) -{ -static char info[ASC_INFO_SIZE ]; -asc_board_t *boardp; -ASC_DVC_VAR *asc_dvc_varp; -ADV_DVC_VAR *adv_dvc_varp; -char *busname; -char *widename =NULL ; - - boardp =ASC_BOARDP (shost); -if (ASC_NARROW_BOARD (boardp)) { - asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; -ASC_DBG (1 ,"advansys_info: begin\n" ); -if (asc_dvc_varp->bus_type &ASC_IS_ISA ) { -if ((asc_dvc_varp->bus_type &ASC_IS_ISAPNP ) == -ASC_IS_ISAPNP ) { - busname ="ISA PnP" ; - }else { - busname ="ISA" ; - } -sprintf (info, -"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X, DMA 0x%X" , -ASC_VERSION , busname, - (ulong )shost->io_port, - (ulong )shost->io_port +ASC_IOADR_GAP -1 , - shost->irq, shost->dma_channel); - }else { -if (asc_dvc_varp->bus_type &ASC_IS_VL ) { - busname ="VL" ; - }else if (asc_dvc_varp->bus_type &ASC_IS_EISA ) { - busname ="EISA" ; - }else if (asc_dvc_varp->bus_type &ASC_IS_PCI ) { -if ((asc_dvc_varp->bus_type &ASC_IS_PCI_ULTRA ) - ==ASC_IS_PCI_ULTRA ) { - busname ="PCI Ultra" ; - }else { - busname ="PCI" ; - } - }else { - busname ="?" ; -ASC_PRINT2 ("advansys_info: board %d: unknown " -"bus type %d\n" , boardp->id, - asc_dvc_varp->bus_type); - } -sprintf (info, -"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X" , -ASC_VERSION , busname, (ulong )shost->io_port, - (ulong )shost->io_port +ASC_IOADR_GAP -1 , - shost->irq); - } - }else { -/* -* Wide Adapter Information -* -* Memory-mapped I/O is used instead of I/O space to access -* the adapter, but display the I/O Port range. The Memory -* I/O address is displayed through the driver /proc file. -*/ - adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; -if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC3550 ) { - widename ="Ultra-Wide" ; - }else if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC38C0800 ) { - widename ="Ultra2-Wide" ; - }else { - widename ="Ultra3-Wide" ; - } -sprintf (info, -"AdvanSys SCSI %s: PCI %s: PCIMEM 0x%lX-0x%lX, IRQ 0x%X" , -ASC_VERSION , widename, (ulong )adv_dvc_varp->iop_base, - (ulong )adv_dvc_varp->iop_base + boardp->asc_n_io_port -1 , shost->irq); - } -BUG_ON (strlen (info) >=ASC_INFO_SIZE ); -ASC_DBG (1 ,"advansys_info: end\n" ); -return info; -} - -static void asc_scsi_done (struct scsi_cmnd *scp) +static void asc_prt_scsi_cmnd (struct scsi_cmnd *s) { -struct asc_board *boardp =ASC_BOARDP (scp->device->host); +printk ("struct scsi_cmnd at addr 0x%lx\n" , (ulong )s); -if (scp->use_sg) -dma_unmap_sg (boardp->dev, - (struct scatterlist *)scp->request_buffer, - scp->use_sg, scp->sc_data_direction); -else if (scp->request_bufflen) -dma_unmap_single (boardp->dev, scp->SCp.dma_handle, - scp->request_bufflen, scp->sc_data_direction); +printk (" host 0x%lx, device 0x%lx, target %u, lun %u, channel %u,\n" , + (ulong )s->device->host, (ulong )s->device, s->device->id, + s->device->lun, s->device->channel); -ASC_STATS (scp->device->host, done); +asc_prt_hex (" CDB" , s->cmnd, s->cmd_len); - scp->scsi_done (scp); -} +printk ("sc_data_direction %u, resid %d\n" , + s->sc_data_direction, s->resid); -/* -* advansys_queuecommand() - interrupt-driven I/O entrypoint. -* -* This function always returns 0. Command return status is saved -* in the 'scp' result field. -*/ -static int -advansys_queuecommand (struct scsi_cmnd *scp,void (*done)(struct scsi_cmnd *)) -{ -struct Scsi_Host *shost = scp->device->host; -asc_board_t *boardp =ASC_BOARDP (shost); -unsigned long flags; -int asc_res, result =0 ; +printk (" use_sg %u, sglist_len %u\n" , s->use_sg, s->sglist_len); -ASC_STATS (shost, queuecommand); - scp->scsi_done = done; +printk (" serial_number 0x%x, retries %d, allowed %d\n" , + (unsigned )s->serial_number, s->retries, s->allowed); -/* -* host_lock taken by mid-level prior to call, but need -* to protect against own ISR -*/ -spin_lock_irqsave (&boardp->lock, flags); - asc_res =asc_execute_scsi_cmnd (scp); -spin_unlock_irqrestore (&boardp->lock, flags); +printk (" timeout_per_command %d\n" , s->timeout_per_command); -switch (asc_res) { -case ASC_NOERROR : -break ; -case ASC_BUSY : - result =SCSI_MLQUEUE_HOST_BUSY ; -break ; -case ASC_ERROR : -default : -asc_scsi_done (scp); -break ; - } +printk (" scsi_done 0x%p, done 0x%p, host_scribble 0x%p, result 0x%x\n" , + s->scsi_done, s->done, s->host_scribble, s->result); -return result; +printk (" tag %u, pid %u\n" , (unsigned )s->tag, (unsigned )s->pid); }/* -* advansys_reset() -* -* Reset the bus associated with the command 'scp'. -* -* This function runs its own thread. Interrupts must be blocked but -* sleeping is allowed and no locking other than for host structures is -* required. Returns SUCCESS or FAILED. +* asc_prt_asc_dvc_var() */ -static int advansys_reset (struct scsi_cmnd *scp) +static void asc_prt_asc_dvc_var (ASC_DVC_VAR *h) { -struct Scsi_Host *shost; -asc_board_t *boardp; -ASC_DVC_VAR *asc_dvc_varp; -ADV_DVC_VAR *adv_dvc_varp; -ulong flags; -int status; -int ret =SUCCESS ; - -ASC_DBG1 (1 ,"advansys_reset: 0x%lx\n" , (ulong )scp); - -#ifdef ADVANSYS_STATS -if (scp->device->host !=NULL ) { -ASC_STATS (scp->device->host, reset); - } -#endif /* ADVANSYS_STATS */ - -if ((shost = scp->device->host) ==NULL ) { - scp->result =HOST_BYTE (DID_ERROR ); -return FAILED ; - } - - boardp =ASC_BOARDP (shost); - -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset started...\n" , - boardp->id); -/* -* Check for re-entrancy. -*/ -spin_lock_irqsave (&boardp->lock, flags); -if (boardp->flags &ASC_HOST_IN_RESET ) { -spin_unlock_irqrestore (&boardp->lock, flags); -return FAILED ; - } - boardp->flags |=ASC_HOST_IN_RESET ; -spin_unlock_irqrestore (&boardp->lock, flags); - -if (ASC_NARROW_BOARD (boardp)) { -/* -* Narrow Board -*/ - asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; - -/* -* Reset the chip and SCSI bus. -*/ -ASC_DBG (1 ,"advansys_reset: before AscInitAsc1000Driver()\n" ); - status =AscInitAsc1000Driver (asc_dvc_varp); - -/* Refer to ASC_IERR_* defintions for meaning of 'err_code'. */ -if (asc_dvc_varp->err_code) { -ASC_PRINT2 ("advansys_reset: board %d: SCSI bus reset " -"error: 0x%x\n" , boardp->id, - asc_dvc_varp->err_code); - ret =FAILED ; - }else if (status) { -ASC_PRINT2 ("advansys_reset: board %d: SCSI bus reset " -"warning: 0x%x\n" , boardp->id, status); - }else { -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset " -"successful.\n" , boardp->id); - } - -ASC_DBG (1 ,"advansys_reset: after AscInitAsc1000Driver()\n" ); -spin_lock_irqsave (&boardp->lock, flags); - - }else { -/* -* Wide Board -* -* If the suggest reset bus flags are set, then reset the bus. -* Otherwise only reset the device. -*/ - adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; +printk ("ASC_DVC_VAR at addr 0x%lx\n" , (ulong )h); -/* -* Reset the target's SCSI bus. -*/ -ASC_DBG (1 ,"advansys_reset: before AdvResetChipAndSB()\n" ); -switch (AdvResetChipAndSB (adv_dvc_varp)) { -case ASC_TRUE : -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset " -"successful.\n" , boardp->id); -break ; -case ASC_FALSE : -default : -ASC_PRINT1 ("advansys_reset: board %d: SCSI bus reset " -"error.\n" , boardp->id); - ret =FAILED ; -break ; - } -spin_lock_irqsave (&boardp->lock, flags); - (void )AdvISR (adv_dvc_varp); - } -/* Board lock is held. */ +printk (" iop_base 0x%x, err_code 0x%x, dvc_cntl 0x%x, bug_fix_cntl " +"%d,\n" , h->iop_base, h->err_code, h->dvc_cntl, h->bug_fix_cntl); -/* Save the time of the most recently completed reset. */ - boardp->last_reset = jiffies; +printk (" bus_type %d, init_sdtr 0x%x,\n" , h->bus_type, + (unsigned )h->init_sdtr); -/* Clear reset flag. */ - boardp->flags &= ~ASC_HOST_IN_RESET ; -spin_unlock_irqrestore (&boardp->lock, flags); +printk (" sdtr_done 0x%x, use_tagged_qng 0x%x, unit_not_ready 0x%x, " +"chip_no 0x%x,\n" , (unsigned )h->sdtr_done, + (unsigned )h->use_tagged_qng, (unsigned )h->unit_not_ready, + (unsigned )h->chip_no); -ASC_DBG1 (1 ,"advansys_reset: ret %d\n" , ret); +printk (" queue_full_or_busy 0x%x, start_motor 0x%x, scsi_reset_wait " +"%u,\n" , (unsigned )h->queue_full_or_busy, + (unsigned )h->start_motor, (unsigned )h->scsi_reset_wait); -return ret; -} +printk (" is_in_int %u, max_total_qng %u, cur_total_qng %u, " +"in_critical_cnt %u,\n" , (unsigned )h->is_in_int, + (unsigned )h->max_total_qng, (unsigned )h->cur_total_qng, + (unsigned )h->in_critical_cnt); -/* -* advansys_biosparam() -* -* Translate disk drive geometry if the "BIOS greater than 1 GB" -* support is enabled for a drive. -* -* ip (information pointer) is an int array with the following definition: -* ip[0]: heads -* ip[1]: sectors -* ip[2]: cylinders -*/ -static int -advansys_biosparam (struct scsi_device *sdev,struct block_device *bdev, -sector_t capacity,int ip[]) -{ -asc_board_t *boardp; +printk (" last_q_shortage %u, init_state 0x%x, no_scam 0x%x, " +"pci_fix_asyn_xfer 0x%x,\n" , (unsigned )h->last_q_shortage, + (unsigned )h->init_state, (unsigned )h->no_scam, + (unsigned )h->pci_fix_asyn_xfer); -ASC_DBG (1 ,"advansys_biosparam: begin\n" ); -ASC_STATS (sdev->host, biosparam); - boardp =ASC_BOARDP (sdev->host); -if (ASC_NARROW_BOARD (boardp)) { -if ((boardp->dvc_var.asc_dvc_var.dvc_cntl & -ASC_CNTL_BIOS_GT_1GB ) && capacity >0x200000 ) { - ip[0 ] =255 ; - ip[1 ] =63 ; - }else { - ip[0 ] =64 ; - ip[1 ] =32 ; - } - }else { -if ((boardp->dvc_var.adv_dvc_var.bios_ctrl & -BIOS_CTRL_EXTENDED_XLAT ) && capacity >0x200000 ) { - ip[0 ] =255 ; - ip[1 ] =63 ; - }else { - ip[0 ] =64 ; - ip[1 ] =32 ; - } - } - ip[2 ] = (unsigned long )capacity / (ip[0 ] * ip[1 ]); -ASC_DBG (1 ,"advansys_biosparam: end\n" ); -return 0 ; +printk (" cfg 0x%lx, irq_no 0x%x\n" , (ulong )h->cfg, (unsigned )h->irq_no); } -static struct scsi_host_template advansys_template = { - .proc_name =DRV_NAME , -#ifdef CONFIG_PROC_FS - .proc_info = advansys_proc_info, -#endif - .name =DRV_NAME , - .info = advansys_info, - .queuecommand = advansys_queuecommand, - .eh_bus_reset_handler = advansys_reset, - .bios_param = advansys_biosparam, - .slave_configure = advansys_slave_configure, -/* -* Because the driver may control an ISA adapter 'unchecked_isa_dma' -* must be set. The flag will be cleared in advansys_board_found -* for non-ISA adapters. -*/ - .unchecked_isa_dma =1 , -/* -* All adapters controlled by this driver are capable of large -* scatter-gather lists. According to the mid-level SCSI documentation -* this obviates any performance gain provided by setting -* 'use_clustering'. But empirically while CPU utilization is increased -* by enabling clustering, I/O throughput increases as well. -*/ - .use_clustering =ENABLE_CLUSTERING , -}; -/* -* First-level interrupt handler. -* -* 'dev_id' is a pointer to the interrupting adapter's Scsi_Host. +* asc_prt_asc_dvc_cfg() */ -static irqreturn_t advansys_interrupt (int irq,void *dev_id) -{ -unsigned long flags; -struct Scsi_Host *shost = dev_id; -asc_board_t *boardp =ASC_BOARDP (shost); -irqreturn_t result =IRQ_NONE ; - -ASC_DBG1 (2 ,"advansys_interrupt: boardp 0x%p\n" , boardp); -spin_lock_irqsave (&boardp->lock, flags); -if (ASC_NARROW_BOARD (boardp)) { -if (AscIsIntPending (shost->io_port)) { - result =IRQ_HANDLED ; -ASC_STATS (shost, interrupt); -ASC_DBG (1 ,"advansys_interrupt: before AscISR()\n" ); -AscISR (&boardp->dvc_var.asc_dvc_var); - } - }else { -ASC_DBG (1 ,"advansys_interrupt: before AdvISR()\n" ); -if (AdvISR (&boardp->dvc_var.adv_dvc_var)) { - result =IRQ_HANDLED ; -ASC_STATS (shost, interrupt); - } - } -spin_unlock_irqrestore (&boardp->lock, flags); - -ASC_DBG (1 ,"advansys_interrupt: end\n" ); -return result; -} - -static void -advansys_narrow_slave_configure (struct scsi_device *sdev,ASC_DVC_VAR *asc_dvc) +static void asc_prt_asc_dvc_cfg (ASC_DVC_CFG *h) { -ASC_SCSI_BIT_ID_TYPE tid_bit =1 << sdev->id; -ASC_SCSI_BIT_ID_TYPE orig_use_tagged_qng = asc_dvc->use_tagged_qng; - -if (sdev->lun ==0 ) { -ASC_SCSI_BIT_ID_TYPE orig_init_sdtr = asc_dvc->init_sdtr; -if ((asc_dvc->cfg->sdtr_enable & tid_bit) && sdev->sdtr) { - asc_dvc->init_sdtr |= tid_bit; - }else { - asc_dvc->init_sdtr &= ~tid_bit; - } - -if (orig_init_sdtr != asc_dvc->init_sdtr) -AscAsyncFix (asc_dvc, sdev); - } - -if (sdev->tagged_supported) { -if (asc_dvc->cfg->cmd_qng_enabled & tid_bit) { -if (sdev->lun ==0 ) { - asc_dvc->cfg->can_tagged_qng |= tid_bit; - asc_dvc->use_tagged_qng |= tid_bit; - } -scsi_adjust_queue_depth (sdev,MSG_ORDERED_TAG , - asc_dvc->max_dvc_qng[sdev->id]); - } - }else { -if (sdev->lun ==0 ) { - asc_dvc->cfg->can_tagged_qng &= ~tid_bit; - asc_dvc->use_tagged_qng &= ~tid_bit; - } -scsi_adjust_queue_depth (sdev,0 , sdev->host->cmd_per_lun); - } - -if ((sdev->lun ==0 ) && - (orig_use_tagged_qng != asc_dvc->use_tagged_qng)) { -AscWriteLramByte (asc_dvc->iop_base,ASCV_DISC_ENABLE_B , - asc_dvc->cfg->disc_enable); -AscWriteLramByte (asc_dvc->iop_base,ASCV_USE_TAGGED_QNG_B , - asc_dvc->use_tagged_qng); -AscWriteLramByte (asc_dvc->iop_base,ASCV_CAN_TAGGED_QNG_B , - asc_dvc->cfg->can_tagged_qng); +printk ("ASC_DVC_CFG at addr 0x%lx\n" , (ulong )h); - asc_dvc->max_dvc_qng[sdev->id] = - asc_dvc->cfg->max_tag_qng[sdev->id]; -AscWriteLramByte (asc_dvc->iop_base, - (ushort)(ASCV_MAX_DVC_QNG_BEG + sdev->id), - asc_dvc->max_dvc_qng[sdev->id]); - } -} +printk (" can_tagged_qng 0x%x, cmd_qng_enabled 0x%x,\n" , + h->can_tagged_qng, h->cmd_qng_enabled); +printk (" disc_enable 0x%x, sdtr_enable 0x%x,\n" , + h->disc_enable, h->sdtr_enable); -/* -* Wide Transfers -* -* If the EEPROM enabled WDTR for the device and the device supports wide -* bus (16 bit) transfers, then turn on the device's 'wdtr_able' bit and -* write the new value to the microcode. -*/ -static void -advansys_wide_enable_wdtr (AdvPortAddr iop_base,unsigned short tidmask) -{ -unsigned short cfg_word; -AdvReadWordLram (iop_base,ASC_MC_WDTR_ABLE , cfg_word); -if ((cfg_word & tidmask) !=0 ) -return ; +printk + (" chip_scsi_id %d, isa_dma_speed %d, isa_dma_channel %d, chip_version %d,\n" , + h->chip_scsi_id, h->isa_dma_speed, h->isa_dma_channel, + h->chip_version); - cfg_word |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_WDTR_ABLE , cfg_word); +printk + (" pci_device_id %d, lib_serial_no %u, lib_version %u, mcode_date 0x%x,\n" , +to_pci_dev (h->dev)->device, h->lib_serial_no, h->lib_version, + h->mcode_date); -/* -* Clear the microcode SDTR and WDTR negotiation done indicators for -* the target to cause it to negotiate with the new setting set above. -* WDTR when accepted causes the target to enter asynchronous mode, so -* SDTR must be negotiated. -*/ -AdvReadWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); - cfg_word &= ~tidmask; -AdvWriteWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); -AdvReadWordLram (iop_base,ASC_MC_WDTR_DONE , cfg_word); - cfg_word &= ~tidmask; -AdvWriteWordLram (iop_base,ASC_MC_WDTR_DONE , cfg_word); +printk (" mcode_version %d, overrun_buf 0x%lx\n" , + h->mcode_version, (ulong )h->overrun_buf); }/* -* Synchronous Transfers -* -* If the EEPROM enabled SDTR for the device and the device -* supports synchronous transfers, then turn on the device's -* 'sdtr_able' bit. Write the new value to the microcode. +* asc_prt_asc_scsi_q() */ -static void -advansys_wide_enable_sdtr (AdvPortAddr iop_base,unsigned short tidmask) +static void asc_prt_asc_scsi_q (ASC_SCSI_Q *q) { -unsigned short cfg_word; -AdvReadWordLram (iop_base,ASC_MC_SDTR_ABLE , cfg_word); -if ((cfg_word & tidmask) !=0 ) -return ; - - cfg_word |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_SDTR_ABLE , cfg_word); - -/* -* Clear the microcode "SDTR negotiation" done indicator for the -* target to cause it to negotiate with the new setting set above. -*/ -AdvReadWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); - cfg_word &= ~tidmask; -AdvWriteWordLram (iop_base,ASC_MC_SDTR_DONE , cfg_word); -} +ASC_SG_HEAD *sgp; +int i; -/* -* PPR (Parallel Protocol Request) Capable -* -* If the device supports DT mode, then it must be PPR capable. -* The PPR message will be used in place of the SDTR and WDTR -* messages to negotiate synchronous speed and offset, transfer -* width, and protocol options. -*/ -static void advansys_wide_enable_ppr (ADV_DVC_VAR *adv_dvc, -AdvPortAddr iop_base,unsigned short tidmask) -{ -AdvReadWordLram (iop_base,ASC_MC_PPR_ABLE , adv_dvc->ppr_able); - adv_dvc->ppr_able |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_PPR_ABLE , adv_dvc->ppr_able); -} +printk ("ASC_SCSI_Q at addr 0x%lx\n" , (ulong )q); -static void -advansys_wide_slave_configure (struct scsi_device *sdev,ADV_DVC_VAR *adv_dvc) -{ -AdvPortAddr iop_base = adv_dvc->iop_base; -unsigned short tidmask =1 << sdev->id; +printk + (" target_ix 0x%x, target_lun %u, srb_ptr 0x%lx, tag_code 0x%x,\n" , + q->q2.target_ix, q->q1.target_lun, (ulong )q->q2.srb_ptr, + q->q2.tag_code); -if (sdev->lun ==0 ) { -/* -* Handle WDTR, SDTR, and Tag Queuing. If the feature -* is enabled in the EEPROM and the device supports the -* feature, then enable it in the microcode. -*/ +printk + (" data_addr 0x%lx, data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , + (ulong )le32_to_cpu (q->q1.data_addr), + (ulong )le32_to_cpu (q->q1.data_cnt), + (ulong )le32_to_cpu (q->q1.sense_addr), q->q1.sense_len); -if ((adv_dvc->wdtr_able & tidmask) && sdev->wdtr) -advansys_wide_enable_wdtr (iop_base, tidmask); -if ((adv_dvc->sdtr_able & tidmask) && sdev->sdtr) -advansys_wide_enable_sdtr (iop_base, tidmask); -if (adv_dvc->chip_type ==ADV_CHIP_ASC38C1600 && sdev->ppr) -advansys_wide_enable_ppr (adv_dvc, iop_base, tidmask); +printk (" cdbptr 0x%lx, cdb_len %u, sg_head 0x%lx, sg_queue_cnt %u\n" , + (ulong )q->cdbptr, q->q2.cdb_len, + (ulong )q->sg_head, q->q1.sg_queue_cnt); -/* -* Tag Queuing is disabled for the BIOS which runs in polled -* mode and would see no benefit from Tag Queuing. Also by -* disabling Tag Queuing in the BIOS devices with Tag Queuing -* bugs will at least work with the BIOS. -*/ -if ((adv_dvc->tagqng_able & tidmask) && - sdev->tagged_supported) { -unsigned short cfg_word; -AdvReadWordLram (iop_base,ASC_MC_TAGQNG_ABLE , cfg_word); - cfg_word |= tidmask; -AdvWriteWordLram (iop_base,ASC_MC_TAGQNG_ABLE , - cfg_word); -AdvWriteByteLram (iop_base, -ASC_MC_NUMBER_OF_MAX_CMD + sdev->id, - adv_dvc->max_dvc_qng); +if (q->sg_head) { + sgp = q->sg_head; +printk ("ASC_SG_HEAD at addr 0x%lx\n" , (ulong )sgp); +printk (" entry_cnt %u, queue_cnt %u\n" , sgp->entry_cnt, + sgp->queue_cnt); +for (i =0 ; i < sgp->entry_cnt; i++) { +printk (" [%u]: addr 0x%lx, bytes %lu\n" , + i, (ulong )le32_to_cpu (sgp->sg_list[i].addr), + (ulong )le32_to_cpu (sgp->sg_list[i].bytes)); } - } -if ((adv_dvc->tagqng_able & tidmask) && sdev->tagged_supported) { -scsi_adjust_queue_depth (sdev,MSG_ORDERED_TAG , - adv_dvc->max_dvc_qng); - }else { -scsi_adjust_queue_depth (sdev,0 , sdev->host->cmd_per_lun); } }/* -* Set the number of commands to queue per device for the -* specified host adapter. +* asc_prt_asc_qdone_info() */ -static int advansys_slave_configure (struct scsi_device *sdev) +static void asc_prt_asc_qdone_info (ASC_QDONE_INFO *q) { -asc_board_t *boardp =ASC_BOARDP (sdev->host); - boardp->flags |=ASC_SELECT_QUEUE_DEPTHS ; - -/* -* Save a pointer to the sdev and set its initial/maximum -* queue depth. Only save the pointer for a lun0 dev though. -*/ -if (sdev->lun ==0 ) - boardp->device[sdev->id] = sdev; - -if (ASC_NARROW_BOARD (boardp)) -advansys_narrow_slave_configure (sdev, - &boardp->dvc_var.asc_dvc_var); -else -advansys_wide_slave_configure (sdev, - &boardp->dvc_var.adv_dvc_var); - -return 0 ; +printk ("ASC_QDONE_INFO at addr 0x%lx\n" , (ulong )q); +printk (" srb_ptr 0x%lx, target_ix %u, cdb_len %u, tag_code %u,\n" , + (ulong )q->d2.srb_ptr, q->d2.target_ix, q->d2.cdb_len, + q->d2.tag_code); +printk + (" done_stat 0x%x, host_stat 0x%x, scsi_stat 0x%x, scsi_msg 0x%x\n" , + q->d3.done_stat, q->d3.host_stat, q->d3.scsi_stat, q->d3.scsi_msg); }/* -* Execute a single 'Scsi_Cmnd'. -* -* The function 'done' is called when the request has been completed. -* -* Scsi_Cmnd: -* -* host - board controlling device -* device - device to send command -* target - target of device -* lun - lun of device -* cmd_len - length of SCSI CDB -* cmnd - buffer for SCSI 8, 10, or 12 byte CDB -* use_sg - if non-zero indicates scatter-gather request with use_sg elements -* -* if (use_sg == 0) { -* request_buffer - buffer address for request -* request_bufflen - length of request buffer -* } else { -* request_buffer - pointer to scatterlist structure -* } -* -* sense_buffer - sense command buffer -* -* result (4 bytes of an int): -* Byte Meaning -* 0 SCSI Status Byte Code -* 1 SCSI One Byte Message Code -* 2 Host Error Code -* 3 Mid-Level Error Code -* -* host driver fields: -* SCp - Scsi_Pointer used for command processing status -* scsi_done - used to save caller's done function -* host_scribble - used for pointer to another struct scsi_cmnd -* -* If this function returns ASC_NOERROR the request will be completed -* from the interrupt handler. -* -* If this function returns ASC_ERROR the host error code has been set, -* and the called must call asc_scsi_done. +* asc_prt_adv_dvc_var() * -* If ASC_BUSY is returned the request will be returned to the midlayer -* and re-tried later. +* Display an ADV_DVC_VAR structure. */ -static int asc_execute_scsi_cmnd (struct scsi_cmnd *scp) +static void asc_prt_adv_dvc_var (ADV_DVC_VAR *h) { -asc_board_t *boardp; -ASC_DVC_VAR *asc_dvc_varp; -ADV_DVC_VAR *adv_dvc_varp; -ADV_SCSI_REQ_Q *adv_scsiqp; -struct scsi_device *device; -int ret; - -ASC_DBG2 (1 ,"asc_execute_scsi_cmnd: scp 0x%lx, done 0x%lx\n" , - (ulong )scp, (ulong )scp->scsi_done); - - boardp =ASC_BOARDP (scp->device->host); - device = boardp->device[scp->device->id]; +printk (" ADV_DVC_VAR at addr 0x%lx\n" , (ulong )h); -if (ASC_NARROW_BOARD (boardp)) { -/* -* Build and execute Narrow Board request. -*/ +printk (" iop_base 0x%lx, err_code 0x%x, ultra_able 0x%x\n" , + (ulong )h->iop_base, h->err_code, (unsigned )h->ultra_able); - asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; +printk (" isr_callback 0x%lx, sdtr_able 0x%x, wdtr_able 0x%x\n" , + (ulong )h->isr_callback, (unsigned )h->sdtr_able, + (unsigned )h->wdtr_able); -/* -* Build Asc Library request structure using the -* global structures 'asc_scsi_req' and 'asc_sg_head'. -* -* If an error is returned, then the request has been -* queued on the board done queue. It will be completed -* by the caller. -* -* asc_build_req() can not return ASC_BUSY. -*/ -if (asc_build_req (boardp, scp) ==ASC_ERROR ) { -ASC_STATS (scp->device->host, build_error); -return ASC_ERROR ; - } +printk (" start_motor 0x%x, scsi_reset_wait 0x%x, irq_no 0x%x,\n" , + (unsigned )h->start_motor, + (unsigned )h->scsi_reset_wait, (unsigned )h->irq_no); -switch (ret =AscExeScsiQueue (asc_dvc_varp, &asc_scsi_q)) { -case ASC_NOERROR : -ASC_STATS (scp->device->host, exe_noerror); -/* -* Increment monotonically increasing per device -* successful request counter. Wrapping doesn't matter. -*/ - boardp->reqcnt[scp->device->id]++; -ASC_DBG (1 ,"asc_execute_scsi_cmnd: AscExeScsiQueue(), " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_STATS (scp->device->host, exe_busy); -break ; -case ASC_ERROR : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AscExeScsiQueue() ASC_ERROR, err_code 0x%x\n" , - boardp->id, asc_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_error); - scp->result =HOST_BYTE (DID_ERROR ); -break ; -default : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AscExeScsiQueue() unknown, err_code 0x%x\n" , - boardp->id, asc_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_unknown); - scp->result =HOST_BYTE (DID_ERROR ); -break ; - } - }else { -/* -* Build and execute Wide Board request. -*/ - adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; +printk (" max_host_qng %u, max_dvc_qng %u, carr_freelist 0x%lxn\n" , + (unsigned )h->max_host_qng, (unsigned )h->max_dvc_qng, + (ulong )h->carr_freelist); -/* -* Build and get a pointer to an Adv Library request structure. -* -* If the request is successfully built then send it below, -* otherwise return with an error. -*/ -switch (adv_build_req (boardp, scp, &adv_scsiqp)) { -case ASC_NOERROR : -ASC_DBG (3 ,"asc_execute_scsi_cmnd: adv_build_req " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_DBG (1 ,"asc_execute_scsi_cmnd: adv_build_req " -"ASC_BUSY\n" ); -/* -* The asc_stats fields 'adv_build_noreq' and -* 'adv_build_nosg' count wide board busy conditions. -* They are updated in adv_build_req and -* adv_get_sglist, respectively. -*/ -return ASC_BUSY ; -case ASC_ERROR : -default : -ASC_DBG (1 ,"asc_execute_scsi_cmnd: adv_build_req " -"ASC_ERROR\n" ); -ASC_STATS (scp->device->host, build_error); -return ASC_ERROR ; - } +printk (" icq_sp 0x%lx, irq_sp 0x%lx\n" , + (ulong )h->icq_sp, (ulong )h->irq_sp); -switch (ret =AdvExeScsiQueue (adv_dvc_varp, adv_scsiqp)) { -case ASC_NOERROR : -ASC_STATS (scp->device->host, exe_noerror); -/* -* Increment monotonically increasing per device -* successful request counter. Wrapping doesn't matter. -*/ - boardp->reqcnt[scp->device->id]++; -ASC_DBG (1 ,"asc_execute_scsi_cmnd: AdvExeScsiQueue(), " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_STATS (scp->device->host, exe_busy); -break ; -case ASC_ERROR : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AdvExeScsiQueue() ASC_ERROR, err_code 0x%x\n" , - boardp->id, adv_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_error); - scp->result =HOST_BYTE (DID_ERROR ); -break ; -default : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AdvExeScsiQueue() unknown, err_code 0x%x\n" , - boardp->id, adv_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_unknown); - scp->result =HOST_BYTE (DID_ERROR ); -break ; - } - } +printk (" no_scam 0x%x, tagqng_able 0x%x\n" , + (unsigned )h->no_scam, (unsigned )h->tagqng_able); -ASC_DBG (1 ,"asc_execute_scsi_cmnd: end\n" ); -return ret; +printk (" chip_scsi_id 0x%x, cfg 0x%lx\n" , + (unsigned )h->chip_scsi_id, (ulong )h->cfg); }/* -* Build a request structure for the Asc Library (Narrow Board). -* -* The global structures 'asc_scsi_q' and 'asc_sg_head' are -* used to build the request. +* asc_prt_adv_dvc_cfg() * -* If an error occurs, then return ASC_ERROR. +* Display an ADV_DVC_CFG structure. */ -static int asc_build_req (asc_board_t *boardp,struct scsi_cmnd *scp) +static void asc_prt_adv_dvc_cfg (ADV_DVC_CFG *h) { -/* -* Mutually exclusive access is required to 'asc_scsi_q' and -* 'asc_sg_head' until after the request is started. -*/ -memset (&asc_scsi_q,0 ,sizeof (ASC_SCSI_Q )); - -/* -* Point the ASC_SCSI_Q to the 'struct scsi_cmnd'. -*/ - asc_scsi_q.q2.srb_ptr =ASC_VADDR_TO_U32 (scp); - -/* -* Build the ASC_SCSI_Q request. -*/ - asc_scsi_q.cdbptr = &scp->cmnd[0 ]; - asc_scsi_q.q2.cdb_len = scp->cmd_len; - asc_scsi_q.q1.target_id =ASC_TID_TO_TARGET_ID (scp->device->id); - asc_scsi_q.q1.target_lun = scp->device->lun; - asc_scsi_q.q2.target_ix = -ASC_TIDLUN_TO_IX (scp->device->id, scp->device->lun); - asc_scsi_q.q1.sense_addr = -cpu_to_le32 (virt_to_bus (&scp->sense_buffer[0 ])); - asc_scsi_q.q1.sense_len =sizeof (scp->sense_buffer); - -/* -* If there are any outstanding requests for the current target, -* then every 255th request send an ORDERED request. This heuristic -* tries to retain the benefit of request sorting while preventing -* request starvation. 255 is the max number of tags or pending commands -* a device may have outstanding. -* -* The request count is incremented below for every successfully -* started request. -* -*/ -if ((boardp->dvc_var.asc_dvc_var.cur_dvc_qng[scp->device->id] >0 ) && - (boardp->reqcnt[scp->device->id] %255 ) ==0 ) { - asc_scsi_q.q2.tag_code =MSG_ORDERED_TAG ; - }else { - asc_scsi_q.q2.tag_code =MSG_SIMPLE_TAG ; - } - -/* -* Build ASC_SCSI_Q for a contiguous buffer or a scatter-gather -* buffer command. -*/ -if (scp->use_sg ==0 ) { -/* -* CDB request of single contiguous buffer. -*/ -ASC_STATS (scp->device->host, cont_cnt); - scp->SCp.dma_handle = scp->request_bufflen ? -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction) :0 ; - asc_scsi_q.q1.data_addr =cpu_to_le32 (scp->SCp.dma_handle); - asc_scsi_q.q1.data_cnt =cpu_to_le32 (scp->request_bufflen); -ASC_STATS_ADD (scp->device->host, cont_xfer, -ASC_CEILING (scp->request_bufflen,512 )); - asc_scsi_q.q1.sg_queue_cnt =0 ; - asc_scsi_q.sg_head =NULL ; - }else { -/* -* CDB scatter-gather request list. -*/ -int sgcnt; -int use_sg; -struct scatterlist *slp; - - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); - -if (use_sg > scp->device->host->sg_tablesize) { -ASC_PRINT3 ("asc_build_req: board %d: use_sg %d > " -"sg_tablesize %d\n" , boardp->id, use_sg, - scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); - scp->result =HOST_BYTE (DID_ERROR ); -return ASC_ERROR ; - } - -ASC_STATS (scp->device->host, sg_cnt); - -/* -* Use global ASC_SG_HEAD structure and set the ASC_SCSI_Q -* structure to point to it. -*/ -memset (&asc_sg_head,0 ,sizeof (ASC_SG_HEAD )); +printk (" ADV_DVC_CFG at addr 0x%lx\n" , (ulong )h); - asc_scsi_q.q1.cntl |=QC_SG_HEAD ; - asc_scsi_q.sg_head = &asc_sg_head; - asc_scsi_q.q1.data_cnt =0 ; - asc_scsi_q.q1.data_addr =0 ; -/* This is a byte value, otherwise it would need to be swapped. */ - asc_sg_head.entry_cnt = asc_scsi_q.q1.sg_queue_cnt = use_sg; -ASC_STATS_ADD (scp->device->host, sg_elem, - asc_sg_head.entry_cnt); +printk (" disc_enable 0x%x, termination 0x%x\n" , + h->disc_enable, h->termination); -/* -* Convert scatter-gather list into ASC_SG_HEAD list. -*/ -for (sgcnt =0 ; sgcnt < use_sg; sgcnt++, slp++) { - asc_sg_head.sg_list[sgcnt].addr = -cpu_to_le32 (sg_dma_address (slp)); - asc_sg_head.sg_list[sgcnt].bytes = -cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer, -ASC_CEILING (sg_dma_len (slp),512 )); - } - } +printk (" chip_version 0x%x, mcode_date 0x%x\n" , + h->chip_version, h->mcode_date); -ASC_DBG_PRT_ASC_SCSI_Q (2 , &asc_scsi_q); -ASC_DBG_PRT_CDB (1 , scp->cmnd, scp->cmd_len); +printk (" mcode_version 0x%x, pci_device_id 0x%x, lib_version %u\n" , + h->mcode_version,to_pci_dev (h->dev)->device, h->lib_version); -return ASC_NOERROR ; +printk (" control_flag 0x%x\n" , h->control_flag); }/* -* Build a request structure for the Adv Library (Wide Board). -* -* If an adv_req_t can not be allocated to issue the request, -* then return ASC_BUSY. If an error occurs, then return ASC_ERROR. +* asc_prt_adv_scsi_req_q() * -* Multi-byte fields in the ASC_SCSI_REQ_Q that are used by the -* microcode for DMA addresses or math operations are byte swapped -* to little-endian order. +* Display an ADV_SCSI_REQ_Q structure. */ -static int -adv_build_req (asc_board_t *boardp,struct scsi_cmnd *scp, -ADV_SCSI_REQ_Q **adv_scsiqpp) +static void asc_prt_adv_scsi_req_q (ADV_SCSI_REQ_Q *q) { -adv_req_t *reqp; -ADV_SCSI_REQ_Q *scsiqp; -int i; -int ret; - -/* -* Allocate an adv_req_t structure from the board to execute -* the command. -*/ -if (boardp->adv_reqp ==NULL ) { -ASC_DBG (1 ,"adv_build_req: no free adv_req_t\n" ); -ASC_STATS (scp->device->host, adv_build_noreq); -return ASC_BUSY ; - }else { - reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp->next_reqp; - reqp->next_reqp =NULL ; - } - -/* -* Get 32-byte aligned ADV_SCSI_REQ_Q and ADV_SG_BLOCK pointers. -*/ - scsiqp = (ADV_SCSI_REQ_Q *)ADV_32BALIGN (&reqp->scsi_req_q); - -/* -* Initialize the structure. -*/ - scsiqp->cntl = scsiqp->scsi_cntl = scsiqp->done_status =0 ; - -/* -* Set the ADV_SCSI_REQ_Q 'srb_ptr' to point to the adv_req_t structure. -*/ - scsiqp->srb_ptr =ASC_VADDR_TO_U32 (reqp); - -/* -* Set the adv_req_t 'cmndp' to point to the struct scsi_cmnd structure. -*/ - reqp->cmndp = scp; - -/* -* Build the ADV_SCSI_REQ_Q request. -*/ - -/* Set CDB length and copy it to the request structure. */ - scsiqp->cdb_len = scp->cmd_len; -/* Copy first 12 CDB bytes to cdb[]. */ -for (i =0 ; i < scp->cmd_len && i <12 ; i++) { - scsiqp->cdb[i] = scp->cmnd[i]; - } -/* Copy last 4 CDB bytes, if present, to cdb16[]. */ -for (; i < scp->cmd_len; i++) { - scsiqp->cdb16[i -12 ] = scp->cmnd[i]; - } - - scsiqp->target_id = scp->device->id; - scsiqp->target_lun = scp->device->lun; - - scsiqp->sense_addr =cpu_to_le32 (virt_to_bus (&scp->sense_buffer[0 ])); - scsiqp->sense_len =sizeof (scp->sense_buffer); +int sg_blk_cnt; +struct asc_sg_block *sg_ptr; -/* -* Build ADV_SCSI_REQ_Q for a contiguous buffer or a scatter-gather -* buffer command. -*/ +printk ("ADV_SCSI_REQ_Q at addr 0x%lx\n" , (ulong )q); - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); - scsiqp->vdata_addr = scp->request_buffer; - scsiqp->data_addr =cpu_to_le32 (virt_to_bus (scp->request_buffer)); +printk (" target_id %u, target_lun %u, srb_ptr 0x%lx, a_flag 0x%x\n" , + q->target_id, q->target_lun, (ulong )q->srb_ptr, q->a_flag); -if (scp->use_sg ==0 ) { -/* -* CDB request of single contiguous buffer. -*/ - reqp->sgblkp =NULL ; - scsiqp->data_cnt =cpu_to_le32 (scp->request_bufflen); -if (scp->request_bufflen) { - scsiqp->vdata_addr = scp->request_buffer; - scp->SCp.dma_handle = -dma_map_single (boardp->dev, scp->request_buffer, - scp->request_bufflen, - scp->sc_data_direction); - }else { - scsiqp->vdata_addr =NULL ; - scp->SCp.dma_handle =0 ; - } - scsiqp->data_addr =cpu_to_le32 (scp->SCp.dma_handle); - scsiqp->sg_list_ptr =NULL ; - scsiqp->sg_real_addr =0 ; -ASC_STATS (scp->device->host, cont_cnt); -ASC_STATS_ADD (scp->device->host, cont_xfer, -ASC_CEILING (scp->request_bufflen,512 )); - }else { -/* -* CDB scatter-gather request list. -*/ -struct scatterlist *slp; -int use_sg; +printk (" cntl 0x%x, data_addr 0x%lx, vdata_addr 0x%lx\n" , + q->cntl, (ulong )le32_to_cpu (q->data_addr), (ulong )q->vdata_addr); - slp = (struct scatterlist *)scp->request_buffer; - use_sg =dma_map_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); +printk (" data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , + (ulong )le32_to_cpu (q->data_cnt), + (ulong )le32_to_cpu (q->sense_addr), q->sense_len); -if (use_sg >ADV_MAX_SG_LIST ) { -ASC_PRINT3 ("adv_build_req: board %d: use_sg %d > " -"ADV_MAX_SG_LIST %d\n" , boardp->id, use_sg, - scp->device->host->sg_tablesize); -dma_unmap_sg (boardp->dev, slp, scp->use_sg, - scp->sc_data_direction); - scp->result =HOST_BYTE (DID_ERROR ); +printk + (" cdb_len %u, done_status 0x%x, host_status 0x%x, scsi_status 0x%x\n" , + q->cdb_len, q->done_status, q->host_status, q->scsi_status); -/* -* Free the 'adv_req_t' structure by adding it back -* to the board free list. -*/ - reqp->next_reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp; +printk (" sg_working_ix 0x%x, target_cmd %u\n" , + q->sg_working_ix, q->target_cmd); -return ASC_ERROR ; - } +printk (" scsiq_rptr 0x%lx, sg_real_addr 0x%lx, sg_list_ptr 0x%lx\n" , + (ulong )le32_to_cpu (q->scsiq_rptr), + (ulong )le32_to_cpu (q->sg_real_addr), (ulong )q->sg_list_ptr); - ret =adv_get_sglist (boardp, reqp, scp, use_sg); -if (ret !=ADV_SUCCESS ) { +/* Display the request's ADV_SG_BLOCK structures. */ +if (q->sg_list_ptr !=NULL ) { + sg_blk_cnt =0 ; +while (1 ) {/* -* Free the adv_req_t structure by adding it back to -* the board free list. +* 'sg_ptr' is a physical address. Convert it to a virtual +* address by indexing 'sg_blk_cnt' into the virtual address +* array 'sg_list_ptr'. +* +* XXX - Assumes all SG physical blocks are virtually contiguous. */ - reqp->next_reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp; - -return ret; + sg_ptr = + &(((ADV_SG_BLOCK *)(q->sg_list_ptr))[sg_blk_cnt]); +asc_prt_adv_sgblock (sg_blk_cnt, sg_ptr); +if (sg_ptr->sg_ptr ==0 ) { +break ; + } + sg_blk_cnt++; } - -ASC_STATS (scp->device->host, sg_cnt); -ASC_STATS_ADD (scp->device->host, sg_elem, use_sg); } - -ASC_DBG_PRT_ADV_SCSI_REQ_Q (2 , scsiqp); -ASC_DBG_PRT_CDB (1 , scp->cmnd, scp->cmd_len); - - *adv_scsiqpp = scsiqp; - -return ASC_NOERROR ; }/* -* Build scatter-gather list for Adv Library (Wide Board). -* -* Additional ADV_SG_BLOCK structures will need to be allocated -* if the total number of scatter-gather elements exceeds -* NO_OF_SG_PER_BLOCK (15). The ADV_SG_BLOCK structures are -* assumed to be physically contiguous. +* asc_prt_adv_sgblock() * -* Return: -* ADV_SUCCESS(1) - SG List successfully created -* ADV_ERROR(-1) - SG List creation failed +* Display an ADV_SG_BLOCK structure. */ -static int -adv_get_sglist (asc_board_t *boardp,adv_req_t *reqp,struct scsi_cmnd *scp, -int use_sg) +static void asc_prt_adv_sgblock (int sgblockno,ADV_SG_BLOCK *b) { -adv_sgblk_t *sgblkp; -ADV_SCSI_REQ_Q *scsiqp; -struct scatterlist *slp; -int sg_elem_cnt; -ADV_SG_BLOCK *sg_block, *prev_sg_block; -ADV_PADDR sg_block_paddr;int i; - scsiqp = (ADV_SCSI_REQ_Q *)ADV_32BALIGN (&reqp->scsi_req_q); - slp = (struct scatterlist *)scp->request_buffer; - sg_elem_cnt = use_sg; - prev_sg_block =NULL ; - reqp->sgblkp =NULL ; - -for (;;) { -/* -* Allocate a 'adv_sgblk_t' structure from the board free -* list. One 'adv_sgblk_t' structure holds NO_OF_SG_PER_BLOCK -* (15) scatter-gather elements. -*/ -if ((sgblkp = boardp->adv_sgblkp) ==NULL ) { -ASC_DBG (1 ,"adv_get_sglist: no free adv_sgblk_t\n" ); -ASC_STATS (scp->device->host, adv_build_nosg); - -/* -* Allocation failed. Free 'adv_sgblk_t' structures -* already allocated for the request. -*/ -while ((sgblkp = reqp->sgblkp) !=NULL ) { -/* Remove 'sgblkp' from the request list. */ - reqp->sgblkp = sgblkp->next_sgblkp; - -/* Add 'sgblkp' to the board free list. */ - sgblkp->next_sgblkp = boardp->adv_sgblkp; - boardp->adv_sgblkp = sgblkp; - } -return ASC_BUSY ; - } - -/* Complete 'adv_sgblk_t' board allocation. */ - boardp->adv_sgblkp = sgblkp->next_sgblkp; - sgblkp->next_sgblkp =NULL ; - -/* -* Get 8 byte aligned virtual and physical addresses -* for the allocated ADV_SG_BLOCK structure. -*/ - sg_block = (ADV_SG_BLOCK *)ADV_8BALIGN (&sgblkp->sg_block); - sg_block_paddr =virt_to_bus (sg_block); - -/* -* Check if this is the first 'adv_sgblk_t' for the -* request. -*/ -if (reqp->sgblkp ==NULL ) { -/* Request's first scatter-gather block. */ - reqp->sgblkp = sgblkp; - -/* -* Set ADV_SCSI_REQ_T ADV_SG_BLOCK virtual and physical -* address pointers. -*/ - scsiqp->sg_list_ptr = sg_block; - scsiqp->sg_real_addr =cpu_to_le32 (sg_block_paddr); - }else { -/* Request's second or later scatter-gather block. */ - sgblkp->next_sgblkp = reqp->sgblkp; - reqp->sgblkp = sgblkp; - -/* -* Point the previous ADV_SG_BLOCK structure to -* the newly allocated ADV_SG_BLOCK structure. -*/ - prev_sg_block->sg_ptr =cpu_to_le32 (sg_block_paddr); - } - -for (i =0 ; i <NO_OF_SG_PER_BLOCK ; i++) { - sg_block->sg_list[i].sg_addr = -cpu_to_le32 (sg_dma_address (slp)); - sg_block->sg_list[i].sg_count = -cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer, -ASC_CEILING (sg_dma_len (slp),512 )); - -if (--sg_elem_cnt ==0 ) {/* Last ADV_SG_BLOCK and scatter-gather entry. */ - sg_block->sg_cnt = i +1 ; - sg_block->sg_ptr =0L ;/* Last ADV_SG_BLOCK in list. */ -return ADV_SUCCESS ; - } - slp++; - } - sg_block->sg_cnt =NO_OF_SG_PER_BLOCK ; - prev_sg_block = sg_block; +printk (" ASC_SG_BLOCK at addr 0x%lx (sgblockno %d)\n" , + (ulong )b, sgblockno); +printk (" sg_cnt %u, sg_ptr 0x%lx\n" , + b->sg_cnt, (ulong )le32_to_cpu (b->sg_ptr)); +BUG_ON (b->sg_cnt >NO_OF_SG_PER_BLOCK ); +if (b->sg_ptr !=0 ) +BUG_ON (b->sg_cnt !=NO_OF_SG_PER_BLOCK ); +for (i =0 ; i < b->sg_cnt; i++) { +printk (" [%u]: sg_addr 0x%lx, sg_count 0x%lx\n" , + i, (ulong )b->sg_list[i].sg_addr, + (ulong )b->sg_list[i].sg_count); } }/* -* asc_isr_callback() - Second Level Interrupt Handler called by AscISR(). +* asc_prt_hex() * -* Interrupt callback function for the Narrow SCSI Asc Library. +* Print hexadecimal output in 4 byte groupings 32 bytes +* or 8 double-words per line. */ -static void asc_isr_callback (ASC_DVC_VAR *asc_dvc_varp,ASC_QDONE_INFO *qdonep) +static void asc_prt_hex (char *f,uchar *s,int l) { -asc_board_t *boardp; -struct scsi_cmnd *scp; -struct Scsi_Host *shost; - -ASC_DBG2 (1 ,"asc_isr_callback: asc_dvc_varp 0x%lx, qdonep 0x%lx\n" , - (ulong )asc_dvc_varp, (ulong )qdonep); -ASC_DBG_PRT_ASC_QDONE_INFO (2 , qdonep); - -/* -* Get the struct scsi_cmnd structure and Scsi_Host structure for the -* command that has been completed. -*/ - scp = (struct scsi_cmnd *)ASC_U32_TO_VADDR (qdonep->d2.srb_ptr); -ASC_DBG1 (1 ,"asc_isr_callback: scp 0x%lx\n" , (ulong )scp); - -if (scp ==NULL ) { -ASC_PRINT ("asc_isr_callback: scp is NULL\n" ); -return ; - } -ASC_DBG_PRT_CDB (2 , scp->cmnd, scp->cmd_len); - - shost = scp->device->host; -ASC_STATS (shost, callback); -ASC_DBG1 (1 ,"asc_isr_callback: shost 0x%lx\n" , (ulong )shost); +int i; +int j; +int k; +int m; - boardp =ASC_BOARDP (shost); -BUG_ON (asc_dvc_varp != &boardp->dvc_var.asc_dvc_var); +printk ("%s: (%d bytes)\n" , f, l); -/* -* 'qdonep' contains the command's ending status. -*/ -switch (qdonep->d3.done_stat) { -case QD_NO_ERROR : -ASC_DBG (2 ,"asc_isr_callback: QD_NO_ERROR\n" ); - scp->result =0 ; +for (i =0 ; i < l; i +=32 ) { -/* -* Check for an underrun condition. -* -* If there was no error and an underrun condition, then -* return the number of underrun bytes. -*/ -if (scp->request_bufflen !=0 && qdonep->remain_bytes !=0 && - qdonep->remain_bytes <= scp->request_bufflen) { -ASC_DBG1 (1 , -"asc_isr_callback: underrun condition %u bytes\n" , - (unsigned )qdonep->remain_bytes); - scp->resid = qdonep->remain_bytes; +/* Display a maximum of 8 double-words per line. */ +if ((k = (l - i) /4 ) >=8 ) { + k =8 ; + m =0 ; + }else { + m = (l - i) %4 ; } -break ; -case QD_WITH_ERROR : -ASC_DBG (2 ,"asc_isr_callback: QD_WITH_ERROR\n" ); -switch (qdonep->d3.host_stat) { -case QHSTA_NO_ERROR : -if (qdonep->d3.scsi_stat ==SAM_STAT_CHECK_CONDITION ) { -ASC_DBG (2 , -"asc_isr_callback: SAM_STAT_CHECK_CONDITION\n" ); -ASC_DBG_PRT_SENSE (2 , scp->sense_buffer, -sizeof (scp->sense_buffer)); -/* -* Note: The 'status_byte()' macro used by -* target drivers defined in scsi.h shifts the -* status byte returned by host drivers right -* by 1 bit. This is why target drivers also -* use right shifted status byte definitions. -* For instance target drivers use -* CHECK_CONDITION, defined to 0x1, instead of -* the SCSI defined check condition value of -* 0x2. Host drivers are supposed to return -* the status byte as it is defined by SCSI. -*/ - scp->result =DRIVER_BYTE (DRIVER_SENSE ) | -STATUS_BYTE (qdonep->d3.scsi_stat); - }else { - scp->result =STATUS_BYTE (qdonep->d3.scsi_stat); - } -break ; +for (j =0 ; j < k; j++) { +printk (" %2.2X%2.2X%2.2X%2.2X" , + (unsigned )s[i + (j *4 )], + (unsigned )s[i + (j *4 ) +1 ], + (unsigned )s[i + (j *4 ) +2 ], + (unsigned )s[i + (j *4 ) +3 ]); + } +switch (m) { +case 0 :default : -/* QHSTA error occurred */ -ASC_DBG1 (1 ,"asc_isr_callback: host_stat 0x%x\n" , - qdonep->d3.host_stat); - scp->result =HOST_BYTE (DID_BAD_TARGET ); +break ; +case 1 : +printk (" %2.2X" , (unsigned )s[i + (j *4 )]); +break ; +case 2 : +printk (" %2.2X%2.2X" , + (unsigned )s[i + (j *4 )], + (unsigned )s[i + (j *4 ) +1 ]); +break ; +case 3 : +printk (" %2.2X%2.2X%2.2X" , + (unsigned )s[i + (j *4 ) +1 ], + (unsigned )s[i + (j *4 ) +2 ], + (unsigned )s[i + (j *4 ) +3 ]);break ; } -break ; - -case QD_ABORTED_BY_HOST : -ASC_DBG (1 ,"asc_isr_callback: QD_ABORTED_BY_HOST\n" ); - scp->result = -HOST_BYTE (DID_ABORT ) |MSG_BYTE (qdonep->d3. - scsi_msg) | -STATUS_BYTE (qdonep->d3.scsi_stat); -break ; - -default : -ASC_DBG1 (1 ,"asc_isr_callback: done_stat 0x%x\n" , - qdonep->d3.done_stat); - scp->result = -HOST_BYTE (DID_ERROR ) |MSG_BYTE (qdonep->d3. - scsi_msg) | -STATUS_BYTE (qdonep->d3.scsi_stat); -break ; - } -/* -* If the 'init_tidmask' bit isn't already set for the target and the -* current request finished normally, then set the bit for the target -* to indicate that a device is present. -*/ -if ((boardp->init_tidmask &ADV_TID_TO_TIDMASK (scp->device->id)) ==0 && - qdonep->d3.done_stat ==QD_NO_ERROR && - qdonep->d3.host_stat ==QHSTA_NO_ERROR ) { - boardp->init_tidmask |=ADV_TID_TO_TIDMASK (scp->device->id); +printk ("\n" ); } - -asc_scsi_done (scp); - -return ; } +#endif /* ADVANSYS_DEBUG */ /* -* adv_isr_callback() - Second Level Interrupt Handler called by AdvISR(). +* advansys_info() * -* Callback function for the Wide SCSI Adv Library. +* Return suitable for printing on the console with the argument +* adapter's configuration information. +* +* Note: The information line should not exceed ASC_INFO_SIZE bytes, +* otherwise the static 'info' array will be overrun. */ -static void adv_isr_callback (ADV_DVC_VAR *adv_dvc_varp,ADV_SCSI_REQ_Q *scsiqp) +static const char *advansys_info (struct Scsi_Host *shost) { +static char info[ASC_INFO_SIZE ];asc_board_t *boardp; -adv_req_t *reqp; -adv_sgblk_t *sgblkp; -struct scsi_cmnd *scp; -struct Scsi_Host *shost; -ADV_DCNT resid_cnt; - -ASC_DBG2 (1 ,"adv_isr_callback: adv_dvc_varp 0x%lx, scsiqp 0x%lx\n" , - (ulong )adv_dvc_varp, (ulong )scsiqp); -ASC_DBG_PRT_ADV_SCSI_REQ_Q (2 , scsiqp); - -/* -* Get the adv_req_t structure for the command that has been -* completed. The adv_req_t structure actually contains the -* completed ADV_SCSI_REQ_Q structure. -*/ - reqp = (adv_req_t *)ADV_U32_TO_VADDR (scsiqp->srb_ptr); -ASC_DBG1 (1 ,"adv_isr_callback: reqp 0x%lx\n" , (ulong )reqp); -if (reqp ==NULL ) { -ASC_PRINT ("adv_isr_callback: reqp is NULL\n" ); -return ; - } - -/* -* Get the struct scsi_cmnd structure and Scsi_Host structure for the -* command that has been completed. -* -* Note: The adv_req_t request structure and adv_sgblk_t structure, -* if any, are dropped, because a board structure pointer can not be -* determined. -*/ - scp = reqp->cmndp; -ASC_DBG1 (1 ,"adv_isr_callback: scp 0x%lx\n" , (ulong )scp); -if (scp ==NULL ) { -ASC_PRINT - ("adv_isr_callback: scp is NULL; adv_req_t dropped.\n" ); -return ; - } -ASC_DBG_PRT_CDB (2 , scp->cmnd, scp->cmd_len); - - shost = scp->device->host; -ASC_STATS (shost, callback); -ASC_DBG1 (1 ,"adv_isr_callback: shost 0x%lx\n" , (ulong )shost); +ASC_DVC_VAR *asc_dvc_varp; +ADV_DVC_VAR *adv_dvc_varp; +char *busname; +char *widename =NULL ; boardp =ASC_BOARDP (shost); -BUG_ON (adv_dvc_varp != &boardp->dvc_var.adv_dvc_var); - -/* -* 'done_status' contains the command's ending status. -*/ -switch (scsiqp->done_status) { -case QD_NO_ERROR : -ASC_DBG (2 ,"adv_isr_callback: QD_NO_ERROR\n" ); - scp->result =0 ; - +if (ASC_NARROW_BOARD (boardp)) { + asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; +ASC_DBG (1 ,"advansys_info: begin\n" ); +if (asc_dvc_varp->bus_type &ASC_IS_ISA ) { +if ((asc_dvc_varp->bus_type &ASC_IS_ISAPNP ) == +ASC_IS_ISAPNP ) { + busname ="ISA PnP" ; + }else { + busname ="ISA" ; + } +sprintf (info, +"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X, DMA 0x%X" , +ASC_VERSION , busname, + (ulong )shost->io_port, + (ulong )shost->io_port +ASC_IOADR_GAP -1 , + shost->irq, shost->dma_channel); + }else { +if (asc_dvc_varp->bus_type &ASC_IS_VL ) { + busname ="VL" ; + }else if (asc_dvc_varp->bus_type &ASC_IS_EISA ) { + busname ="EISA" ; + }else if (asc_dvc_varp->bus_type &ASC_IS_PCI ) { +if ((asc_dvc_varp->bus_type &ASC_IS_PCI_ULTRA ) + ==ASC_IS_PCI_ULTRA ) { + busname ="PCI Ultra" ; + }else { + busname ="PCI" ; + } + }else { + busname ="?" ; +ASC_PRINT2 ("advansys_info: board %d: unknown " +"bus type %d\n" , boardp->id, + asc_dvc_varp->bus_type); + } +sprintf (info, +"AdvanSys SCSI %s: %s: IO 0x%lX-0x%lX, IRQ 0x%X" , +ASC_VERSION , busname, (ulong )shost->io_port, + (ulong )shost->io_port +ASC_IOADR_GAP -1 , + shost->irq); + } + }else {/* -* Check for an underrun condition. +* Wide Adapter Information * -* If there was no error and an underrun condition, then -* then return the number of underrun bytes. +* Memory-mapped I/O is used instead of I/O space to access +* the adapter, but display the I/O Port range. The Memory +* I/O address is displayed through the driver /proc file. */ - resid_cnt =le32_to_cpu (scsiqp->data_cnt); -if (scp->request_bufflen !=0 && resid_cnt !=0 && - resid_cnt <= scp->request_bufflen) { -ASC_DBG1 (1 , -"adv_isr_callback: underrun condition %lu bytes\n" , - (ulong )resid_cnt); - scp->resid = resid_cnt; - } -break ; - -case QD_WITH_ERROR : -ASC_DBG (2 ,"adv_isr_callback: QD_WITH_ERROR\n" ); -switch (scsiqp->host_status) { -case QHSTA_NO_ERROR : -if (scsiqp->scsi_status ==SAM_STAT_CHECK_CONDITION ) { -ASC_DBG (2 , -"adv_isr_callback: SAM_STAT_CHECK_CONDITION\n" ); -ASC_DBG_PRT_SENSE (2 , scp->sense_buffer, -sizeof (scp->sense_buffer)); -/* -* Note: The 'status_byte()' macro used by -* target drivers defined in scsi.h shifts the -* status byte returned by host drivers right -* by 1 bit. This is why target drivers also -* use right shifted status byte definitions. -* For instance target drivers use -* CHECK_CONDITION, defined to 0x1, instead of -* the SCSI defined check condition value of -* 0x2. Host drivers are supposed to return -* the status byte as it is defined by SCSI. -*/ - scp->result =DRIVER_BYTE (DRIVER_SENSE ) | -STATUS_BYTE (scsiqp->scsi_status); - }else { - scp->result =STATUS_BYTE (scsiqp->scsi_status); - } -break ; - -default : -/* Some other QHSTA error occurred. */ -ASC_DBG1 (1 ,"adv_isr_callback: host_status 0x%x\n" , - scsiqp->host_status); - scp->result =HOST_BYTE (DID_BAD_TARGET ); -break ; + adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; +if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC3550 ) { + widename ="Ultra-Wide" ; + }else if (adv_dvc_varp->chip_type ==ADV_CHIP_ASC38C0800 ) { + widename ="Ultra2-Wide" ; + }else { + widename ="Ultra3-Wide" ; } -break ; - -case QD_ABORTED_BY_HOST : -ASC_DBG (1 ,"adv_isr_callback: QD_ABORTED_BY_HOST\n" ); - scp->result = -HOST_BYTE (DID_ABORT ) |STATUS_BYTE (scsiqp->scsi_status); -break ; - -default : -ASC_DBG1 (1 ,"adv_isr_callback: done_status 0x%x\n" , - scsiqp->done_status); - scp->result = -HOST_BYTE (DID_ERROR ) |STATUS_BYTE (scsiqp->scsi_status); -break ; - } - -/* -* If the 'init_tidmask' bit isn't already set for the target and the -* current request finished normally, then set the bit for the target -* to indicate that a device is present. -*/ -if ((boardp->init_tidmask &ADV_TID_TO_TIDMASK (scp->device->id)) ==0 && - scsiqp->done_status ==QD_NO_ERROR && - scsiqp->host_status ==QHSTA_NO_ERROR ) { - boardp->init_tidmask |=ADV_TID_TO_TIDMASK (scp->device->id); - } - -asc_scsi_done (scp); - -/* -* Free all 'adv_sgblk_t' structures allocated for the request. -*/ -while ((sgblkp = reqp->sgblkp) !=NULL ) { -/* Remove 'sgblkp' from the request list. */ - reqp->sgblkp = sgblkp->next_sgblkp; - -/* Add 'sgblkp' to the board free list. */ - sgblkp->next_sgblkp = boardp->adv_sgblkp; - boardp->adv_sgblkp = sgblkp; +sprintf (info, +"AdvanSys SCSI %s: PCI %s: PCIMEM 0x%lX-0x%lX, IRQ 0x%X" , +ASC_VERSION , widename, (ulong )adv_dvc_varp->iop_base, + (ulong )adv_dvc_varp->iop_base + boardp->asc_n_io_port -1 , shost->irq); } - -/* -* Free the adv_req_t structure used with the command by adding -* it back to the board free list. -*/ - reqp->next_reqp = boardp->adv_reqp; - boardp->adv_reqp = reqp; - -ASC_DBG (1 ,"adv_isr_callback: done\n" ); - -return ; +BUG_ON (strlen (info) >=ASC_INFO_SIZE ); +ASC_DBG (1 ,"advansys_info: end\n" ); +return info; } +#ifdef CONFIG_PROC_FS /* -* adv_async_callback() - Adv Library asynchronous event callback function. +* asc_prt_line() +* +* If 'cp' is NULL print to the console, otherwise print to a buffer. +* +* Return 0 if printing to the console, otherwise return the number of +* bytes written to the buffer. +* +* Note: If any single line is greater than ASC_PRTLINE_SIZE bytes the stack +* will be corrupted. 's[]' is defined to be ASC_PRTLINE_SIZE bytes. */ -static void adv_async_callback (ADV_DVC_VAR *adv_dvc_varp,uchar code) +static int asc_prt_line (char *buf,int buflen,char *fmt, ...) { -switch (code) { -case ADV_ASYNC_SCSI_BUS_RESET_DET : -/* -* The firmware detected a SCSI Bus reset. -*/ -ASC_DBG (0 , -"adv_async_callback: ADV_ASYNC_SCSI_BUS_RESET_DET\n" ); -break ; - -case ADV_ASYNC_RDMA_FAILURE : -/* -* Handle RDMA failure by resetting the SCSI Bus and -* possibly the chip if it is unresponsive. Log the error -* with a unique code. -*/ -ASC_DBG (0 ,"adv_async_callback: ADV_ASYNC_RDMA_FAILURE\n" ); -AdvResetChipAndSB (adv_dvc_varp); -break ; - -case ADV_HOST_SCSI_BUS_RESET : -/* -* Host generated SCSI bus reset occurred. -*/ -ASC_DBG (0 ,"adv_async_callback: ADV_HOST_SCSI_BUS_RESET\n" ); -break ; +va_list args; +int ret; +char s[ASC_PRTLINE_SIZE ]; -default : -ASC_DBG1 (0 ,"DvcAsyncCallBack: unknown code 0x%x\n" , code); -break ; +va_start (args, fmt); + ret =vsprintf (s, fmt, args); +BUG_ON (ret >=ASC_PRTLINE_SIZE ); +if (buf ==NULL ) { + (void )printk (s); + ret =0 ; + }else { + ret =min (buflen, ret); +memcpy (buf, s, ret); } +va_end (args); +return ret; } -#ifdef CONFIG_PROC_FS /* * asc_prt_board_devices() *
@@ -5548,159 +4212,7 @@ asc_proc_copy(off_t advoffset, off_t offset, char *curbuf, int leftlen,return cnt; } -/* -* asc_prt_line() -* -* If 'cp' is NULL print to the console, otherwise print to a buffer. -* -* Return 0 if printing to the console, otherwise return the number of -* bytes written to the buffer. -* -* Note: If any single line is greater than ASC_PRTLINE_SIZE bytes the stack -* will be corrupted. 's[]' is defined to be ASC_PRTLINE_SIZE bytes. -*/ -static int asc_prt_line (char *buf,int buflen,char *fmt, ...) -{ -va_list args; -int ret; -char s[ASC_PRTLINE_SIZE ]; - -va_start (args, fmt); - ret =vsprintf (s, fmt, args); -BUG_ON (ret >=ASC_PRTLINE_SIZE ); -if (buf ==NULL ) { - (void )printk (s); - ret =0 ; - }else { - ret =min (buflen, ret); -memcpy (buf, s, ret); - } -va_end (args); -return ret; -} -#endif /* CONFIG_PROC_FS */ - -/* -* void -* DvcPutScsiQ(PortAddr iop_base, ushort s_addr, uchar *outbuf, int words) -* -* Calling/Exit State: -* none -* -* Description: -* Output an ASC_SCSI_Q structure to the chip -*/ -static void -DvcPutScsiQ (PortAddr iop_base,ushort s_addr,uchar *outbuf,int words) -{ -int i; - -ASC_DBG_PRT_HEX (2 ,"DvcPutScsiQ" , outbuf,2 * words); -AscSetChipLramAddr (iop_base, s_addr); -for (i =0 ; i <2 * words; i +=2 ) { -if (i ==4 || i ==20 ) { -continue ; - } -outpw (iop_base +IOP_RAM_DATA , - ((ushort )outbuf[i +1 ] <<8 ) | outbuf[i]); - } -} - -/* -* void -* DvcGetQinfo(PortAddr iop_base, ushort s_addr, uchar *inbuf, int words) -* -* Calling/Exit State: -* none -* -* Description: -* Input an ASC_QDONE_INFO structure from the chip -*/ -static void -DvcGetQinfo (PortAddr iop_base,ushort s_addr,uchar *inbuf,int words) -{ -int i; -ushort word; - -AscSetChipLramAddr (iop_base, s_addr); -for (i =0 ; i <2 * words; i +=2 ) { -if (i ==10 ) { -continue ; - } - word =inpw (iop_base +IOP_RAM_DATA ); - inbuf[i] = word &0xff ; - inbuf[i +1 ] = (word >>8 ) &0xff ; - } -ASC_DBG_PRT_HEX (2 ,"DvcGetQinfo" , inbuf,2 * words); -} - -/* -* Return the BIOS address of the adapter at the specified -* I/O port and with the specified bus type. -*/ -static unsigned short __devinit -AscGetChipBiosAddress (PortAddr iop_base,unsigned short bus_type) -{ -unsigned short cfg_lsw; -unsigned short bios_addr; - -/* -* The PCI BIOS is re-located by the motherboard BIOS. Because -* of this the driver can not determine where a PCI BIOS is -* loaded and executes. -*/ -if (bus_type &ASC_IS_PCI ) -return 0 ; - -#ifdef CONFIG_ISA -if ((bus_type &ASC_IS_EISA ) !=0 ) { - cfg_lsw =AscGetEisaChipCfg (iop_base); - cfg_lsw &=0x000F ; - bios_addr =ASC_BIOS_MIN_ADDR + cfg_lsw *ASC_BIOS_BANK_SIZE ; -return bios_addr; - } -#endif /* CONFIG_ISA */ - - cfg_lsw =AscGetChipCfgLsw (iop_base); - -/* -* ISA PnP uses the top bit as the 32K BIOS flag -*/ -if (bus_type ==ASC_IS_ISAPNP ) - cfg_lsw &=0x7FFF ; - bios_addr =ASC_BIOS_MIN_ADDR + (cfg_lsw >>12 ) *ASC_BIOS_BANK_SIZE ; -return bios_addr; -} - -/* -* DvcGetPhyAddr() -* -* Return the physical address of 'vaddr' and set '*lenp' to the -* number of physically contiguous bytes that follow 'vaddr'. -* 'flag' indicates the type of structure whose physical address -* is being translated. -* -* Note: Because Linux currently doesn't page the kernel and all -* kernel buffers are physically contiguous, leave '*lenp' unchanged. -*/ -ADV_PADDR -DvcGetPhyAddr (ADV_DVC_VAR *asc_dvc,ADV_SCSI_REQ_Q *scsiq, -uchar *vaddr,ADV_SDCNT *lenp,int flag) -{ -ADV_PADDR paddr; - - paddr =virt_to_bus (vaddr); - -ASC_DBG4 (4 , -"DvcGetPhyAddr: vaddr 0x%lx, lenp 0x%lx *lenp %lu, paddr 0x%lx\n" , - (ulong )vaddr, (ulong )lenp, (ulong)*((ulong *)lenp), - (ulong )paddr); - -return paddr; -} -#ifdef ADVANSYS_STATS -#ifdef CONFIG_PROC_FS /* * asc_prt_board_stats() *
@@ -5803,420 +4315,543 @@ static int asc_prt_board_stats(struct Scsi_Host *shost, char *cp, int cplen)return totlen; } -#endif /* CONFIG_PROC_FS */ #endif /* ADVANSYS_STATS */ -#ifdef ADVANSYS_DEBUG /* -* asc_prt_scsi_host() +* advansys_proc_info() - /proc/scsi/advansys/{0,1,2,3,...} +* +* *buffer: I/O buffer +* **start: if inout == FALSE pointer into buffer where user read should start +* offset: current offset into a /proc/scsi/advansys/[0...] file +* length: length of buffer +* hostno: Scsi_Host host_no +* inout: TRUE - user is writing; FALSE - user is reading +* +* Return the number of bytes read from or written to a +* /proc/scsi/advansys/[0...] file. +* +* Note: This function uses the per board buffer 'prtbuf' which is +* allocated when the board is initialized in advansys_detect(). The +* buffer is ASC_PRTBUF_SIZE bytes. The function asc_proc_copy() is +* used to write to the buffer. The way asc_proc_copy() is written +* if 'prtbuf' is too small it will not be overwritten. Instead the +* user just won't get all the available statistics. */ -static void asc_prt_scsi_host (struct Scsi_Host *s) +static int +advansys_proc_info (struct Scsi_Host *shost,char *buffer,char **start, +off_t offset,int length,int inout) {asc_board_t *boardp; +char *cp; +int cplen; +int cnt; +int totcnt; +int leftlen; +char *curbuf; +off_t advoffset; - boardp =ASC_BOARDP (s); +ASC_DBG (1 ,"advansys_proc_info: begin\n" ); -printk ("Scsi_Host at addr 0x%lx\n" , (ulong )s); -printk (" host_busy %u, host_no %d, last_reset %d,\n" , - s->host_busy, s->host_no, (unsigned )s->last_reset); +/* +* User write not supported. +*/ +if (inout == TRUE) { +return (-ENOSYS ); + } -printk (" base 0x%lx, io_port 0x%lx, irq 0x%x,\n" , - (ulong )s->base, (ulong )s->io_port, s->irq); +/* +* User read of /proc/scsi/advansys/[0...] file. +*/ -printk (" dma_channel %d, this_id %d, can_queue %d,\n" , - s->dma_channel, s->this_id, s->can_queue); + boardp =ASC_BOARDP (shost); -printk (" cmd_per_lun %d, sg_tablesize %d, unchecked_isa_dma %d\n" , - s->cmd_per_lun, s->sg_tablesize, s->unchecked_isa_dma); +/* Copy read data starting at the beginning of the buffer. */ + *start = buffer; + curbuf = buffer; + advoffset =0 ; + totcnt =0 ; + leftlen = length; -if (ASC_NARROW_BOARD (boardp)) { -asc_prt_asc_dvc_var (&ASC_BOARDP (s)->dvc_var.asc_dvc_var); -asc_prt_asc_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.asc_dvc_cfg); - }else { -asc_prt_adv_dvc_var (&ASC_BOARDP (s)->dvc_var.adv_dvc_var); -asc_prt_adv_dvc_cfg (&ASC_BOARDP (s)->dvc_cfg.adv_dvc_cfg); +/* +* Get board configuration information. +* +* advansys_info() returns the board string from its own static buffer. +*/ + cp = (char *)advansys_info (shost); +strcat (cp,"\n" ); + cplen =strlen (cp); +/* Copy board information. */ + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; } -} - -/* -* asc_prt_scsi_cmnd() -*/ -static void asc_prt_scsi_cmnd (struct scsi_cmnd *s) -{ -printk ("struct scsi_cmnd at addr 0x%lx\n" , (ulong )s); + advoffset += cplen; + curbuf += cnt; -printk (" host 0x%lx, device 0x%lx, target %u, lun %u, channel %u,\n" , - (ulong )s->device->host, (ulong )s->device, s->device->id, - s->device->lun, s->device->channel); +/* +* Display Wide Board BIOS Information. +*/ +if (ASC_WIDE_BOARD (boardp)) { + cp = boardp->prtbuf; + cplen =asc_prt_adv_bios (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, + cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; + } -asc_prt_hex (" CDB" , s->cmnd, s->cmd_len); +/* +* Display driver information for each device attached to the board. +*/ + cp = boardp->prtbuf; + cplen =asc_prt_board_devices (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk ("sc_data_direction %u, resid %d\n" , - s->sc_data_direction, s->resid); +/* +* Display EEPROM configuration for the board. +*/ + cp = boardp->prtbuf; +if (ASC_NARROW_BOARD (boardp)) { + cplen =asc_prt_asc_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); + }else { + cplen =asc_prt_adv_board_eeprom (shost, cp,ASC_PRTBUF_SIZE ); + } +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk (" use_sg %u, sglist_len %u\n" , s->use_sg, s->sglist_len); +/* +* Display driver configuration and information for the board. +*/ + cp = boardp->prtbuf; + cplen =asc_prt_driver_conf (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk (" serial_number 0x%x, retries %d, allowed %d\n" , - (unsigned )s->serial_number, s->retries, s->allowed); +#ifdef ADVANSYS_STATS +/* +* Display driver statistics for the board. +*/ + cp = boardp->prtbuf; + cplen =asc_prt_board_stats (shost, cp,ASC_PRTBUF_SIZE ); +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; +#endif /* ADVANSYS_STATS */ -printk (" timeout_per_command %d\n" , s->timeout_per_command); +/* +* Display Asc Library dynamic configuration information +* for the board. +*/ + cp = boardp->prtbuf; +if (ASC_NARROW_BOARD (boardp)) { + cplen =asc_prt_asc_board_info (shost, cp,ASC_PRTBUF_SIZE ); + }else { + cplen =asc_prt_adv_board_info (shost, cp,ASC_PRTBUF_SIZE ); + } +BUG_ON (cplen >=ASC_PRTBUF_SIZE ); + cnt =asc_proc_copy (advoffset, offset, curbuf, leftlen, cp, cplen); + totcnt += cnt; + leftlen -= cnt; +if (leftlen ==0 ) { +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); +return totcnt; + } + advoffset += cplen; + curbuf += cnt; -printk (" scsi_done 0x%p, done 0x%p, host_scribble 0x%p, result 0x%x\n" , - s->scsi_done, s->done, s->host_scribble, s->result); +ASC_DBG1 (1 ,"advansys_proc_info: totcnt %d\n" , totcnt); -printk (" tag %u, pid %u\n" , (unsigned )s->tag, (unsigned )s->pid); +return totcnt; } +#endif /* CONFIG_PROC_FS */ -/* -* asc_prt_asc_dvc_var() -*/ -static void asc_prt_asc_dvc_var (ASC_DVC_VAR *h) +static void asc_scsi_done (struct scsi_cmnd *scp) { -printk ("ASC_DVC_VAR at addr 0x%lx\n" , (ulong )h); - -printk (" iop_base 0x%x, err_code 0x%x, dvc_cntl 0x%x, bug_fix_cntl " -"%d,\n" , h->iop_base, h->err_code, h->dvc_cntl, h->bug_fix_cntl); - -printk (" bus_type %d, init_sdtr 0x%x,\n" , h->bus_type, - (unsigned )h->init_sdtr); +struct asc_board *boardp =ASC_BOARDP (scp->device->host); -printk (" sdtr_done 0x%x, use_tagged_qng 0x%x, unit_not_ready 0x%x, " -"chip_no 0x%x,\n" , (unsigned )h->sdtr_done, - (unsigned )h->use_tagged_qng, (unsigned )h->unit_not_ready, - (unsigned )h->chip_no); +if (scp->use_sg) +dma_unmap_sg (boardp->dev, + (struct scatterlist *)scp->request_buffer, + scp->use_sg, scp->sc_data_direction); +else if (scp->request_bufflen) +dma_unmap_single (boardp->dev, scp->SCp.dma_handle, + scp->request_bufflen, scp->sc_data_direction); -printk (" queue_full_or_busy 0x%x, start_motor 0x%x, scsi_reset_wait " -"%u,\n" , (unsigned )h->queue_full_or_busy, - (unsigned )h->start_motor, (unsigned )h->scsi_reset_wait); +ASC_STATS (scp->device->host, done); -printk (" is_in_int %u, max_total_qng %u, cur_total_qng %u, " -"in_critical_cnt %u,\n" , (unsigned )h->is_in_int, - (unsigned )h->max_total_qng, (unsigned )h->cur_total_qng, - (unsigned )h->in_critical_cnt); + scp->scsi_done (scp); +} -printk (" last_q_shortage %u, init_state 0x%x, no_scam 0x%x, " -"pci_fix_asyn_xfer 0x%x,\n" , (unsigned )h->last_q_shortage, - (unsigned )h->init_state, (unsigned )h->no_scam, - (unsigned )h->pci_fix_asyn_xfer); +static void AscSetBank (PortAddr iop_base,uchar bank) +{ +uchar val; -printk (" cfg 0x%lx, irq_no 0x%x\n" , (ulong )h->cfg, (unsigned )h->irq_no); + val =AscGetChipControl (iop_base) & + (~ + (CC_SINGLE_STEP |CC_TEST |CC_DIAG |CC_SCSI_RESET | +CC_CHIP_RESET )); +if (bank ==1 ) { + val |=CC_BANK_ONE ; + }else if (bank ==2 ) { + val |=CC_DIAG |CC_BANK_ONE ; + }else { + val &= ~CC_BANK_ONE ; + } +AscSetChipControl (iop_base, val); +return ; } -/* -* asc_prt_asc_dvc_cfg() -*/ -static void asc_prt_asc_dvc_cfg (ASC_DVC_CFG *h) +static void AscSetChipIH (PortAddr iop_base,ushort ins_code) { -printk ("ASC_DVC_CFG at addr 0x%lx\n" , (ulong )h); - -printk (" can_tagged_qng 0x%x, cmd_qng_enabled 0x%x,\n" , - h->can_tagged_qng, h->cmd_qng_enabled); -printk (" disc_enable 0x%x, sdtr_enable 0x%x,\n" , - h->disc_enable, h->sdtr_enable); +AscSetBank (iop_base,1 ); +AscWriteChipIH (iop_base, ins_code); +AscSetBank (iop_base,0 ); +return ; +} -printk - (" chip_scsi_id %d, isa_dma_speed %d, isa_dma_channel %d, chip_version %d,\n" , - h->chip_scsi_id, h->isa_dma_speed, h->isa_dma_channel, - h->chip_version); +static int AscStartChip (PortAddr iop_base) +{ +AscSetChipControl (iop_base,0 ); +if ((AscGetChipStatus (iop_base) &CSW_HALTED ) !=0 ) { +return (0 ); + } +return (1 ); +} -printk - (" pci_device_id %d, lib_serial_no %u, lib_version %u, mcode_date 0x%x,\n" , -to_pci_dev (h->dev)->device, h->lib_serial_no, h->lib_version, - h->mcode_date); +static int AscStopChip (PortAddr iop_base) +{ +uchar cc_val; -printk (" mcode_version %d, overrun_buf 0x%lx\n" , - h->mcode_version, (ulong )h->overrun_buf); + cc_val = +AscGetChipControl (iop_base) & + (~(CC_SINGLE_STEP |CC_TEST |CC_DIAG )); +AscSetChipControl (iop_base, (uchar)(cc_val |CC_HALT )); +AscSetChipIH (iop_base,INS_HALT ); +AscSetChipIH (iop_base,INS_RFLAG_WTM ); +if ((AscGetChipStatus (iop_base) &CSW_HALTED ) ==0 ) { +return (0 ); + } +return (1 ); } -/* -* asc_prt_asc_scsi_q() -*/ -static void asc_prt_asc_scsi_q (ASC_SCSI_Q *q) +static int AscIsChipHalted (PortAddr iop_base) { -ASC_SG_HEAD *sgp; -int i; - -printk ("ASC_SCSI_Q at addr 0x%lx\n" , (ulong )q); +if ((AscGetChipStatus (iop_base) &CSW_HALTED ) !=0 ) { +if ((AscGetChipControl (iop_base) &CC_HALT ) !=0 ) { +return (1 ); + } + } +return (0 ); +} -printk - (" target_ix 0x%x, target_lun %u, srb_ptr 0x%lx, tag_code 0x%x,\n" , - q->q2.target_ix, q->q1.target_lun, (ulong )q->q2.srb_ptr, - q->q2.tag_code); +static int AscResetChipAndScsiBus (ASC_DVC_VAR *asc_dvc) +{ +PortAddr iop_base; +int i =10 ; -printk - (" data_addr 0x%lx, data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , - (ulong )le32_to_cpu (q->q1.data_addr), - (ulong )le32_to_cpu (q->q1.data_cnt), - (ulong )le32_to_cpu (q->q1.sense_addr), q->q1.sense_len); + iop_base = asc_dvc->iop_base; +while ((AscGetChipStatus (iop_base) &CSW_SCSI_RESET_ACTIVE ) + && (i-- >0 )) { +mdelay (100 ); + } +AscStopChip (iop_base); +AscSetChipControl (iop_base,CC_CHIP_RESET |CC_SCSI_RESET |CC_HALT ); +udelay (60 ); +AscSetChipIH (iop_base,INS_RFLAG_WTM ); +AscSetChipIH (iop_base,INS_HALT ); +AscSetChipControl (iop_base,CC_CHIP_RESET |CC_HALT ); +AscSetChipControl (iop_base,CC_HALT ); +mdelay (200 ); +AscSetChipStatus (iop_base,CIW_CLR_SCSI_RESET_INT ); +AscSetChipStatus (iop_base,0 ); +return (AscIsChipHalted (iop_base)); +} -printk (" cdbptr 0x%lx, cdb_len %u, sg_head 0x%lx, sg_queue_cnt %u\n" , - (ulong )q->cdbptr, q->q2.cdb_len, - (ulong )q->sg_head, q->q1.sg_queue_cnt); +static int AscFindSignature (PortAddr iop_base) +{ +ushort sig_word; -if (q->sg_head) { - sgp = q->sg_head; -printk ("ASC_SG_HEAD at addr 0x%lx\n" , (ulong )sgp); -printk (" entry_cnt %u, queue_cnt %u\n" , sgp->entry_cnt, - sgp->queue_cnt); -for (i =0 ; i < sgp->entry_cnt; i++) { -printk (" [%u]: addr 0x%lx, bytes %lu\n" , - i, (ulong )le32_to_cpu (sgp->sg_list[i].addr), - (ulong )le32_to_cpu (sgp->sg_list[i].bytes)); +ASC_DBG2 (1 ,"AscFindSignature: AscGetChipSignatureByte(0x%x) 0x%x\n" , + iop_base,AscGetChipSignatureByte (iop_base)); +if (AscGetChipSignatureByte (iop_base) == (uchar )ASC_1000_ID1B ) { +ASC_DBG2 (1 , +"AscFindSignature: AscGetChipSignatureWord(0x%x) 0x%x\n" , + iop_base,AscGetChipSignatureWord (iop_base)); + sig_word =AscGetChipSignatureWord (iop_base); +if ((sig_word == (ushort )ASC_1000_ID0W ) || + (sig_word == (ushort )ASC_1000_ID0W_FIX )) { +return (1 ); } - } +return (0 ); } -/* -* asc_prt_asc_qdone_info() -*/ -static void asc_prt_asc_qdone_info (ASC_QDONE_INFO *q) +static void AscEnableInterrupt (PortAddr iop_base) { -printk ("ASC_QDONE_INFO at addr 0x%lx\n" , (ulong )q); -printk (" srb_ptr 0x%lx, target_ix %u, cdb_len %u, tag_code %u,\n" , - (ulong )q->d2.srb_ptr, q->d2.target_ix, q->d2.cdb_len, - q->d2.tag_code); -printk - (" done_stat 0x%x, host_stat 0x%x, scsi_stat 0x%x, scsi_msg 0x%x\n" , - q->d3.done_stat, q->d3.host_stat, q->d3.scsi_stat, q->d3.scsi_msg); +ushort cfg; + + cfg =AscGetChipCfgLsw (iop_base); +AscSetChipCfgLsw (iop_base, cfg |ASC_CFG0_HOST_INT_ON ); +return ; } -/* -* asc_prt_adv_dvc_var() -* -* Display an ADV_DVC_VAR structure. -*/ -static void asc_prt_adv_dvc_var (ADV_DVC_VAR *h) +static void AscDisableInterrupt (PortAddr iop_base) { -printk (" ADV_DVC_VAR at addr 0x%lx\n" , (ulong )h); +ushort cfg; -printk (" iop_base 0x%lx, err_code 0x%x, ultra_able 0x%x\n" , - (ulong )h->iop_base, h->err_code, (unsigned )h->ultra_able); + cfg =AscGetChipCfgLsw (iop_base); +AscSetChipCfgLsw (iop_base, cfg & (~ASC_CFG0_HOST_INT_ON )); +return ; +} -printk (" isr_callback 0x%lx, sdtr_able 0x%x, wdtr_able 0x%x\n" , - (ulong )h->isr_callback, (unsigned )h->sdtr_able, - (unsigned )h->wdtr_able); +static uchar AscReadLramByte (PortAddr iop_base,ushort addr) +{ +unsigned char byte_data; +unsigned short word_data; -printk (" start_motor 0x%x, scsi_reset_wait 0x%x, irq_no 0x%x,\n" , - (unsigned )h->start_motor, - (unsigned )h->scsi_reset_wait, (unsigned )h->irq_no); +if (isodd_word (addr)) { +AscSetChipLramAddr (iop_base, addr -1 ); + word_data =AscGetChipLramData (iop_base); + byte_data = (word_data >>8 ) &0xFF ; + }else { +AscSetChipLramAddr (iop_base, addr); + word_data =AscGetChipLramData (iop_base); + byte_data = word_data &0xFF ; + } +return byte_data; +} -printk (" max_host_qng %u, max_dvc_qng %u, carr_freelist 0x%lxn\n" , - (unsigned )h->max_host_qng, (unsigned )h->max_dvc_qng, - (ulong )h->carr_freelist); +static ushort AscReadLramWord (PortAddr iop_base,ushort addr) +{ +ushort word_data; -printk (" icq_sp 0x%lx, irq_sp 0x%lx\n" , - (ulong )h->icq_sp, (ulong )h->irq_sp); +AscSetChipLramAddr (iop_base, addr); + word_data =AscGetChipLramData (iop_base); +return (word_data); +} -printk (" no_scam 0x%x, tagqng_able 0x%x\n" , - (unsigned )h->no_scam, (unsigned )h->tagqng_able); +#if CC_VERY_LONG_SG_LIST +static ASC_DCNT AscReadLramDWord (PortAddr iop_base,ushort addr) +{ +ushort val_low, val_high; +ASC_DCNT dword_data; -printk (" chip_scsi_id 0x%x, cfg 0x%lx\n" , - (unsigned )h->chip_scsi_id, (ulong )h->cfg); +AscSetChipLramAddr (iop_base, addr); + val_low =AscGetChipLramData (iop_base); + val_high =AscGetChipLramData (iop_base); + dword_data = ((ASC_DCNT ) val_high <<16 ) | (ASC_DCNT ) val_low; +return (dword_data); } +#endif /* CC_VERY_LONG_SG_LIST */ -/* -* asc_prt_adv_dvc_cfg() -* -* Display an ADV_DVC_CFG structure. -*/ -static void asc_prt_adv_dvc_cfg (ADV_DVC_CFG *h) +static void +AscMemWordSetLram (PortAddr iop_base,ushort s_addr,ushort set_wval,int words) { -printk (" ADV_DVC_CFG at addr 0x%lx\n" , (ulong )h); +int i; -printk (" disc_enable 0x%x, termination 0x%x\n" , - h->disc_enable, h->termination); +AscSetChipLramAddr (iop_base, s_addr); +for (i =0 ; i < words; i++) { +AscSetChipLramData (iop_base, set_wval); + } +} -printk (" chip_version 0x%x, mcode_date 0x%x\n" , - h->chip_version, h->mcode_date); +static void AscWriteLramWord (PortAddr iop_base,ushort addr,ushort word_val) +{ +AscSetChipLramAddr (iop_base, addr); +AscSetChipLramData (iop_base, word_val); +return ; +} -printk (" mcode_version 0x%x, pci_device_id 0x%x, lib_version %u\n" , - h->mcode_version,to_pci_dev (h->dev)->device, h->lib_version); +static void AscWriteLramByte (PortAddr iop_base,ushort addr,uchar byte_val) +{ +ushort word_data; -printk (" control_flag 0x%x\n" , h->control_flag); +if (isodd_word (addr)) { + addr--; + word_data =AscReadLramWord (iop_base, addr); + word_data &=0x00FF ; + word_data |= (((ushort )byte_val <<8 ) &0xFF00 ); + }else { + word_data =AscReadLramWord (iop_base, addr); + word_data &=0xFF00 ; + word_data |= ((ushort )byte_val &0x00FF ); + } +AscWriteLramWord (iop_base, addr, word_data); +return ; }/* -* asc_prt_adv_scsi_req_q() +* Copy 2 bytes to LRAM. * -* Display an ADV_SCSI_REQ_Q structure. +* The source data is assumed to be in little-endian order in memory +* and is maintained in little-endian order when written to LRAM. */ -static void asc_prt_adv_scsi_req_q (ADV_SCSI_REQ_Q *q) +static void +AscMemWordCopyPtrToLram (PortAddr iop_base, +ushort s_addr,uchar *s_buffer,int words) { -int sg_blk_cnt; -struct asc_sg_block *sg_ptr; - -printk ("ADV_SCSI_REQ_Q at addr 0x%lx\n" , (ulong )q); - -printk (" target_id %u, target_lun %u, srb_ptr 0x%lx, a_flag 0x%x\n" , - q->target_id, q->target_lun, (ulong )q->srb_ptr, q->a_flag); - -printk (" cntl 0x%x, data_addr 0x%lx, vdata_addr 0x%lx\n" , - q->cntl, (ulong )le32_to_cpu (q->data_addr), (ulong )q->vdata_addr); - -printk (" data_cnt %lu, sense_addr 0x%lx, sense_len %u,\n" , - (ulong )le32_to_cpu (q->data_cnt), - (ulong )le32_to_cpu (q->sense_addr), q->sense_len); - -printk - (" cdb_len %u, done_status 0x%x, host_status 0x%x, scsi_status 0x%x\n" , - q->cdb_len, q->done_status, q->host_status, q->scsi_status); - -printk (" sg_working_ix 0x%x, target_cmd %u\n" , - q->sg_working_ix, q->target_cmd); - -printk (" scsiq_rptr 0x%lx, sg_real_addr 0x%lx, sg_list_ptr 0x%lx\n" , - (ulong )le32_to_cpu (q->scsiq_rptr), - (ulong )le32_to_cpu (q->sg_real_addr), (ulong )q->sg_list_ptr); +int i; -/* Display the request's ADV_SG_BLOCK structures. */ -if (q->sg_list_ptr !=NULL ) { - sg_blk_cnt =0 ; -while (1 ) { -/* -* 'sg_ptr' is a physical address. Convert it to a virtual -* address by indexing 'sg_blk_cnt' into the virtual address -* array 'sg_list_ptr'. -* -* XXX - Assumes all SG physical blocks are virtually contiguous. -*/ - sg_ptr = - &(((ADV_SG_BLOCK *)(q->sg_list_ptr))[sg_blk_cnt]); -asc_prt_adv_sgblock (sg_blk_cnt, sg_ptr); -if (sg_ptr->sg_ptr ==0 ) { -break ; - } - sg_blk_cnt++; - } +AscSetChipLramAddr (iop_base, s_addr); +for (i =0 ; i <2 * words; i +=2 ) { +/* +* On a little-endian system the second argument below +* produces a little-endian ushort which is written to +* LRAM in little-endian order. On a big-endian system +* the second argument produces a big-endian ushort which +* is "transparently" byte-swapped by outpw() and written +* in little-endian order to LRAM. +*/ +outpw (iop_base +IOP_RAM_DATA , + ((ushort )s_buffer[i +1 ] <<8 ) | s_buffer[i]); } +return ; }/* -* asc_prt_adv_sgblock() +* Copy 4 bytes to LRAM. * -* Display an ADV_SG_BLOCK structure.
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.2.4
Part of the diff is not shown here. View the raw message.
PATCH 2/17 advansys: Remove array of scsi targets
In reply to James BottomleyThe driver was saving a scsi_device for each target, but wasn't doing anything useful with them. Just delete the array.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-)
drivers/scsi/advansys.c +0 -10
@@ -2514,7 +2514,6 @@ typedef struct asc_board { } dvc_cfg;ushort asc_n_io_port;/* Number I/O ports. */ ADV_SCSI_BIT_ID_TYPE init_tidmask;/* Target init./valid mask */ -struct scsi_device *device[ADV_MAX_TID +1 ];/* Mid-Level Scsi Device */ ushort reqcnt[ADV_MAX_TID +1 ];/* Starvation request count */ ADV_SCSI_BIT_ID_TYPE queue_full;/* Queue full mask */ ushort queue_full_cnt[ADV_MAX_TID +1 ];/* Queue full count */
@@ -10183,13 +10182,6 @@ static int advansys_slave_configure(struct scsi_device *sdev)asc_board_t *boardp =ASC_BOARDP (sdev->host); boardp->flags |=ASC_SELECT_QUEUE_DEPTHS ; -/* -* Save a pointer to the sdev and set its initial/maximum -* queue depth. Only save the pointer for a lun0 dev though. -*/ -if (sdev->lun ==0 ) - boardp->device[sdev->id] = sdev; -if (ASC_NARROW_BOARD (boardp))advansys_narrow_slave_configure (sdev, &boardp->dvc_var.asc_dvc_var);
@@ -11343,14 +11335,12 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)ASC_DVC_VAR *asc_dvc_varp;ADV_DVC_VAR *adv_dvc_varp;ADV_SCSI_REQ_Q *adv_scsiqp; -struct scsi_device *device;int ret;ASC_DBG2 (1 ,"asc_execute_scsi_cmnd: scp 0x%lx, done 0x%lx\n" , (ulong )scp, (ulong )scp->scsi_done); boardp =ASC_BOARDP (scp->device->host); - device = boardp->device[scp->device->id];if (ASC_NARROW_BOARD (boardp)) {/*
Signature · 1 line
1.5.2.4
PATCH 3/17 advansys: Restructure asc_execute_scsi_cmnd()
In reply to James BottomleyThe wide and narrow boards share identical handling of the return value, except for some trivial error messages. Move the handling to the common end of the function. Also move variable declarations to the arms of the `if' that they're used in and delete some pointless comments.
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 131 ++++++++++++++--------------------------------- 1 files changed, 39 insertions(+), 92 deletions(-)
drivers/scsi/advansys.c +39 -92
@@ -11331,80 +11331,26 @@ static int AdvExeScsiQueue(ADV_DVC_VAR *asc_dvc, ADV_SCSI_REQ_Q *scsiq)*/ static int asc_execute_scsi_cmnd (struct scsi_cmnd *scp) { -asc_board_t *boardp; -ASC_DVC_VAR *asc_dvc_varp; -ADV_DVC_VAR *adv_dvc_varp; -ADV_SCSI_REQ_Q *adv_scsiqp; -int ret; +int ret, err_code; +asc_board_t *boardp =ASC_BOARDP (scp->device->host); -ASC_DBG2 (1 ,"asc_execute_scsi_cmnd: scp 0x%lx, done 0x%lx\n" , - (ulong )scp, (ulong )scp->scsi_done); - - boardp =ASC_BOARDP (scp->device->host); +ASC_DBG1 (1 ,"asc_execute_scsi_cmnd: scp 0x%p\n" , scp);if (ASC_NARROW_BOARD (boardp)) { -/* -* Build and execute Narrow Board request. -*/ - - asc_dvc_varp = &boardp->dvc_var.asc_dvc_var; +ASC_DVC_VAR *asc_dvc = &boardp->dvc_var.asc_dvc_var; -/* -* Build Asc Library request structure using the -* global structures 'asc_scsi_req' and 'asc_sg_head'. -* -* If an error is returned, then the request has been -* queued on the board done queue. It will be completed -* by the caller. -* -* asc_build_req() can not return ASC_BUSY. -*/ +/* asc_build_req() can not return ASC_BUSY. */ if (asc_build_req (boardp, scp) ==ASC_ERROR ) {ASC_STATS (scp->device->host, build_error);return ASC_ERROR ; } -switch (ret =AscExeScsiQueue (asc_dvc_varp, &asc_scsi_q)) { -case ASC_NOERROR : -ASC_STATS (scp->device->host, exe_noerror); -/* -* Increment monotonically increasing per device -* successful request counter. Wrapping doesn't matter. -*/ - boardp->reqcnt[scp->device->id]++; -ASC_DBG (1 ,"asc_execute_scsi_cmnd: AscExeScsiQueue(), " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_STATS (scp->device->host, exe_busy); -break ; -case ASC_ERROR : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AscExeScsiQueue() ASC_ERROR, err_code 0x%x\n" , - boardp->id, asc_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_error); - scp->result =HOST_BYTE (DID_ERROR ); -break ; -default : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AscExeScsiQueue() unknown, err_code 0x%x\n" , - boardp->id, asc_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_unknown); - scp->result =HOST_BYTE (DID_ERROR ); -break ; - } + ret =AscExeScsiQueue (asc_dvc, &asc_scsi_q); + err_code = asc_dvc->err_code; }else { -/* -* Build and execute Wide Board request. -*/ - adv_dvc_varp = &boardp->dvc_var.adv_dvc_var; +ADV_DVC_VAR *adv_dvc = &boardp->dvc_var.adv_dvc_var; +ADV_SCSI_REQ_Q *adv_scsiqp; -/* -* Build and get a pointer to an Adv Library request structure. -* -* If the request is successfully built then send it below, -* otherwise return with an error. -*/ switch (adv_build_req (boardp, scp, &adv_scsiqp)) {case ASC_NOERROR : ASC_DBG(3, "asc_execute_scsi_cmnd: adv_build_req "
@@ -11428,35 +11374,36 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)return ASC_ERROR ; } -switch (ret =AdvExeScsiQueue (adv_dvc_varp, adv_scsiqp)) { -case ASC_NOERROR : -ASC_STATS (scp->device->host, exe_noerror); -/* -* Increment monotonically increasing per device -* successful request counter. Wrapping doesn't matter. -*/ - boardp->reqcnt[scp->device->id]++; -ASC_DBG (1 ,"asc_execute_scsi_cmnd: AdvExeScsiQueue(), " -"ASC_NOERROR\n" ); -break ; -case ASC_BUSY : -ASC_STATS (scp->device->host, exe_busy); -break ; -case ASC_ERROR : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AdvExeScsiQueue() ASC_ERROR, err_code 0x%x\n" , - boardp->id, adv_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_error); - scp->result =HOST_BYTE (DID_ERROR ); -break ; -default : -ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: " -"AdvExeScsiQueue() unknown, err_code 0x%x\n" , - boardp->id, adv_dvc_varp->err_code); -ASC_STATS (scp->device->host, exe_unknown); - scp->result =HOST_BYTE (DID_ERROR ); -break ; - } + ret =AdvExeScsiQueue (adv_dvc, adv_scsiqp); + err_code = adv_dvc->err_code; + } + +switch (ret) { +case ASC_NOERROR : +ASC_STATS (scp->device->host, exe_noerror); +/* +* Increment monotonically increasing per device +* successful request counter. Wrapping doesn't matter. +*/ + boardp->reqcnt[scp->device->id]++; +ASC_DBG (1 ,"asc_execute_scsi_cmnd: ExeScsiQueue(), " +"ASC_NOERROR\n" ); +break ; +case ASC_BUSY : +ASC_STATS (scp->device->host, exe_busy); +break ; +case ASC_ERROR : +ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: ExeScsiQueue() " +"ASC_ERROR, err_code 0x%x\n" , boardp->id, err_code); +ASC_STATS (scp->device->host, exe_error); + scp->result =HOST_BYTE (DID_ERROR ); +break ; +default : +ASC_PRINT2 ("asc_execute_scsi_cmnd: board %d: ExeScsiQueue() " +"unknown, err_code 0x%x\n" , boardp->id, err_code); +ASC_STATS (scp->device->host, exe_unknown); + scp->result =HOST_BYTE (DID_ERROR ); +break ; }ASC_DBG (1 ,"asc_execute_scsi_cmnd: end\n" );
Signature · 1 line
1.5.2.4
PATCH 4/17 advansys: Fix simultaneous calls to ->queuecommand
In reply to James BottomleyThe narrow board used two global structures to set up a command; unfortunately they weren't locked, so with two boards in the machine, one call to queuecommand could corrupt the data being used by the other call to queuecommand.
Fix this by allocating asc_scsi_q on the stack (64 bytes) and using kmalloc for the asc_sg_head (2k)
Signed-off-by Matthew Wilcox <[email protected]>
--- drivers/scsi/advansys.c | 88 +++++++++++++++++++++-------------------------- 1 files changed, 39 insertions(+), 49 deletions(-)
drivers/scsi/advansys.c +39 -49
@@ -380,7 +380,7 @@ typedef struct asc_sg_head {ushort queue_cnt;ushort entry_to_copy;ushort res; -ASC_SG_LIST sg_list[ASC_MAX_SG_LIST ]; +ASC_SG_LIST sg_list[0 ]; }ASC_SG_HEAD ; typedef struct asc_scsi_q {
@@ -2559,12 +2559,6 @@ static int asc_board_count;/* Overrun buffer used by all narrow boards. */ static uchar overrun_buf[ASC_OVERRUN_BSIZE ] = {0 }; -/* -* Global structures required to issue a command. -*/ -static ASC_SCSI_Q asc_scsi_q = { {0 } }; -static ASC_SG_HEAD asc_sg_head = {0 }; -#ifdef ADVANSYS_DEBUG static int asc_dbglvl =3 ;
@@ -10192,39 +10186,28 @@ static int advansys_slave_configure(struct scsi_device *sdev)return 0 ; } -/* -* Build a request structure for the Asc Library (Narrow Board). -* -* The global structures 'asc_scsi_q' and 'asc_sg_head' are -* used to build the request. -* -* If an error occurs, then return ASC_ERROR. -*/ -static int asc_build_req (asc_board_t *boardp,struct scsi_cmnd *scp) +static int asc_build_req (asc_board_t *boardp,struct scsi_cmnd *scp, +struct asc_scsi_q *asc_scsi_q) { -/* -* Mutually exclusive access is required to 'asc_scsi_q' and -* 'asc_sg_head' until after the request is started. -*/ -memset (&asc_scsi_q,0 ,sizeof (ASC_SCSI_Q )); +memset (asc_scsi_q,0 ,sizeof (*asc_scsi_q));/* * Point the ASC_SCSI_Q to the 'struct scsi_cmnd'. */ - asc_scsi_q.q2.srb_ptr =ASC_VADDR_TO_U32 (scp); + asc_scsi_q->q2.srb_ptr =ASC_VADDR_TO_U32 (scp);/* * Build the ASC_SCSI_Q request. */ - asc_scsi_q.cdbptr = &scp->cmnd[0 ]; - asc_scsi_q.q2.cdb_len = scp->cmd_len; - asc_scsi_q.q1.target_id =ASC_TID_TO_TARGET_ID (scp->device->id); - asc_scsi_q.q1.target_lun = scp->device->lun; - asc_scsi_q.q2.target_ix = + asc_scsi_q->cdbptr = &scp->cmnd[0 ]; + asc_scsi_q->q2.cdb_len = scp->cmd_len; + asc_scsi_q->q1.target_id =ASC_TID_TO_TARGET_ID (scp->device->id); + asc_scsi_q->q1.target_lun = scp->device->lun; + asc_scsi_q->q2.target_ix =ASC_TIDLUN_TO_IX (scp->device->id, scp->device->lun); - asc_scsi_q.q1.sense_addr = + asc_scsi_q->q1.sense_addr =cpu_to_le32 (virt_to_bus (&scp->sense_buffer[0 ])); - asc_scsi_q.q1.sense_len =sizeof (scp->sense_buffer); + asc_scsi_q->q1.sense_len =sizeof (scp->sense_buffer);/* * If there are any outstanding requests for the current target,
@@ -10239,9 +10222,9 @@ static int asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)*/ if ((boardp->dvc_var.asc_dvc_var.cur_dvc_qng[scp->device->id] >0 ) && (boardp->reqcnt[scp->device->id] %255 ) ==0 ) { - asc_scsi_q.q2.tag_code =MSG_ORDERED_TAG ; + asc_scsi_q->q2.tag_code =MSG_ORDERED_TAG ; }else { - asc_scsi_q.q2.tag_code =MSG_SIMPLE_TAG ; + asc_scsi_q->q2.tag_code =MSG_SIMPLE_TAG ; }/*
@@ -10257,12 +10240,12 @@ static int asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)dma_map_single (boardp->dev, scp->request_buffer, scp->request_bufflen, scp->sc_data_direction) : 0; - asc_scsi_q.q1.data_addr =cpu_to_le32 (scp->SCp.dma_handle); - asc_scsi_q.q1.data_cnt =cpu_to_le32 (scp->request_bufflen); + asc_scsi_q->q1.data_addr =cpu_to_le32 (scp->SCp.dma_handle); + asc_scsi_q->q1.data_cnt =cpu_to_le32 (scp->request_bufflen);ASC_STATS_ADD (scp->device->host, cont_xfer,ASC_CEILING (scp->request_bufflen,512 )); - asc_scsi_q.q1.sg_queue_cnt =0 ; - asc_scsi_q.sg_head =NULL ; + asc_scsi_q->q1.sg_queue_cnt =0 ; + asc_scsi_q->sg_head =NULL ; }else {/* * CDB scatter-gather request list.
@@ -10270,6 +10253,7 @@ static int asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)int sgcnt;int use_sg;struct scatterlist *slp; +struct asc_sg_head *asc_sg_head; slp = (struct scatterlist *)scp->request_buffer; use_sg = dma_map_sg(boardp->dev, slp, scp->use_sg,
@@ -10287,28 +10271,31 @@ static int asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)ASC_STATS (scp->device->host, sg_cnt); -/* -* Use global ASC_SG_HEAD structure and set the ASC_SCSI_Q -* structure to point to it. -*/ -memset (&asc_sg_head,0 ,sizeof (ASC_SG_HEAD )); + asc_sg_head =kzalloc (sizeof (asc_scsi_q->sg_head) + + use_sg *sizeof (struct asc_sg_list ),GFP_ATOMIC ); +if (!asc_sg_head) { +dma_unmap_sg (boardp->dev, slp, scp->use_sg, + scp->sc_data_direction); + scp->result =HOST_BYTE (DID_SOFT_ERROR ); +return ASC_ERROR ; + } - asc_scsi_q.q1.cntl |=QC_SG_HEAD ; - asc_scsi_q.sg_head = &asc_sg_head; - asc_scsi_q.q1.data_cnt =0 ; - asc_scsi_q.q1.data_addr =0 ; + asc_scsi_q->q1.cntl |=QC_SG_HEAD ; + asc_scsi_q->sg_head = asc_sg_head; + asc_scsi_q->q1.data_cnt =0 ; + asc_scsi_q->q1.data_addr =0 ;/* This is a byte value, otherwise it would need to be swapped. */ - asc_sg_head.entry_cnt = asc_scsi_q.q1.sg_queue_cnt = use_sg; + asc_sg_head->entry_cnt = asc_scsi_q->q1.sg_queue_cnt = use_sg;ASC_STATS_ADD (scp->device->host, sg_elem, - asc_sg_head.entry_cnt); + asc_sg_head->entry_cnt);/* * Convert scatter-gather list into ASC_SG_HEAD list. */ for (sgcnt =0 ; sgcnt < use_sg; sgcnt++, slp++) { - asc_sg_head.sg_list[sgcnt].addr = + asc_sg_head->sg_list[sgcnt].addr =cpu_to_le32 (sg_dma_address (slp)); - asc_sg_head.sg_list[sgcnt].bytes = + asc_sg_head->sg_list[sgcnt].bytes =cpu_to_le32 (sg_dma_len (slp));ASC_STATS_ADD (scp->device->host, sg_xfer,ASC_CEILING (sg_dma_len (slp),512 ));
@@ -11338,14 +11325,17 @@ static int asc_execute_scsi_cmnd(struct scsi_cmnd *scp)if (ASC_NARROW_BOARD (boardp)) {ASC_DVC_VAR *asc_dvc = &boardp->dvc_var.asc_dvc_var; +struct asc_scsi_q asc_scsi_q;/* asc_build_req() can not return ASC_BUSY. */ -if (asc_build_req (boardp, scp) ==ASC_ERROR ) { + ret =asc_build_req (boardp, scp, &asc_scsi_q); +if (ret ==ASC_ERROR ) {ASC_STATS (scp->device->host, build_error);return ASC_ERROR ; } ret =AscExeScsiQueue (asc_dvc, &asc_scsi_q); +kfree (asc_scsi_q.sg_head); err_code = asc_dvc->err_code; }else {ADV_DVC_VAR *adv_dvc = &boardp->dvc_var.adv_dvc_var;
Signature · 1 line
1.5.2.4