releases/6.6.26/intel-add-bit-macro-includes-where-needed.patch

   1 From d3bf104e6f519a33ed764aea8e720da8fe332bd4 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Tue, 5 Dec 2023 17:01:01 -0800
   4 Subject: intel: add bit macro includes where needed
   5
   6 From: Jesse Brandeburg <jesse.brandeburg@intel.com>
   7
   8 [ Upstream commit 3314f2097dee43defc20554f961a8b17f4787e2d ]
   9
  10 This series is introducing the use of FIELD_GET and FIELD_PREP which
  11 requires bitfield.h to be included. Fix all the includes in this one
  12 change, and rearrange includes into alphabetical order to ease
  13 readability and future maintenance.
  14
  15 virtchnl.h and it's usage was modified to have it's own includes as it
  16 should. This required including bits.h for virtchnl.h.
  17
  18 Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
  19 Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
  20 Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
  21 Stable-dep-of: 6dbdd4de0362 ("e1000e: Workaround for sporadic MDI error on Meteor Lake systems")
  22 Signed-off-by: Sasha Levin <sashal@kernel.org>
  23 ---
  24  drivers/net/ethernet/intel/e1000/e1000_hw.c   |  1 +
  25  drivers/net/ethernet/intel/fm10k/fm10k_pf.c   |  1 +
  26  drivers/net/ethernet/intel/fm10k/fm10k_vf.c   |  1 +
  27  drivers/net/ethernet/intel/i40e/i40e_common.c |  1 +
  28  drivers/net/ethernet/intel/i40e/i40e_dcb.c    |  2 ++
  29  drivers/net/ethernet/intel/i40e/i40e_nvm.c    |  1 +
  30  drivers/net/ethernet/intel/iavf/iavf_common.c |  3 +-
  31  .../net/ethernet/intel/iavf/iavf_ethtool.c    |  5 ++--
  32  drivers/net/ethernet/intel/iavf/iavf_fdir.c   |  1 +
  33  drivers/net/ethernet/intel/iavf/iavf_txrx.c   |  1 +
  34  drivers/net/ethernet/intel/igb/e1000_i210.c   |  4 +--
  35  drivers/net/ethernet/intel/igb/e1000_nvm.c    |  4 +--
  36  drivers/net/ethernet/intel/igb/e1000_phy.c    |  4 +--
  37  drivers/net/ethernet/intel/igbvf/netdev.c     | 28 +++++++++----------
  38  drivers/net/ethernet/intel/igc/igc_i225.c     |  1 +
  39  drivers/net/ethernet/intel/igc/igc_phy.c      |  1 +
  40  include/linux/avf/virtchnl.h                  |  1 +
  41  17 files changed, 37 insertions(+), 23 deletions(-)
  42
  43 diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
  44 index 4542e2bc28e8d..4576511c99f56 100644
  45 --- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
  46 +++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
  47 @@ -5,6 +5,7 @@
  48   * Shared functions for accessing and configuring the MAC
  49   */
  50
  51 +#include <linux/bitfield.h>
  52  #include "e1000.h"
  53
  54  static s32 e1000_check_downshift(struct e1000_hw *hw);
  55 diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
  56 index af1b0cde36703..ae700a1807c65 100644
  57 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
  58 +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
  59 @@ -1,6 +1,7 @@
  60  // SPDX-License-Identifier: GPL-2.0
  61  /* Copyright(c) 2013 - 2019 Intel Corporation. */
  62
  63 +#include <linux/bitfield.h>
  64  #include "fm10k_pf.h"
  65  #include "fm10k_vf.h"
  66
  67 diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
  68 index dc8ccd378ec92..c50928ec14fff 100644
  69 --- a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
  70 +++ b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
  71 @@ -1,6 +1,7 @@
  72  // SPDX-License-Identifier: GPL-2.0
  73  /* Copyright(c) 2013 - 2019 Intel Corporation. */
  74
  75 +#include <linux/bitfield.h>
  76  #include "fm10k_vf.h"
  77
  78  /**
  79 diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
  80 index e0685219dbde9..4d7caa1199719 100644
  81 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c
  82 +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
  83 @@ -2,6 +2,7 @@
  84  /* Copyright(c) 2013 - 2021 Intel Corporation. */
  85
  86  #include <linux/avf/virtchnl.h>
  87 +#include <linux/bitfield.h>
  88  #include <linux/delay.h>
  89  #include <linux/etherdevice.h>
  90  #include <linux/pci.h>
  91 diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
  92 index 68602fc375f62..d57dd30b024fa 100644
  93 --- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c
  94 +++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
  95 @@ -1,6 +1,8 @@
  96  // SPDX-License-Identifier: GPL-2.0
  97  /* Copyright(c) 2013 - 2021 Intel Corporation. */
  98
  99 +#include <linux/bitfield.h>
 100 +#include "i40e_adminq.h"
 101  #include "i40e_alloc.h"
 102  #include "i40e_dcb.h"
 103  #include "i40e_prototype.h"
 104 diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
 105 index 77cdbfc19d477..e5aec09d58e27 100644
 106 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c
 107 +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
 108 @@ -1,6 +1,7 @@
 109  // SPDX-License-Identifier: GPL-2.0
 110  /* Copyright(c) 2013 - 2018 Intel Corporation. */
 111
 112 +#include <linux/bitfield.h>
 113  #include <linux/delay.h>
 114  #include "i40e_alloc.h"
 115  #include "i40e_prototype.h"
 116 diff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c
 117 index 1afd761d80520..f7988cf5efa58 100644
 118 --- a/drivers/net/ethernet/intel/iavf/iavf_common.c
 119 +++ b/drivers/net/ethernet/intel/iavf/iavf_common.c
 120 @@ -1,10 +1,11 @@
 121  // SPDX-License-Identifier: GPL-2.0
 122  /* Copyright(c) 2013 - 2018 Intel Corporation. */
 123
 124 +#include <linux/avf/virtchnl.h>
 125 +#include <linux/bitfield.h>
 126  #include "iavf_type.h"
 127  #include "iavf_adminq.h"
 128  #include "iavf_prototype.h"
 129 -#include <linux/avf/virtchnl.h>
 130
 131  /**
 132   * iavf_set_mac_type - Sets MAC type
 133 diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
 134 index 892c6a4f03bb8..1ac97bd606e38 100644
 135 --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
 136 +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
 137 @@ -1,11 +1,12 @@
 138  // SPDX-License-Identifier: GPL-2.0
 139  /* Copyright(c) 2013 - 2018 Intel Corporation. */
 140
 141 +#include <linux/bitfield.h>
 142 +#include <linux/uaccess.h>
 143 +
 144  /* ethtool support for iavf */
 145  #include "iavf.h"
 146
 147 -#include <linux/uaccess.h>
 148 -
 149  /* ethtool statistics helpers */
 150
 151  /**
 152 diff --git a/drivers/net/ethernet/intel/iavf/iavf_fdir.c b/drivers/net/ethernet/intel/iavf/iavf_fdir.c
 153 index 03e774bd2a5b4..65ddcd81c993e 100644
 154 --- a/drivers/net/ethernet/intel/iavf/iavf_fdir.c
 155 +++ b/drivers/net/ethernet/intel/iavf/iavf_fdir.c
 156 @@ -3,6 +3,7 @@
 157
 158  /* flow director ethtool support for iavf */
 159
 160 +#include <linux/bitfield.h>
 161  #include "iavf.h"
 162
 163  #define GTPU_PORT      2152
 164 diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c
 165 index 8c5f6096b0022..f998ecf743c46 100644
 166 --- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c
 167 +++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c
 168 @@ -1,6 +1,7 @@
 169  // SPDX-License-Identifier: GPL-2.0
 170  /* Copyright(c) 2013 - 2018 Intel Corporation. */
 171
 172 +#include <linux/bitfield.h>
 173  #include <linux/prefetch.h>
 174
 175  #include "iavf.h"
 176 diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
 177 index b9b9d35494d27..53b396fd194a3 100644
 178 --- a/drivers/net/ethernet/intel/igb/e1000_i210.c
 179 +++ b/drivers/net/ethernet/intel/igb/e1000_i210.c
 180 @@ -5,9 +5,9 @@
 181   * e1000_i211
 182   */
 183
 184 -#include <linux/types.h>
 185 +#include <linux/bitfield.h>
 186  #include <linux/if_ether.h>
 187 -
 188 +#include <linux/types.h>
 189  #include "e1000_hw.h"
 190  #include "e1000_i210.h"
 191
 192 diff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c
 193 index fa136e6e93285..0da57e89593a0 100644
 194 --- a/drivers/net/ethernet/intel/igb/e1000_nvm.c
 195 +++ b/drivers/net/ethernet/intel/igb/e1000_nvm.c
 196 @@ -1,9 +1,9 @@
 197  // SPDX-License-Identifier: GPL-2.0
 198  /* Copyright(c) 2007 - 2018 Intel Corporation. */
 199
 200 -#include <linux/if_ether.h>
 201 +#include <linux/bitfield.h>
 202  #include <linux/delay.h>
 203 -
 204 +#include <linux/if_ether.h>
 205  #include "e1000_mac.h"
 206  #include "e1000_nvm.h"
 207
 208 diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
 209 index a018000f7db92..3c1b562a3271c 100644
 210 --- a/drivers/net/ethernet/intel/igb/e1000_phy.c
 211 +++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
 212 @@ -1,9 +1,9 @@
 213  // SPDX-License-Identifier: GPL-2.0
 214  /* Copyright(c) 2007 - 2018 Intel Corporation. */
 215
 216 -#include <linux/if_ether.h>
 217 +#include <linux/bitfield.h>
 218  #include <linux/delay.h>
 219 -
 220 +#include <linux/if_ether.h>
 221  #include "e1000_mac.h"
 222  #include "e1000_phy.h"
 223
 224 diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
 225 index 7ff2752dd763a..c748668bf2fce 100644
 226 --- a/drivers/net/ethernet/intel/igbvf/netdev.c
 227 +++ b/drivers/net/ethernet/intel/igbvf/netdev.c
 228 @@ -3,25 +3,25 @@
 229
 230  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 231
 232 -#include <linux/module.h>
 233 -#include <linux/types.h>
 234 -#include <linux/init.h>
 235 -#include <linux/pci.h>
 236 -#include <linux/vmalloc.h>
 237 -#include <linux/pagemap.h>
 238 +#include <linux/bitfield.h>
 239  #include <linux/delay.h>
 240 -#include <linux/netdevice.h>
 241 -#include <linux/tcp.h>
 242 -#include <linux/ipv6.h>
 243 -#include <linux/slab.h>
 244 -#include <net/checksum.h>
 245 -#include <net/ip6_checksum.h>
 246 -#include <linux/mii.h>
 247  #include <linux/ethtool.h>
 248  #include <linux/if_vlan.h>
 249 +#include <linux/init.h>
 250 +#include <linux/ipv6.h>
 251 +#include <linux/mii.h>
 252 +#include <linux/module.h>
 253 +#include <linux/netdevice.h>
 254 +#include <linux/pagemap.h>
 255 +#include <linux/pci.h>
 256  #include <linux/prefetch.h>
 257  #include <linux/sctp.h>
 258 -
 259 +#include <linux/slab.h>
 260 +#include <linux/tcp.h>
 261 +#include <linux/types.h>
 262 +#include <linux/vmalloc.h>
 263 +#include <net/checksum.h>
 264 +#include <net/ip6_checksum.h>
 265  #include "igbvf.h"
 266
 267  char igbvf_driver_name[] = "igbvf";
 268 diff --git a/drivers/net/ethernet/intel/igc/igc_i225.c b/drivers/net/ethernet/intel/igc/igc_i225.c
 269 index 17546a035ab19..d2562c8e8015e 100644
 270 --- a/drivers/net/ethernet/intel/igc/igc_i225.c
 271 +++ b/drivers/net/ethernet/intel/igc/igc_i225.c
 272 @@ -1,6 +1,7 @@
 273  // SPDX-License-Identifier: GPL-2.0
 274  /* Copyright (c)  2018 Intel Corporation */
 275
 276 +#include <linux/bitfield.h>
 277  #include <linux/delay.h>
 278
 279  #include "igc_hw.h"
 280 diff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c
 281 index 53b77c969c857..d0d9e7170154c 100644
 282 --- a/drivers/net/ethernet/intel/igc/igc_phy.c
 283 +++ b/drivers/net/ethernet/intel/igc/igc_phy.c
 284 @@ -1,6 +1,7 @@
 285  // SPDX-License-Identifier: GPL-2.0
 286  /* Copyright (c)  2018 Intel Corporation */
 287
 288 +#include <linux/bitfield.h>
 289  #include "igc_phy.h"
 290
 291  /**
 292 diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h
 293 index 6424aa06fb08d..6e950594215a0 100644
 294 --- a/include/linux/avf/virtchnl.h
 295 +++ b/include/linux/avf/virtchnl.h
 296 @@ -5,6 +5,7 @@
 297  #define _VIRTCHNL_H_
 298
 299  #include <linux/bitops.h>
 300 +#include <linux/bits.h>
 301  #include <linux/overflow.h>
 302  #include <uapi/linux/if_ether.h>
 303
 304 --
 305 2.43.0
 306