From patchwork Thu Dec 1 16:45:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 86103 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp779877qgi; Thu, 1 Dec 2016 08:45:07 -0800 (PST) X-Received: by 10.99.245.21 with SMTP id w21mr71821354pgh.5.1480610707876; Thu, 01 Dec 2016 08:45:07 -0800 (PST) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id p2si774558pge.244.2016.12.01.08.45.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 08:45:07 -0800 (PST) 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 77FBF81F21; Thu, 1 Dec 2016 08:45:07 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x236.google.com (mail-wm0-x236.google.com [IPv6:2a00:1450:400c:c09::236]) (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 AAC0181F19 for ; Thu, 1 Dec 2016 08:45:05 -0800 (PST) Received: by mail-wm0-x236.google.com with SMTP id t79so253246896wmt.0 for ; Thu, 01 Dec 2016 08:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=3Hm/rOSml4RfMSqSdi369aoumWaXnh0XV5bRPJ3VMAA=; b=kdfXSDyOi+gwVg5nwEHAvfHwpaOwXxuyk72NJN6rTrHNP0Rg4o47LSn/8GWMBc8Y0y 9oItMpt1B9fRqp7376Imtr8KOl/QivmYBKN5GQyqFwWgaU6N47rRlVr1V/4VZ/3Y9CEd 1w5vrW8/AJ+tvVkZRvwmifMIhzWGmr3sBR7js= 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=3Hm/rOSml4RfMSqSdi369aoumWaXnh0XV5bRPJ3VMAA=; b=IhbOWRBaSc0Lm8XFexpxQN0Inoq2BiXGpBULYAHJxh/c5O553iH5FvPSLIYwAat7s/ iFCkOnlu2ZBQeez/XMgL4VGckbl9ThhNErUWiGZVXFSDhhjK5LtNTrpe2DH9CzvMsxQ9 S2S7tHQUqXPkBuVv2Mfwa56PvPUrgYPrB5SpDhZV71WJQVS3t0xPoKo/lYLF+2jCecdH P9TGsryTPuu8GrDGk5QzP8dW7DJ+GmLXiyqTFbIemkrvcPMP3SLy0PpBsJdff1etxiWM 3s64ooN07yVYPEa3O1Pzc1yHXGhrC6fXtvv9MYUnxDrcwEPb6si//J8FcipdhB44Tnso nEXg== X-Gm-Message-State: AKaTC027ArATFkUvfyfBxa9fva7E42uy57kVYIVDwDjLIc0yhFmt596onMgNBVFoQ8Z3pCdI X-Received: by 10.28.40.67 with SMTP id o64mr32490507wmo.40.1480610704094; Thu, 01 Dec 2016 08:45:04 -0800 (PST) Received: from mohikan.hemma.eciton.net ([2a01:348:6:8735:e23f:49ff:fe6d:9d26]) by smtp.gmail.com with ESMTPSA id ct7sm1157769wjc.2.2016.12.01.08.45.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 08:45:03 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Thu, 1 Dec 2016 16:45:02 +0000 Message-Id: <20161201164502.9470-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.10.2 Subject: [edk2] [PATCH] ArmPkg: fix compilation error in ArmDmaLib 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: , Cc: Michael D Kinney , Ard Biesheuvel , Andrew Fish , Sudeep Holla MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Commit 0a99a65d2c8a ("fix incorrect device address of double buffer") retained an explicit cast on the variable "Buffer" which became incorrect with the other changes, leading to compilation failures with some toolchains. Drop the cast. Contributed-under: TianoCore Contribution Agreement 1.0 Reported-by: Sudeep Holla Signed-off-by: Leif Lindholm --- Mike, Andrew - since Ard is on holiday and the fix is trivial, could either of you give me a Reviewed-by: on this one? ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.10.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Tested-by: Sudeep Holla Reviewed-by: Ard Biesheuvel diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c index acc106b..f4ee9e4 100644 --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c @@ -142,7 +142,7 @@ DmaMap ( CopyMem (Buffer, HostAddress, *NumberOfBytes); } - *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress ((UINTN)Buffer)); + *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress (Buffer)); Map->BufferAddress = Buffer; } else { Map->DoubleBuffer = FALSE;