From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org,
Russell King <linux@armlinux.org.uk>,
Santosh Shilimkar <ssantosh@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ohad Ben-Cohen <ohad@wizery.com>,
devicetree@vger.kernel.org,
Florian Fainelli <f.fainelli@gmail.com>,
linux-sh@vger.kernel.org, Frank Rowand <frowand.list@gmail.com>,
linux-usb@vger.kernel.org, linux-remoteproc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Bjorn Andersson <bjorn.andersson@linaro.org>,
linux-acpi@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
Jim Quinlan <james.quinlan@broadcom.com>,
linux-pci@vger.kernel.org,
Nathan Chancellor <natechancellor@gmail.com>,
Robin Murphy <robin.murphy@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/6] ARM/keystone: move the DMA offset handling under ifdef CONFIG_ARM_LPAE
Date: Mon, 14 Sep 2020 09:33:41 +0200 [thread overview]
Message-ID: <20200914073343.1579578-5-hch@lst.de> (raw)
In-Reply-To: <20200914073343.1579578-1-hch@lst.de>
The DMA offset notifier can only be used if PHYS_OFFSET is at least
KEYSTONE_HIGH_PHYS_START, which can't be represented by a 32-bit
phys_addr_t. Currently the code compiles fine despite that, a pending
change to the DMA offset handling would create a compiler warning for
this case. Add an ifdef to not compile the code except for LPAE
configs.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
---
arch/arm/mach-keystone/keystone.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 638808c4e12247..dcd031ba84c2e0 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -24,6 +24,7 @@
#include "keystone.h"
+#ifdef CONFIG_ARM_LPAE
static unsigned long keystone_dma_pfn_offset __read_mostly;
static int keystone_platform_notifier(struct notifier_block *nb,
@@ -48,14 +49,17 @@ static int keystone_platform_notifier(struct notifier_block *nb,
static struct notifier_block platform_nb = {
.notifier_call = keystone_platform_notifier,
};
+#endif /* CONFIG_ARM_LPAE */
static void __init keystone_init(void)
{
+#ifdef CONFIG_ARM_LPAE
if (PHYS_OFFSET >= KEYSTONE_HIGH_PHYS_START) {
keystone_dma_pfn_offset = PFN_DOWN(KEYSTONE_HIGH_PHYS_START -
KEYSTONE_LOW_PHYS_START);
bus_register_notifier(&platform_bus_type, &platform_nb);
}
+#endif
keystone_pm_runtime_init();
}
--
2.28.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-14 7:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 7:33 support range based offsets in dma-direct v2 Christoph Hellwig
2020-09-14 7:33 ` [PATCH 1/6] ARM/dma-mapping: remove a __arch_page_to_dma #error Christoph Hellwig
2020-09-14 7:33 ` [PATCH 2/6] ARM/dma-mapping: remove dma_to_virt Christoph Hellwig
2020-09-14 7:33 ` [PATCH 3/6] ARM/dma-mapping: move various helpers from dma-mapping.h to dma-direct.h Christoph Hellwig
2020-09-14 7:33 ` Christoph Hellwig [this message]
2020-09-14 7:33 ` [PATCH 5/6] usb: don't inherity DMA properties for USB devices Christoph Hellwig
2020-09-14 7:51 ` Greg Kroah-Hartman
2020-09-14 7:33 ` [PATCH 6/6] dma-mapping: introduce DMA range map, supplanting dma_pfn_offset Christoph Hellwig
2020-09-14 23:01 ` Mathieu Poirier
2020-09-15 5:41 ` Christoph Hellwig
2020-09-15 19:55 ` Mathieu Poirier
2020-09-16 6:13 ` Christoph Hellwig
2020-09-16 6:14 support range based offsets in dma-direct v3 Christoph Hellwig
2020-09-16 6:14 ` [PATCH 4/6] ARM/keystone: move the DMA offset handling under ifdef CONFIG_ARM_LPAE Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200914073343.1579578-5-hch@lst.de \
--to=hch@lst.de \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=iommu@lists.linux-foundation.org \
--cc=james.quinlan@broadcom.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=natechancellor@gmail.com \
--cc=ohad@wizery.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=ssantosh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).