diff mbox series

[net] net: stmmac: Fix EST offset for dwmac 5.10

Message ID 20240220-stmmac_est-v1-1-c41f9ae2e7b7@linutronix.de (mailing list archive)
State Accepted
Commit 90d07e36d40079a22ca99edd2412e7e9c2382968
Delegated to: Netdev Maintainers
Headers show
Series [net] net: stmmac: Fix EST offset for dwmac 5.10 | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 956 this patch: 956
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 11 of 11 maintainers
netdev/build_clang success Errors and warnings before: 973 this patch: 973
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 973 this patch: 973
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-02-22--00-00 (tests: 1455)

Commit Message

Kurt Kanzenbach Feb. 20, 2024, 8:22 a.m. UTC
Fix EST offset for dwmac 5.10.

Currently configuring Qbv doesn't work as expected. The schedule is
configured, but never confirmed:

|[  128.250219] imx-dwmac 428a0000.ethernet eth1: configured EST

The reason seems to be the refactoring of the EST code which set the wrong
EST offset for the dwmac 5.10. After fixing this it works as before:

|[  106.359577] imx-dwmac 428a0000.ethernet eth1: configured EST
|[  128.430715] imx-dwmac 428a0000.ethernet eth1: EST: SWOL has been switched

Tested on imx93.

Fixes: c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 drivers/net/ethernet/stmicro/stmmac/hwif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: 40b9385dd8e6a0515e1c9cd06a277483556b7286
change-id: 20240220-stmmac_est-ea6884f9ba3c

Best regards,

Comments

Serge Semin Feb. 20, 2024, 9:20 a.m. UTC | #1
Hi Kurt

On Tue, Feb 20, 2024 at 09:22:46AM +0100, Kurt Kanzenbach wrote:
> Fix EST offset for dwmac 5.10.
> 
> Currently configuring Qbv doesn't work as expected. The schedule is
> configured, but never confirmed:
> 
> |[  128.250219] imx-dwmac 428a0000.ethernet eth1: configured EST
> 
> The reason seems to be the refactoring of the EST code which set the wrong
> EST offset for the dwmac 5.10. After fixing this it works as before:
> 
> |[  106.359577] imx-dwmac 428a0000.ethernet eth1: configured EST
> |[  128.430715] imx-dwmac 428a0000.ethernet eth1: EST: SWOL has been switched
> 
> Tested on imx93.
> 
> Fixes: c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
> Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
> ---
>  drivers/net/ethernet/stmicro/stmmac/hwif.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
> index 1bd34b2a47e8..29367105df54 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
> @@ -224,7 +224,7 @@ static const struct stmmac_hwif_entry {
>  		.regs = {
>  			.ptp_off = PTP_GMAC4_OFFSET,
>  			.mmc_off = MMC_GMAC4_OFFSET,
> -			.est_off = EST_XGMAC_OFFSET,
> +			.est_off = EST_GMAC4_OFFSET,

Unfortunate c&p typo indeed. Thanks for fixing it!
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>

-Serge(y)

>  		},
>  		.desc = &dwmac4_desc_ops,
>  		.dma = &dwmac410_dma_ops,
> 
> ---
> base-commit: 40b9385dd8e6a0515e1c9cd06a277483556b7286
> change-id: 20240220-stmmac_est-ea6884f9ba3c
> 
> Best regards,
> -- 
> Kurt Kanzenbach <kurt@linutronix.de>
> 
>
Kurt Kanzenbach Feb. 20, 2024, 9:44 a.m. UTC | #2
On Tue Feb 20 2024, Serge Semin wrote:
> Hi Kurt
>
> On Tue, Feb 20, 2024 at 09:22:46AM +0100, Kurt Kanzenbach wrote:
>> Fix EST offset for dwmac 5.10.
>> 
>> Currently configuring Qbv doesn't work as expected. The schedule is
>> configured, but never confirmed:
>> 
>> |[  128.250219] imx-dwmac 428a0000.ethernet eth1: configured EST
>> 
>> The reason seems to be the refactoring of the EST code which set the wrong
>> EST offset for the dwmac 5.10. After fixing this it works as before:
>> 
>> |[  106.359577] imx-dwmac 428a0000.ethernet eth1: configured EST
>> |[  128.430715] imx-dwmac 428a0000.ethernet eth1: EST: SWOL has been switched
>> 
>> Tested on imx93.
>> 
>> Fixes: c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
>> Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
>> ---
>>  drivers/net/ethernet/stmicro/stmmac/hwif.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
>> index 1bd34b2a47e8..29367105df54 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
>> @@ -224,7 +224,7 @@ static const struct stmmac_hwif_entry {
>>  		.regs = {
>>  			.ptp_off = PTP_GMAC4_OFFSET,
>>  			.mmc_off = MMC_GMAC4_OFFSET,
>> -			.est_off = EST_XGMAC_OFFSET,
>> +			.est_off = EST_GMAC4_OFFSET,
>
> Unfortunate c&p typo indeed. Thanks for fixing it!

No problem. I was just wondering why the confirmation message doesn't
show up after updating to v6.8-RT :-).

Thanks,
Kurt
patchwork-bot+netdevbpf@kernel.org Feb. 22, 2024, 1:20 a.m. UTC | #3
Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 20 Feb 2024 09:22:46 +0100 you wrote:
> Fix EST offset for dwmac 5.10.
> 
> Currently configuring Qbv doesn't work as expected. The schedule is
> configured, but never confirmed:
> 
> |[  128.250219] imx-dwmac 428a0000.ethernet eth1: configured EST
> 
> [...]

Here is the summary with links:
  - [net] net: stmmac: Fix EST offset for dwmac 5.10
    https://git.kernel.org/netdev/net/c/90d07e36d400

You are awesome, thank you!
Rohan G Thomas Feb. 22, 2024, 1:52 p.m. UTC | #4
Hi Kurt,

On Tue, Feb 20, 2024 at 09:22:46AM +0100, Kurt Kanzenbach wrote:
> Fix EST offset for dwmac 5.10.
> 
> Currently configuring Qbv doesn't work as expected. The schedule is
> configured, but never confirmed:
> 
> |[  128.250219] imx-dwmac 428a0000.ethernet eth1: configured EST
> 
> The reason seems to be the refactoring of the EST code which set the wrong
> EST offset for the dwmac 5.10. After fixing this it works as before:
> 
> |[  106.359577] imx-dwmac 428a0000.ethernet eth1: configured EST [
> |128.430715] imx-dwmac 428a0000.ethernet eth1: EST: SWOL has been
> |switched
> 
> Tested on imx93.
> 
> Fixes: c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
> Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
> ---

Thanks for fixing this. Sorry for the typo.

Best Regards,
Rohan
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
index 1bd34b2a47e8..29367105df54 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -224,7 +224,7 @@  static const struct stmmac_hwif_entry {
 		.regs = {
 			.ptp_off = PTP_GMAC4_OFFSET,
 			.mmc_off = MMC_GMAC4_OFFSET,
-			.est_off = EST_XGMAC_OFFSET,
+			.est_off = EST_GMAC4_OFFSET,
 		},
 		.desc = &dwmac4_desc_ops,
 		.dma = &dwmac410_dma_ops,