ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN
Subsystems (2)
PATCH v3 1/3 ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN
We must clear this IMX6Q_GPR13_SATA_MPLL_CLK_EN bit on i.MX6Q, otherwise Linux will fail to find the attached drive on some boards.
This entire fix was:
--- drivers/ata/ahci_imx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
V2: Update the value in the comment from 0x7ffffffd to 0x7ffffffe
V3: Update the value in the comment from 0x7ffffffe to 0x7fffffff
drivers/ata/ahci_imx.c +2 -1
@@ -113,7 +113,7 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio)/* * set PHY Paremeters, two steps to configure the GPR13, * one write for rest of parameters, mask of first write -* is 0x07fffffd, and the other one write for setting +* is 0x07ffffff, and the other one write for setting * the mpll_clk_en. */ regmap_update_bits(imxpriv->gpr, 0x34, IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK
@@ -124,6 +124,7 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio) | IMX6Q_GPR13_SATA_TX_ATTEN_MASK |IMX6Q_GPR13_SATA_TX_BOOST_MASK |IMX6Q_GPR13_SATA_TX_LVL_MASK + |IMX6Q_GPR13_SATA_MPLL_CLK_EN |IMX6Q_GPR13_SATA_TX_EDGE_RATE ,IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB |IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M
Signature · 1 line
1.8.4.3
PATCH v6 2/3 ahci: imx: Pull out the clock enable/disable calls
The same code for enabling and disabling SATA clock was found in multiple places in the driver. Implement functions that enable/disable the SATA clock and use them in such places instead of duplicating the code.
--- drivers/ata/ahci_imx.c | 143 ++++++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 68 deletions(-)
V2: Move the OR sign from the begining of the line to the end of the line in
the regmap_update_bits() call.
V3: Move the PHY configuration programming out of the clock_enable function
and into the probe() function.
V4: Rebase on top of new 1/6 patch.
Remove clk_prepare_enable() being called twice in imx_sata_clock_enable() since it was a rebase artifact.
V5: Pull out the usleep_range() into imx_sata_clock_enable() as well as a small
delay is needed after turning on the clock. Also rebase this on top of the change in comment in 1/6 .
V6: Rebase this on top of the change in comment in 1/3 .
drivers/ata/ahci_imx.c +75 -68
@@ -47,6 +47,36 @@ 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 int imx_sata_clock_enable (struct device *dev) +{ +struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); +int ret; + + ret =clk_prepare_enable (imxpriv->sata_ref_clk); +if (ret <0 ) { +dev_err (dev,"prepare-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 void imx_sata_clock_disable (struct device *dev) +{ +struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); + +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); +} +static void ahci_imx_error_handler (struct ata_port *ap) {u32 reg_val;
@@ -72,10 +102,7 @@ static void ahci_imx_error_handler(struct ata_port *ap)*/ 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); +imx_sata_clock_disable (ap->dev); imxpriv->no_device = true; }
@@ -97,46 +124,9 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio)unsigned int reg_val;struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); - imxpriv->gpr = -syscon_regmap_lookup_by_compatible ("fsl,imx6q-iomuxc-gpr" ); -if (IS_ERR (imxpriv->gpr)) { -dev_err (dev,"failed to find fsl,imx6q-iomux-gpr regmap\n" ); -return PTR_ERR (imxpriv->gpr); - } - - ret =clk_prepare_enable (imxpriv->sata_ref_clk); -if (ret <0 ) { -dev_err (dev,"prepare-enable sata_ref clock err:%d\n" , ret); + ret =imx_sata_clock_enable (dev); +if (ret <0 )return ret; - } - -/* -* set PHY Paremeters, two steps to configure the GPR13, -* one write for rest of parameters, mask of first write -* is 0x07ffffff, and the other one write for setting -* the mpll_clk_en. -*/ -regmap_update_bits (imxpriv->gpr,0x34 ,IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK - |IMX6Q_GPR13_SATA_RX_LOS_LVL_MASK - |IMX6Q_GPR13_SATA_RX_DPLL_MODE_MASK - |IMX6Q_GPR13_SATA_SPD_MODE_MASK - |IMX6Q_GPR13_SATA_MPLL_SS_EN - |IMX6Q_GPR13_SATA_TX_ATTEN_MASK - |IMX6Q_GPR13_SATA_TX_BOOST_MASK - |IMX6Q_GPR13_SATA_TX_LVL_MASK - |IMX6Q_GPR13_SATA_MPLL_CLK_EN - |IMX6Q_GPR13_SATA_TX_EDGE_RATE - ,IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB - |IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M - |IMX6Q_GPR13_SATA_RX_DPLL_MODE_2P_4F - |IMX6Q_GPR13_SATA_SPD_MODE_3P0G - |IMX6Q_GPR13_SATA_MPLL_SS_EN - |IMX6Q_GPR13_SATA_TX_ATTEN_9_16 - |IMX6Q_GPR13_SATA_TX_BOOST_3_33_DB - |IMX6Q_GPR13_SATA_TX_LVL_1_025_V ); -regmap_update_bits (imxpriv->gpr,0x34 ,IMX6Q_GPR13_SATA_MPLL_CLK_EN , -IMX6Q_GPR13_SATA_MPLL_CLK_EN ); -usleep_range (100 ,200 );/* * Configure the HWINIT bits of the HOST_CAP and HOST_PORTS_IMPL,
@@ -164,11 +154,7 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio)static void imx6q_sata_exit (struct device *dev) { -struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); - -regmap_update_bits (imxpriv->gpr,0x34 ,IMX6Q_GPR13_SATA_MPLL_CLK_EN , - !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); -clk_disable_unprepare (imxpriv->sata_ref_clk); +imx_sata_clock_disable (dev); }static int imx_ahci_suspend (struct device *dev)
@@ -179,12 +165,8 @@ static int imx_ahci_suspend(struct device *dev)* If no_device is set, The CLKs had been gated off in the * initialization so don't do it again here. */ -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); - } +if (!imxpriv->no_device) +imx_sata_clock_disable (dev);return 0 ; }
@@ -192,22 +174,12 @@ static int imx_ahci_suspend(struct device *dev)static int imx_ahci_resume (struct device *dev) {struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); -int ret; +int ret =0 ; -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 ); - } +if (!imxpriv->no_device) + ret =imx_sata_clock_enable (dev); -return 0 ; +return ret; }static struct ahci_platform_data imx6q_sata_pdata = {
@@ -290,6 +262,41 @@ static int imx_ahci_probe(struct platform_device *pdev) ahci_dev->dma_mask = &ahci_dev->coherent_dma_mask; ahci_dev->of_node = dev->of_node; + imxpriv->gpr = +syscon_regmap_lookup_by_compatible ("fsl,imx6q-iomuxc-gpr" ); + +if (IS_ERR (imxpriv->gpr)) { +dev_err (dev,"failed to find fsl,imx6q-iomux-gpr regmap\n" ); + ret =PTR_ERR (imxpriv->gpr); + goto err_out; + } + +/* +* Set PHY Paremeters, two steps to configure the GPR13, +* one write for rest of parameters, mask of first write +* is 0x07ffffff, and the other one write for setting +* the mpll_clk_en happens in imx_sata_clock_enable(). +*/ +regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK | +IMX6Q_GPR13_SATA_RX_LOS_LVL_MASK | +IMX6Q_GPR13_SATA_RX_DPLL_MODE_MASK | +IMX6Q_GPR13_SATA_SPD_MODE_MASK | +IMX6Q_GPR13_SATA_MPLL_SS_EN | +IMX6Q_GPR13_SATA_TX_ATTEN_MASK | +IMX6Q_GPR13_SATA_TX_BOOST_MASK | +IMX6Q_GPR13_SATA_TX_LVL_MASK | +IMX6Q_GPR13_SATA_MPLL_CLK_EN | +IMX6Q_GPR13_SATA_TX_EDGE_RATE , +IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB | +IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M | +IMX6Q_GPR13_SATA_RX_DPLL_MODE_2P_4F | +IMX6Q_GPR13_SATA_SPD_MODE_3P0G | +IMX6Q_GPR13_SATA_MPLL_SS_EN | +IMX6Q_GPR13_SATA_TX_ATTEN_9_16 | +IMX6Q_GPR13_SATA_TX_BOOST_3_33_DB | +IMX6Q_GPR13_SATA_TX_LVL_1_025_V ); + ret =platform_device_add_resources (ahci_pdev, res,2 );if (ret) goto err_out;
Signature · 1 line
1.8.4.3
PATCH v6 2/3 ahci: imx: Pull out the clock enable/disable calls
Quoted 9 lines · Marek Vasut
The same code for enabling and disabling SATA clock was found in multiple places in the driver. Implement functions that enable/disable the SATA clock and use them in such places instead of duplicating the code.
Signed-off-by Marek Vasut <[email protected]>Cc Shawn Guo <[email protected]>Cc Richard Zhu <[email protected]>Cc Tejun Heo <[email protected]>Cc Linux-IDE <[email protected]>
Applied 2-3 to libata/for-3.14.
Thanks.
Signature · 1 line
tejun
PATCH v6 3/3 ahci: imx: Add i.MX53 support
In reply to Marek VasutAdd minor adjustments to support i.MX53 SATA port as well as i.MX6Q one. The difference here is mostly the clock which need to be enabled and also the lack of need of programming IOMUXC registers on i.MX53. All of which is well handles in the clock enable/disable functions. Note that this patch also cleans up the names of the common functions, so they don't read imx6q_* but imx_* instead.
--- drivers/ata/ahci_imx.c | 180 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 122 insertions(+), 58 deletions(-)
V2: Rebase this patch to be coherent with formating change in 1/5 .
V3: Rebase this patch to be coherent with change in 1/5 .
V4: Use sata_ref_clk for both MX53 and MX6 instead of separate sata_phy_clk
for MX53.
V5: Rebase on top of changes in 1/6 and 2/6 . Note that I am keeping the small
delay after enabling clock on MX53 as well.
V6: Rebase on top of changes in 1/3 and 2/3 . Also, this is important, add
softreset hook for the i.MX53 implemented by the ahci_imx_softreset() function. For MX6, This function invokes the regular AHCI softreset function, but for MX53 a function which retries the softreset is invoked. The reset hook is needed, otherwise I observe some drives are not detected at all.
drivers/ata/ahci_imx.c +122 -58
@@ -34,10 +34,21 @@ enum { HOST_TIMER1MS = 0xe0, /* Timer 1-ms */ }; +enum ahci_imx_type { +AHCI_IMX53 , +AHCI_IMX6Q , +}; +struct imx_ahci_priv {struct platform_device *ahci_pdev; +enum ahci_imx_type type; + +/* i.MX53 clock */ +struct clk *sata_gate_clk; +/* Common clock */ struct clk *sata_ref_clk;struct clk *ahb_clk; +struct regmap *gpr;bool no_device;bool first_time;
@@ -52,29 +63,52 @@ static int imx_sata_clock_enable(struct device *dev)struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent);int ret; +if (imxpriv->type ==AHCI_IMX53 ) { + ret =clk_prepare_enable (imxpriv->sata_gate_clk); +if (ret <0 ) { +dev_err (dev,"prepare-enable sata_gate clock err:%d\n" , + ret); +return ret; + } + } + ret =clk_prepare_enable (imxpriv->sata_ref_clk);if (ret <0 ) { -dev_err (dev,"prepare-enable sata_ref clock err:%d\n" , ret); -return ret; +dev_err (dev,"prepare-enable sata_ref clock err:%d\n" , + ret); + goto clk_err; } -regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , -IMX6Q_GPR13_SATA_MPLL_CLK_EN , -IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +if (imxpriv->type ==AHCI_IMX6Q ) { +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 ; + +clk_err: +if (imxpriv->type ==AHCI_IMX53 ) +clk_disable_unprepare (imxpriv->sata_gate_clk); +return ret; }static void imx_sata_clock_disable (struct device *dev) {struct imx_ahci_priv *imxpriv =dev_get_drvdata (dev->parent); -regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , -IMX6Q_GPR13_SATA_MPLL_CLK_EN , - !IMX6Q_GPR13_SATA_MPLL_CLK_EN ); +if (imxpriv->type ==AHCI_IMX6Q ) { +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); + +if (imxpriv->type ==AHCI_IMX53 ) +clk_disable_unprepare (imxpriv->sata_gate_clk); }static void ahci_imx_error_handler (struct ata_port *ap)
@@ -106,9 +140,25 @@ static void ahci_imx_error_handler(struct ata_port *ap) imxpriv->no_device = true; } +int ahci_imx_softreset (struct ata_link *link,unsigned int *class, +unsigned long deadline) +{ +struct ata_port *ap = link->ap; +struct imx_ahci_priv *imxpriv =dev_get_drvdata (ap->dev->parent); +int ret = -EIO ; + +if (imxpriv->type ==AHCI_IMX53 ) + ret = ahci_pmp_retry_srst_ops.softreset (link, class, deadline); +else if (imxpriv->type ==AHCI_IMX6Q ) + ret = ahci_ops.softreset (link, class, deadline); + +return ret; +} +static struct ata_port_operations ahci_imx_ops = { .inherits = &ahci_platform_ops, .error_handler = ahci_imx_error_handler, + .softreset = ahci_imx_softreset, };static const struct ata_port_info ahci_imx_port_info = {
@@ -118,7 +168,7 @@ static const struct ata_port_info ahci_imx_port_info = { .port_ops = &ahci_imx_ops, }; -static int imx6q_sata_init (struct device *dev,void __iomem *mmio) +static int imx_sata_init (struct device *dev,void __iomem *mmio) {int ret =0 ;unsigned int reg_val;
@@ -152,7 +202,7 @@ static int imx6q_sata_init(struct device *dev, void __iomem *mmio)return 0 ; } -static void imx6q_sata_exit (struct device *dev) +static void imx_sata_exit (struct device *dev) {imx_sata_clock_disable (dev); }
@@ -182,16 +232,18 @@ static int imx_ahci_resume(struct device *dev)return ret; } -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 struct ahci_platform_data imx_sata_pdata = { + .init = imx_sata_init, + .exit = imx_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[] = { - { .compatible ="fsl,imx6q-ahci" , .data = &imx6q_sata_pdata}, + { .compatible ="fsl,imx53-ahci" , .data = (void *)AHCI_IMX53 }, + { .compatible ="fsl,imx6q-ahci" , .data = (void *)AHCI_IMX6Q }, {}, };MODULE_DEVICE_TABLE (of, imx_ahci_of_match);
@@ -201,12 +253,20 @@ static int imx_ahci_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct resource *mem, *irq, res[2 ];const struct of_device_id *of_id; +enum ahci_imx_type type;const struct ahci_platform_data *pdata =NULL ;struct imx_ahci_priv *imxpriv;struct device *ahci_dev;struct platform_device *ahci_pdev;int ret; + of_id =of_match_device (imx_ahci_of_match, dev); +if (!of_id) +return -EINVAL ; + + type = (enum ahci_imx_type )of_id->data; + pdata = &imx_sata_pdata; + imxpriv =devm_kzalloc (dev,sizeof (*imxpriv),GFP_KERNEL );if (!imxpriv) {dev_err (dev,"can't alloc ahci_host_priv\n" );
@@ -222,6 +282,8 @@ static int imx_ahci_probe(struct platform_device *pdev) imxpriv->no_device = false; imxpriv->first_time = true; + imxpriv->type = type; + imxpriv->ahb_clk =devm_clk_get (dev,"ahb" );if (IS_ERR (imxpriv->ahb_clk)) {dev_err (dev,"can't get ahb clock.\n" );
@@ -229,6 +291,15 @@ static int imx_ahci_probe(struct platform_device *pdev) goto err_out; } +if (type ==AHCI_IMX53 ) { + imxpriv->sata_gate_clk =devm_clk_get (dev,"sata_gate" ); +if (IS_ERR (imxpriv->sata_gate_clk)) { +dev_err (dev,"can't get sata_gate clock.\n" ); + ret =PTR_ERR (imxpriv->sata_gate_clk); + goto err_out; + } + } + imxpriv->sata_ref_clk =devm_clk_get (dev,"sata_ref" );if (IS_ERR (imxpriv->sata_ref_clk)) {dev_err (dev,"can't get sata_ref clock.\n" );
@@ -239,14 +310,6 @@ static int imx_ahci_probe(struct platform_device *pdev) imxpriv->ahci_pdev = ahci_pdev;platform_set_drvdata (pdev, imxpriv); - of_id =of_match_device (imx_ahci_of_match, dev); -if (of_id) { - pdata = of_id->data; - }else { - ret = -EINVAL ; - goto err_out; - } - mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); irq =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (!mem || !irq) {
@@ -262,41 +325,42 @@ static int imx_ahci_probe(struct platform_device *pdev) ahci_dev->dma_mask = &ahci_dev->coherent_dma_mask; ahci_dev->of_node = dev->of_node; - imxpriv->gpr = -syscon_regmap_lookup_by_compatible ("fsl,imx6q-iomuxc-gpr" ); - -if (IS_ERR (imxpriv->gpr)) { -dev_err (dev,"failed to find fsl,imx6q-iomux-gpr regmap\n" ); - ret =PTR_ERR (imxpriv->gpr); - goto err_out; +if (type ==AHCI_IMX6Q ) { + imxpriv->gpr =syscon_regmap_lookup_by_compatible ( +"fsl,imx6q-iomuxc-gpr" ); +if (IS_ERR (imxpriv->gpr)) { +dev_err (dev, +"failed to find fsl,imx6q-iomux-gpr regmap\n" ); +return PTR_ERR (imxpriv->gpr); + } + +/* +* Set PHY Paremeters, two steps to configure the GPR13, +* one write for rest of parameters, mask of first write +* is 0x07fffffe, and the other one write for setting +* the mpll_clk_en happens in imx_sata_clock_enable(). +*/ +regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , +IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK | +IMX6Q_GPR13_SATA_RX_LOS_LVL_MASK | +IMX6Q_GPR13_SATA_RX_DPLL_MODE_MASK | +IMX6Q_GPR13_SATA_SPD_MODE_MASK | +IMX6Q_GPR13_SATA_MPLL_SS_EN | +IMX6Q_GPR13_SATA_TX_ATTEN_MASK | +IMX6Q_GPR13_SATA_TX_BOOST_MASK | +IMX6Q_GPR13_SATA_TX_LVL_MASK | +IMX6Q_GPR13_SATA_MPLL_CLK_EN | +IMX6Q_GPR13_SATA_TX_EDGE_RATE , +IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB | +IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M | +IMX6Q_GPR13_SATA_RX_DPLL_MODE_2P_4F | +IMX6Q_GPR13_SATA_SPD_MODE_3P0G | +IMX6Q_GPR13_SATA_MPLL_SS_EN | +IMX6Q_GPR13_SATA_TX_ATTEN_9_16 | +IMX6Q_GPR13_SATA_TX_BOOST_3_33_DB | +IMX6Q_GPR13_SATA_TX_LVL_1_025_V ); } -/* -* Set PHY Paremeters, two steps to configure the GPR13, -* one write for rest of parameters, mask of first write -* is 0x07ffffff, and the other one write for setting -* the mpll_clk_en happens in imx_sata_clock_enable(). -*/ -regmap_update_bits (imxpriv->gpr,IOMUXC_GPR13 , -IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK | -IMX6Q_GPR13_SATA_RX_LOS_LVL_MASK | -IMX6Q_GPR13_SATA_RX_DPLL_MODE_MASK | -IMX6Q_GPR13_SATA_SPD_MODE_MASK | -IMX6Q_GPR13_SATA_MPLL_SS_EN | -IMX6Q_GPR13_SATA_TX_ATTEN_MASK | -IMX6Q_GPR13_SATA_TX_BOOST_MASK | -IMX6Q_GPR13_SATA_TX_LVL_MASK | -IMX6Q_GPR13_SATA_MPLL_CLK_EN | -IMX6Q_GPR13_SATA_TX_EDGE_RATE , -IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB | -IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M | -IMX6Q_GPR13_SATA_RX_DPLL_MODE_2P_4F | -IMX6Q_GPR13_SATA_SPD_MODE_3P0G | -IMX6Q_GPR13_SATA_MPLL_SS_EN | -IMX6Q_GPR13_SATA_TX_ATTEN_9_16 | -IMX6Q_GPR13_SATA_TX_BOOST_3_33_DB | -IMX6Q_GPR13_SATA_TX_LVL_1_025_V ); - ret =platform_device_add_resources (ahci_pdev, res,2 );if (ret) goto err_out;
Signature · 1 line
1.8.4.3
Sascha Hauer
maintainerPATCH v6 3/3 ahci: imx: Add i.MX53 support
Marek,
Quoted 34 lines · Marek Vasut
Add minor adjustments to support i.MX53 SATA port as well as i.MX6Q one. The difference here is mostly the clock which need to be enabled and also the lack of need of programming IOMUXC registers on i.MX53. All of which is well handles in the clock enable/disable functions. Note that this patch also cleans up the names of the common functions, so they don't read imx6q_* but imx_* instead.
Signed-off-by Marek Vasut <[email protected]>Cc Shawn Guo <[email protected]>Cc Richard Zhu <[email protected]>Cc Tejun Heo <[email protected]>Cc Linux-IDE <[email protected]>--- drivers/ata/ahci_imx.c | 180 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 122 insertions(+), 58 deletions(-)V2: Rebase this patch to be coherent with formating change in 1/5 .
V3: Rebase this patch to be coherent with change in 1/5 .
V4: Usesata_ref_clkfor both MX53 and MX6 instead of separatesata_phy_clkfor MX53.V5: Rebase on top of changes in 1/6 and 2/6 . Note that I am keeping the small
delay after enabling clock on MX53 as well.
V6: Rebase on top of changes in 1/3 and 2/3 . Also, this is important, add
softreset hook for the i.MX53 implemented by theahci_imx_softreset()function. For MX6, This function invokes the regular AHCI softreset function, but for MX53 a function which retries the softreset is invoked. The reset hook is needed, otherwise I observe some drives are not detected at all.drivers/ata/ahci_imx.c +0
-0
drivers/ata/ahci_imx.c enum { · line 40
Quoted 7 lines
drivers/ata/ahci_imx.c +4
-0@@ -34,10 +34,21 @@ enum { HOST_TIMER1MS = 0xe0, /* Timer 1-ms */ }; +enum ahci_imx_type { +AHCI_IMX53 , +AHCI_IMX6Q , +};
Please next time introduce a SoC specific struct to encode the differences between SoCs. This way you can abstract away the differences in flags and function callbacks and don't end up with functions which do completely different things for different SoCs like currently in imx_sata_clock_enable(). The if (type == SOC_XY) style doesn't scale in many drivers anymore.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH v6 3/3 ahci: imx: Add i.MX53 support
Quoted 4 lines · Sascha Hauer
Quoted 4 lines
drivers/ata/ahci_imx.c +0
-0@@ -34,10 +34,21 @@ enum { HOST_TIMER1MS = 0xe0, /* Timer 1-ms */ };
Quoted 11 lines
drivers/ata/ahci_imx.c enum { · line 40
Quoted 4 lines
drivers/ata/ahci_imx.c +4
-0+enum ahci_imx_type { +AHCI_IMX53 , +AHCI_IMX6Q , +};Please next time introduce a SoC specific struct to encode the differences between SoCs. This way you can abstract away the differences in flags and function callbacks and don't end up with functions which do completely different things for different SoCs like currently in
imx_sata_clock_enable(). The if (type ==SOC_XY) style doesn't scale in many drivers anymore.
Yea, I was thinking about the same thing when reviewing the patch in the first time, but decided to not comment on that because currently the added functions are doing the similar/related thing. But I agree that SoC specific structure should be some thing more scalable and we should go for in the future.
Shawn
PATCH v6 3/3 ahci: imx: Add i.MX53 support
Quoted 19 lines · Shawn Guo
Quoted 6 lines · Sascha Hauer
Quoted 6 lines
(quoted diff) +0
-0@@ -34,10 +34,21 @@ enum { HOST_TIMER1MS = 0xe0, /* Timer 1-ms */ };Quoted 11 lines
drivers/ata/ahci_imx.c enum { · line 40
Quoted 4 lines
drivers/ata/ahci_imx.c +4
-0+enum ahci_imx_type { +AHCI_IMX53 , +AHCI_IMX6Q , +};Please next time introduce a SoC specific struct to encode the differences between SoCs. This way you can abstract away the differences in flags and function callbacks and don't end up with functions which do completely different things for different SoCs like currently in
imx_sata_clock_enable(). The if (type ==SOC_XY) style doesn't scale in many drivers anymore.
Quoted 5 lines
Yea, I was thinking about the same thing when reviewing the patch in the first time, but decided to not comment on that because currently the added functions are doing the similar/related thing. But I agree that SoC specific structure should be some thing more scalable and we should go for in the future.
Full ACK on this one, yes. Thus far, the chips are similar so that the ID is enough, once we get some more exotic chip, this should be changed to a structure. I guess the IOMUX register layout might be different on the MX7 at least for example ?
Best regards,
Marek Vasut
PATCH v3 1/3 ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN
In reply to Marek VasutQuoted 11 lines · Marek Vasut
We must clear this
IMX6Q_GPR13_SATA_MPLL_CLK_ENbit on i.MX6Q, otherwise Linux will fail to find the attached drive on some boards.This entire fix was:
Reported-by Eric Nelson <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Shawn Guo <[email protected]>Cc Richard Zhu <[email protected]>Cc Tejun Heo <[email protected]>Cc Linux-IDE <[email protected]>
There have been a lot of review activities on this series. If you guys more or less agree now, can you please reply with acked/reviewed-by's?
Thanks.
Signature · 1 line
tejun
PATCH v3 1/3 ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN
Quoted 13 lines · Tejun Heo
Quoted 11 lines · Marek Vasut
We must clear this
IMX6Q_GPR13_SATA_MPLL_CLK_ENbit on i.MX6Q, otherwise Linux will fail to find the attached drive on some boards.This entire fix was:
Reported-by Eric Nelson <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Shawn Guo <[email protected]>Cc Richard Zhu <[email protected]>Cc Tejun Heo <[email protected]>Cc Linux-IDE <[email protected]>
Quoted 3 lines
There have been a lot of review activities on this series. If you guys more or less agree now, can you please reply with acked/reviewed-by's?
For the series,
Tejun Heo
AppliedPATCH v3 1/3 ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN
In reply to Marek VasutQuoted 11 lines · Marek Vasut
We must clear this
IMX6Q_GPR13_SATA_MPLL_CLK_ENbit on i.MX6Q, otherwise Linux will fail to find the attached drive on some boards.This entire fix was:
Reported-by Eric Nelson <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Shawn Guo <[email protected]>Cc Richard Zhu <[email protected]>Cc Tejun Heo <[email protected]>Cc Linux-IDE <[email protected]>
Applied to libata/for-3.13-fixes w/ stable cc'd.
Thanks.
Signature · 1 line
tejun
PATCH v3 1/3 ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN
Dear Tejun Heo,
Quoted 7 lines · Marek Vasut
Quoted 6 lines
We must clear this
IMX6Q_GPR13_SATA_MPLL_CLK_ENbit on i.MX6Q, otherwise Linux will fail to find the attached drive on some boards.This entire fix was:
Reported-by Eric Nelson <[email protected]>
Quoted 7 lines
Quoted 5 lines
Signed-off-by Marek Vasut <[email protected]>Cc Shawn Guo <[email protected]>Cc Richard Zhu <[email protected]>Cc Tejun Heo <[email protected]>Cc Linux-IDE <[email protected]>Applied to libata/for-3.13-fixes w/ stable cc'd.
Thank you!
Best regards,
Marek Vasut