Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 171a9bae authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by David S. Miller
Browse files

staging/octeon: Allow test build on !MIPS 



Add compile test support by moving all includes of files under
asm/octeon into octeon-ethernet.h, and if we're not on MIPS,
stub out all the calls into the octeon support code in octeon-stubs.h

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c51ab067

drivers/staging/octeon/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config OCTEON_ETHERNET

	tristate "Cavium Networks Octeon Ethernet support"

	depends on CAVIUM_OCTEON_SOC && NETDEVICES

	depends on CAVIUM_OCTEON_SOC && NETDEVICES || COMPILE_TEST

	select PHYLIB

	select MDIO_OCTEON

	help

drivers/staging/octeon/ethernet-defines.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#ifndef __ETHERNET_DEFINES_H__

#define __ETHERNET_DEFINES_H__



#include <asm/octeon/cvmx-config.h>



#ifdef CONFIG_NETFILTER

#define REUSE_SKBUFFS_WITHOUT_FREE  0

#else

drivers/staging/octeon/ethernet-mdio.c

+1 −5
Original line number Diff line number Diff line
@@ -13,15 +13,11 @@ 
#include <generated/utsrelease.h>

#include <net/dst.h>



#include <asm/octeon/octeon.h>



#include "ethernet-defines.h"

#include "octeon-ethernet.h"

#include "ethernet-defines.h"

#include "ethernet-mdio.h"

#include "ethernet-util.h"



#include <asm/octeon/cvmx-gmxx-defs.h>



static void cvm_oct_get_drvinfo(struct net_device *dev,

				struct ethtool_drvinfo *info)

{

drivers/staging/octeon/ethernet-mem.c

+1 −4
Original line number Diff line number Diff line
@@ -9,13 +9,10 @@ 
#include <linux/netdevice.h>

#include <linux/slab.h>



#include <asm/octeon/octeon.h>



#include "octeon-ethernet.h"

#include "ethernet-mem.h"

#include "ethernet-defines.h"



#include <asm/octeon/cvmx-fpa.h>



/**

 * cvm_oct_fill_hw_skbuff - fill the supplied hardware pool with skbuffs

 * @pool:     Pool to allocate an skbuff for

drivers/staging/octeon/ethernet-rgmii.c

+1 −9
Original line number Diff line number Diff line
@@ -12,19 +12,11 @@ 
#include <linux/ratelimit.h>

#include <net/dst.h>



#include <asm/octeon/octeon.h>



#include "ethernet-defines.h"

#include "octeon-ethernet.h"

#include "ethernet-defines.h"

#include "ethernet-util.h"

#include "ethernet-mdio.h"



#include <asm/octeon/cvmx-helper.h>



#include <asm/octeon/cvmx-ipd-defs.h>

#include <asm/octeon/cvmx-npi-defs.h>

#include <asm/octeon/cvmx-gmxx-defs.h>



static DEFINE_SPINLOCK(global_register_lock);



static void cvm_oct_set_hw_preamble(struct octeon_ethernet *priv, bool enable)