Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 736f8f66 authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Greg Kroah-Hartman
Browse files

net: stmmac: Restrict warning on disabling DMA store and fwd mode 



commit 05d7623a892a9da62da0e714428e38f09e4a64d8 upstream.

When setting 'snps,force_thresh_dma_mode' DT property, the following
warning is always emitted, regardless the status of force_sf_dma_mode:

dwmac-starfive 10020000.ethernet: force_sf_dma_mode is ignored if force_thresh_dma_mode is set.

Do not print the rather misleading message when DMA store and forward
mode is already disabled.

Fixes: e2a240c7 ("driver:net:stmmac: Disable DMA store and forward mode if platform data force_thresh_dma_mode is set.")
Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://lore.kernel.org/r/20230210202126.877548-1-cristian.ciocaltea@collabora.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a2c7951

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) 
	dma_cfg->mixed_burst = of_property_read_bool(np, "snps,mixed-burst");



	plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");

	if (plat->force_thresh_dma_mode) {

	if (plat->force_thresh_dma_mode && plat->force_sf_dma_mode) {

		plat->force_sf_dma_mode = 0;

		dev_warn(&pdev->dev,

			 "force_sf_dma_mode is ignored if force_thresh_dma_mode is set.\n");