Commit 17a29fea authored by Paul Burton's avatar Paul Burton Committed by Greg Kroah-Hartman

staging/octeon: Use stubs for MIPS && !CAVIUM_OCTEON_SOC

When building for a non-Cavium MIPS system with COMPILE_TEST=y, the
Octeon ethernet driver hits a number of issues due to use of macros
provided only for CONFIG_CAVIUM_OCTEON_SOC=y configurations. For
example:

  drivers/staging/octeon/ethernet-rx.c:190:6: error:
    'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared (first use in this function)
  drivers/staging/octeon/ethernet-rx.c:472:25: error:
    'OCTEON_IRQ_WORKQ0' undeclared (first use in this function)

These come from various asm/ headers that a non-Octeon build will be
using a non-Octeon version of.

Fix this by using the octeon-stubs.h header for non-Cavium MIPS builds,
and only using the real asm/octeon/ headers when building a Cavium
Octeon kernel configuration.

This requires that octeon-stubs.h doesn't redefine XKPHYS_TO_PHYS, which
is defined for MIPS by asm/addrspace.h which is pulled in by many other
common asm/ headers.
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
URL: https://lore.kernel.org/linux-mips/CAMuHMdXvu+BppwzsU9imNWVKea_hoLcRt9N+a29Q-QsjW=ip2g@mail.gmail.com/
Fixes: 171a9bae ("staging/octeon: Allow test build on !MIPS")
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: David S. Miller <davem@davemloft.net>

Link: https://lore.kernel.org/r/20191007231741.2012860-1-paul.burton@mips.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a30b30f0
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/phy.h> #include <linux/phy.h>
#ifdef CONFIG_MIPS #ifdef CONFIG_CAVIUM_OCTEON_SOC
#include <asm/octeon/octeon.h> #include <asm/octeon/octeon.h>
......
#define CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE 512 #define CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE 512
#define XKPHYS_TO_PHYS(p) (p)
#ifndef XKPHYS_TO_PHYS
# define XKPHYS_TO_PHYS(p) (p)
#endif
#define OCTEON_IRQ_WORKQ0 0 #define OCTEON_IRQ_WORKQ0 0
#define OCTEON_IRQ_RML 0 #define OCTEON_IRQ_RML 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment