Commit ec811a94 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jens Axboe
Browse files

ata: start separating SATA specific code from libata-scsi.c 



Start separating SATA specific code from libata-scsi.c:

* un-static ata_scsi_find_dev()

* move following code to libata-sata.c:
  - SATA only sysfs device attributes handling
  - __ata_change_queue_depth()
  - ata_scsi_change_queue_depth()

* cover with CONFIG_SATA_HOST ifdef SATA only sysfs device
  attributes handling code and ATA_SHT_NCQ() macro in
  <linux/libata.h>

Code size savings on m68k arch using (modified) atari_defconfig:

   text    data     bss     dec     hex filename
before:
  20702     105     576   21383    5387 drivers/ata/libata-scsi.o
after:
  19137      23     576   19736    4d18 drivers/ata/libata-scsi.o

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2b384ede

drivers/ata/libata-sata.c

+298 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/kernel.h>

#include <linux/module.h>

#include <scsi/scsi_device.h>

#include <linux/libata.h>



#include "libata.h"
@@ -764,3 +765,300 @@ bool sata_lpm_ignore_phy_events(struct ata_link *link) 
	return false;

}

EXPORT_SYMBOL_GPL(sata_lpm_ignore_phy_events);



static const char *ata_lpm_policy_names[] = {

	[ATA_LPM_UNKNOWN]		= "max_performance",

	[ATA_LPM_MAX_POWER]		= "max_performance",

	[ATA_LPM_MED_POWER]		= "medium_power",

	[ATA_LPM_MED_POWER_WITH_DIPM]	= "med_power_with_dipm",

	[ATA_LPM_MIN_POWER_WITH_PARTIAL] = "min_power_with_partial",

	[ATA_LPM_MIN_POWER]		= "min_power",

};



static ssize_t ata_scsi_lpm_store(struct device *device,

				  struct device_attribute *attr,

				  const char *buf, size_t count)

{

	struct Scsi_Host *shost = class_to_shost(device);

	struct ata_port *ap = ata_shost_to_port(shost);

	struct ata_link *link;

	struct ata_device *dev;

	enum ata_lpm_policy policy;

	unsigned long flags;



	/* UNKNOWN is internal state, iterate from MAX_POWER */

	for (policy = ATA_LPM_MAX_POWER;

	     policy < ARRAY_SIZE(ata_lpm_policy_names); policy++) {

		const char *name = ata_lpm_policy_names[policy];



		if (strncmp(name, buf, strlen(name)) == 0)

			break;

	}

	if (policy == ARRAY_SIZE(ata_lpm_policy_names))

		return -EINVAL;



	spin_lock_irqsave(ap->lock, flags);



	ata_for_each_link(link, ap, EDGE) {

		ata_for_each_dev(dev, &ap->link, ENABLED) {

			if (dev->horkage & ATA_HORKAGE_NOLPM) {

				count = -EOPNOTSUPP;

				goto out_unlock;

			}

		}

	}



	ap->target_lpm_policy = policy;

	ata_port_schedule_eh(ap);

out_unlock:

	spin_unlock_irqrestore(ap->lock, flags);

	return count;

}



static ssize_t ata_scsi_lpm_show(struct device *dev,

				 struct device_attribute *attr, char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);



	if (ap->target_lpm_policy >= ARRAY_SIZE(ata_lpm_policy_names))

		return -EINVAL;



	return snprintf(buf, PAGE_SIZE, "%s\n",

			ata_lpm_policy_names[ap->target_lpm_policy]);

}

DEVICE_ATTR(link_power_management_policy, S_IRUGO | S_IWUSR,

	    ata_scsi_lpm_show, ata_scsi_lpm_store);

EXPORT_SYMBOL_GPL(dev_attr_link_power_management_policy);



static ssize_t ata_ncq_prio_enable_show(struct device *device,

					struct device_attribute *attr,

					char *buf)

{

	struct scsi_device *sdev = to_scsi_device(device);

	struct ata_port *ap;

	struct ata_device *dev;

	bool ncq_prio_enable;

	int rc = 0;



	ap = ata_shost_to_port(sdev->host);



	spin_lock_irq(ap->lock);

	dev = ata_scsi_find_dev(ap, sdev);

	if (!dev) {

		rc = -ENODEV;

		goto unlock;

	}



	ncq_prio_enable = dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLE;



unlock:

	spin_unlock_irq(ap->lock);



	return rc ? rc : snprintf(buf, 20, "%u\n", ncq_prio_enable);

}



static ssize_t ata_ncq_prio_enable_store(struct device *device,

					 struct device_attribute *attr,

					 const char *buf, size_t len)

{

	struct scsi_device *sdev = to_scsi_device(device);

	struct ata_port *ap;

	struct ata_device *dev;

	long int input;

	int rc;



	rc = kstrtol(buf, 10, &input);

	if (rc)

		return rc;

	if ((input < 0) || (input > 1))

		return -EINVAL;



	ap = ata_shost_to_port(sdev->host);

	dev = ata_scsi_find_dev(ap, sdev);

	if (unlikely(!dev))

		return  -ENODEV;



	spin_lock_irq(ap->lock);

	if (input)

		dev->flags |= ATA_DFLAG_NCQ_PRIO_ENABLE;

	else

		dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE;



	dev->link->eh_info.action |= ATA_EH_REVALIDATE;

	dev->link->eh_info.flags |= ATA_EHI_QUIET;

	ata_port_schedule_eh(ap);

	spin_unlock_irq(ap->lock);



	ata_port_wait_eh(ap);



	if (input) {

		spin_lock_irq(ap->lock);

		if (!(dev->flags & ATA_DFLAG_NCQ_PRIO)) {

			dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE;

			rc = -EIO;

		}

		spin_unlock_irq(ap->lock);

	}



	return rc ? rc : len;

}



DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR,

	    ata_ncq_prio_enable_show, ata_ncq_prio_enable_store);

EXPORT_SYMBOL_GPL(dev_attr_ncq_prio_enable);



struct device_attribute *ata_ncq_sdev_attrs[] = {

	&dev_attr_unload_heads,

	&dev_attr_ncq_prio_enable,

	NULL

};

EXPORT_SYMBOL_GPL(ata_ncq_sdev_attrs);



static ssize_t

ata_scsi_em_message_store(struct device *dev, struct device_attribute *attr,

			  const char *buf, size_t count)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);

	if (ap->ops->em_store && (ap->flags & ATA_FLAG_EM))

		return ap->ops->em_store(ap, buf, count);

	return -EINVAL;

}



static ssize_t

ata_scsi_em_message_show(struct device *dev, struct device_attribute *attr,

			 char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);



	if (ap->ops->em_show && (ap->flags & ATA_FLAG_EM))

		return ap->ops->em_show(ap, buf);

	return -EINVAL;

}

DEVICE_ATTR(em_message, S_IRUGO | S_IWUSR,

		ata_scsi_em_message_show, ata_scsi_em_message_store);

EXPORT_SYMBOL_GPL(dev_attr_em_message);



static ssize_t

ata_scsi_em_message_type_show(struct device *dev, struct device_attribute *attr,

			      char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);



	return snprintf(buf, 23, "%d\n", ap->em_message_type);

}

DEVICE_ATTR(em_message_type, S_IRUGO,

		  ata_scsi_em_message_type_show, NULL);

EXPORT_SYMBOL_GPL(dev_attr_em_message_type);



static ssize_t

ata_scsi_activity_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct ata_port *ap = ata_shost_to_port(sdev->host);

	struct ata_device *atadev = ata_scsi_find_dev(ap, sdev);



	if (atadev && ap->ops->sw_activity_show &&

	    (ap->flags & ATA_FLAG_SW_ACTIVITY))

		return ap->ops->sw_activity_show(atadev, buf);

	return -EINVAL;

}



static ssize_t

ata_scsi_activity_store(struct device *dev, struct device_attribute *attr,

	const char *buf, size_t count)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct ata_port *ap = ata_shost_to_port(sdev->host);

	struct ata_device *atadev = ata_scsi_find_dev(ap, sdev);

	enum sw_activity val;

	int rc;



	if (atadev && ap->ops->sw_activity_store &&

	    (ap->flags & ATA_FLAG_SW_ACTIVITY)) {

		val = simple_strtoul(buf, NULL, 0);

		switch (val) {

		case OFF: case BLINK_ON: case BLINK_OFF:

			rc = ap->ops->sw_activity_store(atadev, val);

			if (!rc)

				return count;

			else

				return rc;

		}

	}

	return -EINVAL;

}

DEVICE_ATTR(sw_activity, S_IWUSR | S_IRUGO, ata_scsi_activity_show,

			ata_scsi_activity_store);

EXPORT_SYMBOL_GPL(dev_attr_sw_activity);



/**

 *	__ata_change_queue_depth - helper for ata_scsi_change_queue_depth

 *	@ap: ATA port to which the device change the queue depth

 *	@sdev: SCSI device to configure queue depth for

 *	@queue_depth: new queue depth

 *

 *	libsas and libata have different approaches for associating a sdev to

 *	its ata_port.

 *

 */

int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,

			     int queue_depth)

{

	struct ata_device *dev;

	unsigned long flags;



	if (queue_depth < 1 || queue_depth == sdev->queue_depth)

		return sdev->queue_depth;



	dev = ata_scsi_find_dev(ap, sdev);

	if (!dev || !ata_dev_enabled(dev))

		return sdev->queue_depth;



	/* NCQ enabled? */

	spin_lock_irqsave(ap->lock, flags);

	dev->flags &= ~ATA_DFLAG_NCQ_OFF;

	if (queue_depth == 1 || !ata_ncq_enabled(dev)) {

		dev->flags |= ATA_DFLAG_NCQ_OFF;

		queue_depth = 1;

	}

	spin_unlock_irqrestore(ap->lock, flags);



	/* limit and apply queue depth */

	queue_depth = min(queue_depth, sdev->host->can_queue);

	queue_depth = min(queue_depth, ata_id_queue_depth(dev->id));

	queue_depth = min(queue_depth, ATA_MAX_QUEUE);



	if (sdev->queue_depth == queue_depth)

		return -EINVAL;



	return scsi_change_queue_depth(sdev, queue_depth);

}

EXPORT_SYMBOL_GPL(__ata_change_queue_depth);



/**

 *	ata_scsi_change_queue_depth - SCSI callback for queue depth config

 *	@sdev: SCSI device to configure queue depth for

 *	@queue_depth: new queue depth

 *

 *	This is libata standard hostt->change_queue_depth callback.

 *	SCSI will call into this callback when user tries to set queue

 *	depth via sysfs.

 *

 *	LOCKING:

 *	SCSI layer (we don't care)

 *

 *	RETURNS:

 *	Newly configured queue depth.

 */

int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)

{

	struct ata_port *ap = ata_shost_to_port(sdev->host);



	return __ata_change_queue_depth(ap, sdev, queue_depth);

}

EXPORT_SYMBOL_GPL(ata_scsi_change_queue_depth);

drivers/ata/libata-scsi.c

+1 −300
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc); 


static struct ata_device *__ata_scsi_find_dev(struct ata_port *ap,

					const struct scsi_device *scsidev);

static struct ata_device *ata_scsi_find_dev(struct ata_port *ap,

					    const struct scsi_device *scsidev);



#define RW_RECOVERY_MPAGE 0x1

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

};



static const char *ata_lpm_policy_names[] = {

	[ATA_LPM_UNKNOWN]		= "max_performance",

	[ATA_LPM_MAX_POWER]		= "max_performance",

	[ATA_LPM_MED_POWER]		= "medium_power",

	[ATA_LPM_MED_POWER_WITH_DIPM]	= "med_power_with_dipm",

	[ATA_LPM_MIN_POWER_WITH_PARTIAL] = "min_power_with_partial",

	[ATA_LPM_MIN_POWER]		= "min_power",

};



static ssize_t ata_scsi_lpm_store(struct device *device,

				  struct device_attribute *attr,

				  const char *buf, size_t count)

{

	struct Scsi_Host *shost = class_to_shost(device);

	struct ata_port *ap = ata_shost_to_port(shost);

	struct ata_link *link;

	struct ata_device *dev;

	enum ata_lpm_policy policy;

	unsigned long flags;



	/* UNKNOWN is internal state, iterate from MAX_POWER */

	for (policy = ATA_LPM_MAX_POWER;

	     policy < ARRAY_SIZE(ata_lpm_policy_names); policy++) {

		const char *name = ata_lpm_policy_names[policy];



		if (strncmp(name, buf, strlen(name)) == 0)

			break;

	}

	if (policy == ARRAY_SIZE(ata_lpm_policy_names))

		return -EINVAL;



	spin_lock_irqsave(ap->lock, flags);



	ata_for_each_link(link, ap, EDGE) {

		ata_for_each_dev(dev, &ap->link, ENABLED) {

			if (dev->horkage & ATA_HORKAGE_NOLPM) {

				count = -EOPNOTSUPP;

				goto out_unlock;

			}

		}

	}



	ap->target_lpm_policy = policy;

	ata_port_schedule_eh(ap);

out_unlock:

	spin_unlock_irqrestore(ap->lock, flags);

	return count;

}



static ssize_t ata_scsi_lpm_show(struct device *dev,

				 struct device_attribute *attr, char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);



	if (ap->target_lpm_policy >= ARRAY_SIZE(ata_lpm_policy_names))

		return -EINVAL;



	return snprintf(buf, PAGE_SIZE, "%s\n",

			ata_lpm_policy_names[ap->target_lpm_policy]);

}

DEVICE_ATTR(link_power_management_policy, S_IRUGO | S_IWUSR,

	    ata_scsi_lpm_show, ata_scsi_lpm_store);

EXPORT_SYMBOL_GPL(dev_attr_link_power_management_policy);



static ssize_t ata_scsi_park_show(struct device *device,

				  struct device_attribute *attr, char *buf)

{
@@ -255,83 +188,6 @@ DEVICE_ATTR(unload_heads, S_IRUGO | S_IWUSR, 
	    ata_scsi_park_show, ata_scsi_park_store);

EXPORT_SYMBOL_GPL(dev_attr_unload_heads);



static ssize_t ata_ncq_prio_enable_show(struct device *device,

					struct device_attribute *attr,

					char *buf)

{

	struct scsi_device *sdev = to_scsi_device(device);

	struct ata_port *ap;

	struct ata_device *dev;

	bool ncq_prio_enable;

	int rc = 0;



	ap = ata_shost_to_port(sdev->host);



	spin_lock_irq(ap->lock);

	dev = ata_scsi_find_dev(ap, sdev);

	if (!dev) {

		rc = -ENODEV;

		goto unlock;

	}



	ncq_prio_enable = dev->flags & ATA_DFLAG_NCQ_PRIO_ENABLE;



unlock:

	spin_unlock_irq(ap->lock);



	return rc ? rc : snprintf(buf, 20, "%u\n", ncq_prio_enable);

}



static ssize_t ata_ncq_prio_enable_store(struct device *device,

					 struct device_attribute *attr,

					 const char *buf, size_t len)

{

	struct scsi_device *sdev = to_scsi_device(device);

	struct ata_port *ap;

	struct ata_device *dev;

	long int input;

	int rc;



	rc = kstrtol(buf, 10, &input);

	if (rc)

		return rc;

	if ((input < 0) || (input > 1))

		return -EINVAL;



	ap = ata_shost_to_port(sdev->host);

	dev = ata_scsi_find_dev(ap, sdev);

	if (unlikely(!dev))

		return  -ENODEV;



	spin_lock_irq(ap->lock);

	if (input)

		dev->flags |= ATA_DFLAG_NCQ_PRIO_ENABLE;

	else

		dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE;



	dev->link->eh_info.action |= ATA_EH_REVALIDATE;

	dev->link->eh_info.flags |= ATA_EHI_QUIET;

	ata_port_schedule_eh(ap);

	spin_unlock_irq(ap->lock);



	ata_port_wait_eh(ap);



	if (input) {

		spin_lock_irq(ap->lock);

		if (!(dev->flags & ATA_DFLAG_NCQ_PRIO)) {

			dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE;

			rc = -EIO;

		}

		spin_unlock_irq(ap->lock);

	}



	return rc ? rc : len;

}



DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR,

	    ata_ncq_prio_enable_show, ata_ncq_prio_enable_store);

EXPORT_SYMBOL_GPL(dev_attr_ncq_prio_enable);



void ata_scsi_set_sense(struct ata_device *dev, struct scsi_cmnd *cmd,

			u8 sk, u8 asc, u8 ascq)

{
@@ -380,100 +236,12 @@ static void ata_scsi_set_invalid_parameter(struct ata_device *dev, 
				     field, 0xff, 0);

}



static ssize_t

ata_scsi_em_message_store(struct device *dev, struct device_attribute *attr,

			  const char *buf, size_t count)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);

	if (ap->ops->em_store && (ap->flags & ATA_FLAG_EM))

		return ap->ops->em_store(ap, buf, count);

	return -EINVAL;

}



static ssize_t

ata_scsi_em_message_show(struct device *dev, struct device_attribute *attr,

			 char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);



	if (ap->ops->em_show && (ap->flags & ATA_FLAG_EM))

		return ap->ops->em_show(ap, buf);

	return -EINVAL;

}

DEVICE_ATTR(em_message, S_IRUGO | S_IWUSR,

		ata_scsi_em_message_show, ata_scsi_em_message_store);

EXPORT_SYMBOL_GPL(dev_attr_em_message);



static ssize_t

ata_scsi_em_message_type_show(struct device *dev, struct device_attribute *attr,

			      char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);



	return snprintf(buf, 23, "%d\n", ap->em_message_type);

}

DEVICE_ATTR(em_message_type, S_IRUGO,

		  ata_scsi_em_message_type_show, NULL);

EXPORT_SYMBOL_GPL(dev_attr_em_message_type);



static ssize_t

ata_scsi_activity_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct ata_port *ap = ata_shost_to_port(sdev->host);

	struct ata_device *atadev = ata_scsi_find_dev(ap, sdev);



	if (atadev && ap->ops->sw_activity_show &&

	    (ap->flags & ATA_FLAG_SW_ACTIVITY))

		return ap->ops->sw_activity_show(atadev, buf);

	return -EINVAL;

}



static ssize_t

ata_scsi_activity_store(struct device *dev, struct device_attribute *attr,

	const char *buf, size_t count)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct ata_port *ap = ata_shost_to_port(sdev->host);

	struct ata_device *atadev = ata_scsi_find_dev(ap, sdev);

	enum sw_activity val;

	int rc;



	if (atadev && ap->ops->sw_activity_store &&

	    (ap->flags & ATA_FLAG_SW_ACTIVITY)) {

		val = simple_strtoul(buf, NULL, 0);

		switch (val) {

		case OFF: case BLINK_ON: case BLINK_OFF:

			rc = ap->ops->sw_activity_store(atadev, val);

			if (!rc)

				return count;

			else

				return rc;

		}

	}

	return -EINVAL;

}

DEVICE_ATTR(sw_activity, S_IWUSR | S_IRUGO, ata_scsi_activity_show,

			ata_scsi_activity_store);

EXPORT_SYMBOL_GPL(dev_attr_sw_activity);



struct device_attribute *ata_common_sdev_attrs[] = {

	&dev_attr_unload_heads,

	NULL

};

EXPORT_SYMBOL_GPL(ata_common_sdev_attrs);



struct device_attribute *ata_ncq_sdev_attrs[] = {

	&dev_attr_unload_heads,

	&dev_attr_ncq_prio_enable,

	NULL

};

EXPORT_SYMBOL_GPL(ata_ncq_sdev_attrs);



/**

 *	ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.

 *	@sdev: SCSI device for which BIOS geometry is to be determined
@@ -1391,73 +1159,6 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev) 
}

EXPORT_SYMBOL_GPL(ata_scsi_slave_destroy);



/**

 *	__ata_change_queue_depth - helper for ata_scsi_change_queue_depth

 *	@ap: ATA port to which the device change the queue depth

 *	@sdev: SCSI device to configure queue depth for

 *	@queue_depth: new queue depth

 *

 *	libsas and libata have different approaches for associating a sdev to

 *	its ata_port.

 *

 */

int __ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,

			     int queue_depth)

{

	struct ata_device *dev;

	unsigned long flags;



	if (queue_depth < 1 || queue_depth == sdev->queue_depth)

		return sdev->queue_depth;



	dev = ata_scsi_find_dev(ap, sdev);

	if (!dev || !ata_dev_enabled(dev))

		return sdev->queue_depth;



	/* NCQ enabled? */

	spin_lock_irqsave(ap->lock, flags);

	dev->flags &= ~ATA_DFLAG_NCQ_OFF;

	if (queue_depth == 1 || !ata_ncq_enabled(dev)) {

		dev->flags |= ATA_DFLAG_NCQ_OFF;

		queue_depth = 1;

	}

	spin_unlock_irqrestore(ap->lock, flags);



	/* limit and apply queue depth */

	queue_depth = min(queue_depth, sdev->host->can_queue);

	queue_depth = min(queue_depth, ata_id_queue_depth(dev->id));

	queue_depth = min(queue_depth, ATA_MAX_QUEUE);



	if (sdev->queue_depth == queue_depth)

		return -EINVAL;



	return scsi_change_queue_depth(sdev, queue_depth);

}

EXPORT_SYMBOL_GPL(__ata_change_queue_depth);



/**

 *	ata_scsi_change_queue_depth - SCSI callback for queue depth config

 *	@sdev: SCSI device to configure queue depth for

 *	@queue_depth: new queue depth

 *

 *	This is libata standard hostt->change_queue_depth callback.

 *	SCSI will call into this callback when user tries to set queue

 *	depth via sysfs.

 *

 *	LOCKING:

 *	SCSI layer (we don't care)

 *

 *	RETURNS:

 *	Newly configured queue depth.

 */

int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)

{

	struct ata_port *ap = ata_shost_to_port(sdev->host);



	return __ata_change_queue_depth(ap, sdev, queue_depth);

}

EXPORT_SYMBOL_GPL(ata_scsi_change_queue_depth);



/**

 *	ata_scsi_start_stop_xlat - Translate SCSI START STOP UNIT command

 *	@qc: Storage for translated ATA taskfile
@@ -3094,7 +2795,7 @@ static struct ata_device *__ata_scsi_find_dev(struct ata_port *ap, 
 *	RETURNS:

 *	Associated ATA device, or %NULL if not found.

 */

static struct ata_device *

struct ata_device *

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

{

	struct ata_device *dev = __ata_scsi_find_dev(ap, scsidev);

drivers/ata/libata.h

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ static inline void ata_acpi_bind_dev(struct ata_device *dev) {} 
#endif



/* libata-scsi.c */

extern struct ata_device *ata_scsi_find_dev(struct ata_port *ap,

					    const struct scsi_device *scsidev);

extern int ata_scsi_add_hosts(struct ata_host *host,

			      struct scsi_host_template *sht);

extern void ata_scsi_scan_host(struct ata_port *ap, int sync);

include/linux/libata.h

+7 −2
Original line number Diff line number Diff line
@@ -530,12 +530,14 @@ typedef int (*ata_reset_fn_t)(struct ata_link *link, unsigned int *classes, 
			      unsigned long deadline);

typedef void (*ata_postreset_fn_t)(struct ata_link *link, unsigned int *classes);



extern struct device_attribute dev_attr_link_power_management_policy;

extern struct device_attribute dev_attr_unload_heads;

#ifdef CONFIG_SATA_HOST

extern struct device_attribute dev_attr_link_power_management_policy;

extern struct device_attribute dev_attr_ncq_prio_enable;

extern struct device_attribute dev_attr_em_message_type;

extern struct device_attribute dev_attr_em_message;

extern struct device_attribute dev_attr_sw_activity;

#endif



enum sw_activity {

	OFF,
@@ -1371,7 +1373,6 @@ extern int ata_link_nr_enabled(struct ata_link *link); 
extern const struct ata_port_operations ata_base_port_ops;

extern const struct ata_port_operations sata_port_ops;

extern struct device_attribute *ata_common_sdev_attrs[];

extern struct device_attribute *ata_ncq_sdev_attrs[];



/*

 * All sht initializers (BASE, PIO, BMDMA, NCQ) must be instantiated
@@ -1399,10 +1400,14 @@ extern struct device_attribute *ata_ncq_sdev_attrs[]; 
	__ATA_BASE_SHT(drv_name),				\

	.sdev_attrs		= ata_common_sdev_attrs



#ifdef CONFIG_SATA_HOST

extern struct device_attribute *ata_ncq_sdev_attrs[];



#define ATA_NCQ_SHT(drv_name)					\

	__ATA_BASE_SHT(drv_name),				\

	.sdev_attrs		= ata_ncq_sdev_attrs,		\

	.change_queue_depth	= ata_scsi_change_queue_depth

#endif



/*

 * PMP helpers

CRA Git | Maintained and supported by SUSTech CRA and CCSE