From 5981079782783a2328984b2834a1450ce77faca2 Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 24 Jan 2023 18:54:57 +0100 Subject: [PATCH 1/9] rust: Update dependencies, use riot-wrappers from git This primarily updates riot-wrappers, which has accumulated several compatible changes. --- .cargo/config.toml | 4 ++-- examples/rust-gcoap/Cargo.lock | Bin 23847 -> 21182 bytes examples/rust-hello-world/Cargo.lock | Bin 20145 -> 17480 bytes sys/rust_riotmodules_standalone/Cargo.lock | Bin 20156 -> 17491 bytes tests/rust_minimal/Cargo.lock | Bin 20141 -> 17476 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index f295621eb5..03fd973948 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -5,5 +5,5 @@ # Cargo.toml, copy this file over, or just use the released versions. [patch.crates-io] -#riot-sys = { git = "https://github.com/RIOT-OS/rust-riot-sys" } -#riot-wrappers = { git = "https://github.com/RIOT-OS/rust-riot-wrappers" } +riot-sys = { git = "https://github.com/RIOT-OS/rust-riot-sys" } +riot-wrappers = { git = "https://github.com/RIOT-OS/rust-riot-wrappers" } diff --git a/examples/rust-gcoap/Cargo.lock b/examples/rust-gcoap/Cargo.lock index 7fddaffdbaf02ac08d57e118e81061a0858ca6a3..02798434759218e6a9eff781941c387d3fde8028 100644 GIT binary patch delta 2445 zcmZWrJB*!271qDD$xEz-gx8BB#e@(*M2=_9yv`V{?-FFdL6P?rFtP$UGjk?NmB@A! zC=hH*6*QGW0wH9jwk`!i*h(6xBAP_0DMRO^iBj?X*Gm$yqPMx{*oCaEwqzS4b1IHCs5iyt9Pnr19EzrDdv?;aCX=kx@g$uZ zi|MZI5ED#0rGXn5t1+ zldeSBbBhVbc#m^Z&_Lte$2OP$I&*LwFn6}alExTP^)+J@QmhT)sa4gKh(b@@Gu77E z+X|%272n1;G^;V1j&REOcz+DPxJ%7i+pvo2a62_km05sbpuOHPN@s)lqhe z_fW)CE-sJ5yfNPKkB(n`^THHX8}FDKQ}-n+#}cbZBwM9uF*!QtsAWgph2F zIM;TJHqYh8pT7P0a1J2lIAi&v7FeW5leXB%`T6A3U z*xfk2eEFGwJ~VE=I4>i)%&rER7nY1T^MP|v4afK3VdHnBs7N~?zd$`{A)?C#dg zOorD$WF*!@o!+>pVqJiuT+JGD3>8jOEm(?|o*W2Xde3#p)zjnd`So!-KZD85s)c4n zurV%p#SC+(jVc~Axkt)m;SmzGYW4sl)|ecObmPQ%RCX(HZ(ewL;&JEF?!{Q6aYeDx zhH({>z-enTw2ykyZS)`=%)nzSA@*QE>Zp)&uIy3bdz;H&f9KvbK0S4EY#o1iYwz-v zgL7B*&tHGz#?5orUw!T7xf{Q{@f5oZ?+|s~K?w~Vz+cf}!2G1<^O$C)V#uJN2$Fqz7F2DHP zhtv4uwY_on(zWsN*)!u0mrlVT{(Nm`QK01Howf)!@%U7=^$dh6GSlDZAZoovTj2^q zIV9t?m70(VO~-$BH^gZ3d8HkMn@udf}|+ZOmSDq2=FV6ry^*2ydvm?%eBGBXOL0?A=R2B`=+I<6_y z0NJjHboYE3zqx#3oO@woEkDRYPFS@I@VW%u8sMyi66C-hxGzMIusZFwH1OAPcPJcS zkKCYmUJ-Qp(F;!>2jOAe3oI7X3B^VQi8UB3198fV;PPnHIE@8n+3ajhwMn*Oi^As_ zvHT$a?w&t0-rHM@w|4fn3#L{(LmnLh4_Hm8RC9Koh)rYE@s% zm$>SCxxa-q&rU`}GXI9s)s_OkOBh+u>X`-hR%WY!t<9H;oP7Y$)Qp|ETT^vo_vGfd zb@0RyY0w(c5f#w4^+*6*D}3(;Ib~czq(i7(0N;T~po5PXMB#`}rLJ<|@gM(V-2KUy z$KlDn1$o46VqXK{o{_}_UlJJvVRpzPB`^ic*Ez}*Zpo0SC8Rh}6atg;#_|_e?;jh# zjXT@wE9Va9!_B5TC(>b}rAHS7(zGLspvMM-Mnu6d3@!>@kO;V~SoHAV*0lc8SN;d8 CrpSf> delta 3617 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 G*na@10jZS$ delta 3586 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 AuK)l5 diff --git a/tests/rust_minimal/Cargo.lock b/tests/rust_minimal/Cargo.lock index 98ba605d012b64ee0495adac5f50e6c68c6e8ca4..30e513354589495ef587d77962738ad9d91681c6 100644 GIT binary patch delta 2367 zcmZWrPpI8T73St2t;M#s?p%$YeO_}&dwqb)QqX$6Z5IWu#n6co!# zL|j%-T!=Ib6a>YMATAWjT?pdBh`MkiMe4?lx^rt?6x{UtUE@kF_aFEE&V1)P-}jy0 z&wsS~-FH`S{9r}%-o?XpYbB)U%P46mdEb03J|&S{gBV+M)tAEfSfy~a-25m(yS41H z*EX*`x;qb6*H(VMzPhotFh;f-M(~M4>=IOzTIfFIsLe!Kv-d@;YVbxzl}nZoMk=L} z%)5K1HD#!Iw5KpL}<<`O^dcI5k&$hwF@z+#JLOO$G}dKW*=aBtq|SpNAsV4d6A)Q(Ai+#tfeQ^r7on}F z_dW99CV%|WYL(}2F5XY`>`Lhf2KghGNrwJOy^c`=s?ct)_cO9KWp+V*_r>i*)3 z1E?+`3ZN=tQXgT==t45}fnll8ilvgcA!XVkQM`;CAn-ayX?d=$o}S;|d3ZkHK5;zX zcP@OZim6G(E2u2oIyGGD%1BhmBOx?dvl0PFy>o?~4i_{;6c1Y||J8kYCEFl~oLX|B z8fM!;T6Gz+_O2iSP*I0Z5yC?xM2v^iU+?5W zx_slst4CkIedqGgt6#fw`Sv$&?@1^K5Va5kywK4C@)cb&NQ_Yj6h+?k#b~?p$Mn|! z%02u4<-T#Guf1kRxA!`sUnF5niqsovAhR)ixXX=^D)JH%b!{v)KT!3^E`QbT=vU@@ z;g_4Aq;Ie06EEDFy?klD{>Zucx3arUid^C89E0_QWQq9Jtd9burn=Z67FP4ol5dCy zrNY@o>$PR#^kUX;msf|b7OdT zJFqLCIXAy^Ajisomy2Y~Ixylc!@v#*8{u*aP!IAKPRJOY4PQGH9ApF(WhA6@SYH;2 z?r!?}qbHCV%X0OYENJ2ClR?ME4r9PV6~q3D=+OmB6^YsX5>l;e@#?D~>II9L?_+#< zKJ@IZbp=^%2;4E?amGBjQ7a`xB5_F~T&YFDSL{Fw^jNhWq!zYXYMO69e_`@x(<&`_ zc0feBJh=|@wIcO0xMFKjL=kdzNehJAa!XN4WPr@w`9-)bw=nNrKRb7>KZ$Bfr)Z1l z{`}Fik5~b?sfc4ZtSJ{V_BmWS6z~Jo0~N#s5~?J8t8J^4H$V65DbMZ9$I7iWMQq$G vu`%H;qp0IpGuF+(?GN^m5d?y%+p@|GfhjPkCoFQJq?ERP+`RkTua3VDE=Z-A delta 3563 zcmZu!O^BUW8Rkyg)CNKu^V4aQwrNab(NpNOhq-xKOCrjXMRIg&+kLMRcV_S1z;*-74bV_57hJ9uL4 zpNqT9293v0Z?AmQ8l3im8k1GFU7F3Dg7qb|oFtK!E>&7g(FUra2d>$+P>cA=(}~A+ zKfAXtS8nR=-p-9rox#x?JdPfD_+WAOC)d`m^c}s{&K|z=_A_VBnhk3<#+Mdb%O*9n zW`#J0Mrv}1IViC!(Ws4@od`AGyz4!QI;wkrkP{dc{B$II`1VKbCo z8|B0Wr<7P*bVj6Fv{t&WiMsQGe;LeHwQ(?>rWMsp8twSrh4q6^9Qx~_arDC0Dh20a zY1uf5y)xsxY$UhXl~EBE(8LqhBp9L(^NO10k~|xV-WCX;*xlEcE?s}eMB+vm zKYwm}Gx-!K7w1!Ny>ads2?}h&COd0874C_vHjN>tgr(IEY^kVbHPbpCsbyC$UDy3` zZQg}Hd-3p@vv;O6{&e}|(VI7}mHnM-dTCd$?(FUBF4lEwg!@kqIric*`vy4K=zR5| zx!RaBI#A)v-lS~NGsYE@)06|D)fS0>hi)p6GL9a5(EhgsyJ0rWT!Qqgmv;Kwf8H6w zRNC&&p4^-&IQZB7FWx=jVucH8_uT^Mu30l}3mfq@nh;!dY;T&ts!cix-#agKpZj!(NwZWH`OjgXjM_(njO3EPW zgt3ELC%(RR2-9>M=HP4VKU|xOw59+8IYu^2rgu$B%~?}@;~FwW+?*PT#Rx%kAiAWi z(qqEjoSmqBa{T$!^W%l%TgxD+^yETxU9n~2k`u{P_QZ0NLIDUIz**37O(qzzBmqTp z(&*$ar#!B=wGeq093Be*$j#&5QVL`!BwHXH4S+Z~ zUVHq$gWo^)$9u+K;?@dtFs!}+=xn1WXp3vc8R{uS2p85u78ppinu<2m*&x9y8{3?4 zm|zZ3yzk)S=g%(|e*ELy_DU1Af|&!)O$@vd&hC> z2Y-L^`-?Rfrj2Z7r=&f#+J#-LAQ1?SIrJEl;w{G1a;=U6X$nnp77PJc^&QWT*B^Lr zeBkNL8F&@zbEz{fjVQHk9#)GkH4)yzY=3p=u%dj^ObG=M=?ti&0Fx6e=dAQpVE|E z(tg>!s{3Pc`Sf9wbNl717s?7}6xc@_+B|M;JTl(0zrOd(G->Om>&7qW z_&D~!*2;MUb!okG0rQI$TOIgdBYB`DcPJZbFnq10!G4*3Vfbn%AiRks6la%t~m)EdAs;apDw$5 zv#CBjR&ITk;L%@u>!$Y0|R)au_OMB`*nsGTl{Hi~R zYJc|J_L3%BWGskb>hRvoA%O3_3sMh(iJ*mr2TYSiB*UHw^HT@&^kLS76XOm4p*81c zKT5V^-N`j>wh9KBoDlYfBb6+In1QK?bTAoF3Qi}X1>{*|G(-z0kgTg~X*z3b>0ulg zU@6*j^PfpQai79DpgQC(PR3wmt zfYgDBXu{+{PIzIe(9P(e>m)D&8-Xl@QjiG=5#mdz>+<;W2bT*wF<^;APv{Y*1?`(c zE#PSx8CHg+gtWjJlb`NM)3@I9reX&7=iHwvBpPC``%IYU~{Tm|a4Ws}7 From 3779abca36b63a985dc28735c7c2154a77114255 Mon Sep 17 00:00:00 2001 From: chrysn Date: Wed, 25 Jan 2023 02:07:49 +0100 Subject: [PATCH 2/9] rust: Update riot-wrappers --- examples/rust-gcoap/Cargo.lock | Bin 21182 -> 21427 bytes examples/rust-hello-world/Cargo.lock | Bin 17480 -> 17725 bytes sys/rust_riotmodules_standalone/Cargo.lock | Bin 17491 -> 17736 bytes tests/rust_minimal/Cargo.lock | Bin 17476 -> 17721 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/examples/rust-gcoap/Cargo.lock b/examples/rust-gcoap/Cargo.lock index 02798434759218e6a9eff781941c387d3fde8028..60f6f91c421c4325b50047d5438f88c6c9a5be84 100644 GIT binary patch delta 184 zcmdnDlyUQN#trMNG}2PjOpMYJQ<4pg(oE6}lGBWmlFU;qQq7XglT3|_k}M6Ak`fI} zEhal^icWrQb%#emskl6|BsoJjBQa;PqNVia`_>`6oCu*p|3rIBgG3Xckrv5GDTd}o zW=1BKNrq;I7M2#NCKjm%X~t=W$*JZhDaIx#$>tU&$w^7cmKJGAi6*HjMi$0tNs}K6 Yi}9r9CZ(pNq^3aZ;gQ;G6^}5P;#FqbZ0A3>bpKG`Bl9+|C9Bud=fI_`mO6aoZQCZ8r$~yV&MNa+14@OG17T*)k&F|n09D5J Uk9GBvRYc_hz4Zo{^X$<10~AR-4gdfE delta 72 zcmdnn#dxBFaYKc^Mv9S{k!7-FiiugGfst{VS(=GKQks#WiHU(hTAEpsX>yWLnz2E0 c+T@G8qLa7kubj-HFR{7Rz=nJCa+_%!08Munk^lez diff --git a/sys/rust_riotmodules_standalone/Cargo.lock b/sys/rust_riotmodules_standalone/Cargo.lock index 4b908c5791e835b0203a9d9ae091790e1245d66f..f0ca6730b576f15d340ca8440a0f6adecfa260b3 100644 GIT binary patch delta 187 zcmXxdy=p>15I|w<3>P6ysx-kWjkr5^ygQ2sLY`#j4+BZ1khCd;kamkagN+Dc=L4h- zzK{uMdy4a&K6^i3z1{ox(ajOOs048IAP&q)$vRFv0pJ{&OPEmo9o*H!c+)%#mv7H2 zS&SB?e$4LcHr(#lfts6ZeW|;rGS8vl-<5yWLnz2E0 c+T@G8qLa7kubix6D80GEz=eDBCYxy-09D=>;{X5v diff --git a/tests/rust_minimal/Cargo.lock b/tests/rust_minimal/Cargo.lock index 30e513354589495ef587d77962738ad9d91681c6..b1486b4e1d15d04ba9c78002e8ac0887d580dc39 100644 GIT binary patch delta 185 zcmYMtt!@HA6hPsuD}fb=8fr)thV0DjW#>*XBz=;(f1wE|2=oyMb_Ke!qDhkt0?!NZ zMwFV`BhGg{6qjT1^HEJq4T5E17Yxj?1)?aZ4Mm!TK*yWLnz2E0 c+T@G8qLa7kubj-HFR{7Rz=C`8Vw-6k081Aaf&c&j From 42b683a89e3b7e1eee3dfd90d1dc97cc666f72de Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Thu, 19 Jan 2023 17:20:12 +0100 Subject: [PATCH 3/9] cpu/gdv32: add SPI support --- cpu/gd32v/include/periph_cpu.h | 78 ++++- cpu/gd32v/include/vendor/gd32vf103_periph.h | 6 +- cpu/gd32v/periph/spi.c | 298 ++++++++++++++++++++ 3 files changed, 371 insertions(+), 11 deletions(-) create mode 100644 cpu/gd32v/periph/spi.c diff --git a/cpu/gd32v/include/periph_cpu.h b/cpu/gd32v/include/periph_cpu.h index 0f953eb04b..e0b3438e5e 100644 --- a/cpu/gd32v/include/periph_cpu.h +++ b/cpu/gd32v/include/periph_cpu.h @@ -205,22 +205,84 @@ typedef struct { #define UART_ISR_PRIO (2) /** - * @name This CPU makes use of the following shared SPI functions + * @brief Define a magic number that tells us to use hardware chip select + * + * We use a random value here, that does clearly differentiate from any possible + * GPIO_PIN(x) value. + */ +#define SPI_HWCS_MASK (0xffffff00) + +/** + * @brief Override the default SPI hardware chip select access macro + * + * Since the CPU does only support one single hardware chip select line, we can + * detect the usage of non-valid lines by comparing to SPI_HWCS_VALID. + */ +#define SPI_HWCS(x) (SPI_HWCS_MASK | x) + +/** + * @brief Define value for unused CS line + */ +#define SPI_CS_UNDEF (GPIO_UNDEF) + +#ifndef DOXYGEN +/** + * @brief Overwrite the default spi_cs_t type definition * @{ */ -#define PERIPH_SPI_NEEDS_TRANSFER_BYTE 1 -#define PERIPH_SPI_NEEDS_TRANSFER_REG 1 -#define PERIPH_SPI_NEEDS_TRANSFER_REGS 1 +#define HAVE_SPI_CS_T +typedef uint32_t spi_cs_t; +/** @} */ +#endif + +/** + * @brief Use the shared SPI functions + * @{ + */ +/** Use transfer byte function from periph common */ +#define PERIPH_SPI_NEEDS_TRANSFER_BYTE +/** Use transfer reg function from periph common */ +#define PERIPH_SPI_NEEDS_TRANSFER_REG +/** Use transfer regs function from periph common */ +#define PERIPH_SPI_NEEDS_TRANSFER_REGS +/** @} */ + +/** + * @brief Override SPI clock speed values + * @{ + */ +#define HAVE_SPI_CLK_T +enum { + SPI_CLK_100KHZ = KHZ(100), /**< drive the SPI bus with 100KHz */ + SPI_CLK_400KHZ = KHZ(400), /**< drive the SPI bus with 400KHz */ + SPI_CLK_1MHZ = MHZ(1), /**< drive the SPI bus with 1MHz */ + SPI_CLK_5MHZ = MHZ(5), /**< drive the SPI bus with 5MHz */ + SPI_CLK_10MHZ = MHZ(10), /**< drive the SPI bus with 10MHz */ +}; + +/** + * @brief SPI clock type + */ +typedef uint32_t spi_clk_t; /** @} */ /** * @brief Structure for SPI configuration data */ typedef struct { - uint32_t addr; /**< SPI control register address */ - gpio_t mosi; /**< MOSI pin */ - gpio_t miso; /**< MISO pin */ - gpio_t sclk; /**< SCLK pin */ + SPI_Type *dev; /**< SPI device base register address */ + gpio_t mosi_pin; /**< MOSI pin */ + gpio_t miso_pin; /**< MISO pin */ + gpio_t sclk_pin; /**< SCLK pin */ + spi_cs_t cs_pin; /**< HWCS pin, set to SPI_CS_UNDEF if not mapped */ + uint32_t rcumask; /**< bit in the RCC peripheral enable register */ + uint8_t apbbus; /**< APBx bus the device is connected to */ +#ifdef MODULE_PERIPH_DMA + dma_t tx_dma; /**< Logical DMA stream used for TX */ + uint8_t tx_dma_chan; /**< DMA channel used for TX */ + dma_t rx_dma; /**< Logical DMA stream used for RX */ + uint8_t rx_dma_chan; /**< DMA channel used for RX */ +#endif } spi_conf_t; /** diff --git a/cpu/gd32v/include/vendor/gd32vf103_periph.h b/cpu/gd32v/include/vendor/gd32vf103_periph.h index 70cb840f56..52d0d437ea 100644 --- a/cpu/gd32v/include/vendor/gd32vf103_periph.h +++ b/cpu/gd32v/include/vendor/gd32vf103_periph.h @@ -11555,9 +11555,9 @@ typedef struct { /*!< (@ 0x40002C00) WWDGT Struct //#define PMU_BASE 0x40007000UL //#define RCU_BASE 0x40021000UL //#define RTC_BASE 0x40002800UL -//#define SPI0_BASE 0x40013000UL -//#define SPI1_BASE 0x40003800UL -//#define SPI2_BASE 0x40003C00UL +#define SPI0_BASE 0x40013000UL +#define SPI1_BASE 0x40003800UL +#define SPI2_BASE 0x40003C00UL #define TIMER0_BASE 0x40012C00UL #define TIMER1_BASE 0x40000000UL #define TIMER2_BASE 0x40000400UL diff --git a/cpu/gd32v/periph/spi.c b/cpu/gd32v/periph/spi.c new file mode 100644 index 0000000000..8cedd7664a --- /dev/null +++ b/cpu/gd32v/periph/spi.c @@ -0,0 +1,298 @@ +/* + * Copyright (C) 2014 Hamburg University of Applied Sciences + * 2014-2017 Freie Universität Berlin + * 2016-2017 OTA keys S.A. + * 2023 Gunar Schorcht + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup cpu_gd32v + * @ingroup drivers_periph_spi + * @{ + * + * @file + * @brief Low-level SPI driver implementation + * + * + * @author Peter Kietzmann + * @author Fabian Nack + * @author Hauke Petersen + * @author Vincent Dupont + * @author Joakim Nohlgård + * @author Thomas Eichinger + * @author Gunar Schorcht + * + * @} + */ + +#include + +#include "bitarithm.h" +#include "cpu.h" +#include "mutex.h" +#include "periph/gpio.h" +#include "periph/spi.h" +#include "pm_layered.h" + +#define ENABLE_DEBUG 0 +#include "debug.h" + +/** + * @brief Number of bits to shift the BR value in the CR1 register + */ +#define BR_SHIFT (3U) +#define BR_MAX (7U) + +#define SPI_CTL1_SETTINGS 0 + +/** + * @brief Allocate one lock per SPI device + */ +static mutex_t locks[SPI_NUMOF]; + +/** + * @brief Clock configuration cache + */ +static uint32_t clocks[SPI_NUMOF]; + +/** + * @brief Clock divider cache + */ +static uint8_t dividers[SPI_NUMOF]; + +static inline SPI_Type *dev(spi_t bus) +{ + return spi_config[bus].dev; +} + +/** + * @brief Multiplier for clock divider calculations + * + * Makes the divider calculation fixed point + */ +#define SPI_APB_CLOCK_SHIFT (4U) +#define SPI_APB_CLOCK_MULT (1U << SPI_APB_CLOCK_SHIFT) + +static uint8_t _get_clkdiv(const spi_conf_t *conf, uint32_t clock) +{ + uint32_t bus_clock = periph_apb_clk(conf->apbbus); + /* Shift bus_clock with SPI_APB_CLOCK_SHIFT to create a fixed point int */ + uint32_t div = (bus_clock << SPI_APB_CLOCK_SHIFT) / (2 * clock); + DEBUG("[spi] clock: divider: %"PRIu32"\n", div); + /* Test if the divider is 2 or smaller, keeping the fixed point in mind */ + if (div <= SPI_APB_CLOCK_MULT) { + return 0; + } + /* determine MSB and compensate back for the fixed point int shift */ + uint8_t rounded_div = bitarithm_msb(div) - SPI_APB_CLOCK_SHIFT; + /* Determine if rounded_div is not a power of 2 */ + if ((div & (div - 1)) != 0) { + /* increment by 1 to ensure that the clock speed at most the + * requested clock speed */ + rounded_div++; + } + return rounded_div > BR_MAX ? BR_MAX : rounded_div; +} + +void spi_init(spi_t bus) +{ + assert(bus < SPI_NUMOF); + + /* initialize device lock */ + mutex_init(&locks[bus]); + /* trigger pin initialization */ + spi_init_pins(bus); + + periph_clk_en(spi_config[bus].apbbus, spi_config[bus].rcumask); + + /* reset configuration */ + dev(bus)->CTL0 = 0; +#ifdef SPI0_I2SCTL_I2SSEL_Msk + dev(bus)->I2SCTL = 0; +#endif + dev(bus)->CTL1 = SPI_CTL1_SETTINGS; + periph_clk_dis(spi_config[bus].apbbus, spi_config[bus].rcumask); +} + +void spi_init_pins(spi_t bus) +{ + if (gpio_is_valid(spi_config[bus].sclk_pin)) { + gpio_init_af(spi_config[bus].sclk_pin, GPIO_AF_OUT_PP); + } + + if (gpio_is_valid(spi_config[bus].mosi_pin)) { + gpio_init_af(spi_config[bus].mosi_pin, GPIO_AF_OUT_PP); + } + + if (gpio_is_valid(spi_config[bus].miso_pin)) { + gpio_init(spi_config[bus].miso_pin, GPIO_IN); + } +} + +int spi_init_cs(spi_t bus, spi_cs_t cs) +{ + if (bus >= SPI_NUMOF) { + return SPI_NODEV; + } + + if (!gpio_is_valid(cs) || + (((cs & SPI_HWCS_MASK) == SPI_HWCS_MASK) && (cs & ~(SPI_HWCS_MASK)))) { + return SPI_NOCS; + } + + if (cs == SPI_HWCS_MASK) { + if (!gpio_is_valid(spi_config[bus].cs_pin)) { + return SPI_NOCS; + } + gpio_init_af(spi_config[bus].cs_pin, GPIO_AF_OUT_PP); + } + else { + gpio_init((gpio_t)cs, GPIO_OUT); + gpio_set((gpio_t)cs); + } + + return SPI_OK; +} + +#ifdef MODULE_PERIPH_SPI_GPIO_MODE +int spi_init_with_gpio_mode(spi_t bus, const spi_gpio_mode_t* mode) +{ + assert(bus < SPI_NUMOF); + + int ret = 0; + + /* This has no effect on GD32VF103 */ + return ret; +} +#endif + +void spi_acquire(spi_t bus, spi_cs_t cs, spi_mode_t mode, spi_clk_t clk) +{ + assert((unsigned)bus < SPI_NUMOF); + + /* lock bus */ + mutex_lock(&locks[bus]); + + /* block DEEP_SLEEP mode */ + pm_block(GD32V_PM_DEEPSLEEP); + + /* enable SPI device clock */ + periph_clk_en(spi_config[bus].apbbus, spi_config[bus].rcumask); + /* enable device */ + if (clk != clocks[bus]) { + dividers[bus] = _get_clkdiv(&spi_config[bus], clk); + clocks[bus] = clk; + } + uint8_t br = dividers[bus]; + + DEBUG("[spi] acquire: requested clock: %"PRIu32", resulting clock: %"PRIu32 + " BR divider: %u\n", + clk, + periph_apb_clk(spi_config[bus].apbbus)/(1 << (br + 1)), + br); + + uint16_t ctl0_settings = ((br << BR_SHIFT) | mode | SPI0_CTL0_MSTMOD_Msk); + /* Settings to add to CTL1 in addition to SPI_CTL1_SETTINGS */ + uint16_t ctl1_extra_settings = 0; + if (cs != SPI_HWCS_MASK) { + ctl0_settings |= (SPI0_CTL0_SWNSSEN_Msk | SPI0_CTL0_SWNSS_Msk); + } + else { + ctl1_extra_settings = (SPI0_CTL1_NSSDRV_Msk); + } + + dev(bus)->CTL0 = ctl0_settings; + /* Only modify CR2 if needed */ + if (ctl1_extra_settings) { + dev(bus)->CTL1 = (SPI_CTL1_SETTINGS | ctl1_extra_settings); + } +} + +void spi_release(spi_t bus) +{ + /* disable device and release lock */ + dev(bus)->CTL0 = 0; + dev(bus)->CTL1 = SPI_CTL1_SETTINGS; /* Clear the DMA and SSOE flags */ + periph_clk_dis(spi_config[bus].apbbus, spi_config[bus].rcumask); + + /* unblock DEEP_SLEEP mode */ + pm_unblock(GD32V_PM_DEEPSLEEP); + + mutex_unlock(&locks[bus]); +} + +static inline void _wait_for_end(spi_t bus) +{ + /* make sure the transfer is completed before continuing, see reference + * manual(s) -> section 'Disabling the SPI' */ + while (!(dev(bus)->STAT & SPI0_STAT_TBE_Msk)) {} + while (dev(bus)->STAT & SPI0_STAT_TRANS_Msk) {} +} + +static void _transfer_no_dma(spi_t bus, const void *out, void *in, size_t len) +{ + const uint8_t *outbuf = out; + uint8_t *inbuf = in; + + /* we need to recast the data register to uint_8 to force 8-bit access */ + volatile uint8_t *DR = (volatile uint8_t*)&(dev(bus)->DATA); + + /* transfer data, use shortpath if only sending data */ + if (!inbuf) { + for (size_t i = 0; i < len; i++) { + while (!(dev(bus)->STAT & SPI0_STAT_TBE_Msk)) {} + *DR = outbuf[i]; + } + /* wait until everything is finished and empty the receive buffer */ + while (!(dev(bus)->STAT & SPI0_STAT_TBE_Msk)) {} + while (dev(bus)->STAT & SPI0_STAT_TRANS_Msk) {} + while (dev(bus)->STAT & SPI0_STAT_RBNE_Msk) { + dev(bus)->DATA; /* we might just read 2 bytes at once here */ + } + } + else if (!outbuf) { + for (size_t i = 0; i < len; i++) { + while (!(dev(bus)->STAT & SPI0_STAT_TBE_Msk)) {} + *DR = 0; + while (!(dev(bus)->STAT & SPI0_STAT_RBNE_Msk)) {} + inbuf[i] = *DR; + } + } + else { + for (size_t i = 0; i < len; i++) { + while (!(dev(bus)->STAT & SPI0_STAT_TBE_Msk)) {} + *DR = outbuf[i]; + while (!(dev(bus)->STAT & SPI0_STAT_RBNE_Msk)) {} + inbuf[i] = *DR; + } + } + + _wait_for_end(bus); +} + +void spi_transfer_bytes(spi_t bus, spi_cs_t cs, bool cont, + const void *out, void *in, size_t len) +{ + /* make sure at least one input or one output buffer is given */ + assert(out || in); + + /* active the given chip select line */ + dev(bus)->CTL0 |= (SPI0_CTL0_SPIEN_Msk); /* this pulls the HW CS line low */ + if ((cs != SPI_HWCS_MASK) && gpio_is_valid(cs)) { + gpio_clear((gpio_t)cs); + } + + _transfer_no_dma(bus, out, in, len); + + /* release the chip select if not specified differently */ + if ((!cont) && gpio_is_valid(cs)) { + dev(bus)->CTL0 &= ~(SPI0_CTL0_SPIEN_Msk); /* pull HW CS line high */ + if (cs != SPI_HWCS_MASK) { + gpio_set((gpio_t)cs); + } + } +} From ea6a9d3f36205c3340c6ab118d28e803b238f510 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Thu, 19 Jan 2023 17:09:33 +0100 Subject: [PATCH 4/9] boards/common/gd32v: add default SPI configuration --- boards/common/gd32v/include/cfg_spi_default.h | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 boards/common/gd32v/include/cfg_spi_default.h diff --git a/boards/common/gd32v/include/cfg_spi_default.h b/boards/common/gd32v/include/cfg_spi_default.h new file mode 100644 index 0000000000..c7f28f96cc --- /dev/null +++ b/boards/common/gd32v/include/cfg_spi_default.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2020 Koen Zandberg + * 2023 Gunar Schorcht + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ + +/** + * @ingroup boards_common_gd32v + * @{ + * + * @file + * @brief Common peripheral configuration for GD32VF103 boards + * + * @author Koen Zandberg + * @author Gunar Schorcht + */ + +#ifndef CFG_SPI_DEFAULT_H +#define CFG_SPI_DEFAULT_H + +#include "periph_cpu.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @name SPI configuration + * @{ + */ +static const spi_conf_t spi_config[] = { + { + .dev = SPI1, + .mosi_pin = GPIO_PIN(PORT_B, 15), + .miso_pin = GPIO_PIN(PORT_B, 14), + .sclk_pin = GPIO_PIN(PORT_B, 13), + .cs_pin = GPIO_PIN(PORT_B, 12), + .rcumask = RCU_APB1EN_SPI1EN_Msk, + .apbbus = APB1, + }, +#ifndef MODULE_PERIPH_ADC + { + .dev = SPI0, + .mosi_pin = GPIO_PIN(PORT_A, 7), + .miso_pin = GPIO_PIN(PORT_A, 6), + .sclk_pin = GPIO_PIN(PORT_A, 5), + .cs_pin = GPIO_PIN(PORT_A, 4), + .rcumask = RCU_APB2EN_SPI0EN_Msk, + .apbbus = APB2, + }, +#endif +}; + +#define SPI_NUMOF ARRAY_SIZE(spi_config) +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* CFG_SPI_DEFAULT_H */ +/** @} */ From b2c0062393b12942a8869334687e01c14d00aaa7 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 30 Jan 2023 08:08:05 +0100 Subject: [PATCH 5/9] boards/seeedstudio-gd32v: add SPI configuration --- boards/seeedstudio-gd32/Kconfig | 1 + boards/seeedstudio-gd32/Makefile.features | 1 + boards/seeedstudio-gd32/doc.txt | 14 +++++++++++--- boards/seeedstudio-gd32/include/periph_conf.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/boards/seeedstudio-gd32/Kconfig b/boards/seeedstudio-gd32/Kconfig index b0dcf5773c..46c9ea8230 100644 --- a/boards/seeedstudio-gd32/Kconfig +++ b/boards/seeedstudio-gd32/Kconfig @@ -16,6 +16,7 @@ config BOARD_SEEEDSTUDIO_GD32 select BOARD_HAS_LXTAL select HAS_PERIPH_I2C select HAS_PERIPH_PWM + select HAS_PERIPH_SPI select HAS_PERIPH_TIMER select HAS_PERIPH_UART select HAVE_SAUL_GPIO diff --git a/boards/seeedstudio-gd32/Makefile.features b/boards/seeedstudio-gd32/Makefile.features index 7f8956607c..f1a4d92d35 100644 --- a/boards/seeedstudio-gd32/Makefile.features +++ b/boards/seeedstudio-gd32/Makefile.features @@ -3,6 +3,7 @@ CPU_MODEL = gd32vf103vbt6 # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm +FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart diff --git a/boards/seeedstudio-gd32/doc.txt b/boards/seeedstudio-gd32/doc.txt index 1ddffa1445..2419086fa0 100644 --- a/boards/seeedstudio-gd32/doc.txt +++ b/boards/seeedstudio-gd32/doc.txt @@ -41,7 +41,7 @@ on-board components: | DAC | 2 x 12-bit channel | no | | UART | 2 | yes | | USART | 3 | yes | -| SPI | 3 | no | +| SPI | 3 | yes | | I2C | 2 x Fast Mode 400 kHz | yes | | I2S | 2 | no | | CAN | 2 x CAN 2.0B with up to 1 Mbps | no | @@ -64,9 +64,13 @@ MCU pins and their configuration in RIOT. | MCU Pin | MCU Peripheral | RIOT Peripheral | Board Function | Remark | |:--------|:---------------|:-----------------|:---------------|:-----------------------------| -| PA0 | | BTN0 | KEY1 | | +| PA0 | BOOT0 | BTN0 | KEY1 | | | PA9 | USART0 TX | UART_DEV(0) TX | UART TX | | | PA10 | USART0 RX | UART_DEV(0) RX | UART RX | | +| PA4 | SPI1 CS | SPI_DEV(1) CS | | | +| PA5 | SPI1 SCLK | SPI_DEV(1) SCLK | | | +| PA6 | SPI1 MISO | SPI_DEV(1) MISO | | | +| PA7 | SPI1 MOSI | SPI_DEV(1) MOSI | | | | PB0 | | PWM_DEV(0) CH0 | LED1 green | | | PB1 | | PWM_DEV(0) CH1 | LED2 blue | | | PB5 | | | LED0 red | | @@ -76,9 +80,13 @@ MCU pins and their configuration in RIOT. | PB9 | | PWM_DEV(1) CH1 | | N/A if CAN is used | | PB10 | I2C1 SCL | I2C_DEV(1) SCL | | | | PB11 | I2C1 SDA | I2C_DEV(1) SDA | | | +| PB12 | SPI0 CS | SPI_DEV(0) CS | | | +| PB13 | SPI0 SCLK | SPI_DEV(0) SCLK | | | +| PB14 | SPI0 MISO | SPI_DEV(0) MISO | | | +| PB15 | SPI0 MOSI | SPI_DEV(0) MOSI | | | | PC13 | | BTN1 | KEY2 | | -## Flash the board +## Flashing the Device The board is flashed via a JTAG interface with OpenOCD (at least [release version 0.12.0] (https://github.com/openocd-org/openocd/tree/9ea7f3d647c8ecf6b0f1424002dfc3f4504a162c)). diff --git a/boards/seeedstudio-gd32/include/periph_conf.h b/boards/seeedstudio-gd32/include/periph_conf.h index 64b667b112..9a807a2434 100644 --- a/boards/seeedstudio-gd32/include/periph_conf.h +++ b/boards/seeedstudio-gd32/include/periph_conf.h @@ -37,6 +37,7 @@ #include "periph_common_conf.h" #include "cfg_i2c_default.h" +#include "cfg_spi_default.h" #include "cfg_timer_default.h" #include "cfg_uart_default.h" From 8d3369acc77bbc2e8d8d1fc6e7915bfc491c596b Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 30 Jan 2023 08:07:22 +0100 Subject: [PATCH 6/9] boards/sipeed-longan-nano: add SPI configuration --- boards/sipeed-longan-nano/Kconfig | 1 + boards/sipeed-longan-nano/Makefile.features | 1 + boards/sipeed-longan-nano/doc.txt | 12 +++++++++-- boards/sipeed-longan-nano/include/board.h | 21 +++++++++++++++++++ .../sipeed-longan-nano/include/periph_conf.h | 1 + 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/boards/sipeed-longan-nano/Kconfig b/boards/sipeed-longan-nano/Kconfig index ecd1fa339f..7597d38880 100644 --- a/boards/sipeed-longan-nano/Kconfig +++ b/boards/sipeed-longan-nano/Kconfig @@ -16,6 +16,7 @@ config BOARD_SIPEED_LONGAN_NANO select BOARD_HAS_LXTAL select HAS_PERIPH_I2C select HAS_PERIPH_PWM + select HAS_PERIPH_SPI select HAS_PERIPH_TIMER select HAS_PERIPH_UART select HAVE_SAUL_GPIO diff --git a/boards/sipeed-longan-nano/Makefile.features b/boards/sipeed-longan-nano/Makefile.features index 1fc54d3a18..392f643648 100644 --- a/boards/sipeed-longan-nano/Makefile.features +++ b/boards/sipeed-longan-nano/Makefile.features @@ -3,6 +3,7 @@ CPU_MODEL = gd32vf103cbt6 # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm +FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart diff --git a/boards/sipeed-longan-nano/doc.txt b/boards/sipeed-longan-nano/doc.txt index 43fa392ba4..04ec0c4187 100644 --- a/boards/sipeed-longan-nano/doc.txt +++ b/boards/sipeed-longan-nano/doc.txt @@ -35,7 +35,7 @@ on-board components: | DAC | 2 x 12-bit channel | no | | UART | - | yes | | USART | 3 | yes | -| SPI | 3 | no | +| SPI | 3 | yes | | I2C | 2 x Fast Mode 400 kHz | yes | | I2S | 2 | no | | CAN | 2 x CAN 2.0B with up to 1 Mbps | no | @@ -58,9 +58,13 @@ MCU pins and their configuration in RIOT. | MCU Pin | MCU Peripheral | RIOT Peripheral | Board Function | Remark | |:--------|:---------------|:-----------------|:---------------|:-----------------------------| -| PA0 | BOOT0 | | BTN0 | | +| PA0 | BOOT0 | BTN0 | BOOT | | | PA1 | | PWM_DEV(0) CH0 | LED1 green | | | PA2 | | PWM_DEV(0) CH1 | LED2 blue | | +| PA4 | SPI1 CS | SPI_DEV(1) CS | | | +| PA5 | SPI1 SCLK | SPI_DEV(1) SCLK | | | +| PA6 | SPI1 MISO | SPI_DEV(1) MISO | | | +| PA7 | SPI1 MOSI | SPI_DEV(1) MOSI | | | | PA9 | USART0 TX | UART_DEV(0) TX | UART TX | | | PA10 | USART0 RX | UART_DEV(0) RX | UART RX | | | PB6 | I2C0 SCL | I2C_DEV(0) SCL | | | @@ -69,6 +73,10 @@ MCU pins and their configuration in RIOT. | PB9 | | PWM_DEV(1) CH1 | | N/A if CAN is used | | PB10 | I2C1 SCL | I2C_DEV(1) SCL | | | | PB11 | I2C1 SDA | I2C_DEV(1) SDA | | | +| PB12 | SPI0 CS | SPI_DEV(0) CS | | | +| PB13 | SPI0 SCLK | SPI_DEV(0) SCLK | | | +| PB14 | SPI0 MISO | SPI_DEV(0) MISO | | | +| PB15 | SPI0 MOSI | SPI_DEV(0) MOSI | | | | PC13 | | | LED0 red | | ## Flashing the Device diff --git a/boards/sipeed-longan-nano/include/board.h b/boards/sipeed-longan-nano/include/board.h index f72ca46cdb..f57ffc94fe 100644 --- a/boards/sipeed-longan-nano/include/board.h +++ b/boards/sipeed-longan-nano/include/board.h @@ -53,6 +53,27 @@ extern "C" { #define LED_BLUE_PIN LED2_PIN /**< LED2 is blue */ /** @} */ +#if defined(MODULE_SDCARD_SPI) +#define SDCARD_SPI_PARAM_SPI SPI_DEV(0) +#define SDCARD_SPI_PARAM_CS GPIO_PIN(PORT_B, 12) +#define SDCARD_SPI_PARAM_CLK GPIO_PIN(PORT_B, 13) +#define SDCARD_SPI_PARAM_MISO GPIO_PIN(PORT_B, 14) +#define SDCARD_SPI_PARAM_MOSI GPIO_PIN(PORT_B, 15) +#endif + +#if defined(MODULE_ST7735) && defined(CONFIG_SIPEED_LONGAN_NANO_WITH_TFT) +#define ST7735_PARAM_SPI SPI_DEV(1) /**< SPI device */ +#define ST7735_PARAM_SPI_CLK SPI_CLK_5MHZ /**< SPI clock frequency */ +#define ST7735_PARAM_SPI_MODE SPI_MODE_0 /**< SPI mode */ +#define ST7735_PARAM_CS GPIO_PIN(PORT_B, 2) /**< Chip Select pin */ +#define ST7735_PARAM_DCX GPIO_PIN(PORT_B, 0) /**< DCX pin */ +#define ST7735_PARAM_RST GPIO_PIN(PORT_B, 1) /**< Reset pin */ +#define ST7735_PARAM_RGB 1 /**< RGB mode enable */ +#define ST7735_PARAM_INVERTED 0 /**< Inverted mode enable */ +#define ST7735_PARAM_NUM_LINES 160U /**< Number of lines */ +#define ST7735_PARAM_RGB_CHANNELS 80U /**< Number of columns */ +#endif + #ifdef __cplusplus } #endif diff --git a/boards/sipeed-longan-nano/include/periph_conf.h b/boards/sipeed-longan-nano/include/periph_conf.h index 7b3ea51c0c..3f9027f7a6 100644 --- a/boards/sipeed-longan-nano/include/periph_conf.h +++ b/boards/sipeed-longan-nano/include/periph_conf.h @@ -37,6 +37,7 @@ #include "periph_common_conf.h" #include "cfg_i2c_default.h" +#include "cfg_spi_default.h" #include "cfg_timer_default.h" #include "cfg_uart_default.h" From 4b3663ee02b533c6031feaead9b15300ab069147 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 30 Jan 2023 08:20:43 +0100 Subject: [PATCH 7/9] dist/tools/doccheck: add SPI config to generic_exclude_pattern --- dist/tools/doccheck/generic_exclude_patterns | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/tools/doccheck/generic_exclude_patterns b/dist/tools/doccheck/generic_exclude_patterns index ddb307d8de..c0aaaeff71 100644 --- a/dist/tools/doccheck/generic_exclude_patterns +++ b/dist/tools/doccheck/generic_exclude_patterns @@ -47,6 +47,8 @@ warning: Member RTT_MAX_FREQUENCY \(macro definition\) of warning: Member SHT1X_PARAMS \(macro definition\) of warning: Member SHT1X_PARAM_[A-Z0-9_]* \(macro definition\) of warning: Member SHT1X_SAULINFO \(macro definition\) of +warning: Member spi_config\[\] \(variable\) of +warning: Member SPI_NUMOF \(macro definition\) of warning: Member TIMER_[0-9]_IRQN \(macro definition\) of warning: Member TIMER_NUMOF \(macro definition\) of warning: Member timer_config\[\] \(variable\) of From 1e5b89c40bf5e4b920dc4e802f0e5769e120408d Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 30 Jan 2023 08:21:17 +0100 Subject: [PATCH 8/9] dist/tools/doccheck: add SD_SPI CARD config to generic_exclude_pattern --- dist/tools/doccheck/generic_exclude_patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/tools/doccheck/generic_exclude_patterns b/dist/tools/doccheck/generic_exclude_patterns index c0aaaeff71..cdcb0c57fe 100644 --- a/dist/tools/doccheck/generic_exclude_patterns +++ b/dist/tools/doccheck/generic_exclude_patterns @@ -44,6 +44,7 @@ warning: Member pwm_config\[\] \(variable\) of warning: Member PWM_NUMOF \(macro definition\) of warning: Member RTT_FREQUENCY \(macro definition\) of warning: Member RTT_MAX_FREQUENCY \(macro definition\) of +warning: Member SDCARD_SPI_PARAM_[A-Z0-9_]* \(macro definition\) of warning: Member SHT1X_PARAMS \(macro definition\) of warning: Member SHT1X_PARAM_[A-Z0-9_]* \(macro definition\) of warning: Member SHT1X_SAULINFO \(macro definition\) of From 929bb3e0abaa54e77ed4cb47392861ad847c8053 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 30 Jan 2023 08:21:40 +0100 Subject: [PATCH 9/9] dist/tools/doccheck: add ST7735 config to generic_exclude_pattern --- dist/tools/doccheck/generic_exclude_patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/tools/doccheck/generic_exclude_patterns b/dist/tools/doccheck/generic_exclude_patterns index cdcb0c57fe..523ae35144 100644 --- a/dist/tools/doccheck/generic_exclude_patterns +++ b/dist/tools/doccheck/generic_exclude_patterns @@ -50,6 +50,7 @@ warning: Member SHT1X_PARAM_[A-Z0-9_]* \(macro definition\) of warning: Member SHT1X_SAULINFO \(macro definition\) of warning: Member spi_config\[\] \(variable\) of warning: Member SPI_NUMOF \(macro definition\) of +warning: Member ST7735_PARAM_[A-Z0-9_]* \(macro definition\) of warning: Member TIMER_[0-9]_IRQN \(macro definition\) of warning: Member TIMER_NUMOF \(macro definition\) of warning: Member timer_config\[\] \(variable\) of