Skip to contentSkip to conversation

ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA

PATCH Superseded Suman Tripathi 2 participants 4 messages Sep 6, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA

Due to hardware errata, Ampere Computing eMAG SATA can't support AHCI ALPM feature. This patch disables the AHCI ALPM feature for eMAG SATA.

Changes for v2:

* Introduce the new ata_port_info object which includes ATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve the ata_port_info from the acpi match table.

Changes for v3:

* Fix the indentation and whitespace warnings.

---
 drivers/ata/ahci_platform.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/ata/ahci_platform.c +14 -1
index 99f9a89..9ba283f 100644
@@ -33,6 +33,13 @@ static const struct ata_port_info ahci_port_info = {
        .port_ops       = &ahci_platform_ops,
 };
 
+static const struct ata_port_info ahci_port_info_nolpm = {
+       .flags          = AHCI_FLAG_COMMON | ATA_FLAG_NO_LPM,
+       .pio_mask       = ATA_PIO4,
+       .udma_mask      = ATA_UDMA6,
+       .port_ops       = &ahci_platform_ops,
+};
+
 static struct scsi_host_template ahci_platform_sht = {
        AHCI_SHT(DRV_NAME),
 };
@@ -41,6 +48,7 @@ static int ahci_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct ahci_host_priv *hpriv;
+       const struct ata_port_info *port;
        int rc;
 
        hpriv = ahci_platform_get_resources(pdev);
@@ -57,7 +65,11 @@ static int ahci_probe(struct platform_device *pdev)
        if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
                hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
 
-       rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
+       port = acpi_device_get_match_data(dev);
+       if (!port)
+               port = &ahci_port_info;
+
+       rc = ahci_platform_init_host(pdev, hpriv, port,
                                     &ahci_platform_sht);
        if (rc)
                goto disable_resources;
@@ -85,6 +97,7 @@ static const struct of_device_id ahci_of_match[] = {
 MODULE_DEVICE_TABLE(of, ahci_of_match);
 
 static const struct acpi_device_id ahci_acpi_match[] = {
+       { "APMC0D33", (unsigned long)&ahci_port_info_nolpm },
        { ACPI_DEVICE_CLASS(PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff) },
        {},
 };

--
2.7.4

CONFIDENTIALITY NOTICE: This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and contains information that is confidential and proprietary to Ampere Computing or its subsidiaries. It is to be used solely for the purpose of furthering the parties' business relationship. Any review, copying, or distribution of this email (or any attachments thereto) is strictly prohibited. If you are not the intended recipient, please contact the sender immediately and permanently delete the original and any copies of this email and any attachments thereto.

#1 lore raw

Hi,

Quoted 10 lines · Suman Tripathi

Due to hardware errata, Ampere Computing eMAG SATA can't support AHCI ALPM feature. This patch disables the AHCI ALPM feature for eMAG SATA.

Changes for v2:

* Introduce the new ata_port_info object which includes ATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve the ata_port_info from the acpi match table.

Quoted 6 lines

Changes for v3:

* Fix the indentation and whitespace warnings.

Small remark, normally the changelog is put after the Signed-off-by messages like this:

"""

---
Changes for v3:
* Fix the indentation and whitespace warnings.

Changes for v2:

* Introduce the new ata_port_info object which includes ATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve the ata_port_info from the acpi match table.
"""

This will cause git am to remove it, so that the git history just has your original commit message.

By itself this would not be a reason to request a new version, but it seems you've copy and pasted the patch from "git format-patch" output into you mail client. I tried to run checkpatch myself to make sure you caught all whitespace issues and I got this:

[hans at shalem linux]$ scripts/checkpatch.pl ~/\[PATCH\ v3\]\ ata\:\ Disable\ AHCI\ ALPM\ feature\ for\ Ampere\ Computing\ eMAG\ SATA.eml
ERROR: patch seems to be corrupt (line wrapped?)
#177: FILE: drivers/ata/ahci_platform.c:34:

ERROR: DOS line endings
#178: FILE: drivers/ata/ahci_platform.c:35:
+static const struct ata_port_info ahci_port_info_nolpm = {^M$

ERROR: DOS line endings
#179: FILE: drivers/ata/ahci_platform.c:36:
+^I.flags^I^I= AHCI_FLAG_COMMON | ATA_FLAG_NO_LPM,^M$

ERROR: DOS line endings
#180: FILE: drivers/ata/ahci_platform.c:37:
+^I.pio_mask^I= ATA_PIO4,^M$

ERROR: DOS line endings
#181: FILE: drivers/ata/ahci_platform.c:38:
+^I.udma_mask^I= ATA_UDMA6,^M$

Followed by lots more errors, line 177 of the email is empty, while it should contain a single space. This stripping of whitespace typically is the result of copy pasting or some other processing of the patch.

Please try to re-send v3 using the "git send-email" command, so that we get a patch which we can actually apply.

Regards,

Hans

Quoted 54 lines
---
  drivers/ata/ahci_platform.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
drivers/ata/ahci_platform.c +14 -2
index 99f9a89..9ba283f 100644
@@ -33,6 +33,13 @@ static const struct ata_port_info ahci_port_info = {
  	.port_ops	= &ahci_platform_ops,
  };
 
+static const struct ata_port_info ahci_port_info_nolpm = {
+	.flags		= AHCI_FLAG_COMMON | ATA_FLAG_NO_LPM,
+	.pio_mask	= ATA_PIO4,
+	.udma_mask	= ATA_UDMA6,
+	.port_ops	= &ahci_platform_ops,
+};
+
  static struct scsi_host_template ahci_platform_sht = {
  	AHCI_SHT(DRV_NAME),
  };
@@ -41,6 +48,7 @@ static int ahci_probe(struct platform_device *pdev)
  {
  	struct device *dev = &pdev->dev;
  	struct ahci_host_priv *hpriv;
+	const struct ata_port_info *port;
  	int rc;
 
  	hpriv = ahci_platform_get_resources(pdev);
@@ -57,7 +65,11 @@ static int ahci_probe(struct platform_device *pdev)
  	if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
  		hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
 
-	rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
+	port = acpi_device_get_match_data(dev);
+	if (!port)
+		port = &ahci_port_info;
+
+	rc = ahci_platform_init_host(pdev, hpriv, port,
  				     &ahci_platform_sht);
  	if (rc)
  		goto disable_resources;
@@ -85,6 +97,7 @@ static const struct of_device_id ahci_of_match[] = {
  MODULE_DEVICE_TABLE(of, ahci_of_match);
 
  static const struct acpi_device_id ahci_acpi_match[] = {
+	{ "APMC0D33", (unsigned long)&ahci_port_info_nolpm },
  	{ ACPI_DEVICE_CLASS(PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff) },
  	{},
  };
--

2.7.4

#2 lore raw

Hi Hans,

I ran checkpatch and see no error. I will check my git-send-email

scripts/checkpatch.pl 0001-ata-Disable-AHCI-ALPM-feature-for-Ampere-Computing-e.patch total: 0 errors, 0 warnings, 39 lines checked

0001-ata-Disable-AHCI-ALPM-feature-for-Ampere-Computing-e.patch has no obvious style problems and is ready for submission.

With regards,
Suman

-----Original Message-----
From: Hans de Goede <[email protected]>
Sent: Thursday, September 6, 2018 12:32 AM
To: Suman Tripathi <[email protected]>; axboe at kernel.dk; tj at kernel.org; linux-ide at vger.kernel.org; linux-arm-kernel at lists.infradead.org; linux-kernel at vger.kernel.org; joe at perches.com; arnd at arndb.de; gregkh at linuxfoundation.org
Cc: Open Source Submission <[email protected]>; Rameshwar Sahu <[email protected]>
Subject: Re: [PATCH v3] ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA

[NOTICE: This email originated from an external sender. Please be mindful of safe email handling and proprietary information protection practices.] ________________________________________________________________________________________________________________________

Hi,

Quoted 9 lines · Suman Tripathi

Due to hardware errata, Ampere Computing eMAG SATA can't support AHCI ALPM feature. This patch disables the AHCI ALPM feature for eMAG SATA.

Changes for v2:

* Introduce the new ata_port_info object which includes ATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve the ata_port_info from the acpi match table.

Quoted 7 lines

Changes for v3:

* Fix the indentation and whitespace warnings.

Signed-off-by Rameshwar Prasad Sahu

<[email protected]>

Small remark, normally the changelog is put after the Signed-off-by messages like this:

"""

---
Changes for v3:
* Fix the indentation and whitespace warnings.

Changes for v2:

* Introduce the new ata_port_info object which includes ATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve the ata_port_info from the acpi match table.
"""

This will cause git am to remove it, so that the git history just has your original commit message.

By itself this would not be a reason to request a new version, but it seems you've copy and pasted the patch from "git format-patch" output into you mail client. I tried to run checkpatch myself to make sure you caught all whitespace issues and I got this:

[hans at shalem linux]$ scripts/checkpatch.pl ~/\[PATCH\ v3\]\ ata\:\ Disable\ AHCI\ ALPM\ feature\ for\ Ampere\ Computing\ eMAG\ SATA.eml
ERROR: patch seems to be corrupt (line wrapped?)
#177: FILE: drivers/ata/ahci_platform.c:34:

ERROR: DOS line endings
#178: FILE: drivers/ata/ahci_platform.c:35:
+static const struct ata_port_info ahci_port_info_nolpm = {^M$

ERROR: DOS line endings
#179: FILE: drivers/ata/ahci_platform.c:36:
+^I.flags^I^I= AHCI_FLAG_COMMON | ATA_FLAG_NO_LPM,^M$

ERROR: DOS line endings
#180: FILE: drivers/ata/ahci_platform.c:37:
+^I.pio_mask^I= ATA_PIO4,^M$

ERROR: DOS line endings
#181: FILE: drivers/ata/ahci_platform.c:38:
+^I.udma_mask^I= ATA_UDMA6,^M$

Followed by lots more errors, line 177 of the email is empty, while it should contain a single space. This stripping of whitespace typically is the result of copy pasting or some other processing of the patch.

Please try to re-send v3 using the "git send-email" command, so that we get a patch which we can actually apply.

Regards,

Hans

Quoted 54 lines
---
  drivers/ata/ahci_platform.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
drivers/ata/ahci_platform.c +14 -2
index 99f9a89..9ba283f 100644
@@ -33,6 +33,13 @@ static const struct ata_port_info ahci_port_info = {
      .port_ops       = &ahci_platform_ops,
  };
 
+static const struct ata_port_info ahci_port_info_nolpm = {
+     .flags          = AHCI_FLAG_COMMON | ATA_FLAG_NO_LPM,
+     .pio_mask       = ATA_PIO4,
+     .udma_mask      = ATA_UDMA6,
+     .port_ops       = &ahci_platform_ops,
+};
+
  static struct scsi_host_template ahci_platform_sht = {
      AHCI_SHT(DRV_NAME),
  };
@@ -41,6 +48,7 @@ static int ahci_probe(struct platform_device *pdev)
  {
      struct device *dev = &pdev->dev;
      struct ahci_host_priv *hpriv;
+     const struct ata_port_info *port;
      int rc;
 
      hpriv = ahci_platform_get_resources(pdev);
@@ -57,7 +65,11 @@ static int ahci_probe(struct platform_device *pdev)
      if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
              hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
 
-     rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
+     port = acpi_device_get_match_data(dev);
+     if (!port)
+             port = &ahci_port_info;
+
+     rc = ahci_platform_init_host(pdev, hpriv, port,
                                   &ahci_platform_sht);
      if (rc)
              goto disable_resources;
@@ -85,6 +97,7 @@ static const struct of_device_id ahci_of_match[] = {
  MODULE_DEVICE_TABLE(of, ahci_of_match);
 
  static const struct acpi_device_id ahci_acpi_match[] = {
+     { "APMC0D33", (unsigned long)&ahci_port_info_nolpm },
      { ACPI_DEVICE_CLASS(PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff) },
      {},
  };
--

2.7.4

#3 lore raw

Hi,

Quoted 3 lines · Suman Tripathi

Hi Hans,

I ran checkpatch and see no error. I will check my git-send-email

Right, the problem is not with the patch, but with your email client mangling the file.

git send-email will send the patch for you without damaging it.

Regards,

Hans

Quoted 148 lines

scripts/checkpatch.pl 0001-ata-Disable-AHCI-ALPM-feature-for-Ampere-Computing-e.patch total: 0 errors, 0 warnings, 39 lines checked

0001-ata-Disable-AHCI-ALPM-feature-for-Ampere-Computing-e.patch has no obvious style problems and is ready for submission.

With regards,
Suman

-----Original Message-----
From: Hans de Goede <[email protected]>
Sent: Thursday, September 6, 2018 12:32 AM
To: Suman Tripathi <[email protected]>; axboe at kernel.dk; tj at kernel.org; linux-ide at vger.kernel.org; linux-arm-kernel at lists.infradead.org; linux-kernel at vger.kernel.org; joe at perches.com; arnd at arndb.de; gregkh at linuxfoundation.org
Cc: Open Source Submission <[email protected]>; Rameshwar Sahu <[email protected]>
Subject: Re: [PATCH v3] ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA

[NOTICE: This email originated from an external sender. Please be mindful of safe email handling and proprietary information protection practices.] ________________________________________________________________________________________________________________________

Hi,

Quoted 9 lines · Suman Tripathi

Due to hardware errata, Ampere Computing eMAG SATA can't support AHCI ALPM feature. This patch disables the AHCI ALPM feature for eMAG SATA.

Changes for v2:

* Introduce the new ata_port_info object which includes ATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve the ata_port_info from the acpi match table.

Quoted 7 lines

Changes for v3:

* Fix the indentation and whitespace warnings.

Signed-off-by Rameshwar Prasad Sahu

<[email protected]>

Small remark, normally the changelog is put after the Signed-off-by messages like this:

"""

---
Changes for v3:
* Fix the indentation and whitespace warnings.

Changes for v2:

* Introduce the new ata_port_info object which includes ATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve the ata_port_info from the acpi match table.
"""

This will cause git am to remove it, so that the git history just has your original commit message.

By itself this would not be a reason to request a new version, but it seems you've copy and pasted the patch from "git format-patch" output into you mail client. I tried to run checkpatch myself to make sure you caught all whitespace issues and I got this:

[hans at shalem linux]$ scripts/checkpatch.pl ~/\[PATCH\ v3\]\ ata\:\ Disable\ AHCI\ ALPM\ feature\ for\ Ampere\ Computing\ eMAG\ SATA.eml
ERROR: patch seems to be corrupt (line wrapped?)
#177: FILE: drivers/ata/ahci_platform.c:34:

ERROR: DOS line endings
#178: FILE: drivers/ata/ahci_platform.c:35:
+static const struct ata_port_info ahci_port_info_nolpm = {^M$

ERROR: DOS line endings
#179: FILE: drivers/ata/ahci_platform.c:36:
+^I.flags^I^I= AHCI_FLAG_COMMON | ATA_FLAG_NO_LPM,^M$

ERROR: DOS line endings
#180: FILE: drivers/ata/ahci_platform.c:37:
+^I.pio_mask^I= ATA_PIO4,^M$

ERROR: DOS line endings
#181: FILE: drivers/ata/ahci_platform.c:38:
+^I.udma_mask^I= ATA_UDMA6,^M$

Followed by lots more errors, line 177 of the email is empty, while it should contain a single space. This stripping of whitespace typically is the result of copy pasting or some other processing of the patch.

Please try to re-send v3 using the "git send-email" command, so that we get a patch which we can actually apply.

Regards,

Hans

Quoted 54 lines
---
   drivers/ata/ahci_platform.c | 15 ++++++++++++++-
   1 file changed, 14 insertions(+), 1 deletion(-)
drivers/ata/ahci_platform.c +14 -2
index 99f9a89..9ba283f 100644
@@ -33,6 +33,13 @@ static const struct ata_port_info ahci_port_info = {
       .port_ops       = &ahci_platform_ops,
   };
 
+static const struct ata_port_info ahci_port_info_nolpm = {
+     .flags          = AHCI_FLAG_COMMON | ATA_FLAG_NO_LPM,
+     .pio_mask       = ATA_PIO4,
+     .udma_mask      = ATA_UDMA6,
+     .port_ops       = &ahci_platform_ops,
+};
+
   static struct scsi_host_template ahci_platform_sht = {
       AHCI_SHT(DRV_NAME),
   };
@@ -41,6 +48,7 @@ static int ahci_probe(struct platform_device *pdev)
   {
       struct device *dev = &pdev->dev;
       struct ahci_host_priv *hpriv;
+     const struct ata_port_info *port;
       int rc;
 
       hpriv = ahci_platform_get_resources(pdev);
@@ -57,7 +65,11 @@ static int ahci_probe(struct platform_device *pdev)
       if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
               hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
 
-     rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
+     port = acpi_device_get_match_data(dev);
+     if (!port)
+             port = &ahci_port_info;
+
+     rc = ahci_platform_init_host(pdev, hpriv, port,
                                    &ahci_platform_sht);
       if (rc)
               goto disable_resources;
@@ -85,6 +97,7 @@ static const struct of_device_id ahci_of_match[] = {
   MODULE_DEVICE_TABLE(of, ahci_of_match);
 
   static const struct acpi_device_id ahci_acpi_match[] = {
+     { "APMC0D33", (unsigned long)&ahci_port_info_nolpm },
       { ACPI_DEVICE_CLASS(PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff) },
       {},
   };
--

2.7.4