fix SPI dynamic config not working

Author: dragonlock2

firmware/src/peripherals/spi.c

@@ -8,21 +8,32 @@ LOG_MODULE_REGISTER(periph_spi, CONFIG_LOG_DEFAULT_LEVEL);
 
 #if DT_NODE_HAS_PROP(JABI_PERIPH_NODE, spi)
 
-#define GEN_SPI_DT_SPEC(node_id, prop, idx)                                       \
+#define GEN_SPI_DEV_DATA(node_id, prop, idx)                                      \
     {                                                                             \
         .bus = DEVICE_DT_GET(DT_PROP_BY_IDX(node_id, prop, idx)),                 \
-        .config = {                                                               \
+        .configs[0] = {                                                           \
             .frequency = 1000000,                                                 \
             .operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_LINES_SINGLE, \
             .cs = NULL,                                                           \
         },                                                                        \
+        .curr_cfg = 0,                                                            \
+        .stale = false,                                                           \
     },
 
-static struct spi_dt_spec spi_devs[] = {
-    DT_FOREACH_PROP_ELEM(JABI_PERIPH_NODE, spi, GEN_SPI_DT_SPEC)
+// SPI API uses pointer comparison to know when to update the config
+typedef struct {
+    const struct device *bus;
+    struct spi_config configs[2];
+    int curr_cfg;
+    bool stale;
+} spi_dev_data_t;
+
+static spi_dev_data_t spi_devs[] = {
+    DT_FOREACH_PROP_ELEM(JABI_PERIPH_NODE, spi, GEN_SPI_DEV_DATA)
 };
 
 static int spi_init(uint16_t idx) {
+    spi_devs[idx].configs[1] = spi_devs[idx].configs[0];
     return JABI_NO_ERR;
 }
 
@@ -37,7 +48,10 @@ PERIPH_FUNC_DEF(spi_set_freq) {
 
     LOG_DBG("(freq=%d)", args->freq);
 
-    spi_devs[idx].config.frequency = args->freq;
+    spi_devs[idx].configs[0].frequency = args->freq;
+
+    spi_devs[idx].configs[1].frequency = spi_devs[idx].configs[0].frequency;
+    spi_devs[idx].stale = true;
     *resp_len = 0;
     return JABI_NO_ERR;
 }
@@ -48,24 +62,27 @@ PERIPH_FUNC_DEF(spi_set_mode) {
 
     LOG_DBG("(mode=%d)", args->mode);
 
-    spi_devs[idx].config.operation &= ~SPI_MODE_MASK;
+    spi_devs[idx].configs[0].operation &= ~SPI_MODE_MASK;
     switch (args->mode) {
         case 0:
             break;
         case 1:
-            spi_devs[idx].config.operation |= SPI_MODE_CPHA;
+            spi_devs[idx].configs[0].operation |= SPI_MODE_CPHA;
             break;
         case 2:
-            spi_devs[idx].config.operation |= SPI_MODE_CPOL;
+            spi_devs[idx].configs[0].operation |= SPI_MODE_CPOL;
             break;
         case 3:
-            spi_devs[idx].config.operation |= SPI_MODE_CPOL;
-            spi_devs[idx].config.operation |= SPI_MODE_CPHA;
+            spi_devs[idx].configs[0].operation |= SPI_MODE_CPOL;
+            spi_devs[idx].configs[0].operation |= SPI_MODE_CPHA;
             break;
         default:
             LOG_ERR("invalid mode");
             return JABI_INVALID_ARGS_ERR;
     }
+
+    spi_devs[idx].configs[1].operation = spi_devs[idx].configs[0].operation;
+    spi_devs[idx].stale = true;
     *resp_len = 0;
     return JABI_NO_ERR;
 }
@@ -77,23 +94,35 @@ PERIPH_FUNC_DEF(spi_set_bitorder) {
     LOG_DBG("(order=%d)", args->order);
 
     if (args->order) {
-        spi_devs[idx].config.operation &= ~SPI_TRANSFER_LSB;
+        spi_devs[idx].configs[0].operation &= ~SPI_TRANSFER_LSB;
     } else {
-        spi_devs[idx].config.operation |= SPI_TRANSFER_LSB;
+        spi_devs[idx].configs[0].operation |= SPI_TRANSFER_LSB;
     }
+
+    spi_devs[idx].configs[1].operation = spi_devs[idx].configs[0].operation;
+    spi_devs[idx].stale = true;
     *resp_len = 0;
     return JABI_NO_ERR;
 }
 
+static inline void spi_update_config(uint16_t idx) {
+    if (spi_devs[idx].stale) {
+        spi_devs[idx].curr_cfg = spi_devs[idx].curr_cfg == 0 ? 1 : 0;
+        spi_devs[idx].stale = false;
+    }
+}
+
 PERIPH_FUNC_DEF(spi_write_j) {
     PERIPH_FUNC_GET_ARGS(spi, write_j);
 
     LOG_DBG("()");
     LOG_HEXDUMP_DBG(args, req_len, "data=");
 
+    spi_update_config(idx);
+    spi_dev_data_t *spi = &spi_devs[idx];
     struct spi_buf buf = { .buf = args, .len = req_len };
     struct spi_buf_set set = { .buffers = &buf, .count = 1};
-    if (spi_write_dt(&spi_devs[idx], &set)) {
+    if (spi_write(spi->bus, &spi->configs[spi->curr_cfg], &set)) {
         LOG_ERR("failed to write");
         return JABI_PERIPHERAL_ERR;
     }
@@ -114,9 +143,11 @@ PERIPH_FUNC_DEF(spi_read_j) {
 
     LOG_DBG("(data_len=%d)", args->data_len);
 
+    spi_update_config(idx);
+    spi_dev_data_t *spi = &spi_devs[idx];
     struct spi_buf buf = { .buf = ret, .len = args->data_len };
     struct spi_buf_set set = { .buffers = &buf, .count = 1 };
-    if (spi_read_dt(&spi_devs[idx], &set)) {
+    if (spi_read(spi->bus, &spi->configs[spi->curr_cfg], &set)) {
         LOG_ERR("failed to write");
         return JABI_PERIPHERAL_ERR;
     }
@@ -136,11 +167,13 @@ PERIPH_FUNC_DEF(spi_transceive_j) {
     LOG_DBG("()");
     LOG_HEXDUMP_DBG(args, req_len, "data=");
 
+    spi_update_config(idx);
+    spi_dev_data_t *spi = &spi_devs[idx];
     struct spi_buf txbuf = { .buf = args, .len = req_len };
     struct spi_buf rxbuf = { .buf = ret, .len = req_len };
     struct spi_buf_set txset = { .buffers = &txbuf, .count = 1};
     struct spi_buf_set rxset = { .buffers = &rxbuf, .count = 1 };
-    if (spi_transceive_dt(&spi_devs[idx], &txset, &rxset)) {
+    if (spi_transceive(spi->bus, &spi->configs[spi->curr_cfg], &txset, &rxset)) {
         LOG_ERR("failed to write");
         return JABI_PERIPHERAL_ERR;
     }