From: Luke Kenneth Casson Leighton Date: Fri, 3 Dec 2021 19:17:11 +0000 (+0000) Subject: driver conflict on priv_mode and virt_mode, do not understand right now, X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0dcaa841a71947b07beeed562bf980a37ac0493f;p=soc.git driver conflict on priv_mode and virt_mode, do not understand right now, commenting them out in loadstore.py --- diff --git a/src/soc/fu/ldst/loadstore.py b/src/soc/fu/ldst/loadstore.py index f7fedc2c..010c7a0f 100644 --- a/src/soc/fu/ldst/loadstore.py +++ b/src/soc/fu/ldst/loadstore.py @@ -326,8 +326,9 @@ class LoadStore1(PortInterfaceBase): m.d.comb += d_out.byte_sel.eq(self.req.byte_sel) m.d.comb += self.addr.eq(self.req.addr) m.d.comb += d_out.nc.eq(self.req.nc) - m.d.comb += d_out.priv_mode.eq(self.req.priv_mode) - m.d.comb += d_out.virt_mode.eq(self.req.virt_mode) + # XXX driver conflict. ehn?? + # XXX m.d.comb += d_out.priv_mode.eq(self.req.priv_mode) + # XXX m.d.comb += d_out.virt_mode.eq(self.req.virt_mode) m.d.comb += self.align_intr.eq(self.req.align_intr) #m.d.comb += Display("validblip dcbz=%i addr=%x", #self.req.dcbz,self.req.addr) @@ -337,8 +338,9 @@ class LoadStore1(PortInterfaceBase): m.d.comb += d_out.byte_sel.eq(ldst_r.byte_sel) m.d.comb += self.addr.eq(ldst_r.addr) m.d.comb += d_out.nc.eq(ldst_r.nc) - m.d.comb += d_out.priv_mode.eq(ldst_r.priv_mode) - m.d.comb += d_out.virt_mode.eq(ldst_r.virt_mode) + # XXX driver conflict. ehn?? + # XXX m.d.comb += d_out.priv_mode.eq(ldst_r.priv_mode) + # XXX m.d.comb += d_out.virt_mode.eq(ldst_r.virt_mode) m.d.comb += self.align_intr.eq(ldst_r.align_intr) #m.d.comb += Display("no_validblip dcbz=%i addr=%x", #ldst_r.dcbz,ldst_r.addr)