From e32782b2df1243183ed057f272f176dc2601cc33 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 11 Dec 2023 13:15:09 +0100 Subject: [PATCH] mt76: update to Git HEAD (2023-12-11) f63f87cd5b45 wifi: mt76: mt7996: fix shift overflow warning on 32 bit systems Signed-off-by: Felix Fietkau (cherry picked from commit da7b0351fce5dd59b79ea78d34c90c66b8bd6f6e) [rmilecki: it's a no-change for 23.05 as we had that fix backported] --- package/kernel/mt76/Makefile | 6 ++-- ...-fix-shift-overflow-warning-on-32-bi.patch | 34 ------------------- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/kernel/mt76/patches/0001-wifi-mt76-mt7996-fix-shift-overflow-warning-on-32-bi.patch diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 762f474ce9..38a92c953e 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2023-12-08 -PKG_SOURCE_VERSION:=f559adf1849c8af91f5a5eb670f4ed2c24988898 -PKG_MIRROR_HASH:=74dde4478442d5f0edbae918636b40767b0e49181b732d4184feeccd8a8cc328 +PKG_SOURCE_DATE:=2023-12-11 +PKG_SOURCE_VERSION:=f63f87cd5b45c3779293e6062c6b26bdf57e851d +PKG_MIRROR_HASH:=43f1b1fb75dfb4756aa1767983b338bd63154f0f6c45554029e69af49d55b914 PKG_MAINTAINER:=Felix Fietkau PKG_USE_NINJA:=0 diff --git a/package/kernel/mt76/patches/0001-wifi-mt76-mt7996-fix-shift-overflow-warning-on-32-bi.patch b/package/kernel/mt76/patches/0001-wifi-mt76-mt7996-fix-shift-overflow-warning-on-32-bi.patch deleted file mode 100644 index 5acc9e88a5..0000000000 --- a/package/kernel/mt76/patches/0001-wifi-mt76-mt7996-fix-shift-overflow-warning-on-32-bi.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f63f87cd5b45c3779293e6062c6b26bdf57e851d Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Sat, 9 Dec 2023 22:44:57 +0100 -Subject: [PATCH] wifi: mt76: mt7996: fix shift overflow warning on 32 bit - systems - -Fix additional shift overflow warning on 32 bit systems for mt7996 mac.c -source. - -Fixes: 95c14207d2a9 ("wifi: mt76: mt7996: set DMA mask to 36 bits for boards with more than 4GB of RAM") -Signed-off-by: Christian Marangi ---- - mt7996/mac.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - ---- a/mt7996/mac.c -+++ b/mt7996/mac.c -@@ -942,9 +942,13 @@ int mt7996_tx_prepare_skb(struct mt76_de - - txp = (struct mt76_connac_txp_common *)(txwi + MT_TXD_SIZE); - for (i = 0; i < nbuf; i++) { -- u16 len = FIELD_PREP(MT_TXP_BUF_LEN, tx_info->buf[i + 1].len) | -- FIELD_PREP(MT_TXP_DMA_ADDR_H, -- tx_info->buf[i + 1].addr >> 32); -+ u16 len; -+ -+ len = FIELD_PREP(MT_TXP_BUF_LEN, tx_info->buf[i + 1].len); -+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT -+ len |= FIELD_PREP(MT_TXP_DMA_ADDR_H, -+ tx_info->buf[i + 1].addr >> 32); -+#endif - - txp->fw.buf[i] = cpu_to_le32(tx_info->buf[i + 1].addr); - txp->fw.len[i] = cpu_to_le16(len); -- 2.30.2