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

i40e: Move memory allocation structures to i40e_alloc.h 



Structures i40e_dma_mem & i40e_virt_mem are defined i40e_osdep.h while
memory allocation functions that use them are declared in i40e_alloc.h
Move them there.

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 d3276f92

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

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#ifndef _I40E_ADMINQ_H_

#define _I40E_ADMINQ_H_



#include "i40e_alloc.h"

#include "i40e_osdep.h"

#include "i40e_adminq_cmd.h"

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

+14 −0
Original line number Diff line number Diff line
@@ -4,8 +4,22 @@ 
#ifndef _I40E_ALLOC_H_

#define _I40E_ALLOC_H_



#include <linux/types.h>



struct i40e_hw;



/* memory allocation tracking */

struct i40e_dma_mem {

	void *va;

	dma_addr_t pa;

	u32 size;

};



struct i40e_virt_mem {

	void *va;

	u32 size;

};



/* prototype for functions used for dynamic memory allocation */

int i40e_allocate_dma_mem(struct i40e_hw *hw,

			  struct i40e_dma_mem *mem,

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

+0 −12
Original line number Diff line number Diff line
@@ -29,18 +29,6 @@ struct device *i40e_hw_to_dev(struct i40e_hw *hw); 
#define rd64(a, reg)		readq((a)->hw_addr + (reg))

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



/* memory allocation tracking */

struct i40e_dma_mem {

	void *va;

	dma_addr_t pa;

	u32 size;

};



struct i40e_virt_mem {

	void *va;

	u32 size;

};



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

do {								\

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