Commit 284fce04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-5.17-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata fixes from Damien Le Moal:
 "A couple of additional fixes for 5.17-rc4:

   - Fix compilation warnings in the sata_fsl driver (powerpc) (me)

   - Disable TRIM commands on M88V29 devices as these commands are
     failing despite the device reporting it supports TRIM (Zoltan)"

* tag 'ata-5.17-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: libata-core: Disable TRIM on M88V29
  ata: sata_fsl: fix sscanf() and sysfs_emit() format strings
parents c3ee3a9e c8ea23d5

drivers/ata/libata-core.c

+1 −0
Original line number Diff line number Diff line
@@ -4029,6 +4029,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 


	/* devices that don't properly handle TRIM commands */

	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM, },

	{ "M88V29*",			NULL,	ATA_HORKAGE_NOTRIM, },



	/*

	 * As defined, the DRAT (Deterministic Read After Trim) and RZAT

drivers/ata/sata_fsl.c

+7 −9
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static void fsl_sata_set_irq_coalescing(struct ata_host *host, 
static ssize_t fsl_sata_intr_coalescing_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	return sysfs_emit(buf, "%d	%d\n",

	return sysfs_emit(buf, "%u	%u\n",

			intr_coalescing_count, intr_coalescing_ticks);

}
@@ -332,10 +332,8 @@ static ssize_t fsl_sata_intr_coalescing_store(struct device *dev, 
{

	unsigned int coalescing_count,	coalescing_ticks;



	if (sscanf(buf, "%d%d",

				&coalescing_count,

				&coalescing_ticks) != 2) {

		printk(KERN_ERR "fsl-sata: wrong parameter format.\n");

	if (sscanf(buf, "%u%u", &coalescing_count, &coalescing_ticks) != 2) {

		dev_err(dev, "fsl-sata: wrong parameter format.\n");

		return -EINVAL;

	}
@@ -359,7 +357,7 @@ static ssize_t fsl_sata_rx_watermark_show(struct device *dev, 
	rx_watermark &= 0x1f;

	spin_unlock_irqrestore(&host->lock, flags);



	return sysfs_emit(buf, "%d\n", rx_watermark);

	return sysfs_emit(buf, "%u\n", rx_watermark);

}



static ssize_t fsl_sata_rx_watermark_store(struct device *dev,
@@ -373,8 +371,8 @@ static ssize_t fsl_sata_rx_watermark_store(struct device *dev, 
	void __iomem *csr_base = host_priv->csr_base;

	u32 temp;



	if (sscanf(buf, "%d", &rx_watermark) != 1) {

		printk(KERN_ERR "fsl-sata: wrong parameter format.\n");

	if (kstrtouint(buf, 10, &rx_watermark) < 0) {

		dev_err(dev, "fsl-sata: wrong parameter format.\n");

		return -EINVAL;

	}
@@ -382,8 +380,8 @@ static ssize_t fsl_sata_rx_watermark_store(struct device *dev, 
	temp = ioread32(csr_base + TRANSCFG);

	temp &= 0xffffffe0;

	iowrite32(temp | rx_watermark, csr_base + TRANSCFG);



	spin_unlock_irqrestore(&host->lock, flags);



	return strlen(buf);

}