From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (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 E8DFD81F0D for ; Sat, 12 Nov 2016 05:02:32 -0800 (PST) Received: by mail-wm0-x232.google.com with SMTP id a197so23478254wmd.0 for ; Sat, 12 Nov 2016 05:02:37 -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:in-reply-to:references; bh=U17XMjyDwVzOddn6ykc3Qe46DxpWpWxb+/Koefme4c0=; b=OLesI28Lty+Har+LAHdGPUfiPDvWzuhYeLg2/5KzZv9f07cZ8OVMlaRHue0oTfNV2M ColdGJrUlj7ukK4PUEXPgbwR3SjEqOZCL/hfX9koPa2mb1/y7e7jDYsXmzE2MVJ5+3Xo DxpFBdJzZuop+0Gahc+G2HW6GMRaIp5wxAGiE= 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=U17XMjyDwVzOddn6ykc3Qe46DxpWpWxb+/Koefme4c0=; b=KgT/ZEWNUfeA5xYTZSjjXV2J9egki5XG0E+Zo/GoNKLcZlDe0eKLgWCQJ/vNFke66b jkNqTqRyBe1FEaQTWpf95C2D/9VKFmNTE2ithMSsJvQRfKmK8T3wjx+g1+FJZCv0jca3 2K0EPnlmjkSjxySVzPwLIXgbIfvuvlUujgU2gOitL3ECs6xn5frBP2qqX1O9pHjZSspp 0RxTVCNXnnIFe1Mmr+JlhcmWySpXgOie8hIoUFElvv+aPck9Wee1htbydQY6OkuT5i0j mnFtCdGbAFh+PDfso0n2bVPr8TRJwhU9xuQhQ6LEvyR8cE4ZUtNBFoc/xXhg3TtmA77/ lTcQ== X-Gm-Message-State: ABUngveeSYJxjlQHp+Hjqx6mOLfnmxLgpyc5qKHzgNoTuKsMZvcoVa/uCttdYSY/oxHw+KYV X-Received: by 10.28.148.81 with SMTP id w78mr2467706wmd.42.1478955755417; Sat, 12 Nov 2016 05:02:35 -0800 (PST) Received: from ards-macbook-pro.access.network ([193.57.185.11]) by smtp.gmail.com with ESMTPSA id e188sm6084212wma.21.2016.11.12.05.02.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Nov 2016 05:02:34 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Cc: Ard Biesheuvel Date: Sat, 12 Nov 2016 14:02:28 +0100 Message-Id: <1478955748-14819-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478955748-14819-1-git-send-email-ard.biesheuvel@linaro.org> References: <1478955748-14819-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [PATCH v2 4/4] ArmPkg/ArmDmaLib: add support for fixed host-to-device DMA offset 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: Sat, 12 Nov 2016 13:02:33 -0000 Some devices, such as the Raspberry Pi3, have a fixed offset between memory addresses as seen by the host and as seen by the other bus masters. So add a new PCD that allows this fixed offset to be recorded, and to be used when returning device addresses from the DmaLib mapping routines. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dec | 8 ++++++++ ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 20 ++++++++++++++++++-- ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 3cdb5da3d4f3..090ed9951366 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -134,6 +134,14 @@ [PcdsFixedAtBuild.common] gArmTokenSpaceGuid.PcdFdSize|0|UINT32|0x0000002C gArmTokenSpaceGuid.PcdFvSize|0|UINT32|0x0000002E + # + # Value to add to a host address to obtain a device address, using + # unsigned 64-bit integer arithmetic on both ARM and AArch64. This + # means we can rely on truncation on overflow to specify negative + # offsets. + # + gArmTokenSpaceGuid.PcdArmDmaDeviceOffset|0x0|UINT64|0x0000044 + [PcdsFixedAtBuild.common, PcdsPatchableInModule.common] gArmTokenSpaceGuid.PcdFdBaseAddress|0|UINT64|0x0000002B gArmTokenSpaceGuid.PcdFvBaseAddress|0|UINT64|0x0000002D diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c index 7321388de63e..1de4a6e5b04f 100644 --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c @@ -37,6 +37,15 @@ typedef struct { STATIC EFI_CPU_ARCH_PROTOCOL *mCpu; +STATIC +PHYSICAL_ADDRESS +HostToDeviceAddress ( + IN PHYSICAL_ADDRESS HostAddress + ) +{ + return HostAddress + PcdGet64 (PcdArmDmaDeviceOffset); +} + /** Provides the DMA controller-specific addresses needed to access system memory. @@ -80,7 +89,14 @@ DmaMap ( return EFI_INVALID_PARAMETER; } - *DeviceAddress = ConvertToPhysicalAddress (HostAddress); + // + // The debug implementation of UncachedMemoryAllocationLib in ArmPkg returns + // a virtual uncached alias, and unmaps the cached ID mapping of the buffer, + // in order to catch inadvertent references to the cached mapping. + // Since HostToDeviceAddress () expects ID mapped input addresses, convert + // the host address to an ID mapped address first. + // + *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress (HostAddress)); // Remember range so we can flush on the other side Map = AllocatePool (sizeof (MAP_INFO_INSTANCE)); @@ -127,7 +143,7 @@ DmaMap ( CopyMem (Buffer, HostAddress, *NumberOfBytes); } - *DeviceAddress = ConvertToPhysicalAddress ((UINTN)Buffer); + *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress ((UINTN)Buffer)); Map->BufferAddress = Buffer; } else { Map->DoubleBuffer = FALSE; diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf index 31de3cfd828c..9b7dad114b18 100644 --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf @@ -44,6 +44,7 @@ [Protocols] [Guids] [Pcd] + gArmTokenSpaceGuid.PcdArmDmaDeviceOffset [Depex] gEfiCpuArchProtocolGuid -- 2.7.4