Commit d720e641 authored Aug 20, 2019 by Robin Murphy Committed by Will Deacon Aug 20, 2019

iommu/arm-smmu: Ensure 64-bit I/O accessors are available on 32-bit CPU



As part of the grand SMMU driver refactoring effort, the I/O register
accessors were moved into 'arm-smmu.h' in commit 6d7dff62
("iommu/arm-smmu: Move Secure access quirk to implementation").

On 32-bit architectures (such as ARM), the 64-bit accessors are defined
in 'linux/io-64-nonatomic-hi-lo.h', so include this header to fix the
build.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>

parent 4b67f1dd

drivers/iommu/arm-smmu.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		#include <linux/err.h>
		#include <linux/interrupt.h>
		#include <linux/io.h>
		#include <linux/io-64-nonatomic-hi-lo.h>
		#include <linux/iopoll.h>
		#include <linux/init.h>
		#include <linux/moduleparam.h>

drivers/iommu/arm-smmu.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		#include <linux/bits.h>
		#include <linux/clk.h>
		#include <linux/device.h>
		#include <linux/io-64-nonatomic-hi-lo.h>
		#include <linux/io-pgtable.h>
		#include <linux/iommu.h>
		#include <linux/mutex.h>

Admin message