git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 72f79f9e35bd3f78ee8853f2fcacaa197d23ebac Mon Sep 17 00:00:00 2001
   2 From: Suman Tripathi <stripathi@apm.com>
   3 Date: Fri, 8 Aug 2014 21:44:25 +0530
   4 Subject: ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA Host Controller driver.
   5
   6 From: Suman Tripathi <stripathi@apm.com>
   7
   8 commit 72f79f9e35bd3f78ee8853f2fcacaa197d23ebac upstream.
   9
  10 This patch removes the NCQ support from the APM X-Gene SoC AHCI
  11 Host Controller driver as it doesn't support it.
  12
  13 Signed-off-by: Loc Ho <lho@apm.com>
  14 Signed-off-by: Suman Tripathi <stripathi@apm.com>
  15 Signed-off-by: Tejun Heo <tj@kernel.org>
  16 [bwh: Backported to 3.16: host flags are passed to ahci_platform_init_host()]
  17 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  drivers/ata/ahci_xgene.c |    4 ++--
  22  1 file changed, 2 insertions(+), 2 deletions(-)
  23
  24 --- a/drivers/ata/ahci_xgene.c
  25 +++ b/drivers/ata/ahci_xgene.c
  26 @@ -337,7 +337,7 @@ static struct ata_port_operations xgene_
  27  };
  28
  29  static const struct ata_port_info xgene_ahci_port_info = {
  30 -       .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
  31 +       .flags = AHCI_FLAG_COMMON,
  32         .pio_mask = ATA_PIO4,
  33         .udma_mask = ATA_UDMA6,
  34         .port_ops = &xgene_ahci_ops,
  35 @@ -484,7 +484,7 @@ static int xgene_ahci_probe(struct platf
  36                 goto disable_resources;
  37         }
  38
  39 -       hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
  40 +       hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ;
  41
  42         rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info,
  43                                      hflags, 0, 0);