From patchwork Wed Apr 13 11:49:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65715 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2454894qge; Wed, 13 Apr 2016 04:49:59 -0700 (PDT) X-Received: by 10.98.22.146 with SMTP id 140mr4839888pfw.116.1460548199079; Wed, 13 Apr 2016 04:49:59 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id b90si3472424pfd.128.2016.04.13.04.49.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Apr 2016 04:49:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 36E881A215B; Wed, 13 Apr 2016 04:49:58 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org 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 C7B221A1FE9 for ; Wed, 13 Apr 2016 04:49:56 -0700 (PDT) Received: by mail-wm0-x234.google.com with SMTP id u206so72865155wme.1 for ; Wed, 13 Apr 2016 04:49:56 -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; bh=U+RPqLLGX7tBmRRfOXiGgwWZ2iXMaKgnefJMdoxTyOU=; b=D/vXQOrEGr1HkiyTNca+LEd1MDRbriPutK0ZYkyzqkZbzaMJF2T4K9wyTaFw6vm4B0 pegm/Rkv6OYLAYq7fLePyO2AsBcbEq/M/xopgo5RVy0ymRDOjeO+WCmI02Xv4jsAz1jQ D80O91OBJagz5zoZ/KzQsTySQKM9C5O4DMOvk= 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; bh=U+RPqLLGX7tBmRRfOXiGgwWZ2iXMaKgnefJMdoxTyOU=; b=TZqW723elh4Y5tETpXGlwZBtnzAu+d0K4IyXl5nZFMay6yenvYcV5htSA7utZYm8EK nrGVFNLLCPR/aGUu2DREb/SXvszw26tZ23B0kHZGcJmSvuejOgb07HGfkwt2CubA4TbH 5Cju74RfdR7DBrLRzI8lILrYaw5slgpfD/Dqt6aLuAeLUNtqedm10WfvAc3d34BOY9DO +IE+3ilN70OqJduE+60+QNkKy3vUCEIpfZrflfNJq3fbrGdAqWs1dmX7kmQHHNrea87X KKu3Hnx+es+6WuleeDORRAxmWgtWvth6nppa8K33uTx5eSN66BiXGUJWLmn0RJupazXh /zDg== X-Gm-Message-State: AOPr4FX2jvb5nlD3WqGzkn3vvO3o37OBrS7PIWMbOPaKwAtLt2gmUIBibn0fD5q4ofMaWfqV X-Received: by 10.28.130.6 with SMTP id e6mr10566229wmd.94.1460548195070; Wed, 13 Apr 2016 04:49:55 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id wa1sm21822463wjc.45.2016.04.13.04.49.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Apr 2016 04:49:54 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 13 Apr 2016 13:49:50 +0200 Message-Id: <1460548190-8942-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 Subject: [edk2] [PATCH] ArmVirtPkg/RelocatableVirtHelper: use correct FindMemNode argument order X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Commit 03b6bed17ea6 ArmVirtPkg/XenRelocatablePlatformLib: rewrite DTB memory node retrieval in C") introduced a FindMemNode () C function that takes pointers to system memory base and size as arguments, but the calling code passes them in the wrong order. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S | 4 ++-- ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S | 4 ++-- ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S | 4 ++-- ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Acked-by: Laszlo Ersek diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S index 0980a387207f..27ad07a1a197 100644 --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S @@ -82,8 +82,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - adr x1, PcdGet64 (PcdSystemMemorySize) - adr x2, PcdGet64 (PcdSystemMemoryBase) + adr x1, PcdGet64 (PcdSystemMemoryBase) + adr x2, PcdGet64 (PcdSystemMemorySize) mov sp, x7 bl FindMemnode cbz x0, .Lout diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S index 3d77ea215709..097038806ecd 100644 --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S @@ -79,8 +79,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - ldr r1, =PcdGet64 (PcdSystemMemorySize) - ldr r2, =PcdGet64 (PcdSystemMemoryBase) + ldr r1, =PcdGet64 (PcdSystemMemoryBase) + ldr r2, =PcdGet64 (PcdSystemMemorySize) mov sp, r5 bl FindMemnode teq r0, #0 diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S index ae77492bf363..940bcb2d257a 100644 --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S @@ -81,8 +81,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - adr x1, PcdGet64 (PcdSystemMemorySize) - adr x2, PcdGet64 (PcdSystemMemoryBase) + adr x1, PcdGet64 (PcdSystemMemoryBase) + adr x2, PcdGet64 (PcdSystemMemorySize) mov sp, x7 bl FindMemnode cbz x0, .Lout diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S index b69c6d618a26..539426f36f50 100644 --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S @@ -78,8 +78,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - ldr r1, =PcdGet64 (PcdSystemMemorySize) - ldr r2, =PcdGet64 (PcdSystemMemoryBase) + ldr r1, =PcdGet64 (PcdSystemMemoryBase) + ldr r2, =PcdGet64 (PcdSystemMemorySize) mov sp, r5 bl FindMemnode teq r0, #0