This patch series updates the ceva driver to add support for Xilinx GT phy.
This also updates the documentation with the device tree binding required
for working with Xilinx GT phy.
Piyush Mehta (2):
ata: ahci: ceva: Update the driver to support xilinx GT phy
dt-bindings: ata: achi: ceva: Update documentation for CEVA Controller
.../devicetree/bindings/ata/ahci-ceva.txt | 8 +++++
drivers/ata/ahci_ceva.c | 34 ++++++++++++++++++++--
2 files changed, 40 insertions(+), 2 deletions(-)
--
2.7.4
SATA controller used in Xilinx ZynqMP platform uses xilinx GT phy
which has 4 GT lanes and can used by 4 peripherals at a time.
SATA controller uses 1 GT phy lane among the 4 GT lanes. To configure
the GT lane for SATA controller, the below sequence is expected.
1. Assert the SATA controller reset.
2. Configure the xilinx GT phy lane for SATA controller (phy_init).
3. De-assert the SATA controller reset.
4. Wait for PLL of the GT lane used by SATA to be locked (phy_power_on).
The ahci_platform_enable_resources() by default does the phy_init()
and phy_power_on() but the default sequence doesn't work with Xilinx
platforms. Because of this reason, updated the driver to support the
new sequence.
Signed-off-by: Piyush Mehta <[email protected]>
---
drivers/ata/ahci_ceva.c | 34 ++++++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/ahci_ceva.c b/drivers/ata/ahci_ceva.c
index b10fd4c..5341d89 100644
--- a/drivers/ata/ahci_ceva.c
+++ b/drivers/ata/ahci_ceva.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/reset.h>
#include "ahci.h"
/* Vendor Specific Register Offsets */
@@ -87,6 +88,7 @@ struct ceva_ahci_priv {
u32 axicc;
bool is_cci_enabled;
int flags;
+ struct reset_control *rst;
};
static unsigned int ceva_ahci_read_id(struct ata_device *dev,
@@ -194,7 +196,7 @@ static int ceva_ahci_probe(struct platform_device *pdev)
struct ahci_host_priv *hpriv;
struct ceva_ahci_priv *cevapriv;
enum dev_dma_attr attr;
- int rc;
+ int rc, i;
cevapriv = devm_kzalloc(dev, sizeof(*cevapriv), GFP_KERNEL);
if (!cevapriv)
@@ -202,14 +204,42 @@ static int ceva_ahci_probe(struct platform_device *pdev)
cevapriv->ahci_pdev = pdev;
+ cevapriv->rst = devm_reset_control_get(&pdev->dev, NULL);
+ if (IS_ERR(cevapriv->rst)) {
+ if (PTR_ERR(cevapriv->rst) != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "failed to get reset: %ld\n",
+ PTR_ERR(cevapriv->rst));
+ return PTR_ERR(cevapriv->rst);
+ }
+
hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv))
return PTR_ERR(hpriv);
- rc = ahci_platform_enable_resources(hpriv);
+ rc = ahci_platform_enable_clks(hpriv);
if (rc)
return rc;
+ /* Assert the controller reset */
+ reset_control_assert(cevapriv->rst);
+
+ for (i = 0; i < hpriv->nports; i++) {
+ rc = phy_init(hpriv->phys[i]);
+ if (rc)
+ return rc;
+ }
+
+ /* De-assert the controller reset */
+ reset_control_deassert(cevapriv->rst);
+
+ for (i = 0; i < hpriv->nports; i++) {
+ rc = phy_power_on(hpriv->phys[i]);
+ if (rc) {
+ phy_exit(hpriv->phys[i]);
+ return rc;
+ }
+ }
+
if (of_property_read_bool(np, "ceva,broken-gen2"))
cevapriv->flags = CEVA_FLAG_BROKEN_GEN2;
--
2.7.4
This patch updates the documentation for the CEVA controller for adding
the required properties for 'phys' and 'resets'.
Signed-off-by: Piyush Mehta <[email protected]>
---
Documentation/devicetree/bindings/ata/ahci-ceva.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/ata/ahci-ceva.txt b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
index 7561cc4..f01d317 100644
--- a/Documentation/devicetree/bindings/ata/ahci-ceva.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
@@ -35,6 +35,10 @@ Required properties:
ceva,pN-retry-params = /bits/ 16 <RIT RCT>;
RIT: Retry Interval Timer.
RCT: Rate Change Timer.
+ - phys: phandle for the PHY device
+ - phy-names: Should be "sata-phy"
+ - resets: phandle to the reset controller for the SATA IP
+ - reset-names: Should be "sata_rst".
Optional properties:
- ceva,broken-gen2: limit to gen1 speed instead of gen2.
@@ -56,4 +60,8 @@ Examples:
ceva,p1-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
ceva,p1-retry-params = /bits/ 16 <0x0216 0x7F06>;
ceva,broken-gen2;
+ phy-names = "sata-phy";
+ phys = <&psgtr 1 PHY_TYPE_SATA 1 1>;
+ reset-names = "sata_rst";
+ resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;
};
--
2.7.4
On 02. 09. 20 9:05, Piyush Mehta wrote:
> This patch updates the documentation for the CEVA controller for adding
> the required properties for 'phys' and 'resets'.
>
> Signed-off-by: Piyush Mehta <[email protected]>
> ---
> Documentation/devicetree/bindings/ata/ahci-ceva.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/ata/ahci-ceva.txt b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> index 7561cc4..f01d317 100644
> --- a/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> +++ b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> @@ -35,6 +35,10 @@ Required properties:
> ceva,pN-retry-params = /bits/ 16 <RIT RCT>;
> RIT: Retry Interval Timer.
> RCT: Rate Change Timer.
> + - phys: phandle for the PHY device
> + - phy-names: Should be "sata-phy"
> + - resets: phandle to the reset controller for the SATA IP
> + - reset-names: Should be "sata_rst".
I expect that these can't be required properties because you break all
existing boards.
Thanks
Michal
On Wed, Sep 02, 2020 at 12:35:48PM +0530, Piyush Mehta wrote:
> This patch updates the documentation for the CEVA controller for adding
> the required properties for 'phys' and 'resets'.
>
> Signed-off-by: Piyush Mehta <[email protected]>
> ---
> Documentation/devicetree/bindings/ata/ahci-ceva.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/ata/ahci-ceva.txt b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> index 7561cc4..f01d317 100644
> --- a/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> +++ b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> @@ -35,6 +35,10 @@ Required properties:
> ceva,pN-retry-params = /bits/ 16 <RIT RCT>;
> RIT: Retry Interval Timer.
> RCT: Rate Change Timer.
> + - phys: phandle for the PHY device
> + - phy-names: Should be "sata-phy"
> + - resets: phandle to the reset controller for the SATA IP
> + - reset-names: Should be "sata_rst".
The names here are rather pointless. You don't really need them if only
1 entry.
>
> Optional properties:
> - ceva,broken-gen2: limit to gen1 speed instead of gen2.
> @@ -56,4 +60,8 @@ Examples:
> ceva,p1-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
> ceva,p1-retry-params = /bits/ 16 <0x0216 0x7F06>;
> ceva,broken-gen2;
> + phy-names = "sata-phy";
> + phys = <&psgtr 1 PHY_TYPE_SATA 1 1>;
> + reset-names = "sata_rst";
> + resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;
> };
> --
> 2.7.4
>
Hello Rob Herring,
Thanks for review.
Regards,
Piyush Mehta
-----Original Message-----
From: Rob Herring <[email protected]>
Sent: Tuesday, September 15, 2020 1:39 AM
To: Piyush Mehta <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; git <[email protected]>; Srinivas Goud <[email protected]>; Michal Simek <[email protected]>
Subject: Re: [PATCH 2/2] dt-bindings: ata: achi: ceva: Update documentation for CEVA Controller
On Wed, Sep 02, 2020 at 12:35:48PM +0530, Piyush Mehta wrote:
> This patch updates the documentation for the CEVA controller for
> adding the required properties for 'phys' and 'resets'.
>
> Signed-off-by: Piyush Mehta <[email protected]>
> ---
> Documentation/devicetree/bindings/ata/ahci-ceva.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> index 7561cc4..f01d317 100644
> --- a/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> +++ b/Documentation/devicetree/bindings/ata/ahci-ceva.txt
> @@ -35,6 +35,10 @@ Required properties:
> ceva,pN-retry-params = /bits/ 16 <RIT RCT>;
> RIT: Retry Interval Timer.
> RCT: Rate Change Timer.
> + - phys: phandle for the PHY device
> + - phy-names: Should be "sata-phy"
> + - resets: phandle to the reset controller for the SATA IP
> + - reset-names: Should be "sata_rst".
The names here are rather pointless. You don't really need them if only
1 entry.
>
> Optional properties:
> - ceva,broken-gen2: limit to gen1 speed instead of gen2.
> @@ -56,4 +60,8 @@ Examples:
> ceva,p1-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
> ceva,p1-retry-params = /bits/ 16 <0x0216 0x7F06>;
> ceva,broken-gen2;
> + phy-names = "sata-phy";
> + phys = <&psgtr 1 PHY_TYPE_SATA 1 1>;
> + reset-names = "sata_rst";
> + resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;
> };
> --
> 2.7.4
>