From nobody Sun Feb 8 14:31:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560613884; cv=none; d=zoho.com; s=zohoarc; b=gF1sYcqvDwJZjO5lod+qpoz4fGhz9T3tN2iievSwWGOZbyev7TkbUuUmH6GobRBIsmdGOjjctBzSLmQ5Lh9mSwZ5Z20Lj4OasP0Z3JNlF8U6WUjFcW+txKwR442r7gUyyOyBvGCvYZ/arkh2vL2bFAoLr9Bqk1caZV4NjGRibwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560613884; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yo7jr7EgZmc1Ol1bnBWDRJhyg3WpJxlJ44odK1iIVWg=; b=imGeIw2vCG1YIyXIBhnYgZvSHt12CaYJccuwYgqRD0UVA95caB4yefzzFCjVeIajS5KmZA9dWp2u9YCEGgGhPUkRIgxRYvhaa6WKbhiS2r9DSlw5inkUf+PQhbJ/TLeeeeQU/6GDimLeszDaOlJ++z0LYCCHZYVsfoduQ7xcQQ8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156061388465951.12114648937427; Sat, 15 Jun 2019 08:51:24 -0700 (PDT) Received: from localhost ([::1]:32898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcAxf-0007kX-Mb for importer@patchew.org; Sat, 15 Jun 2019 11:51:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35899) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcAr4-00044T-1j for qemu-devel@nongnu.org; Sat, 15 Jun 2019 11:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcAr2-0000tJ-H1 for qemu-devel@nongnu.org; Sat, 15 Jun 2019 11:44:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41868) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcAqw-0000YG-Oc; Sat, 15 Jun 2019 11:44:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED74A356D2; Sat, 15 Jun 2019 15:44:24 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-41.brq.redhat.com [10.40.204.41]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ACEF21001B05; Sat, 15 Jun 2019 15:44:23 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sat, 15 Jun 2019 17:43:42 +0200 Message-Id: <20190615154352.26824-14-philmd@redhat.com> In-Reply-To: <20190615154352.26824-1-philmd@redhat.com> References: <20190615154352.26824-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 15 Jun 2019 15:44:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 13/23] target/arm: Make the v7-M Security State routines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The Security State helpers are now only called within v7m_helper.c. Remove them from "internals.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- target/arm/internals.h | 8 -------- target/arm/v7m_helper.c | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 1d15af3f8b..fe9e4665e2 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1043,12 +1043,4 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t ad= dress, int *prot, bool *is_subpage, ARMMMUFaultInfo *fi, uint32_t *mregion); =20 -void write_v7m_control_spsel_for_secstate(CPUARMState *env, - bool new_spsel, - bool secstate); - -void write_v7m_control_spsel(CPUARMState *env, bool new_spsel); - -void switch_v7m_security_state(CPUARMState *env, bool new_secstate); - #endif diff --git a/target/arm/v7m_helper.c b/target/arm/v7m_helper.c index b50bb98e06..aa6a08e326 100644 --- a/target/arm/v7m_helper.c +++ b/target/arm/v7m_helper.c @@ -94,9 +94,9 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, = uint32_t op) * stack pointers if it is done for the CONTROL register for the current * security state. */ -void write_v7m_control_spsel_for_secstate(CPUARMState *env, - bool new_spsel, - bool secstate) +static void write_v7m_control_spsel_for_secstate(CPUARMState *env, + bool new_spsel, + bool secstate) { bool old_is_psp =3D v7m_using_psp(env); =20 @@ -121,13 +121,13 @@ void write_v7m_control_spsel_for_secstate(CPUARMState= *env, * Write to v7M CONTROL.SPSEL bit. This may change the current * stack pointer between Main and Process stack pointers. */ -void write_v7m_control_spsel(CPUARMState *env, bool new_spsel) +static void write_v7m_control_spsel(CPUARMState *env, bool new_spsel) { write_v7m_control_spsel_for_secstate(env, new_spsel, env->v7m.secure); } =20 /* Switch M profile security state between NS and S */ -void switch_v7m_security_state(CPUARMState *env, bool new_secstate) +static void switch_v7m_security_state(CPUARMState *env, bool new_secstate) { uint32_t new_ss_msp, new_ss_psp; =20 --=20 2.20.1