Skip to content

Opta secure QSPI simplify code avoid breaking QSPIFBlockDevice #981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Opta secure QSPI simplify code avoid breaking QSPIFBlockDevice #981

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d683edf
Reapply "Opta: secure_qspi: simplify code"
pennam Oct 25, 2024
4ad1efd
Ensure getSecureFlashData is called before QSPIFBlockDevice constructor
pennam Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions variants/OPTA/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,21 +283,28 @@ static bool has_otp_info = false;

bool getSecureFlashData() {
static OptaBoardInfo info;
uint8_t temp_buf[sizeof(OptaBoardInfo) + 1];
int ret = 0;
static SecureQSPIFBlockDevice secure_root;
secure_root.init();
// read secure sector 2 ( address 1 << 13 )
ret = secure_root.readSecure(temp_buf, (1 << 13), sizeof(temp_buf));
char temp_buf[sizeof(OptaBoardInfo) + 1];
int ret = QSPI_STATUS_OK;
mbed::QSPI _qspi(QSPI_FLASH1_IO0, QSPI_FLASH1_IO1, QSPI_FLASH1_IO2, QSPI_FLASH1_IO3, QSPI_FLASH1_SCK, QSPI_FLASH1_CSN, QSPIF_POLARITY_MODE_0);
auto rxlen = sizeof(temp_buf);
ret = _qspi.read(0x48, -1, 1 << 13, temp_buf, &rxlen);
memcpy(&info, &temp_buf[1], sizeof(OptaBoardInfo));
if (info.magic == OTP_QSPI_MAGIC) {
_boardInfo = (uint8_t*)&info;
has_otp_info = true;
}
secure_root.deinit();
return ret == 0;
return ret == QSPI_STATUS_OK;
}

class SecureQSPIReader {
public:
SecureQSPIReader() {
getSecureFlashData();
}
};

SecureQSPIReader __reader __attribute__ ((init_priority (101)));

uint8_t* boardInfo() {
return _boardInfo;
}
Expand Down