mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

i40e: Move memory allocation structures to i40e_alloc.h 

[ Upstream commit ef5d54078d ]

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: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Stable-dep-of: 6dbdd4de03 ("e1000e: Workaround for sporadic MDI error on Meteor Lake systems")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ivan Vecera 2023-09-27 10:31:32 +02:00 committed by Greg Kroah-Hartman
parent 0ed115020a
commit 2ee5326d32
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/intel/i40e/i40e_adminq.h
View File

@ -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"

14
drivers/net/ethernet/intel/i40e/i40e_alloc.h
View File

@ -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,

12
drivers/net/ethernet/intel/i40e/i40e_osdep.h
View File

@ -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)) \