aic79xx: remove slave_destroy
Subsystems (2)
PATCH 1/1 aic79xx: remove slave_destroy
Hi James,
this patch removes the need for a slave_destroy callback in aic79xx. We've been troubles again even with the latest scanning fixes so I decided it has to go. Especially as it's not really required anyway.
Please apply.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke [email protected] SuSE Linux Products GmbH S390 & zSeries Maxfeldstraße 5 +49 911 74053 688 90409 Nürnberg http://www.suse.de
aic79xx: Remove slave_destroy
Even with the latest fixes aic79xx still occasionally triggers the BUG_ON in slave_destroy. Rather than trying to figure out the various levels of interaction here I've decided to remove the callback altogether.
The primary reason for the slave_alloc / slave_destroy is to keep an index of pointers to the sdevs associated with a given target. However, by changing the arguments to the affected functions slightly it's possible to avoid the use of that index entirely.
The only performance penalty we'll incur is in writing the information for /proc/scsi/XXX, as we'll have to recurse over all available sdevs to find the correct ones. But I doubt that reading from /proc is in any way time-critical.
Signed-off-by Hannes Reinecke <[email protected]>
drivers/scsi/aic7xxx/aic79xx.h +1 -0
@@ -1487,6 +1487,7 @@ typedef enum { } ahd_queue_alg;void ahd_set_tags (struct ahd_softc *ahd, +struct scsi_cmnd *cmd,struct ahd_devinfo *devinfo,ahd_queue_alg alg);
drivers/scsi/aic7xxx/aic79xx_core.c +13 -11
@@ -1090,7 +1090,7 @@ #endif/* Notify XPT */ ahd_send_async (ahd, devinfo.channel, devinfo.target, -CAM_LUN_WILDCARD ,AC_SENT_BDR ,NULL ); +CAM_LUN_WILDCARD ,AC_SENT_BDR );/* * Allow the sequencer to continue with
@@ -3062,7 +3062,7 @@ ahd_set_syncrate(struct ahd_softc *ahd, tinfo->curr.ppr_options = ppr_options;ahd_send_async (ahd, devinfo->channel, devinfo->target, -CAM_LUN_WILDCARD ,AC_TRANSFER_NEG ,NULL ); +CAM_LUN_WILDCARD ,AC_TRANSFER_NEG );if (bootverbose) {if (offset !=0 ) {int options;
@@ -3184,7 +3184,7 @@ ahd_set_width(struct ahd_softc *ahd, str tinfo->curr.width = width;ahd_send_async (ahd, devinfo->channel, devinfo->target, -CAM_LUN_WILDCARD ,AC_TRANSFER_NEG ,NULL ); +CAM_LUN_WILDCARD ,AC_TRANSFER_NEG );if (bootverbose) { printf("%s: target %d using %dbit transfers\n", ahd_name(ahd), devinfo->target,
@@ -3211,12 +3211,14 @@ ahd_set_width(struct ahd_softc *ahd, str* Update the current state of tagged queuing for a given target. */ void -ahd_set_tags (struct ahd_softc *ahd,struct ahd_devinfo *devinfo, -ahd_queue_alg alg) +ahd_set_tags (struct ahd_softc *ahd,struct scsi_cmnd *cmd, +struct ahd_devinfo *devinfo,ahd_queue_alg alg) { -ahd_platform_set_tags (ahd, devinfo, alg); +struct scsi_device *sdev = cmd->device; + +ahd_platform_set_tags (ahd, sdev, devinfo, alg);ahd_send_async (ahd, devinfo->channel, devinfo->target, - devinfo->lun,AC_TRANSFER_NEG , &alg); + devinfo->lun,AC_TRANSFER_NEG ); } static void
@@ -4746,7 +4748,7 @@ ahd_handle_msg_reject(struct ahd_softc *printf ("(%s:%c:%d:%d): refuses tagged commands. " "Performing non-tagged I/O\n" ,ahd_name (ahd), devinfo->channel, devinfo->target, devinfo->lun); -ahd_set_tags (ahd, devinfo,AHD_QUEUE_NONE ); +ahd_set_tags (ahd, scb->io_ctx, devinfo,AHD_QUEUE_NONE ); mask = ~0x23 ; }else { printf("(%s:%c:%d:%d): refuses %s tagged commands. "
@@ -4754,7 +4756,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd_name (ahd), devinfo->channel, devinfo->target, devinfo->lun, tag_type ==MSG_ORDERED_TASK ? "ordered" : "head of queue"); -ahd_set_tags (ahd, devinfo,AHD_QUEUE_BASIC ); +ahd_set_tags (ahd, scb->io_ctx, devinfo,AHD_QUEUE_BASIC ); mask = ~0x03 ; }
@@ -5098,7 +5100,7 @@ #endifif (status !=CAM_SEL_TIMEOUT )ahd_send_async (ahd, devinfo->channel, devinfo->target, -CAM_LUN_WILDCARD ,AC_SENT_BDR ,NULL ); +CAM_LUN_WILDCARD ,AC_SENT_BDR );if (message !=NULL && bootverbose) printf("%s: %s on %c:%d. %d SCBs aborted\n", ahd_name(ahd),
@@ -7952,7 +7954,7 @@ #ifdef AHD_TARGET_MODE#endif /* Notify the XPT that a bus reset occurred */ ahd_send_async (ahd, devinfo.channel,CAM_TARGET_WILDCARD , -CAM_LUN_WILDCARD ,AC_BUS_RESET ,NULL ); +CAM_LUN_WILDCARD ,AC_BUS_RESET );/* * Revert to async/narrow transfers until we renegotiate.
drivers/scsi/aic7xxx/aic79xx_osm.c +12 -50
159 lines not on this page · raw message
drivers/scsi/aic7xxx/aic79xx_osm.h +2 -9
@@ -263,7 +263,6 @@ typedef enum { AHD_DEV_PERIODIC_OTAG = 0x40, /* Send OTAG to prevent starvation */ } ahd_linux_dev_flags; -struct ahd_linux_target ;struct ahd_linux_device {TAILQ_ENTRY (ahd_linux_device) links;
@@ -343,12 +342,6 @@ #define AHD_LOCK_TAGS_COUNT 50#define AHD_OTAG_THRESH 500 }; -struct ahd_linux_target { -struct scsi_device *sdev[AHD_NUM_LUNS ]; -struct ahd_transinfo last_tinfo; -struct ahd_softc *ahd; -}; -/********************* Definitions Required by the Core ***********************/ /* * Number of SG segments we require. So long as the S/G segments for
@@ -865,7 +858,7 @@ ahd_freeze_scb(struct scb *scb) } } -void ahd_platform_set_tags (struct ahd_softc *ahd, +void ahd_platform_set_tags (struct ahd_softc *ahd,struct scsi_device *sdev,struct ahd_devinfo *devinfo,ahd_queue_alg ); int ahd_platform_abort_scbs(struct ahd_softc *ahd, int target, char channel, int lun, u_int tag,
@@ -874,7 +867,7 @@ irqreturn_t ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs);void ahd_done (struct ahd_softc *,struct scb *);void ahd_send_async (struct ahd_softc *,char channel, -u_int target,u_int lun,ac_code ,void *); +u_int target,u_int lun,ac_code );void ahd_print_path (struct ahd_softc *,struct scb *);#ifdef CONFIG_PCI
drivers/scsi/aic7xxx/aic79xx_proc.c +8 -11
@@ -47,7 +47,7 @@ static int copy_info(struct info_str *instatic void ahd_dump_target_state (struct ahd_softc *ahd,struct info_str *info,u_int our_id,char channel, -u_int target_id,u_int target_offset); +u_int target_id);static void ahd_dump_device_state (struct info_str *info,struct scsi_device *sdev); static int ahd_proc_write_seeprom(struct ahd_softc *ahd,
@@ -204,10 +204,8 @@ ahd_format_transinfo(struct info_str *instatic void ahd_dump_target_state (struct ahd_softc *ahd,struct info_str *info, -u_int our_id,char channel,u_int target_id, -u_int target_offset) +u_int our_id,char channel,u_int target_id) { -struct ahd_linux_target *targ;struct scsi_target *starget;struct ahd_initiator_tinfo *tinfo;struct ahd_tmode_tstate *tstate;
@@ -218,10 +216,9 @@ ahd_dump_target_state(struct ahd_softc *copy_info (info,"Target %d Negotiation Settings\n" , target_id);copy_info (info,"\tUser: " );ahd_format_transinfo (info, &tinfo->user); - starget = ahd->platform_data->starget[target_offset]; + starget = ahd->platform_data->starget[target_id];if (starget ==NULL )return ; - targ =scsi_transport_target_data (starget);copy_info (info,"\tGoal: " );ahd_format_transinfo (info, &tinfo->goal);
@@ -231,7 +228,7 @@ ahd_dump_target_state(struct ahd_softc *for (lun =0 ; lun <AHD_NUM_LUNS ; lun++) {struct scsi_device *dev; - dev = targ->sdev[lun]; + dev =scsi_device_lookup_by_target (starget, lun);if (dev ==NULL )continue ;
@@ -355,7 +352,7 @@ ahd_linux_proc_info(struct Scsi_Host *shcopy_info (&info,"Allocated SCBs: %d, SG List Length: %d\n\n" , ahd->scb_data.numscbs,AHD_NSEG ); - max_targ =15 ; + max_targ =16 ;if (ahd->seep_config ==NULL )copy_info (&info,"No Serial EEPROM\n" );
@@ -373,12 +370,12 @@ ahd_linux_proc_info(struct Scsi_Host *shcopy_info (&info,"\n" );if ((ahd->features &AHD_WIDE ) ==0 ) - max_targ =7 ; + max_targ =8 ; -for (i =0 ; i <= max_targ; i++) { +for (i =0 ; i < max_targ; i++) {ahd_dump_target_state (ahd, &info, ahd->our_id,'A' , -/*target_id*/ i,/*target_offset*/ i); +/*target_id*/ i); } retval = info.pos > info.offset ? info.pos - info.offset :0 ; done: