Skip to contentSkip to conversation

phy: phy-brcm-sata: Allow configuration SATA AFE TX amplitude

PATCH Applied Florian Fainelli 2 participants 6 messages Oct 22, 2020 – Nov 16, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover phy: phy-brcm-sata: Allow configuration SATA AFE TX amplitude

Hi Vinod, Kishon,

This patch series allows the configuration of the Broadcom SATA PHY TX amplitude which may be required in order to meet specific tests.

Thanks!

Changes in v2:

- rebased against phy/next
- added Rob's Acked-by to the dt-binding patch

Florian Fainelli (2):
dt-bindings: phy: Allow defining the SATA AFE TX amplitude
phy: phy-brcm-sata: Allow configuration SATA AFE TX amplitude

 .../devicetree/bindings/phy/brcm-sata-phy.txt |  3 ++
 drivers/phy/broadcom/phy-brcm-sata.c          | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/2 dt-bindings: phy: Allow defining the SATA AFE TX amplitude

Document a new property which allows the selection of the SATA AFE TX amplitude in milli Volts. Possible values are 400, 500, 600 and 800mV.

---
 Documentation/devicetree/bindings/phy/brcm-sata-phy.txt | 3 +++
 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/phy/brcm-sata-phy.txt +3 -0
index c03ad2198410..e5abbace93a3 100644
@@ -38,6 +38,9 @@ Sub-nodes optional properties:
 - brcm,rxaeq-value: when 'rxaeq-mode' is set to "manual", provides the RX
   equalizer value that should be used. Allowed range is 0..63.
 
+- brcm,tx-amplitude-millivolt: transmit amplitude voltage in millivolt.
+  Possible values are 400, 500, 600 or 800 mV.
+
 Example
 	sata-phy@f0458100 {
 		compatible = "brcm,bcm7445-sata-phy", "brcm,phy-sata3";
Signature · 1 line
2.25.1
#2 lore raw

PATCH v2 2/2 phy: phy-brcm-sata: Allow configuration SATA AFE TX amplitude

In reply to Florian Fainelli

Read the 'brcm,tx-amplitude-millivolt' property from Device Tree and propagate its value into the appropriate test transmit register to change the TX amplitude.

---
 drivers/phy/broadcom/phy-brcm-sata.c | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
drivers/phy/broadcom/phy-brcm-sata.c +32 -0
index 18251f232172..7be3586b16cb 100644
@@ -65,6 +65,7 @@ struct brcm_sata_port {
 	bool ssc_en;
 	enum brcm_sata_phy_rxaeq_mode rxaeq_mode;
 	u32 rxaeq_val;
+	u32 tx_amplitude_val;
 };
 
 struct brcm_sata_phy {
@@ -84,6 +85,10 @@ enum sata_phy_regs {
 	BLOCK0_SPARE_OOB_CLK_SEL_MASK		= 0x3,
 	BLOCK0_SPARE_OOB_CLK_SEL_REFBY2		= 0x1,
 
+	BLOCK1_REG_BANK				= 0x10,
+	BLOCK1_TEST_TX				= 0x83,
+	BLOCK1_TEST_TX_AMP_SHIFT		= 12,
+
 	PLL_REG_BANK_0				= 0x050,
 	PLL_REG_BANK_0_PLLCONTROL_0		= 0x81,
 	PLLCONTROL_0_FREQ_DET_RESTART		= BIT(13),
@@ -379,6 +384,29 @@ static int brcm_stb_sata_16nm_ssc_init(struct brcm_sata_port *port)
 	brcm_sata_phy_wr(port, RXPMD_REG_BANK, RXPMD_RX_FREQ_MON_CONTROL1,
 			 ~tmp, RXPMD_MON_CORRECT_EN | value);
 
+	tmp = GENMASK(15, 12);
+	switch (port->tx_amplitude_val) {
+	case 400:
+		value = BIT(12) | BIT(13);
+		break;
+	case 500:
+		value = BIT(13);
+		break;
+	case 600:
+		value = BIT(12);
+		break;
+	case 800:
+		value = 0;
+		break;
+	default:
+		value = tmp;
+		break;
+	}
+
+	if (value != tmp)
+		brcm_sata_phy_wr(port, BLOCK1_REG_BANK, BLOCK1_TEST_TX, ~tmp,
+				 value);
+
 	/* Turn on/off SSC */
 	brcm_sata_phy_wr(port, TX_REG_BANK, TX_ACTRL5, ~TX_ACTRL5_SSC_EN,
 			 port->ssc_en ? TX_ACTRL5_SSC_EN : 0);
@@ -791,6 +819,10 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
 		if (port->rxaeq_mode == RXAEQ_MODE_MANUAL)
 			of_property_read_u32(child, "brcm,rxaeq-value",
 					     &port->rxaeq_val);
+
+		of_property_read_u32(child, "brcm,tx-amplitude-millivolt",
+				     &port->tx_amplitude_val);
+
 		port->ssc_en = of_property_read_bool(child, "brcm,enable-ssc");
 		if (IS_ERR(port->phy)) {
 			dev_err(dev, "failed to create PHY\n");
Signature · 1 line
2.25.1
#3 lore raw
In reply to Florian Fainelli
Quoted 8 lines · Florian Fainelli

Hi Vinod, Kishon,

This patch series allows the configuration of the Broadcom SATA PHY TX amplitude which may be required in order to meet specific tests.

Thanks!

Changes in v2:

Vinod, Kishon, can this be applied if you are okay with the changes? Thank you!

Quoted 12 lines

- rebased against phy/next
- added Rob's Acked-by to the dt-binding patch

Florian Fainelli (2):
dt-bindings: phy: Allow defining the SATA AFE TX amplitude
phy: phy-brcm-sata: Allow configuration SATA AFE TX amplitude

 .../devicetree/bindings/phy/brcm-sata-phy.txt |  3 ++
 drivers/phy/broadcom/phy-brcm-sata.c          | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+)
Signature · 1 line
Florian
maintainer Applied
#4 lore raw
In reply to Florian Fainelli
Quoted 4 lines · Florian Fainelli

Hi Vinod, Kishon,

This patch series allows the configuration of the Broadcom SATA PHY TX amplitude which may be required in order to meet specific tests.

Applied, thanks

Btw please do convert the binding doc to yaml

Thanks

Signature · 1 line
~Vinod
#5 lore raw
Quoted 9 lines · Vinod Koul
Quoted 4 lines · Florian Fainelli

Hi Vinod, Kishon,

This patch series allows the configuration of the Broadcom SATA PHY TX amplitude which may be required in order to meet specific tests.

Applied, thanks

Btw please do convert the binding doc to yaml

Will do, thanks!

Signature · 1 line
Florian