Move drivers from chipflow-lib to alongside the IP.

robtaylor · robtaylor · commit 5f3441bf2381 · 2025-09-08T20:43:58.000+01:00
This makes use of the new `amaranth.lib.wiring.Signature` `chipflow_lib.platform.DriverSignature` to
annotate the driver information for the IP
diff --git a/chipflow_digital_ip/base/_platform_timer.py b/chipflow_digital_ip/base/_platform_timer.py
@@ -1,9 +1,10 @@
 from amaranth import *
 from amaranth.lib import wiring
 from amaranth.lib.wiring import In, Out, flipped, connect
-
 from amaranth_soc import csr
 
+from chipflow_lib.platforms import DriverSignature
+
 
 __all__ = ["PlatformTimer"]
 
@@ -34,10 +35,19 @@ def __init__(self):
 
         self._bridge = csr.Bridge(regs.as_memory_map())
 
-        super().__init__({
-            "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
-            "irq": Out(unsigned(1)),
-        })
+        super().__init__(
+            DriverSignature(
+                members={
+                    "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
+                    "irq": Out(unsigned(1)),
+                },
+                component=self,
+                regs_struct='plat_timer_regs_t',
+                c_files=['drivers/plat_timer.c'],
+                h_files=['drivers/plat_timer.h'],
+                )
+            )
+
         self.bus.memory_map = self._bridge.bus.memory_map
 
     def elaborate(self, platform):
diff --git a/chipflow_digital_ip/base/_soc_id.py b/chipflow_digital_ip/base/_soc_id.py
@@ -6,6 +6,7 @@
 
 from amaranth_soc import csr
 
+from chipflow_lib.platforms import DriverSignature
 
 __all__ = ["SoCID"]
 
@@ -31,10 +32,16 @@ def __init__(self, *, type_id=0xbadca77e):
         self._soc_version = regs.add("soc_version", self.Register(32), offset=0x4)
 
         self._bridge = csr.Bridge(regs.as_memory_map())
+        super().__init__(
+            DriverSignature(
+                members={
+                    "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
+                },
+                component=self,
+                regs_struct='soc_id_regs_t',
+                h_files=['drivers/soc_id.h'])
+            )
 
-        super().__init__({
-            "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
-        })
         self.bus.memory_map = self._bridge.bus.memory_map
 
     def elaborate(self, platform):
diff --git a/chipflow_digital_ip/base/drivers/plat_timer.c b/chipflow_digital_ip/base/drivers/plat_timer.c
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#include "plat_timer.h"
+
+uint64_t plat_timer_read(volatile plat_timer_regs_t *timer) {
+	uint32_t cnt_lo = timer->cnt_lo;
+	__asm__ volatile ("" : : : "memory");
+	return (((uint64_t)timer->cnt_hi) << 32ULL) | cnt_lo;
+}
+
+void plat_timer_schedule(volatile plat_timer_regs_t *timer, uint64_t val) {
+	timer->cmp_lo = val & 0xFFFFFFFFU;
+	__asm__ volatile ("" : : : "memory");
+	timer->cmp_hi = (val >> 32U) & 0xFFFFFFFFU;
+}
diff --git a/chipflow_digital_ip/base/drivers/plat_timer.h b/chipflow_digital_ip/base/drivers/plat_timer.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#ifndef PLAT_TIMER_H
+#define PLAT_TIMER_H
+
+#include <stdint.h>
+
+typedef struct __attribute__((packed, aligned(4))) {
+	uint32_t cnt_lo;
+	uint32_t cnt_hi;
+	uint32_t cmp_lo;
+	uint32_t cmp_hi;
+} plat_timer_regs_t;
+
+uint64_t plat_timer_read(volatile plat_timer_regs_t *timer);
+void plat_timer_schedule(volatile plat_timer_regs_t *timer, uint64_t val);
+
+#endif
diff --git a/chipflow_digital_ip/base/drivers/soc_id.h b/chipflow_digital_ip/base/drivers/soc_id.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#ifndef SOC_ID_H
+#define SOC_ID_H
+
+#include <stdint.h>
+
+typedef struct __attribute__((packed, aligned(4))) {
+	uint32_t type;
+	uint32_t version;
+} soc_id_regs_t;
+
+#endif
diff --git a/chipflow_digital_ip/io/_gpio.py b/chipflow_digital_ip/io/_gpio.py
@@ -5,7 +5,8 @@
 
 from amaranth_soc import csr, gpio
 
-from chipflow_lib.platforms import GPIOSignature
+from chipflow_lib.platforms import GPIOSignature, DriverSignature
+
 
 __all__ = ["GPIOPeripheral"]
 
@@ -51,12 +52,18 @@ def __init__(self, *, pin_count, addr_width=4, data_width=8, input_stages=2):
                                      addr_width=addr_width,
                                      data_width=data_width,
                                      input_stages=input_stages)
+        super().__init__(
+            DriverSignature(
+                members={
+                    "bus": In(csr.Signature(addr_width=addr_width, data_width=data_width)),
+                    "pins": Out(GPIOSignature(pin_count)),
+                    "alt_mode": Out(unsigned(pin_count)),
+                },
+                component=self,
+                regs_struct='gpio_regs_t',
+                h_files=['drivers/gpio.h'])
+            )
 
-        super().__init__({
-            "bus": In(csr.Signature(addr_width=addr_width, data_width=data_width)),
-            "pins": Out(GPIOSignature(pin_count)),
-            "alt_mode": Out(unsigned(pin_count)),
-        })
         self.bus.memory_map = self._gpio.bus.memory_map
 
     def elaborate(self, platform):
diff --git a/chipflow_digital_ip/io/_i2c.py b/chipflow_digital_ip/io/_i2c.py
@@ -3,7 +3,7 @@
 from amaranth.lib.wiring import In, Out, connect, flipped
 
 from amaranth_soc import csr
-from chipflow_lib.platforms import I2CSignature
+from chipflow_lib.platforms import I2CSignature, DriverSignature
 from ._glasgow_i2c import I2CInitiator
 
 __all__ = ["I2CPeripheral"]
@@ -55,10 +55,20 @@ def __init__(self):
 
         self._bridge = csr.Bridge(regs.as_memory_map())
 
-        super().__init__({
-            "i2c_pins": Out(I2CSignature()),
-            "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
-        })
+        super().__init__(
+            DriverSignature(
+                members={
+                    "i2c_pins": Out(I2CSignature()),
+                    "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
+                },
+                component=self,
+                regs_struct='i2c_regs_t',
+                c_files=['drivers/i2c.c'],
+                h_files=['drivers/i2c.h'],
+                )
+
+            )
+
         self.bus.memory_map = self._bridge.bus.memory_map
 
     def elaborate(self, platform):
diff --git a/chipflow_digital_ip/io/_spi.py b/chipflow_digital_ip/io/_spi.py
@@ -3,10 +3,12 @@
 from amaranth.lib.wiring import In, Out, connect, flipped
 
 from amaranth_soc import csr
-from chipflow_lib.platforms import SPISignature
+from chipflow_lib.platforms import SPISignature, DriverSignature
+
 
 __all__ = ["SPIPeripheral"]
 
+
 class SPIController(wiring.Component):
     def __init__(self):
         super().__init__({
@@ -149,10 +151,18 @@ def __init__(self):
 
         self._bridge = csr.Bridge(regs.as_memory_map())
 
-        super().__init__({
-            "spi_pins": Out(SPISignature()),
-            "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
-        })
+        super().__init__(
+            DriverSignature(
+                members={
+                    "spi_pins": Out(SPISignature()),
+                    "bus": In(csr.Signature(addr_width=regs.addr_width, data_width=regs.data_width)),
+                },
+                component=self,
+                regs_struct='spi_regs_t',
+                c_files=['drivers/spi.c'],
+                h_files=['drivers/spi.h'])
+            )
+
         self.bus.memory_map = self._bridge.bus.memory_map
 
     def elaborate(self, platform):
diff --git a/chipflow_digital_ip/io/_uart.py b/chipflow_digital_ip/io/_uart.py
@@ -5,7 +5,7 @@
 from amaranth_soc import csr
 from amaranth_stdio.serial import AsyncSerialRX, AsyncSerialTX
 
-from chipflow_lib.platforms import UARTSignature
+from chipflow_lib.platforms import UARTSignature, DriverSignature
 
 from . import _rfc_uart
 
@@ -117,7 +117,6 @@ def elaborate(self, platform):
 
         return m
 
-
 class UARTPeripheral(wiring.Component):
 
     """Wrapper for amaranth_soc RFC UART with PHY and chipflow_lib.IOSignature support
@@ -149,10 +148,18 @@ def __init__(self, *, addr_width=5, data_width=8, init_divisor=0):
             phy_config_init=phy_config_shape.const({"divisor": init_divisor}),
         )
 
-        super().__init__({
-            "bus": In(csr.Signature(addr_width=addr_width, data_width=data_width)),
-            "pins": Out(UARTSignature()),
-        })
+        super().__init__(
+            DriverSignature(
+                members={
+                    "bus": In(csr.Signature(addr_width=addr_width, data_width=data_width)),
+                    "pins": Out(UARTSignature()),
+                },
+                component=self,
+                regs_struct='uart_regs_t',
+                c_files=['drivers/uart.c'],
+                h_files=['drivers/uart.h'])
+            )
+
         self.bus.memory_map = self._uart.bus.memory_map
         self._phy = UARTPhy(ports=self.pins, init_divisor=init_divisor)
 
diff --git a/chipflow_digital_ip/io/drivers/gpio.h b/chipflow_digital_ip/io/drivers/gpio.h
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#ifndef GPIO_H
+#define GPIO_H
+
+#include <stdint.h>
+
+typedef struct __attribute__((packed, aligned(2))) {
+	uint16_t mode;
+	uint8_t input;
+	uint8_t output;
+	uint16_t setclr;
+} gpio_regs_t;
+
+typedef enum {
+#define _GPIO_PIN(n) \
+	GPIO_PIN ## n ## _INPUT_ONLY = (0 << 2 * (n)), \
+	GPIO_PIN ## n ## _PUSH_PULL  = (1 << 2 * (n)), \
+	GPIO_PIN ## n ## _OPEN_DRAIN = (2 << 2 * (n)), \
+	GPIO_PIN ## n ## _ALTERNATE  = (3 << 2 * (n))
+
+	_GPIO_PIN(0),
+	_GPIO_PIN(1),
+	_GPIO_PIN(2),
+	_GPIO_PIN(3),
+	_GPIO_PIN(4),
+	_GPIO_PIN(5),
+	_GPIO_PIN(6),
+	_GPIO_PIN(7),
+#undef _GPIO_PIN
+} gpio_mode_t;
+
+typedef enum {
+#define _GPIO_PIN(n) \
+	GPIO_PIN ## n ## _SET   = (1 << 2 * (n)), \
+	GPIO_PIN ## n ## _CLEAR = (2 << 2 * (n))
+
+	_GPIO_PIN(0),
+	_GPIO_PIN(1),
+	_GPIO_PIN(2),
+	_GPIO_PIN(3),
+	_GPIO_PIN(4),
+	_GPIO_PIN(5),
+	_GPIO_PIN(6),
+	_GPIO_PIN(7),
+#undef _GPIO_PIN
+} gpio_setclr_t;
+
+#endif
diff --git a/chipflow_digital_ip/io/drivers/i2c.c b/chipflow_digital_ip/io/drivers/i2c.c
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#include "i2c.h"
+
+void i2c_init(volatile i2c_regs_t *i2c, uint32_t divider) {
+	i2c->divider = divider;
+}
+
+void i2c_start(volatile i2c_regs_t *i2c) {
+	i2c->action = (1<<1);
+	while (i2c->status & 0x1)
+		;
+}
+
+int i2c_write(volatile i2c_regs_t *i2c, uint8_t data) {
+	i2c->send_data = data;
+	while (i2c->status & 0x1)
+		;
+	return (i2c->status & 0x2) != 0; // check ACK
+}
+
+uint8_t i2c_read(volatile i2c_regs_t *i2c) {
+	i2c->action = (1<<3);
+	while (i2c->status & 0x1)
+		;
+	return i2c->receive_data;
+}
+
+void i2c_stop(volatile i2c_regs_t *i2c) {
+	i2c->action = (1<<2);
+	while (i2c->status & 0x1)
+		;
+}
diff --git a/chipflow_digital_ip/io/drivers/i2c.h b/chipflow_digital_ip/io/drivers/i2c.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#ifndef I2C_H
+#define I2C_H
+
+#include <stdint.h>
+
+typedef struct {
+	uint32_t divider;
+	uint32_t action;
+	uint32_t send_data;
+	uint32_t receive_data;
+	uint32_t status;
+} i2c_regs_t;
+
+void i2c_init(volatile i2c_regs_t *i2c, uint32_t divider);
+void i2c_start(volatile i2c_regs_t *i2c);
+int i2c_write(volatile i2c_regs_t *i2c, uint8_t data);
+uint8_t i2c_read(volatile i2c_regs_t *i2c);
+void i2c_stop(volatile i2c_regs_t *i2c);
+
+#endif
diff --git a/chipflow_digital_ip/io/drivers/spi.c b/chipflow_digital_ip/io/drivers/spi.c
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#include "spi.h"
+
+void spi_init(volatile spi_regs_t *spi, uint32_t divider) {
+    spi->divider = divider;
+    spi->config = 0x02; // CS=0, SCK_EDGE=1, SCK_IDLE=0
+}
+
+uint32_t spi_xfer(volatile spi_regs_t *spi, uint32_t data, uint32_t width, bool deselect) {
+    spi->config = ((width - 1) << 3) | 0x06; // CS=1, SCK_EDGE=1, SCK_IDLE=0
+    spi->send_data = data << (32U - width);
+    while (!(spi->status & 0x1)) // wait for rx full
+        ;
+    if (deselect) {
+        spi->config = ((width - 1) << 3) | 0x02; // CS=0, SCK_EDGE=1, SCK_IDLE=0
+    }
+    return spi->receive_data;
+}
diff --git a/chipflow_digital_ip/io/drivers/spi.h b/chipflow_digital_ip/io/drivers/spi.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+#ifndef SPI_H
+#define SPI_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct {
+	uint32_t config;
+	uint32_t divider;
+	uint32_t send_data;
+	uint32_t receive_data;
+	uint32_t status;
+} spi_regs_t;
+
+void spi_init(volatile spi_regs_t *spi, uint32_t divider);
+uint32_t spi_xfer(volatile spi_regs_t *spi, uint32_t data, uint32_t width, bool deselect);
+
+#endif
diff --git a/chipflow_digital_ip/io/drivers/uart.c b/chipflow_digital_ip/io/drivers/uart.c
diff --git a/chipflow_digital_ip/io/drivers/uart.h b/chipflow_digital_ip/io/drivers/uart.h
diff --git a/chipflow_digital_ip/memory/_qspi_flash.py b/chipflow_digital_ip/memory/_qspi_flash.py
diff --git a/chipflow_digital_ip/memory/drivers/spiflash.S b/chipflow_digital_ip/memory/drivers/spiflash.S
diff --git a/chipflow_digital_ip/memory/drivers/spiflash.c b/chipflow_digital_ip/memory/drivers/spiflash.c
diff --git a/chipflow_digital_ip/memory/drivers/spiflash.h b/chipflow_digital_ip/memory/drivers/spiflash.h
