From 497bbc03945248142b2f3e82bc06cd687c28c01c Mon Sep 17 00:00:00 2001 From: Florent Kermarrec <florent@enjoy-digital.fr> Date: Tue, 15 Feb 2022 17:43:31 +0100 Subject: [PATCH] frontend/axi: Improve similarities in aw/ar handling. --- litedram/frontend/axi.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/litedram/frontend/axi.py b/litedram/frontend/axi.py index efcfcf3..13aa99a 100644 --- a/litedram/frontend/axi.py +++ b/litedram/frontend/axi.py @@ -1,7 +1,7 @@ # # This file is part of LiteDRAM. # -# Copyright (c) 2018-2019 Florent Kermarrec <florent@enjoy-digital.fr> +# Copyright (c) 2018-2022 Florent Kermarrec <florent@enjoy-digital.fr> # SPDX-License-Identifier: BSD-2-Clause """ @@ -86,7 +86,7 @@ class LiteDRAMAXI2NativeW(Module): port.cmd.valid.eq(1), port.cmd.we.eq(1), port.cmd.addr.eq((aw.addr - base_address) >> ashift), - If(port.cmd.valid & port.cmd.ready, + If(port.cmd.ready, aw.ready.eq(1), ) ) @@ -160,11 +160,13 @@ class LiteDRAMAXI2NativeR(Module): # Command ---------------------------------------------------------------------------------- self.comb += [ self.cmd_request.eq(ar.valid & can_read), - If(self.cmd_grant, - port.cmd.valid.eq(ar.valid & can_read), - ar.ready.eq(port.cmd.ready & can_read), + If(self.cmd_request & self.cmd_grant, + port.cmd.valid.eq(1), port.cmd.we.eq(0), - port.cmd.addr.eq((ar.addr - base_address) >> ashift) + port.cmd.addr.eq((ar.addr - base_address) >> ashift), + If(port.cmd.ready, + ar.ready.eq(1), + ) ) ]