Make Stm32 SPI driver more generic to reuse on other STM32 platforms

pull/31/head
Daniele Lacamera 2019-12-18 15:19:59 +01:00
parent 453a07bd7b
commit 25455744b6
6 changed files with 314 additions and 5 deletions

View File

@ -95,7 +95,7 @@ ifeq ($(SPI_FLASH),1)
EXT_FLASH=1
CFLAGS+= -DSPI_FLASH=1
OBJS+= src/spi_flash.o
WOLFCRYPT_OBJS+=hal/spi/spi_drv_$(TARGET).o
WOLFCRYPT_OBJS+=hal/spi/spi_drv_$(SPI_TARGET).o
endif
ifeq ($(EXT_FLASH),1)
@ -132,7 +132,7 @@ OBJS += lib/wolfTPM/src/tpm2.o \
lib/wolfTPM/src/tpm2_tis.o \
lib/wolfTPM/src/tpm2_wrap.o \
src/ecc256_pub_key.o \
hal/spi/spi_drv_$(TARGET).o
hal/spi/spi_drv_$(SPI_TARGET).o
CFLAGS+=-DWOLFTPM_SLB9670 -DWOLFTPM2_NO_WOLFCRYPT -DSIZEOF_LONG=4 -Ilib/wolfTPM \
-DMAX_COMMAND_SIZE=1024 -DMAX_RESPONSE_SIZE=1024 -DWOLFTPM2_MAX_BUFFER=1500 -DMAX_SESSION_NUM=1 -DMAX_DIGEST_BUFFER=973 \
-DWOLFTPM_SMALL_STACK

View File

@ -10,6 +10,9 @@ endif
# Default flash offset
ARCH_FLASH_OFFSET=0x0
# Default SPI driver name
SPI_TARGET=$(TARGET)
## ARM
ifeq ($(ARCH),ARM)
CROSS_COMPILE:=arm-none-eabi-
@ -32,10 +35,12 @@ ifeq ($(ARCH),ARM)
ifeq ($(TARGET),stm32f7)
ARCH_FLASH_OFFSET=0x08000000
SPI_TARGET=stm32
endif
ifeq ($(TARGET),stm32h7)
ARCH_FLASH_OFFSET=0x08000000
SPI_TARGET=stm32
endif
## Cortex-M CPU
@ -102,8 +107,12 @@ OBJCOPY:=$(CROSS_COMPILE)objcopy
SIZE:=$(CROSS_COMPILE)size
BOOT_IMG?=test-app/image.bin
ifeq ($(TARGET),stm32f4)
SPI_TARGET=stm32
endif
ifeq ($(TARGET),stm32wb)
SPI_TARGET=stm32
ifneq ($(PKA),0)
ECC_EXTRA_OBJS+= $(STM32CUBE)/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.o ./lib/wolfssl/wolfcrypt/src/port/st/stm32.o
ECC_EXTRA_CFLAGS+=-DWOLFSSL_STM32_PKA -I$(STM32CUBE)/Drivers/STM32WBxx_HAL_Driver/Inc \

View File

@ -0,0 +1,171 @@
/* spi_drv.h
*
* Driver for the SPI back-end of the SPI_FLASH module.
*
* Example implementation for stm32F4, using SPI1.
*
* Pinout: see spi_drv_stm32.h
*
* Copyright (C) 2019 wolfSSL Inc.
*
* This file is part of wolfBoot.
*
* wolfBoot is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* wolfBoot is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/
#include <stdint.h>
#include "spi_drv.h"
#include "spi_drv_stm32.h"
void spi_cs_off(int pin)
{
SPI_PIO_CS_BSRR |= (1 << pin);
while(!(SPI_PIO_CS_ODR & (1 << pin)))
;
}
void spi_cs_on(int pin)
{
SPI_PIO_CS_BSRR |= (1 << (pin + 16));
while(SPI_PIO_CS_ODR & (1 << pin))
;
}
static void spi_flash_pin_setup(void)
{
uint32_t reg;
RCC_GPIO_CLOCK_ER |= SPI_PIO_CS_CEN;
reg = SPI_PIO_CS_MODE & ~ (0x03 << (SPI_CS_FLASH * 2));
SPI_PIO_CS_MODE = reg | (1 << (SPI_CS_FLASH * 2));
reg = SPI_PIO_CS_PUPD & ~(0x03 << (SPI_CS_FLASH * 2));
SPI_PIO_CS_PUPD = reg | (0x01 << (SPI_CS_FLASH * 2));
reg = SPI_PIO_CS_OSPD & ~(0x03 << (SPI_CS_FLASH * 2));
SPI_PIO_CS_OSPD |= (0x03 << (SPI_CS_FLASH * 2));
spi_cs_off(SPI_CS_FLASH);
}
static void spi_tpm2_pin_setup(void)
{
#ifdef WOLFTPM2_NO_WOLFCRYPT
uint32_t reg;
RCC_GPIO_CLOCK_ER |= SPI_PIO_CS_EN;
reg = SPI_PIO_CS_MODE & ~ (0x03 << (SPI_CS_TPM * 2));
SPI_PIO_CS_MODE = reg | (1 << (SPI_CS_TPM * 2));
reg = SPI_PIO_CS_PUPD & ~(0x03 << (SPI_CS_TPM * 2));
SPI_PIO_CS_PUPD = reg | (0x01 << (SPI_CS_TPM * 2));
reg = SPI_PIO_CS_OSPD & ~(0x03 << (SPI_CS_TPM * 2));
SPI_PIO_CS_OSPD |= (0x03 << (SPI_CS_TPM * 2));
spi_cs_off(SPI_CS_TPM);
#endif
}
static void spi1_pins_setup(void)
{
uint32_t reg;
RCC_GPIO_CLOCK_ER |= SPI_PIO_CEN;
/* Set mode = AF */
reg = SPI_PIO_MODE & ~ (0x03 << (SPI1_CLOCK_PIN * 2));
SPI_PIO_MODE = reg | (2 << (SPI1_CLOCK_PIN * 2));
reg = SPI_PIO_MODE & ~ (0x03 << (SPI1_MOSI_PIN * 2));
SPI_PIO_MODE = reg | (2 << (SPI1_MOSI_PIN * 2));
reg = SPI_PIO_MODE & ~ (0x03 << (SPI1_MISO_PIN * 2));
SPI_PIO_MODE = reg | (2 << (SPI1_MISO_PIN * 2));
/* Alternate function: use low pins (5,6,7) */
reg = SPI_PIO_AFL & ~(0xf << ((SPI1_CLOCK_PIN) * 4));
SPI_PIO_AFL = reg | (SPI1_PIN_AF << ((SPI1_CLOCK_PIN) * 4));
reg = SPI_PIO_AFL & ~(0xf << ((SPI1_MOSI_PIN) * 4));
SPI_PIO_AFL = reg | (SPI1_PIN_AF << ((SPI1_MOSI_PIN) * 4));
reg = SPI_PIO_AFL & ~(0xf << ((SPI1_MISO_PIN) * 4));
SPI_PIO_AFL = reg | (SPI1_PIN_AF << ((SPI1_MISO_PIN) * 4));
}
static void spi_pins_release(void)
{
uint32_t reg;
/* Set mode = 0 */
SPI_PIO_MODE &= ~ (0x03 << (SPI1_CLOCK_PIN * 2));
SPI_PIO_MODE &= ~ (0x03 << (SPI1_MOSI_PIN * 2));
SPI_PIO_MODE &= ~ (0x03 << (SPI1_MISO_PIN * 2));
/* Alternate function clear */
SPI_PIO_AFL &= ~(0xf << ((SPI1_CLOCK_PIN) * 4));
SPI_PIO_AFL &= ~(0xf << ((SPI1_MOSI_PIN) * 4));
SPI_PIO_AFL &= ~(0xf << ((SPI1_MISO_PIN) * 4));
/* Floating */
SPI_PIO_PUPD &= ~ (0x03 << (SPI1_CLOCK_PIN * 2));
SPI_PIO_PUPD &= ~ (0x03 << (SPI1_MOSI_PIN * 2));
SPI_PIO_PUPD &= ~ (0x03 << (SPI1_MISO_PIN * 2));
/* Release CS */
SPI_PIO_CS_MODE &= ~ (0x03 << (SPI_CS_FLASH * 2));
SPI_PIO_CS_PUPD &= ~ (0x03 << (SPI_CS_TPM * 2));
}
static void spi1_reset(void)
{
APB2_CLOCK_RST |= SPI1_APB2_CLOCK_ER_VAL;
APB2_CLOCK_RST &= ~SPI1_APB2_CLOCK_ER_VAL;
}
uint8_t spi_read(void)
{
volatile uint32_t reg;
do {
reg = SPI1_SR;
} while(!(reg & SPI_SR_RX_NOTEMPTY));
return (uint8_t)SPI1_DR;
}
void spi_write(const char byte)
{
int i;
volatile uint32_t reg;
do {
reg = SPI1_SR;
} while ((reg & SPI_SR_TX_EMPTY) == 0);
SPI1_DR = byte;
do {
reg = SPI1_SR;
} while ((reg & SPI_SR_TX_EMPTY) == 0);
}
void spi_init(int polarity, int phase)
{
static int initialized = 0;
if (!initialized) {
initialized++;
spi1_pins_setup();
spi_flash_pin_setup();
spi_tpm2_pin_setup();
APB2_CLOCK_ER |= SPI1_APB2_CLOCK_ER_VAL;
spi1_reset();
SPI1_CR1 = SPI_CR1_MASTER | (5 << 3) | (polarity << 1) | (phase << 0);
SPI1_CR2 |= SPI_CR2_SSOE;
SPI1_CR1 |= SPI_CR1_SPI_EN;
}
}
void spi_release(void)
{
spi1_reset();
SPI1_CR2 &= ~SPI_CR2_SSOE;
SPI1_CR1 = 0;
spi_pins_release();
}

View File

@ -0,0 +1,129 @@
#ifndef SPI_DRV_STM32_H_INCLUDED
#define SPI_DRV_STM32_H_INCLUDED
#include <stdint.h>
/** SPI settings **/
#define SPI1 (0x40013000)/* SPI1 base address */
#define SPI1_APB2_CLOCK_ER_VAL (1 << 12)
#define CEN_GPIOA (1 << 0)
#define CEN_GPIOB (1 << 1)
#define CEN_GPIOC (1 << 2)
#define CEN_GPIOD (1 << 3)
#define CEN_GPIOE (1 << 4)
#ifdef PLATFORM_stm32f4
#define APB2_CLOCK_ER (*(volatile uint32_t *)(0x40023844))
#define APB2_CLOCK_RST (*(volatile uint32_t *)(0x40023824))
#define CLOCK_SPEED (168000000)
#define RCC_GPIO_CLOCK_ER (*(volatile uint32_t *)(0x40023830))
#define GPIOA_BASE (0x40020000)
#define GPIOB_BASE (0x40020400)
#define GPIOC_BASE (0x40020800)
#define GPIOD_BASE (0x40020C00)
#define GPIOE_BASE (0x40021000)
#define SPI_GPIO GPIOB_BASE
#define SPI_CS_GPIO GPIOB_BASE
#define SPI_PIO_BASE GPIOB_BASE
#define SPI_CS_PIO_BASE GPIOE_BASE
#define SPI_CS_FLASH 1 /* Flash CS connected to GPIOE1 */
#define SPI_CS_TPM 0 /* TPM CS connected to GPIOE0 */
#define SPI1_PIN_AF 5 /* Alternate function for SPI pins */
#define SPI1_CLOCK_PIN 3 /* SPI_SCK: PB3 */
#define SPI1_MISO_PIN 4 /* SPI_MISO PB4 */
#define SPI1_MOSI_PIN 5 /* SPI_MOSI PB5 */
#endif
#ifdef PLATFORM_stm32wb
#define APB2_CLOCK_ER (*(volatile uint32_t *)(0x58000060))
#define APB2_CLOCK_RST (*(volatile uint32_t *)(0x58000040))
#define SPI_GPIO GPIOA_BASE
#define RCC_GPIO_CLOCK_ER (*(volatile uint32_t *)(0x5800004C))
#define GPIOA_BASE (0x48000000)
#define GPIOB_BASE (0x48000400)
#define GPIOC_BASE (0x48000800)
#define GPIOD_BASE (0x48000C00)
#define SPI_CS_GPIO GPIOA_BASE
#define SPI_CS_FLASH 4 /* Flash CS connected to GPIOA4 */
#define SPI_CS_TPM 0 /* TPM CS connected to GPIOA0 */
#define SPI1_PIN_AF 5 /* Alternate function for SPI pins */
#define SPI1_CLOCK_PIN 5 /* SPI_SCK: PA5 */
#define SPI1_MISO_PIN 6 /* SPI_MISO PA6 */
#define SPI1_MOSI_PIN 7 /* SPI_MOSI PA7 */
#endif
#define SPI_PIO_BASE SPI_GPIO
#define SPI_CS_PIO_BASE SPI_CS_GPIO
#if (SPI_GPIO == GPIOA_BASE)
# define SPI_PIO_CEN CEN_GPIOA
#elif (SPI_GPIO == GPIOB_BASE)
# define SPI_PIO_CEN CEN_GPIOB
#elif (SPI_GPIO == GPIOC_BASE)
# define SPI_PIO_CEN CEN_GPIOC
#elif (SPI_GPIO == GPIOD_BASE)
# define SPI_PIO_CEN CEN_GPIOD
#elif (SPI_GPIO == GPIOE_BASE)
# define SPI_PIO_CEN CEN_GPIOE
#endif
#if (SPI_CS_GPIO == GPIOA_BASE)
# define SPI_PIO_CS_CEN CEN_GPIOA
#elif (SPI_CS_GPIO == GPIOB_BASE)
# define SPI_PIO_CS_CEN CEN_GPIOB
#elif (SPI_CS_GPIO == GPIOC_BASE)
# define SPI_PIO_CS_CEN CEN_GPIOC
#elif (SPI_CS_GPIO == GPIOD_BASE)
# define SPI_PIO_CS_CEN CEN_GPIOD
#elif (SPI_CS_GPIO == GPIOE_BASE)
# define SPI_PIO_CS_CEN CEN_GPIOE
#endif
#define SPI1_CR1 (*(volatile uint32_t *)(SPI1))
#define SPI1_CR2 (*(volatile uint32_t *)(SPI1 + 0x04))
#define SPI1_SR (*(volatile uint32_t *)(SPI1 + 0x08))
#define SPI1_DR (*(volatile uint32_t *)(SPI1 + 0x0c))
#define SPI_CR1_CLOCK_PHASE (1 << 0)
#define SPI_CR1_CLOCK_POLARITY (1 << 1)
#define SPI_CR1_MASTER (1 << 2)
#define SPI_CR1_BAUDRATE (0x07 << 3)
#define SPI_CR1_SPI_EN (1 << 6)
#define SPI_CR1_LSBFIRST (1 << 7)
#define SPI_CR1_SSI (1 << 8)
#define SPI_CR1_SSM (1 << 9)
#define SPI_CR1_16BIT_FORMAT (1 << 11)
#define SPI_CR1_TX_CRC_NEXT (1 << 12)
#define SPI_CR1_HW_CRC_EN (1 << 13)
#define SPI_CR1_BIDIOE (1 << 14)
#define SPI_CR2_SSOE (1 << 2)
#define SPI_SR_RX_NOTEMPTY (1 << 0)
#define SPI_SR_TX_EMPTY (1 << 1)
#define SPI_SR_BUSY (1 << 7)
#define SPI_PIO_MODE (*(volatile uint32_t *)(SPI_PIO_BASE + 0x00))
#define SPI_PIO_AFL (*(volatile uint32_t *)(SPI_PIO_BASE + 0x20))
#define SPI_PIO_AFH (*(volatile uint32_t *)(SPI_PIO_BASE + 0x24))
#define SPI_PIO_OSPD (*(volatile uint32_t *)(SPI_PIO_BASE + 0x08))
#define SPI_PIO_PUPD (*(volatile uint32_t *)(SPI_PIO_BASE + 0x0c))
#define SPI_PIO_BSRR (*(volatile uint32_t *)(SPI_PIO_BASE + 0x18))
#define SPI_PIO_CS_MODE (*(volatile uint32_t *)(SPI_CS_PIO_BASE + 0x00))
#define SPI_PIO_CS_AFL (*(volatile uint32_t *)(SPI_CS_PIO_BASE + 0x20))
#define SPI_PIO_CS_AFH (*(volatile uint32_t *)(SPI_CS_PIO_BASE + 0x24))
#define SPI_PIO_CS_OSPD (*(volatile uint32_t *)(SPI_CS_PIO_BASE + 0x08))
#define SPI_PIO_CS_PUPD (*(volatile uint32_t *)(SPI_CS_PIO_BASE + 0x0c))
#define SPI_PIO_CS_BSRR (*(volatile uint32_t *)(SPI_CS_PIO_BASE + 0x18))
#define SPI_PIO_CS_ODR (*(volatile uint32_t *)(SPI_CS_PIO_BASE + 0x14))
#define GPIO_MODE_AF (2)
#endif

View File

@ -30,8 +30,8 @@
#define SPI_DRV_H_INCLUDED
#include <stdint.h>
#ifdef PLATFORM_stm32f4
#include "hal/spi/spi_drv_stm32f4.h"
#if defined(PLATFORM_stm32f4) || defined(PLATFORM_stm32f7) || defined(PLATFORM_stm32wb)
#include "hal/spi/spi_drv_stm32.h"
#endif
void spi_init(int polarity, int phase);

View File

@ -40,7 +40,7 @@ endif
ifeq ($(SPI_FLASH),1)
CFLAGS+=-DSPI_FLASH
APP_OBJS+=../hal/spi/spi_drv_$(TARGET).o ../src/spi_flash.o
APP_OBJS+=../hal/spi/spi_drv_$(SPI_TARGET).o ../src/spi_flash.o
endif
ifeq ($(TARGET),kinetis)