Skip to content

Commit

Permalink
Transplanted changes from ASR4.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Lundell committed Nov 13, 2014
1 parent 38c164c commit c327511
Showing 1 changed file with 66 additions and 25 deletions.
91 changes: 66 additions & 25 deletions memory/Fee/Fee.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ typedef struct {
typedef union {
FlsBlockControlType BlockCtrl;
FlsBankControlType BankCtrl;
uint8 Byte[1];
uint8 Byte[ADMIN_SIZE];
} ReadWriteBufferType;

/*
Expand Down Expand Up @@ -770,7 +770,7 @@ static void StartupReadBlockAdminWait(void)
RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress >= CurrentJob.Startup.BlockDataAddress &&
RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress < CurrentJob.Startup.BlockAdminAddress &&
RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress == PAGE_ALIGN(RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress) &&
RWBuffer.BlockCtrl.DataPage.Data.BlockDataLength + RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress < CurrentJob.Startup.BlockAdminAddress))) {
RWBuffer.BlockCtrl.DataPage.Data.BlockDataLength + RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress <= CurrentJob.Startup.BlockAdminAddress))) {
// invalidated address or DataAddress within bank and has valid alignment, InvBlockDataLength valid, BlockDataLength has a reasonable value, we assume that BlockDataLength is valid
uint16 blockIndex = GetBlockIdxFromBlockNumber(RWBuffer.BlockCtrl.IdPage.Data.BlockNo);
if(MEMIF_JOB_OK == readResult &&
Expand All @@ -789,7 +789,7 @@ static void StartupReadBlockAdminWait(void)
// next admin block
CurrentJob.Startup.BlockAdminAddress -= ADMIN_SIZE;
// check if room for more admin blocks
if(CurrentJob.Startup.BlockAdminAddress > CurrentJob.Startup.BlockDataAddress) {
if(CurrentJob.Startup.BlockAdminAddress >= CurrentJob.Startup.BlockDataAddress) {
// still room for admin blocks, read next admin block
AdminFls.State = FEE_STARTUP_READ_BLOCK_ADMIN;
StartupReadBlockAdmin();
Expand All @@ -806,7 +806,7 @@ static void StartupReadBlockAdminWait(void)
// invalid admin block: ignore
CurrentJob.Startup.BlockAdminAddress -= ADMIN_SIZE;
// check if room for more admin blocks
if(CurrentJob.Startup.BlockAdminAddress > CurrentJob.Startup.BlockDataAddress) {
if(CurrentJob.Startup.BlockAdminAddress >= CurrentJob.Startup.BlockDataAddress) {
// still room for admin blocks, read next admin block
AdminFls.State = FEE_STARTUP_READ_BLOCK_ADMIN;
StartupReadBlockAdmin();
Expand Down Expand Up @@ -845,6 +845,7 @@ static void Reading(void)
AdminFls.State = FEE_READ_WAIT;
} else {
AdminFls.BlockDescrTbl[CurrentJob.Read.BlockIdx].BlockDataAddress = BLOCK_CORRUPT;
AdminFls.pendingJob &= ~PENDING_READ_JOB;
FinishJob(MEMIF_BLOCK_INCONSISTENT);
}
}
Expand Down Expand Up @@ -881,13 +882,7 @@ static void WriteAdminData(void) {
if (ret == E_OK) {
AdminFls.State++;
} else {
// failed to write: update pointers and set state to idle to restart
AdminFls.Write.NewBlockDataAddress += PAGE_ALIGN(RWBuffer.BlockCtrl.DataPage.Data.BlockDataLength); // use length from RWBuffer since function is reused for garbage collect
AdminFls.Write.NewBlockAdminAddress -= ADMIN_SIZE;
AdminFls.State = FEE_IDLE;
// increase error counter
AdminFls.FailCounter++;
// todo: check max fail counter value
AbortWriteJob();
}
}
Irq_Restore(state);
Expand Down Expand Up @@ -1043,11 +1038,22 @@ static void WriteCheckAdminDataWait(void) {
}

static void EraseBank(void) {
imask_t state;
Irq_Save(state);
if(Fls_GetStatus() == MEMIF_IDLE) {
SetFlsJobBusy();
if (Fls_Erase(BankProp[AdminFls.Erase.BankIdx].Start, BankProp[AdminFls.Erase.BankIdx].End - BankProp[AdminFls.Erase.BankIdx].Start) == E_OK) {
Std_ReturnType ret = Fls_Erase(BankProp[AdminFls.Erase.BankIdx].Start, BankProp[AdminFls.Erase.BankIdx].End - BankProp[AdminFls.Erase.BankIdx].Start);
if (ret == E_OK) {
AdminFls.State = FEE_ERASE_BANK_WAIT;
} else {
// failed to write, set mode to idle to restart
AdminFls.State = FEE_IDLE;
// increase error counter
AdminFls.FailCounter++;
}
}
Irq_Restore(state);
}

static void WriteBankHeader() {
imask_t state;
Expand Down Expand Up @@ -1119,7 +1125,11 @@ static void WriteBankHeaderWait() {
static void GarbageCollectStartJob(void)
{
// init the rw buffer
if(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress == INVALIDATED_BLOCK) {
RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress = INVALIDATED_BLOCK;
} else {
RWBuffer.BlockCtrl.DataPage.Data.BlockDataAddress = AdminFls.Write.NewBlockDataAddress;
}
RWBuffer.BlockCtrl.DataPage.Data.BlockDataLength = Fee_Config.BlockConfig[AdminFls.GarbageCollect.BlockIdx].BlockSize;
RWBuffer.BlockCtrl.DataPage.Data.InvBlockDataLength = ~RWBuffer.BlockCtrl.DataPage.Data.BlockDataLength;
// write the data part of the admin block
Expand All @@ -1139,8 +1149,8 @@ static void GarbageCollectRead(void)
if (ret == E_OK) {
AdminFls.State++;
} else {
// failed to read data, set data to invalid
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress = 0;
// failed to read data, set data to corrupt
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress = BLOCK_CORRUPT;
AdminFls.GarbageCollect.BlockIdx++;
AbortGCJob();
}
Expand Down Expand Up @@ -1169,10 +1179,19 @@ static void GarbageCollectWriteAdminDataWait(void) {
if (CheckFlsJobFinished()) {
writeResult = Fls_GetJobResult();
if (MEMIF_JOB_OK == writeResult) {
if(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress == INVALIDATED_BLOCK) {
// no data to write, write remaining part of admin block
RWBuffer.BlockCtrl.IdPage.Data.BlockNo = Fee_Config.BlockConfig[AdminFls.GarbageCollect.BlockIdx].BlockNumber;
RWBuffer.BlockCtrl.IdPage.Data.InvBlockNo = ~Fee_Config.BlockConfig[AdminFls.GarbageCollect.BlockIdx].BlockNumber;
RWBuffer.BlockCtrl.IdPage.Data.Magic = BlockMagicMaster;
AdminFls.State = FEE_GARBAGE_COLLECT_WRITE_ADMIN_ID;
WriteAdminId();
} else {
// admin data written, read data
AdminFls.GarbageCollect.Offset = 0;
AdminFls.State = FEE_GARBAGE_COLLECT_READ;
GarbageCollectRead();
}
} else {
// failed to write, check is anything was written
memset(RWBuffer.Byte, ~FLS_ERASED_VALUE, ADMIN_SIZE);
Expand Down Expand Up @@ -1210,7 +1229,7 @@ static void GarbageCollectReadWait(void)
GarbageCollectWriteData();
} else {
// failed to read data, set data to invalid
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress = 0;
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress = BLOCK_CORRUPT;
AdminFls.GarbageCollect.BlockIdx++;
AbortGCJob();
}
Expand Down Expand Up @@ -1248,9 +1267,11 @@ static void GarbageCollectWriteAdminIdWait(void) {
readResult = Fls_GetJobResult();
if (MEMIF_JOB_OK == readResult) {
// garbage collect of block is done
if(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress != INVALIDATED_BLOCK) {
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress = AdminFls.Write.NewBlockDataAddress;
// all data written. Update admin data
AdminFls.Write.NewBlockDataAddress += PAGE_ALIGN(Fee_Config.BlockConfig[AdminFls.GarbageCollect.BlockIdx].BlockSize);
}
AdminFls.Write.NewBlockAdminAddress -= ADMIN_SIZE;
AdminFls.GarbageCollect.BlockIdx++;
// change state to idle to continue with next block
Expand Down Expand Up @@ -1284,24 +1305,26 @@ static void Idle(void) {
Reading();
} else if((AdminFls.pendingJob & PENDING_WRITE_JOB) && (
(AdminFls.pendingJob & PENDING_FORCED_GARBAGE_COLLECT_JOB) == 0 ||
CurrentJob.Write.Invalidate == 1 ||
IS_ADDRESS_WITHIN_BANK(AdminFls.BlockDescrTbl[CurrentJob.Write.BlockIdx].BlockDataAddress, AdminFls.GarbageCollect.BankIdx) )
) {
// pending write job while not in forced garbage collect or data to write is not gargbage collected
uint8 nextBank = NEXT_BANK_IDX(AdminFls.Write.BankIdx);
sint32 remainingBytesInBank = AdminFls.Write.NewBlockAdminAddress - AdminFls.Write.NewBlockDataAddress; // This value might be negative: use signed type
sint32 bytesToWrite = (CurrentJob.Write.Invalidate == 1)? 0 : Fee_Config.BlockConfig[CurrentJob.Write.BlockIdx].BlockSize;
if((AdminFls.pendingJob & PENDING_FORCED_GARBAGE_COLLECT_JOB) == 0 &&
remainingBytesInBank < (sint32)(AdminFls.GarbageCollect.TotalFeeSize + Fee_Config.BlockConfig[CurrentJob.Write.BlockIdx].BlockSize + FORCED_GARBAGE_COLLECT_MARGIN) &&
remainingBytesInBank < (sint32)(AdminFls.GarbageCollect.TotalFeeSize + bytesToWrite + ADMIN_SIZE + FORCED_GARBAGE_COLLECT_MARGIN) &&
nextBank == AdminFls.GarbageCollect.BankIdx
) {
// no room for all data when this data written, and all banks written: set forced garbage collect
AdminFls.pendingJob |= PENDING_FORCED_GARBAGE_COLLECT_JOB;
// stay in idle and perform a new evaluation in next main loop
} else if(remainingBytesInBank < Fee_Config.BlockConfig[CurrentJob.Write.BlockIdx].BlockSize) {
} else if(remainingBytesInBank < bytesToWrite) {
// no room for this block, is it possible to switch bank?
if(nextBank == AdminFls.GarbageCollect.BankIdx) {
// next bank is garbage collect bank, not possible to switch bank
// throw stored data and hope that garbage collect will finish before power is switched off and new data written. set fault code?
AdminFls.BlockDescrTbl[CurrentJob.Write.BlockIdx].BlockDataAddress = 0; // next call to idle will continue with garbage collect of the other blocks, stay in idle
AdminFls.BlockDescrTbl[CurrentJob.Write.BlockIdx].BlockDataAddress = BLOCK_CORRUPT; // next call to idle will continue with garbage collect of the other blocks, stay in idle
} else if (nextBank == AdminFls.Erase.BankIdx) {
// next bank isn't erased and not garbage collect bank: erase job pending, erase bank to get room for new data
AdminFls.State = FEE_ERASE_BANK;
Expand All @@ -1322,8 +1345,11 @@ static void Idle(void) {
AdminFls.State = FEE_ERASE_BANK;
} else if(AdminFls.pendingJob & PENDING_FORCED_GARBAGE_COLLECT_JOB) {
// search for next block to garbage collect
while(AdminFls.GarbageCollect.BlockIdx < FEE_NUM_OF_BLOCKS &&
!IS_ADDRESS_WITHIN_BANK(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress ,AdminFls.GarbageCollect.BankIdx)
while(AdminFls.GarbageCollect.BlockIdx < FEE_NUM_OF_BLOCKS && (
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress == BLOCK_CORRUPT ||
(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress != INVALIDATED_BLOCK &&
!IS_ADDRESS_WITHIN_BANK(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress ,AdminFls.GarbageCollect.BankIdx))
)
) {
// block isn't in the bank that currently is garbage collected: try next block
AdminFls.GarbageCollect.BlockIdx++;
Expand All @@ -1343,22 +1369,37 @@ static void Idle(void) {
AdminFls.pendingJob |= PENDING_ERASE_JOB;
} else {
sint32 remainingBytes = AdminFls.Write.NewBlockAdminAddress - AdminFls.Write.NewBlockDataAddress;
if ((sint32)Fee_Config.BlockConfig[AdminFls.GarbageCollect.BlockIdx].BlockSize > remainingBytes) {
sint32 bytesToWrite = (AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress == INVALIDATED_BLOCK)? 0 : Fee_Config.BlockConfig[AdminFls.GarbageCollect.BlockIdx].BlockSize;
if (bytesToWrite > remainingBytes) {
// no room in bank. Throw data, set fault code?
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress = 0;
AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress = BLOCK_CORRUPT;
AdminFls.GarbageCollect.BlockIdx++;
} else {
GarbageCollectStartJob();
}
}
} else if(AdminFls.pendingJob & PENDING_GARBAGE_COLLECT_JOB) {
// search for next block to garbage collect
while(AdminFls.GarbageCollect.BlockIdx < FEE_NUM_OF_BLOCKS &&
!IS_ADDRESS_WITHIN_BANK(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress ,AdminFls.GarbageCollect.BankIdx)
) {
while(AdminFls.GarbageCollect.BlockIdx < FEE_NUM_OF_BLOCKS) {
if(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress == INVALIDATED_BLOCK) {
// block invalidated, invalidate again to garbage collect the invalidation
sint32 remainingBytes = AdminFls.Write.NewBlockAdminAddress - AdminFls.Write.NewBlockDataAddress;
sint32 bytesToWrite = 0;
if (bytesToWrite > remainingBytes) {
// no room in bank. Throw data, set fault code?
AdminFls.GarbageCollect.BlockIdx++;
} else {
GarbageCollectStartJob();
break;
}
} else if(IS_ADDRESS_WITHIN_BANK(AdminFls.BlockDescrTbl[AdminFls.GarbageCollect.BlockIdx].BlockDataAddress ,AdminFls.GarbageCollect.BankIdx)) {
// block not garbage collected
break;
} else {
// block isn't in the bank that currently is garbage collected: try next block
AdminFls.GarbageCollect.BlockIdx++;
}
}
if(AdminFls.GarbageCollect.BlockIdx >= FEE_NUM_OF_BLOCKS) {
// garbage collect done
AdminFls.GarbageCollect.BankIdx = NEXT_BANK_IDX(AdminFls.GarbageCollect.BankIdx);
Expand Down

0 comments on commit c327511

Please sign in to comment.