ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA
Subsystems (2)
PATCH v2 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.
--- drivers/ata/ahci_platform.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/ata/ahci_platform.c +15 -2
@@ -33,6 +33,13 @@ .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,7 +48,8 @@ static int ahci_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct ahci_host_priv *hpriv; -int rc; +const struct ata_port_info *port; +int rc; hpriv =ahci_platform_get_resources (pdev);if (IS_ERR (hpriv))
@@ -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 SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,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 ) }, {}, };
--
1.8.3.1
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.
Hi,
Quoted 35 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_infoobject which includesATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve theata_port_infofrom the acpi match table.Signed-off-by Suman Trpathi <[email protected]>Signed-off-by Rameshwar Prasad Sahu <[email protected]>--- drivers/ata/ahci_platform.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/ata/ahci_platform.c +7
-0@@ -33,6 +33,13 @@ .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 ), };
drivers/ata/ahci_platform.c static int ahci_probe(struct platform_device *pdev) · line 52
Quoted 6 lines
drivers/ata/ahci_platform.c +2
-1@@ -41,7 +48,8 @@ static int ahci_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct ahci_host_priv *hpriv; -int rc; +const struct ata_port_info *port; +int rc;
You are accidentally changing the indentation of rc here.
Please fix this and run scripts/checkpatch.pl on the patch before submitting v3. Otherwise v2 looks good.
Regards,
Hans
Quoted 25 lines
drivers/ata/ahci_platform.c +6
-1hpriv =ahci_platform_get_resources (pdev);if (IS_ERR (hpriv))@@ -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 SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,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 ) }, {}, };
Hi Hans
Thanks for your quick review !!
With regards,
Suman
-----Original Message-----
From: Hans de Goede <[email protected]>
Sent: Wednesday, September 5, 2018 1:16 PM
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 v2] 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 35 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_infoobject which includesATA_FLAG_NO_LPM.
* Include this object for eMAG SATA inside the acpi match table.
* Retrieve theata_port_infofrom the acpi match table.Signed-off-by Suman Trpathi <[email protected]>Signed-off-by Rameshwar Prasad Sahu--- drivers/ata/ahci_platform.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/ata/ahci_platform.c +7
-0@@ -33,6 +33,13 @@ .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 ), };
drivers/ata/ahci_platform.c static int ahci_probe(struct platform_device *pdev) · line 52
Quoted 6 lines
drivers/ata/ahci_platform.c +2
-1@@ -41,7 +48,8 @@ static int ahci_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct ahci_host_priv *hpriv; -int rc; +const struct ata_port_info *port; +int rc;
You are accidentally changing the indentation of rc here. [Suman Tripathi] yes will fix in v3
Please fix this and run scripts/checkpatch.pl on the patch before submitting v3. Otherwise v2 looks good.
Regards,
Hans
Quoted 25 lines
drivers/ata/ahci_platform.c +6
-1hpriv =ahci_platform_get_resources (pdev);if (IS_ERR (hpriv))@@ -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 SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,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 ) }, {}, };