ahci: imx: setup power saving methods
Subsystems (2)
v3 cover ahci: imx: setup power saving methods
v3: ahci: imx: setup power saving methods
- Thanks for Tejun's suggestions.
override the error_handler by ahci_imx_error_handler, to do the complete SATA device detection, enter into PDDQ mode, if there is no any SATA device.
- minor modifications:
- The format of the copyright is changed, because that the original one can't pass fsl internal patch reivew without the character '(c)'.
- Change the module parameters to be more readable.
V2: http://www.spinics.net/lists/linux-ide/msg46606.html
- kernel build option is replaced by the module parameter(ahci-imx.hp)
v1: http://www.spinics.net/lists/linux-ide/msg46389.html
* Disable sata phy internal pll reference clock when sysetem enter into suspend mode, enable it after resume.
* Enter into test power down mode when there is no sata disk detected on the port and 'AHCI_IMX_PHY_POWER_DOWN_MODE' is enabled.
This patch is based on for-next branch of "http://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git"
[v3] ahci: imx: setup power saving methodsdrivers/ata/ahci_imx.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 123 insertions(+), 2 deletions(-)
PATCH v3 1/1 ahci: imx: setup power saving methods
From: Richard Zhu <[email protected]>
In order to save power consumption amap.
* Disable sata phy internal pll reference clock when sysetem enter into suspend mode, enable it after resume.
* Enter into test power down mode(PDDQ) and don't support hot-plug feature anymore, when there is no device detected on the port.
NOTE:
- The hot-plug can't be supported when PDDQ mode is ever enabled.
- module parameter usage how-to:
* default: enable PDDQ mode when no device detected.
* add "ahci-imx.hotplug=1" into kernel command line if your don't want to enable PDDQ mode when no device detected on the port.
--- drivers/ata/ahci_imx.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 123 insertions(+), 2 deletions(-)
drivers/ata/ahci_imx.c +123 -2
@@ -1,6 +1,6 @@/* +* copyright (c) 2013 Freescale Semiconductor, Inc. * Freescale IMX AHCI SATA platform driver -* Copyright 2013 Freescale Semiconductor, Inc. * * based on the AHCI SATA platform driver by Jeff Garzik and Anton Vorontsov *
@@ -25,9 +25,17 @@#include <linux/of_device.h> #include <linux/mfd/syscon.h> #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> +#include <linux/libata.h> #include "ahci.h" +static void ahci_imx_error_handler (struct ata_port *ap); +static void ahci_host_stop (struct ata_host *host); +enum { +/* Port0 PHY Control */ +PORT_PHY_CTL =0x178 , +/* PORT_PHY_CTL bits */ +PORT_PHY_CTL_PDDQ_LOC =0x100000 ,HOST_TIMER1MS =0xe0 ,/* Timer 1-ms */ };
@@ -36,12 +44,85 @@ struct imx_ahci_priv {struct clk *sata_ref_clk;struct clk *ahb_clk;struct regmap *gpr; +bool no_device; +bool first_time; +}; + +static struct ata_port_operations ahci_imx_ops = { + .inherits = &ahci_ops, + .host_stop = ahci_host_stop, + .error_handler = ahci_imx_error_handler, +}; + +static const struct ata_port_info ahci_imx_port_info = { + .flags =AHCI_FLAG_COMMON , + .pio_mask =ATA_PIO4 , + .udma_mask =ATA_UDMA6 , + .port_ops = &ahci_imx_ops, }; +static int ahci_imx_hotplug; +module_param_named (hotplug, ahci_imx_hotplug, int,0644 ); +MODULE_PARM_DESC (hotplug,"AHCI IMX hot-plug support (0=Don't support, 1=support)" ); + +static void ahci_imx_error_handler (struct ata_port *ap) +{ +u32 reg_val; +struct ata_device *dev; +struct ata_host *host =dev_get_drvdata (ap->dev); +struct ahci_host_priv *hpriv = host->private_data; +void __iomem *mmio = hpriv->mmio; +struct imx_ahci_priv *imxpriv =dev_get_drvdata (ap->dev->parent); + +/* wrapper of the ahci_error_handler */ +if (!(ap->pflags &ATA_PFLAG_FROZEN )) { +/* restart engine */ +ahci_stop_engine (ap); +ahci_start_engine (ap); + } + +sata_pmp_error_handler (ap); + +if (!ata_dev_enabled (ap->link.device)) +ahci_stop_engine (ap); +/* end of wrapper */ + +if (!(imxpriv->first_time) || ahci_imx_hotplug) +return ; + + imxpriv->first_time = false; + +ata_for_each_dev (dev, &ap->link,ENABLED ) +return ; +/* DISABLE LINK to save power consumption */ + reg_val =readl (mmio +PORT_PHY_CTL ); +writel (reg_val |PORT_PHY_CTL_PDDQ_LOC , mmio +PORT_PHY_CTL ); +regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_MPLL_CLK_EN , + !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +clk_disable_unprepare (imxpriv->sata_ref_clk); + imxpriv->no_device = true; +} + +static void ahci_host_stop (struct ata_host *host) +{ +struct device *dev = host->dev; +struct ahci_platform_data *pdata =dev_get_platdata (dev); +struct ahci_host_priv *hpriv = host->private_data; + +if (pdata && pdata->exit) + pdata->exit (dev); + +if (!IS_ERR (hpriv->clk)) { +clk_disable_unprepare (hpriv->clk); +clk_put (hpriv->clk); + } +} +static int imx6q_sata_init (struct device *dev,void __iomem *mmio) {int ret =0 ; -unsigned int reg_val; +u32 reg_val;struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); imxpriv->gpr =
@@ -117,9 +198,47 @@ static void imx6q_sata_exit(struct device *dev)clk_disable_unprepare (imxpriv->sata_ref_clk); } +static int imx_ahci_suspend (struct device *dev) +{ +struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); + +if (!(imxpriv->no_device)) { +regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_MPLL_CLK_EN , + !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +clk_disable_unprepare (imxpriv->sata_ref_clk); + } + +return 0 ; +} + +static int imx_ahci_resume (struct device *dev) +{ +struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); +int ret; + +if (!(imxpriv->no_device)) { + ret =clk_prepare_enable (imxpriv->sata_ref_clk); +if (ret <0 ) { +dev_err (dev,"pre-enable sata_ref clock err:%d\n" , ret); +return ret; + } + +regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_MPLL_CLK_EN , +IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +usleep_range (1000 ,2000 ); + } + +return 0 ; +} +static struct ahci_platform_data imx6q_sata_pdata = { .init = imx6q_sata_init, .exit = imx6q_sata_exit, + .ata_port_info = &ahci_imx_port_info, + .suspend = imx_ahci_suspend, + .resume = imx_ahci_resume, };static const struct of_device_id imx_ahci_of_match[] = {
@@ -152,6 +271,8 @@ static int imx_ahci_probe(struct platform_device *pdev) ahci_dev = &ahci_pdev->dev; ahci_dev->parent = dev; + imxpriv->no_device = false; + imxpriv->first_time = true; imxpriv->ahb_clk =devm_clk_get (dev,"ahb" );if (IS_ERR (imxpriv->ahb_clk)) {dev_err (dev,"can't get ahb clock.\n" );
Signature · 1 line
1.7.5.4
PATCH v3 1/1 ahci: imx: setup power saving methods
Hello,
drivers/ata/ahci_imx.c line 3
Quoted 5 lines · Richard Zhu
drivers/ata/ahci_imx.c +1
-1@@ -1,6 +1,6 @@/* +* copyright (c) 2013 Freescale Semiconductor, Inc. * Freescale IMX AHCI SATA platform driver -* Copyright 2013 Freescale Semiconductor, Inc.
Forgot to mention the above in the commit message?
drivers/ata/ahci_imx.c line 32
Quoted 2 lines
drivers/ata/ahci_imx.c +2
-0+static void ahci_imx_error_handler (struct ata_port *ap); +static void ahci_host_stop (struct ata_host *host);
Please put the ops definition below the function defs so that the above aren't necessary.
Quoted 5 lines
drivers/ata/ahci_imx.c +5
-0+static void ahci_imx_error_handler (struct ata_port *ap) +{ +u32 reg_val; +struct ata_device *dev; +struct ata_host *host =dev_get_drvdata (ap->dev);
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 82
Quoted 10 lines
drivers/ata/ahci_imx.c +10
-0+struct ahci_host_priv *hpriv = host->private_data; +void __iomem *mmio = hpriv->mmio; +struct imx_ahci_priv *imxpriv =dev_get_drvdata (ap->dev->parent); + +/* wrapper of the ahci_error_handler */ +if (!(ap->pflags &ATA_PFLAG_FROZEN )) { +/* restart engine */ +ahci_stop_engine (ap); +ahci_start_engine (ap); + }
Please export ahci_error_handler() and use that instead of duplicating this part.
Quoted 5 lines
drivers/ata/ahci_imx.c +5
-0+ +sata_pmp_error_handler (ap); + +if (!ata_dev_enabled (ap->link.device)) +ahci_stop_engine (ap);
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 97
Quoted 10 lines
drivers/ata/ahci_imx.c +10
-0+/* end of wrapper */ + +if (!(imxpriv->first_time) || ahci_imx_hotplug) +return ; + + imxpriv->first_time = false; + +ata_for_each_dev (dev, &ap->link,ENABLED ) +return ; +/* DISABLE LINK to save power consumption */
A bit more explanation would be nice. ie. briefly explain why it can't be part of usual LPM.
Quoted 13 lines
drivers/ata/ahci_imx.c +13
-0+ reg_val =readl (mmio +PORT_PHY_CTL ); +writel (reg_val |PORT_PHY_CTL_PDDQ_LOC , mmio +PORT_PHY_CTL ); +regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_MPLL_CLK_EN , + !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +clk_disable_unprepare (imxpriv->sata_ref_clk); + imxpriv->no_device = true; +} + +static void ahci_host_stop (struct ata_host *host) +{ +struct device *dev = host->dev; +struct ahci_platform_data *pdata =dev_get_platdata (dev);
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 120
Quoted 10 lines
drivers/ata/ahci_imx.c +10
-0+struct ahci_host_priv *hpriv = host->private_data; + +if (pdata && pdata->exit) + pdata->exit (dev); + +if (!IS_ERR (hpriv->clk)) { +clk_disable_unprepare (hpriv->clk); +clk_put (hpriv->clk); + } +}
Please do not duplicate functions like this. Why not export and inherit from ahci_platform_ops?
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 125
Quoted 5 lines
static int
imx6q_sata_init(struct device *dev, void __iomem *mmio){drivers/ata/ahci_imx.c +1
-1int ret =0 ; -unsigned int reg_val; +u32 reg_val;
Hah? Why is this chunk in this patch?
drivers/ata/ahci_imx.c static void imx6q_sata_exit(struct device *dev) · line 205
Quoted 5 lines
drivers/ata/ahci_imx.c +5
-0+static int imx_ahci_suspend (struct device *dev) +{ +struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); + +if (!(imxpriv->no_device)) {
Please lose the unnecessary parantheses.
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 105
Quoted 5 lines
drivers/ata/ahci_imx.c +5
-0+regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_MPLL_CLK_EN , + !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +clk_disable_unprepare (imxpriv->sata_ref_clk); + }
Some comment of what's going on would be nice.
Other than the above, looks good to me.
Thanks.
Signature · 1 line
tejun
PATCH v3 1/1 ahci: imx: setup power saving methods
Hi Tejun:
Thanks for your review comments.
Best Regards
Richard Zhu
-----Original Message-----
From: Tejun Heo [mailto:htejun at gmail.com] On Behalf Of Tejun Heo
Sent: Monday, October 14, 2013 4:17 AM
To: Richard Zhu
Cc: shawn.guo at linaro.org; linux-arm-kernel at lists.infradead.org; jgarzik at pobox.com; linux-ide at vger.kernel.org; Zhu Richard-R65037
Subject: Re: [v3] ahci: imx: setup power saving methods
Hello,
drivers/ata/ahci_imx.c line 3
Quoted 5 lines · Richard Zhu
drivers/ata/ahci_imx.c +1
-1@@ -1,6 +1,6 @@/* +* copyright (c) 2013 Freescale Semiconductor, Inc. * Freescale IMX AHCI SATA platform driver -* Copyright 2013 Freescale Semiconductor, Inc.
Forgot to mention the above in the commit message? [Richard] Ok, I would add change-note in the commit message.
Review line 5
Quoted 2 lines
(quoted diff) +2
-0+static void ahci_imx_error_handler(struct ata_port *ap); static void +ahci_host_stop(struct ata_host *host);
Please put the ops definition below the function defs so that the above aren't necessary. [Richard] Accept.
Quoted 4 lines
drivers/ata/ahci_imx.c +4
-0+static void ahci_imx_error_handler (struct ata_port *ap) { +u32 reg_val; +struct ata_device *dev; +struct ata_host *host =dev_get_drvdata (ap->dev);
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 82
Quoted 10 lines
drivers/ata/ahci_imx.c +10
-0+struct ahci_host_priv *hpriv = host->private_data; +void __iomem *mmio = hpriv->mmio; +struct imx_ahci_priv *imxpriv =dev_get_drvdata (ap->dev->parent); + +/* wrapper of the ahci_error_handler */ +if (!(ap->pflags &ATA_PFLAG_FROZEN )) { +/* restart engine */ +ahci_stop_engine (ap); +ahci_start_engine (ap); + }
Please export ahci_error_handler() and use that instead of duplicating this part. [Richard] Ok, accept.
Quoted 5 lines
drivers/ata/ahci_imx.c +5
-0+ +sata_pmp_error_handler (ap); + +if (!ata_dev_enabled (ap->link.device)) +ahci_stop_engine (ap);
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 97
Quoted 10 lines
drivers/ata/ahci_imx.c +10
-0+/* end of wrapper */ + +if (!(imxpriv->first_time) || ahci_imx_hotplug) +return ; + + imxpriv->first_time = false; + +ata_for_each_dev (dev, &ap->link,ENABLED ) +return ; +/* DISABLE LINK to save power consumption */
A bit more explanation would be nice. ie. briefly explain why it can't be part of usual LPM. [Richard] no problem, I would add the explanation later. Thanks.
Quoted 12 lines
drivers/ata/ahci_imx.c +12
-0+ reg_val =readl (mmio +PORT_PHY_CTL ); +writel (reg_val |PORT_PHY_CTL_PDDQ_LOC , mmio +PORT_PHY_CTL ); +regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_MPLL_CLK_EN , + !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +clk_disable_unprepare (imxpriv->sata_ref_clk); + imxpriv->no_device = true; +} + +static void ahci_host_stop (struct ata_host *host) { +struct device *dev = host->dev; +struct ahci_platform_data *pdata =dev_get_platdata (dev);
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 120
Quoted 10 lines
drivers/ata/ahci_imx.c +10
-0+struct ahci_host_priv *hpriv = host->private_data; + +if (pdata && pdata->exit) + pdata->exit (dev); + +if (!IS_ERR (hpriv->clk)) { +clk_disable_unprepare (hpriv->clk); +clk_put (hpriv->clk); + } +}
Please do not duplicate functions like this. Why not export and inherit from ahci_platform_ops? [Richard] Ok, I would export and inherit from ahci_platform_ops.
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 125
Quoted 4 lines
static int
imx6q_sata_init(struct device *dev, void __iomem *mmio){drivers/ata/ahci_imx.c +1
-1int ret =0 ; -unsigned int reg_val; +u32 reg_val;
Hah? Why is this chunk in this patch?
[Richard] Would be removed later. Thanks.
drivers/ata/ahci_imx.c static void imx6q_sata_exit(struct device *dev) · line 205
Quoted 4 lines
drivers/ata/ahci_imx.c +4
-0+static int imx_ahci_suspend (struct device *dev) { +struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); + +if (!(imxpriv->no_device)) {
Please lose the unnecessary parantheses.
[Richard] Would be removed later. Thanks.
drivers/ata/ahci_imx.c struct imx_ahci_priv { · line 105
Quoted 5 lines
drivers/ata/ahci_imx.c +5
-0+regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_MPLL_CLK_EN , + !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +clk_disable_unprepare (imxpriv->sata_ref_clk); + }
Some comment of what's going on would be nice.
Other than the above, looks good to me.
[Richard] Ok, no problem, comments would be added in next version. Thanks again. :).
Thanks.
--
tejun