diff options
author | Daniel Golle <daniel@makrotopia.org> | 2021-10-09 16:44:01 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2021-10-09 16:48:45 +0100 |
commit | 7ab94288e052ad17cbbed5c78a5e7194b0cfa116 (patch) | |
tree | a564f5b9116a90f9c92718d202bf3defdfee88b9 /target/linux/oxnas/patches-5.4/999-libata-hacks.patch | |
parent | 401d7ebf2c9bdcc7c1e24900ed9f8acf87d932c8 (diff) | |
download | upstream-7ab94288e052ad17cbbed5c78a5e7194b0cfa116.tar.gz upstream-7ab94288e052ad17cbbed5c78a5e7194b0cfa116.tar.bz2 upstream-7ab94288e052ad17cbbed5c78a5e7194b0cfa116.zip |
oxnas: switch to Linux 5.10
Linux 5.10 has been there as testing kernel for a while now.
Do the switch and drop config and patches for Linux 5.4.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/oxnas/patches-5.4/999-libata-hacks.patch')
-rw-r--r-- | target/linux/oxnas/patches-5.4/999-libata-hacks.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch deleted file mode 100644 index d91f2d6724..0000000000 --- a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/drivers/ata/libata-core.c -+++ b/drivers/ata/libata-core.c -@@ -1583,6 +1583,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 */ - qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); - -@@ -5128,6 +5136,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); -@@ -5173,6 +5184,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 -@@ -910,6 +910,8 @@ struct ata_port_operations { - enum ata_completion_errors (*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 -@@ -1000,6 +1002,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. |