Commit eff380aa authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Introduce ice_base.c 



Remove a few uses of kernel configuration flags from ice_lib.c by
introducing a new source file ice_base.c. Also move corresponding
function prototypes from ice_lib.h to ice_base.h and include ice_base.h
where required.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1574cf83

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ ice-y := ice_main.o \ 
	 ice_nvm.o	\

	 ice_switch.o	\

	 ice_sched.o	\

	 ice_base.o	\

	 ice_lib.o	\

	 ice_txrx.o	\

	 ice_flex_pipe.o	\

drivers/net/ethernet/intel/ice/ice.h

+8 −0
Original line number Diff line number Diff line
@@ -127,6 +127,14 @@ extern const char ice_drv_ver[]; 
				     ICE_PROMISC_VLAN_TX  | \

				     ICE_PROMISC_VLAN_RX)



struct ice_txq_meta {

	u32 q_teid;	/* Tx-scheduler element identifier */

	u16 q_id;	/* Entry in VSI's txq_map bitmap */

	u16 q_handle;	/* Relative index of Tx queue within TC */

	u16 vsi_idx;	/* VSI index that Tx queue belongs to */

	u8 tc;		/* TC number that Tx queue belongs to */

};



struct ice_tc_info {

	u16 qoffset;

	u16 qcount_tx;

drivers/net/ethernet/intel/ice/ice_base.c

0 → 100644
+767 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ice/ice_base.h

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

/* Copyright (c) 2019, Intel Corporation. */



#ifndef _ICE_BASE_H_

#define _ICE_BASE_H_



#include "ice.h"



int ice_setup_rx_ctx(struct ice_ring *ring);

int __ice_vsi_get_qs(struct ice_qs_cfg *qs_cfg);

int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx);

int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi);

void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi);

void ice_vsi_free_q_vectors(struct ice_vsi *vsi);

int

ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring, u16 tc_q_idx,

		struct ice_aqc_add_tx_qgrp *qg_buf, u8 tc);

void ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector);

void

ice_cfg_txq_interrupt(struct ice_vsi *vsi, u16 txq, u16 msix_idx, u16 itr_idx);

void

ice_cfg_rxq_interrupt(struct ice_vsi *vsi, u16 rxq, u16 msix_idx, u16 itr_idx);

void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector);

int

ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,

		     u16 rel_vmvf_num, struct ice_ring *ring,

		     struct ice_txq_meta *txq_meta);

void

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_ring *ring,

		  struct ice_txq_meta *txq_meta);

#endif /* _ICE_BASE_H_ */

drivers/net/ethernet/intel/ice/ice_dcb_lib.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#define _ICE_DCB_LIB_H_



#include "ice.h"

#include "ice_base.h"

#include "ice_lib.h"



#ifdef CONFIG_DCB

CRA Git | Maintained and supported by SUSTech CRA and CCSE