| Message ID | 1515720668-4860-2-git-send-email-f.fainelli@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | ata: ahci_brcm: Recover from failures to identify devices | expand |
On Friday 12 January 2018 07:01 AM, Florian Fainelli wrote: > Implement the calibration callback to allow turning on the Clock-Data > Recovery module clamping when necessary, e.g: during failure to identify > a SATA hard drive from ahci_brcm.c::brcm_ahci_read_id. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/phy/broadcom/phy-brcm-sata.c | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/drivers/phy/broadcom/phy-brcm-sata.c b/drivers/phy/broadcom/phy-brcm-sata.c > index 3f953db70288..8000ce312d95 100644 > --- a/drivers/phy/broadcom/phy-brcm-sata.c > +++ b/drivers/phy/broadcom/phy-brcm-sata.c > @@ -150,6 +150,9 @@ enum sata_phy_regs { > TXPMD_TX_FREQ_CTRL_CONTROL2_FMIN_MASK = 0x3ff, > TXPMD_TX_FREQ_CTRL_CONTROL3 = 0x84, > TXPMD_TX_FREQ_CTRL_CONTROL3_FMAX_MASK = 0x3ff, > + > + RXPMD_REG_BANK = 0x1c0, > + RXPMD_RX_FREQ_MON_CONTROL1 = 0x87, > }; > > enum sata_phy_ctrl_regs { > @@ -505,8 +508,37 @@ static int brcm_sata_phy_init(struct phy *phy) > return rc; > } > > +static void brcm_stb_sata_calibrate(struct brcm_sata_port *port) > +{ > + void __iomem *base = brcm_sata_pcb_base(port); > + struct brcm_sata_phy *priv = port->phy_priv; > + u32 tmp = BIT(8); > + > + brcm_sata_phy_wr(base, RXPMD_REG_BANK, RXPMD_RX_FREQ_MON_CONTROL1, > + ~tmp, tmp); > +} > + > +static int brcm_sata_phy_calibrate(struct phy *phy) > +{ > + struct brcm_sata_port *port = phy_get_drvdata(phy); > + int rc = -EOPNOTSUPP; > + > + switch (port->phy_priv->version) { > + case BRCM_SATA_PHY_STB_28NM: > + case BRCM_SATA_PHY_STB_40NM: > + brcm_stb_sata_calibrate(port); > + rc = 0; > + break; > + default: > + break; > + }; > + > + return rc; > +} > + > static const struct phy_ops phy_ops = { > .init = brcm_sata_phy_init, > + .calibrate = brcm_sata_phy_calibrate, > .owner = THIS_MODULE, > }; > > -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/phy/broadcom/phy-brcm-sata.c b/drivers/phy/broadcom/phy-brcm-sata.c index 3f953db70288..8000ce312d95 100644 --- a/drivers/phy/broadcom/phy-brcm-sata.c +++ b/drivers/phy/broadcom/phy-brcm-sata.c @@ -150,6 +150,9 @@ enum sata_phy_regs { TXPMD_TX_FREQ_CTRL_CONTROL2_FMIN_MASK = 0x3ff, TXPMD_TX_FREQ_CTRL_CONTROL3 = 0x84, TXPMD_TX_FREQ_CTRL_CONTROL3_FMAX_MASK = 0x3ff, + + RXPMD_REG_BANK = 0x1c0, + RXPMD_RX_FREQ_MON_CONTROL1 = 0x87, }; enum sata_phy_ctrl_regs { @@ -505,8 +508,37 @@ static int brcm_sata_phy_init(struct phy *phy) return rc; } +static void brcm_stb_sata_calibrate(struct brcm_sata_port *port) +{ + void __iomem *base = brcm_sata_pcb_base(port); + struct brcm_sata_phy *priv = port->phy_priv; + u32 tmp = BIT(8); + + brcm_sata_phy_wr(base, RXPMD_REG_BANK, RXPMD_RX_FREQ_MON_CONTROL1, + ~tmp, tmp); +} + +static int brcm_sata_phy_calibrate(struct phy *phy) +{ + struct brcm_sata_port *port = phy_get_drvdata(phy); + int rc = -EOPNOTSUPP; + + switch (port->phy_priv->version) { + case BRCM_SATA_PHY_STB_28NM: + case BRCM_SATA_PHY_STB_40NM: + brcm_stb_sata_calibrate(port); + rc = 0; + break; + default: + break; + }; + + return rc; +} + static const struct phy_ops phy_ops = { .init = brcm_sata_phy_init, + .calibrate = brcm_sata_phy_calibrate, .owner = THIS_MODULE, };
Implement the calibration callback to allow turning on the Clock-Data Recovery module clamping when necessary, e.g: during failure to identify a SATA hard drive from ahci_brcm.c::brcm_ahci_read_id. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/phy/broadcom/phy-brcm-sata.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)