Fix FMC flash bounds and logging

Corrected the GD32 FMC end-of-flash address calculation to avoid an off-by-one bounds issue in flash reads. Added targeted debug tracing around the flash read/write paths and cleaned up redundant debug entry/exit calls. The config-store state log now reports the idle state after a successful flash write, keeping the diagnostics and flash boundary checks aligned with the actual device layout.

Author: vanvught

lib-configstore/device/gd32/rom/storedevice.cpp

@@ -80,13 +80,9 @@ bool StoreDevice::Erase(uint32_t offset, uint32_t length, storedevice::Result& r
 }
 
 bool StoreDevice::Write(uint32_t offset, std::span<const uint8_t> buffer, storedevice::Result& result) {
-    CONFIGSTORE_DEBUG_ENTRY();
-
     flashcode::Result flashrom_result;
     const auto kState = FlashCode::Write(offset, buffer, flashrom_result);
 
     result = static_cast<storedevice::Result>(flashrom_result);
-
-    CONFIGSTORE_DEBUG_EXIT();
     return kState;
 }

lib-configstore/include/configstore.h

@@ -518,16 +518,12 @@ class ConfigStore : StoreDevice {
     }
 
     static void Timer([[maybe_unused]] TimerHandle_t timer_handle) {
-        CONFIGSTORE_DEBUG_ENTRY();
-
         if (!Instance().Commit()) {
             Instance().TimerStop();
 
             CONFIGSTORE_DEBUG_EXIT();
             return;
         }
-
-        CONFIGSTORE_DEBUG_EXIT();
     }
 
     void TimerStart() {
@@ -561,8 +557,6 @@ class ConfigStore : StoreDevice {
     }
 
     bool Flash() {
-        CONFIGSTORE_DEBUG_PUTS(kStateNames[static_cast<unsigned int>(s_state)]);
-
         if (__builtin_expect((s_state == State::kIdle), 1)) {
             return false;
         }
@@ -596,6 +590,7 @@ class ConfigStore : StoreDevice {
                 storedevice::Result result;
                 if (StoreDevice::Write(s_start_address, std::span{s_store}.first<sizeof(ConfigurationStore)>(), result)) {
                     s_state = State::kIdle;
+					CONFIGSTORE_DEBUG_PUTS(kStateNames[static_cast<unsigned int>(s_state)]);
                     return false;
                 }
                 assert(result == storedevice::Result::kOk);

lib-flashcode/src/gd32/flashcode.cpp

@@ -62,8 +62,13 @@ uint32_t FlashCode::GetSectorSize() const {
 }
 
 bool FlashCode::Read(uint32_t offset, std::span<uint8_t> buffer, flashcode::Result& result) {
+	FLASHCODE_DEBUG_ENTRY();
+	FLASHCODE_DEBUG_PRINTF("offset=%u", static_cast<unsigned>(offset));
+	
     const auto kStatus = gd32::fmc::Read(offset, buffer); // Blocking
     result = kStatus ? flashcode::Result::kOk : flashcode::Result::kError;
+	
+	FLASHCODE_DEBUG_EXIT();
     return true;
 }
 

lib-gd32/src/f/fmc/gd32_fmc.cpp

@@ -51,7 +51,7 @@ constexpr auto kBanK1FlashPage = 4 * k1KiB;
 constexpr uint32_t kStartAddress = FLASH_BASE;
 constexpr uint32_t kBank0StartAddress = kStartAddress;
 constexpr uint32_t kBank1StartAddress = 0x08080000;
-const uint32_t kEndAddress = (kStartAddress + (FMC_SIZE * k1KiB) - 1);
+const uint32_t kEndAddress = (kStartAddress + (FMC_SIZE * k1KiB));
 
 enum class State { kIdle, kEraseBusy, kEraseProgram, kWriteBusy, kWriteProgram };
 
@@ -124,9 +124,12 @@ bool Read(uint32_t offset, std::span<uint8_t> buffer) {
     GD32_FMC_DEBUG_ENTRY();
 
     const auto kAddress = offset + FLASH_BASE;
+	
+	GD32_FMC_DEBUG_PRINTF("kStartAddress=%p, kAddress=%p, kEndAddress=%p", reinterpret_cast<void*>(kStartAddress), reinterpret_cast<void*>(kAddress), reinterpret_cast<void*>(kEndAddress));
 
     if (buffer.empty() || ((buffer.size() % sizeof(uint32_t)) != 0) || (kAddress < kStartAddress) || (kAddress >= kEndAddress) || (buffer.size() > (kEndAddress - kAddress))) {
-        return false;
+		GD32_FMC_DEBUG_EXIT();
+		return false;
     }
 
     assert((reinterpret_cast<uintptr_t>(buffer.data()) % alignof(uint32_t)) == 0);