On Sat, 2014-09-20 at 10:47 -0700, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> The patch below does not apply to the 3.16-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 72f79f9e35bd3f78ee8853f2fcacaa197d23ebac Mon Sep 17 00:00:00 2001
> From: Suman Tripathi <stripathi@xxxxxxx>
> Date: Fri, 8 Aug 2014 21:44:25 +0530
> Subject: [PATCH] ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI
> SATA Host Controller driver.
[...]
I'm attaching an backport which is compile-tested only, but it seemed
pretty straightforward to me.
Ben.
--
Ben Hutchings
Hoare's Law of Large Problems:
Inside every large problem is a small problem struggling to get out.
From fd50aaa3f25ec33917d18f7f25c66ac8b40085c6 Mon Sep 17 00:00:00 2001
From: Suman Tripathi <stripathi@xxxxxxx>
Date: Fri, 8 Aug 2014 21:44:25 +0530
Subject: [PATCH] ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI
SATA Host Controller driver.
commit 72f79f9e35bd3f78ee8853f2fcacaa197d23ebac upstream.
This patch removes the NCQ support from the APM X-Gene SoC AHCI
Host Controller driver as it doesn't support it.
Signed-off-by: Loc Ho <lho@xxxxxxx>
Signed-off-by: Suman Tripathi <stripathi@xxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
[bwh: Backported to 3.16: host flags are passed to ahci_platform_init_host()]
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
drivers/ata/ahci_xgene.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index ee3a365..10d5246 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -337,7 +337,7 @@ static struct ata_port_operations xgene_ahci_ops = {
};
static const struct ata_port_info xgene_ahci_port_info = {
- .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
+ .flags = AHCI_FLAG_COMMON,
.pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6,
.port_ops = &xgene_ahci_ops,
@@ -484,7 +484,7 @@ static int xgene_ahci_probe(struct platform_device *pdev)
goto disable_resources;
}
- hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
+ hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ;
rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info,
hflags, 0, 0);
Attachment:
signature.asc
Description: This is a digitally signed message part