Merge #17810 #19120

17810: drivers/slipdev: implement sleep states r=benpicco a=benpicco



19120: CI: seperate check-labels and check-commits workflows r=miri64 a=kaspar030



Co-authored-by: Benjamin Valentin <[email protected]>
Co-authored-by: Kaspar Schleiser <[email protected]>

.github/workflows/check-pr.yml → .github/workflows/check-commits.yml

@@ -1,18 +1,8 @@
-name: check-pr
+name: check-commits
 on:
   pull_request:
-    types: [opened, reopened, labeled, unlabeled, synchronize]
-  pull_request_review:
-    types: [submitted, dismissed]
+    types: [opened, reopened, synchronize]
 jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: RIOT-OS/[email protected]
-      with:
-        access_token: ${{ secrets.GITHUB_TOKEN }}
-        unset_labels: 'CI: needs squashing,State: waiting for CI update,State: waiting for other PR,Process: blocked by feature freeze'
-        cond_labels: '(Process: needs >1 ACK,review.approvals>1),(Area: RDM,review.approvals>2)'
   check-commits:
     runs-on: ubuntu-latest
     if: ${{ github.base_ref }}

.github/workflows/check-labels.yml

@@ -0,0 +1,15 @@
+name: check-labels
+on:
+  pull_request:
+    types: [opened, reopened, labeled, unlabeled]
+  pull_request_review:
+    types: [submitted, dismissed]
+jobs:
+  check-labels:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: RIOT-OS/[email protected]
+      with:
+        access_token: ${{ secrets.GITHUB_TOKEN }}
+        unset_labels: 'CI: needs squashing,State: waiting for CI update,State: waiting for other PR,Process: blocked by feature freeze'
+        cond_labels: '(Process: needs >1 ACK,review.approvals>1),(Area: RDM,review.approvals>2)'

drivers/include/slipdev.h

@@ -72,6 +72,14 @@ enum {
      * @brief   Device writes received data to stdin
      */
     SLIPDEV_STATE_STDIN,
+    /**
+     * @brief   Device is in standby, will wake up when sending data
+     */
+    SLIPDEV_STATE_STANDBY,
+    /**
+     * @brief   Device is in sleep mode
+     */
+    SLIPDEV_STATE_SLEEP,
 };
 /** @} */
 

drivers/slipdev/slipdev.c

@@ -32,6 +32,8 @@
 #include "mutex.h"
 #include "stdio_uart.h"
 
+static int _check_state(slipdev_t *dev);
+
 static inline void slipdev_lock(void)
 {
     if (IS_USED(MODULE_SLIPDEV_STDIO)) {
@@ -74,6 +76,23 @@ static void _slip_rx_cb(void *arg, uint8_t byte)
     }
 }
 
+static void _poweron(slipdev_t *dev)
+{
+    if ((dev->state != SLIPDEV_STATE_STANDBY) ||
+        (dev->state != SLIPDEV_STATE_SLEEP)) {
+        return;
+    }
+
+    dev->state = 0;
+    uart_init(dev->config.uart, dev->config.baudrate, _slip_rx_cb, dev);
+}
+
+static inline void _poweroff(slipdev_t *dev, uint8_t state)
+{
+    uart_poweroff(dev->config.uart);
+    dev->state = state;
+}
+
 static int _init(netdev_t *netdev)
 {
     slipdev_t *dev = (slipdev_t *)netdev;
@@ -150,10 +169,33 @@ unsigned slipdev_unstuff_readbyte(uint8_t *buf, uint8_t byte, bool *escaped)
     return res;
 }
 
+static int _check_state(slipdev_t *dev)
+{
+    /* power states not supported when multiplexing stdio */
+    if (IS_USED(MODULE_SLIPDEV_STDIO)) {
+        return 0;
+    }
+
+    /* discard data when interface is in SLEEP mode */
+    if (dev->state == SLIPDEV_STATE_SLEEP) {
+        return -ENETDOWN;
+    }
+
+    /* sending data wakes the interface from STANDBY */
+    if (dev->state == SLIPDEV_STATE_STANDBY) {
+        _poweron(dev);
+    }
+
+    return 0;
+}
+
 static int _send(netdev_t *netdev, const iolist_t *iolist)
 {
     slipdev_t *dev = (slipdev_t *)netdev;
-    int bytes = 0;
+    int bytes = _check_state(dev);
+    if (bytes) {
+        return bytes;
+    }
 
     DEBUG("slipdev: sending iolist\n");
     slipdev_lock();
@@ -233,6 +275,45 @@ static void _isr(netdev_t *netdev)
     }
 }
 
+#if !IS_USED(MODULE_SLIPDEV_STDIO)
+static int _set_state(slipdev_t *dev, netopt_state_t state)
+{
+    if (IS_USED(MODULE_SLIPDEV_STDIO)) {
+        return -ENOTSUP;
+    }
+
+    switch (state) {
+    case NETOPT_STATE_STANDBY:
+        _poweroff(dev, SLIPDEV_STATE_STANDBY);
+        break;
+    case NETOPT_STATE_SLEEP:
+        _poweroff(dev, SLIPDEV_STATE_SLEEP);
+        break;
+    case NETOPT_STATE_IDLE:
+        _poweron(dev);
+        break;
+    default:
+        return -ENOTSUP;
+    }
+
+    return sizeof(netopt_state_t);
+}
+
+static int _set(netdev_t *netdev, netopt_t opt, const void *value, size_t max_len)
+{
+    (void)max_len;
+
+    slipdev_t *dev = (slipdev_t *)netdev;
+    switch (opt) {
+    case NETOPT_STATE:
+        assert(max_len <= sizeof(netopt_state_t));
+        return _set_state(dev, *((const netopt_state_t *)value));
+    default:
+        return -ENOTSUP;
+    }
+}
+#endif /* !MODULE_SLIPDEV_STDIO */
+
 static int _get(netdev_t *netdev, netopt_t opt, void *value, size_t max_len)
 {
     (void)netdev;
@@ -262,7 +343,11 @@ static const netdev_driver_t slip_driver = {
     .init = _init,
     .isr = _isr,
     .get = _get,
+#if IS_USED(MODULE_SLIPDEV_STDIO)
     .set = netdev_set_notsup,
+#else
+    .set = _set,
+#endif
 };
 
 void slipdev_setup(slipdev_t *dev, const slipdev_params_t *params, uint8_t index)