From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5E6D51A1DF8 for ; Wed, 10 Aug 2016 08:18:13 -0700 (PDT) Received: by mail-wm0-x234.google.com with SMTP id o80so110980037wme.1 for ; Wed, 10 Aug 2016 08:18:13 -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; bh=msEseSw/bkaOnypf1JwhF9bsJ3yMVH/jkSWnyfSjPfU=; b=ClWyRZP4DO5emizvt5nXQ0mFIYosZXL8maSEFz0pdekkX1PsGt1fzWwuqqvCDLKyJX 08g60NHiUkbPW82SQegYrtByBw9S0MOSPilOWAuU9leDu1SK/VHqsIZw4IEFbUqUMj+g 3JMMXibNi9aHiuIp3a8LatkbsbW3dllL/mNZk= 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; bh=msEseSw/bkaOnypf1JwhF9bsJ3yMVH/jkSWnyfSjPfU=; b=UxIyKluqdwWQxtZ9wYS87NvO3pUNxG/UAuEXKcPsbSIPPFS6d2tQNFBTXLsyUlk7RN avB99BzfEvALOLyhuIfZbX4uyG6zhDHMg/w2QiLjzt7C088K0PO04V8UmNjFQPMb2PyZ 65Uj3as8qTp26tkSjtOQBaScy4Swaoy2QuWuj7ZMLeSvLV33eFJS8knla8wAuZ1LVdJA NKhyb5uebfLQV4M3XzNpVltDCHyZuXfjkYMAIL+uPlP0LkgU6K3c/GVjml+6DBWBg4X2 zndHZvmZUVIJu6/DZcJ0Vanb25trTLHIEN8WA6W4ijMsDauM6oRMRjMrDKChsc761J2g v4Hw== X-Gm-Message-State: AEkooutRs2dHBkkkzDRkMqqSm9OKeiu5oqZoUx9IJn96rqnignxwl0GDS5VYuYW6CtxxMzU8 X-Received: by 10.28.15.3 with SMTP id 3mr3598779wmp.31.1470842291742; Wed, 10 Aug 2016 08:18:11 -0700 (PDT) Received: from localhost.localdomain (46.red-81-37-107.dynamicip.rima-tde.net. [81.37.107.46]) by smtp.gmail.com with ESMTPSA id c16sm8908374wme.4.2016.08.10.08.18.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Aug 2016 08:18:11 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, eugene@hp.com Cc: lersek@redhat.com, Ard Biesheuvel Date: Wed, 10 Aug 2016 17:17:37 +0200 Message-Id: <1470842282-8415-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470842282-8415-1-git-send-email-ard.biesheuvel@linaro.org> References: <1470842282-8415-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [PATCH 01/26] ArmLib: remove ArmReplaceLiveTranslationEntry() implementation X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2016 15:18:13 -0000 The function ArmReplaceLiveTranslationEntry() has been moved to ArmMmuLib, so remove the old implementation from ArmLib. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmLib/AArch64/AArch64Support.S | 60 -------------------- ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S | 4 ++ 2 files changed, 4 insertions(+), 60 deletions(-) diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S index 9441f47e30ba..5cef98fd42a0 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S @@ -488,64 +488,4 @@ ASM_PFX(ArmReadCurrentEL): mrs x0, CurrentEL ret - - .macro __replace_entry, el - - // disable the MMU - mrs x8, sctlr_el\el - bic x9, x8, #CTRL_M_BIT - msr sctlr_el\el, x9 - isb - - // write updated entry - str x1, [x0] - - // invalidate again to get rid of stale clean cachelines that may - // have been filled speculatively since the last invalidate - dmb sy - dc ivac, x0 - - // flush the TLBs - .if \el == 1 - tlbi vmalle1 - .else - tlbi alle\el - .endif - dsb sy - - // re-enable the MMU - msr sctlr_el\el, x8 - isb - .endm - -//VOID -//ArmReplaceLiveTranslationEntry ( -// IN UINT64 *Entry, -// IN UINT64 Value -// ) -ASM_PFX(ArmReplaceLiveTranslationEntry): - - // disable interrupts - mrs x2, daif - msr daifset, #0xf - isb - - // clean and invalidate first so that we don't clobber - // adjacent entries that are dirty in the caches - dc civac, x0 - dsb ish - - EL1_OR_EL2_OR_EL3(x3) -1:__replace_entry 1 - b 4f -2:__replace_entry 2 - b 4f -3:__replace_entry 3 - -4:msr daif, x2 - ret - -ASM_PFX(ArmReplaceLiveTranslationEntrySize): - .long . - ArmReplaceLiveTranslationEntry - ASM_FUNCTION_REMOVE_IF_UNREFERENCED diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S index 7c5d205d940b..3834da7bfedd 100644 --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S @@ -14,6 +14,8 @@ #include +GCC_ASM_EXPORT(ArmReplaceLiveTranslationEntry) + .set CTRL_M_BIT, (1 << 0) .macro __replace_entry, el @@ -72,5 +74,7 @@ ASM_PFX(ArmReplaceLiveTranslationEntry): 4:msr daif, x2 ret +ASM_GLOBAL ASM_PFX(ArmReplaceLiveTranslationEntrySize) + ASM_PFX(ArmReplaceLiveTranslationEntrySize): .long . - ArmReplaceLiveTranslationEntry -- 2.7.4