From cca0013674ab065ddfc42b1ba88a2f39637fc4d8 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 20 Jun 2017 16:06:35 -0600 Subject: [PATCH 1/4] Fix some backward arguments in the debug statement --- wireless/ieee802154/mac802154_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireless/ieee802154/mac802154_data.c b/wireless/ieee802154/mac802154_data.c index 6223cd6a033..171751169bb 100644 --- a/wireless/ieee802154/mac802154_data.c +++ b/wireless/ieee802154/mac802154_data.c @@ -83,7 +83,7 @@ int mac802154_req_data(MACHANDLE mac, int ret; wlinfo("Received frame io_len=%u io_offset=%u\n", - frame->io_offset, frame->io_len); + frame->io_len, frame->io_offset); /* Check the required frame size */ From 4931792700ad00c56e7636e9b6591661790efaf3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 21 Jun 2017 06:56:34 -0600 Subject: [PATCH 2/4] Make naming of NTXDESC consistent. I don't know where it should be MAC or IEEE, gut I changed the one that affects the fewest files. --- wireless/ieee802154/mac802154.c | 4 ++-- wireless/ieee802154/mac802154_internal.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c index 70e44b68f5c..012139204f3 100644 --- a/wireless/ieee802154/mac802154.c +++ b/wireless/ieee802154/mac802154.c @@ -126,12 +126,12 @@ static void mac802154_resetqueues(FAR struct ieee802154_privmac_s *priv) /* Initialize the tx descriptor allocation pool */ sq_init(&priv->txdesc_queue); - for (i = 0; i < CONFIG_MAC802154_NTXDESC; i++) + for (i = 0; i < CONFIG_IEEE802154_NTXDESC; i++) { sq_addlast((FAR sq_entry_t *)&priv->txdesc_pool[i], &priv->txdesc_queue); } - sem_init(&priv->txdesc_sem, 0, CONFIG_MAC802154_NTXDESC); + sem_init(&priv->txdesc_sem, 0, CONFIG_IEEE802154_NTXDESC); /* Initialize the notifcation allocation pool */ diff --git a/wireless/ieee802154/mac802154_internal.h b/wireless/ieee802154/mac802154_internal.h index 1ebfa0e15ac..d9df64d8516 100644 --- a/wireless/ieee802154/mac802154_internal.h +++ b/wireless/ieee802154/mac802154_internal.h @@ -177,17 +177,17 @@ # define CONFIG_MAC802154_NNOTIF 6 #endif -#if !defined(CONFIG_MAC802154_NTXDESC) || CONFIG_MAC802154_NTXDESC <= 0 -# undef CONFIG_MAC802154_NTXDESC -# define CONFIG_MAC802154_NTXDESC 3 +#if !defined(CONFIG_IEEE802154_NTXDESC) || CONFIG_IEEE802154_NTXDESC <= 0 +# undef CONFIG_IEEE802154_NTXDESC +# define CONFIG_IEEE802154_NTXDESC 3 #endif -#if CONFIG_MAC802154_NTXDESC > CONFIG_MAC802154_NNOTIF -#error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_MAC802154_NTXDESC +#if CONFIG_IEEE802154_NTXDESC > CONFIG_MAC802154_NNOTIF +# error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_IEEE802154_NTXDESC #endif #if !defined(CONFIG_IEEE802154_DEFAULT_EADDR) -#define CONFIG_IEEE802154_DEFAULT_EADDR 0xFFFFFFFFFFFFFFFF +# define CONFIG_IEEE802154_DEFAULT_EADDR 0xFFFFFFFFFFFFFFFF #endif /**************************************************************************** From e7e8228b003657e99b92567a02dd29a546f2e795 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 21 Jun 2017 07:35:09 -0600 Subject: [PATCH 3/4] Missing option to select CONFIG_MAC802154_NNOTIF in Kconfig --- configs/clicker2-stm32/mrf24j40-6lowpan/defconfig | 3 ++- configs/clicker2-stm32/mrf24j40-mac/defconfig | 1 + wireless/ieee802154/Kconfig | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig index 76c738cd115..0e9a12211ca 100644 --- a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig +++ b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig @@ -1138,6 +1138,7 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_IEEE802154=y CONFIG_IEEE802154_DEFAULT_EADDR=0x00fade00deadbeef CONFIG_MAC802154_HPWORK=y +CONFIG_MAC802154_NNOTIF=48 CONFIG_IEEE802154_NTXDESC=32 CONFIG_IEEE802154_IND_PREALLOC=20 CONFIG_IEEE802154_IND_IRQRESERVE=10 @@ -1364,7 +1365,7 @@ CONFIG_EXAMPLES_UDP_DEVNAME="wpan0" CONFIG_EXAMPLES_UDP_IPv6=y # -# Server IPv6 address +# Default Server IPv6 address # CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_1=0xfe80 CONFIG_EXAMPLES_UDP_SERVERIPv6ADDR_2=0x0000 diff --git a/configs/clicker2-stm32/mrf24j40-mac/defconfig b/configs/clicker2-stm32/mrf24j40-mac/defconfig index d6ba224b4e1..00102b8a385 100644 --- a/configs/clicker2-stm32/mrf24j40-mac/defconfig +++ b/configs/clicker2-stm32/mrf24j40-mac/defconfig @@ -984,6 +984,7 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_IEEE802154=y CONFIG_IEEE802154_DEFAULT_EADDR=0x00fade00deadbeef CONFIG_MAC802154_HPWORK=y +CONFIG_MAC802154_NNOTIF=6 CONFIG_IEEE802154_NTXDESC=3 CONFIG_IEEE802154_IND_PREALLOC=20 CONFIG_IEEE802154_IND_IRQRESERVE=10 diff --git a/wireless/ieee802154/Kconfig b/wireless/ieee802154/Kconfig index baf801b7e7f..b5360ab782b 100644 --- a/wireless/ieee802154/Kconfig +++ b/wireless/ieee802154/Kconfig @@ -41,6 +41,12 @@ config MAC802154_LPWORK endchoice # Work queue +config MAC802154_NNOTIF + int "Number of Notifers" + default 6 + ---help--- + This value must be larger than CONFIG_IEEE802154_NTDESC. + config IEEE802154_NTXDESC int "Number or TX descriptors" default 3 @@ -63,7 +69,7 @@ config IEEE802154_IND_PREALLOC from either from tasking logic or from interrupt level logic. config IEEE802154_IND_IRQRESERVE - int "Rserved pre-allocated meta-data structures" + int "Reserved pre-allocated meta-data structures" default 10 ---help--- If meta-data structures can be allocated from interrupt handlers, From a3bb6fc1390ddc5d4700c4d04e578a4a6cd502d9 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 21 Jun 2017 08:20:51 -0600 Subject: [PATCH 4/4] clicker2-stm32/mrf24j40-6lowpan: Network now runs on LP work queue. --- configs/clicker2-stm32/mrf24j40-6lowpan/defconfig | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig index 0e9a12211ca..562af07892c 100644 --- a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig +++ b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig @@ -717,7 +717,11 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKPERIOD=50000 CONFIG_SCHED_HPWORKSTACKSIZE=2048 -# CONFIG_SCHED_LPWORK is not set +CONFIG_SCHED_LPWORK=y +CONFIG_SCHED_LPNTHREADS=1 +CONFIG_SCHED_LPWORKPRIORITY=160 +CONFIG_SCHED_LPWORKPERIOD=50000 +CONFIG_SCHED_LPWORKSTACKSIZE=2048 # # Stack and heap information @@ -1076,6 +1080,7 @@ CONFIG_NET_HOSTNAME="MRF24J40" # CONFIG_PSEUDOFS_SOFTLINKS is not set CONFIG_FS_READABLE=y CONFIG_FS_WRITABLE=y +# CONFIG_FS_AIO is not set # CONFIG_FS_NAMED_SEMAPHORES is not set CONFIG_FS_MQUEUE_MPATH="/var/mqueue" # CONFIG_FS_RAMMAP is not set @@ -1138,15 +1143,17 @@ CONFIG_WIRELESS=y CONFIG_WIRELESS_IEEE802154=y CONFIG_IEEE802154_DEFAULT_EADDR=0x00fade00deadbeef CONFIG_MAC802154_HPWORK=y +# CONFIG_MAC802154_LPWORK is not set CONFIG_MAC802154_NNOTIF=48 CONFIG_IEEE802154_NTXDESC=32 -CONFIG_IEEE802154_IND_PREALLOC=20 +CONFIG_IEEE802154_IND_PREALLOC=32 CONFIG_IEEE802154_IND_IRQRESERVE=10 CONFIG_IEEE802154_MACDEV=y CONFIG_IEEE802154_MACDEV_RECVRPRIO=0 CONFIG_IEEE802154_NETDEV=y CONFIG_IEEE802154_NETDEV_RECVRPRIO=1 -CONFIG_IEEE802154_NETDEV_HPWORK=y +# CONFIG_IEEE802154_NETDEV_HPWORK is not set +CONFIG_IEEE802154_NETDEV_LPWORK=y # CONFIG_IEEE802154_LOOPBACK is not set #