diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-05-12 17:51:24 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-05-12 17:51:24 +0200 |
commit | 930195737a0916d80ad2f7fe8b0f8fe4e4691762 (patch) | |
tree | ff89a5a9f52efd7f74fdeca722138e6a83efb65c /target/linux/oxnas/patches-4.1/999-libata-hacks.patch | |
parent | 825ef34f15b0b66d2c77bc6dc6002268c310a356 (diff) | |
download | upstream-930195737a0916d80ad2f7fe8b0f8fe4e4691762.tar.gz upstream-930195737a0916d80ad2f7fe8b0f8fe4e4691762.tar.bz2 upstream-930195737a0916d80ad2f7fe8b0f8fe4e4691762.zip |
oxnas: delete linux 4.1 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/oxnas/patches-4.1/999-libata-hacks.patch')
-rw-r--r-- | target/linux/oxnas/patches-4.1/999-libata-hacks.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch deleted file mode 100644 index 7d6670be56..0000000000 --- a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/drivers/ata/libata-core.c -+++ b/drivers/ata/libata-core.c -@@ -1589,6 +1589,14 @@ unsigned ata_exec_internal_sg(struct ata - return AC_ERR_SYSTEM; - } - -+ if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap, 0, 0)) { -+ spin_unlock_irqrestore(ap->lock, flags); -+ if (!ap->ops->acquire_hw(ap, 1, (2*HZ))) { -+ return AC_ERR_TIMEOUT; -+ } -+ spin_lock_irqsave(ap->lock, flags); -+ } -+ - /* initialize internal qc */ - - /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4780,6 +4788,9 @@ struct ata_queued_cmd *ata_qc_new_init(s - if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) - return NULL; - -+ if (ap->ops->qc_new && ap->ops->qc_new(ap)) -+ return NULL; -+ - /* libsas case */ - if (ap->flags & ATA_FLAG_SAS_HOST) { - tag = ata_sas_allocate_tag(ap); -@@ -4825,6 +4836,8 @@ void ata_qc_free(struct ata_queued_cmd * - qc->tag = ATA_TAG_POISON; - if (ap->flags & ATA_FLAG_SAS_HOST) - ata_sas_free_tag(tag, ap); -+ if (ap->ops->qc_free) -+ ap->ops->qc_free(qc); - } - } - ---- a/include/linux/libata.h -+++ b/include/linux/libata.h -@@ -905,6 +905,8 @@ struct ata_port_operations { - void (*qc_prep)(struct ata_queued_cmd *qc); - unsigned int (*qc_issue)(struct ata_queued_cmd *qc); - bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); -+ int (*qc_new)(struct ata_port *ap); -+ void (*qc_free)(struct ata_queued_cmd *qc); - - /* - * Configuration and exception handling -@@ -995,6 +997,9 @@ struct ata_port_operations { - void (*phy_reset)(struct ata_port *ap); - void (*eng_timeout)(struct ata_port *ap); - -+ int (*acquire_hw)(struct ata_port *ap, int may_sleep, -+ int timeout_jiffies); -+ - /* - * ->inherits must be the last field and all the preceding - * fields must be pointers. |