driver:net:stmmac: Disable DMA store and forward mode if platform data force_thresh_dma_mode is set.

PATCH Superseded Sonic Zhang 2 participants 2 messages Aug 28, 2013

Subsystems (6)

Networking Network drivers Device tree bindings Documentation +2 more subsystems

lore

Share & tools

lore

Sonic Zhang

author

2013-08-28 10:34 UTC #0 lore raw

PATCH v4 1/1 driver:net:stmmac: Disable DMA store and forward mode if platform data force_thresh_dma_mode is set.

From: Sonic Zhang <[email protected]>

Some synopsys ip implementation doesn't support DMA store and forward mode, such as BF60x. So, set force_thresh_dma_mode to use DMA thresholds only. Update document and devicetree as well.

Signed-off-by Sonic Zhang <[email protected]>

---
 Documentation/devicetree/bindings/net/stmmac.txt      | 5 +++++
 Documentation/networking/stmmac.txt                   | 3 +++
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c     | 4 +++-
 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +++
 include/linux/stmmac.h                                | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

Documentation/devicetree/bindings/net/stmmac.txt +5 -0

index 261c563..eba0e5e 100644
@@ -22,6 +22,11 @@ Required properties:
 - snps,pbl		Programmable Burst Length
 - snps,fixed-burst	Program the DMA to use the fixed burst mode
 - snps,mixed-burst	Program the DMA to use the mixed burst mode
+- snps,force_thresh_dma_mode	Force DMA to use the threshold mode for
+				both tx and rx
+- snps,force_sf_dma_mode	Force DMA to use the Store and Forward
+				mode for both tx and rx. This flag is
+				ignored if force_thresh_dma_mode is set.
 
 Optional properties:
 - mac-address: 6 bytes, mac address

Documentation/networking/stmmac.txt +3 -0

index 654d2e5..457b8bb 100644
@@ -123,6 +123,7 @@ struct plat_stmmacenet_data {
 	int bugged_jumbo;
 	int pmt;
 	int force_sf_dma_mode;
+	int force_thresh_dma_mode;
 	int riwt_off;
 	void (*fix_mac_speed)(void *priv, unsigned int speed);
 	void (*bus_setup)(void __iomem *ioaddr);

@@ -159,6 +160,8 @@ Where:
  o pmt: core has the embedded power module (optional).
  o force_sf_dma_mode: force DMA to use the Store and Forward mode
 		     instead of the Threshold.
+ o force_thresh_dma_mode: force DMA to use the Shreshold mode other than
+		     the Store and Forward mode.
  o riwt_off: force to disable the RX watchdog feature and switch to NAPI mode.
  o fix_mac_speed: this callback is used for modifying some syscfg registers
 		 (on ST SoCs) according to the link speed negotiated by the

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -1

index be40691..8d4ccd3 100644
@@ -1224,7 +1224,9 @@ static void free_dma_desc_resources(struct stmmac_priv *priv)
  */
 static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
 {
-	if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
+	if (priv->plat->force_thresh_dma_mode)
+		priv->hw->dma->dma_mode(priv->ioaddr, tc, tc);
+	else if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
 		/*
 		 * In case of GMAC, SF mode can be enabled
 		 * to perform the TX COE in HW. This depends on:

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +3 -0

index da8be6e..865c944 100644
@@ -79,6 +79,9 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
 	of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
 	dma_cfg->fixed_burst = of_property_read_bool(np, "snps,fixed-burst");
 	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)
+		plat->force_sf_dma_mode = 0;
 
 	return 0;
 }

include/linux/stmmac.h +1 -0

index 9e495d31..bb5deb0 100644
@@ -108,6 +108,7 @@ struct plat_stmmacenet_data {
 	int bugged_jumbo;
 	int pmt;
 	int force_sf_dma_mode;
+	int force_thresh_dma_mode;
 	int riwt_off;
 	void (*fix_mac_speed)(void *priv, unsigned int speed);
 	void (*bus_setup)(void __iomem *ioaddr);

Signature · 1 line

1.8.2.3

Giuseppe CAVALLARO

2013-08-28 10:39 UTC #1 lore raw

Quoted 72 lines · Sonic Zhang

From: Sonic Zhang<[email protected]>

Some synopsys ip implementation doesn't support DMA store and forward mode, such as BF60x. So, set force_thresh_dma_mode to use DMA thresholds only. Update document and devicetree as well.

Signed-off-by Sonic Zhang<[email protected]>

---
  Documentation/devicetree/bindings/net/stmmac.txt      | 5 +++++
  Documentation/networking/stmmac.txt                   | 3 +++
  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c     | 4 +++-
  drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +++
  include/linux/stmmac.h                                | 1 +
  5 files changed, 15 insertions(+), 1 deletion(-)

Documentation/devicetree/bindings/net/stmmac.txt +5 -0

index 261c563..eba0e5e 100644
@@ -22,6 +22,11 @@ Required properties:
  - snps,pbl		Programmable Burst Length
  - snps,fixed-burst	Program the DMA to use the fixed burst mode
  - snps,mixed-burst	Program the DMA to use the mixed burst mode
+- snps,force_thresh_dma_mode	Force DMA to use the threshold mode for
+				both tx and rx
+- snps,force_sf_dma_mode	Force DMA to use the Store and Forward
+				mode for both tx and rx. This flag is
+				ignored if force_thresh_dma_mode is set.
 
  Optional properties:
  - mac-address: 6 bytes, mac address

Documentation/networking/stmmac.txt +3 -0

index 654d2e5..457b8bb 100644
@@ -123,6 +123,7 @@ struct plat_stmmacenet_data {
  	int bugged_jumbo;
  	int pmt;
  	int force_sf_dma_mode;
+	int force_thresh_dma_mode;
  	int riwt_off;
  	void (*fix_mac_speed)(void *priv, unsigned int speed);
  	void (*bus_setup)(void __iomem *ioaddr);

@@ -159,6 +160,8 @@ Where:
   o pmt: core has the embedded power module (optional).
   o force_sf_dma_mode: force DMA to use the Store and Forward mode
  		     instead of the Threshold.
+ o force_thresh_dma_mode: force DMA to use the Shreshold mode other than
+		     the Store and Forward mode.
   o riwt_off: force to disable the RX watchdog feature and switch to NAPI mode.
   o fix_mac_speed: this callback is used for modifying some syscfg registers
  		 (on ST SoCs) according to the link speed negotiated by the

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -1

index be40691..8d4ccd3 100644
@@ -1224,7 +1224,9 @@ static void free_dma_desc_resources(struct stmmac_priv *priv)
   */
  static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
  {
-	if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
+	if (priv->plat->force_thresh_dma_mode)
+		priv->hw->dma->dma_mode(priv->ioaddr, tc, tc);
+	else if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
  		/*
  		 * In case of GMAC, SF mode can be enabled
  		 * to perform the TX COE in HW. This depends on:

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +0 -0

index da8be6e..865c944 100644

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c static int stmmac_probe_config_dt(struct platform_device *pdev, · line 85

Quoted 7 lines

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +3 -0

@@ -79,6 +79,9 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
  	of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
  	dma_cfg->fixed_burst = of_property_read_bool(np, "snps,fixed-burst");
  	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)
+		plat->force_sf_dma_mode = 0;

ok this solution looks to be a compromise and avoids to disturb platforms that already use the force_sf_dma_mode.

can I only ask you to add a pr_warn here

thanks a lot
peppe