Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v6.7.5-scx1 #12

Merged
merged 131 commits into from
Feb 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
6b0d486
ext4: regenerate buddy after block freeing failed if under fc replay
LiBaokun96 Jan 4, 2024
7e81c9e
dmaengine: fsl-dpaa2-qdma: Fix the size of dma pools
Jan 18, 2024
d48e89f
dmaengine: ti: k3-udma: Report short packet errors
jailuthra Jan 3, 2024
1905e4f
dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMA
tititiou36 Jan 7, 2024
198270d
dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA
tititiou36 Jan 7, 2024
ee77826
phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018
mantas-p Jan 23, 2024
8befbbe
phy: qcom-qmp-usb: fix serdes init sequence for IPQ6018
mantas-p Jan 23, 2024
433e6b9
phy: renesas: rcar-gen3-usb2: Fix returning wrong error code
shimoday Jan 5, 2024
f2dfbcf
perf tests: Add perf script test
captain5050 Dec 7, 2023
1696ee0
perf test: Fix 'perf script' tests on s390
Jan 25, 2024
fd17d74
perf evlist: Fix evlist__new_default() for > 1 core PMU
James-A-Clark Jan 24, 2024
4506077
dmaengine: fix is_slave_direction() return false when DMA_DEV_TO_DEV
nxpfrankli Jan 23, 2024
396e17a
phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRP
tmlind Jan 28, 2024
7454c0e
cifs: avoid redundant calls to disable multichannel
sprasad-microsoft Feb 1, 2024
22a6c5b
cifs: failure to add channel on iface should bump up weight
sprasad-microsoft Feb 1, 2024
0615d27
drm/msms/dp: fixed link clock divider bits be over written in BPC unk…
Jan 10, 2024
e9ecfb5
drm/msm/dp: return correct Colorimetry for DP_TEST_DYNAMIC_RANGE_CEA …
Jan 17, 2024
eb4f56f
drm/msm/dpu: check for valid hw_pp in dpu_encoder_helper_phys_cleanup
Jan 17, 2024
8dcd2aa
wifi: iwlwifi: mvm: skip adding debugfs symlink for reconfig
benzea Jan 23, 2024
7f3e756
x86/efistub: Give up if memory attribute protocol returns an error
ardbiesheuvel Jan 26, 2024
83eb64e
x86/efistub: Avoid placing the kernel below LOAD_PHYSICAL_ADDR
ardbiesheuvel Jan 30, 2024
3b48c9e
net: stmmac: xgmac: fix handling of DPP safety error for DMA channels
Jan 31, 2024
7af9b4d
wifi: cfg80211: consume both probe response and beacon IEs
benzea Dec 11, 2023
ce112c9
wifi: cfg80211: detect stuck ECSA element in probe resp
jmberg-intel Jan 29, 2024
ea88bde
wifi: mac80211: improve CSA/ECSA connection refusal
jmberg-intel Jan 29, 2024
c255c3b
wifi: mac80211: fix RCU use in TDLS fast-xmit
jmberg-intel Jan 29, 2024
f86f72f
wifi: mac80211: fix unsolicited broadcast probe config
jmberg-intel Jan 29, 2024
1c91546
wifi: mac80211: fix waiting for beacons logic
jmberg-intel Jan 31, 2024
2bedd9a
wifi: iwlwifi: exit eSR only after the FW does
Miriam-Rachel Feb 1, 2024
d32fe55
wifi: brcmfmac: Adjust n_channels usage for __counted_by
kees Jan 26, 2024
d91964c
netdevsim: avoid potential loop in nsim_dev_trap_report_work()
Feb 1, 2024
e42e334
net: atlantic: Fix DMA mapping for PTP hwts ring
Feb 1, 2024
ac031e5
selftests: net: cut more slack for gro fwd tests.
Feb 1, 2024
4228fff
selftests/net: convert unicast_extensions.sh to run it in unique name…
liuhangbin Dec 2, 2023
0d661ec
selftests/net: convert pmtu.sh to run it in unique namespace
liuhangbin Dec 19, 2023
743f994
selftests/net: change shebang to bash to support "source"
Yujie-Liu Dec 29, 2023
2840519
selftests: net: fix tcp listener handling in pmtu.sh
Feb 1, 2024
3689096
selftests: net: avoid just another constant wait
Feb 1, 2024
f2e3190
tsnep: Fix mapping for zero copy XDP_TX action
Jan 31, 2024
7dc9feb
tunnels: fix out of bounds access when building IPv6 PMTU error
atenart Feb 1, 2024
c267f63
atm: idt77252: fix a memleak in open_card_ubr0
AlexiousLu Feb 1, 2024
1731cb9
octeontx2-pf: Fix a memleak otx2_sq_init
AlexiousLu Feb 1, 2024
8083fdf
hwmon: (aspeed-pwm-tacho) mutex for tach reading
lprylli Nov 3, 2023
3a7753b
hwmon: (coretemp) Fix out-of-bounds memory access
zhang-rui Feb 2, 2024
8b8cbb0
hwmon: (coretemp) Fix bogus core_id to attr name mapping
zhang-rui Feb 2, 2024
307fa8a
inet: read sk->sk_family once in inet_recv_error()
Feb 2, 2024
86e0a09
drm/i915/gvt: Fix uninitialized variable in handle_mmio()
Jan 26, 2024
4adeeff
x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
ardbiesheuvel Feb 5, 2024
edc8201
rxrpc: Fix generation of serial numbers to skip zero
dhowells Feb 2, 2024
63719f4
rxrpc: Fix delayed ACKs to not set the reference serial number
dhowells Feb 2, 2024
033edcf
rxrpc: Fix response to PING RESPONSE ACKs to a dead call
dhowells Feb 2, 2024
2fb1d2b
rxrpc: Fix counting of new acks and nacks
dhowells Feb 2, 2024
c44e8d4
selftests: net: let big_tcp test cope with slow env
Feb 2, 2024
0cd331d
tipc: Check the bearer type before calling tipc_udp_nl_bearer_add()
Jan 31, 2024
82ae47c
af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.
q2ven Feb 3, 2024
319d215
devlink: avoid potential loop in devlink_rel_nested_in_notify_work()
Feb 5, 2024
210d938
ppp_async: limit MRU to 64K
Feb 5, 2024
972d0dd
selftests: cmsg_ipv6: repeat the exact packet
kuba-moo Feb 4, 2024
36e38d8
netfilter: nft_compat: narrow down revision to unsigned 8-bits
ummakynes Feb 1, 2024
af12244
netfilter: nft_compat: reject unused compat flag
ummakynes Feb 1, 2024
c45aea3
netfilter: nft_compat: restrict match/target protocol to u16
ummakynes Feb 1, 2024
0c863ca
drm/amd/display: Fix 'panel_cntl' could be null in 'dcn21_set_backlig…
srishanm Jan 27, 2024
39f24c0
drm/amd/display: Add NULL test for 'timing generator' in 'dcn21_set_p…
srishanm Jan 31, 2024
a938eab
drm/amd/display: Implement bounds check for stream encoder creation i…
srishanm Feb 7, 2024
b4b2571
netfilter: nft_set_pipapo: remove static in nft_pipapo_get()
ummakynes Feb 2, 2024
fc46e23
netfilter: nft_ct: reject direction for ct id
ummakynes Feb 5, 2024
383182d
netfilter: nf_tables: use timestamp to check for set element timeout
ummakynes Feb 5, 2024
3c0c0cf
netfilter: nfnetlink_queue: un-break NF_REPEAT
Feb 6, 2024
70e02eb
netfilter: nft_set_pipapo: store index in scratch maps
Feb 7, 2024
14429a7
netfilter: nft_set_pipapo: add helper to release pcpu scratch area
Feb 7, 2024
f125d00
netfilter: nft_set_pipapo: remove scratch_aligned pointer
Feb 8, 2024
686820f
fs/ntfs3: Fix an NULL dereference bug
Oct 17, 2023
2b89c3f
mm: Introduce flush_cache_vmap_early()
Dec 12, 2023
4a67cb9
riscv: mm: execute local TLB flush after populating vmemmap
VincentZWC Jan 17, 2024
ee0948b
riscv: Fix set_huge_pte_at() for NAPOT mapping
Jan 17, 2024
0424da2
riscv: Fix hugetlb_mask_last_page() when NAPOT is enabled
Jan 17, 2024
412dc60
scsi: core: Move scsi_host_busy() out of host lock if it is for per-c…
Feb 3, 2024
d3607ac
riscv: Flush the tlb when a page directory is freed
Jan 28, 2024
e6140f2
libceph: rename read_sparse_msg_*() to read_partial_sparse_msg_*()
lxbsz Dec 14, 2023
bd9442e
libceph: just wait for more data to be available on the socket
lxbsz Dec 14, 2023
524b788
ceph: always set initial i_blkbits to CEPH_FSCRYPT_BLOCK_SHIFT
lxbsz Jan 18, 2024
ac4be33
riscv: Fix arch_hugetlb_migration_supported() for NAPOT
Jan 30, 2024
389870b
riscv: declare overflow_stack as exported from traps.c
bjdooks-ct Nov 23, 2023
dc1fc14
nvme-host: fix the updating of the firmware version
maurizio-lombardi Jan 18, 2024
a56d283
selftests: core: include linux/close_range.h for CLOSE_RANGE_* macros
musamaanjum Oct 24, 2023
cd33b33
blk-iocost: Fix an UBSAN shift-out-of-bounds warning
htejun Nov 20, 2023
db58ef7
ALSA: usb-audio: Add delay quirk for MOTU M Series 2nd revision
puleglot Jan 24, 2024
800de2b
ALSA: usb-audio: Add a quirk for Yamaha YIT-W12TX transmitter
belegdol Jan 23, 2024
0864d65
ALSA: usb-audio: add quirk for RODE NT-USB+
seanyoung Jan 24, 2024
5b123ea
USB: serial: qcserial: add new usb-id for Dell Wireless DW5826e
JackBBWu Jan 23, 2024
9eb61d8
USB: serial: option: add Fibocom FM101-GL variant
LuPuliang Jan 31, 2024
f81f4d9
USB: serial: cp210x: add ID for IMST iM871A-USB
ldallmayr Jan 5, 2024
a87cc08
Revert "usb: typec: tcpm: fix cc role at port reset"
Jan 17, 2024
f41943e
Revert "drm/amd/pm: fix the high voltage and temperature issue"
superm1 Jan 19, 2024
2da241c
x86/lib: Revert to _ASM_EXTABLE_UA() for {get,put}_user() fixups
qzhuo2 Jan 29, 2024
c5a2550
usb: dwc3: host: Set XHCI_SG_TRB_CACHE_SIZE_QUIRK
Jan 16, 2024
e420429
usb: host: xhci-plat: Add support for XHCI_SG_TRB_CACHE_SIZE_QUIRK
Jan 16, 2024
783e69d
xhci: process isoc TD properly when there was a transaction error mid…
matnyman Jan 25, 2024
418456c
xhci: handle isoc Babble and Buffer Overrun events properly
Jan 25, 2024
2fff7bb
usb: dwc3: pci: add support for the Intel Arrow Lake-H
Jan 15, 2024
6424f6e
hrtimer: Report offline hrtimer enqueue
Jan 29, 2024
672049b
Input: i8042 - fix strange behavior of touchpad on Clevo NS70PU
tuxedo-wse Dec 5, 2023
2d470b1
Input: atkbd - skip ATKBD_CMD_SETLEDS when skipping ATKBD_CMD_GETID
jwrdegoede Jan 26, 2024
30f3841
wifi: iwlwifi: mvm: fix a battery life regression
egrumbach Jan 28, 2024
5f42b16
io_uring/net: fix sr->len for IORING_OP_RECV with MSG_WAITALL and buf…
axboe Feb 1, 2024
995d020
io_uring/poll: move poll execution helpers higher up
axboe Jan 29, 2024
f43a63e
io_uring/net: un-indent mshot retry path in io_recv_finish()
axboe Jan 29, 2024
01960f1
io_uring/rw: ensure poll based multishot read retries appropriately
axboe Jan 27, 2024
ef90508
PCI/ASPM: Fix deadlock when enabling ASPM
jhovold Jan 30, 2024
9b9a2f1
new helper: user_path_locked_at()
Nov 16, 2023
dc610c4
bch2_ioctl_subvolume_destroy(): fix locking
Nov 14, 2023
f114cfc
bcachefs: Don't pass memcmp() as a pointer
Jan 15, 2024
6763051
bcachefs: rebalance should wakeup on shutdown if disabled
YellowOnion Nov 26, 2023
9a26938
bcachefs: Add missing bch2_moving_ctxt_flush_all()
Jan 15, 2024
a12bbb4
bcachefs: bch2_kthread_io_clock_wait() no longer sleeps until full am…
Jan 15, 2024
5659067
bcachefs: kvfree bch_fs::snapshots in bch2_fs_snapshots_exit
Damenly Jan 16, 2024
5b41d3f
bcachefs: grab s_umount only if snapshotting
Damenly Jan 15, 2024
4571eb9
bcachefs: fix incorrect usage of REQ_OP_FLUSH
Jan 11, 2024
a18ae02
bcachefs: unlock parent dir if entry is not found in subvolume deletion
ouonline Jan 28, 2024
3183d7a
bcachefs: time_stats: Check for last_event == 0 when updating freq stats
Feb 2, 2024
e8fd56f
Revert "ASoC: amd: Add new dmi entries for acp5x platform"
gregkh Feb 13, 2024
4023b7b
io_uring/poll: add requeue return code from poll multishot handling
axboe Jan 29, 2024
3438de3
io_uring/net: limit inline multishot retries
axboe Jan 29, 2024
50d0dff
net: Fix from address in memcpy_to_iter_csum()
michaellass Jan 31, 2024
9b16230
net: stmmac: xgmac: use #define for string constants
horms Feb 8, 2024
87d1f70
ALSA: usb-audio: Sort quirk table entries
tiwai Jan 24, 2024
e749566
net: stmmac: xgmac: fix a typo of register name in DPP safety handling
Feb 3, 2024
6eb1444
netfilter: nft_set_rbtree: skip end interval element from gc
ummakynes Feb 7, 2024
004dcea
Linux 6.7.5
gregkh Feb 16, 2024
0de69ee
Merge tag 'v6.7.5' into merge_latest
Byte-Lab Feb 17, 2024
8434f90
v6.7.5-scx1
Byte-Lab Feb 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
net: stmmac: xgmac: use #define for string constants
commit 1692b97 upstream.

The cited commit introduces and uses the string constants dpp_tx_err and
dpp_rx_err. These are assigned to constant fields of the array
dwxgmac3_error_desc.

It has been reported that on GCC 6 and 7.5.0 this results in warnings
such as:

  .../dwxgmac2_core.c:836:20: error: initialiser element is not constant
   { true, "TDPES0", dpp_tx_err },

I have been able to reproduce this using: GCC 7.5.0, 8.4.0, 9.4.0 and 10.5.0.
But not GCC 13.2.0.

So it seems this effects older compilers but not newer ones.
As Jon points out in his report, the minimum compiler supported by
the kernel is GCC 5.1, so it does seem that this ought to be fixed.

It is not clear to me what combination of 'const', if any, would address
this problem.  So this patch takes of using #defines for the string
constants

Compile tested only.

Fixes: 46eba19 ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels")
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Closes: https://lore.kernel.org/netdev/c25eb595-8d91-40ea-9f52-efa15ebafdbc@nvidia.com/
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202402081135.lAxxBXHk-lkp@intel.com/
Signed-off-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240208-xgmac-const-v1-1-e69a1eeabfc8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
horms authored and gregkh committed Feb 16, 2024
commit 9b16230a81aaa0b93734ad7c8b9f9c5b97b27920
69 changes: 35 additions & 34 deletions drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
Original file line number Diff line number Diff line change
@@ -830,41 +830,42 @@ static const struct dwxgmac3_error_desc dwxgmac3_dma_errors[32]= {
{ false, "UNKNOWN", "Unknown Error" }, /* 31 */
};

static const char * const dpp_rx_err = "Read Rx Descriptor Parity checker Error";
static const char * const dpp_tx_err = "Read Tx Descriptor Parity checker Error";
#define DPP_RX_ERR "Read Rx Descriptor Parity checker Error"
#define DPP_TX_ERR "Read Tx Descriptor Parity checker Error"

static const struct dwxgmac3_error_desc dwxgmac3_dma_dpp_errors[32] = {
{ true, "TDPES0", dpp_tx_err },
{ true, "TDPES1", dpp_tx_err },
{ true, "TDPES2", dpp_tx_err },
{ true, "TDPES3", dpp_tx_err },
{ true, "TDPES4", dpp_tx_err },
{ true, "TDPES5", dpp_tx_err },
{ true, "TDPES6", dpp_tx_err },
{ true, "TDPES7", dpp_tx_err },
{ true, "TDPES8", dpp_tx_err },
{ true, "TDPES9", dpp_tx_err },
{ true, "TDPES10", dpp_tx_err },
{ true, "TDPES11", dpp_tx_err },
{ true, "TDPES12", dpp_tx_err },
{ true, "TDPES13", dpp_tx_err },
{ true, "TDPES14", dpp_tx_err },
{ true, "TDPES15", dpp_tx_err },
{ true, "RDPES0", dpp_rx_err },
{ true, "RDPES1", dpp_rx_err },
{ true, "RDPES2", dpp_rx_err },
{ true, "RDPES3", dpp_rx_err },
{ true, "RDPES4", dpp_rx_err },
{ true, "RDPES5", dpp_rx_err },
{ true, "RDPES6", dpp_rx_err },
{ true, "RDPES7", dpp_rx_err },
{ true, "RDPES8", dpp_rx_err },
{ true, "RDPES9", dpp_rx_err },
{ true, "RDPES10", dpp_rx_err },
{ true, "RDPES11", dpp_rx_err },
{ true, "RDPES12", dpp_rx_err },
{ true, "RDPES13", dpp_rx_err },
{ true, "RDPES14", dpp_rx_err },
{ true, "RDPES15", dpp_rx_err },
{ true, "TDPES0", DPP_TX_ERR },
{ true, "TDPES1", DPP_TX_ERR },
{ true, "TDPES2", DPP_TX_ERR },
{ true, "TDPES3", DPP_TX_ERR },
{ true, "TDPES4", DPP_TX_ERR },
{ true, "TDPES5", DPP_TX_ERR },
{ true, "TDPES6", DPP_TX_ERR },
{ true, "TDPES7", DPP_TX_ERR },
{ true, "TDPES8", DPP_TX_ERR },
{ true, "TDPES9", DPP_TX_ERR },
{ true, "TDPES10", DPP_TX_ERR },
{ true, "TDPES11", DPP_TX_ERR },
{ true, "TDPES12", DPP_TX_ERR },
{ true, "TDPES13", DPP_TX_ERR },
{ true, "TDPES14", DPP_TX_ERR },
{ true, "TDPES15", DPP_TX_ERR },
{ true, "RDPES0", DPP_RX_ERR },
{ true, "RDPES1", DPP_RX_ERR },
{ true, "RDPES2", DPP_RX_ERR },
{ true, "RDPES3", DPP_RX_ERR },
{ true, "RDPES4", DPP_RX_ERR },
{ true, "RDPES5", DPP_RX_ERR },
{ true, "RDPES6", DPP_RX_ERR },
{ true, "RDPES7", DPP_RX_ERR },
{ true, "RDPES8", DPP_RX_ERR },
{ true, "RDPES9", DPP_RX_ERR },
{ true, "RDPES10", DPP_RX_ERR },
{ true, "RDPES11", DPP_RX_ERR },
{ true, "RDPES12", DPP_RX_ERR },
{ true, "RDPES13", DPP_RX_ERR },
{ true, "RDPES14", DPP_RX_ERR },
{ true, "RDPES15", DPP_RX_ERR },
};

static void dwxgmac3_handle_dma_err(struct net_device *ndev,