From patchwork Thu Oct 27 15:10:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 79731 Delivered-To: patch@linaro.org Received: by 10.80.142.83 with SMTP id 19csp717544edx; Thu, 27 Oct 2016 08:46:49 -0700 (PDT) X-Received: by 10.31.149.73 with SMTP id x70mr6821929vkd.86.1477583209451; Thu, 27 Oct 2016 08:46:49 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 38si3588733uaf.86.2016.10.27.08.46.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 27 Oct 2016 08:46:49 -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=@linaro.org; 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 dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmtE-0000B2-H0 for patch@linaro.org; Thu, 27 Oct 2016 11:46:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmTL-0003hg-DI for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzmTK-0004Sj-7m for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:03 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34885) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bzmTK-0004S3-1F for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:02 -0400 Received: by mail-wm0-x22c.google.com with SMTP id e69so41516353wmg.0 for ; Thu, 27 Oct 2016 08:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aCZf5aRZ/DM9OhB54Pi/vy77WQTwFAZTNy6aFSZrWvA=; b=Cp5mOm3YXsEM4cCzd+WtAROrHb+9ijgN0AHC8SOu//L058Ax267Vt1HQq2iaE64gF5 6jIBjFKjdlARvlYCPyGOz7b1QKgpI264PLQvqcsb2uDHPY98Id+sdS3tdBSYvadU2GAe WAbAYBtI0Hf48DCginKD2B9kILwy67EUloP24= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aCZf5aRZ/DM9OhB54Pi/vy77WQTwFAZTNy6aFSZrWvA=; b=fEY0bGnfo2ibAZiAuIT6obrD67OLQhy4tjNbtrprmvMKjQW0GqH8etlZLxNPM39Wcx 29GoMS+v/rK/70IxeS2lqCiNfv1Q6eLIbUK92VfYhH3bswwY4H2UIWd4E+k3QqnqtYM6 fleEoAJtxt6EBUcwPy1piIYA3AJ6PEwUt+C+7Jxkj//0+r9EIJfT68gBmwkuEK8kQucQ 45ptFrZNJkNg65jefKD0H2Rr0Lj+3FArWrBbGQhj15If7HeZNI5XsxvSg1RKQbi7fLYB CIgnxF1LKEWezYHNsFiEE+v8PHJX+oF5CW0mlVZpsdN0v5JAzkO4Cjp/mLDKmdBR9F4v 5d0w== X-Gm-Message-State: ABUngve/JiGPGyAebdug31iupBF8g2A/t7v06EzvWsoX6n6if/gCMsASsIXLqSt76xYth+K5 X-Received: by 10.194.59.82 with SMTP id x18mr7237649wjq.109.1477581600929; Thu, 27 Oct 2016 08:20:00 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p184sm3845454wmg.3.2016.10.27.08.19.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 08:19:58 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 736973E04CC; Thu, 27 Oct 2016 16:11:01 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: pbonzini@redhat.com Date: Thu, 27 Oct 2016 16:10:27 +0100 Message-Id: <20161027151030.20863-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161027151030.20863-1-alex.bennee@linaro.org> References: <20161027151030.20863-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PATCH v5 30/33] target-arm/cpu: don't reset TLB structures, use cputlb to do it 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: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, nikunj@linux.vnet.ibm.com, jan.kiszka@siemens.com, mark.burton@greensocs.com, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, "open list:ARM" , serge.fdrv@gmail.com, bobby.prani@gmail.com, rth@twiddle.net, =?UTF-8?q?Alex=20Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" cputlb owns the TLB entries and knows how to safely update them in MTTCG. Signed-off-by: Alex Bennée --- target-arm/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.10.1 diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 1b9540e..ff8c594 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -121,7 +121,13 @@ static void arm_cpu_reset(CPUState *s) acc->parent_reset(s); +#ifdef CONFIG_SOFTMMU + memset(env, 0, offsetof(CPUARMState, tlb_table)); + tlb_flush(s, 0); +#else memset(env, 0, offsetof(CPUARMState, features)); +#endif + g_hash_table_foreach(cpu->cp_regs, cp_reg_reset, cpu); g_hash_table_foreach(cpu->cp_regs, cp_reg_check_reset, cpu);