Merge tag 'mips_fixes_4.20_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips...

Pull MIPS fixes from Paul Burton:
 "A couple of MIPS fixes that should have ideally made it for v4.19, but
  hey-ho here they are now:

   - A fix for potential poor stack placement introduced in v4.19-rc8.

   - A fix for a warning introduced in use of TURBOchannel devices by
     DMA changes in v4.16"

* tag 'mips_fixes_4.20_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: VDSO: Reduce VDSO_RANDOMIZE_SIZE to 64MB for 64bit
  TC: Set DMA masks for devices

diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h
index 49d6046ca1d0c1661403111519478666964f5a16..c373eb605040246ad67e332f72bc6de8aee0dfa8 100644 (file)
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -81,7 +81,7 @@ extern unsigned int vced_count, vcei_count;
 
 #endif
 
-#define VDSO_RANDOMIZE_SIZE    (TASK_IS_32BIT_ADDR ? SZ_1M : SZ_256M)
+#define VDSO_RANDOMIZE_SIZE    (TASK_IS_32BIT_ADDR ? SZ_1M : SZ_64M)
 
 extern unsigned long mips_stack_top(void);
 #define STACK_TOP              mips_stack_top()

diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c
index 3be9519654e51018032623561a9a0b78f952ea7b..cf3fad2cb87140b810f094d390df69f51e8e3aff 100644 (file)
--- a/drivers/tc/tc.c
+++ b/drivers/tc/tc.c
@@ -2,7 +2,7 @@
  *     TURBOchannel bus services.
  *
  *     Copyright (c) Harald Koerfgen, 1998
- *     Copyright (c) 2001, 2003, 2005, 2006  Maciej W. Rozycki
+ *     Copyright (c) 2001, 2003, 2005, 2006, 2018  Maciej W. Rozycki
  *     Copyright (c) 2005  James Simmons
  *
  *     This file is subject to the terms and conditions of the GNU
@@ -10,6 +10,7 @@
  *     directory of this archive for more details.
  */
 #include <linux/compiler.h>
+#include <linux/dma-mapping.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
@@ -92,6 +93,11 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
                tdev->dev.bus = &tc_bus_type;
                tdev->slot = slot;
 
+               /* TURBOchannel has 34-bit DMA addressing (16GiB space). */
+               tdev->dma_mask = DMA_BIT_MASK(34);
+               tdev->dev.dma_mask = &tdev->dma_mask;
+               tdev->dev.coherent_dma_mask = DMA_BIT_MASK(34);
+
                for (i = 0; i < 8; i++) {
                        tdev->firmware[i] =
                                readb(module + offset + TC_FIRM_VER + 4 * i);

diff --git a/include/linux/tc.h b/include/linux/tc.h
index f92511e57cdbb6e4193be7e3061eca0f21dfeaca..a60639f37963999ef11c6dff9ac59487a94ca7c8 100644 (file)
--- a/include/linux/tc.h
+++ b/include/linux/tc.h
@@ -84,6 +84,7 @@ struct tc_dev {
                                           device. */
        struct device   dev;            /* Generic device interface. */
        struct resource resource;       /* Address space of this device. */
+       u64             dma_mask;       /* DMA addressable range. */
        char            vendor[9];
        char            name[9];
        char            firmware[9];