Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.38
Browse files Browse the repository at this point in the history 
Automatically refreshed:
apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
generic/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch
generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch
generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch
generic/hack-5.10/204-module_strip.patch
generic/hack-5.10/911-kobject_add_broadcast_uevent.patch
ipq806x/patches-5.10/104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch
ipq806x/patches-5.10/104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch

Deleted (reverse-appliable):
generic/backport-5.10/610-v5.13-37-net-ethernet-mtk_eth_soc-fix-RX-VLAN-offload.patch
ipq806x/patches-5.10/106-5.13-net-stmmac-Set-FIFO-sizes-for-ipq806x.patch

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
  • Loading branch information
@rsalvaterra @ldir-EDB0
rsalvaterra authored and ldir-EDB0 committed May 22, 2021
1 parent ddcb970 commit 8615573
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 155 deletions.
4 changes: 2 additions & 2 deletions include/kernel-version.mk
View file
Expand Up @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif

LINUX_VERSION-5.4 = .117
LINUX_VERSION-5.10 = .37
LINUX_VERSION-5.10 = .38

LINUX_KERNEL_HASH-5.4.117 = 4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770
LINUX_KERNEL_HASH-5.10.37 = a8d5e3309dafc484eb70f94747a6efffa29a79bae651ae126333e913c00be077
LINUX_KERNEL_HASH-5.10.38 = 32f25ab128f9e819fd5de28ac4a7c6c2dac96340cff4b03338bcb4edecbbf12f

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
Expand Down
2 changes: 1 addition & 1 deletion target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
View file
Expand Up @@ -13,7 +13,7 @@ produce a noisy warning.

--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -261,6 +261,7 @@ static void xhci_pci_quirks(struct devic
@@ -265,6 +265,7 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x0015) {
xhci->quirks |= XHCI_RESET_ON_RESUME;
xhci->quirks |= XHCI_ZERO_64B_REGS;
Expand Down
2 changes: 1 addition & 1 deletion ...eric/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch
View file
Expand Up @@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#define MTK_GDMA_ICS_EN BIT(22)
#define MTK_GDMA_TCS_EN BIT(21)
#define MTK_GDMA_UCS_EN BIT(20)
@@ -304,6 +305,7 @@
@@ -305,6 +306,7 @@
#define RX_DMA_L4_VALID_PDMA BIT(30) /* when PDMA is used */
#define RX_DMA_FPORT_SHIFT 19
#define RX_DMA_FPORT_MASK 0x7
Expand Down
6 changes: 3 additions & 3 deletions ...ric/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch
View file
Expand Up @@ -105,7 +105,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#define MTK_GDMA_DROP_ALL 0x7777

/* Unicast Filter MAC Address Register - Low */
@@ -301,6 +303,12 @@
@@ -302,6 +304,12 @@
#define RX_DMA_VID(_x) ((_x) & 0xfff)

/* QDMA descriptor rxd4 */
Expand All @@ -118,15 +118,15 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#define RX_DMA_L4_VALID BIT(24)
#define RX_DMA_L4_VALID_PDMA BIT(30) /* when PDMA is used */
#define RX_DMA_FPORT_SHIFT 19
@@ -798,6 +806,7 @@ struct mtk_soc_data {
@@ -799,6 +807,7 @@ struct mtk_soc_data {
u32 caps;
u32 required_clks;
bool required_pctl;
+ u8 offload_version;
netdev_features_t hw_features;
};

@@ -897,6 +906,8 @@ struct mtk_eth {
@@ -898,6 +907,8 @@ struct mtk_eth {
u32 tx_int_status_reg;
u32 rx_dma_l4_valid;
int ip_align;
Expand Down
4 changes: 2 additions & 2 deletions ...ric/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch
View file
Expand Up @@ -60,15 +60,15 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
#define MTK_HW_FEATURES_MT7628 (NETIF_F_SG | NETIF_F_RXCSUM)
#define NEXT_DESP_IDX(X, Y) (((X) + 1) & ((Y) - 1))

@@ -908,6 +910,7 @@ struct mtk_eth {
@@ -909,6 +911,7 @@ struct mtk_eth {
int ip_align;

struct mtk_ppe ppe;
+ struct rhashtable flow_table;
};

/* struct mtk_mac - the structure that holds the info about the MACs of the
@@ -952,4 +955,9 @@ int mtk_gmac_sgmii_path_setup(struct mtk
@@ -953,4 +956,9 @@ int mtk_gmac_sgmii_path_setup(struct mtk
int mtk_gmac_gephy_path_setup(struct mtk_eth *eth, int mac_id);
int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id);

Expand Down
38 changes: 0 additions & 38 deletions ...nux/generic/backport-5.10/610-v5.13-37-net-ethernet-mtk_eth_soc-fix-RX-VLAN-offload.patch
View file

This file was deleted.

2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/204-module_strip.patch
View file
Expand Up @@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}

static void write_buf(struct buffer *b, const char *fname)
@@ -2643,7 +2653,9 @@ int main(int argc, char **argv)
@@ -2630,7 +2640,9 @@ int main(int argc, char **argv)
add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod);
add_depends(&buf, mod);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/911-kobject_add_broadcast_uevent.patch
View file
Expand Up @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* _KOBJECT_H_ */
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -690,6 +690,43 @@ int add_uevent_var(struct kobj_uevent_en
@@ -691,6 +691,43 @@ int add_uevent_var(struct kobj_uevent_en
EXPORT_SYMBOL_GPL(add_uevent_var);

#if defined(CONFIG_NET)
Expand Down
12 changes: 6 additions & 6 deletions target/linux/ipq806x/patches-5.10/104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch
View file
Expand Up @@ -166,7 +166,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
if (tsens_version(priv) > VER_0_1) {
for (i = VER_MAJOR; i <= VER_STEP; i++) {
priv->rf[i] = devm_regmap_field_alloc(dev, priv->srot_map,
@@ -769,6 +818,10 @@ int __init init_common(struct tsens_priv
@@ -771,6 +820,10 @@ int __init init_common(struct tsens_priv
ret = PTR_ERR(priv->rf[TSENS_EN]);
goto err_put_device;
}
Expand All @@ -177,7 +177,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
ret = regmap_field_read(priv->rf[TSENS_EN], &enabled);
if (ret)
goto err_put_device;
@@ -791,6 +844,19 @@ int __init init_common(struct tsens_priv
@@ -793,6 +846,19 @@ int __init init_common(struct tsens_priv
goto err_put_device;
}

Expand All @@ -197,7 +197,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
/* This loop might need changes if enum regfield_ids is reordered */
for (j = LAST_TEMP_0; j <= UP_THRESH_15; j += 16) {
for (i = 0; i < priv->feat->max_sensors; i++) {
@@ -806,7 +872,7 @@ int __init init_common(struct tsens_priv
@@ -808,7 +874,7 @@ int __init init_common(struct tsens_priv
}
}

Expand All @@ -206,7 +206,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
/* Loop might need changes if enum regfield_ids is reordered */
for (j = CRITICAL_STATUS_0; j <= CRIT_THRESH_15; j += 16) {
for (i = 0; i < priv->feat->max_sensors; i++) {
@@ -844,7 +910,11 @@ int __init init_common(struct tsens_priv
@@ -846,7 +912,11 @@ int __init init_common(struct tsens_priv
}

spin_lock_init(&priv->ul_lock);
Expand All @@ -219,7 +219,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
tsens_debug_init(op);

err_put_device:
@@ -943,10 +1013,19 @@ static int tsens_register_irq(struct tse
@@ -945,10 +1015,19 @@ static int tsens_register_irq(struct tse
if (irq == -ENXIO)
ret = 0;
} else {
Expand All @@ -243,7 +243,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
if (ret)
dev_err(&pdev->dev, "%s: failed to get irq\n",
__func__);
@@ -975,6 +1054,19 @@ static int tsens_register(struct tsens_p
@@ -977,6 +1056,19 @@ static int tsens_register(struct tsens_p
priv->ops->enable(priv, i);
}

Expand Down
2 changes: 1 addition & 1 deletion ...inux/ipq806x/patches-5.10/104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch
View file
Expand Up @@ -14,7 +14,7 @@ Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>

--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -966,6 +966,9 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, t
@@ -968,6 +968,9 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, t

static const struct of_device_id tsens_table[] = {
{
Expand Down
99 changes: 0 additions & 99 deletions target/linux/ipq806x/patches-5.10/106-5.13-net-stmmac-Set-FIFO-sizes-for-ipq806x.patch
View file

This file was deleted.

0 comments on commit 8615573

Please sign in to comment.