* [PATCH] phy: uniphier-usb3ss: fix unintended writing zeros to PHY register
@ 2021-12-22 5:19 Kunihiko Hayashi
2021-12-23 12:46 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Kunihiko Hayashi @ 2021-12-22 5:19 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Vinod Koul
Cc: Masami Hiramatsu, Ryuta NAKANISHI, linux-phy, linux-arm-kernel,
linux-kernel, Kunihiko Hayashi
From: Ryuta NAKANISHI <nakanishi.ryuta@socionext.com>
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>
---
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 7ce611c2088b..f402ed8732fd 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.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] phy: uniphier-usb3ss: fix unintended writing zeros to PHY register
2021-12-22 5:19 [PATCH] phy: uniphier-usb3ss: fix unintended writing zeros to PHY register Kunihiko Hayashi
@ 2021-12-23 12:46 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2021-12-23 12:46 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: Kishon Vijay Abraham I, Masami Hiramatsu, Ryuta NAKANISHI,
linux-phy, linux-arm-kernel, linux-kernel
On 22-12-21, 14:19, Kunihiko Hayashi wrote:
> From: Ryuta NAKANISHI <nakanishi.ryuta@socionext.com>
>
> 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.
Applied, thanks
--
~Vinod
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-23 12:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-22 5:19 [PATCH] phy: uniphier-usb3ss: fix unintended writing zeros to PHY register Kunihiko Hayashi
2021-12-23 12:46 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).