Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30afc84c authored by Tejun Heo's avatar Tejun Heo Committed by James Bottomley
Browse files

[SCSI] libata: implement minimal transport template for ->eh_timed_out 



SCSI midlayer has moved hostt->eh_timed_out to transport template.  As
libata doesn't need full-blown transport support yet, implement
minimal transport for libata.  No transport class or whatsoever, just
empty transport template with ->eh_timed_out hook.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent d04cdb64

drivers/scsi/ahci.c

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static struct scsi_host_template ahci_sht = { 
	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

	.queuecommand		= ata_scsi_queuecmd,

	.eh_timed_out		= ata_scsi_timed_out,

	.eh_strategy_handler	= ata_scsi_error,

	.can_queue		= ATA_DEF_QUEUE,

	.this_id		= ATA_SHT_THIS_ID,

drivers/scsi/ata_piix.c

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ static struct scsi_host_template piix_sht = { 
	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,

	.queuecommand		= ata_scsi_queuecmd,

	.eh_timed_out		= ata_scsi_timed_out,

	.eh_strategy_handler	= ata_scsi_error,

	.can_queue		= ATA_DEF_QUEUE,

	.this_id		= ATA_SHT_THIS_ID,

drivers/scsi/libata-core.c

+2 −1
Original line number Diff line number Diff line
@@ -4653,6 +4653,8 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent, 
	if (!host)

		return NULL;



	host->transportt = &ata_scsi_transport_template;



	ap = (struct ata_port *) &host->hostdata[0];



	ata_host_init(ap, host, host_set, ent, port_no);
@@ -5084,7 +5086,6 @@ EXPORT_SYMBOL_GPL(ata_busy_sleep); 
EXPORT_SYMBOL_GPL(ata_port_queue_task);

EXPORT_SYMBOL_GPL(ata_scsi_ioctl);

EXPORT_SYMBOL_GPL(ata_scsi_queuecmd);

EXPORT_SYMBOL_GPL(ata_scsi_timed_out);

EXPORT_SYMBOL_GPL(ata_scsi_error);

EXPORT_SYMBOL_GPL(ata_scsi_slave_config);

EXPORT_SYMBOL_GPL(ata_scsi_release);

drivers/scsi/libata-scsi.c

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <scsi/scsi_eh.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_request.h>

#include <scsi/scsi_transport.h>

#include <linux/libata.h>

#include <linux/hdreg.h>

#include <asm/uaccess.h>
@@ -52,6 +53,7 @@ 
typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc, const u8 *scsicmd);

static struct ata_device *

ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev);

enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);



#define RW_RECOVERY_MPAGE 0x1

#define RW_RECOVERY_MPAGE_LEN 12
@@ -92,6 +94,14 @@ static const u8 def_control_mpage[CONTROL_MPAGE_LEN] = { 
	0, 30	/* extended self test time, see 05-359r1 */

};



/*

 * libata transport template.  libata doesn't do real transport stuff.

 * It just needs the eh_timed_out hook.

 */

struct scsi_transport_template ata_scsi_transport_template = {

	.eh_timed_out		= ata_scsi_timed_out,

};





static void ata_scsi_invalid_field(struct scsi_cmnd *cmd,

				   void (*done)(struct scsi_cmnd *))

drivers/scsi/libata.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg); 




/* libata-scsi.c */

extern struct scsi_transport_template ata_scsi_transport_template;



extern void ata_scsi_scan_host(struct ata_port *ap);

extern int ata_scsi_error(struct Scsi_Host *host);

extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,