lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0505/1039] phy: uniphier-usb3ss: fix unintended writing zeros to PHY register
    Date
    From: Ryuta NAKANISHI <nakanishi.ryuta@socionext.com>

    [ Upstream commit 898c7a9ec81620125f2463714a0f4dea18ad6e54 ]

    Similar to commit 4a90bbb478db ("phy: uniphier-pcie: Fix updating phy
    parameters"), in function uniphier_u3ssphy_set_param(), unintentionally
    write zeros to other fields when writing PHY registers.

    Fixes: 5ab43d0f8697 ("phy: socionext: add USB3 PHY driver for UniPhier SoC")
    Signed-off-by: Ryuta NAKANISHI <nakanishi.ryuta@socionext.com>
    Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
    Link: https://lore.kernel.org/r/1640150369-4134-1-git-send-email-hayashi.kunihiko@socionext.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/phy/socionext/phy-uniphier-usb3ss.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/phy/socionext/phy-uniphier-usb3ss.c b/drivers/phy/socionext/phy-uniphier-usb3ss.c
    index 6700645bcbe6b..3b5ffc16a6947 100644
    --- a/drivers/phy/socionext/phy-uniphier-usb3ss.c
    +++ b/drivers/phy/socionext/phy-uniphier-usb3ss.c
    @@ -22,11 +22,13 @@
    #include <linux/reset.h>

    #define SSPHY_TESTI 0x0
    -#define SSPHY_TESTO 0x4
    #define TESTI_DAT_MASK GENMASK(13, 6)
    #define TESTI_ADR_MASK GENMASK(5, 1)
    #define TESTI_WR_EN BIT(0)

    +#define SSPHY_TESTO 0x4
    +#define TESTO_DAT_MASK GENMASK(7, 0)
    +
    #define PHY_F(regno, msb, lsb) { (regno), (msb), (lsb) }

    #define CDR_CPD_TRIM PHY_F(7, 3, 0) /* RxPLL charge pump current */
    @@ -84,12 +86,12 @@ static void uniphier_u3ssphy_set_param(struct uniphier_u3ssphy_priv *priv,
    val = FIELD_PREP(TESTI_DAT_MASK, 1);
    val |= FIELD_PREP(TESTI_ADR_MASK, p->field.reg_no);
    uniphier_u3ssphy_testio_write(priv, val);
    - val = readl(priv->base + SSPHY_TESTO);
    + val = readl(priv->base + SSPHY_TESTO) & TESTO_DAT_MASK;

    /* update value */
    - val &= ~FIELD_PREP(TESTI_DAT_MASK, field_mask);
    + val &= ~field_mask;
    data = field_mask & (p->value << p->field.lsb);
    - val = FIELD_PREP(TESTI_DAT_MASK, data);
    + val = FIELD_PREP(TESTI_DAT_MASK, data | val);
    val |= FIELD_PREP(TESTI_ADR_MASK, p->field.reg_no);
    uniphier_u3ssphy_testio_write(priv, val);
    uniphier_u3ssphy_testio_write(priv, val | TESTI_WR_EN);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-09-17 16:12    [W:5.883 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site