Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified uncore to use AHB bridge to GPIO

Browse Source
This commit is contained in:
David Harris 2022-07-05 05:02:21 +00:00
parent e7fe7ad0c8
commit d033659beb
1 changed files with 125 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
pipelined/src/uncore/uncore.sv
View File

@ -81,6 +81,24 @@ module uncore (
logic UARTIntr,GPIOIntr; logic UARTIntr,GPIOIntr;
logic SDCIntM; logic SDCIntM;
logic PCLK, PRESETn, PWRITE, PENABLE;
// logic PSEL, PREADY;
logic [1:0] PSEL, PREADY;
logic [31:0] PADDR;
logic [`XLEN-1:0] PWDATA;
logic [`XLEN/8-1:0] PSTRB;
logic [1:0][`XLEN-1:0] PRDATA;
// logic [`XLEN-1:0][8:0] PRDATA;
logic [`XLEN-1:0] HREADBRIDGE;
logic HRESPBRIDGE, HREADYBRIDGE, HSELBRIDGE, HSELBRIDGED;
// *** to do:
// combinational loop related to HREADY, HREADYOUT through PENABLE
// hook up and test GPIO on AHB
// hook up HWSTRB and remove subword write decoders
// add other peripherals on AHB
// HTRANS encoding
// Determine which region of physical memory (if any) is being accessed // Determine which region of physical memory (if any) is being accessed
// Use a trimmed down portion of the PMA checker - only the address decoders // Use a trimmed down portion of the PMA checker - only the address decoders
// Set access types to all 1 as don't cares because the MMU has already done access checking // Set access types to all 1 as don't cares because the MMU has already done access checking
@ -89,98 +107,109 @@ module uncore (
// unswizzle HSEL signals // unswizzle HSEL signals
assign {HSELEXT, HSELBootRom, HSELRam, HSELCLINT, HSELGPIO, HSELUART, HSELPLIC, HSELSDC} = HSELRegions[7:0]; assign {HSELEXT, HSELBootRom, HSELRam, HSELCLINT, HSELGPIO, HSELUART, HSELPLIC, HSELSDC} = HSELRegions[7:0];
// generate // AHB -> APB bridge
// on-chip RAM ahbapbbridge #(2) ahbapbbridge
if (`RAM_SUPPORTED) begin : ram (.HCLK, .HRESETn, .HSEL({1'b0, HSELGPIO}), .HADDR, .HWDATA, .HWRITE, .HTRANS, .HREADY, .HWSTRB('1),
ram #( .HRDATA(HREADBRIDGE), .HRESP(HRESPBRIDGE), .HREADYOUT(HREADYBRIDGE),
.BASE(`RAM_BASE), .RANGE(`RAM_RANGE)) ram ( .PCLK, .PRESETn, .PSEL, .PWRITE, .PENABLE, .PADDR, .PWDATA, .PSTRB, .PREADY, .PRDATA);
.HCLK, .HRESETn, assign PREADY[1] = 0; // *** replace these with connections to other peripherals
.HSELRam, .HADDR, assign PRDATA[1] = 0;
.HWRITE, .HREADY, .HSIZED, assign HSELBRIDGE = HSELGPIO; // if any of the bridge signals are selected
.HTRANS, .HWDATA, .HREADRam, // This system is showing a combinatonal loop related to HREADY and HREADYBRIDGE and HREADYGPIO
.HRESPRam, .HREADYRam);
end
if (`BOOTROM_SUPPORTED) begin : bootrom // on-chip RAM
ram_orig #(.BASE(`BOOTROM_BASE), .RANGE(`BOOTROM_RANGE)) if (`RAM_SUPPORTED) begin : ram
bootrom( ram #(
.HCLK, .HRESETn, .BASE(`RAM_BASE), .RANGE(`RAM_RANGE)) ram (
.HSELRam(HSELBootRom), .HADDR, .HCLK, .HRESETn,
.HWRITE, .HREADY, .HTRANS, .HSIZED, .HSELRam, .HADDR,
.HWDATA, .HWRITE, .HREADY, .HSIZED,
.HREADRam(HREADBootRom), .HRESPRam(HRESPBootRom), .HREADYRam(HREADYBootRom)); .HTRANS, .HWDATA, .HREADRam,
end .HRESPRam, .HREADYRam);
end
// memory-mapped I/O peripherals if (`BOOTROM_SUPPORTED) begin : bootrom
if (`CLINT_SUPPORTED == 1) begin : clint ram_orig #(.BASE(`BOOTROM_BASE), .RANGE(`BOOTROM_RANGE))
clint clint( bootrom(
.HCLK, .HRESETn, .TIMECLK, .HCLK, .HRESETn,
.HSELCLINT, .HADDR(HADDR[15:0]), .HWRITE, .HSELRam(HSELBootRom), .HADDR,
.HWDATA, .HREADY, .HTRANS, .HSIZED, .HWRITE, .HREADY, .HTRANS, .HSIZED,
.HREADCLINT, .HWDATA,
.HRESPCLINT, .HREADYCLINT, .HREADRam(HREADBootRom), .HRESPRam(HRESPBootRom), .HREADYRam(HREADYBootRom));
.MTIME(MTIME_CLINT), end
.MTimerInt, .MSwInt);
end else begin : clint // memory-mapped I/O peripherals
assign MTIME_CLINT = 0; if (`CLINT_SUPPORTED == 1) begin : clint
assign MTimerInt = 0; assign MSwInt = 0; clint clint(
end .HCLK, .HRESETn, .TIMECLK,
if (`PLIC_SUPPORTED == 1) begin : plic .HSELCLINT, .HADDR(HADDR[15:0]), .HWRITE,
plic plic( .HWDATA, .HREADY, .HTRANS, .HSIZED,
.HCLK, .HRESETn, .HREADCLINT,
.HSELPLIC, .HADDR(HADDR[27:0]), .HRESPCLINT, .HREADYCLINT,
.HWRITE, .HREADY, .HTRANS, .HWDATA, .MTIME(MTIME_CLINT),
.UARTIntr, .GPIOIntr, .MTimerInt, .MSwInt);
.HREADPLIC, .HRESPPLIC, .HREADYPLIC,
.MExtInt, .SExtInt);
end else begin : plic
assign MExtInt = 0;
assign SExtInt = 0;
end
if (`GPIO_SUPPORTED == 1) begin : gpio
gpio gpio(
.HCLK, .HRESETn, .HSELGPIO,
.HADDR(HADDR[7:0]),
.HWDATA,
.HWRITE, .HREADY,
.HTRANS,
.HREADGPIO,
.HRESPGPIO, .HREADYGPIO,
.GPIOPinsIn,
.GPIOPinsOut, .GPIOPinsEn,
.GPIOIntr);
end else begin : gpio end else begin : clint
assign GPIOPinsOut = 0; assign GPIOPinsEn = 0; assign GPIOIntr = 0; assign MTIME_CLINT = 0;
end assign MTimerInt = 0; assign MSwInt = 0;
if (`UART_SUPPORTED == 1) begin : uart end
uart uart( if (`PLIC_SUPPORTED == 1) begin : plic
.HCLK, .HRESETn, plic plic(
.HSELUART, .HCLK, .HRESETn,
.HADDR(HADDR[2:0]), .HSELPLIC, .HADDR(HADDR[27:0]),
.HWRITE, .HWDATA, .HWRITE, .HREADY, .HTRANS, .HWDATA,
.HREADUART, .HRESPUART, .HREADYUART, .UARTIntr, .GPIOIntr,
.SIN(UARTSin), .DSRb(1'b1), .DCDb(1'b1), .CTSb(1'b0), .RIb(1'b1), // from E1A driver from RS232 interface .HREADPLIC, .HRESPPLIC, .HREADYPLIC,
.SOUT(UARTSout), .RTSb(), .DTRb(), // to E1A driver to RS232 interface .MExtInt, .SExtInt);
.OUT1b(), .OUT2b(), .INTR(UARTIntr), .TXRDYb(), .RXRDYb()); // to CPU end else begin : plic
end else begin : uart assign MExtInt = 0;
assign UARTSout = 0; assign UARTIntr = 0; assign SExtInt = 0;
end end
if (`SDC_SUPPORTED == 1) begin : sdc if (`GPIO_SUPPORTED == 1) begin : gpio
SDC SDC(.HCLK, .HRESETn, .HSELSDC, .HADDR(HADDR[4:0]), .HWRITE, .HREADY, .HTRANS, /* gpio gpio(
.HWDATA, .HREADSDC, .HRESPSDC, .HREADYSDC, .HCLK, .HRESETn, .HSELGPIO,
// sdc interface .HADDR(HADDR[7:0]),
.SDCCmdOut, .SDCCmdIn, .SDCCmdOE, .SDCDatIn, .SDCCLK, .HWDATA,
// interrupt to PLIC .HWRITE, .HREADY,
.SDCIntM .HTRANS,
); .HREADGPIO,
end else begin : sdc .HRESPGPIO, .HREADYGPIO,
assign SDCCLK = 0; .GPIOPinsIn,
assign SDCCmdOut = 0; .GPIOPinsOut, .GPIOPinsEn,
assign SDCCmdOE = 0; .GPIOIntr); */
end gpio_apb gpio(
// endgenerate .PCLK, .PRESETn, .PSEL(PSEL[0]), .PADDR(PADDR[7:0]), .PWDATA, .PSTRB, .PWRITE, .PENABLE,
.PRDATA(PRDATA[0]), .PREADY(PREADY[0]),
.iof0(), .iof1(), .GPIOPinsIn, .GPIOPinsOut, .GPIOPinsEn, .GPIOIntr);
end else begin : gpio
assign GPIOPinsOut = 0; assign GPIOPinsEn = 0; assign GPIOIntr = 0;
end
if (`UART_SUPPORTED == 1) begin : uart
uart uart(
.HCLK, .HRESETn,
.HSELUART,
.HADDR(HADDR[2:0]),
.HWRITE, .HWDATA,
.HREADUART, .HRESPUART, .HREADYUART,
.SIN(UARTSin), .DSRb(1'b1), .DCDb(1'b1), .CTSb(1'b0), .RIb(1'b1), // from E1A driver from RS232 interface
.SOUT(UARTSout), .RTSb(), .DTRb(), // to E1A driver to RS232 interface
.OUT1b(), .OUT2b(), .INTR(UARTIntr), .TXRDYb(), .RXRDYb()); // to CPU
end else begin : uart
assign UARTSout = 0; assign UARTIntr = 0;
end
if (`SDC_SUPPORTED == 1) begin : sdc
SDC SDC(.HCLK, .HRESETn, .HSELSDC, .HADDR(HADDR[4:0]), .HWRITE, .HREADY, .HTRANS,
.HWDATA, .HREADSDC, .HRESPSDC, .HREADYSDC,
// sdc interface
.SDCCmdOut, .SDCCmdIn, .SDCCmdOE, .SDCDatIn, .SDCCLK,
// interrupt to PLIC
.SDCIntM
);
end else begin : sdc
assign SDCCLK = 0;
assign SDCCmdOut = 0;
assign SDCCmdOE = 0;
end
// mux could also include external memory // mux could also include external memory
// AHB Read Multiplexer // AHB Read Multiplexer
@ -188,7 +217,8 @@ module uncore (
({`XLEN{HSELEXTD}} & HRDATAEXT) | ({`XLEN{HSELEXTD}} & HRDATAEXT) |
({`XLEN{HSELCLINTD}} & HREADCLINT) | ({`XLEN{HSELCLINTD}} & HREADCLINT) |
({`XLEN{HSELPLICD}} & HREADPLIC) | ({`XLEN{HSELPLICD}} & HREADPLIC) |
({`XLEN{HSELGPIOD}} & HREADGPIO) | // ({`XLEN{HSELGPIOD}} & HREADGPIO) |
({`XLEN{HSELBRIDGED}} & HREADBRIDGE) |
({`XLEN{HSELBootRomD}} & HREADBootRom) | ({`XLEN{HSELBootRomD}} & HREADBootRom) |
({`XLEN{HSELUARTD}} & HREADUART) | ({`XLEN{HSELUARTD}} & HREADUART) |
({`XLEN{HSELSDCD}} & HREADSDC); ({`XLEN{HSELSDCD}} & HREADSDC);
@ -197,7 +227,8 @@ module uncore (
HSELEXTD & HRESPEXT | HSELEXTD & HRESPEXT |
HSELCLINTD & HRESPCLINT | HSELCLINTD & HRESPCLINT |
HSELPLICD & HRESPPLIC | HSELPLICD & HRESPPLIC |
HSELGPIOD & HRESPGPIO | // HSELGPIOD & HRESPGPIO |
HSELBRIDGE & HRESPBRIDGE |
HSELBootRomD & HRESPBootRom | HSELBootRomD & HRESPBootRom |
HSELUARTD & HRESPUART | HSELUARTD & HRESPUART |
HSELSDC & HRESPSDC; HSELSDC & HRESPSDC;
@ -206,7 +237,8 @@ module uncore (
HSELEXTD & HREADYEXT | HSELEXTD & HREADYEXT |
HSELCLINTD & HREADYCLINT | HSELCLINTD & HREADYCLINT |
HSELPLICD & HREADYPLIC | HSELPLICD & HREADYPLIC |
HSELGPIOD & HREADYGPIO | // HSELGPIOD & HREADYGPIO |
HSELBRIDGED & HREADYBRIDGE |
HSELBootRomD & HREADYBootRom | HSELBootRomD & HREADYBootRom |
HSELUARTD & HREADYUART | HSELUARTD & HREADYUART |
HSELSDCD & HREADYSDC | HSELSDCD & HREADYSDC |
@ -214,5 +246,6 @@ module uncore (
// Address Decoder Delay (figure 4-2 in spec) // Address Decoder Delay (figure 4-2 in spec)
flopr #(9) hseldelayreg(HCLK, ~HRESETn, HSELRegions, {HSELNoneD, HSELEXTD, HSELBootRomD, HSELRamD, HSELCLINTD, HSELGPIOD, HSELUARTD, HSELPLICD, HSELSDCD}); flopr #(9) hseldelayreg(HCLK, ~HRESETn, HSELRegions, {HSELNoneD, HSELEXTD, HSELBootRomD, HSELRamD, HSELCLINTD, HSELGPIOD, HSELUARTD, HSELPLICD, HSELSDCD});
flopr #(1) hselbridgedelayreg(HCLK, ~HRESETn, HSELBRIDGE, HSELBRIDGED);
endmodule endmodule