queue-6.6/i40e-move-memory-allocation-structures-to-i40e_alloc.patch

   1 From 009f4bbd248ed1e348f220e159ca859288a8a5a7 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 27 Sep 2023 10:31:32 +0200
   4 Subject: i40e: Move memory allocation structures to i40e_alloc.h
   5
   6 From: Ivan Vecera <ivecera@redhat.com>
   7
   8 [ Upstream commit ef5d54078d451973f90e123fafa23fc95c2a08ae ]
   9
  10 Structures i40e_dma_mem & i40e_virt_mem are defined i40e_osdep.h while
  11 memory allocation functions that use them are declared in i40e_alloc.h
  12 Move them there.
  13
  14 Signed-off-by: Ivan Vecera <ivecera@redhat.com>
  15 Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
  16 Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
  17 Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
  18 Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
  19 Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
  20 Stable-dep-of: 6dbdd4de0362 ("e1000e: Workaround for sporadic MDI error on Meteor Lake systems")
  21 Signed-off-by: Sasha Levin <sashal@kernel.org>
  22 ---
  23  drivers/net/ethernet/intel/i40e/i40e_adminq.h |  1 +
  24  drivers/net/ethernet/intel/i40e/i40e_alloc.h  | 14 ++++++++++++++
  25  drivers/net/ethernet/intel/i40e/i40e_osdep.h  | 12 ------------
  26  3 files changed, 15 insertions(+), 12 deletions(-)
  27
  28 diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.h b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
  29 index 267f2e0a21ce8..1c3d2bc5c3f79 100644
  30 --- a/drivers/net/ethernet/intel/i40e/i40e_adminq.h
  31 +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
  32 @@ -4,6 +4,7 @@
  33  #ifndef _I40E_ADMINQ_H_
  34  #define _I40E_ADMINQ_H_
  35
  36 +#include "i40e_alloc.h"
  37  #include "i40e_osdep.h"
  38  #include "i40e_adminq_cmd.h"
  39
  40 diff --git a/drivers/net/ethernet/intel/i40e/i40e_alloc.h b/drivers/net/ethernet/intel/i40e/i40e_alloc.h
  41 index 4b2d8da048c64..e0dde326255d6 100644
  42 --- a/drivers/net/ethernet/intel/i40e/i40e_alloc.h
  43 +++ b/drivers/net/ethernet/intel/i40e/i40e_alloc.h
  44 @@ -4,8 +4,22 @@
  45  #ifndef _I40E_ALLOC_H_
  46  #define _I40E_ALLOC_H_
  47
  48 +#include <linux/types.h>
  49 +
  50  struct i40e_hw;
  51
  52 +/* memory allocation tracking */
  53 +struct i40e_dma_mem {
  54 +       void *va;
  55 +       dma_addr_t pa;
  56 +       u32 size;
  57 +};
  58 +
  59 +struct i40e_virt_mem {
  60 +       void *va;
  61 +       u32 size;
  62 +};
  63 +
  64  /* prototype for functions used for dynamic memory allocation */
  65  int i40e_allocate_dma_mem(struct i40e_hw *hw,
  66                           struct i40e_dma_mem *mem,
  67 diff --git a/drivers/net/ethernet/intel/i40e/i40e_osdep.h b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
  68 index 70cac3bb31ec3..fd18895cfb56b 100644
  69 --- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h
  70 +++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h
  71 @@ -29,18 +29,6 @@ struct device *i40e_hw_to_dev(struct i40e_hw *hw);
  72  #define rd64(a, reg)           readq((a)->hw_addr + (reg))
  73  #define i40e_flush(a)          readl((a)->hw_addr + I40E_GLGEN_STAT)
  74
  75 -/* memory allocation tracking */
  76 -struct i40e_dma_mem {
  77 -       void *va;
  78 -       dma_addr_t pa;
  79 -       u32 size;
  80 -};
  81 -
  82 -struct i40e_virt_mem {
  83 -       void *va;
  84 -       u32 size;
  85 -};
  86 -
  87  #define i40e_debug(h, m, s, ...)                               \
  88  do {                                                           \
  89         if (((m) & (h)->debug_mask))                            \
  90 --
  91 2.43.0
  92