75428f537d
The kernel build regressions/improvements email contained a couple of
issues with old compilers (in fact all the reports were on different
architectures, but all gcc 5.5) and the FIELD_PREP() and FIELD_GET()
conversions. They're all because an integer #define that should have
been declared as unsigned, was shifted to the point that it could set
the sign bit.
The fix just involves making sure the defines use the "U" identifier on
the constants to make sure they're unsigned. Should make the checkers
happier.
Confirmed with objdump before/after that there is no change to the
binaries.
Issues were reported as follows:
./drivers/net/ethernet/intel/ice/ice_base.c:238:7: note: in expansion of macro 'FIELD_GET'
(FIELD_GET(GLINT_CTL_ITR_GRAN_25_M, regval) == ICE_ITR_GRAN_US))
^
./include/linux/compiler_types.h:435:38: error: call to '__compiletime_assert_1093' declared with attribute error: FIELD_GET: mask is not constant
drivers/net/ethernet/intel/ice/ice_nvm.c:709:16: note: in expansion of macro ‘FIELD_GET’
orom->major = FIELD_GET(ICE_OROM_VER_MASK, combo_ver);
^
./include/linux/compiler_types.h:435:38: error: call to ‘__compiletime_assert_796’ declared with attribute error: FIELD_GET: mask is not constant
drivers/net/ethernet/intel/ice/ice_common.c:945:18: note: in expansion of macro ‘FIELD_GET’
u8 max_agg_bw = FIELD_GET(GL_PWR_MODE_CTL_CAR_MAX_BW_M,
^
./include/linux/compiler_types.h:435:38: error: call to ‘__compiletime_assert_420’ declared with attribute error: FIELD_GET: mask is not constant
drivers/net/ethernet/intel/i40e/i40e_dcb.c:458:8: note: in expansion of macro ‘FIELD_GET’
oui = FIELD_GET(I40E_LLDP_TLV_OUI_MASK, ouisubtype);
^
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Closes: https://lore.kernel.org/lkml/d03e90ca-8485-4d1b-5ec1-c3398e0e8da@linux-m68k.org/ #i40e #ice
Fixes: 62589808d7 ("i40e: field get conversion")
Fixes: 5a259f8e0b ("ice: field get conversion")
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Link: https://lore.kernel.org/r/20240206022906.2194214-1-jesse.brandeburg@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
81 lines
2.2 KiB
C
81 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright (c) 2018, Intel Corporation. */
|
|
|
|
#ifndef _ICE_OSDEP_H_
|
|
#define _ICE_OSDEP_H_
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/io.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/pci_ids.h>
|
|
#ifndef CONFIG_64BIT
|
|
#include <linux/io-64-nonatomic-lo-hi.h>
|
|
#endif
|
|
#include <net/udp_tunnel.h>
|
|
|
|
#define wr32(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
|
|
#define rd32(a, reg) readl((a)->hw_addr + (reg))
|
|
#define wr64(a, reg, value) writeq((value), ((a)->hw_addr + (reg)))
|
|
#define rd64(a, reg) readq((a)->hw_addr + (reg))
|
|
|
|
#define ice_flush(a) rd32((a), GLGEN_STAT)
|
|
#define ICE_M(m, s) ((m ## U) << (s))
|
|
|
|
struct ice_dma_mem {
|
|
void *va;
|
|
dma_addr_t pa;
|
|
size_t size;
|
|
};
|
|
|
|
struct ice_hw;
|
|
struct device *ice_hw_to_dev(struct ice_hw *hw);
|
|
|
|
#ifdef CONFIG_DYNAMIC_DEBUG
|
|
#define ice_debug(hw, type, fmt, args...) \
|
|
dev_dbg(ice_hw_to_dev(hw), fmt, ##args)
|
|
|
|
#define ice_debug_array(hw, type, rowsize, groupsize, buf, len) \
|
|
print_hex_dump_debug(KBUILD_MODNAME " ", \
|
|
DUMP_PREFIX_OFFSET, rowsize, \
|
|
groupsize, buf, len, false)
|
|
#else
|
|
#define ice_debug(hw, type, fmt, args...) \
|
|
do { \
|
|
if ((type) & (hw)->debug_mask) \
|
|
dev_info(ice_hw_to_dev(hw), fmt, ##args); \
|
|
} while (0)
|
|
|
|
#ifdef DEBUG
|
|
#define ice_debug_array(hw, type, rowsize, groupsize, buf, len) \
|
|
do { \
|
|
if ((type) & (hw)->debug_mask) \
|
|
print_hex_dump_debug(KBUILD_MODNAME, \
|
|
DUMP_PREFIX_OFFSET, \
|
|
rowsize, groupsize, buf, \
|
|
len, false); \
|
|
} while (0)
|
|
#else
|
|
#define ice_debug_array(hw, type, rowsize, groupsize, buf, len) \
|
|
do { \
|
|
struct ice_hw *hw_l = hw; \
|
|
if ((type) & (hw_l)->debug_mask) { \
|
|
u16 len_l = len; \
|
|
u8 *buf_l = buf; \
|
|
int i; \
|
|
for (i = 0; i < (len_l - 16); i += 16) \
|
|
ice_debug(hw_l, type, "0x%04X %16ph\n",\
|
|
i, ((buf_l) + i)); \
|
|
if (i < len_l) \
|
|
ice_debug(hw_l, type, "0x%04X %*ph\n", \
|
|
i, ((len_l) - i), ((buf_l) + i));\
|
|
} \
|
|
} while (0)
|
|
#endif /* DEBUG */
|
|
#endif /* CONFIG_DYNAMIC_DEBUG */
|
|
|
|
#endif /* _ICE_OSDEP_H_ */
|