You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/07/27 04:50:04 UTC
[incubator-nuttx] branch master updated (cc00d2b -> a58193a)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from cc00d2b arch/sim: Call sched_note_cpu_* when SCHED_INSTRUMENTATION equal true
new 9079d48 arch: imxrt: Fix auto negotiation for KSZ8081 PHY
new a58193a arch: imxrt: Fix style violations in imxrt_enet.c
The 2 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/imxrt/imxrt_enet.c | 42 +++++++++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 14 deletions(-)
[incubator-nuttx] 02/02: arch: imxrt: Fix style violations in
imxrt_enet.c
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a58193aa9ae8aaacace5bae4c61d323f459e838f
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Jul 24 06:58:36 2020 +0900
arch: imxrt: Fix style violations in imxrt_enet.c
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/arm/src/imxrt/imxrt_enet.c | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c
index 6aa70a8..b1b8105 100644
--- a/arch/arm/src/imxrt/imxrt_enet.c
+++ b/arch/arm/src/imxrt/imxrt_enet.c
@@ -242,7 +242,9 @@
#define CRITICAL_ERROR (ENET_INT_UN | ENET_INT_RL | ENET_INT_EBERR)
-/* This is a helper pointer for accessing the contents of the Ethernet header */
+/* This is a helper pointer for accessing
+ * the contents of the Ethernet header
+ */
#define BUF ((struct eth_hdr_s *)priv->dev.d_buf)
@@ -252,8 +254,8 @@
* Private Types
****************************************************************************/
-/* The imxrt_driver_s encapsulates all state information for a single hardware
- * interface
+/* The imxrt_driver_s encapsulates all state information for
+ * a single hardware interface
*/
struct imxrt_driver_s
@@ -651,8 +653,8 @@ static int imxrt_txpoll(struct net_driver_s *dev)
}
}
- /* If zero is returned, the polling will continue until all connections have
- * been examined.
+ /* If zero is returned, the polling will continue until
+ * all connections have been examined.
*/
return 0;
@@ -1219,8 +1221,9 @@ static void imxrt_poll_work(FAR void *arg)
{
FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg;
- /* Check if there is there is a transmission in progress. We cannot perform
- * the TX poll if he are unable to accept another packet for transmission.
+ /* Check if there is there is a transmission in progress.
+ * We cannot perform the TX poll if he are unable to accept
+ * another packet for transmission.
*/
net_lock();
@@ -1788,7 +1791,8 @@ static int imxrt_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg)
{
struct mii_ioctl_data_s *req =
(struct mii_ioctl_data_s *)((uintptr_t)arg);
- ret = imxrt_readmii(priv, req->phy_id, req->reg_num, &req->val_out);
+ ret = imxrt_readmii(priv, req->phy_id,
+ req->reg_num, &req->val_out);
}
break;
@@ -2037,9 +2041,10 @@ static inline int imxrt_initphy(struct imxrt_driver_s *priv, bool renogphy)
if (renogphy)
{
- /* Loop (potentially infinitely?) until we successfully communicate with
- * the PHY. This is 'standard stuff' that should work for any PHY - we
- * are not communicating with it's 'special' registers at this point.
+ /* Loop (potentially infinitely?) until we successfully communicate
+ * with the PHY. This is 'standard stuff' that should work for any PHY
+ * - we are not communicating with it's 'special' registers
+ * at this point.
*/
ninfo("%s: Try phyaddr: %u\n", BOARD_PHY_NAME, phyaddr);
@@ -2474,7 +2479,9 @@ int imxrt_netinitialize(int intf)
regval |= GPR_GPR1_ENET1_TX_CLK_OUT_EN;
putreg32(regval, IMXRT_IOMUXC_GPR_GPR1);
- /* Enable the ENET clock. Clock is on during all modes, except STOP mode. */
+ /* Enable the ENET clock. Clock is on during all modes,
+ * except STOP mode.
+ */
imxrt_clockall_enet();
@@ -2538,8 +2545,8 @@ int imxrt_netinitialize(int intf)
#ifdef CONFIG_NET_ETHERNET
/* Determine a semi-unique MAC address from MCU UID
* We use UID Low and Mid Low registers to get 64 bits, from which we keep
- * 48 bits. We then force unicast and locally administered bits (b0 and b1,
- * 1st octet)
+ * 48 bits. We then force unicast and locally administered bits
+ * (b0 and b1, 1st octet)
*/
/* hardcoded offset: todo: need proper header file */
[incubator-nuttx] 01/02: arch: imxrt: Fix auto negotiation for
KSZ8081 PHY
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9079d48646d5fed9ff58466804895d1fe10d1037
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Jul 24 06:49:36 2020 +0900
arch: imxrt: Fix auto negotiation for KSZ8081 PHY
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/arm/src/imxrt/imxrt_enet.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c
index 6d02134..6aa70a8 100644
--- a/arch/arm/src/imxrt/imxrt_enet.c
+++ b/arch/arm/src/imxrt/imxrt_enet.c
@@ -2144,6 +2144,13 @@ static inline int imxrt_initphy(struct imxrt_driver_s *priv, bool renogphy)
imxrt_writemii(priv, phyaddr, MII_KSZ8081_PHYCTRL2,
(phydata | (1 << 4)));
+ imxrt_writemii(priv, phyaddr, MII_ADVERTISE,
+ MII_ADVERTISE_100BASETXFULL |
+ MII_ADVERTISE_100BASETXHALF |
+ MII_ADVERTISE_10BASETXFULL |
+ MII_ADVERTISE_10BASETXHALF |
+ MII_ADVERTISE_CSMA);
+
#elif defined (CONFIG_ETH0_PHY_LAN8720)
/* Make sure that PHY comes up in correct mode when it's reset */