From: Kamal Mostafa <kamal@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
kernel-team@lists.ubuntu.com
Cc: Arne Fitzenreiter <arne_f@ipfire.org>, Tejun Heo <tj@kernel.org>,
Luis Henriques <luis.henriques@canonical.com>,
Kamal Mostafa <kamal@canonical.com>
Subject: [PATCH 3.13.y-ckt 04/60] libata: add ATA_HORKAGE_NOTRIM
Date: Tue, 1 Sep 2015 17:57:10 -0700 [thread overview]
Message-ID: <1441155486-26089-5-git-send-email-kamal@canonical.com> (raw)
In-Reply-To: <1441155486-26089-1-git-send-email-kamal@canonical.com>
3.13.11-ckt26 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Arne Fitzenreiter <arne_f@ipfire.org>
commit 71d126fd28de2d4d9b7b2088dbccd7ca62fad6e0 upstream.
Some devices lose data on TRIM whether queued or not. This patch adds
a horkage to disable TRIM.
tj: Collapsed unnecessary if() nesting.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
[ luis: backported to 3.16:
- dropped changes to show_ata_dev_trim
- adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
drivers/ata/libata-scsi.c | 3 ++-
include/linux/libata.h | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index ef8567d..6fecf0b 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2510,7 +2510,8 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf)
rbuf[14] = (lowest_aligned >> 8) & 0x3f;
rbuf[15] = lowest_aligned;
- if (ata_id_has_trim(args->id)) {
+ if (ata_id_has_trim(args->id) &&
+ !(dev->horkage & ATA_HORKAGE_NOTRIM)) {
rbuf[14] |= 0x80; /* TPE */
if (ata_id_has_zero_after_trim(args->id))
diff --git a/include/linux/libata.h b/include/linux/libata.h
index fa413ee..8c58412 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -429,6 +429,8 @@ enum {
ATA_HORKAGE_NO_NCQ_TRIM = (1 << 19), /* don't use queued TRIM */
ATA_HORKAGE_NOLPM = (1 << 20), /* don't use LPM */
ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21), /* some WDs have broken LPM */
+ ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */
+
/* DMA mask for user DMA control: User visible values; DO NOT
renumber */
--
1.9.1
next prev parent reply other threads:[~2015-09-02 0:58 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 0:57 [3.13.y-ckt stable] Linux 3.13.11-ckt26 stable review Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 01/60] md: use kzalloc() when bitmap is disabled Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 02/60] ata: pmp: add quirk for Marvell 4140 SATA PMP Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 03/60] libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for HP 250GB SATA disk VB0250EAVER Kamal Mostafa
2015-09-02 0:57 ` Kamal Mostafa [this message]
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 05/60] libata: force disable trim for SuperSSpeed S238 Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 06/60] libata: increase the timeout when setting transfer mode Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 07/60] libata: Do not blacklist M510DC Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 08/60] mac80211: clear subdir_stations when removing debugfs Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 09/60] ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 10/60] md/raid10: always set reshape_safe when initializing reshape_position Kamal Mostafa
2015-09-04 19:39 ` Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 11/60] drm: Stop resetting connector state to unknown Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 12/60] usb: dwc3: Reset the transfer resource index on SET_INTERFACE Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 13/60] usb: xhci: Bugfix for NULL pointer deference in xhci_endpoint_init() function Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 14/60] xhci: Calculate old endpoints correctly on device reset Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 15/60] xhci: report U3 when link is in resume state Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 16/60] xhci: prevent bus_suspend if SS port resuming in phase 1 Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 17/60] xhci: do not report PLC when link is in internal resume state Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 18/60] USB: OHCI: Fix race between ED unlink and URB submission Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 19/60] usb-storage: ignore ZTE MF 823 card reader in mode 0x1225 Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 20/60] blkcg: fix gendisk reference leak in blkg_conf_prep() Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 21/60] tile: use free_bootmem_late() for initrd Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 22/60] Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 23/60] md/raid1: fix test for 'was read error from last working device' Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 24/60] mmc: omap_hsmmc: Fix DTO and DCRC handling Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 25/60] isdn/gigaset: reset tty->receive_room when attaching ser_gigaset Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 26/60] mmc: sdhci-pxav3: fix platform_data is not initialized Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 27/60] mmc: block: Add missing mmc_blk_put() in power_ro_lock_show() Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 28/60] mmc: sdhci-esdhc: Make 8BIT bus work Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 29/60] bonding: correctly handle bonding type change on enslave failure Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 30/60] net: Clone skb before setting peeked flag Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 31/60] bridge: mdb: fix double add notification Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 32/60] usb: gadget: mv_udc_core: fix phy_regs I/O memory leak Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 33/60] inet: frags: fix defragmented packet's IP header for af_packet Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 34/60] bonding: fix destruction of bond with devices different from arphrd_ether Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 35/60] ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 36/60] ASoC: pcm1681: Fix setting de-emphasis sampling rate selection Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 37/60] iscsi-target: Fix use-after-free during TPG session shutdown Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 38/60] iscsi-target: Fix iscsit_start_kthreads failure OOPs Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 39/60] iscsi-target: Fix iser explicit logout TX kthread leak Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 40/60] ALSA: hda - Apply fixup for another Toshiba Satellite S50D Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 41/60] vhost: actually track log eventfd file Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 42/60] xfs: remote attributes need to be considered data Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 43/60] ALSA: usb-audio: add dB range mapping for some devices Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 44/60] drm/radeon/combios: add some validation of lvds values Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 45/60] x86/efi: Use all 64 bit of efi_memmap in setup_e820() Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 46/60] ipr: Fix locking for unit attention handling Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 47/60] ipr: Fix incorrect trace indexing Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 48/60] ipr: Fix invalid array indexing for HRRQ Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 49/60] ALSA: hda - Fix MacBook Pro 5,2 quirk Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 50/60] x86/xen: Probe target addresses in set_aliased_prot() before the hypercall Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 51/60] netfilter: ctnetlink: put back references to master ct and expect objects Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 52/60] bridge: mdb: fix delmdb state in the notification Kamal Mostafa
2015-09-02 0:57 ` [PATCH 3.13.y-ckt 53/60] ipvs: fix crash with sync protocol v0 and FTP Kamal Mostafa
2015-09-02 0:58 ` [PATCH 3.13.y-ckt 54/60] act_pedit: check binding before calling tcf_hash_release() Kamal Mostafa
2015-09-02 0:58 ` [PATCH 3.13.y-ckt 55/60] netfilter: nf_conntrack: Support expectations in different zones Kamal Mostafa
2015-09-02 0:58 ` [PATCH 3.13.y-ckt 56/60] ipvs: do not use random local source address for tunnels Kamal Mostafa
2015-09-02 0:58 ` [PATCH 3.13.y-ckt 57/60] ALSA: hda - fix cs4210_spdif_automute() Kamal Mostafa
2015-09-02 0:58 ` [PATCH 3.13.y-ckt 58/60] niu: don't count tx error twice in case of headroom realloc fails Kamal Mostafa
2015-09-02 0:58 ` [PATCH 3.13.y-ckt 59/60] net/mlx4_core: Fix wrong index in propagating port change event to VFs Kamal Mostafa
2015-09-02 0:58 ` [PATCH 3.13.y-ckt 60/60] ipvs: fix crash if scheduler is changed Kamal Mostafa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441155486-26089-5-git-send-email-kamal@canonical.com \
--to=kamal@canonical.com \
--cc=arne_f@ipfire.org \
--cc=kernel-team@lists.ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luis.henriques@canonical.com \
--cc=stable@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®