The-Homebrew-Cloud/SummerCart64
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/SummerCart64.git synced 2024-11-25 07:06:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SC64][FW] Flash: fixed partial page write + handle data mask during write

Browse Source 
Flash memory module had an issue when ending address was not page (256 bytes) aligned.

Now it's possible to write single bytes to the Flash instead of being forced to do 16 bit aligned writes.
This commit is contained in:
Mateusz Faderewski 2024-05-03 17:49:44 +02:00
parent 64c3b69454
commit 4eaa0b3353
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fw/rtl/memory/memory_flash.sv
View File

@ -234,7 +234,7 @@ module memory_flash (
if (reset) begin if (reset) begin
state <= STATE_IDLE; state <= STATE_IDLE;
end else begin end else begin
if (!busy && (start || finish)) begin if ((start || finish) && !busy) begin
counter <= counter + 1'd1; counter <= counter + 1'd1;
end end
@ -248,6 +248,7 @@ module memory_flash (
end else if (mem_bus.request) begin end else if (mem_bus.request) begin
current_address <= {mem_bus.address[23:1], 1'b0}; current_address <= {mem_bus.address[23:1], 1'b0};
if (mem_bus.write) begin if (mem_bus.write) begin
current_address[0] <= (~mem_bus.wmask[1]);
state <= STATE_WRITE_ENABLE; state <= STATE_WRITE_ENABLE;
end else begin end else begin
state <= STATE_READ_START; state <= STATE_READ_START;
@ -263,7 +264,7 @@ module memory_flash (
end end
3'd1: begin 3'd1: begin
finish <= 1'b1; finish <= 1'b1;
wdata <= 8'd4; wdata <= 8'd5;
if (!busy) begin if (!busy) begin
counter <= 3'd0; counter <= 3'd0;
if (flash_scb.erase_pending) begin if (flash_scb.erase_pending) begin
@ -296,7 +297,7 @@ module memory_flash (
end end
3'd4: begin 3'd4: begin
finish <= 1'b1; finish <= 1'b1;
wdata <= 8'd4; wdata <= 8'd5;
if (!busy) begin if (!busy) begin
flash_scb.erase_done <= 1'b1; flash_scb.erase_done <= 1'b1;
counter <= 3'd0; counter <= 3'd0;
@ -314,17 +315,17 @@ module memory_flash (
end end
3'd1: begin 3'd1: begin
start <= 1'b1; start <= 1'b1;
wdata <= mem_bus.address[23:16]; wdata <= current_address[23:16];
end end
3'd2: begin 3'd2: begin
start <= 1'b1; start <= 1'b1;
wdata <= mem_bus.address[15:8]; wdata <= current_address[15:8];
end end
3'd3: begin 3'd3: begin
start <= 1'b1; start <= 1'b1;
wdata <= mem_bus.address[7:0]; wdata <= current_address[7:0];
if (!busy) begin if (!busy) begin
counter <= 3'd0; counter <= 3'd0 + current_address[0];
state <= STATE_PROGRAM; state <= STATE_PROGRAM;
end end
end end
@ -336,26 +337,33 @@ module memory_flash (
3'd0: begin 3'd0: begin
start <= 1'b1; start <= 1'b1;
wdata <= mem_bus.wdata[15:8]; wdata <= mem_bus.wdata[15:8];
if (start && !busy) begin
current_address <= current_address + 1'd1;
if (!mem_bus.wmask[0]) begin
counter <= 3'd2;
mem_bus.ack <= 1'b1;
end
end
end end
3'd1: begin 3'd1: begin
start <= 1'b1; start <= 1'b1;
wdata <= mem_bus.wdata[7:0]; wdata <= mem_bus.wdata[7:0];
if (!busy) begin if (!busy) begin
mem_bus.ack <= 1'b1; mem_bus.ack <= 1'b1;
current_address <= current_address + 2'd2; current_address <= current_address + 1'd1;
end end
end end
3'd2: begin 3'd2: begin
if (current_address[7:0] == 8'h00) begin if (current_address[7:0] == 8'h00) begin
state <= STATE_PROGRAM_END; state <= STATE_PROGRAM_END;
end else if (flash_scb.erase_pending) begin
state <= STATE_PROGRAM_END;
end else if (mem_bus.request && !mem_bus.ack) begin end else if (mem_bus.request && !mem_bus.ack) begin
if (!mem_bus.write || (mem_bus.address[23:0] != current_address)) begin if (mem_bus.write && mem_bus.wmask[1] && (mem_bus.address[23:0] == current_address)) begin
state <= STATE_PROGRAM_END;
end else begin
counter <= 3'd0; counter <= 3'd0;
end else begin
state <= STATE_PROGRAM_END;
end end
end else if (!busy) begin
state <= STATE_PROGRAM_END;
end end
end end
endcase endcase
@ -363,8 +371,8 @@ module memory_flash (
STATE_PROGRAM_END: begin STATE_PROGRAM_END: begin
finish <= 1'b1; finish <= 1'b1;
wdata <= 8'd4; wdata <= 8'd5;
if (!busy) begin if (finish && !busy) begin
counter <= 3'd0; counter <= 3'd0;
state <= STATE_WAIT; state <= STATE_WAIT;
end end
@ -407,15 +415,15 @@ module memory_flash (
3'd1: begin 3'd1: begin
start <= 1'b1; start <= 1'b1;
quad_enable <= 1'b1; quad_enable <= 1'b1;
wdata <= mem_bus.address[23:16]; wdata <= current_address[23:16];
end end
3'd2: begin 3'd2: begin
start <= 1'b1; start <= 1'b1;
wdata <= mem_bus.address[15:8]; wdata <= current_address[15:8];
end end
3'd3: begin 3'd3: begin
start <= 1'b1; start <= 1'b1;
wdata <= mem_bus.address[7:0]; wdata <= current_address[7:0];
end end
3'd4: begin 3'd4: begin
start <= 1'b1; start <= 1'b1;