From 9dd02d5baf0cee7d1cde75f35767dfbc46c09b90 Mon Sep 17 00:00:00 2001 From: kodario Date: Mon, 14 Nov 2022 10:53:47 +0100 Subject: [PATCH] card map fix. --- driver/fpga_mmu.c | 2 +- sw/examples/service_reconfiguration/client/main.cpp | 2 +- sw/examples/service_reconfiguration/service/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/driver/fpga_mmu.c b/driver/fpga_mmu.c index 5f0b35d..a353fbf 100644 --- a/driver/fpga_mmu.c +++ b/driver/fpga_mmu.c @@ -432,7 +432,7 @@ void tlb_create_map(struct tlb_order *tlb_ord, uint64_t vaddr, uint64_t paddr_ho key = (vaddr >> tlb_ord->page_shift) & tlb_ord->key_mask; tag = vaddr >> (tlb_ord->page_shift + tlb_ord->key_size); phost = (paddr_host >> tlb_ord->page_shift) & tlb_ord->phy_mask; - pcard = ((paddr_card >> tlb_ord->page_shift) & tlb_ord->phy_mask) << tlb_ord->phy_size; + pcard = (paddr_card >> tlb_ord->page_shift) & tlb_ord->phy_mask; // new entry entry[0] |= key | diff --git a/sw/examples/service_reconfiguration/client/main.cpp b/sw/examples/service_reconfiguration/client/main.cpp index 458e39a..3e52435 100644 --- a/sw/examples/service_reconfiguration/client/main.cpp +++ b/sw/examples/service_reconfiguration/client/main.cpp @@ -30,7 +30,7 @@ constexpr auto const defPredicate = 100; constexpr auto const opIdAddMul = 1; constexpr auto const opIdMinMax = 2; constexpr auto const opIdRotate = 3; -constexpr auto const opIdSelect = 3; +constexpr auto const opIdSelect = 4; int main(int argc, char *argv[]) { diff --git a/sw/examples/service_reconfiguration/service/main.cpp b/sw/examples/service_reconfiguration/service/main.cpp index 571bdae..d057e3f 100644 --- a/sw/examples/service_reconfiguration/service/main.cpp +++ b/sw/examples/service_reconfiguration/service/main.cpp @@ -41,7 +41,7 @@ constexpr auto const defTargetRegion = 0; constexpr auto const opIdAddMul = 1; constexpr auto const opIdMinMax = 2; constexpr auto const opIdRotate = 3; -constexpr auto const opIdSelect = 3; +constexpr auto const opIdSelect = 4; /** * @brief Main