leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2022-02-11 10:42:31 -08:00
parent c3ee3a9e4f c8ea23d5fa
commit 284fce0443
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/ata/libata-core.c
View File

@@ -4029,6 +4029,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
/* devices that don't properly handle TRIM commands */ /* devices that don't properly handle TRIM commands */
{ "SuperSSpeed S238*", NULL, ATA_HORKAGE_NOTRIM, }, { "SuperSSpeed S238*", NULL, ATA_HORKAGE_NOTRIM, },
{ "M88V29*", NULL, ATA_HORKAGE_NOTRIM, },
/* /*
* As defined, the DRAT (Deterministic Read After Trim) and RZAT * As defined, the DRAT (Deterministic Read After Trim) and RZAT

16
drivers/ata/sata_fsl.c
View File

@@ -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, static ssize_t fsl_sata_intr_coalescing_show(struct device *dev,
struct device_attribute *attr, char *buf) 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); 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; unsigned int coalescing_count, coalescing_ticks;
if (sscanf(buf, "%d%d", if (sscanf(buf, "%u%u", &coalescing_count, &coalescing_ticks) != 2) {
&coalescing_count, dev_err(dev, "fsl-sata: wrong parameter format.\n");
&coalescing_ticks) != 2) {
printk(KERN_ERR "fsl-sata: wrong parameter format.\n");
return -EINVAL; return -EINVAL;
} }
@@ -359,7 +357,7 @@ static ssize_t fsl_sata_rx_watermark_show(struct device *dev,
rx_watermark &= 0x1f; rx_watermark &= 0x1f;
spin_unlock_irqrestore(&host->lock, flags); 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, 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; void __iomem *csr_base = host_priv->csr_base;
u32 temp; u32 temp;
if (sscanf(buf, "%d", &rx_watermark) != 1) { if (kstrtouint(buf, 10, &rx_watermark) < 0) {
printk(KERN_ERR "fsl-sata: wrong parameter format.\n"); dev_err(dev, "fsl-sata: wrong parameter format.\n");
return -EINVAL; return -EINVAL;
} }
@@ -382,8 +380,8 @@ static ssize_t fsl_sata_rx_watermark_store(struct device *dev,
temp = ioread32(csr_base + TRANSCFG); temp = ioread32(csr_base + TRANSCFG);
temp &= 0xffffffe0; temp &= 0xffffffe0;
iowrite32(temp | rx_watermark, csr_base + TRANSCFG); iowrite32(temp | rx_watermark, csr_base + TRANSCFG);
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);
return strlen(buf); return strlen(buf);
} }