These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / bus / mips_cdmm.c

diff --git a/kernel/drivers/bus/mips_cdmm.c b/kernel/drivers/bus/mips_cdmm.c
index ab3bde1..1c543ef 100644 (file)
--- a/kernel/drivers/bus/mips_cdmm.c
+++ b/kernel/drivers/bus/mips_cdmm.c
@@ -331,6 +331,18 @@ static phys_addr_t mips_cdmm_cur_base(void)
                << MIPS_CDMMBASE_ADDR_START;
 }
 
+/**
+ * mips_cdmm_phys_base() - Choose a physical base address for CDMM region.
+ *
+ * Picking a suitable physical address at which to map the CDMM region is
+ * platform specific, so this weak function can be overridden by platform
+ * code to pick a suitable value if none is configured by the bootloader.
+ */
+phys_addr_t __weak mips_cdmm_phys_base(void)
+{
+       return 0;
+}
+
 /**
  * mips_cdmm_setup() - Ensure the CDMM bus is initialised and usable.
  * @bus:       Pointer to bus information for current CPU.
@@ -368,7 +380,7 @@ static int mips_cdmm_setup(struct mips_cdmm_bus *bus)
        if (!bus->phys)
                bus->phys = mips_cdmm_cur_base();
        /* Otherwise, ask platform code for suggestions */
-       if (!bus->phys && mips_cdmm_phys_base)
+       if (!bus->phys)
                bus->phys = mips_cdmm_phys_base();
        /* Otherwise, copy what other CPUs have done */
        if (!bus->phys)