ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver
Subsystems (9)
v6 cover ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver
Hi all,
Here is v6 of my patchset for adding ahci-sunxi support. This has been tested with Allwinner A10, Allwinner A20 and Freeware imx6x SoCs, including suspend / resume. Note that since my last revision the ahci_imx driver has also grown imx53 sata support, it would be good if some-one could test that with this series.
History:
v1, by Olliver Schinagl:
This was using the approach of having a platform device which probe method creates a new child platform device which gets driven by ahci_platform.c, as done by ahci_imx.c .
v2, by Hans de Goede:
Stand-alone platform driver based on Olliver's work
v3, by Hans de Goede:
patch-series, with 4 different parts
a) Make ahci_platform.c more generic, handle more then 1 clk, target pwr regulator
b) New ahci-sunxi code only populating ahci_platform_data, passed to ahci_platform.c to of_device_id matching.
c) Refactor ahci-imx code to work the same as the new ahci-sunxi code, this is the reason why v3 is an RFC, I'm waiting for the wandboard I ordered to arrive so that I can actually test this.
d) dts bindings for the sunxi ahci parts
v4, by Hans de Goede:
patch-series, with 5 different parts:
a) Make ahci_platform.c more generic, handle more then 1 clk, target pwr regulator
b) Turn parts of ahci_platform.c into a library for use by other drivers
c) New ahci-sunxi driver using the ahci_platform.c library functionality
d) Refactor ahci-imx code to work the same as the new ahci-sunxi code
e) dts bindings for the sunxi ahci parts
v5:
v4 + the following changes:
1) fsl,imx6q driver is now tested
2) fixed suspend / resume on fsl,imx6q
3) Modifed devicetree node naming to match dt spec
4) Reworked the busy waiting code in the sunxi-phy handling as suggested by Russell King
v6:
v5 rebased on top of 3.14-rc3 + the following changes
1) Added Roger Quadros' generic phy support series
2) Added a "ARM: sun4i: dt: Remove grouping + simple-bus for regulators" dts patch
Tejun, can you please add patches 1-15 to your ata tree for 3.15 ?
Maxime, can you please add patch 16-18 to your dts tree for 3.15 ?
Thanks & Regards,
Hans
PATCH v6 1/18 libahci: Allow drivers to override start_engine
Allwinner A10 and A20 ARM SoCs have an AHCI sata controller which needs a special register to be poked before starting the DMA engine.
This register gets reset on an ahci_stop_engine call, so there is no other place then ahci_start_engine where this poking can be done.
This commit allows drivers to override ahci_start_engine behavior for use by the Allwinner AHCI driver (and potentially other drivers in the future).
--- drivers/ata/ahci.c | 6 ++++-- drivers/ata/ahci.h | 3 ++- drivers/ata/libahci.c | 27 ++++++++++++++++++--------- drivers/ata/sata_highbank.c | 3 ++- 4 files changed, 26 insertions(+), 13 deletions(-)
drivers/ata/ahci.c +4 -2
@@ -564,6 +564,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline) {struct ata_port *ap = link->ap; +struct ahci_host_priv *hpriv = ap->host->private_data;bool online;int rc;
@@ -574,7 +575,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, rc =sata_link_hardreset (link,sata_ehc_deb_timing (&link->eh_context), deadline, &online,NULL ); -ahci_start_engine (ap); + hpriv->start_engine (ap);DPRINTK ("EXIT, rc=%d, class=%u\n" , rc, *class);
@@ -589,6 +590,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, {struct ata_port *ap = link->ap;struct ahci_port_priv *pp = ap->private_data; +struct ahci_host_priv *hpriv = ap->host->private_data;u8 *d2h_fis = pp->rx_fis +RX_FIS_D2H_REG ;struct ata_taskfile tf;bool online;
@@ -604,7 +606,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, rc =sata_link_hardreset (link,sata_ehc_deb_timing (&link->eh_context), deadline, &online,NULL ); -ahci_start_engine (ap); + hpriv->start_engine (ap);/* The pseudo configuration device on SIMG4726 attached to * ASUS P5W-DH Deluxe doesn't send signature FIS after
drivers/ata/ahci.h +2 -1
@@ -323,6 +323,8 @@ struct ahci_host_priv {u32 em_msg_type;/* EM message type */ struct clk *clk;/* Only for platforms supporting clk */ void *plat_data;/* Other platform data */ +/* Optional ahci_start_engine override */ +void (*start_engine)(struct ata_port *ap); };extern int ahci_ignore_sss;
@@ -357,7 +359,6 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, int (*check_ready)(struct ata_link *link));int ahci_stop_engine (struct ata_port *ap); -void ahci_start_engine (struct ata_port *ap);int ahci_check_ready (struct ata_link *link);int ahci_kick_engine (struct ata_port *ap);int ahci_port_resume (struct ata_port *ap);
drivers/ata/libahci.c +18 -9
@@ -69,6 +69,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,static int ahci_scr_read (struct ata_link *link,unsigned int sc_reg,u32 *val);static int ahci_scr_write (struct ata_link *link,unsigned int sc_reg,u32 val); +static void ahci_start_engine (struct ata_port *ap);static unsigned int ahci_qc_issue (struct ata_queued_cmd *qc);static bool ahci_qc_fill_rtf (struct ata_queued_cmd *qc);static int ahci_port_start (struct ata_port *ap);
@@ -500,6 +501,9 @@ void ahci_save_initial_config(struct device *dev, hpriv->cap = cap; hpriv->cap2 = cap2; hpriv->port_map = port_map; + +if (!hpriv->start_engine) + hpriv->start_engine = ahci_start_engine; }EXPORT_SYMBOL_GPL (ahci_save_initial_config);
@@ -565,7 +569,7 @@ static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)return -EINVAL ; } -void ahci_start_engine (struct ata_port *ap) +static void ahci_start_engine (struct ata_port *ap) {void __iomem *port_mmio =ahci_port_base (ap);u32 tmp;
@@ -576,7 +580,6 @@ void ahci_start_engine(struct ata_port *ap)writel (tmp, port_mmio +PORT_CMD );readl (port_mmio +PORT_CMD );/* flush */ } -EXPORT_SYMBOL_GPL (ahci_start_engine);int ahci_stop_engine (struct ata_port *ap) {
@@ -766,7 +769,7 @@ static void ahci_start_port(struct ata_port *ap)/* enable DMA */ if (!(hpriv->flags &AHCI_HFLAG_DELAY_ENGINE )) -ahci_start_engine (ap); + hpriv->start_engine (ap);/* turn on LEDs */ if (ap->flags &ATA_FLAG_EM ) {
@@ -1234,7 +1237,7 @@ int ahci_kick_engine(struct ata_port *ap)/* restart engine */ out_restart: -ahci_start_engine (ap); + hpriv->start_engine (ap);return rc; }EXPORT_SYMBOL_GPL (ahci_kick_engine);
@@ -1426,6 +1429,7 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class,const unsigned long *timing =sata_ehc_deb_timing (&link->eh_context);struct ata_port *ap = link->ap;struct ahci_port_priv *pp = ap->private_data; +struct ahci_host_priv *hpriv = ap->host->private_data;u8 *d2h_fis = pp->rx_fis +RX_FIS_D2H_REG ;struct ata_taskfile tf;bool online;
@@ -1443,7 +1447,7 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, rc =sata_link_hardreset (link, timing, deadline, &online, ahci_check_ready); -ahci_start_engine (ap); + hpriv->start_engine (ap);if (online) *class =ahci_dev_classify (ap);
@@ -2007,10 +2011,12 @@ static void ahci_thaw(struct ata_port *ap)void ahci_error_handler (struct ata_port *ap) { +struct ahci_host_priv *hpriv = ap->host->private_data; +if (!(ap->pflags &ATA_PFLAG_FROZEN )) {/* restart engine */ ahci_stop_engine (ap); -ahci_start_engine (ap); + hpriv->start_engine (ap); }sata_pmp_error_handler (ap);
@@ -2031,6 +2037,7 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc)static void ahci_set_aggressive_devslp (struct ata_port *ap,bool sleep) { +struct ahci_host_priv *hpriv = ap->host->private_data;void __iomem *port_mmio =ahci_port_base (ap);struct ata_device *dev = ap->link.device;u32 devslp, dm, dito, mdat, deto;
@@ -2094,7 +2101,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) PORT_DEVSLP_ADSE);writel (devslp, port_mmio +PORT_DEVSLP ); -ahci_start_engine (ap); + hpriv->start_engine (ap);/* enable device sleep feature for the drive */ err_mask = ata_dev_set_feature(dev,
@@ -2106,6 +2113,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)static void ahci_enable_fbs (struct ata_port *ap) { +struct ahci_host_priv *hpriv = ap->host->private_data;struct ahci_port_priv *pp = ap->private_data;void __iomem *port_mmio =ahci_port_base (ap);u32 fbs;
@@ -2134,11 +2142,12 @@ static void ahci_enable_fbs(struct ata_port *ap) }else dev_err (ap->host->dev,"Failed to enable FBS\n" ); -ahci_start_engine (ap); + hpriv->start_engine (ap); }static void ahci_disable_fbs (struct ata_port *ap) { +struct ahci_host_priv *hpriv = ap->host->private_data;struct ahci_port_priv *pp = ap->private_data;void __iomem *port_mmio =ahci_port_base (ap);u32 fbs;
@@ -2166,7 +2175,7 @@ static void ahci_disable_fbs(struct ata_port *ap) pp->fbs_enabled = false; } -ahci_start_engine (ap); + hpriv->start_engine (ap); }static void ahci_pmp_attach (struct ata_port *ap)
drivers/ata/sata_highbank.c +2 -1
@@ -403,6 +403,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class,static const unsigned long timing[] = {5 ,100 ,500 };struct ata_port *ap = link->ap;struct ahci_port_priv *pp = ap->private_data; +struct ahci_host_priv *hpriv = ap->host->private_data;u8 *d2h_fis = pp->rx_fis +RX_FIS_D2H_REG ;struct ata_taskfile tf;bool online;
@@ -431,7 +432,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class,break ; }while (!online && retry--); -ahci_start_engine (ap); + hpriv->start_engine (ap);if (online) *class =ahci_dev_classify (ap);
Signature · 1 line
1.8.5.3
PATCH v6 1/18 libahci: Allow drivers to override start_engine
Hello,
drivers/ata/ahci.h struct ahci_host_priv { · line 327
Quoted 10 lines · Hans de Goede
drivers/ata/ahci.h +2
-0@@ -323,6 +323,8 @@ struct ahci_host_priv {u32 em_msg_type;/* EM message type */ struct clk *clk;/* Only for platforms supporting clk */ void *plat_data;/* Other platform data */ +/* Optional ahci_start_engine override */ +void (*start_engine)(struct ata_port *ap);
Can you please add that this gets initialized to the default during save_initial_config and can be overridden anytime before the host is activated?
drivers/ata/ahci.h void ahci_save_initial_config(struct device *dev, · line 506
Quoted 7 lines
drivers/ata/ahci.h +3
-0@@ -500,6 +501,9 @@ void ahci_save_initial_config(struct device *dev, hpriv->cap = cap; hpriv->cap2 = cap2; hpriv->port_map = port_map; + +if (!hpriv->start_engine) + hpriv->start_engine = ahci_start_engine;
Please update the function comment accordingly.
drivers/ata/ahci.h void ahci_start_engine(struct ata_port *ap) · line 579
Quoted 10 lines
drivers/ata/ahci.h +1
-1-void ahci_start_engine (struct ata_port *ap) +static void ahci_start_engine (struct ata_port *ap) {void __iomem *port_mmio =ahci_port_base (ap);drivers/ata/ahci.h +0
-1u32 tmp;@@ -576,7 +580,6 @@ void ahci_start_engine(struct ata_port *ap)writel (tmp, port_mmio +PORT_CMD );readl (port_mmio +PORT_CMD );/* flush */ } -EXPORT_SYMBOL_GPL (ahci_start_engine);
Why are we making ahci_start_engine() static? Wouldn't there likely be users who would do more things before or after ahci_start_engine()? Also, why is there no explanation of this change in the patch description?
Thanks.
Signature · 1 line
tejun
PATCH v6 2/18 libahci: Move ahci_host_priv declaration to include/linux/ahci.h
In reply to Hans de GoedeWith the ahci-platform.c changes later in this patch-set, some arch/arm/mach-foo/*.c sata drivers need access to ahci_host_priv, so move its declaration outside of drivers/ata.
--- drivers/ata/ahci.h | 20 +------------------- include/linux/ahci.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 include/linux/ahci.h
drivers/ata/ahci.h +1 -19
@@ -35,7 +35,7 @@#ifndef _AHCI_H#define _AHCI_H -#include <linux/clk.h> +#include <linux/ahci.h> #include <linux/libata.h> /* Enclosure Management Control */
@@ -309,24 +309,6 @@ struct ahci_port_priv {char *irq_desc;/* desc in /proc/interrupts */ }; -struct ahci_host_priv { -void __iomem * mmio;/* bus-independent mem map */ -unsigned int flags;/* AHCI_HFLAG_* */ -u32 cap;/* cap to use */ -u32 cap2;/* cap2 to use */ -u32 port_map;/* port map to use */ -u32 saved_cap;/* saved initial cap */ -u32 saved_cap2;/* saved initial cap2 */ -u32 saved_port_map;/* saved initial port_map */ -u32 em_loc;/* enclosure management location */ -u32 em_buf_sz;/* EM buffer size in byte */ -u32 em_msg_type;/* EM message type */ -struct clk *clk;/* Only for platforms supporting clk */ -void *plat_data;/* Other platform data */ -/* Optional ahci_start_engine override */ -void (*start_engine)(struct ata_port *ap); -}; -extern int ahci_ignore_sss;extern struct device_attribute *ahci_shost_attrs[];
include/linux/ahci.h new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH v6 3/18 ahci-platform: Pass ahci_host_priv ptr to ahci_platform_data init method
In reply to Hans de GoedeSome ahci_platform_data->init methods need access to the ahci_host_priv data.
When calling ahci_platform_data->init the ata_host has not been allocated yet, so access to ahci_host_priv through the dev argument is not possible.
--- arch/arm/mach-davinci/devices-da8xx.c | 5 +++-- arch/arm/mach-spear/spear1340.c | 2 +- drivers/ata/ahci_imx.c | 12 ++++++------ drivers/ata/ahci_platform.c | 2 +- include/linux/ahci_platform.h | 3 ++- 5 files changed, 13 insertions(+), 11 deletions(-)
arch/arm/mach-davinci/devices-da8xx.c +3 -2
@@ -14,6 +14,7 @@#include <linux/platform_device.h> #include <linux/dma-contiguous.h> #include <linux/serial_8250.h> +#include <linux/ahci.h> #include <linux/ahci_platform.h> #include <linux/clk.h> #include <linux/reboot.h>
@@ -1061,7 +1062,7 @@ static unsigned long da850_sata_xtal[] = { KHZ_TO_HZ(60000), }; -static int da850_sata_init (struct device *dev,void __iomem *addr) +static int da850_sata_init (struct device *dev,struct ahci_host_priv *hpriv) {int i, ret;unsigned int val;
@@ -1096,7 +1097,7 @@ static int da850_sata_init(struct device *dev, void __iomem *addr)SATA_PHY_TXSWING (3 ) |SATA_PHY_ENPLL (1 ); -__raw_writel (val, addr +SATA_P0PHYCR_REG ); +__raw_writel (val, hpriv->mmio +SATA_P0PHYCR_REG );return 0 ;
arch/arm/mach-spear/spear1340.c +1 -1
@@ -77,7 +77,7 @@ SPEAR1340_MIPHY_PLL_RATIO_TOP(25))/* SATA device registration */ -static int sata_miphy_init (struct device *dev,void __iomem *addr) +static int sata_miphy_init (struct device *dev,struct ahci_host_priv *hpriv) {writel (SPEAR1340_SATA_CFG_VAL ,SPEAR1340_PCIE_SATA_CFG ); writel(SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK,
drivers/ata/ahci_imx.c +6 -6
@@ -168,7 +168,7 @@ static const struct ata_port_info ahci_imx_port_info = { .port_ops = &ahci_imx_ops, }; -static int imx_sata_init (struct device *dev,void __iomem *mmio) +static int imx_sata_init (struct device *dev,struct ahci_host_priv *hpriv) {int ret =0 ;unsigned int reg_val;
@@ -185,19 +185,19 @@ static int imx_sata_init(struct device *dev, void __iomem *mmio)* Implement the port0. * Get the ahb clock rate, and configure the TIMER1MS register. */ - reg_val =readl (mmio +HOST_CAP ); + reg_val =readl (hpriv->mmio +HOST_CAP );if (!(reg_val &HOST_CAP_SSS )) { reg_val |=HOST_CAP_SSS ; -writel (reg_val, mmio +HOST_CAP ); +writel (reg_val, hpriv->mmio +HOST_CAP ); } - reg_val =readl (mmio +HOST_PORTS_IMPL ); + reg_val =readl (hpriv->mmio +HOST_PORTS_IMPL );if (!(reg_val &0x1 )) { reg_val |=0x1 ; -writel (reg_val, mmio +HOST_PORTS_IMPL ); +writel (reg_val, hpriv->mmio +HOST_PORTS_IMPL ); } reg_val =clk_get_rate (imxpriv->ahb_clk) /1000 ; -writel (reg_val, mmio +HOST_TIMER1MS ); +writel (reg_val, hpriv->mmio +HOST_TIMER1MS );return 0 ; }
drivers/ata/ahci_platform.c +1 -1
@@ -149,7 +149,7 @@ static int ahci_probe(struct platform_device *pdev)* returned successfully. */ if (pdata && pdata->init) { - rc = pdata->init (dev, hpriv->mmio); + rc = pdata->init (dev, hpriv);if (rc) goto disable_unprepare_clk; }
include/linux/ahci_platform.h +2 -1
@@ -19,9 +19,10 @@struct device ;struct ata_port_info ; +struct ahci_host_priv ;struct ahci_platform_data { -int (*init)(struct device *dev,void __iomem *addr); +int (*init)(struct device *dev,struct ahci_host_priv *hpriv);void (*exit)(struct device *dev);int (*suspend)(struct device *dev);int (*resume)(struct device *dev);
Signature · 1 line
1.8.5.3
PATCH v6 4/18 ahci-platform: Add support for devices with more then 1 clock
In reply to Hans de GoedeThe allwinner-sun4i AHCI controller needs 2 clocks to be enabled and the imx AHCI controller needs 3 clocks to be enabled.
--- .../devicetree/bindings/ata/ahci-platform.txt | 1 + drivers/ata/ahci_platform.c | 97 +++++++++++++++------- include/linux/ahci.h | 4 +- include/linux/ahci_platform.h | 3 + 4 files changed, 73 insertions(+), 32 deletions(-)
Documentation/devicetree/bindings/ata/ahci-platform.txt +1 -0
@@ -10,6 +10,7 @@ Required properties: Optional properties: - dma-coherent : Present if dma operations are coherent +- clocks : a list of phandle + clock specifier pairs Example: sata at ffe08000 {
drivers/ata/ahci_platform.c +66 -31
149 lines not on this page · raw message
include/linux/ahci.h +3 -1
@@ -23,6 +23,8 @@#include <linux/clk.h> +#define AHCI_MAX_CLKS 3 +struct ata_port ;struct ahci_host_priv {
@@ -37,7 +39,7 @@ struct ahci_host_priv {u32 em_loc;/* enclosure management location */ u32 em_buf_sz;/* EM buffer size in byte */ u32 em_msg_type;/* EM message type */ -struct clk *clk;/* Optional */ +struct clk *clks[AHCI_MAX_CLKS ];/* Optional */ void *plat_data;/* Other platform data */ /* Optional ahci_start_engine override */ void (*start_engine)(struct ata_port *ap);
include/linux/ahci_platform.h +3 -0
@@ -31,4 +31,7 @@ struct ahci_platform_data { unsigned int mask_port_map; }; +int ahci_platform_enable_clks (struct ahci_host_priv *hpriv); +void ahci_platform_disable_clks (struct ahci_host_priv *hpriv); +#endif /* _AHCI_PLATFORM_H */
Signature · 1 line
1.8.5.3
PATCH v6 4/18 ahci-platform: Add support for devices with more then 1 clock
drivers/ata/ahci_platform.c static struct scsi_host_template ahci_platform_sht = { · line 91
Quoted 10 lines · Hans de Goede
drivers/ata/ahci_platform.c +2
-0@@ -87,6 +87,44 @@ static struct scsi_host_template ahci_platform_sht = { AHCI_SHT("ahci_platform"), }; + +int ahci_platform_enable_clks (struct ahci_host_priv *hpriv)
Throughout the series, there are mixtures of one and two blank lines in front of functions, let's just do one consistently. Also, can you please add proper function comments on top of the exported functions?
Quoted 25 lines
drivers/ata/ahci_platform.c +25
-0+{ +int c, rc; + +for (c =0 ; c <AHCI_MAX_CLKS && hpriv->clks[c]; c++) { + rc =clk_prepare_enable (hpriv->clks[c]); +if (rc) + goto disable_unprepare_clk; + } +return 0 ; + +disable_unprepare_clk: +while (--c >=0 ) +clk_disable_unprepare (hpriv->clks[c]); +return rc; +} +EXPORT_SYMBOL_GPL (ahci_platform_enable_clks); + +void ahci_platform_disable_clks (struct ahci_host_priv *hpriv) +{ +int c; + +for (c =AHCI_MAX_CLKS -1 ; c >=0 ; c--) +if (hpriv->clks[c]) +clk_disable_unprepare (hpriv->clks[c]); +}
drivers/ata/ahci_platform.c static struct scsi_host_template ahci_platform_sht = { · line 126
Quoted 10 lines
drivers/ata/ahci_platform.c +10
-0+EXPORT_SYMBOL_GPL (ahci_platform_disable_clks); + + +static void ahci_put_clks (struct ahci_host_priv *hpriv) +{ +int c; + +for (c =0 ; c <AHCI_MAX_CLKS && hpriv->clks[c]; c++) +clk_put (hpriv->clks[c]); +}
Urgh, clk can't do devm? ahci_platform itself should be able to build devmized interface using devres_alloc() or devm_add_action(). Eh.... maybe later.
Quoted 17 lines
drivers/ata/ahci_platform.c +5
-8@@ -131,17 +167,26 @@ static int ahci_probe(struct platform_device *pdev)return -ENOMEM ; } - hpriv->clk =clk_get (dev,NULL ); -if (IS_ERR (hpriv->clk)) { -dev_err (dev,"can't get clock\n" ); - }else { - rc =clk_prepare_enable (hpriv->clk); -if (rc) { -dev_err (dev,"clock prepare enable failed" ); - goto free_clk; + max_clk = dev->of_node ?AHCI_MAX_CLKS :1 ; +for (i =0 ; i < max_clk; i++) { +if (i ==0 ) + clk =clk_get (dev,NULL );/* For old platform init */ +else
drivers/ata/ahci_platform.c static int ahci_probe(struct platform_device *pdev) · line 184
Quoted 10 lines
drivers/ata/ahci_platform.c +8
-0+ clk =of_clk_get (dev->of_node, i); + +if (IS_ERR (clk)) { + rc =PTR_ERR (clk); +if (rc == -EPROBE_DEFER ) + goto free_clk; +break ; } + hpriv->clks[i] = clk; }
Wouldn't it be nice to have some eplanation on why clk init path diverges depending on whether dev->of_node is NULL or not? In general, the patchset seems dearth on comment side.
Thanks.
Signature · 1 line
tejun
PATCH v6 4/18 ahci-platform: Add support for devices with more then 1 clock
Quoted 47 lines · Tejun Heo
drivers/ata/ahci_platform.c static struct scsi_host_template ahci_platform_sht = { · line 91
Quoted 10 lines · Hans de Goede
drivers/ata/ahci_platform.c +2
-0@@ -87,6 +87,44 @@ static struct scsi_host_template ahci_platform_sht = { AHCI_SHT("ahci_platform"), }; + +int ahci_platform_enable_clks (struct ahci_host_priv *hpriv)Throughout the series, there are mixtures of one and two blank lines in front of functions, let's just do one consistently. Also, can you please add proper function comments on top of the exported functions?
Quoted 31 lines
drivers/ata/ahci_platform.c +31
-0+{ +int c, rc; + +for (c =0 ; c <AHCI_MAX_CLKS && hpriv->clks[c]; c++) { + rc =clk_prepare_enable (hpriv->clks[c]); +if (rc) + goto disable_unprepare_clk; + } +return 0 ; + +disable_unprepare_clk: +while (--c >=0 ) +clk_disable_unprepare (hpriv->clks[c]); +return rc; +} +EXPORT_SYMBOL_GPL (ahci_platform_enable_clks); + +void ahci_platform_disable_clks (struct ahci_host_priv *hpriv) +{ +int c; + +for (c =AHCI_MAX_CLKS -1 ; c >=0 ; c--) +if (hpriv->clks[c]) +clk_disable_unprepare (hpriv->clks[c]); +} +EXPORT_SYMBOL_GPL (ahci_platform_disable_clks); + + +static void ahci_put_clks (struct ahci_host_priv *hpriv) +{ +int c;
Quoted 8 lines
drivers/ata/ahci_platform.c static struct scsi_host_template ahci_platform_sht = { · line 126
Quoted 4 lines
drivers/ata/ahci_platform.c +4
-0+ +for (c =0 ; c <AHCI_MAX_CLKS && hpriv->clks[c]; c++) +clk_put (hpriv->clks[c]); +}Urgh, clk can't do devm?
ahci_platformitself should be able to build devmized interface usingdevres_alloc()ordevm_add_action(). Eh.... maybe later.
There is devm_clk_get()
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
PATCH v6 5/18 ahci-platform: Add support for an optional regulator for sata-target power
In reply to Hans de Goede--- .../devicetree/bindings/ata/ahci-platform.txt | 1 + drivers/ata/ahci_platform.c | 35 ++++++++++++++++++++-- include/linux/ahci.h | 2 ++ 3 files changed, 36 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/ata/ahci-platform.txt +1 -0
@@ -11,6 +11,7 @@ Required properties: Optional properties: - dma-coherent : Present if dma operations are coherent - clocks : a list of phandle + clock specifier pairs +- target-supply : regulator for SATA target power Example: sata at ffe08000 {
drivers/ata/ahci_platform.c +33 -2
@@ -167,6 +167,13 @@ static int ahci_probe(struct platform_device *pdev)return -ENOMEM ; } + hpriv->target_pwr =devm_regulator_get_optional (dev,"target" ); +if (IS_ERR (hpriv->target_pwr)) { +if (PTR_ERR (hpriv->target_pwr) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + hpriv->target_pwr =NULL ; + } + max_clk = dev->of_node ?AHCI_MAX_CLKS :1 ;for (i =0 ; i < max_clk; i++) {if (i ==0 )
@@ -183,9 +190,15 @@ static int ahci_probe(struct platform_device *pdev) hpriv->clks[i] = clk; } +if (hpriv->target_pwr) { + rc =regulator_enable (hpriv->target_pwr); +if (rc) + goto free_clk; + } + rc =ahci_enable_clks (dev, hpriv);if (rc) - goto free_clk; + goto disable_regulator;/* * Some platforms might need to prepare for mmio region access,
@@ -268,6 +281,9 @@ pdata_exit: pdata->exit (dev); disable_unprepare_clk:ahci_disable_clks (hpriv); +disable_regulator: +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr); free_clk:ahci_put_clks (hpriv);return rc;
@@ -284,6 +300,9 @@ static void ahci_host_stop(struct ata_host *host)ahci_disable_clks (hpriv);ahci_put_clks (hpriv); + +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr); }#ifdef CONFIG_PM_SLEEP
@@ -320,6 +339,9 @@ static int ahci_suspend(struct device *dev)ahci_disable_clks (hpriv); +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr); +return 0 ; }
@@ -330,9 +352,15 @@ static int ahci_resume(struct device *dev)struct ahci_host_priv *hpriv = host->private_data;int rc; +if (hpriv->target_pwr) { + rc =regulator_enable (hpriv->target_pwr); +if (rc) +return rc; + } + rc =ahci_enable_clks (dev, hpriv);if (rc) -return rc; + goto disable_regulator;if (pdata && pdata->resume) { rc = pdata->resume (dev);
@@ -354,6 +382,9 @@ static int ahci_resume(struct device *dev) disable_unprepare_clk:ahci_disable_clks (hpriv); +disable_regulator: +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr);return rc; }
include/linux/ahci.h +2 -0
@@ -22,6 +22,7 @@#define __LINUX_AHCI_H__#include <linux/clk.h> +#include <linux/regulator/consumer.h> #define AHCI_MAX_CLKS 3
@@ -40,6 +41,7 @@ struct ahci_host_priv {u32 em_buf_sz;/* EM buffer size in byte */ u32 em_msg_type;/* EM message type */ struct clk *clks[AHCI_MAX_CLKS ];/* Optional */ +struct regulator *target_pwr;/* Optional */ void *plat_data;/* Other platform data */ /* Optional ahci_start_engine override */ void (*start_engine)(struct ata_port *ap);
Signature · 1 line
1.8.5.3
PATCH v6 5/18 ahci-platform: Add support for an optional regulator for sata-target power
drivers/ata/ahci_platform.c pdata_exit: · line 286
Quoted 7 lines · Hans de Goede
drivers/ata/ahci_platform.c +3
-0@@ -268,6 +281,9 @@ pdata_exit: pdata->exit (dev); disable_unprepare_clk:ahci_disable_clks (hpriv); +disable_regulator: +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr);
The same thing with clks, I'd much prefer to see ahci_platform doing devres wrapping so that its consumers wouldn't have to worry about tearing stuff down.
Thanks.
Signature · 1 line
tejun
PATCH v6 6/18 ahci-platform: Add enable_ / disable_resources helper functions
In reply to Hans de Goede--- drivers/ata/ahci_platform.c | 83 ++++++++++++++++++++++++------------------- include/linux/ahci_platform.h | 2 ++ 2 files changed, 48 insertions(+), 37 deletions(-)
drivers/ata/ahci_platform.c +46 -37
@@ -117,6 +117,39 @@ void ahci_platform_disable_clks(struct ahci_host_priv *hpriv)EXPORT_SYMBOL_GPL (ahci_platform_disable_clks); +int ahci_platform_enable_resources (struct ahci_host_priv *hpriv) +{ +int rc; + +if (hpriv->target_pwr) { + rc =regulator_enable (hpriv->target_pwr); +if (rc) +return rc; + } + + rc =ahci_platform_enable_clks (hpriv); +if (rc) + goto disable_regulator; + +return 0 ; + +disable_regulator: +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr); +return rc; +} +EXPORT_SYMBOL_GPL (ahci_platform_enable_resources); + +void ahci_platform_disable_resources (struct ahci_host_priv *hpriv) +{ +ahci_platform_disable_clks (hpriv); + +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr); +} +EXPORT_SYMBOL_GPL (ahci_platform_disable_resources); + +static void ahci_put_clks (struct ahci_host_priv *hpriv) {int c;
@@ -190,15 +223,9 @@ static int ahci_probe(struct platform_device *pdev) hpriv->clks[i] = clk; } -if (hpriv->target_pwr) { - rc =regulator_enable (hpriv->target_pwr); -if (rc) - goto free_clk; - } - - rc =ahci_enable_clks (dev, hpriv); + rc =ahci_platform_enable_resources (hpriv);if (rc) - goto disable_regulator; + goto free_clk;/* * Some platforms might need to prepare for mmio region access,
@@ -209,7 +236,7 @@ static int ahci_probe(struct platform_device *pdev)if (pdata && pdata->init) { rc = pdata->init (dev, hpriv);if (rc) - goto disable_unprepare_clk; + goto disable_resources; } ahci_save_initial_config(dev, hpriv,
@@ -279,11 +306,8 @@ static int ahci_probe(struct platform_device *pdev) pdata_exit:if (pdata && pdata->exit) pdata->exit (dev); -disable_unprepare_clk: -ahci_disable_clks (hpriv); -disable_regulator: -if (hpriv->target_pwr) -regulator_disable (hpriv->target_pwr); +disable_resources: +ahci_platform_disable_resources (hpriv); free_clk:ahci_put_clks (hpriv);return rc;
@@ -298,11 +322,8 @@ static void ahci_host_stop(struct ata_host *host)if (pdata && pdata->exit) pdata->exit (dev); -ahci_disable_clks (hpriv); +ahci_platform_disable_resources (hpriv);ahci_put_clks (hpriv); - -if (hpriv->target_pwr) -regulator_disable (hpriv->target_pwr); }#ifdef CONFIG_PM_SLEEP
@@ -337,10 +358,7 @@ static int ahci_suspend(struct device *dev)if (pdata && pdata->suspend)return pdata->suspend (dev); -ahci_disable_clks (hpriv); - -if (hpriv->target_pwr) -regulator_disable (hpriv->target_pwr); +ahci_platform_disable_resources (hpriv);return 0 ; }
@@ -352,26 +370,20 @@ static int ahci_resume(struct device *dev)struct ahci_host_priv *hpriv = host->private_data;int rc; -if (hpriv->target_pwr) { - rc =regulator_enable (hpriv->target_pwr); -if (rc) -return rc; - } - - rc =ahci_enable_clks (dev, hpriv); + rc =ahci_platform_enable_resources (hpriv);if (rc) - goto disable_regulator; +return rc;if (pdata && pdata->resume) { rc = pdata->resume (dev);if (rc) - goto disable_unprepare_clk; + goto disable_resources; }if (dev->power.power_state.event ==PM_EVENT_SUSPEND ) { rc =ahci_reset_controller (host);if (rc) - goto disable_unprepare_clk; + goto disable_resources;ahci_init_controller (host); }
@@ -380,11 +392,8 @@ static int ahci_resume(struct device *dev)return 0 ; -disable_unprepare_clk: -ahci_disable_clks (hpriv); -disable_regulator: -if (hpriv->target_pwr) -regulator_disable (hpriv->target_pwr); +disable_resources: +ahci_platform_disable_resources (hpriv);return rc; }
include/linux/ahci_platform.h +2 -0
@@ -33,5 +33,7 @@ struct ahci_platform_data {int ahci_platform_enable_clks (struct ahci_host_priv *hpriv);void ahci_platform_disable_clks (struct ahci_host_priv *hpriv); +int ahci_platform_enable_resources (struct ahci_host_priv *hpriv); +void ahci_platform_disable_resources (struct ahci_host_priv *hpriv);#endif /* _AHCI_PLATFORM_H */
Signature · 1 line
1.8.5.3
PATCH v6 6/18 ahci-platform: Add enable_ / disable_resources helper functions
Quoted 37 lines · Hans de Goede
Signed-off-by Hans de Goede <[email protected]>--- drivers/ata/ahci_platform.c | 83 ++++++++++++++++++++++++------------------- include/linux/ahci_platform.h | 2 ++ 2 files changed, 48 insertions(+), 37 deletions(-)drivers/ata/ahci_platform.c +23
-0@@ -117,6 +117,39 @@ void ahci_platform_disable_clks(struct ahci_host_priv *hpriv)EXPORT_SYMBOL_GPL (ahci_platform_disable_clks); +int ahci_platform_enable_resources (struct ahci_host_priv *hpriv) +{ +int rc; + +if (hpriv->target_pwr) { + rc =regulator_enable (hpriv->target_pwr); +if (rc) +return rc; + } + + rc =ahci_platform_enable_clks (hpriv); +if (rc) + goto disable_regulator; + +return 0 ; + +disable_regulator: +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr); +return rc; +} +EXPORT_SYMBOL_GPL (ahci_platform_enable_resources); +
drivers/ata/ahci_platform.c void ahci_platform_disable_clks(struct ahci_host_priv *hpriv) · line 152
Quoted 10 lines
drivers/ata/ahci_platform.c +10
-0+void ahci_platform_disable_resources (struct ahci_host_priv *hpriv) +{ +ahci_platform_disable_clks (hpriv); + +if (hpriv->target_pwr) +regulator_disable (hpriv->target_pwr); +} +EXPORT_SYMBOL_GPL (ahci_platform_disable_resources); + +
Ditto with comments, double blank lines and devres wrapping.
Thanks.
Signature · 1 line
tejun
PATCH v6 7/18 ahci-platform: "Library-ise" ahci_probe functionality
In reply to Hans de Goedeahci_probe consists of 3 steps:
1) Get resources (get mmio, clks, regulator)
2) Enable resources, handled by ahci_platform_enable_resouces
3) The more or less standard ahci-host controller init sequence
This commit refactors step 1 and 3 into separate functions, so the platform drivers for AHCI implementations which need a specific order in step 2, and / or need to do some custom register poking at some time, can re-use ahci-platform.c code without needing to copy and paste it.
Note that ahci_platform_init_host's prototype takes the 3 non function members of ahci_platform_data as arguments, the idea is that drivers using the new exported utility functions will not use ahci_platform_data at all, and hopefully in the future ahci_platform_data can go away entirely.
--- drivers/ata/ahci_platform.c | 158 ++++++++++++++++++++++++------------------ include/linux/ahci_platform.h | 14 ++++ 2 files changed, 106 insertions(+), 66 deletions(-)
drivers/ata/ahci_platform.c +92 -66
@@ -150,60 +150,31 @@ void ahci_platform_disable_resources(struct ahci_host_priv *hpriv)EXPORT_SYMBOL_GPL (ahci_platform_disable_resources); -static void ahci_put_clks (struct ahci_host_priv *hpriv) -{ -int c; - -for (c =0 ; c <AHCI_MAX_CLKS && hpriv->clks[c]; c++) -clk_put (hpriv->clks[c]); -} - -static int ahci_probe (struct platform_device *pdev) +struct ahci_host_priv *ahci_platform_get_resources ( +struct platform_device *pdev) {struct device *dev = &pdev->dev; -struct ahci_platform_data *pdata =dev_get_platdata (dev); -const struct platform_device_id *id =platform_get_device_id (pdev); -struct ata_port_info pi = ahci_port_info[id ? id->driver_data :0 ]; -const struct ata_port_info *ppi[] = { &pi,NULL };struct ahci_host_priv *hpriv; -struct ata_host *host; -struct resource *mem;struct clk *clk; -int i, irq, max_clk, n_ports, rc; - - mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!mem) { -dev_err (dev,"no mmio space\n" ); -return -EINVAL ; - } - - irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) { -dev_err (dev,"no irq\n" ); -return -EINVAL ; - } - -if (pdata && pdata->ata_port_info) - pi = *pdata->ata_port_info; +int i, max_clk, rc; hpriv =devm_kzalloc (dev,sizeof (*hpriv),GFP_KERNEL );if (!hpriv) {dev_err (dev,"can't alloc ahci_host_priv\n" ); -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); } - hpriv->flags |= (unsigned long )pi.private_data; - - hpriv->mmio =devm_ioremap (dev, mem->start,resource_size (mem)); + hpriv->mmio =devm_ioremap_resource (dev, +platform_get_resource (pdev,IORESOURCE_MEM ,0 ));if (!hpriv->mmio) { -dev_err (dev,"can't map %pR\n" , mem); -return -ENOMEM ; +dev_err (dev,"no mmio space\n" ); +return ERR_PTR (-EINVAL ); } hpriv->target_pwr =devm_regulator_get_optional (dev,"target" );if (IS_ERR (hpriv->target_pwr)) {if (PTR_ERR (hpriv->target_pwr) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +return ERR_PTR (-EPROBE_DEFER ); hpriv->target_pwr =NULL ; }
@@ -223,27 +194,48 @@ static int ahci_probe(struct platform_device *pdev) hpriv->clks[i] = clk; } - rc =ahci_platform_enable_resources (hpriv); -if (rc) - goto free_clk; +return hpriv; -/* -* Some platforms might need to prepare for mmio region access, -* which could be done in the following init call. So, the mmio -* region shouldn't be accessed before init (if provided) has -* returned successfully. -*/ -if (pdata && pdata->init) { - rc = pdata->init (dev, hpriv); -if (rc) - goto disable_resources; - } +free_clk: +while (--i >=0 ) +clk_put (hpriv->clks[i]); +return ERR_PTR (rc); +} +EXPORT_SYMBOL_GPL (ahci_platform_get_resources); + +void ahci_platform_put_resources (struct ahci_host_priv *hpriv) +{ +int c; + +for (c =0 ; c <AHCI_MAX_CLKS && hpriv->clks[c]; c++) +clk_put (hpriv->clks[c]); +} +EXPORT_SYMBOL_GPL (ahci_platform_put_resources); + + +int ahci_platform_init_host (struct platform_device *pdev, +struct ahci_host_priv *hpriv, +const struct ata_port_info *pi_template, +unsigned int force_port_map, +unsigned int mask_port_map) +{ +struct device *dev = &pdev->dev; +struct ata_port_info pi = *pi_template; +const struct ata_port_info *ppi[] = { &pi,NULL }; +struct ata_host *host; +int i, irq, n_ports, rc; -ahci_save_initial_config (dev, hpriv, - pdata ? pdata->force_port_map :0 , - pdata ? pdata->mask_port_map :0 ); + irq =platform_get_irq (pdev,0 ); +if (irq <=0 ) { +dev_err (dev,"no irq\n" ); +return -EINVAL ; + }/* prepare host */ + hpriv->flags |= (unsigned long )pi.private_data; + +ahci_save_initial_config (dev, hpriv, force_port_map, mask_port_map); +if (hpriv->cap &HOST_CAP_NCQ ) pi.flags |=ATA_FLAG_NCQ ;
@@ -260,10 +252,8 @@ static int ahci_probe(struct platform_device *pdev) n_ports =max (ahci_nr_ports (hpriv->cap),fls (hpriv->port_map)); host =ata_host_alloc_pinfo (dev, ppi, n_ports); -if (!host) { - rc = -ENOMEM ; - goto pdata_exit; - } +if (!host) +return -ENOMEM ; host->private_data = hpriv;
@@ -278,7 +268,8 @@ static int ahci_probe(struct platform_device *pdev)for (i =0 ; i < host->n_ports; i++) {struct ata_port *ap = host->ports[i]; -ata_port_desc (ap,"mmio %pR" , mem); +ata_port_desc (ap,"mmio %pR" , +platform_get_resource (pdev,IORESOURCE_MEM ,0 ));ata_port_desc (ap,"port 0x%x" ,0x100 + ap->port_no *0x80 );/* set enclosure management message type */
@@ -292,13 +283,48 @@ static int ahci_probe(struct platform_device *pdev) rc =ahci_reset_controller (host);if (rc) - goto pdata_exit; +return rc;ahci_init_controller (host);ahci_print_info (host,"platform" ); - rc =ata_host_activate (host, irq, ahci_interrupt,IRQF_SHARED , - &ahci_platform_sht); +return ata_host_activate (host, irq, ahci_interrupt,IRQF_SHARED , + &ahci_platform_sht); +} +EXPORT_SYMBOL_GPL (ahci_platform_init_host); + +static int ahci_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct ahci_platform_data *pdata =dev_get_platdata (dev); +const struct platform_device_id *id =platform_get_device_id (pdev); +struct ahci_host_priv *hpriv; +int rc; + + hpriv =ahci_platform_get_resources (pdev); +if (IS_ERR (hpriv)) +return PTR_ERR (hpriv); + + rc =ahci_platform_enable_resources (hpriv); +if (rc) + goto put_resources; + +/* +* Some platforms might need to prepare for mmio region access, +* which could be done in the following init call. So, the mmio +* region shouldn't be accessed before init (if provided) has +* returned successfully. +*/ +if (pdata && pdata->init) { + rc = pdata->init (dev, hpriv); +if (rc) + goto disable_resources; + } + + rc =ahci_platform_init_host (pdev, hpriv, + &ahci_port_info[id ? id->driver_data :0 ], + pdata ? pdata->force_port_map :0 , + pdata ? pdata->mask_port_map :0 );if (rc) goto pdata_exit;
@@ -308,8 +334,8 @@ pdata_exit: pdata->exit (dev); disable_resources:ahci_platform_disable_resources (hpriv); -free_clk: -ahci_put_clks (hpriv); +put_resources: +ahci_platform_put_resources (hpriv);return rc; }
@@ -323,7 +349,7 @@ static void ahci_host_stop(struct ata_host *host) pdata->exit (dev);ahci_platform_disable_resources (hpriv); -ahci_put_clks (hpriv); +ahci_platform_put_resources (hpriv); }#ifdef CONFIG_PM_SLEEP
include/linux/ahci_platform.h +14 -0
@@ -20,7 +20,13 @@struct device ;struct ata_port_info ;struct ahci_host_priv ; +struct platform_device ; +/* +* Note ahci_platform_data is deprecated. New drivers which need to override +* any of these, should instead declare there own platform_driver struct, and +* use ahci_platform* functions in their own probe, suspend and resume methods. +*/ struct ahci_platform_data {int (*init)(struct device *dev,struct ahci_host_priv *hpriv);void (*exit)(struct device *dev);
@@ -35,5 +41,13 @@ int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);void ahci_platform_disable_clks (struct ahci_host_priv *hpriv);int ahci_platform_enable_resources (struct ahci_host_priv *hpriv);void ahci_platform_disable_resources (struct ahci_host_priv *hpriv); +struct ahci_host_priv *ahci_platform_get_resources ( +struct platform_device *pdev); +void ahci_platform_put_resources (struct ahci_host_priv *hpriv); +int ahci_platform_init_host (struct platform_device *pdev, +struct ahci_host_priv *hpriv, +const struct ata_port_info *pi_template, +unsigned int force_port_map, +unsigned int mask_port_map);#endif /* _AHCI_PLATFORM_H */
Signature · 1 line
1.8.5.3
PATCH v6 7/18 ahci-platform: "Library-ise" ahci_probe functionality
Quoted 10 lines · Hans de Goede
ahci_probeconsists of 3 steps:
1) Get resources (get mmio, clks, regulator)
2) Enable resources, handled byahci_platform_enable_resouces
3) The more or less standard ahci-host controller init sequenceThis commit refactors step 1 and 3 into separate functions, so the platform drivers for AHCI implementations which need a specific order in step 2, and / or need to do some custom register poking at some time, can re-use
ahci-platform.ccode without needing to copy and paste it.
Quoted 6 lines
Note that ahci_platform_init_host's prototype takes the 3 non function members of
ahci_platform_dataas arguments, the idea is that drivers using the new exported utility functions will not useahci_platform_dataat all, and hopefully in the futureahci_platform_datacan go away entirely.Signed-off-by Hans de Goede <[email protected]>
Heh, the lack of comments is getting kinda impressive. :)
Thanks.
Signature · 1 line
tejun
PATCH v6 8/18 ahci-platform: "Library-ise" suspend / resume functionality
In reply to Hans de GoedeSplit suspend / resume code into host suspend / resume functionality and resource enable / disabling phases, and export the new suspend_ / resume_host functions.
--- drivers/ata/ahci_platform.c | 55 +++++++++++++++++++++++++++++++------------ include/linux/ahci_platform.h | 5 ++++ 2 files changed, 45 insertions(+), 15 deletions(-)
drivers/ata/ahci_platform.c +40 -15
@@ -353,14 +353,12 @@ static void ahci_host_stop(struct ata_host *host) }#ifdef CONFIG_PM_SLEEP -static int ahci_suspend (struct device *dev) +int ahci_platform_suspend_host (struct device *dev) { -struct ahci_platform_data *pdata =dev_get_platdata (dev);struct ata_host *host =dev_get_drvdata (dev);struct ahci_host_priv *hpriv = host->private_data;void __iomem *mmio = hpriv->mmio;u32 ctl; -int rc;if (hpriv->flags &AHCI_HFLAG_NO_SUSPEND ) {dev_err (dev,"firmware update required for suspend/resume\n" );
@@ -377,7 +375,37 @@ static int ahci_suspend(struct device *dev)writel (ctl, mmio +HOST_CTL );readl (mmio +HOST_CTL );/* flush */ - rc =ata_host_suspend (host,PMSG_SUSPEND ); +return ata_host_suspend (host,PMSG_SUSPEND ); +} +EXPORT_SYMBOL_GPL (ahci_platform_suspend_host); + +int ahci_platform_resume_host (struct device *dev) +{ +struct ata_host *host =dev_get_drvdata (dev); +int rc; + +if (dev->power.power_state.event ==PM_EVENT_SUSPEND ) { + rc =ahci_reset_controller (host); +if (rc) +return rc; + +ahci_init_controller (host); + } + +ata_host_resume (host); + +return 0 ; +} +EXPORT_SYMBOL_GPL (ahci_platform_resume_host); + +int ahci_platform_suspend (struct device *dev) +{ +struct ahci_platform_data *pdata =dev_get_platdata (dev); +struct ata_host *host =dev_get_drvdata (dev); +struct ahci_host_priv *hpriv = host->private_data; +int rc; + + rc =ahci_platform_suspend_host (dev);if (rc)return rc;
@@ -388,8 +416,9 @@ static int ahci_suspend(struct device *dev)return 0 ; } +EXPORT_SYMBOL_GPL (ahci_platform_suspend); -static int ahci_resume (struct device *dev) +int ahci_platform_resume (struct device *dev) {struct ahci_platform_data *pdata =dev_get_platdata (dev);struct ata_host *host =dev_get_drvdata (dev);
@@ -406,15 +435,9 @@ static int ahci_resume(struct device *dev) goto disable_resources; } -if (dev->power.power_state.event ==PM_EVENT_SUSPEND ) { - rc =ahci_reset_controller (host); -if (rc) - goto disable_resources; - -ahci_init_controller (host); - } - -ata_host_resume (host); + rc =ahci_platform_resume_host (dev); +if (rc) + goto disable_resources;return 0 ;
@@ -423,9 +446,11 @@ disable_resources:return rc; } +EXPORT_SYMBOL_GPL (ahci_platform_resume);#endif -static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_suspend, ahci_resume); +static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend, + ahci_platform_resume);static const struct of_device_id ahci_of_match[] = { { .compatible ="snps,spear-ahci" , },
include/linux/ahci_platform.h +5 -0
@@ -50,4 +50,9 @@ int ahci_platform_init_host(struct platform_device *pdev,unsigned int force_port_map, unsigned int mask_port_map); +int ahci_platform_suspend_host (struct device *dev); +int ahci_platform_resume_host (struct device *dev); +int ahci_platform_suspend (struct device *dev); +int ahci_platform_resume (struct device *dev); +#endif /* _AHCI_PLATFORM_H */
Signature · 1 line
1.8.5.3
PATCH v6 9/18 ARM: sunxi: Add support for Allwinner SUNXi SoCs sata to ahci_platform
In reply to Hans de GoedeFrom: Olliver Schinagl <[email protected]>
This patch adds support for the ahci sata controler found on Allwinner A10 and A20 SoCs to the ahci_platform driver.
Orignally written by Olliver Schinagl using the approach of having a platform device which probe method creates a new child platform device which gets driven by ahci_platform.c, as done by ahci_imx.c .
Refactored by Hans de Goede to add most of the non sunxi specific functionality to ahci_platform.c and use a platform_data pointer from of_device_id for the sunxi specific bits.
--- .../devicetree/bindings/ata/ahci-platform.txt | 15 +- drivers/ata/Kconfig | 9 + drivers/ata/Makefile | 1 + drivers/ata/ahci_sunxi.c | 251 +++++++++++++++++++++ 4 files changed, 273 insertions(+), 3 deletions(-) create mode 100644 drivers/ata/ahci_sunxi.c
Documentation/devicetree/bindings/ata/ahci-platform.txt +12 -3
@@ -4,7 +4,9 @@ SATA nodes are defined to describe on-chip Serial ATA controllers. Each SATA controller should have its own node. Required properties: -- compatible : compatible list, contains "snps,spear-ahci" +- compatible : compatible list, one of "snps,spear-ahci", + "snps,exynos5440-ahci", "ibm,476gtr-ahci", or + "allwinner,sun4i-a10-ahci" - interrupts : <interrupt mapping for SATA IRQ> - reg : <registers mapping>
@@ -13,10 +15,17 @@ Optional properties: - clocks : a list of phandle + clock specifier pairs - target-supply : regulator for SATA target power -Example: +Examples: sata at ffe08000 { compatible = "snps,spear-ahci"; reg = <0xffe08000 0x1000>; interrupts = <115>; - }; + + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + target-supply = <®_ahci_5v>; + };
drivers/ata/Kconfig +9 -0
@@ -106,6 +106,15 @@ config AHCI_IMX If unsure, say N. +config AHCI_SUNXI + tristate "Allwinner sunxi AHCI SATA support" + depends on ARCH_SUNXI && SATA_AHCI_PLATFORM + help + This option enables support for the Allwinner sunxi SoC's + onboard AHCI SATA. + + If unsure, say N. + config SATA_FSL tristate "Freescale 3.0Gbps SATA support" depends on FSL_SOC
drivers/ata/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-$(CONFIG_SATA_SIL24) += sata_sil24.o obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o obj-$(CONFIG_SATA_HIGHBANK) += sata_highbank.o libahci.o obj-$(CONFIG_AHCI_IMX) += ahci_imx.o +obj-$(CONFIG_AHCI_SUNXI) += ahci_sunxi.o # SFF w/ custom DMA obj-$(CONFIG_PDC_ADMA) += pdc_adma.o
drivers/ata/ahci_sunxi.c new file +251 -0
251 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH v6 10/18 ahci-imx: Port to library-ised ahci_platform
In reply to Hans de GoedeThis avoids the ugliness of creating a nested platform device from probe.
While moving it around anyways, move the mk6q phy init code from probe to imx_sata_enable, as the phy needs to be re-initialized on resume too, otherwise the drive won't be recognized after resume.
Tested on a wandboard i.mx6 quad.
--- .../devicetree/bindings/ata/ahci-platform.txt | 9 +- drivers/ata/ahci_imx.c | 338 ++++++++------------- 2 files changed, 141 insertions(+), 206 deletions(-)
Documentation/devicetree/bindings/ata/ahci-platform.txt +7 -2
@@ -5,8 +5,9 @@ Each SATA controller should have its own node. Required properties: - compatible : compatible list, one of "snps,spear-ahci", - "snps,exynos5440-ahci", "ibm,476gtr-ahci", or - "allwinner,sun4i-a10-ahci" + "snps,exynos5440-ahci", "ibm,476gtr-ahci", + "allwinner,sun4i-a10-ahci", "fsl,imx53-ahci" or + "fsl,imx6q-ahci" - interrupts : <interrupt mapping for SATA IRQ> - reg : <registers mapping>
@@ -15,6 +16,10 @@ Optional properties: - clocks : a list of phandle + clock specifier pairs - target-supply : regulator for SATA target power +"fsl,imx53-ahci", "fsl,imx6q-ahci" required properties: +- clocks : must contain the sata, sata_ref and ahb clocks +- clock-names : must contain "ahb" for the ahb clock + Examples: sata at ffe08000 { compatible = "snps,spear-ahci";
drivers/ata/ahci_imx.c +134 -204
458 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH v6 11/18 ata: ahci_platform: Add DT compatible for Synopsis DWC AHCI controller
In reply to Hans de GoedeFrom: Roger Quadros <[email protected]>
Add compatible string "snps,dwc-ahci", which should be used for Synopsis Designware SATA cores. e.g. on TI OMAP5 and DRA7 platforms.
--- drivers/ata/ahci_platform.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/ahci_platform.c +1 -0
@@ -456,6 +456,7 @@ static const struct of_device_id ahci_of_match[] = { { .compatible = "snps,spear-ahci", }, { .compatible = "snps,exynos5440-ahci", }, { .compatible = "ibm,476gtr-ahci", }, + { .compatible = "snps,dwc-ahci", }, {}, }; MODULE_DEVICE_TABLE(of, ahci_of_match);
Signature · 1 line
1.8.5.3
PATCH v6 12/18 ata: ahci_platform: Update DT compatible list
In reply to Hans de GoedeFrom: Roger Quadros <[email protected]>
The ahci_platform driver supports "snps,dwc-ahci". Add this to the DT binding information.
--- Documentation/devicetree/bindings/ata/ahci-platform.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/ata/ahci-platform.txt +2 -2
@@ -6,8 +6,8 @@ Each SATA controller should have its own node. Required properties: - compatible : compatible list, one of "snps,spear-ahci", "snps,exynos5440-ahci", "ibm,476gtr-ahci", - "allwinner,sun4i-a10-ahci", "fsl,imx53-ahci" or - "fsl,imx6q-ahci" + "allwinner,sun4i-a10-ahci", "fsl,imx53-ahci" + "fsl,imx6q-ahci" or "snps,dwc-ahci" - interrupts : <interrupt mapping for SATA IRQ> - reg : <registers mapping>
Signature · 1 line
1.8.5.3
PATCH v6 13/18 ata: ahci_platform: Manage SATA PHY
In reply to Hans de GoedeFrom: Roger Quadros <[email protected]>
Some platforms have a PHY hooked up to the SATA controller. The PHY needs to be initialized and powered up for SATA to work. We do that using the PHY framework.
--- drivers/ata/Kconfig | 1 + drivers/ata/ahci_platform.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/linux/ahci.h | 2 ++ 3 files changed, 43 insertions(+)
drivers/ata/Kconfig +1 -0
@@ -91,6 +91,7 @@ config SATA_AHCI config SATA_AHCI_PLATFORM tristate "Platform AHCI SATA support" + depends on GENERIC_PHY || !GENERIC_PHY help This option enables support for Platform AHCI Serial ATA controllers.
drivers/ata/ahci_platform.c +40 -0
@@ -23,6 +23,7 @@#include <linux/platform_device.h> #include <linux/libata.h> #include <linux/ahci_platform.h> +#include <linux/phy/phy.h> #include "ahci.h" static void ahci_host_stop (struct ata_host *host);
@@ -131,8 +132,23 @@ int ahci_platform_enable_resources(struct ahci_host_priv *hpriv)if (rc) goto disable_regulator; +if (hpriv->phy) { + rc =phy_init (hpriv->phy); +if (rc) + goto disable_clks; + + rc =phy_power_on (hpriv->phy); +if (rc) { +phy_exit (hpriv->phy); + goto disable_clks; + } + } +return 0 ; +disable_clks: +ahci_platform_disable_clks (hpriv); + disable_regulator:if (hpriv->target_pwr)regulator_disable (hpriv->target_pwr);
@@ -142,6 +158,11 @@ EXPORT_SYMBOL_GPL(ahci_platform_enable_resources);void ahci_platform_disable_resources (struct ahci_host_priv *hpriv) { +if (hpriv->phy) { +phy_power_off (hpriv->phy); +phy_exit (hpriv->phy); + } +ahci_platform_disable_clks (hpriv);if (hpriv->target_pwr)
@@ -194,6 +215,25 @@ struct ahci_host_priv *ahci_platform_get_resources( hpriv->clks[i] = clk; } + hpriv->phy =devm_phy_get (dev,"sata-phy" ); +if (IS_ERR (hpriv->phy)) { + rc =PTR_ERR (hpriv->phy); +switch (rc) { +case -ENODEV : +case -ENOSYS : +/* continue normally */ + hpriv->phy =NULL ; +break ; + +case -EPROBE_DEFER : + goto free_clk; + +default : +dev_err (dev,"couldn't get sata-phy\n" ); + goto free_clk; + } + } +return hpriv; free_clk:
include/linux/ahci.h +2 -0
@@ -23,6 +23,7 @@#include <linux/clk.h> #include <linux/regulator/consumer.h> +#include <linux/phy/phy.h> #define AHCI_MAX_CLKS 3
@@ -42,6 +43,7 @@ struct ahci_host_priv {u32 em_msg_type;/* EM message type */ struct clk *clks[AHCI_MAX_CLKS ];/* Optional */ struct regulator *target_pwr;/* Optional */ +struct phy *phy;/* If platform uses phy */ void *plat_data;/* Other platform data */ /* Optional ahci_start_engine override */ void (*start_engine)(struct ata_port *ap);
Signature · 1 line
1.8.5.3
PATCH v6 14/18 ata: ahci_platform: Add 'struct device' argument to ahci_platform_put_resources()
In reply to Hans de GoedeFrom: Roger Quadros <[email protected]>
There is no easy way to access 'struct device' from 'struct ahci_host_priv' so add an explicit argument for 'struct device'. We will need it to call Runtime PM APIs.
--- drivers/ata/ahci_imx.c | 5 +++-- drivers/ata/ahci_platform.c | 7 ++++--- drivers/ata/ahci_sunxi.c | 2 +- include/linux/ahci_platform.h | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-)
drivers/ata/ahci_imx.c +3 -2
@@ -276,16 +276,17 @@ static int imx_ahci_probe(struct platform_device *pdev) disable:imx_sata_disable (hpriv); put_resources: -ahci_platform_put_resources (hpriv); +ahci_platform_put_resources (dev, hpriv);return ret; }static void ahci_imx_host_stop (struct ata_host *host) { +struct device *dev = host->dev;struct ahci_host_priv *hpriv = host->private_data;imx_sata_disable (hpriv); -ahci_platform_put_resources (hpriv); +ahci_platform_put_resources (dev, hpriv); }static int imx_ahci_suspend (struct device *dev)
drivers/ata/ahci_platform.c +4 -3
@@ -243,7 +243,8 @@ free_clk: }EXPORT_SYMBOL_GPL (ahci_platform_get_resources); -void ahci_platform_put_resources (struct ahci_host_priv *hpriv) +void ahci_platform_put_resources (struct device *dev, +struct ahci_host_priv *hpriv) {int c;
@@ -375,7 +376,7 @@ pdata_exit: disable_resources:ahci_platform_disable_resources (hpriv); put_resources: -ahci_platform_put_resources (hpriv); +ahci_platform_put_resources (dev, hpriv);return rc; }
@@ -389,7 +390,7 @@ static void ahci_host_stop(struct ata_host *host) pdata->exit (dev);ahci_platform_disable_resources (hpriv); -ahci_platform_put_resources (hpriv); +ahci_platform_put_resources (dev, hpriv); }#ifdef CONFIG_PM_SLEEP
drivers/ata/ahci_sunxi.c +1 -1
@@ -194,7 +194,7 @@ static int ahci_sunxi_probe(struct platform_device *pdev) disable_resources:ahci_platform_disable_resources (hpriv); put_resources: -ahci_platform_put_resources (hpriv); +ahci_platform_put_resources (dev, hpriv);return rc; }
include/linux/ahci_platform.h +2 -1
@@ -43,7 +43,8 @@ int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);void ahci_platform_disable_resources (struct ahci_host_priv *hpriv);struct ahci_host_priv *ahci_platform_get_resources (struct platform_device *pdev); -void ahci_platform_put_resources (struct ahci_host_priv *hpriv); +void ahci_platform_put_resources (struct device *dev, +struct ahci_host_priv *hpriv); int ahci_platform_init_host(struct platform_device *pdev, struct ahci_host_priv *hpriv, const struct ata_port_info *pi_template,
Signature · 1 line
1.8.5.3
PATCH v6 15/18 ata: ahci_platform: runtime resume the device before use
In reply to Hans de GoedeFrom: Roger Quadros <[email protected]>
On OMAP platforms the device needs to be runtime resumed before it can be accessed. The OMAP HWMOD framework takes care of enabling the module and its resources based on the device's runtime PM state.
In this patch we runtime resume during .probe() and runtime suspend during .remove() (i.e. ahci_host_stop()).
We also update the runtime PM state during .resume().
--- drivers/ata/ahci_platform.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/ata/ahci_platform.c +12 -0
@@ -24,6 +24,7 @@#include <linux/libata.h> #include <linux/ahci_platform.h> #include <linux/phy/phy.h> +#include <linux/pm_runtime.h> #include "ahci.h" static void ahci_host_stop (struct ata_host *host);
@@ -234,6 +235,9 @@ struct ahci_host_priv *ahci_platform_get_resources( } } +pm_runtime_enable (dev); +pm_runtime_get_sync (dev); +return hpriv; free_clk:
@@ -248,6 +252,9 @@ void ahci_platform_put_resources(struct device *dev, {int c; +pm_runtime_put_sync (dev); +pm_runtime_disable (dev); +for (c =0 ; c <AHCI_MAX_CLKS && hpriv->clks[c]; c++)clk_put (hpriv->clks[c]); }
@@ -480,6 +487,11 @@ int ahci_platform_resume(struct device *dev)if (rc) goto disable_resources; +/* We resumed so update PM runtime state */ +pm_runtime_disable (dev); +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +return 0 ; disable_resources:
Signature · 1 line
1.8.5.3
PATCH v6 16/18 ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators
In reply to Hans de GoedeAccording to Documentation/devicetree/bindings/regulator/regulator.txt regulator nodes should not be placed under 'simple-bus'.
Mark Rutland also explains about it at:
http://www.spinics.net/lists/linux-usb/msg101497.html
--- arch/arm/boot/dts/sun4i-a10-a1000.dts | 22 +++++++++------------- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 18 +++++++----------- 2 files changed, 16 insertions(+), 24 deletions(-)
arch/arm/boot/dts/sun4i-a10-a1000.dts +9 -13
@@ -80,18 +80,14 @@ }; }; - regulators { - compatible = "simple-bus"; - - reg_emac_3v3: emac-3v3 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&emac_power_pin_a1000>; - regulator-name = "emac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - gpio = <&pio 7 15 0>; - }; + reg_emac_3v3: emac-3v3 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&emac_power_pin_a1000>; + regulator-name = "emac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pio 7 15 0>; }; };
arch/arm/boot/dts/sun4i-a10-hackberry.dts +7 -11
@@ -54,16 +54,12 @@ }; }; - regulators { - compatible = "simple-bus"; - - reg_emac_3v3: emac-3v3 { - compatible = "regulator-fixed"; - regulator-name = "emac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - gpio = <&pio 7 19 0>; - }; + reg_emac_3v3: emac-3v3 { + compatible = "regulator-fixed"; + regulator-name = "emac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pio 7 19 0>; }; };
Signature · 1 line
1.8.5.3
PATCH v6 17/18 ARM: sun4i: dt: Add ahci / sata support
In reply to Hans de GoedeFrom: Oliver Schinagl <[email protected]>
This patch adds sunxi sata support to A10 boards that have such a connector. Some boards also feature a regulator via a GPIO and support for this is also added.
--- arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi
arch/arm/boot/dts/sun4i-a10-a1000.dts +4 -0
@@ -35,6 +35,10 @@ }; }; + ahci: sata at 01c18000 { + status = "okay"; + }; + pinctrl at 01c20800 { emac_power_pin_a1000: emac_power_pin at 0 { allwinner,pins = "PH15";
arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6 -0
@@ -12,6 +12,7 @@ /dts-v1/; /include/ "sun4i-a10.dtsi" +/include/ "sunxi-ahci-reg.dtsi" / { model = "Cubietech Cubieboard";
@@ -33,6 +34,11 @@ }; }; + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { led_pins_cubieboard: led_pins at 0 { allwinner,pins = "PH20", "PH21";
arch/arm/boot/dts/sun4i-a10.dtsi +8 -0
@@ -338,6 +338,14 @@ #size-cells = <0>; }; + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + intc: interrupt-controller at 01c20400 { compatible = "allwinner,sun4i-ic"; reg = <0x01c20400 0x400>;
arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +36 -0
@@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common code + * + * Copyright 2014 - Hans de Goede <[email protected]> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/ { + soc at 01c00000 { + pio: pinctrl at 01c20800 { + ahci_pwr_pin_a: ahci_pwr_pin at 0 { + allwinner,pins = "PB8"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + }; + }; + + reg_ahci_5v: ahci-5v { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&ahci_pwr_pin_a>; + regulator-name = "ahci-5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + gpio = <&pio 1 8 0>; + }; +};
Signature · 1 line
1.8.5.3
PATCH v6 17/18 ARM: sun4i: dt: Add ahci / sata support
Hi Hans,
Quoted 80 lines · Hans de Goede
From: Oliver Schinagl <[email protected]>
This patch adds sunxi sata support to A10 boards that have such a connector. Some boards also feature a regulator via a GPIO and support for this is also added.
Signed-off-by Olliver Schinagl <[email protected]>Signed-off-by Hans de Goede <[email protected]>--- arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsiarch/arm/boot/dts/sun4i-a10-a1000.dts +4
-0@@ -35,6 +35,10 @@ }; }; + ahci: sata at 01c18000 { + status = "okay"; + }; + pinctrl at 01c20800 { emac_power_pin_a1000: emac_power_pin at 0 { allwinner,pins = "PH15";arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6
-0@@ -12,6 +12,7 @@ /dts-v1/; /include/ "sun4i-a10.dtsi" +/include/ "sunxi-ahci-reg.dtsi" / { model = "Cubietech Cubieboard";@@ -33,6 +34,11 @@ }; }; + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { led_pins_cubieboard: led_pins at 0 { allwinner,pins = "PH20", "PH21";arch/arm/boot/dts/sun4i-a10.dtsi +8
-0@@ -338,6 +338,14 @@ #size-cells = <0>; }; + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + intc: interrupt-controller at 01c20400 { compatible = "allwinner,sun4i-ic"; reg = <0x01c20400 0x400>;arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +0
-0
arch/arm/boot/dts/sunxi-ahci-reg.dtsi line 2
Quoted 2 lines
arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +2
-0@@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common code
Since IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators?
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140221/e4884b34/attachment.sig>
PATCH v6 17/18 ARM: sun4i: dt: Add ahci / sata support
Hi Maxime,
Quoted 82 lines · Maxime Ripard
Hi Hans,
Quoted 79 lines · Hans de Goede
From: Oliver Schinagl <[email protected]>
This patch adds sunxi sata support to A10 boards that have such a connector. Some boards also feature a regulator via a GPIO and support for this is also added.
Signed-off-by Olliver Schinagl <[email protected]>Signed-off-by Hans de Goede <[email protected]>--- arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+)create mode 100644
arch/arm/boot/dts/sunxi-ahci-reg.dtsiarch/arm/boot/dts/sun4i-a10-a1000.dts +4
-0@@ -35,6 +35,10 @@ }; }; + ahci: sata at 01c18000 { + status = "okay"; + }; + pinctrl at 01c20800 { emac_power_pin_a1000: emac_power_pin at 0 { allwinner,pins = "PH15";arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6
-0@@ -12,6 +12,7 @@ /dts-v1/; /include/ "sun4i-a10.dtsi" +/include/ "sunxi-ahci-reg.dtsi" / { model = "Cubietech Cubieboard";@@ -33,6 +34,11 @@ }; }; + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { led_pins_cubieboard: led_pins at 0 { allwinner,pins = "PH20", "PH21";arch/arm/boot/dts/sun4i-a10.dtsi +8
-0@@ -338,6 +338,14 @@ #size-cells = <0>; }; + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + intc: interrupt-controller at 01c20400 { compatible = "allwinner,sun4i-ic"; reg = <0x01c20400 0x400>;arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +0
-0
Quoted 8 lines
arch/arm/boot/dts/sunxi-ahci-reg.dtsi line 2
Quoted 3 lines
arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +2
-0@@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common codeSince IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators?
On most boards with sata, there will also be 1 or 2 usb regulators, so we need differently named regulator nodes for all 3 of ahci, usb1 and usb2 vbus. On some boards how ever we may only need the usb regulators. So if you look in my current personal sunxi-devel tree you will see separate dtsi files for both ahci and usb regulators, another advantage of having these separate is that the gpio controlling the regulator can be pre-populated with the reference design gpio which is used in most boards, so that the ahci specific code in the dts becomes only the ahci: sata at ... node.
Regards,
Hans
PATCH v6 17/18 ARM: sun4i: dt: Add ahci / sata support
Quoted 94 lines · Hans de Goede
Hi Maxime,
Quoted 82 lines · Maxime Ripard
Hi Hans,
Quoted 79 lines · Hans de Goede
From: Oliver Schinagl <[email protected]>
This patch adds sunxi sata support to A10 boards that have such a connector. Some boards also feature a regulator via a GPIO and support for this is also added.
Signed-off-by Olliver Schinagl <[email protected]>Signed-off-by Hans de Goede <[email protected]>--- arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsiarch/arm/boot/dts/sun4i-a10-a1000.dts +4
-0@@ -35,6 +35,10 @@ }; }; + ahci: sata at 01c18000 { + status = "okay"; + }; + pinctrl at 01c20800 { emac_power_pin_a1000: emac_power_pin at 0 { allwinner,pins = "PH15";arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6
-0@@ -12,6 +12,7 @@ /dts-v1/; /include/ "sun4i-a10.dtsi" +/include/ "sunxi-ahci-reg.dtsi" / { model = "Cubietech Cubieboard";@@ -33,6 +34,11 @@ }; }; + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { led_pins_cubieboard: led_pins at 0 { allwinner,pins = "PH20", "PH21";arch/arm/boot/dts/sun4i-a10.dtsi +8
-0@@ -338,6 +338,14 @@ #size-cells = <0>; }; + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + intc: interrupt-controller at 01c20400 { compatible = "allwinner,sun4i-ic"; reg = <0x01c20400 0x400>;arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +0
-0Quoted 8 lines
arch/arm/boot/dts/sunxi-ahci-reg.dtsi line 2
Quoted 3 lines
arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +2
-0@@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common codeSince IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators?
Quoted 4 lines
On most boards with sata, there will also be 1 or 2 usb regulators, so we need differently named regulator nodes for all 3 of ahci, usb1 and usb2 vbus. On some boards how ever we may only need the usb regulators.
Yes, obviously...
Quoted 2 lines
So if you look in my current personal sunxi-devel tree you will see separate dtsi files for both ahci and usb regulators,
And this is precisely what I don't understand. Why do you *need* different DTSI files. If there's common regulators, that are used on most boards, fine, create a common regulators files. But why do you have to create a DTSI to define only one regulator.
Quoted 4 lines
another advantage of having these separate is that the gpio controlling the regulator can be pre-populated with the reference design gpio which is used in most boards, so that the ahci specific code in the dts becomes only the ahci: sata at ... node.
I understand very well the advantages of what having a reference regulators bring. What I don't understand is the benefits of having "topics" regulators DTSI.
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140222/216c9a7e/attachment.sig>
PATCH v6 17/18 ARM: sun4i: dt: Add ahci / sata support
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Quoted 32 lines · Maxime Ripard
Quoted 20 lines · Hans de Goede
Hi Maxime,
Quoted 17 lines · Maxime Ripard
Hi Hans,
Quoted 14 lines · Hans de Goede
From: Oliver Schinagl <[email protected]>
This patch adds sunxi sata support to A10 boards that have such a connector. Some boards also feature a regulator via a GPIO and support for this is also added.
arch/arm/boot/dts/sun4i-a10-a1000.dts index cbd2e13..d6ec839 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -35,6 +35,10 @@ }; }; renamed from arch/arm/boot/dts/sun4i-a10-a1000.dts +1
-0+ ahci: sata at 01c18000 { + status = "okay"; + }; + pinctrl at 01c20800 { emac_power_pin_a1000: emac_power_pin at 0 { allwinner,pins = "PH15"; diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index b139ee6..6df237d8 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -12,6 +12,7 @@/dts-v1/; /include/ "
sun4i-a10.dtsi" +/include/ "sunxi-ahci-reg.dtsi"/ { model = "Cubietech Cubieboard"; @@ -33,6 +34,11 @@ }; };
Quoted 8 lines
Quoted 6 lines
arch/arm/boot/dts/sun4i-a10-a1000.dts index cbd2e13..d6ec839 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -35,6 +35,10 @@ }; };
Quoted 3 lines
arch/arm/boot/dts/sun4i-a10-a1000.dts index cbd2e13..d6ec839 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -35,6 +35,10 @@ }; }; renamed from arch/arm/boot/dts/sun4i-a10-a1000.dts +2
-0+ ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { led_pins_cubieboard: led_pins at 0 { allwinner,pins = "PH20", "PH21"; diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 336dbec..454077a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -338,6 +338,14 @@ #size-cells = <0>; }; + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + intc: interrupt-controller at 01c20400 { compatible = "allwinner,sun4i-ic"; reg = <0x01c20400 0x400>; diff --git a/arch/arm/boot/dts/sunxi-ahci-reg.dtsi b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file mode 100644 index 0000000..7072af1 --- /dev/null +++ b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi @@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common codeSince IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators?
On most boards with sata, there will also be 1 or 2 usb regulators, so we need differently named regulator nodes for all 3 of ahci, usb1 and usb2 vbus. On some boards how ever we may only need the usb regulators.
Yes, obviously...
Quoted 7 lines
Quoted 1 line
So if you look in my current personal sunxi-devel tree you will see separate dtsi files for both ahci and usb regulators,
And this is precisely what I don't understand. Why do you *need* different DTSI files. If there's common regulators, that are used on most boards, fine, create a common regulators files. But why do you have to create a DTSI to define only one regulator.
Quoted 1 line
another advantage of having these separate is that the gpio controlling the regulator can be pre-populated with the reference design gpio which is used in most boards, so that the ahci specific code in the dts becomes only the ahci: sata at ... node.
I understand very well the advantages of what having a reference regulators bring. What I don't understand is the benefits of having "topics" regulators DTSI.
Ok, so let me try to explain:
With topics regulator files, the ahci bits look something like this for a board using the reference design gpio:
/include/ "sunxi-ahci-reg.dtsi"
...
ahci: sata at 01c18000 {
target-supply = <®_ahci_5v>;
status = "okay";
};If we put all regulators in one file, then the ahci regulator cannot be enabled (so it will have status = "disabled) by default since most boards don't have it, so things would change into:
/include/ "sunxi-common-regulators.dtsi"
...
ahci: sata at 01c18000 {
target-supply = <®_ahci_5v>;
status = "okay";
};...
reg_ahci_5v: ahci-5v {
status = "okay";
};Notice the addition of the 2nd node. This is why I ended up doing 2 separate dtsi files for the ahci and for the usb regulators.
To me saying:
/include/ "sunxi-ahci-reg.dtsi"
Makes it clear to the reader that the board has a ahci target-supply regulator, so enabling it separately seems being overly verbose.
Of course of we change it to:
/include/ "sunxi-common-regulators.dtsi"
Then the verbosity / explicit enabling of various regulators becomes a good thing, as it is not directly clear what the include does.
But if we do this, then for many boards we end up replacing:
/include/ "sunxi-ahci-reg.dtsi"
/include/ "sun4i-a10-usb-vbus-reg.dtsi"
With:
/include/ "sunxi-common-regulators.dtsi"
reg_ahci_5v: ahci-5v {
status = "okay";
};
reg_usb1_vbus: usb1-vbus {
status = "okay";
};
reg_usb2_vbus: usb2-vbus {
status = "okay";
};I prefer the shorter version, but I can completely understand if you prefer the slightly more verbose version, this would also get rid of having different usb regulator dtsi files for sun4i / sun5i (as sun5i only has 1 usb host).
I hope this helps explain my reasoning, as said I'm fine with either way, if you want to change over to a single file + explicit enabling, let me know and I'll respin the ahci dts patches. Note I'm going on vacation for a week starting Monday, so you likely won't get a new version until next weekend.
Regards,
Hans
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iEYEARECAAYFAlMI9jgACgkQF3VEtJrzE/tkEQCgm1V2Nga+RxsTELQUJxIl2Go3 4dkAnRK0CjK1YEapqN0anp2iltgp7smc
=fBXT
-----END PGP SIGNATURE-----
PATCH v6 17/18 ARM: sun4i: dt: Add ahci / sata support
Hi Hans,
Quoted 104 lines · Hans de Goede
Quoted 19 lines
Quoted 8 lines
Quoted 3 lines
Since IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators?
On most boards with sata, there will also be 1 or 2 usb regulators, so we need differently named regulator nodes for all 3 of ahci, usb1 and usb2 vbus. On some boards how ever we may only need the usb regulators.
Yes, obviously...
Quoted 2 lines
So if you look in my current personal sunxi-devel tree you will see separate dtsi files for both ahci and usb regulators,
And this is precisely what I don't understand. Why do you *need* different DTSI files. If there's common regulators, that are used on most boards, fine, create a common regulators files. But why do you have to create a DTSI to define only one regulator.
Quoted 8 lines
Quoted 4 lines
another advantage of having these separate is that the gpio controlling the regulator can be pre-populated with the reference design gpio which is used in most boards, so that the ahci specific code in the dts becomes only the ahci: sata at ... node.
I understand very well the advantages of what having a reference regulators bring. What I don't understand is the benefits of having "topics" regulators DTSI.
Ok, so let me try to explain:
With topics regulator files, the ahci bits look something like this for a board using the reference design gpio:
/include/ "
sunxi-ahci-reg.dtsi"...
ahci: sata at 01c18000 { target-supply = <®_ahci_5v>; status = "okay"; };If we put all regulators in one file, then the ahci regulator cannot be enabled (so it will have status = "disabled) by default since most boards don't have it, so things would change into:
/include/ "
sunxi-common-regulators.dtsi"...
ahci: sata at 01c18000 { target-supply = <®_ahci_5v>; status = "okay"; };...
reg_ahci_5v: ahci-5v { status = "okay"; };Notice the addition of the 2nd node. This is why I ended up doing 2 separate dtsi files for the ahci and for the usb regulators.
To me saying:
/include/ "
sunxi-ahci-reg.dtsi"Makes it clear to the reader that the board has a ahci target-supply regulator, so enabling it separately seems being overly verbose.
Of course of we change it to:
/include/ "
sunxi-common-regulators.dtsi"Then the verbosity / explicit enabling of various regulators becomes a good thing, as it is not directly clear what the include does.
But if we do this, then for many boards we end up replacing:
/include/ "
sunxi-ahci-reg.dtsi"
/include/ "sun4i-a10-usb-vbus-reg.dtsi"With:
/include/ "
sunxi-common-regulators.dtsi"reg_ahci_5v: ahci-5v { status = "okay"; }; reg_usb1_vbus: usb1-vbus { status = "okay"; }; reg_usb2_vbus: usb2-vbus { status = "okay"; };I prefer the shorter version, but I can completely understand if you prefer the slightly more verbose version, this would also get rid of having different usb regulator dtsi files for sun4i / sun5i (as sun5i only has 1 usb host).
Quoted 5 lines
I hope this helps explain my reasoning, as said I'm fine with either way, if you want to change over to a single file + explicit enabling, let me know and I'll respin the ahci dts patches. Note I'm going on vacation for a week starting Monday, so you likely won't get a new version until next weekend.
Yes, I strongly prefer the second case. That allows to have a good-enough degree of factorisation, while not having anything happening behind the scenes.
Thanks!
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140303/b4d9317d/attachment.sig>
PATCH v6 17/18 ARM: sun4i: dt: Add ahci / sata support
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Quoted 65 lines · Maxime Ripard
Hi Hans,
Quoted 62 lines · Hans de Goede
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Since IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators?
On most boards with sata, there will also be 1 or 2 usb regulators, so we need differently named regulator nodes for all 3 of ahci, usb1 and usb2 vbus. On some boards how ever we may only need the usb regulators.
Yes, obviously...
Quoted 7 lines
Quoted 1 line
So if you look in my current personal sunxi-devel tree you will see separate dtsi files for both ahci and usb regulators,
And this is precisely what I don't understand. Why do you *need* different DTSI files. If there's common regulators, that are used on most boards, fine, create a common regulators files. But why do you have to create a DTSI to define only one regulator.
Quoted 1 line
another advantage of having these separate is that the gpio controlling the regulator can be pre-populated with the reference design gpio which is used in most boards, so that the ahci specific code in the dts becomes only the ahci: sata at ... node.
I understand very well the advantages of what having a reference regulators bring. What I don't understand is the benefits of having "topics" regulators DTSI.
Ok, so let me try to explain:
With topics regulator files, the ahci bits look something like this for a board using the reference design gpio:
/include/ "
sunxi-ahci-reg.dtsi"...
ahci: sata at
01c18000{ target-supply = <®_ahci_5v>; status = "okay"; };If we put all regulators in one file, then the ahci regulator cannot be enabled (so it will have status = "disabled) by default since most boards don't have it, so things would change into:
/include/ "
sunxi-common-regulators.dtsi"...
ahci: sata at
01c18000{ target-supply = <®_ahci_5v>; status = "okay"; };...
reg_ahci_5v: ahci-5v { status = "okay"; };Notice the addition of the 2nd node. This is why I ended up doing 2 separate dtsi files for the ahci and for the usb regulators.
To me saying:
/include/ "
sunxi-ahci-reg.dtsi"Makes it clear to the reader that the board has a ahci target-supply regulator, so enabling it separately seems being overly verbose.
Of course of we change it to:
/include/ "
sunxi-common-regulators.dtsi"Then the verbosity / explicit enabling of various regulators becomes a good thing, as it is not directly clear what the include does.
But if we do this, then for many boards we end up replacing:
/include/ "
sunxi-ahci-reg.dtsi" /include/ "sun4i-a10-usb-vbus-reg.dtsi"With:
/include/ "
sunxi-common-regulators.dtsi"
reg_ahci_5v: ahci-5v { status = "okay"; };
reg_usb1_vbus: usb1-vbus { status = "okay"; };
Quoted 7 lines
Quoted 5 lines
reg_usb2_vbus: usb2-vbus { status = "okay"; };I prefer the shorter version, but I can completely understand if you prefer the slightly more verbose version, this would also get rid of having different usb regulator dtsi files for sun4i / sun5i (as sun5i only has 1 usb host).
I hope this helps explain my reasoning, as said I'm fine with either way, if you want to change over to a single file + explicit enabling, let me know and I'll respin the ahci dts patches. Note I'm going on vacation for a week starting Monday, so you likely won't get a new version until next weekend.
Yes, I strongly prefer the second case. That allows to have a good-enough degree of factorisation, while not having anything happening behind the scenes.
Good, note I've already assumed as much and send a new series which already has moved over to 1 common regulators dtsi, with all regulators disabled by default + explicit enabling in the board dts files.
Regards,
Hans
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iEYEARECAAYFAlMUVHEACgkQF3VEtJrzE/vIyQCfVgZNpu7YEk/pf7QiE90C6Cuj Dv8AoJq8fAEwTURGg5WF2FwMqZBPD1iS
=Vtd+
-----END PGP SIGNATURE-----
PATCH v6 18/18 ARM: sun7i: dt: Add ahci / sata support
In reply to Hans de GoedeThis patch adds sunxi sata support to A20 boards that have such a connector. Some boards also feature a regulator via a GPIO and support for this is also added.
--- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 18 ++++++++++++++++++ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 4 files changed, 38 insertions(+)
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +6 -0
@@ -13,12 +13,18 @@ /dts-v1/; /include/ "sun7i-a20.dtsi" +/include/ "sunxi-ahci-reg.dtsi" / { model = "Cubietech Cubieboard2"; compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20"; soc at 01c00000 { + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { led_pins_cubieboard2: led_pins at 0 { allwinner,pins = "PH20", "PH21";
arch/arm/boot/dts/sun7i-a20-cubietruck.dts +18 -0
@@ -13,13 +13,26 @@ /dts-v1/; /include/ "sun7i-a20.dtsi" +/include/ "sunxi-ahci-reg.dtsi" / { model = "Cubietech Cubietruck"; compatible = "cubietech,cubietruck", "allwinner,sun7i-a20"; soc at 01c00000 { + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { + ahci_pwr_pin_cubietruck: ahci_pwr_pin at 1 { + allwinner,pins = "PH12"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + led_pins_cubietruck: led_pins at 0 { allwinner,pins = "PH7", "PH11", "PH20", "PH21"; allwinner,function = "gpio_out";
@@ -90,4 +103,9 @@ gpios = <&pio 7 7 0>; }; }; + + reg_ahci_5v: ahci-5v { + pinctrl-0 = <&ahci_pwr_pin_cubietruck>; + gpio = <&pio 7 12 0>; + }; };
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +6 -0
@@ -13,12 +13,18 @@ /dts-v1/; /include/ "sun7i-a20.dtsi" +/include/ "sunxi-ahci-reg.dtsi" / { model = "Olimex A20-Olinuxino Micro"; compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20"; soc at 01c00000 { + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { led_pins_olinuxino: led_pins at 0 { allwinner,pins = "PH2";
arch/arm/boot/dts/sun7i-a20.dtsi +8 -0
@@ -392,6 +392,14 @@ #size-cells = <0>; }; + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <0 56 4>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + pio: pinctrl at 01c20800 { compatible = "allwinner,sun7i-a20-pinctrl"; reg = <0x01c20800 0x400>;
Signature · 1 line
1.8.5.3
v6 cover ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver
In reply to Hans de GoedeHello,
Quoted 5 lines · Hans de Goede
Here is v6 of my patchset for adding ahci-sunxi support. This has been tested with Allwinner A10, Allwinner A20 and Freeware imx6x SoCs, including suspend / resume. Note that since my last revision the
ahci_imxdriver has also grown imx53 sata support, it would be good if some-one could test that with this series.
Stopping review here. I really like where it's headed in general and most review points, except for lack of devres usage, are rather cosmetic. I'm not completely decided yet whether we can defer devres until later or should go for it in the first round.
Thanks.
Signature · 1 line
tejun
v6 cover ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver
Hi,
Quoted 11 lines · Tejun Heo
Hello,
Quoted 5 lines · Hans de Goede
Here is v6 of my patchset for adding ahci-sunxi support. This has been tested with Allwinner A10, Allwinner A20 and Freeware imx6x SoCs, including suspend / resume. Note that since my last revision the
ahci_imxdriver has also grown imx53 sata support, it would be good if some-one could test that with this series.Stopping review here. I really like where it's headed in general and most review points,
Thanks for the review. I'll respin the patchset taking the various remarks into account. I hope to have a new version ready at the end of the coming weekend at the latest.
Quoted 3 lines
except for lack of devres usage, are rather
cosmetic. I'm not completely decided yet whether we can defer devres until later or should go for it in the first round.
The devres usage are really 2 different issues:
1) There is the issue that we're getting clocks by index (this is by design as clk-names are not generic), but there is no devm_get_clk_by_index (or some such), this is a shortcoming of the clk-core, which needs a separate patch to fix. I would rather not delay this patch-set based on getting a patch into another subsys.
Note that even with devm_get_clk_by_index we can unfortunately not get rid of ahci_platform_put_resources() as in Roger's follow-up patches it gets used for putting some runtime pm related resources too.
I guess this argues for simply turning ahci_platform_get_resources into a devm_ahci_platform_get_resources doing its own devm handling, and then making ahci_platform_put_resources a private function called by the devm framework. If you agree I can do that for the next patch-set.
2) In some comments you also seem to want devm variants of enable / disable resources, or at least have ahci_platform_put_resources do the disable automatically. The problem is that most of the functions called here need to be balanced, they increment / decrement usage counters in the clk / regulator subsystems, so we cannot simply unconditional do an ahci_platform_disable_resources in ahci_platform_put_resources
Doing the disable automatically requires tracking the enable state, and doing this per resource, since the whole idea of having a separate ahci_platform_enable_resources is that some drivers may want to override its behavior doing things in a different order.
To ensure proper tracking we would then need to offer ahci_platform_enable_regulator, etc. functions, and ensure that all drivers using the ahci_platform framework always go through these, rather then calling directly into the relevant framework.
This is all doable, and I'm not against doing this but before spending a couple of hours coding this all up, I would like to hear back from you whether you would like to see this, or would rather keep things as is.
Regards,
Hans
v6 cover ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver
Hello, Hans.
Quoted 7 lines · Hans de Goede
The devres usage are really 2 different issues:
1) There is the issue that we're getting clocks by index (this is by design as clk-names are not generic), but there is no
devm_get_clk_by_index(or some such), this is a shortcoming of the clk-core, which needs a separate patch to fix. I would rather not delay this patch-set based on getting a patch into another subsys.
Yes, that'd be my usual preference too. The only reason I'm hesitant is because nobody seems to be too interested in long term aspect of the code base and the only leverage I have seems to be rejecting drivers until things become right.
Quoted 8 lines
Note that even with
devm_get_clk_by_indexwe can unfortunately not get rid ofahci_platform_put_resources()as in Roger's follow-up patches it gets used for putting some runtime pm related resources too.I guess this argues for simply turning
ahci_platform_get_resourcesinto adevm_ahci_platform_get_resourcesdoing its own devm handling, and then makingahci_platform_put_resourcesa private function called by the devm framework. If you agree I can do that for the next patch-set.
Note that libata core already does something similar. Please take a look at ata_host_alloc() for details. You don't really need to create a separate devm_ prefixed variant. Just making the function register devres automatically should be enough. If this is too much work, I'm okay with deferring it until later if you promise to do it soonish.
Quoted 12 lines
2) In some comments you also seem to want devm variants of enable / disable resources, or at least have
ahci_platform_put_resourcesdo the disable automatically. The problem is that most of the functions called here need to be balanced, they increment / decrement usage counters in the clk / regulator subsystems, so we cannot simply unconditional do anahci_platform_disable_resourcesinahci_platform_put_resourcesDoing the disable automatically requires tracking the enable state, and doing this per resource, since the whole idea of having a separate
ahci_platform_enable_resourcesis that some drivers may want to override its behavior doing things in a different order.
Quoted 7 lines
To ensure proper tracking we would then need to offer
ahci_platform_enable_regulator, etc. functions, and ensure that all drivers using theahci_platformframework always go through these, rather then calling directly into the relevant framework.This is all doable, and I'm not against doing this but before spending a couple of hours coding this all up, I would like to hear back from you whether you would like to see this, or would rather keep things as is.
Yes, in principle, I want every resource used by ahci_platform to be devres managed. I *think* devres should be flexible enough to handle what you're describing (each devres resource can have data for state tracking and devres resources can be looked up and modified, so the different orders should be okay) but if not I'd be happy to help extend it so that it can.
I'm not sure how many more ahci_platform drivers we'll get but the rate seems pretty high in recent months, so I think it's worthwhile to provide full devres coverage even if that complicates ahci_platform a bit if it can simplify leaf drivers. Again, if you commit to doing it in the foreseeable future, I'm okay with proceeding as-is, but it needs to happen one way or another.
Thanks.
Signature · 1 line
tejun
v6 cover ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver
Hi,
Quoted 25 lines · Tejun Heo
Hello, Hans.
Quoted 7 lines · Hans de Goede
The devres usage are really 2 different issues:
1) There is the issue that we're getting clocks by index (this is by design as clk-names are not generic), but there is no
devm_get_clk_by_index(or some such), this is a shortcoming of the clk-core, which needs a separate patch to fix. I would rather not delay this patch-set based on getting a patch into another subsys.Yes, that'd be my usual preference too. The only reason I'm hesitant is because nobody seems to be too interested in long term aspect of the code base and the only leverage I have seems to be rejecting drivers until things become right.
Quoted 8 lines
Note that even with
devm_get_clk_by_indexwe can unfortunately not get rid ofahci_platform_put_resources()as in Roger's follow-up patches it gets used for putting some runtime pm related resources too.I guess this argues for simply turning
ahci_platform_get_resourcesinto adevm_ahci_platform_get_resourcesdoing its own devm handling, and then makingahci_platform_put_resourcesa private function called by the devm framework. If you agree I can do that for the next patch-set.
Quoted 6 lines
Note that libata core already does something similar. Please take a look at
ata_host_alloc()for details. You don't really need to create a separatedevm_prefixed variant. Just making the function register devres automatically should be enough. If this is too much work, I'm okay with deferring it until later if you promise to do it soonish.
Ok, I'll try to do this for the next revision.
Quoted 20 lines
Quoted 12 lines
2) In some comments you also seem to want devm variants of enable / disable resources, or at least have
ahci_platform_put_resourcesdo the disable automatically. The problem is that most of the functions called here need to be balanced, they increment / decrement usage counters in the clk / regulator subsystems, so we cannot simply unconditional do anahci_platform_disable_resourcesinahci_platform_put_resourcesDoing the disable automatically requires tracking the enable state, and doing this per resource, since the whole idea of having a separate
ahci_platform_enable_resourcesis that some drivers may want to override its behavior doing things in a different order.Quoted 7 lines
To ensure proper tracking we would then need to offer
ahci_platform_enable_regulator, etc. functions, and ensure that all drivers using theahci_platformframework always go through these, rather then calling directly into the relevant framework.This is all doable, and I'm not against doing this but before spending a couple of hours coding this all up, I would like to hear back from you whether you would like to see this, or would rather keep things as is.
Quoted 6 lines
Yes, in principle, I want every resource used by
ahci_platformto be devres managed. I *think* devres should be flexible enough to handle what you're describing (each devres resource can have data for state tracking and devres resources can be looked up and modified, so the different orders should be okay) but if not I'd be happy to help extend it so that it can.
Most of the resources are already devres managed (I use devm functions to get them), the problem is not in freeing our reference to the resources, the problem is that we've sequences like this:
devm_get_fooenable_foodisable_foo
(automatic release foo)
Where enable / disable can be done repeatedly (ie each suspend / resume).
Quoted 1 line
From your review comments, I take it that you want the final
disable_foo
on driver release to happen automatically.
My preference for this would be to extend the devres tracking already present in the relevant subsystems to keep track of the enable count done through a specific reference, to allow automatic disable (if needed) on release.
But thinking more about this, I think that doing this automatically is a bad idea, because then we fixate the shutdown sequence to a certain order (the order in which we did the _get_foo for the resources) and the correct order may be device specific.
So TL;DR: Yes to making things so that ahci_platform_put_resources gets done automatically, no to automating the disable calls.
If I don't hear back from you, then I'll respin the patch-set assuming that you agree to the above.
Regards,
Hans
v6 cover ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver
Quoted 23 lines · Hans de Goede
Most of the resources are already devres managed (I use devm functions to get them), the problem is not in freeing our reference to the resources, the problem is that we've sequences like this:
devm_get_fooenable_foodisable_foo
(automatic release foo)Where enable / disable can be done repeatedly (ie each suspend / resume).
From your review comments, I take it that you want the final
disable_fooon driver release to happen automatically.My preference for this would be to extend the devres tracking already present in the relevant subsystems to keep track of the enable count done through a specific reference, to allow automatic disable (if needed) on release.
But thinking more about this, I think that doing this automatically is a bad idea, because then we fixate the shutdown sequence to a certain order (the order in which we did the
_get_foofor the resources) and the correct order may be device specific.
Quoted 5 lines
So TL;DR: Yes to making things so that
ahci_platform_put_resourcesgets done automatically, no to automating the disable calls.If I don't hear back from you, then I'll respin the patch-set assuming that you agree to the above.
Yeah, sounds good enough to me.
Thanks.
Signature · 1 line
tejun
A message that is not in the archive (sent off-list or not yet received): 1392811320-3132-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Quoted 8 lines · Hans de Goede
Hi all,
Here is v6 of my patchset for adding ahci-sunxi support. This has been tested with Allwinner A10, Allwinner A20 and Freeware imx6x SoCs, including suspend / resume. Note that since my last revision the
ahci_imxdriver has also grown imx53 sata support, it would be good if some-one could test that with this series.
basic file system tests on an imx53-qsb look fine with sata changes..
Using v3.14-rc3 + 20140219 (next) + shawn.guo's imx for-next branch which wasn't in today next tree..
debian@arm:~$ dmesg | grep ata [ 0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache [ 0.000000] Memory policy: Data cache writeback [ 0.000000] Memory: 1010076K/1048576K available (7008K kernel code, 527K rwdata, 2280K rodata, 416K init, 373K bss, 38500K reserved, 524288K highmem) [ 0.000000] .data : 0xc0984000 - 0xc0a07d60 ( 528 kB) [ 1.796587] libata version 3.00 loaded. [ 2.777037] ahci-imx 10000000.sata: unable to find phy [ 2.784385] ahci-imx 10000000.sata: SSS flag set, parallel bus scan disabled [ 2.791495] ahci-imx 10000000.sata: AHCI 0001.0100 32 slots 1 ports 3 Gbps 0x1 impl platform mode [ 2.800394] ahci-imx 10000000.sata: flags: ncq sntf stag pm led clo only pmp pio slum part ccc [ 2.814178] ata1: SATA max UDMA/133 mmio [mem 0x10000000-0x10000fff] port 0x100 irq 44 [ 3.400107] ata1: softreset failed (device not ready) [ 3.405174] ata1: applying PMP SRST workaround and retrying [ 3.610105] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 300) [ 3.663654] ata1.00: ATA-8: ST9120315AS, 0001SDM1, max UDMA/133 [ 3.669583] ata1.00: 234441648 sectors, multi 16: LBA48 NCQ (depth 31/32) [ 3.678553] ata1.00: configured for UDMA/133 [ 5.680633] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null)
Regards,
Signature · 7 lines
Robert Nelson http://www.rcn-ee.com/ -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/[email protected] For more options, visit https://groups.google.com/groups/opt_out.