Merge pull request #5 from antonblanchard/lpc-ctrl

LPC-CTRL fixes

lpcperipheral/io_space.py

@@ -13,23 +13,22 @@ class IOSpace(Elaboratable):
                  bmc_lpc_ctrl_addr=0x2000,
                  target_vuart_addr=0x3f8, target_ipmi_addr=0xe4):
         self.vuart_depth = vuart_depth
-        # BMC wishbone is 32 bit wide, so divide addresses by 4
-        self.bmc_vuart_addr = bmc_vuart_addr // 4
-        self.bmc_ipmi_addr = bmc_ipmi_addr // 4
-        self.bmc_lpc_ctrl_addr = bmc_lpc_ctrl_addr // 4
+        self.bmc_vuart_addr = bmc_vuart_addr
+        self.bmc_ipmi_addr = bmc_ipmi_addr
+        self.bmc_lpc_ctrl_addr = bmc_lpc_ctrl_addr
         self.target_vuart_addr = target_vuart_addr
         self.target_ipmi_addr = target_ipmi_addr
 
         self.bmc_vuart_irq = Signal()
         self.bmc_ipmi_irq = Signal()
-        self.bmc_wb = WishboneInterface(addr_width=14, data_width=8)
+        self.bmc_wb = WishboneInterface(addr_width=14, data_width=32, granularity=8)
+
+        self.lpc_ctrl_wb = WishboneInterface(addr_width=3, data_width=32, granularity=8)
 
         self.target_vuart_irq = Signal()
         self.target_ipmi_irq = Signal()
         self.target_wb = WishboneInterface(addr_width=16, data_width=8, features=["err"])
 
-        self.lpc_ctrl_wb = WishboneInterface(addr_width=3, data_width=8)
-
         self.error_wb = WishboneInterface(addr_width=2, data_width=8,
                                           features=["err"])
 
@@ -40,18 +39,18 @@ class IOSpace(Elaboratable):
         m.submodules.ipmi_bt = ipmi_bt = IPMI_BT()
 
         # BMC address decode
-        m.submodules.bmc_decode = bmc_decode = WishboneDecoder(addr_width=14, data_width=8, granularity=8)
+        m.submodules.bmc_decode = bmc_decode = WishboneDecoder(addr_width=14, data_width=32, granularity=8)
 
         bmc_ipmi_bus = ipmi_bt.bmc_wb
-        bmc_ipmi_bus.memory_map = MemoryMap(addr_width=3, data_width=8)
+        bmc_ipmi_bus.memory_map = MemoryMap(addr_width=5, data_width=8)
         bmc_decode.add(bmc_ipmi_bus, addr=self.bmc_ipmi_addr)
 
         bmc_vuart_bus = vuart_joined.wb_a
-        bmc_vuart_bus.memory_map = MemoryMap(addr_width=3, data_width=8)
+        bmc_vuart_bus.memory_map = MemoryMap(addr_width=5, data_width=8)
         bmc_decode.add(bmc_vuart_bus, addr=self.bmc_vuart_addr)
 
         lpc_ctrl_bus = self.lpc_ctrl_wb
-        lpc_ctrl_bus.memory_map = MemoryMap(addr_width=3, data_width=8)
+        lpc_ctrl_bus.memory_map = MemoryMap(addr_width=5, data_width=8)
         bmc_decode.add(lpc_ctrl_bus, addr=self.bmc_lpc_ctrl_addr)
 
         m.d.comb += [

lpcperipheral/ipmi_bt.py

@@ -38,7 +38,7 @@ class IPMI_BT(Elaboratable):
     def __init__(self, depth=64):
         self.depth = depth
 
-        self.bmc_wb = WishboneInterface(data_width=8, addr_width=3)
+        self.bmc_wb = WishboneInterface(data_width=32, addr_width=3, granularity=8)
         self.bmc_irq = Signal()
 
         self.target_wb = WishboneInterface(data_width=8, addr_width=2)

lpcperipheral/lpc_ctrl.py

@@ -26,11 +26,11 @@ class LPC_Ctrl(Elaboratable):
         m = Module()
 
         base_lo_csr = CSRElement(32, "rw")
-        base_lo = Signal(32, reset=192*1024*1024)
+        base_lo = Signal(32)
         #  Leave space for upper 32 bits, unused for now
         base_hi_csr = CSRElement(32, "rw")
         mask_lo_csr = CSRElement(32, "rw")
-        mask_lo = Signal(32, reset=0x3FFFFFF)
+        mask_lo = Signal(32)
         #  Leave space for upper 32 bits, unused for now
         mask_hi_csr = CSRElement(32, "rw")
 
@@ -56,7 +56,7 @@ class LPC_Ctrl(Elaboratable):
 
         m.d.comb += [
             self.lpc_wb.connect(self.dma_wb),
-            # bask/mask are in bytes, so convert to wishbone addresses
+            # base/mask are in bytes, so convert to wishbone addresses
             self.dma_wb.adr.eq((self.lpc_wb.adr & (mask_lo >> 2)) | (base_lo >> 2))
         ]
 

lpcperipheral/lpcperipheral.py

@@ -2,7 +2,6 @@ from enum import Enum, unique
 
 from nmigen import Signal, Elaboratable, Module, Cat
 from nmigen.back import verilog
-from nmigen_soc.wishbone import Interface as WishboneInterface
 
 from .io_space import IOSpace
 from .lpc2wb import lpc2wb
@@ -27,8 +26,8 @@ class LPCPeripheral(Elaboratable):
         # BMC wishbone. We dont use a Record because we want predictable
         # signal names so we can hook it up to VHDL/Verilog
         self.adr = Signal(14)
-        self.dat_w = Signal(8)
-        self.dat_r = Signal(8)
+        self.dat_w = Signal(32)
+        self.dat_r = Signal(32)
         self.sel = Signal()
         self.cyc = Signal()
         self.stb = Signal()
@@ -99,9 +98,12 @@ class LPCPeripheral(Elaboratable):
             lpc_ctrl.dma_wb.dat_r.eq(self.dma_dat_r),
             lpc_ctrl.dma_wb.ack.eq(self.dma_ack),
 
-            # LPC to LPC CTRL wishbone
+            # LPC to LPC CTRL DMA wishbone
             lpc.fw_wb.connect(lpc_ctrl.lpc_wb),
 
+            # LPC CTRL I/O wishbone
+            io.lpc_ctrl_wb.connect(lpc_ctrl.io_wb),
+
             # LPC
             lpc.lclk.eq(self.lclk),
             lpc.lframe.eq(self.lframe),

lpcperipheral/vuart_joined.py

@@ -21,10 +21,10 @@ class VUartJoined(Elaboratable):
         self.depth = depth
 
         self.irq_a = Signal()
-        self.wb_a = WishboneInterface(data_width=8, addr_width=3)
+        self.wb_a = WishboneInterface(data_width=32, addr_width=3, granularity=8)
 
         self.irq_b = Signal()
-        self.wb_b = WishboneInterface(data_width=8, addr_width=3)
+        self.wb_b = WishboneInterface(data_width=8, addr_width=3, granularity=8)
 
     def elaborate(self, platform):
         m = Module()