]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ARM/keystone: move the DMA offset handling under ifdef CONFIG_ARM_LPAE
authorChristoph Hellwig <hch@lst.de>
Tue, 8 Sep 2020 17:24:00 +0000 (19:24 +0200)
committerChristoph Hellwig <hch@lst.de>
Thu, 17 Sep 2020 16:43:24 +0000 (18:43 +0200)
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

index 638808c4e12247fa19849b1e1b5480f63bae62cb..dcd031ba84c2e0b160bd4fe43c7b46d62af02333 100644 (file)
@@ -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();
 }