From: Anthony Foiani <tkil@scrye•com>
To: Jeff Garzik <jgarzik@pobox•com>
Cc: Scott Wood <scottwood@freescale•com>,
"Robert P.J.Day" <rpjday@crashcourse•ca>,
"linuxppc-dev@lists•ozlabs.org" <linuxppc-dev@lists•ozlabs.org>,
Li Yang-R58472 <r58472@freescale•com>,
Adrian Bunk <bunk@stusta•de>
Subject: Re: ppc/sata-fsl: orphan config value: CONFIG_MPC8315_DS
Date: Wed, 08 May 2013 06:04:39 -0600 [thread overview]
Message-ID: <g7gj9smnc.fsf@dworkin.scrye.com> (raw)
In-Reply-To: <87a9odrinu.fsf@hum.int.foiani.com> (Anthony Foiani's message of "Thu\, 02 May 2013 00\:37\:57 -0600")
Anthony Foiani <tkil@scrye•com> writes:
> Maybe I need to call ata_set_sata_spd as well. Can I do that before
> discovery, or should it be a part of the port_start callback? And
> if the latter, shouldn't it be handled within the ata core, instead
> of expecting each host driver to do that call?
My final version calls sata_set_spd from within the hard reset
callback for the fsl sata driver.
If there's a better place to put it, please let me know.
With this patch (and an appropriate entry in the device tree), the
machine comes up and reports:
# cd /sys/devices/e0000000.immr/e0019000.sata
# find * -name '*_spd*' -print | xargs grep .
ata2/link2/ata_link/link2/sata_spd:1.5 Gbps
ata2/link2/ata_link/link2/hw_sata_spd_limit:1.5 Gbps
ata2/link2/ata_link/link2/sata_spd_limit:1.5 Gbps
Which is what I needed to see.
Thanks for the hints!
Best regards,
Anthony Foiani
--
>From 357c96b4f31b457eca0b96147c749c21d0f4f086 Mon Sep 17 00:00:00 2001
From: Anthony Foiani <anthony.foiani@gmail•com>
Date: Wed, 8 May 2013 05:24:20 -0600
Subject: [PATCH] sata: fsl: allow device tree to limit sata speed.
There used to be an "orphan" config symbol (CONFIG_MPC8315_DS) that
would artificially limit SATA speed to generation 1 (1.5Gbps).
Since that config symbol got lost whenever any sort of configuration
was done, we instead extract the limitation from the device tree,
using a new name "sata-spd-limit".
Signed-off-by: Anthony Foiani <anthony.foiani@gmail•com>
---
.../devicetree/bindings/powerpc/fsl/board.txt | 23 ++++++++++++++++++
drivers/ata/sata_fsl.c | 28 +++++++++++-----------
2 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/board.txt b/Documentation/devicetree/bindings/powerpc/fsl/board.txt
index 380914e..9c9fed4 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/board.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/board.txt
@@ -67,3 +67,26 @@ Example:
gpio-controller;
};
};
+
+* Maximum SATA Generation workaround
+
+Some boards advertise SATA speeds that they cannot actually achieve.
+Previously, this was dealt with via the orphaned config symbol
+CONFIG_MPC8315_DS. We now have a device tree property
+"sata-spd-limit" to control this. It should live within the "sata"
+block.
+
+Example:
+
+ sata@18000 {
+ compatible = "fsl,mpc8315-sata", "fsl,pq-sata";
+ reg = <0x18000 0x1000>;
+ cell-index = <1>;
+ interrupts = <44 0x8>;
+ interrupt-parent = <&ipic>;
+ sata-spd-limit = <1>;
+ };
+
+By default, there is no limitation; if a value is given, it indicates
+the maximum "generation" that should be negotiated. Gen 1 is 1.5Gbps,
+Gen 2 is 3.0Gbps.
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index d6577b9..9e3f3ec 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -726,20 +726,6 @@ static int sata_fsl_port_start(struct ata_port *ap)
VPRINTK("HControl = 0x%x\n", ioread32(hcr_base + HCONTROL));
VPRINTK("CHBA = 0x%x\n", ioread32(hcr_base + CHBA));
-#ifdef CONFIG_MPC8315_DS
- /*
- * Workaround for 8315DS board 3gbps link-up issue,
- * currently limit SATA port to GEN1 speed
- */
- sata_fsl_scr_read(&ap->link, SCR_CONTROL, &temp);
- temp &= ~(0xF << 4);
- temp |= (0x1 << 4);
- sata_fsl_scr_write(&ap->link, SCR_CONTROL, temp);
-
- sata_fsl_scr_read(&ap->link, SCR_CONTROL, &temp);
- dev_warn(dev, "scr_control, speed limited to %x\n", temp);
-#endif
-
return 0;
}
@@ -836,6 +822,11 @@ try_offline_again:
*/
ata_msleep(ap, 1);
+ /* if the device tree forces a speed limit, set it here. */
+ ata_link_info(link, "setting speed (in hard reset)\n");
+ DPRINTK("setting spd_limit\n");
+ sata_set_spd(link);
+
/*
* Now, bring the host controller online again, this can take time
* as PHY reset and communication establishment, 1st D2H FIS and
@@ -1444,6 +1435,15 @@ static int sata_fsl_probe(struct platform_device *ofdev)
goto error_exit_with_cleanup;
}
+ /* record speed limit if requested by device tree */
+ if (!of_property_read_u32(ofdev->dev.of_node, "sata-spd-limit",
+ &temp)) {
+ int i;
+ for (i = 0; i < SATA_FSL_MAX_PORTS; ++i)
+ host->ports[i]->link.hw_sata_spd_limit = temp;
+ dev_warn(&ofdev->dev, "speed limit set to gen %u\n", temp);
+ }
+
/* host->iomap is not used currently */
host->private_data = host_priv;
--
1.8.1.4
next prev parent reply other threads:[~2013-05-08 12:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-17 17:08 ppc/sata-fsl: orphan config value: CONFIG_MPC8315_DS Anthony Foiani
2012-05-21 6:31 ` Li Yang-R58472
2012-05-26 6:53 ` Anthony Foiani
2012-05-29 18:02 ` Scott Wood
2012-05-29 22:07 ` Anthony Foiani
2012-05-29 22:57 ` Scott Wood
2012-05-30 10:59 ` Li Yang
2012-05-30 20:07 ` Anthony Foiani
2012-05-30 20:14 ` Anthony Foiani
2012-05-30 20:20 ` Scott Wood
2012-05-30 20:52 ` Anthony Foiani
2013-04-30 6:41 ` Anthony Foiani
2013-04-30 18:15 ` Scott Wood
2013-05-01 0:34 ` Anthony Foiani
2013-05-01 0:42 ` Scott Wood
2013-05-01 2:06 ` Anthony Foiani
2013-05-01 18:05 ` Scott Wood
2013-05-01 23:35 ` Anthony Foiani
2013-05-02 0:13 ` Scott Wood
2013-04-30 21:35 ` Jeff Garzik
2013-05-02 6:37 ` Anthony Foiani
2013-05-08 12:04 ` Anthony Foiani [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-23 19:25 Scott Wood
2013-08-23 23:41 ` Anthony Foiani
2013-08-23 23:47 ` Scott Wood
2013-08-24 8:03 ` Anthony Foiani
2013-08-27 10:51 ` Xie Shaohui-B21989
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=g7gj9smnc.fsf@dworkin.scrye.com \
--to=tkil@scrye$(echo .)com \
--cc=bunk@stusta$(echo .)de \
--cc=jgarzik@pobox$(echo .)com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=r58472@freescale$(echo .)com \
--cc=rpjday@crashcourse$(echo .)ca \
--cc=scottwood@freescale$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox