mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-26 06:09:37 +00:00
b934aa2f21
This bumps the 4.4. kernel in LEDE 17.01 to 4.4.116. More Meltdown & Spectre mitigation. * Refresh patches. * Refresh x86/config for RETPOLINE. * Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream) * Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream) * 650-pppoe_header_pad.patch does not apply anymore (code was replaced). Bumps from 4.4.113 to 4.4.115 were handled by Kevin Darbyshire-Bryant. Compile-tested on: ar71xx, ramips/mt7621, x86/64 Run-tested on: ar71xx, ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
--- 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
|
|
@@ -4788,6 +4796,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);
|
|
@@ -4833,6 +4844,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
|
|
@@ -906,6 +906,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
|
|
@@ -996,6 +998,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.
|