mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
a9c5c7aa6b
* kernel: bump 5.10 to 5.10.65 Manually refreshed: generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch bcm27xx/patches-5.10/950-0053-firmware-bcm2835-Support-ARCH_BCM270x.patch bcm27xx/patches-5.10/950-0087-firmware-raspberrypi-Add-backward-compatible-get_thr.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.66 No patches refreshed. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.67 Deleted (upstreamed): bcm27xx/patches-5.10/950-0312-vc4_hdmi-Set-HD_CTL_WHOLSMP-and-HD_CTL_CHALIGN_SET.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.68 Deleted (upstreamed): generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch generic/backport-5.10/792-v5.15-0001-net-dsa-b53-Fix-calculating-number-of-switch-ports.patch generic/backport-5.10/792-v5.15-0002-net-dsa-b53-Set-correct-number-of-ports-in-the-DSA-s.patch generic/backport-5.10/792-v5.15-0003-net-dsa-b53-Fix-IMP-port-setup-on-BCM5301x.patch generic/backport-5.10/840-0001-PCI-of-Don-t-fail-devm_pci_alloc_host_bridge-on-miss.patch generic/backport-5.10/840-0002-PCI-iproc-Fix-BCMA-probe-resource-handling.patch generic/pending-5.10/498-mtd-mtdconcat-select-readwrite-function.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.69 Patches automatically refreshed. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> * kernel: bump 5.10 to 5.10.70 Deleted (upstreamed): bcm53xx/patches-5.10/181-Revert-USB-bcma-Add-a-check-for-devm_gpiod_get.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Co-authored-by: Rui Salvaterra <rsalvaterra@gmail.com>
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
--- a/drivers/ata/libata-core.c
|
|
+++ b/drivers/ata/libata-core.c
|
|
@@ -1528,6 +1528,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);
|
|
|
|
@@ -4524,6 +4532,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);
|
|
@@ -4569,6 +4580,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
|
|
@@ -911,6 +911,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
|
|
@@ -1001,6 +1003,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.
|