From patchwork Mon Jul 2 15:10:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 140817 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp90228ljj; Mon, 2 Jul 2018 08:33:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpduZbOBTT0O45pM+Ov5qZKV8J4pVhocPVSU2P5WikC20LS/ykTYthyhcRGNBhx+3tQ3TvS6 X-Received: by 2002:a0c:d80f:: with SMTP id h15-v6mr12308415qvj.5.1530545602336; Mon, 02 Jul 2018 08:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530545602; cv=none; d=google.com; s=arc-20160816; b=0JGpvRAzmnPoPg2gSScMNLBbshvxVvXIfcE97s7AOdYcKIOsdJCKNVoGAZiWQNc/bt Eh46OWqYbIxjxQwcUlLAScqiOsVuqu746dkN53/g46tn0xXm4FdOpUrloz+bzJz5UZVJ FJkpn59eP7dd4vGCbQkDQmJB1znc9Pho6gOfhLr3IOqAmLTvAhxu2PI46EsCmSl8tGja MVEcLybXzARfJG73kdPJfvbnCkQKXSgmvZ7Mln6lnQVFrsKQLFgTYrF020I83KDwyC6T eTNfd2vRFH4kcn+zRaQ0WJKSxey0XtV+/DID/mcahPCnZAcaBXa0gBtV23vW0BJbi206 tMwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=pNLpyMH2MtrDqswU9mlulZblcEuP061D6R6k4Avg5bA=; b=G/4sWG96nsfIZvLSk652zSPpEpzgcmPpk9b8JWCqjUgbC/SORb9KloE0gX0RtsTkHg sXQ2/totYU0BHBuLw4AgdYNfly+8Zhm7WI9JH6iuyKDJcqbBWhtmdAdzSW75KVo2VnNV BM+4Dc7DGvJJAntiuUKHkM+33cZsrlEPjY8lT8gLbxLNPhhd0R0xE8gAxX82WRPFCFAI wxkb85yEYln09UucsvDrtDIcYEvOyLRDk6yASBJyvw+Jxyspydr+bO+gvlC0vCRt7OF9 szAwn35adVyOPNRj2lKPetAh6RVlp2hUMya4RuFG7r3A72OwW8DdFVMzJ7Y/weSd2RAv iG6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="s/VaV3CO"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p123-v6si3239693qkc.311.2018.07.02.08.33.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 08:33:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="s/VaV3CO"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1]:33564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0pM-0004AO-Sr for patch@linaro.org; Mon, 02 Jul 2018 11:33:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0UD-0004Sn-G9 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa0UA-0008FZ-LF for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:29 -0400 Received: from mail-pl0-x22b.google.com ([2607:f8b0:400e:c01::22b]:44643) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa0UA-0008F2-Fh for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:26 -0400 Received: by mail-pl0-x22b.google.com with SMTP id m16-v6so8093629pls.11 for ; Mon, 02 Jul 2018 08:11:26 -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=pNLpyMH2MtrDqswU9mlulZblcEuP061D6R6k4Avg5bA=; b=s/VaV3COqRMvbK5zqqBMYWvpz1BIHNXfqlXWcDaRTYnq8Fi09Cf9zLTeaXJS594ptm eH7zoXNk7khxoG/kWo2H2C7J58U9tJ2OAlquI2RqdHf7XAr/abZcc3SsNRLEs3H6HeR8 cDITc7QDPn+NYsFbAjCoX9zENbRtqkS7GSxS6rfWX4JHbveZostJm6kEfmqwQoI0ZKV0 767QiqgWqlELlJevGGyfXqVcEQUOiQjRSmK1L5z+ltxG3CgUjMVre33Pf82//C3ujLRR J/nQ47BH1wOJl8b2kLa4wcfO4mUvDrouu3uY50Xh5adC7Y1tPivpLn5JbO2AKJ08DOTG PqhQ== 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=pNLpyMH2MtrDqswU9mlulZblcEuP061D6R6k4Avg5bA=; b=razTcf05FqHBr3rp7g2HQ1GiMGRdFKtqnXRQT1rsucTdl6hpGvuuu6z8pFw7gyXqjf NI+fbba5/PKsp6h5Br0lxCnY7g57Uc16+IUAkPGWsxF8GoMXe0yWiMKVV1DZKdsOnCLR EPi3Hy/4cqwh3SuthnTY3cpKSxK+0sZu3Gk81ui3VKAcEZ8OM45OXqTmKbffdwMVANRI QWXYxrotQXsAXQ0qJVtWnI4yEzkjK//j+9H/pVLYwPX2vESPxc0MXCUHRPhi/xsrSbZI KZ8lD1CWoq264drnBm0RPchqaYncnosx9Yt/Wp4vRte2Ma0hnBTr8SmlbSKtWBcF0fZF wOLg== X-Gm-Message-State: APt69E0NN1Iu/2Pb0yPKfEZ1mfCPotiB/coBHprOheDQGn3UcnXNby8g BywngUl9sPOe4/4OOKbEqGA= X-Received: by 2002:a17:902:2983:: with SMTP id h3-v6mr26365717plb.232.1530544285670; Mon, 02 Jul 2018 08:11:25 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id j133-v6sm33300282pgc.75.2018.07.02.08.11.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 08:11:25 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Tue, 3 Jul 2018 00:10:17 +0900 Message-Id: <20180702151023.24532-20-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702151023.24532-1-shorne@gmail.com> References: <20180702151023.24532-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22b Subject: [Qemu-devel] [PULL v2 19/25] target/openrisc: Increase the TLB size 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: Stafford Horne , Richard Henderson , QEMU Development Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The architecture supports 128 TLB entries. There is no reason not to provide all of them. In the process we need to fix a bug that failed to parameterize the configuration register that tells the operating system the number of entries. Signed-off-by: Richard Henderson Signed-off-by: Stafford Horne --- v2: - Change VMState version. --- target/openrisc/cpu.c | 6 ++++-- target/openrisc/cpu.h | 2 +- target/openrisc/machine.c | 5 ++--- 3 files changed, 7 insertions(+), 6 deletions(-) -- 2.17.0 diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index b92de51ecf..e01ce9ed1c 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -57,8 +57,10 @@ static void openrisc_cpu_reset(CPUState *s) cpu->env.upr = UPR_UP | UPR_DMP | UPR_IMP | UPR_PICP | UPR_TTP | UPR_PMP; - cpu->env.dmmucfgr = (DMMUCFGR_NTW & (0 << 2)) | (DMMUCFGR_NTS & (6 << 2)); - cpu->env.immucfgr = (IMMUCFGR_NTW & (0 << 2)) | (IMMUCFGR_NTS & (6 << 2)); + cpu->env.dmmucfgr = (DMMUCFGR_NTW & (0 << 2)) + | (DMMUCFGR_NTS & (ctz32(TLB_SIZE) << 2)); + cpu->env.immucfgr = (IMMUCFGR_NTW & (0 << 2)) + | (IMMUCFGR_NTS & (ctz32(TLB_SIZE) << 2)); #ifndef CONFIG_USER_ONLY cpu->env.picmr = 0x00000000; diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index 47e94659e1..b180e30e9e 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -222,7 +222,7 @@ enum { /* TLB size */ enum { - TLB_SIZE = 64, + TLB_SIZE = 128, TLB_MASK = TLB_SIZE - 1, }; diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index 3fc837b925..1eedbf3dbe 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -38,9 +38,8 @@ static const VMStateDescription vmstate_tlb_entry = { static const VMStateDescription vmstate_cpu_tlb = { .name = "cpu_tlb", - .version_id = 1, - .minimum_version_id = 1, - .minimum_version_id_old = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (VMStateField[]) { VMSTATE_STRUCT_ARRAY(itlb, CPUOpenRISCTLBContext, TLB_SIZE, 0, vmstate_tlb_entry, OpenRISCTLBEntry),