SPI frequency parameter

Author: bbogush

firmware/programmer/spi_flash.c

@@ -36,6 +36,7 @@ typedef struct __attribute__((__packed__))
     uint8_t status_cmd;
     uint8_t busy_bit;
     uint8_t busy_state;
+    uint32_t freq;
 } spi_conf_t;
 
 static spi_conf_t spi_conf;
@@ -105,6 +106,28 @@ static inline void spi_flash_deselect_chip()
     GPIO_SetBits(GPIOA, SPI_FLASH_CS_PIN);
 }
 
+static uint16_t spi_flash_get_baud_rate_prescaler(uint32_t spi_freq_khz)
+{
+    uint32_t system_clock_khz = SystemCoreClock / 1000;
+
+    if (spi_freq_khz >= system_clock_khz / 2)
+        return SPI_BaudRatePrescaler_2;
+    else if (spi_freq_khz >= system_clock_khz / 4)
+        return SPI_BaudRatePrescaler_4;
+    else if (spi_freq_khz >= system_clock_khz / 8)
+        return SPI_BaudRatePrescaler_8;
+    else if (spi_freq_khz >= system_clock_khz / 16)
+        return SPI_BaudRatePrescaler_16;
+    else if (spi_freq_khz >= system_clock_khz / 32)
+        return SPI_BaudRatePrescaler_32;
+    else if (spi_freq_khz >= system_clock_khz / 64)
+        return SPI_BaudRatePrescaler_64;
+    else if (spi_freq_khz >= system_clock_khz / 128)
+        return SPI_BaudRatePrescaler_128;
+    else
+        return SPI_BaudRatePrescaler_256;
+}
+
 static int spi_flash_init(void *conf, uint32_t conf_size)
 {
     SPI_InitTypeDef spi_init;
@@ -124,7 +147,8 @@ static int spi_flash_init(void *conf, uint32_t conf_size)
     spi_init.SPI_CPOL = SPI_CPOL_High;
     spi_init.SPI_CPHA = SPI_CPHA_2Edge;
     spi_init.SPI_NSS = SPI_NSS_Soft;
-    spi_init.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_4;
+    spi_init.SPI_BaudRatePrescaler =
+        spi_flash_get_baud_rate_prescaler(spi_conf.freq);
     spi_init.SPI_FirstBit = SPI_FirstBit_MSB;
     spi_init.SPI_CRCPolynomial = 7;
     SPI_Init(SPI1, &spi_init);

qt/nando_spi_chip_db.csv

@@ -1,2 +1,2 @@
-# name, page size, block size, total size, page off., read com., read ID com., write com., erase com., status com., Busy bit, Busy bit state, ID1, ID2, ID3, ID4, ID5
-AT45DB021D, 264, 2112, 270336, 9, 11, 159, 130, 80, 215, 7, 0, 31, 35, -, -, -
+# name, page size, block size, total size, page off., read com., read ID com., write com., erase com., status com., Busy bit, Busy bit state, Max. freq. kHz, ID1, ID2, ID3, ID4, ID5
+AT45DB021D, 264, 2112, 270336, 9, 11, 159, 130, 80, 215, 7, 0, 66000, 31, 35, -, -, -

qt/spi_chip_db.h

@@ -40,6 +40,7 @@ class SpiChipDb : public ChipDb
         CHIP_PARAM_STATUS_CMD,
         CHIP_PARAM_BUSY_BIT,
         CHIP_PARAM_BUSY_STATE,
+        CHIP_PARAM_FREQ,
         CHIP_PARAM_ID1,
         CHIP_PARAM_ID2,
         CHIP_PARAM_ID3,

qt/spi_chip_db_dialog.cpp

@@ -27,7 +27,7 @@ SpiChipDbDialog::SpiChipDbDialog(SpiChipDb *chipDb, QWidget *parent) :
         HEADER_MED_WIDTH);
 
     for (int i = SpiChipDb::CHIP_PARAM_PAGE_OFF;
-         i <= SpiChipDb::CHIP_PARAM_BUSY_STATE; i++)
+         i <= SpiChipDb::CHIP_PARAM_FREQ; i++)
     {
         ui->chipDbTableView->setColumnWidth(i, HEADER_MED_WIDTH);
     }

qt/spi_chip_db_table_model.cpp

@@ -79,6 +79,9 @@ QVariant SpiChipDbTableModel::data(const QModelIndex &index, int role) const
     case SpiChipDb::CHIP_PARAM_BUSY_STATE:
         return chipDb->getChipParam(index.row(),
             SpiChipInfo::CHIP_PARAM_BUSY_STATE);
+    case SpiChipDb::CHIP_PARAM_FREQ:
+        return chipDb->getChipParam(index.row(),
+            SpiChipInfo::CHIP_PARAM_FREQ);
     case SpiChipDb::CHIP_PARAM_ID1:
         chipDb->getHexStringFromParam(chipDb->getChipParam(index.row(),
             SpiChipInfo::CHIP_PARAM_ID1), paramStr);
@@ -123,6 +126,7 @@ QVariant SpiChipDbTableModel::headerData(int section,
         case SpiChipDb::CHIP_PARAM_STATUS_CMD: return tr("Status com.");
         case SpiChipDb::CHIP_PARAM_BUSY_BIT: return tr("Busy bit");
         case SpiChipDb::CHIP_PARAM_BUSY_STATE: return tr("Busy bit state");
+        case SpiChipDb::CHIP_PARAM_FREQ: return tr("Freq. (kHz)");
         case SpiChipDb::CHIP_PARAM_ID1: return tr("ID 1");
         case SpiChipDb::CHIP_PARAM_ID2: return tr("ID 2");
         case SpiChipDb::CHIP_PARAM_ID3: return tr("ID 3");
@@ -159,6 +163,8 @@ QVariant SpiChipDbTableModel::headerData(int section,
             return tr("Busy bit number (0-7) in status register");
         case SpiChipDb::CHIP_PARAM_BUSY_STATE:
             return tr("Busy bit active state (0/1)");
+        case SpiChipDb::CHIP_PARAM_FREQ:
+            return tr("Maximum supported SPI frequency in kHz");
         case SpiChipDb::CHIP_PARAM_ID1:
             return tr("Chip ID 1st byte");
         case SpiChipDb::CHIP_PARAM_ID2:
@@ -272,6 +278,14 @@ bool SpiChipDbTableModel::setData(const QModelIndex &index,
         chipDb->setChipParam(index.row(), SpiChipInfo::CHIP_PARAM_BUSY_STATE,
             paramVal);
         return true;
+    case SpiChipDb::CHIP_PARAM_FREQ:
+        if (chipDb->getParamFromString(value.toString(), paramVal))
+            return false;
+        if (!chipDb->isParamValid(paramVal, 0x00, 0xFFFFFFFF))
+            return false;
+        chipDb->setChipParam(index.row(), SpiChipInfo::CHIP_PARAM_FREQ,
+            paramVal);
+        return true;
     case SpiChipDb::CHIP_PARAM_ID1:
         if (chipDb->getParamFromHexString(value.toString(), paramVal))
             return false;

qt/spi_chip_info.cpp

@@ -15,6 +15,7 @@ typedef struct __attribute__((__packed__))
     uint8_t status_cmd;
     uint8_t busy_bit;
     uint8_t busy_state;
+    uint32_t freq;
 } Conf;
 
 SpiChipInfo::SpiChipInfo()
@@ -38,6 +39,7 @@ const QByteArray &SpiChipInfo::getHalConf()
     conf.status_cmd = static_cast<uint8_t>(params[CHIP_PARAM_STATUS_CMD]);
     conf.busy_bit = static_cast<uint8_t>(params[CHIP_PARAM_BUSY_BIT]);
     conf.busy_state = static_cast<uint8_t>(params[CHIP_PARAM_BUSY_STATE]);
+    conf.freq = params[CHIP_PARAM_FREQ];
 
     halConf.clear();
     halConf.append(reinterpret_cast<const char *>(&conf), sizeof(conf));

qt/spi_chip_info.h

@@ -21,6 +21,7 @@ class SpiChipInfo : public ChipInfo
         CHIP_PARAM_STATUS_CMD,
         CHIP_PARAM_BUSY_BIT,
         CHIP_PARAM_BUSY_STATE,
+        CHIP_PARAM_FREQ,
         CHIP_PARAM_ID1,
         CHIP_PARAM_ID2,
         CHIP_PARAM_ID3,