* [PATCH] dp83640: Ensure against premature access to PHY registers after reset
@ 2018-04-06 14:05 Esben Haabendal
2018-04-06 14:14 ` Andrew Lunn
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Esben Haabendal @ 2018-04-06 14:05 UTC (permalink / raw)
To: netdev
Cc: Esben Haabendal, Richard Cochran, Andrew Lunn, Florian Fainelli,
linux-kernel
From: Esben Haabendal <eha@deif.com>
Signed-off-by: Esben Haabendal <eha@deif.com>
---
drivers/net/phy/dp83640.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 654f42d00092..48403170096a 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1207,6 +1207,22 @@ static void dp83640_remove(struct phy_device *phydev)
kfree(dp83640);
}
+static int dp83640_soft_reset(struct phy_device *phydev)
+{
+ int ret;
+
+ ret = genphy_soft_reset(phydev);
+ if (ret < 0)
+ return ret;
+
+ /* From DP83640 datasheet: "Software driver code must wait 3 us
+ * following a software reset before allowing further serial MII
+ * operations with the DP83640." */
+ udelay(3);
+
+ return 0;
+}
+
static int dp83640_config_init(struct phy_device *phydev)
{
struct dp83640_private *dp83640 = phydev->priv;
@@ -1501,6 +1517,7 @@ static struct phy_driver dp83640_driver = {
.flags = PHY_HAS_INTERRUPT,
.probe = dp83640_probe,
.remove = dp83640_remove,
+ .soft_reset = dp83640_soft_reset,
.config_init = dp83640_config_init,
.ack_interrupt = dp83640_ack_interrupt,
.config_intr = dp83640_config_intr,
--
2.16.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 14:05 [PATCH] dp83640: Ensure against premature access to PHY registers after reset Esben Haabendal
@ 2018-04-06 14:14 ` Andrew Lunn
2018-04-06 15:13 ` David Miller
2018-04-06 17:08 ` [PATCH v2] " Esben Haabendal
2018-04-10 13:50 ` [PATCH] " Sasha Levin
2 siblings, 1 reply; 10+ messages in thread
From: Andrew Lunn @ 2018-04-06 14:14 UTC (permalink / raw)
To: Esben Haabendal
Cc: netdev, Esben Haabendal, Richard Cochran, Florian Fainelli,
linux-kernel
On Fri, Apr 06, 2018 at 04:05:40PM +0200, Esben Haabendal wrote:
> From: Esben Haabendal <eha@deif.com>
>
> Signed-off-by: Esben Haabendal <eha@deif.com>
> ---
> drivers/net/phy/dp83640.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
> index 654f42d00092..48403170096a 100644
> --- a/drivers/net/phy/dp83640.c
> +++ b/drivers/net/phy/dp83640.c
> @@ -1207,6 +1207,22 @@ static void dp83640_remove(struct phy_device *phydev)
> kfree(dp83640);
> }
>
> +static int dp83640_soft_reset(struct phy_device *phydev)
> +{
> + int ret;
> +
> + ret = genphy_soft_reset(phydev);
> + if (ret < 0)
> + return ret;
> +
> + /* From DP83640 datasheet: "Software driver code must wait 3 us
> + * following a software reset before allowing further serial MII
> + * operations with the DP83640." */
> + udelay(3);
Hi Esben
The accuracy of udelay() is not guaranteed. So you probably want to be
a bit pessimistic, and use 10.
Andrew
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 14:14 ` Andrew Lunn
@ 2018-04-06 15:13 ` David Miller
2018-04-06 17:06 ` Esben Haabendal
0 siblings, 1 reply; 10+ messages in thread
From: David Miller @ 2018-04-06 15:13 UTC (permalink / raw)
To: andrew
Cc: esben.haabendal, netdev, eha, richardcochran, f.fainelli,
linux-kernel
From: Andrew Lunn <andrew@lunn.ch>
Date: Fri, 6 Apr 2018 16:14:10 +0200
> On Fri, Apr 06, 2018 at 04:05:40PM +0200, Esben Haabendal wrote:
>> From: Esben Haabendal <eha@deif.com>
>>
>> Signed-off-by: Esben Haabendal <eha@deif.com>
>> ---
>> drivers/net/phy/dp83640.c | 17 +++++++++++++++++
>> 1 file changed, 17 insertions(+)
>>
>> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
>> index 654f42d00092..48403170096a 100644
>> --- a/drivers/net/phy/dp83640.c
>> +++ b/drivers/net/phy/dp83640.c
>> @@ -1207,6 +1207,22 @@ static void dp83640_remove(struct phy_device *phydev)
>> kfree(dp83640);
>> }
>>
>> +static int dp83640_soft_reset(struct phy_device *phydev)
>> +{
>> + int ret;
>> +
>> + ret = genphy_soft_reset(phydev);
>> + if (ret < 0)
>> + return ret;
>> +
>> + /* From DP83640 datasheet: "Software driver code must wait 3 us
>> + * following a software reset before allowing further serial MII
>> + * operations with the DP83640." */
>> + udelay(3);
>
> Hi Esben
>
> The accuracy of udelay() is not guaranteed. So you probably want to be
> a bit pessimistic, and use 10.
Agreed.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 15:13 ` David Miller
@ 2018-04-06 17:06 ` Esben Haabendal
0 siblings, 0 replies; 10+ messages in thread
From: Esben Haabendal @ 2018-04-06 17:06 UTC (permalink / raw)
To: David Miller; +Cc: andrew, netdev, richardcochran, f.fainelli, linux-kernel
David Miller <davem@davemloft.net> writes:
> From: Andrew Lunn <andrew@lunn.ch>
> Date: Fri, 6 Apr 2018 16:14:10 +0200
>
>> On Fri, Apr 06, 2018 at 04:05:40PM +0200, Esben Haabendal wrote:
>>> From: Esben Haabendal <eha@deif.com>
>>>
>>> Signed-off-by: Esben Haabendal <eha@deif.com>
>>> ---
>>> drivers/net/phy/dp83640.c | 17 +++++++++++++++++
>>> 1 file changed, 17 insertions(+)
>>>
>>> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
>>> index 654f42d00092..48403170096a 100644
>>> --- a/drivers/net/phy/dp83640.c
>>> +++ b/drivers/net/phy/dp83640.c
>>> @@ -1207,6 +1207,22 @@ static void dp83640_remove(struct phy_device *phydev)
>>> kfree(dp83640);
>>> }
>>>
>>> +static int dp83640_soft_reset(struct phy_device *phydev)
>>> +{
>>> + int ret;
>>> +
>>> + ret = genphy_soft_reset(phydev);
>>> + if (ret < 0)
>>> + return ret;
>>> +
>>> + /* From DP83640 datasheet: "Software driver code must wait 3 us
>>> + * following a software reset before allowing further serial MII
>>> + * operations with the DP83640." */
>>> + udelay(3);
>>
>> Hi Esben
>>
>> The accuracy of udelay() is not guaranteed. So you probably want to be
>> a bit pessimistic, and use 10.
Ok, will do.
/Esben
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 14:05 [PATCH] dp83640: Ensure against premature access to PHY registers after reset Esben Haabendal
2018-04-06 14:14 ` Andrew Lunn
@ 2018-04-06 17:08 ` Esben Haabendal
2018-04-06 17:23 ` Andrew Lunn
` (2 more replies)
2018-04-10 13:50 ` [PATCH] " Sasha Levin
2 siblings, 3 replies; 10+ messages in thread
From: Esben Haabendal @ 2018-04-06 17:08 UTC (permalink / raw)
To: netdev; +Cc: andrew, richardcochran, f.fainelli, linux-kernel, Esben Haabendal
From: Esben Haabendal <eha@deif.com>
Signed-off-by: Esben Haabendal <eha@deif.com>
---
drivers/net/phy/dp83640.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 654f42d00092..a6c87793d899 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1207,6 +1207,23 @@ static void dp83640_remove(struct phy_device *phydev)
kfree(dp83640);
}
+static int dp83640_soft_reset(struct phy_device *phydev)
+{
+ int ret;
+
+ ret = genphy_soft_reset(phydev);
+ if (ret < 0)
+ return ret;
+
+ /* From DP83640 datasheet: "Software driver code must wait 3 us
+ * following a software reset before allowing further serial MII
+ * operations with the DP83640."
+ */
+ udelay(10); /* Taking udelay inaccuracy into account */
+
+ return 0;
+}
+
static int dp83640_config_init(struct phy_device *phydev)
{
struct dp83640_private *dp83640 = phydev->priv;
@@ -1501,6 +1518,7 @@ static struct phy_driver dp83640_driver = {
.flags = PHY_HAS_INTERRUPT,
.probe = dp83640_probe,
.remove = dp83640_remove,
+ .soft_reset = dp83640_soft_reset,
.config_init = dp83640_config_init,
.ack_interrupt = dp83640_ack_interrupt,
.config_intr = dp83640_config_intr,
--
2.16.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 17:08 ` [PATCH v2] " Esben Haabendal
@ 2018-04-06 17:23 ` Andrew Lunn
2018-04-08 20:17 ` [PATCH v3] " Esben Haabendal
2018-04-10 13:50 ` [PATCH v2] " Sasha Levin
2 siblings, 0 replies; 10+ messages in thread
From: Andrew Lunn @ 2018-04-06 17:23 UTC (permalink / raw)
To: Esben Haabendal
Cc: netdev, richardcochran, f.fainelli, linux-kernel, Esben Haabendal
On Fri, Apr 06, 2018 at 07:08:44PM +0200, Esben Haabendal wrote:
> From: Esben Haabendal <eha@deif.com>
Hi Esben
It it good to have some form of commit message. Something like:
The datasheet specifies a 3uS pause after performing a software
reset. The default implementation of genphy_soft_reset() does not
provide this, so implement soft_reset with the needed pause.
With that, or something similar added:
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v3] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 17:08 ` [PATCH v2] " Esben Haabendal
2018-04-06 17:23 ` Andrew Lunn
@ 2018-04-08 20:17 ` Esben Haabendal
2018-04-08 23:59 ` David Miller
2018-04-10 13:50 ` [PATCH v2] " Sasha Levin
2 siblings, 1 reply; 10+ messages in thread
From: Esben Haabendal @ 2018-04-08 20:17 UTC (permalink / raw)
To: netdev
Cc: Esben Haabendal, Richard Cochran, Andrew Lunn, Florian Fainelli,
linux-kernel
From: Esben Haabendal <eha@deif.com>
The datasheet specifies a 3uS pause after performing a software
reset. The default implementation of genphy_soft_reset() does not
provide this, so implement soft_reset with the needed pause.
Signed-off-by: Esben Haabendal <eha@deif.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/phy/dp83640.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 654f42d00092..a6c87793d899 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1207,6 +1207,23 @@ static void dp83640_remove(struct phy_device *phydev)
kfree(dp83640);
}
+static int dp83640_soft_reset(struct phy_device *phydev)
+{
+ int ret;
+
+ ret = genphy_soft_reset(phydev);
+ if (ret < 0)
+ return ret;
+
+ /* From DP83640 datasheet: "Software driver code must wait 3 us
+ * following a software reset before allowing further serial MII
+ * operations with the DP83640."
+ */
+ udelay(10); /* Taking udelay inaccuracy into account */
+
+ return 0;
+}
+
static int dp83640_config_init(struct phy_device *phydev)
{
struct dp83640_private *dp83640 = phydev->priv;
@@ -1501,6 +1518,7 @@ static struct phy_driver dp83640_driver = {
.flags = PHY_HAS_INTERRUPT,
.probe = dp83640_probe,
.remove = dp83640_remove,
+ .soft_reset = dp83640_soft_reset,
.config_init = dp83640_config_init,
.ack_interrupt = dp83640_ack_interrupt,
.config_intr = dp83640_config_intr,
--
2.16.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3] dp83640: Ensure against premature access to PHY registers after reset
2018-04-08 20:17 ` [PATCH v3] " Esben Haabendal
@ 2018-04-08 23:59 ` David Miller
0 siblings, 0 replies; 10+ messages in thread
From: David Miller @ 2018-04-08 23:59 UTC (permalink / raw)
To: esben.haabendal
Cc: netdev, eha, richardcochran, andrew, f.fainelli, linux-kernel
From: Esben Haabendal <esben.haabendal@gmail.com>
Date: Sun, 8 Apr 2018 22:17:01 +0200
> From: Esben Haabendal <eha@deif.com>
>
> The datasheet specifies a 3uS pause after performing a software
> reset. The default implementation of genphy_soft_reset() does not
> provide this, so implement soft_reset with the needed pause.
>
> Signed-off-by: Esben Haabendal <eha@deif.com>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Applied, thank you.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 17:08 ` [PATCH v2] " Esben Haabendal
2018-04-06 17:23 ` Andrew Lunn
2018-04-08 20:17 ` [PATCH v3] " Esben Haabendal
@ 2018-04-10 13:50 ` Sasha Levin
2 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2018-04-10 13:50 UTC (permalink / raw)
To: Sasha Levin, Esben Haabendal, Esben Haabendal,
netdev@vger.kernel.org
Cc: andrew@lunn.ch, richardcochran@gmail.com, f.fainelli@gmail.com,
stable@vger.kernel.org
Hi,
[This is an automated email]
This commit has been processed by the -stable helper bot and determined
to be a high probability candidate for -stable trees. (score: 7.2454)
The bot has tested the following trees: v4.16.1, v4.15.16, v4.14.33, v4.9.93, v4.4.127.
v4.16.1: Build OK!
v4.15.16: Build OK!
v4.14.33: Build OK!
v4.9.93: Build OK!
v4.4.127: Build OK!
Please let us know if you'd like to have this patch included in a stable tree.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] dp83640: Ensure against premature access to PHY registers after reset
2018-04-06 14:05 [PATCH] dp83640: Ensure against premature access to PHY registers after reset Esben Haabendal
2018-04-06 14:14 ` Andrew Lunn
2018-04-06 17:08 ` [PATCH v2] " Esben Haabendal
@ 2018-04-10 13:50 ` Sasha Levin
2 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2018-04-10 13:50 UTC (permalink / raw)
To: Sasha Levin, Esben Haabendal, Esben Haabendal,
netdev@vger.kernel.org
Cc: Esben Haabendal, stable@vger.kernel.org
Hi,
[This is an automated email]
This commit has been processed by the -stable helper bot and determined
to be a high probability candidate for -stable trees. (score: 6.8160)
The bot has tested the following trees: v4.16.1, v4.15.16, v4.14.33, v4.9.93, v4.4.127.
v4.16.1: Build OK!
v4.15.16: Build OK!
v4.14.33: Build OK!
v4.9.93: Build OK!
v4.4.127: Build OK!
Please let us know if you'd like to have this patch included in a stable tree.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-04-10 13:50 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-06 14:05 [PATCH] dp83640: Ensure against premature access to PHY registers after reset Esben Haabendal
2018-04-06 14:14 ` Andrew Lunn
2018-04-06 15:13 ` David Miller
2018-04-06 17:06 ` Esben Haabendal
2018-04-06 17:08 ` [PATCH v2] " Esben Haabendal
2018-04-06 17:23 ` Andrew Lunn
2018-04-08 20:17 ` [PATCH v3] " Esben Haabendal
2018-04-08 23:59 ` David Miller
2018-04-10 13:50 ` [PATCH v2] " Sasha Levin
2018-04-10 13:50 ` [PATCH] " Sasha Levin
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).