Commit 5dfd37c3 authored by Ivan Vecera's avatar Ivan Vecera Committed by Tony Nguyen
Browse files

i40e: Split i40e_osdep.h 



Header i40e_osdep.h contains only IO primitives and couple of debug
printing macros. Split this header file to i40e_io.h and i40e_debug.h
and move i40e_debug_mask enum to i40e_debug.h

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent ef5d5407

drivers/net/ethernet/intel/i40e/i40e_adminq.h

+1 −1
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#ifndef _I40E_ADMINQ_H_

#define _I40E_ADMINQ_H_



#include <linux/mutex.h>

#include "i40e_alloc.h"

#include "i40e_osdep.h"

#include "i40e_adminq_cmd.h"



#define I40E_ADMINQ_DESC(R, i)   \

drivers/net/ethernet/intel/i40e/i40e_debug.h

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 2023 Intel Corporation. */



#ifndef _I40E_DEBUG_H_

#define _I40E_DEBUG_H_



#include <linux/dev_printk.h>



/* debug masks - set these bits in hw->debug_mask to control output */

enum i40e_debug_mask {

	I40E_DEBUG_INIT			= 0x00000001,

	I40E_DEBUG_RELEASE		= 0x00000002,



	I40E_DEBUG_LINK			= 0x00000010,

	I40E_DEBUG_PHY			= 0x00000020,

	I40E_DEBUG_HMC			= 0x00000040,

	I40E_DEBUG_NVM			= 0x00000080,

	I40E_DEBUG_LAN			= 0x00000100,

	I40E_DEBUG_FLOW			= 0x00000200,

	I40E_DEBUG_DCB			= 0x00000400,

	I40E_DEBUG_DIAG			= 0x00000800,

	I40E_DEBUG_FD			= 0x00001000,

	I40E_DEBUG_PACKAGE		= 0x00002000,

	I40E_DEBUG_IWARP		= 0x00F00000,

	I40E_DEBUG_AQ_MESSAGE		= 0x01000000,

	I40E_DEBUG_AQ_DESCRIPTOR	= 0x02000000,

	I40E_DEBUG_AQ_DESC_BUFFER	= 0x04000000,

	I40E_DEBUG_AQ_COMMAND		= 0x06000000,

	I40E_DEBUG_AQ			= 0x0F000000,



	I40E_DEBUG_USER			= 0xF0000000,



	I40E_DEBUG_ALL			= 0xFFFFFFFF

};



struct i40e_hw;

struct device *i40e_hw_to_dev(struct i40e_hw *hw);



#define hw_dbg(hw, S, A...) dev_dbg(i40e_hw_to_dev(hw), S, ##A)



#define i40e_debug(h, m, s, ...)				\

do {								\

	if (((m) & (h)->debug_mask))				\

		dev_info(i40e_hw_to_dev(hw), s, ##__VA_ARGS__);	\

} while (0)



#endif /* _I40E_DEBUG_H_ */

drivers/net/ethernet/intel/i40e/i40e_hmc.c

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
/* Copyright(c) 2013 - 2018 Intel Corporation. */



#include "i40e.h"

#include "i40e_osdep.h"

#include "i40e_register.h"

#include "i40e_alloc.h"

#include "i40e_hmc.h"

drivers/net/ethernet/intel/i40e/i40e_osdep.h→drivers/net/ethernet/intel/i40e/i40e_io.h

+16 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2023 Intel Corporation. */



#ifndef _I40E_OSDEP_H_

#define _I40E_OSDEP_H_



#include <linux/types.h>

#include <linux/if_ether.h>

#include <linux/if_vlan.h>

#include <linux/tcp.h>

#include <linux/pci.h>

#include <linux/highuid.h>

#ifndef _I40E_IO_H_

#define _I40E_IO_H_



/* get readq/writeq support for 32 bit kernels, use the low-first version */

#include <linux/io-64-nonatomic-lo-hi.h>



/* File to be the magic between shared code and

 * actual OS primitives

 */



struct i40e_hw;

struct device *i40e_hw_to_dev(struct i40e_hw *hw);



#define hw_dbg(hw, S, A...) dev_dbg(i40e_hw_to_dev(hw), S, ##A)



#define wr32(a, reg, value)	writel((value), ((a)->hw_addr + (reg)))

#define rd32(a, reg)		readl((a)->hw_addr + (reg))



#define rd64(a, reg)		readq((a)->hw_addr + (reg))

#define i40e_flush(a)		readl((a)->hw_addr + I40E_GLGEN_STAT)



#define i40e_debug(h, m, s, ...)				\

do {								\

	if (((m) & (h)->debug_mask))				\

		pr_info("i40e %02x:%02x.%x " s,			\

			(h)->bus.bus_id, (h)->bus.device,	\

			(h)->bus.func, ##__VA_ARGS__);		\

} while (0)



#endif /* _I40E_OSDEP_H_ */
 
#endif /* _I40E_IO_H_ */

drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
/* Copyright(c) 2013 - 2018 Intel Corporation. */



#include "i40e.h"

#include "i40e_osdep.h"

#include "i40e_register.h"

#include "i40e_type.h"

#include "i40e_hmc.h"