Skip to content

Commit

Permalink
kernel: bump 6.6 to 6.6.54
Browse files Browse the repository at this point in the history
  • Loading branch information
@DHDAXCW
DHDAXCW committed Oct 8, 2024
1 parent ea0d1cc commit 95fd4e2
Show file tree
Hide file tree
Showing 40 changed files with 81 additions and 429 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.6
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .47
LINUX_KERNEL_HASH-6.6.47 = d43376c9e9eaa92bb1b926054bd160d329c58a62d64bd65fe1222c11c6564f50
LINUX_VERSION-6.6 = .54
LINUX_KERNEL_HASH-6.6.54 = 5fae869d6a24055c16ffc2d92669e3fb2b258e34d36c850bb8cf9def417ecfa0
6 changes: 3 additions & 3 deletions ...neric/backport-6.6/752-04-v6.6-net-ethernet-mtk_wed-check-update_wo_rx_stats-in-mtk.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Signed-off-by: Paolo Abeni <[email protected]>

--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
@@ -68,6 +68,9 @@ mtk_wed_update_rx_stats(struct mtk_wed_d
struct mtk_wed_wo_rx_stats *stats;
int i;
@@ -71,6 +71,9 @@ mtk_wed_update_rx_stats(struct mtk_wed_d
if (!wed->wlan.update_wo_rx_stats)
return;

+ if (!wed->wlan.update_wo_rx_stats)
+ return;
Expand Down
6 changes: 3 additions & 3 deletions ...neric/backport-6.6/752-06-v6.7-net-ethernet-mtk_wed-introduce-versioning-utility-ro.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
ext_mask |= MTK_WED_EXT_INT_STATUS_TX_DRV_R_RESP_ERR;
else
ext_mask |= MTK_WED_EXT_INT_STATUS_RX_FBUF_LO_TH |
@@ -1840,7 +1840,7 @@ mtk_wed_setup_tc(struct mtk_wed_device *
@@ -1842,7 +1842,7 @@ mtk_wed_setup_tc(struct mtk_wed_device *
{
struct mtk_wed_hw *hw = wed->hw;

Expand All @@ -177,7 +177,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
return -EOPNOTSUPP;

switch (type) {
@@ -1914,9 +1914,9 @@ void mtk_wed_add_hw(struct device_node *
@@ -1916,9 +1916,9 @@ void mtk_wed_add_hw(struct device_node *
hw->wdma = wdma;
hw->index = index;
hw->irq = irq;
Expand Down Expand Up @@ -221,7 +221,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
}
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
@@ -207,7 +207,7 @@ int mtk_wed_mcu_msg_update(struct mtk_we
@@ -210,7 +210,7 @@ int mtk_wed_mcu_msg_update(struct mtk_we
{
struct mtk_wed_wo *wo = dev->hw->wed_wo;

Expand Down
2 changes: 1 addition & 1 deletion ...neric/backport-6.6/752-07-v6.7-net-ethernet-mtk_wed-do-not-configure-rx-offload-if-.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
dev_err(dev->hw->dev, "failed to attach wed device\n");
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
@@ -207,7 +207,7 @@ int mtk_wed_mcu_msg_update(struct mtk_we
@@ -210,7 +210,7 @@ int mtk_wed_mcu_msg_update(struct mtk_we
{
struct mtk_wed_wo *wo = dev->hw->wed_wo;

Expand Down
4 changes: 2 additions & 2 deletions ...neric/backport-6.6/752-10-v6.7-net-ethernet-mtk_wed-move-mem_region-array-out-of-mt.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
}

static struct sk_buff *
@@ -294,18 +310,6 @@ next:
@@ -297,18 +313,6 @@ next:
static int
mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
{
Expand All @@ -64,7 +64,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
const struct mtk_wed_fw_trailer *trailer;
const struct firmware *fw;
const char *fw_name;
@@ -319,11 +323,6 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
@@ -322,11 +326,6 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
return ret;
}

Expand Down
8 changes: 4 additions & 4 deletions ...x/generic/backport-6.6/752-11-v6.7-net-ethernet-mtk_wed-make-memory-region-optional.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
@@ -234,19 +234,13 @@ int mtk_wed_mcu_msg_update(struct mtk_we
@@ -237,19 +237,13 @@ int mtk_wed_mcu_msg_update(struct mtk_we
}

static int
Expand All @@ -35,7 +35,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
if (!np)
return -ENODEV;

@@ -258,7 +252,7 @@ mtk_wed_get_memory_region(struct mtk_wed
@@ -261,7 +255,7 @@ mtk_wed_get_memory_region(struct mtk_wed

region->phy_addr = rmem->base;
region->size = rmem->size;
Expand All @@ -44,7 +44,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

return !region->addr ? -EINVAL : 0;
}
@@ -271,6 +265,9 @@ mtk_wed_mcu_run_firmware(struct mtk_wed_
@@ -274,6 +268,9 @@ mtk_wed_mcu_run_firmware(struct mtk_wed_
const struct mtk_wed_fw_trailer *trailer;
const struct mtk_wed_fw_region *fw_region;

Expand All @@ -54,7 +54,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
trailer_ptr = fw->data + fw->size - sizeof(*trailer);
trailer = (const struct mtk_wed_fw_trailer *)trailer_ptr;
region_ptr = trailer_ptr - trailer->num_region * sizeof(*fw_region);
@@ -318,7 +315,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
@@ -321,7 +318,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed

/* load firmware region metadata */
for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
Expand Down
4 changes: 2 additions & 2 deletions ...eneric/backport-6.6/752-13-v6.7-net-ethernet-mtk_wed-add-mtk_wed_soc_data-structure.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
return -ENOMEM;

wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_BASE,
@@ -1928,7 +1935,12 @@ void mtk_wed_add_hw(struct device_node *
@@ -1930,7 +1937,12 @@ void mtk_wed_add_hw(struct device_node *
hw->irq = irq;
hw->version = eth->soc->version;

Expand All @@ -156,7 +156,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
hw->mirror = syscon_regmap_lookup_by_phandle(eth_np,
"mediatek,pcie-mirror");
hw->hifsys = syscon_regmap_lookup_by_phandle(eth_np,
@@ -1942,6 +1954,8 @@ void mtk_wed_add_hw(struct device_node *
@@ -1944,6 +1956,8 @@ void mtk_wed_add_hw(struct device_node *
regmap_write(hw->mirror, 0, 0);
regmap_write(hw->mirror, 4, 0);
}
Expand Down
8 changes: 4 additions & 4 deletions ...neric/backport-6.6/752-14-v6.7-net-ethernet-mtk_wed-introduce-WED-support-for-MT798.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

val = wed_r32(dev, MTK_WED_EXT_INT_STATUS);
wed_w32(dev, MTK_WED_EXT_INT_STATUS, val);
@@ -1939,6 +2130,9 @@ void mtk_wed_add_hw(struct device_node *
@@ -1941,6 +2132,9 @@ void mtk_wed_add_hw(struct device_node *
case 2:
hw->soc = &mt7986_data;
break;
Expand Down Expand Up @@ -837,7 +837,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
int index);
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
@@ -331,10 +331,22 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
@@ -334,10 +334,22 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
wo->hw->index + 1);

/* load firmware */
Expand All @@ -864,7 +864,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

ret = request_firmware(&fw, fw_name, wo->hw->dev);
if (ret)
@@ -355,15 +367,16 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
@@ -358,15 +370,16 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
}

/* set the start address */
Expand All @@ -886,7 +886,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
wo_w32(wo, MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR, val);
out:
release_firmware(fw);
@@ -398,3 +411,5 @@ int mtk_wed_mcu_init(struct mtk_wed_wo *
@@ -401,3 +414,5 @@ int mtk_wed_mcu_init(struct mtk_wed_wo *
MODULE_FIRMWARE(MT7981_FIRMWARE_WO);
MODULE_FIRMWARE(MT7986_FIRMWARE_WO0);
MODULE_FIRMWARE(MT7986_FIRMWARE_WO1);
Expand Down
2 changes: 1 addition & 1 deletion ...neric/backport-6.6/752-17-v6.7-net-ethernet-mtk_wed-introduce-hw_rro-support-for-MT.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask)
{
int i;
@@ -2212,6 +2503,10 @@ void mtk_wed_add_hw(struct device_node *
@@ -2214,6 +2505,10 @@ void mtk_wed_add_hw(struct device_node *
.detach = mtk_wed_detach,
.ppe_check = mtk_wed_ppe_check,
.setup_tc = mtk_wed_setup_tc,
Expand Down
6 changes: 3 additions & 3 deletions ...neric/backport-6.6/752-21-v6.7-net-ethernet-mtk_wed-fix-firmware-loading-for-MT7986.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
@@ -258,16 +258,12 @@ mtk_wed_get_memory_region(struct mtk_wed
@@ -261,16 +261,12 @@ mtk_wed_get_memory_region(struct mtk_wed
}

static int
Expand All @@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
trailer_ptr = fw->data + fw->size - sizeof(*trailer);
trailer = (const struct mtk_wed_fw_trailer *)trailer_ptr;
region_ptr = trailer_ptr - trailer->num_region * sizeof(*fw_region);
@@ -275,33 +271,41 @@ mtk_wed_mcu_run_firmware(struct mtk_wed_
@@ -278,33 +274,41 @@ mtk_wed_mcu_run_firmware(struct mtk_wed_

while (region_ptr < trailer_ptr) {
u32 length;
Expand Down Expand Up @@ -96,7 +96,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
}

static int
@@ -360,11 +364,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
@@ -363,11 +367,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
dev_info(wo->hw->dev, "MTK WED WO Chip ID %02x Region %d\n",
trailer->chip_id, trailer->num_region);

Expand Down
2 changes: 1 addition & 1 deletion ...neric/backport-6.6/752-22-v6.7-net-ethernet-mtk_wed-remove-wo-pointer-in-wo_r32-wo_.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
{
writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
}
@@ -373,13 +373,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
@@ -376,13 +376,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
boot_cr = MTK_WO_MCU_CFG_LS_WA_BOOT_ADDR_ADDR;
else
boot_cr = MTK_WO_MCU_CFG_LS_WM_BOOT_ADDR_ADDR;
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/backport-6.6/780-03-v6.9-r8169-add-support-for-RTL8126A.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ Signed-off-by: David S. Miller <[email protected]>
default:
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -1102,6 +1102,12 @@ static void rtl8125b_hw_phy_config(struc
@@ -1104,6 +1104,12 @@ static void rtl8125b_hw_phy_config(struc
rtl8125b_config_eee_phy(phydev);
}

Expand All @@ -345,7 +345,7 @@ Signed-off-by: David S. Miller <[email protected]>
void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
enum mac_version ver)
{
@@ -1152,6 +1158,7 @@ void r8169_hw_phy_config(struct rtl8169_
@@ -1154,6 +1160,7 @@ void r8169_hw_phy_config(struct rtl8169_
[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
Expand Down
4 changes: 2 additions & 2 deletions ...ric/backport-6.6/819-v6.8-0001-nvmem-Move-of_nvmem_layout_get_container-in-another-.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
return of_get_child_by_name(nvmem->dev.of_node, "nvmem-layout");
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h
@@ -241,7 +241,6 @@ struct nvmem_cell *of_nvmem_cell_get(str
@@ -242,7 +242,6 @@ struct nvmem_cell *of_nvmem_cell_get(str
const char *id);
struct nvmem_device *of_nvmem_device_get(struct device_node *np,
const char *name);
-struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem);
#else
static inline struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
const char *id)
@@ -254,12 +253,6 @@ static inline struct nvmem_device *of_nv
@@ -255,12 +254,6 @@ static inline struct nvmem_device *of_nv
{
return ERR_PTR(-EOPNOTSUPP);
}
Expand Down
2 changes: 1 addition & 1 deletion ...eric/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
}
EXPORT_SYMBOL_GPL(nvmem_cell_put);

@@ -2103,11 +2044,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name);
@@ -2116,11 +2057,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_size);

static int __init nvmem_init(void)
{
Expand Down
53 changes: 0 additions & 53 deletions target/linux/generic/backport-6.6/819-v6.8-0010-nvmem-core-add-nvmem_dev_size-helper.patch
View file

This file was deleted.

Loading

0 comments on commit 95fd4e2

Please sign in to comment.