release 6.15.4
This commit is contained in:
@@ -94,7 +94,7 @@ Contains:
|
||||
-#endif
|
||||
--- a/drivers/ata/ahci.c
|
||||
+++ b/drivers/ata/ahci.c
|
||||
@@ -1629,7 +1629,7 @@ static irqreturn_t ahci_thunderx_irq_han
|
||||
@@ -1662,7 +1662,7 @@ static irqreturn_t ahci_thunderx_irq_han
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -103,7 +103,7 @@ Contains:
|
||||
struct ahci_host_priv *hpriv)
|
||||
{
|
||||
int i;
|
||||
@@ -1642,7 +1642,7 @@ static void ahci_remap_check(struct pci_
|
||||
@@ -1675,7 +1675,7 @@ static void ahci_remap_check(struct pci_
|
||||
pci_resource_len(pdev, bar) < SZ_512K ||
|
||||
bar != AHCI_PCI_BAR_STANDARD ||
|
||||
!(readl(hpriv->mmio + AHCI_VSCAP) & 1))
|
||||
@@ -112,7 +112,7 @@ Contains:
|
||||
|
||||
cap = readq(hpriv->mmio + AHCI_REMAP_CAP);
|
||||
for (i = 0; i < AHCI_MAX_REMAP; i++) {
|
||||
@@ -1657,18 +1657,11 @@ static void ahci_remap_check(struct pci_
|
||||
@@ -1690,18 +1690,11 @@ static void ahci_remap_check(struct pci_
|
||||
}
|
||||
|
||||
if (!hpriv->remapped_nvme)
|
||||
@@ -135,7 +135,7 @@ Contains:
|
||||
}
|
||||
|
||||
static int ahci_get_irq_vector(struct ata_host *host, int port)
|
||||
@@ -1912,7 +1905,9 @@ static int ahci_init_one(struct pci_dev
|
||||
@@ -1945,7 +1938,9 @@ static int ahci_init_one(struct pci_dev
|
||||
return -ENOMEM;
|
||||
|
||||
/* detect remapped nvme devices */
|
||||
|
Reference in New Issue
Block a user