Fix typo s/mechansim/mechanism/
Signed-off-by: Antonio Borneo <[email protected]>
---
drivers/ptp/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 960961fb0d7c..0517272a268e 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -97,8 +97,8 @@ config PTP_1588_CLOCK_PCH
help
This driver adds support for using the PCH EG20T as a PTP
clock. The hardware supports time stamping of PTP packets
- when using the end-to-end delay (E2E) mechansim. The peer
- delay mechansim (P2P) is not supported.
+ when using the end-to-end delay (E2E) mechanism. The peer
+ delay mechanism (P2P) is not supported.
This clock is only useful if your PTP programs are getting
hardware time stamps on the PTP Ethernet packets using the
--
2.23.0
All the registers and the functionalities used in the callback
dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
5.00a [2].
Reuse the same callback for dwmac 4.10a too.
Tested on STM32MP15x, based on dwmac 4.10a.
[1] DWC Ethernet QoS Databook 4.10a October 2014
[2] DWC Ethernet QoS Databook 5.00a September 2017
Signed-off-by: Antonio Borneo <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 2cb9c53f93b8..3006047213ea 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
.pcs_get_adv_lp = dwmac4_get_adv_lp,
.debug = dwmac4_debug,
.set_filter = dwmac4_set_filter,
+ .flex_pps_config = dwmac5_flex_pps_config,
.set_mac_loopback = dwmac4_set_mac_loopback,
.update_vlan_hash = dwmac4_update_vlan_hash,
.sarc_configure = dwmac4_sarc_configure,
--
2.23.0
From: Antonio Borneo <[email protected]>
Date: Mon, 7 Oct 2019 17:43:02 +0200
> Fix typo s/mechansim/mechanism/
>
> Signed-off-by: Antonio Borneo <[email protected]>
Applied, thank you.
On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
> All the registers and the functionalities used in the callback
> dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
> 5.00a [2].
>
> Reuse the same callback for dwmac 4.10a too.
>
> Tested on STM32MP15x, based on dwmac 4.10a.
>
> [1] DWC Ethernet QoS Databook 4.10a October 2014
> [2] DWC Ethernet QoS Databook 5.00a September 2017
>
> Signed-off-by: Antonio Borneo <[email protected]>
Applied to net-next.
Hello Jakub,
On 10.10.19 00:26, Jakub Kicinski wrote:
> On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
>> All the registers and the functionalities used in the callback
>> dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
>> 5.00a [2].
>>
>> Reuse the same callback for dwmac 4.10a too.
>>
>> Tested on STM32MP15x, based on dwmac 4.10a.
>>
>> [1] DWC Ethernet QoS Databook 4.10a October 2014
>> [2] DWC Ethernet QoS Databook 5.00a September 2017
>>
>> Signed-off-by: Antonio Borneo <[email protected]>
>
> Applied to net-next.
This patch seems to have been fuzzily applied at the wrong location.
The diff describes extension of dwmac 4.10a and so does the @@ line:
@@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
The patch was applied mainline as 757926247836 ("net: stmmac: add
flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead:
@@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = {
I don't know if dwmac4 actually supports FlexPPS, so I think it's
better to be on the safe side and revert 757926247836 and add the
change for the correct variant.
Cheers,
Ahmad
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
On Tue, 2020-11-24 at 15:15 +0100, Ahmad Fatoum wrote:
> Hello Jakub,
>
> On 10.10.19 00:26, Jakub Kicinski wrote:
> > On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
> > > All the registers and the functionalities used in the callback
> > > dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
> > > 5.00a [2].
> > >
> > > Reuse the same callback for dwmac 4.10a too.
> > >
> > > Tested on STM32MP15x, based on dwmac 4.10a.
> > >
> > > [1] DWC Ethernet QoS Databook 4.10a October 2014
> > > [2] DWC Ethernet QoS Databook 5.00a September 2017
> > >
> > > Signed-off-by: Antonio Borneo <[email protected]>
> >
> > Applied to net-next.
>
> This patch seems to have been fuzzily applied at the wrong location.
> The diff describes extension of dwmac 4.10a and so does the @@ line:
>
> @@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
>
> The patch was applied mainline as 757926247836 ("net: stmmac: add
> flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead:
>
> @@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = {
>
> I don't know if dwmac4 actually supports FlexPPS, so I think it's
> better to be on the safe side and revert 757926247836 and add the
> change for the correct variant.
Agree,
the patch get applied to the wrong place!
Antonio
>
> Cheers,
> Ahmad
>
>
On Tue, 24 Nov 2020 15:23:27 +0100 Antonio Borneo wrote:
> On Tue, 2020-11-24 at 15:15 +0100, Ahmad Fatoum wrote:
> > On 10.10.19 00:26, Jakub Kicinski wrote:
> > > On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
> > > > All the registers and the functionalities used in the callback
> > > > dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
> > > > 5.00a [2].
> > > >
> > > > Reuse the same callback for dwmac 4.10a too.
> > > >
> > > > Tested on STM32MP15x, based on dwmac 4.10a.
> > > >
> > > > [1] DWC Ethernet QoS Databook 4.10a October 2014
> > > > [2] DWC Ethernet QoS Databook 5.00a September 2017
> > > >
> > > > Signed-off-by: Antonio Borneo <[email protected]>
> > >
> > > Applied to net-next.
> >
> > This patch seems to have been fuzzily applied at the wrong location.
> > The diff describes extension of dwmac 4.10a and so does the @@ line:
> >
> > @@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
> >
> > The patch was applied mainline as 757926247836 ("net: stmmac: add
> > flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead:
> >
> > @@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = {
> >
> > I don't know if dwmac4 actually supports FlexPPS, so I think it's
> > better to be on the safe side and revert 757926247836 and add the
> > change for the correct variant.
>
> Agree,
> the patch get applied to the wrong place!
:-o
This happens sometimes with stable backports but I've never seen it
happen working on "current" branches.
Sorry about that!
Would you mind sending the appropriate patches? I can do the revert if
you prefer, but since you need to send the fix anyway..
On Tue, 2020-11-24 at 10:20 -0800, Jakub Kicinski wrote:
> On Tue, 24 Nov 2020 15:23:27 +0100 Antonio Borneo wrote:
> > On Tue, 2020-11-24 at 15:15 +0100, Ahmad Fatoum wrote:
> > > On 10.10.19 00:26, Jakub Kicinski wrote:
> > > > On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
> > > > > All the registers and the functionalities used in the callback
> > > > > dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
> > > > > 5.00a [2].
> > > > >
> > > > > Reuse the same callback for dwmac 4.10a too.
> > > > >
> > > > > Tested on STM32MP15x, based on dwmac 4.10a.
> > > > >
> > > > > [1] DWC Ethernet QoS Databook 4.10a October 2014
> > > > > [2] DWC Ethernet QoS Databook 5.00a September 2017
> > > > >
> > > > > Signed-off-by: Antonio Borneo <[email protected]>
> > > >
> > > > Applied to net-next.
> > >
> > > This patch seems to have been fuzzily applied at the wrong location.
> > > The diff describes extension of dwmac 4.10a and so does the @@ line:
> > >
> > > @@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
> > >
> > > The patch was applied mainline as 757926247836 ("net: stmmac: add
> > > flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead:
> > >
> > > @@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = {
> > >
> > > I don't know if dwmac4 actually supports FlexPPS, so I think it's
> > > better to be on the safe side and revert 757926247836 and add the
> > > change for the correct variant.
> >
> > Agree,
> > the patch get applied to the wrong place!
>
> :-o
>
> This happens sometimes with stable backports but I've never seen it
> happen working on "current" branches.
>
> Sorry about that!
>
> Would you mind sending the appropriate patches? I can do the revert if
> you prefer, but since you need to send the fix anyway..
You mean sending two patches one for revert and one to re-apply the code?
Or a single patch for the fix?
Antonio
On Tue, 24 Nov 2020 19:27:03 +0100 Antonio Borneo wrote:
> On Tue, 2020-11-24 at 10:20 -0800, Jakub Kicinski wrote:
> > On Tue, 24 Nov 2020 15:23:27 +0100 Antonio Borneo wrote:
> > > On Tue, 2020-11-24 at 15:15 +0100, Ahmad Fatoum wrote:
> > > > On 10.10.19 00:26, Jakub Kicinski wrote:
> > > > > On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
> > > > > > All the registers and the functionalities used in the callback
> > > > > > dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
> > > > > > 5.00a [2].
> > > > > >
> > > > > > Reuse the same callback for dwmac 4.10a too.
> > > > > >
> > > > > > Tested on STM32MP15x, based on dwmac 4.10a.
> > > > > >
> > > > > > [1] DWC Ethernet QoS Databook 4.10a October 2014
> > > > > > [2] DWC Ethernet QoS Databook 5.00a September 2017
> > > > > >
> > > > > > Signed-off-by: Antonio Borneo <[email protected]>
> > > > >
> > > > > Applied to net-next.
> > > >
> > > > This patch seems to have been fuzzily applied at the wrong location.
> > > > The diff describes extension of dwmac 4.10a and so does the @@ line:
> > > >
> > > > @@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
> > > >
> > > > The patch was applied mainline as 757926247836 ("net: stmmac: add
> > > > flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead:
> > > >
> > > > @@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = {
> > > >
> > > > I don't know if dwmac4 actually supports FlexPPS, so I think it's
> > > > better to be on the safe side and revert 757926247836 and add the
> > > > change for the correct variant.
> > >
> > > Agree,
> > > the patch get applied to the wrong place!
> >
> > :-o
> >
> > This happens sometimes with stable backports but I've never seen it
> > happen working on "current" branches.
> >
> > Sorry about that!
> >
> > Would you mind sending the appropriate patches? I can do the revert if
> > you prefer, but since you need to send the fix anyway..
>
> You mean sending two patches one for revert and one to re-apply the code?
> Or a single patch for the fix?
Either way is fine by me. If I was doing it - I'd probably send just one
patch, but if you prefer to revert first - nothing wrong with that.
Commit 757926247836 ("net: stmmac: add flexible PPS to dwmac
4.10a") was intended to modify the struct dwmac410_ops, but it got
somehow badly merged and modified the struct dwmac4_ops.
Revert the modification in struct dwmac4_ops and re-apply it
properly in struct dwmac410_ops.
Fixes: 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a")
Cc: [email protected] # v5.6+
Signed-off-by: Antonio Borneo <[email protected]>
Reported-by: Ahmad Fatoum <[email protected]>
---
To: Alexandre Torgue <[email protected]>
To: Jose Abreu <[email protected]>
To: "David S. Miller" <[email protected]>
To: Jakub Kicinski <[email protected]>
Cc: Maxime Coquelin <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
In-Reply-To: <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 002791b77356..ced6d76a0d85 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -1171,7 +1171,6 @@ const struct stmmac_ops dwmac4_ops = {
.pcs_get_adv_lp = dwmac4_get_adv_lp,
.debug = dwmac4_debug,
.set_filter = dwmac4_set_filter,
- .flex_pps_config = dwmac5_flex_pps_config,
.set_mac_loopback = dwmac4_set_mac_loopback,
.update_vlan_hash = dwmac4_update_vlan_hash,
.sarc_configure = dwmac4_sarc_configure,
@@ -1213,6 +1212,7 @@ const struct stmmac_ops dwmac410_ops = {
.pcs_get_adv_lp = dwmac4_get_adv_lp,
.debug = dwmac4_debug,
.set_filter = dwmac4_set_filter,
+ .flex_pps_config = dwmac5_flex_pps_config,
.set_mac_loopback = dwmac4_set_mac_loopback,
.update_vlan_hash = dwmac4_update_vlan_hash,
.sarc_configure = dwmac4_sarc_configure,
base-commit: 9bd2702d292cb7b565b09e949d30288ab7a26d51
--
2.29.2
To += Jakub's new address
On 24.11.20 15:15, Ahmad Fatoum wrote:
> Hello Jakub,
>
> On 10.10.19 00:26, Jakub Kicinski wrote:
>> On Mon, 7 Oct 2019 17:43:06 +0200, Antonio Borneo wrote:
>>> All the registers and the functionalities used in the callback
>>> dwmac5_flex_pps_config() are common between dwmac 4.10a [1] and
>>> 5.00a [2].
>>>
>>> Reuse the same callback for dwmac 4.10a too.
>>>
>>> Tested on STM32MP15x, based on dwmac 4.10a.
>>>
>>> [1] DWC Ethernet QoS Databook 4.10a October 2014
>>> [2] DWC Ethernet QoS Databook 5.00a September 2017
>>>
>>> Signed-off-by: Antonio Borneo <[email protected]>
>>
>> Applied to net-next.
>
> This patch seems to have been fuzzily applied at the wrong location.
> The diff describes extension of dwmac 4.10a and so does the @@ line:
>
> @@ -864,6 +864,7 @@ const struct stmmac_ops dwmac410_ops = {
>
> The patch was applied mainline as 757926247836 ("net: stmmac: add
> flexible PPS to dwmac 4.10a"), but it extends dwmac4_ops instead:
>
> @@ -938,6 +938,7 @@ const struct stmmac_ops dwmac4_ops = {
>
> I don't know if dwmac4 actually supports FlexPPS, so I think it's
> better to be on the safe side and revert 757926247836 and add the
> change for the correct variant.
>
> Cheers,
> Ahmad
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hello,
On 24.11.20 23:37, Antonio Borneo wrote:
> Commit 757926247836 ("net: stmmac: add flexible PPS to dwmac
> 4.10a") was intended to modify the struct dwmac410_ops, but it got
> somehow badly merged and modified the struct dwmac4_ops.
>
> Revert the modification in struct dwmac4_ops and re-apply it
> properly in struct dwmac410_ops.
>
> Fixes: 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a")
> Cc: [email protected] # v5.6+
I don't think extension of dwmac410_ops should be backported to stable.
It's a new feature and should go into net-next like any other.
The fix that could be backported is reverting the unintentional change
of dwmac4.
Cheers,
Ahmad
> Signed-off-by: Antonio Borneo <[email protected]>
> Reported-by: Ahmad Fatoum <[email protected]>
> ---
> To: Alexandre Torgue <[email protected]>
> To: Jose Abreu <[email protected]>
> To: "David S. Miller" <[email protected]>
> To: Jakub Kicinski <[email protected]>
> Cc: Maxime Coquelin <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> In-Reply-To: <[email protected]>
> ---
> drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
> index 002791b77356..ced6d76a0d85 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
> @@ -1171,7 +1171,6 @@ const struct stmmac_ops dwmac4_ops = {
> .pcs_get_adv_lp = dwmac4_get_adv_lp,
> .debug = dwmac4_debug,
> .set_filter = dwmac4_set_filter,
> - .flex_pps_config = dwmac5_flex_pps_config,
> .set_mac_loopback = dwmac4_set_mac_loopback,
> .update_vlan_hash = dwmac4_update_vlan_hash,
> .sarc_configure = dwmac4_sarc_configure,
> @@ -1213,6 +1212,7 @@ const struct stmmac_ops dwmac410_ops = {
> .pcs_get_adv_lp = dwmac4_get_adv_lp,
> .debug = dwmac4_debug,
> .set_filter = dwmac4_set_filter,
> + .flex_pps_config = dwmac5_flex_pps_config,
> .set_mac_loopback = dwmac4_set_mac_loopback,
> .update_vlan_hash = dwmac4_update_vlan_hash,
> .sarc_configure = dwmac4_sarc_configure,
>
> base-commit: 9bd2702d292cb7b565b09e949d30288ab7a26d51
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
On Tue, 24 Nov 2020 23:37:29 +0100 Antonio Borneo wrote:
> Commit 757926247836 ("net: stmmac: add flexible PPS to dwmac
> 4.10a") was intended to modify the struct dwmac410_ops, but it got
> somehow badly merged and modified the struct dwmac4_ops.
>
> Revert the modification in struct dwmac4_ops and re-apply it
> properly in struct dwmac410_ops.
>
> Fixes: 757926247836 ("net: stmmac: add flexible PPS to dwmac 4.10a")
> Cc: [email protected] # v5.6+
> Signed-off-by: Antonio Borneo <[email protected]>
> Reported-by: Ahmad Fatoum <[email protected]>
Applied, and queued for 5.9 (all other 5.5+ branches are EOL by now).
Thanks!