On 09/24/2010 09:08 AM, Sergei Shtylyov wrote:
Hello.
David Daney wrote:
This allows platforms that are using the swiotlb to initialize it.
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
---
arch/mips/include/asm/bootinfo.h | 5 +++++
arch/mips/kernel/setup.c | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/mips/include/asm/bootinfo.h
b/arch/mips/include/asm/bootinfo.h
index 15a8ef0..b3cf989 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -125,4 +125,9 @@ extern unsigned long fw_arg0, fw_arg1, fw_arg2,
fw_arg3;
*/
extern void plat_mem_setup(void);
+/*
+ * Optional platform hook to call swiotlb_setup().
+ */
+extern void plat_swiotlb_setup(void);
+
#endif /* _ASM_BOOTINFO_H */
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 85aef3f..8b650da 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -488,6 +488,11 @@ static void __init arch_mem_init(char **cmdline_p)
bootmem_init();
sparse_init();
+
+#ifdef CONFIG_SWIOTLB
+ plat_swiotlb_setup();
+#endif
We should avoid #ifdef's in function bodies. Why not defile an empty
'inline' in the header above if CONFIG_SWIOTLB is not defined?
Good idea. I will wait several days and collect any more feedback and
generate a new patch set.
David Daney
