riscv
/
caravel
mirror of https://github.com/efabless/caravel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix bug move some housekeeping initialization wires and regs before they are used

This commit is contained in:
M0stafaRady 2022-09-30 01:57:20 -07:00
parent add4c5f6c8
commit fc8369443c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
verilog/rtl/housekeeping.v
View File

@ -300,6 +300,13 @@ module housekeeping #(
assign spimemio_flash_io0_di = (pass_thru_mgmt_delay) ? 1'b0 : pad_flash_io0_di; assign spimemio_flash_io0_di = (pass_thru_mgmt_delay) ? 1'b0 : pad_flash_io0_di;
assign spimemio_flash_io1_di = (pass_thru_mgmt) ? 1'b0 : pad_flash_io1_di; assign spimemio_flash_io1_di = (pass_thru_mgmt) ? 1'b0 : pad_flash_io1_di;
wire [11:0] mfgr_id;
wire [7:0] prod_id;
wire [31:0] mask_rev;
reg serial_busy;
// Wishbone bus "back door" to SPI registers. This section of code // Wishbone bus "back door" to SPI registers. This section of code
// (1) Maps SPI byte addresses to memory map 32-bit addresses // (1) Maps SPI byte addresses to memory map 32-bit addresses
// (2) Applies signals to the housekeeping SPI to mux in the SPI address, // (2) Applies signals to the housekeeping SPI to mux in the SPI address,
@ -636,6 +643,15 @@ module housekeeping #(
end end
endfunction endfunction
// SPI is considered active when the GPIO for CSB is set to input and
// CSB is low. SPI is considered "busy" when rdstb or wrstb are high,
// indicating that the SPI will read or write a byte on the next SCK
// transition.
wire spi_is_enabled = (~gpio_configure[3][INP_DIS]) & (~hkspi_disable);
wire spi_is_active = spi_is_enabled && (mgmt_gpio_in[3] == 1'b0);
wire spi_is_busy = spi_is_active && (rdstb || wrstb);
/* Wishbone back-door state machine and address translation */ /* Wishbone back-door state machine and address translation */
always @(posedge wb_clk_i or posedge wb_rst_i) begin always @(posedge wb_clk_i or posedge wb_rst_i) begin
@ -766,14 +782,7 @@ module housekeeping #(
.pass_thru_user_reset(pass_thru_user_reset) .pass_thru_user_reset(pass_thru_user_reset)
); );
// SPI is considered active when the GPIO for CSB is set to input and
// CSB is low. SPI is considered "busy" when rdstb or wrstb are high,
// indicating that the SPI will read or write a byte on the next SCK
// transition.
wire spi_is_enabled = (~gpio_configure[3][INP_DIS]) & (~hkspi_disable);
wire spi_is_active = spi_is_enabled && (mgmt_gpio_in[3] == 1'b0);
wire spi_is_busy = spi_is_active && (rdstb || wrstb);
// GPIO data handling to and from the management SoC // GPIO data handling to and from the management SoC
@ -869,7 +878,6 @@ module housekeeping #(
reg serial_clock_pre; reg serial_clock_pre;
reg serial_resetn_pre; reg serial_resetn_pre;
reg serial_load_pre; reg serial_load_pre;
reg serial_busy;
wire serial_data_1; wire serial_data_1;
wire serial_data_2; wire serial_data_2;
wire serial_clock; wire serial_clock;
@ -980,10 +988,6 @@ module housekeeping #(
// SPI Identification // SPI Identification
wire [11:0] mfgr_id;
wire [7:0] prod_id;
wire [31:0] mask_rev;
assign mfgr_id = 12'h456; // Hard-coded assign mfgr_id = 12'h456; // Hard-coded
assign prod_id = 8'h11; // Hard-coded assign prod_id = 8'h11; // Hard-coded
assign mask_rev = mask_rev_in; // Copy in to out. assign mask_rev = mask_rev_in; // Copy in to out.