From nobody Sun Nov 2 07:34:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527591733256468.2649247709867; Tue, 29 May 2018 04:02:13 -0700 (PDT) Received: from localhost ([::1]:60142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNcOK-0002Dj-Et for importer@patchew.org; Tue, 29 May 2018 07:02:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNcDT-0001j2-Np for qemu-devel@nongnu.org; Tue, 29 May 2018 06:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNcDS-0004CB-GB for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:59 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:54720) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNcDS-0004B6-9U for qemu-devel@nongnu.org; Tue, 29 May 2018 06:50:58 -0400 Received: by mail-wm0-x22e.google.com with SMTP id f6-v6so39205198wmc.4 for ; Tue, 29 May 2018 03:50:58 -0700 (PDT) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id v1-v6sm6418356ljg.58.2018.05.29.03.50.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 03:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qX1PEmeLBFPGq2zdwN6kiMMwoESHL+lKVoMVf6OgQ5U=; b=aUbFtgF7BWdDrhO6FP6LLMgvrVZmuXSvnuv8SAw95dJWB2WqmiXCDW+bFjNVJzYTth kSMTl5NKW+hoi4+0SSVgeVSdSNTCMrKpcih4sGKaMxUOf03X3+xmroihbAUgpLhk135Y pmjM0igZh5lVvxZ3yPmouNSmn6v4Pd8AYhnI2q7eYEOaEVF/c4mz5kitmy8p8n4jo8V+ 7+htBZkvzBlKjFoqrtTp90tsr2iN8YAlmcyuWXoXUi2PbJIC927rS+mICgw49KpjPztD W0lpS3fcmlmRL30k65AJTi2kYgGx0hAWI/H2FAaa9kZ3jrwqNI0+9x2+ZfUGPZJuohqb W+gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qX1PEmeLBFPGq2zdwN6kiMMwoESHL+lKVoMVf6OgQ5U=; b=nRtyE27AwKohnC3SR1mzFMNmxY05vnkB1raC+QPUnsnvlXc126LCatr6NY9F7ekX/m iEf+s0KDPblpZjKvZWCBQYLnebDDtTCxHdFqDamw2imze09cMl5iZs0zlbcNTm/wy9Hv aXKkMwfr/+yVyLNMRpAfgjSFtCvclqdy3ZLe7zFyg8SawgBiC2wht9QAuKjGYVYLykoV K23lCJKuKzJ9JH/en75LBt2bzo/sD2VXWbJ71cChYilHTLdHZWYHooXxPFSep5eE+xbO Fnfm65gQJyl9mvDsQA7CLX0LarM2c4Ry9xmu95ScWnL/L7UsOygWQ4mUf9kog77dKX4v NaTw== X-Gm-Message-State: ALKqPweU3xyhH7F3Kum8d7nwqGLV1LSnTQAFFRUm+qJ3WDH2q99809ow Km82TJZRGQOwVM4Pah0kIjIX0w== X-Google-Smtp-Source: ADUXVKIeVXcXxlU5IVyI95N7PoaUi0E16cfEUK7BtapysLm82D6JKVlGq2tR/i6wmU7ywd2PU+Q/DA== X-Received: by 2002:a2e:9a06:: with SMTP id o6-v6mr6360476lji.17.1527591056911; Tue, 29 May 2018 03:50:56 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 12:49:59 +0200 Message-Id: <20180529105011.1914-27-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180529105011.1914-1-edgar.iglesias@gmail.com> References: <20180529105011.1914-1-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22e Subject: [Qemu-devel] [PULL v1 26/38] target-microblaze: mmu: Prepare for 64-bit addresses X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Edgar E. Iglesias" Prepare for 64-bit addresses. This makes no functional difference as the upper parts of the 64-bit addresses are not yet reachable. Reviewed-by: Richard Henderson Signed-off-by: Edgar E. Iglesias --- target/microblaze/mmu.c | 14 +++++++------- target/microblaze/mmu.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index 231803ceea..a379968618 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -81,16 +81,16 @@ unsigned int mmu_translate(struct microblaze_mmu *mmu, { unsigned int i, hit =3D 0; unsigned int tlb_ex =3D 0, tlb_wr =3D 0, tlb_zsel; - unsigned int tlb_size; - uint32_t tlb_tag, tlb_rpn, mask, t0; + uint64_t tlb_tag, tlb_rpn, mask; + uint32_t tlb_size, t0; =20 lu->err =3D ERR_MISS; for (i =3D 0; i < ARRAY_SIZE(mmu->rams[RAM_TAG]); i++) { - uint32_t t, d; + uint64_t t, d; =20 /* Lookup and decode. */ t =3D mmu->rams[RAM_TAG][i]; - D(qemu_log("TLB %d valid=3D%d\n", i, t & TLB_VALID)); + D(qemu_log("TLB %d valid=3D%" PRId64 "\n", i, t & TLB_VALID)); if (t & TLB_VALID) { tlb_size =3D tlb_decode_size((t & TLB_PAGESZ_MASK) >> 7); if (tlb_size < TARGET_PAGE_SIZE) { @@ -98,10 +98,10 @@ unsigned int mmu_translate(struct microblaze_mmu *mmu, abort(); } =20 - mask =3D ~(tlb_size - 1); + mask =3D ~((uint64_t)tlb_size - 1); tlb_tag =3D t & TLB_EPN_MASK; if ((vaddr & mask) !=3D (tlb_tag & mask)) { - D(qemu_log("TLB %d vaddr=3D%x !=3D tag=3D%x\n", + D(qemu_log("TLB %d vaddr=3D%" PRIx64 " !=3D tag=3D%" PRIx6= 4 "\n", i, vaddr & mask, tlb_tag & mask)); continue; } @@ -173,7 +173,7 @@ unsigned int mmu_translate(struct microblaze_mmu *mmu, } } done: - D(qemu_log("MMU vaddr=3D%x rw=3D%d tlb_wr=3D%d tlb_ex=3D%d hit=3D%d\n", + D(qemu_log("MMU vaddr=3D%" PRIx64 " rw=3D%d tlb_wr=3D%d tlb_ex=3D%d hi= t=3D%d\n", vaddr, rw, tlb_wr, tlb_ex, hit)); return hit; } diff --git a/target/microblaze/mmu.h b/target/microblaze/mmu.h index 624becfded..1714caf82e 100644 --- a/target/microblaze/mmu.h +++ b/target/microblaze/mmu.h @@ -28,7 +28,7 @@ #define RAM_TAG 0 =20 /* Tag portion */ -#define TLB_EPN_MASK 0xFFFFFC00 /* Effective Page Number */ +#define TLB_EPN_MASK MAKE_64BIT_MASK(10, 64 - 10) #define TLB_PAGESZ_MASK 0x00000380 #define TLB_PAGESZ(x) (((x) & 0x7) << 7) #define PAGESZ_1K 0 @@ -42,7 +42,7 @@ #define TLB_VALID 0x00000040 /* Entry is valid */ =20 /* Data portion */ -#define TLB_RPN_MASK 0xFFFFFC00 /* Real Page Number */ +#define TLB_RPN_MASK MAKE_64BIT_MASK(10, 64 - 10) #define TLB_PERM_MASK 0x00000300 #define TLB_EX 0x00000200 /* Instruction execution allowed = */ #define TLB_WR 0x00000100 /* Writes permitted */ @@ -63,7 +63,7 @@ struct microblaze_mmu { /* Data and tag brams. */ - uint32_t rams[2][TLB_ENTRIES]; + uint64_t rams[2][TLB_ENTRIES]; /* We keep a separate ram for the tids to avoid the 48 bit tag width. = */ uint8_t tids[TLB_ENTRIES]; /* Control flops. */ --=20 2.14.1