The patch titled
swiotlb: use iommu_is_span_boundary helper function
has been added to the -mm tree. Its filename is
swiotlb-use-iommu_is_span_boundary-helper-function.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: swiotlb: use iommu_is_span_boundary helper function
From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
iommu_is_span_boundary in lib/iommu-helper.c was exported for PARISC IOMMUs
(commit 3715863aa142c4f4c5208f5f3e5e9bac06006d2f). SWIOTLB can use it instead
of the homegrown function.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/ia64/Kconfig | 5 ++++-
arch/x86/Kconfig | 5 ++---
lib/swiotlb.c | 14 +++-----------
3 files changed, 9 insertions(+), 15 deletions(-)
diff -puN arch/ia64/Kconfig~swiotlb-use-iommu_is_span_boundary-helper-function arch/ia64/Kconfig
--- a/arch/ia64/Kconfig~swiotlb-use-iommu_is_span_boundary-helper-function
+++ a/arch/ia64/Kconfig
@@ -46,6 +46,9 @@ config MMU
config SWIOTLB
bool
+config IOMMU_HELPER
+ bool
+
config GENERIC_LOCKBREAK
bool
default y
@@ -623,7 +626,7 @@ config IRQ_PER_CPU
default y
config IOMMU_HELPER
- def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC)
+ def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
source "arch/ia64/hp/sim/Kconfig"
diff -puN arch/x86/Kconfig~swiotlb-use-iommu_is_span_boundary-helper-function arch/x86/Kconfig
--- a/arch/x86/Kconfig~swiotlb-use-iommu_is_span_boundary-helper-function
+++ a/arch/x86/Kconfig
@@ -496,9 +496,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
Calgary anyway, pass 'iommu=calgary' on the kernel command line.
If unsure, say Y.
-config IOMMU_HELPER
- def_bool (CALGARY_IOMMU || GART_IOMMU)
-
# need this always selected by IOMMU for the VIA workaround
config SWIOTLB
bool
@@ -509,6 +506,8 @@ config SWIOTLB
access 32-bits of memory can be used on systems with more than
3 GB of memory. If unsure, say Y.
+config IOMMU_HELPER
+ def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
config NR_CPUS
int "Maximum number of CPUs (2-255)"
diff -puN lib/swiotlb.c~swiotlb-use-iommu_is_span_boundary-helper-function lib/swiotlb.c
--- a/lib/swiotlb.c~swiotlb-use-iommu_is_span_boundary-helper-function
+++ a/lib/swiotlb.c
@@ -31,6 +31,7 @@
#include <linux/init.h>
#include <linux/bootmem.h>
+#include <linux/iommu-helper.h>
#define OFFSET(val,align) ((unsigned long) \
( (val) & ( (align) - 1)))
@@ -282,15 +283,6 @@ address_needs_mapping(struct device *hwd
return (addr & ~mask) != 0;
}
-static inline unsigned int is_span_boundary(unsigned int index,
- unsigned int nslots,
- unsigned long offset_slots,
- unsigned long max_slots)
-{
- unsigned long offset = (offset_slots + index) & (max_slots - 1);
- return offset + nslots > max_slots;
-}
-
/*
* Allocates bounce buffer and returns its kernel virtual address.
*/
@@ -338,8 +330,8 @@ map_single(struct device *hwdev, char *b
wrap = index;
do {
- while (is_span_boundary(index, nslots, offset_slots,
- max_slots)) {
+ while (iommu_is_span_boundary(index, nslots, offset_slots,
+ max_slots)) {
index += stride;
if (index >= io_tlb_nslabs)
index = 0;
_
Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are
origin.patch
ia64-make-iommu-respect-the-segment-boundary-limits.patch
git-scsi-misc.patch
lib-swiotlbc-avoid-endless-loops-fix.patch
lib-swiotlbc-cleanups.patch
swiotlb-use-iommu_is_span_boundary-helper-function.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
