You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/07/09 02:14:37 UTC
[incubator-nuttx] branch master updated (d12619c -> 282ab79)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from d12619c drivers/syslog: Avoid prepending process name when no TCB is available
new bf4e971 stm32h7:Ethernet fix formating
new 70c9cd1 stm32h7:ethernet add timeout on MAC reset
new 282ab79 stm32h7:Ethernet Add some delays so that ifup() does not hog the CPU.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/stm32h7/stm32_ethernet.c | 40 +++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 13 deletions(-)
[incubator-nuttx] 03/03: stm32h7:Ethernet Add some delays so that
ifup() does not hog the CPU.
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 282ab797bf689faaefacc080c45c2ee8e3d44e41
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Thu Jul 8 13:13:16 2021 -0700
stm32h7:Ethernet Add some delays so that ifup() does not hog the CPU.
---
arch/arm/src/stm32h7/stm32_ethernet.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c
index ae731f2..49a3eae 100644
--- a/arch/arm/src/stm32h7/stm32_ethernet.c
+++ b/arch/arm/src/stm32h7/stm32_ethernet.c
@@ -40,6 +40,7 @@
#include <nuttx/irq.h>
#include <nuttx/wdog.h>
#include <nuttx/wqueue.h>
+#include <nuttx/signal.h>
#include <nuttx/net/mii.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/netdev.h>
@@ -295,7 +296,7 @@
#define PHY_READ_TIMEOUT (0x0004ffff)
#define PHY_WRITE_TIMEOUT (0x0004ffff)
-#define PHY_RETRY_TIMEOUT (0x0004ffff)
+#define PHY_RETRY_TIMEOUT (0x0001998)
/* MAC reset ready delays in loop counts */
@@ -3553,6 +3554,8 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
{
break;
}
+
+ nxsig_usleep(100);
}
if (timeout >= PHY_RETRY_TIMEOUT)
@@ -3585,6 +3588,8 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
{
break;
}
+
+ nxsig_usleep(100);
}
if (timeout >= PHY_RETRY_TIMEOUT)
[incubator-nuttx] 02/03: stm32h7:ethernet add timeout on MAC reset
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 70c9cd1508d76aadd86fa9693944ac89d8fb78ad
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Thu Jul 8 13:11:50 2021 -0700
stm32h7:ethernet add timeout on MAC reset
---
arch/arm/src/stm32h7/stm32_ethernet.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c
index 22cea0f..ae731f2 100644
--- a/arch/arm/src/stm32h7/stm32_ethernet.c
+++ b/arch/arm/src/stm32h7/stm32_ethernet.c
@@ -297,6 +297,10 @@
#define PHY_WRITE_TIMEOUT (0x0004ffff)
#define PHY_RETRY_TIMEOUT (0x0004ffff)
+/* MAC reset ready delays in loop counts */
+
+#define MAC_READY_USTIMEOUT (200)
+
/* Register values **********************************************************/
/* Clear the MACCR bits that will be setup during MAC initialization (or that
@@ -3913,6 +3917,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
static void stm32_ethreset(struct stm32_ethmac_s *priv)
{
uint32_t regval;
+ volatile uint32_t timeout;
/* Reset the Ethernet on the AHB1 bus */
@@ -3937,7 +3942,11 @@ static void stm32_ethreset(struct stm32_ethmac_s *priv)
* core clock domains.
*/
- while ((stm32_getreg(STM32_ETH_DMAMR) & ETH_DMAMR_SWR) != 0);
+ timeout = MAC_READY_USTIMEOUT;
+ while (timeout-- && (stm32_getreg(STM32_ETH_DMAMR) & ETH_DMAMR_SWR) != 0)
+ {
+ up_udelay(1);
+ }
/* According to the spec, these need to be done before creating
* the descriptor lists, so initialize these already here
[incubator-nuttx] 01/03: stm32h7:Ethernet fix formating
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit bf4e97177a7c2150c9db7262b13777adb26657dd
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Thu Jul 8 13:09:42 2021 -0700
stm32h7:Ethernet fix formating
---
arch/arm/src/stm32h7/stm32_ethernet.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c
index b5485e2..22cea0f 100644
--- a/arch/arm/src/stm32h7/stm32_ethernet.c
+++ b/arch/arm/src/stm32h7/stm32_ethernet.c
@@ -3771,7 +3771,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
/* Set up the MII interface */
-#if defined(CONFIG_STM32H7_MII)
+# if defined(CONFIG_STM32H7_MII)
/* Select the MII interface */
@@ -3786,7 +3786,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
* PLLI2S clock (through a configurable prescaler) on PC9 pin."
*/
-# if defined(CONFIG_STM32H7_MII_MCO1)
+# if defined(CONFIG_STM32H7_MII_MCO1)
/* Configure MC01 to drive the PHY. Board logic must provide MC01 clocking
* info.
*/
@@ -3794,7 +3794,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
stm32_configgpio(GPIO_MCO1);
stm32_mco1config(BOARD_CFGR_MC01_SOURCE, BOARD_CFGR_MC01_DIVIDER);
-# elif defined(CONFIG_STM32H7_MII_MCO2)
+# elif defined(CONFIG_STM32H7_MII_MCO2)
/* Configure MC02 to drive the PHY. Board logic must provide MC02 clocking
* info.
*/
@@ -3802,12 +3802,12 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
stm32_configgpio(GPIO_MCO2);
stm32_mco2config(BOARD_CFGR_MC02_SOURCE, BOARD_CFGR_MC02_DIVIDER);
-# elif defined(CONFIG_STM32H7_MII_MCO)
+# elif defined(CONFIG_STM32H7_MII_MCO)
/* Setup MCO pin for alternative usage */
stm32_configgpio(GPIO_MCO);
stm32_mcoconfig(BOARD_CFGR_MCO_SOURCE);
-# endif
+# endif
/* MII interface pins (17):
*
@@ -3833,7 +3833,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
/* Set up the RMII interface. */
-#elif defined(CONFIG_STM32H7_RMII)
+# elif defined(CONFIG_STM32H7_RMII)
/* Select the RMII interface */
@@ -3848,7 +3848,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
* PLLI2S clock (through a configurable prescaler) on PC9 pin."
*/
-# if defined(CONFIG_STM32H7_RMII_MCO1)
+# if defined(CONFIG_STM32H7_RMII_MCO1)
/* Configure MC01 to drive the PHY. Board logic must provide MC01 clocking
* info.
*/
@@ -3856,7 +3856,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
stm32_configgpio(GPIO_MCO1);
stm32_mco1config(BOARD_CFGR_MC01_SOURCE, BOARD_CFGR_MC01_DIVIDER);
-# elif defined(CONFIG_STM32H7_RMII_MCO2)
+# elif defined(CONFIG_STM32H7_RMII_MCO2)
/* Configure MC02 to drive the PHY. Board logic must provide MC02 clocking
* info.
*/
@@ -3864,12 +3864,12 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
stm32_configgpio(GPIO_MCO2);
stm32_mco2config(BOARD_CFGR_MC02_SOURCE, BOARD_CFGR_MC02_DIVIDER);
-# elif defined(CONFIG_STM32H7_RMII_MCO)
+# elif defined(CONFIG_STM32H7_RMII_MCO)
/* Setup MCO pin for alternative usage */
stm32_configgpio(GPIO_MCO);
stm32_mcoconfig(BOARD_CFGR_MCO_SOURCE);
-# endif
+# endif
/* RMII interface pins (7):
*
@@ -3884,7 +3884,7 @@ static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
stm32_configgpio(GPIO_ETH_RMII_TXD0);
stm32_configgpio(GPIO_ETH_RMII_TXD1);
stm32_configgpio(GPIO_ETH_RMII_TX_EN);
-#endif
+# endif
#endif
#ifdef CONFIG_STM32H7_ETH_PTP