Skip to content

Commit

Permalink
kernel: bump 5.15 to 5.15.54 (coolsnowwolf#9749)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aakkll
aakkll authored Jul 13, 2022
1 parent c73b2f4 commit e22356a
Show file tree
Hide file tree
Showing 19 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .53
LINUX_KERNEL_HASH-5.15.53 = f3aa717243051f3fcca90ebfe26fe5c3a596c2f6047846e8d1724ea90df77b07
LINUX_VERSION-5.15 = .54
LINUX_KERNEL_HASH-5.15.54 = 594f548bb0a73e9c08deef838836c984666709687257a624c5ccaf9ae056ce4d
4 changes: 2 additions & 2 deletions target/linux/generic/backport-5.15/747-v5.16-12-net-dsa-qca8k-add-support-for-QCA8328.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <[email protected]>
if (ret)
return ret;
}
@@ -2105,7 +2112,12 @@ static int qca8k_resume(struct device *d
@@ -2124,7 +2131,12 @@ static int qca8k_resume(struct device *d
static SIMPLE_DEV_PM_OPS(qca8k_pm_ops,
qca8k_suspend, qca8k_resume);

Expand All @@ -56,7 +56,7 @@ Signed-off-by: David S. Miller <[email protected]>
.id = QCA8K_ID_QCA8327,
};

@@ -2114,7 +2126,8 @@ static const struct qca8k_match_data qca
@@ -2133,7 +2145,8 @@ static const struct qca8k_match_data qca
};

static const struct of_device_id qca8k_of_match[] = {
Expand Down
8 changes: 4 additions & 4 deletions ...ic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Signed-off-by: David S. Miller <[email protected]>
mask);
}

@@ -1916,11 +1911,11 @@ qca8k_port_vlan_filtering(struct dsa_swi
@@ -1935,11 +1930,11 @@ qca8k_port_vlan_filtering(struct dsa_swi

if (vlan_filtering) {
ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
Expand All @@ -232,7 +232,7 @@ Signed-off-by: David S. Miller <[email protected]>
QCA8K_PORT_LOOKUP_VLAN_MODE_NONE);
}

@@ -1944,10 +1939,9 @@ qca8k_port_vlan_add(struct dsa_switch *d
@@ -1963,10 +1958,9 @@ qca8k_port_vlan_add(struct dsa_switch *d
}

if (pvid) {
Expand All @@ -245,7 +245,7 @@ Signed-off-by: David S. Miller <[email protected]>
if (ret)
return ret;

@@ -2041,7 +2035,7 @@ static int qca8k_read_switch_id(struct q
@@ -2060,7 +2054,7 @@ static int qca8k_read_switch_id(struct q
if (ret < 0)
return -ENODEV;

Expand All @@ -254,7 +254,7 @@ Signed-off-by: David S. Miller <[email protected]>
if (id != data->id) {
dev_err(priv->dev, "Switch id detected %x but expected %x", id, data->id);
return -ENODEV;
@@ -2050,7 +2044,7 @@ static int qca8k_read_switch_id(struct q
@@ -2069,7 +2063,7 @@ static int qca8k_read_switch_id(struct q
priv->switch_id = id;

/* Save revision to communicate to the internal PHY driver */
Expand Down
2 changes: 1 addition & 1 deletion ...neric/backport-5.15/756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <[email protected]>
ret = qca8k_setup_mdio_bus(priv);
if (ret)
return ret;
@@ -2077,6 +2071,14 @@ qca8k_sw_probe(struct mdio_device *mdiod
@@ -2096,6 +2090,14 @@ qca8k_sw_probe(struct mdio_device *mdiod
gpiod_set_value_cansleep(priv->reset_gpio, 0);
}

Expand Down
2 changes: 1 addition & 1 deletion ...ux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Signed-off-by: David S. Miller <[email protected]>
}

static int
@@ -2154,14 +2168,17 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops,
@@ -2173,14 +2187,17 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops,
static const struct qca8k_match_data qca8327 = {
.id = QCA8K_ID_QCA8327,
.reduced_package = true,
Expand Down
2 changes: 1 addition & 1 deletion ...ux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <[email protected]>
static int
qca8k_port_enable(struct dsa_switch *ds, int port,
struct phy_device *phy)
@@ -1998,6 +2008,7 @@ static const struct dsa_switch_ops qca8k
@@ -2017,6 +2027,7 @@ static const struct dsa_switch_ops qca8k
.port_stp_state_set = qca8k_port_stp_state_set,
.port_bridge_join = qca8k_port_bridge_join,
.port_bridge_leave = qca8k_port_bridge_leave,
Expand Down
2 changes: 1 addition & 1 deletion .../linux/generic/backport-5.15/760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Signed-off-by: David S. Miller <[email protected]>
qca8k_port_enable(struct dsa_switch *ds, int port,
struct phy_device *phy)
{
@@ -1999,6 +2023,7 @@ static const struct dsa_switch_ops qca8k
@@ -2018,6 +2042,7 @@ static const struct dsa_switch_ops qca8k
.get_strings = qca8k_get_strings,
.get_ethtool_stats = qca8k_get_ethtool_stats,
.get_sset_count = qca8k_get_sset_count,
Expand Down
4 changes: 2 additions & 2 deletions .../linux/generic/backport-5.15/761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Signed-off-by: David S. Miller <[email protected]>
qca8k_vlan_access(struct qca8k_priv *priv, enum qca8k_vlan_cmd cmd, u16 vid)
{
u32 reg;
@@ -1930,6 +2005,28 @@ qca8k_port_fdb_dump(struct dsa_switch *d
@@ -1949,6 +2024,28 @@ qca8k_port_fdb_dump(struct dsa_switch *d
}

static int
Expand Down Expand Up @@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <[email protected]>
qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,
struct netlink_ext_ack *extack)
{
@@ -2037,6 +2134,8 @@ static const struct dsa_switch_ops qca8k
@@ -2056,6 +2153,8 @@ static const struct dsa_switch_ops qca8k
.port_fdb_add = qca8k_port_fdb_add,
.port_fdb_del = qca8k_port_fdb_del,
.port_fdb_dump = qca8k_port_fdb_dump,
Expand Down
4 changes: 2 additions & 2 deletions .../linux/generic/backport-5.15/762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -2027,6 +2027,99 @@ qca8k_port_mdb_del(struct dsa_switch *ds
@@ -2046,6 +2046,99 @@ qca8k_port_mdb_del(struct dsa_switch *ds
}

static int
Expand Down Expand Up @@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <[email protected]>
qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,
struct netlink_ext_ack *extack)
{
@@ -2136,6 +2229,8 @@ static const struct dsa_switch_ops qca8k
@@ -2155,6 +2248,8 @@ static const struct dsa_switch_ops qca8k
.port_fdb_dump = qca8k_port_fdb_dump,
.port_mdb_add = qca8k_port_mdb_add,
.port_mdb_del = qca8k_port_mdb_del,
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/backport-5.15/763-net-next-net-dsa-qca8k-add-LAG-support.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]>
return 0;
}

@@ -2207,6 +2210,178 @@ qca8k_get_tag_protocol(struct dsa_switch
@@ -2226,6 +2229,178 @@ qca8k_get_tag_protocol(struct dsa_switch
return DSA_TAG_PROTO_QCA;
}

Expand Down Expand Up @@ -214,7 +214,7 @@ Signed-off-by: David S. Miller <[email protected]>
static const struct dsa_switch_ops qca8k_switch_ops = {
.get_tag_protocol = qca8k_get_tag_protocol,
.setup = qca8k_setup,
@@ -2240,6 +2415,8 @@ static const struct dsa_switch_ops qca8k
@@ -2259,6 +2434,8 @@ static const struct dsa_switch_ops qca8k
.phylink_mac_link_down = qca8k_phylink_mac_link_down,
.phylink_mac_link_up = qca8k_phylink_mac_link_up,
.get_phy_flags = qca8k_get_phy_flags,
Expand Down
4 changes: 2 additions & 2 deletions ...t/linux/generic/backport-5.15/764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -2232,7 +2232,7 @@ qca8k_lag_can_offload(struct dsa_switch
@@ -2251,7 +2251,7 @@ qca8k_lag_can_offload(struct dsa_switch
if (info->tx_type != NETDEV_LAG_TX_TYPE_HASH)
return false;

Expand All @@ -28,7 +28,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
info->hash_type != NETDEV_LAG_HASH_L23)
return false;

@@ -2246,8 +2246,8 @@ qca8k_lag_setup_hash(struct dsa_switch *
@@ -2265,8 +2265,8 @@ qca8k_lag_setup_hash(struct dsa_switch *
{
struct qca8k_priv *priv = ds->priv;
bool unique_lag = true;
Expand Down
4 changes: 2 additions & 2 deletions .../linux/generic/backport-5.15/766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -2382,6 +2382,20 @@ qca8k_port_lag_leave(struct dsa_switch *
@@ -2401,6 +2401,20 @@ qca8k_port_lag_leave(struct dsa_switch *
return qca8k_lag_refresh_portmap(ds, port, lag, true);
}

Expand All @@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <[email protected]>
static const struct dsa_switch_ops qca8k_switch_ops = {
.get_tag_protocol = qca8k_get_tag_protocol,
.setup = qca8k_setup,
@@ -2417,6 +2431,7 @@ static const struct dsa_switch_ops qca8k
@@ -2436,6 +2450,7 @@ static const struct dsa_switch_ops qca8k
.get_phy_flags = qca8k_get_phy_flags,
.port_lag_join = qca8k_port_lag_join,
.port_lag_leave = qca8k_port_lag_leave,
Expand Down
6 changes: 3 additions & 3 deletions ...x/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ Signed-off-by: David S. Miller <[email protected]>
qca8k_split_addr(reg, &r1, &r2, &page);

mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
@@ -2393,7 +2591,30 @@ qca8k_master_change(struct dsa_switch *d
@@ -2412,7 +2610,30 @@ qca8k_master_change(struct dsa_switch *d
if (dp->index != 0)
return;

Expand Down Expand Up @@ -307,15 +307,15 @@ Signed-off-by: David S. Miller <[email protected]>
}

static const struct dsa_switch_ops qca8k_switch_ops = {
@@ -2432,6 +2653,7 @@ static const struct dsa_switch_ops qca8k
@@ -2451,6 +2672,7 @@ static const struct dsa_switch_ops qca8k
.port_lag_join = qca8k_port_lag_join,
.port_lag_leave = qca8k_port_lag_leave,
.master_state_change = qca8k_master_change,
+ .connect_tag_protocol = qca8k_connect_tag_protocol,
};

static int qca8k_read_switch_id(struct qca8k_priv *priv)
@@ -2511,6 +2733,9 @@ qca8k_sw_probe(struct mdio_device *mdiod
@@ -2530,6 +2752,9 @@ qca8k_sw_probe(struct mdio_device *mdiod
if (!priv->ds)
return -ENOMEM;

Expand Down
6 changes: 3 additions & 3 deletions ...x/generic/backport-5.15/766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Signed-off-by: David S. Miller <[email protected]>
match_data = of_device_get_match_data(priv->dev);

for (i = 0; i < match_data->mib_count; i++) {
@@ -2592,9 +2690,11 @@ qca8k_master_change(struct dsa_switch *d
@@ -2611,9 +2709,11 @@ qca8k_master_change(struct dsa_switch *d
return;

mutex_lock(&priv->mgmt_eth_data.mutex);
Expand All @@ -159,15 +159,15 @@ Signed-off-by: David S. Miller <[email protected]>
mutex_unlock(&priv->mgmt_eth_data.mutex);
}

@@ -2608,6 +2708,7 @@ static int qca8k_connect_tag_protocol(st
@@ -2627,6 +2727,7 @@ static int qca8k_connect_tag_protocol(st
tagger_data = ds->tagger_data;

tagger_data->rw_reg_ack_handler = qca8k_rw_reg_ack_handler;
+ tagger_data->mib_autocast_handler = qca8k_mib_autocast_handler;

break;
default:
@@ -2736,6 +2837,9 @@ qca8k_sw_probe(struct mdio_device *mdiod
@@ -2755,6 +2856,9 @@ qca8k_sw_probe(struct mdio_device *mdiod
mutex_init(&priv->mgmt_eth_data.mutex);
init_completion(&priv->mgmt_eth_data.rw_done);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ Signed-off-by: David S. Miller <[email protected]>

if (ret < 0)
return 0xffff;
@@ -3041,6 +3037,8 @@ qca8k_sw_probe(struct mdio_device *mdiod
@@ -3060,6 +3056,8 @@ qca8k_sw_probe(struct mdio_device *mdiod
return PTR_ERR(priv->regmap);
}

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/backport-5.15/766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Signed-off-by: David S. Miller <[email protected]>

mutex_unlock(&bus->mdio_lock);

@@ -3038,6 +3073,8 @@ qca8k_sw_probe(struct mdio_device *mdiod
@@ -3057,6 +3092,8 @@ qca8k_sw_probe(struct mdio_device *mdiod
}

priv->mdio_cache.page = 0xffff;
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.15/204-module_strip.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

#ifdef CONFIG_MODVERSIONS

@@ -3227,9 +3229,11 @@ static int setup_load_info(struct load_i
@@ -3266,9 +3268,11 @@ static int setup_load_info(struct load_i

static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
Expand All @@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;

@@ -3250,6 +3254,7 @@ static int check_modinfo(struct module *
@@ -3289,6 +3293,7 @@ static int check_modinfo(struct module *
mod->name);
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
}
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.15/904-debloat_dma_buf.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
+dma-shared-buffer-objs := $(dma-buf-objs-y)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -1506,4 +1506,5 @@ static void __exit dma_buf_deinit(void)
@@ -1513,4 +1513,5 @@ static void __exit dma_buf_deinit(void)
kern_unmount(dma_buf_mnt);
dma_buf_uninit_sysfs_statistics();
}
Expand Down
2 changes: 1 addition & 1 deletion target/linux/rockchip/patches-5.15/208-rockchip-rk3399-add-support-for-GuangMiao-G4C.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -32,6 +32,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gr
@@ -33,6 +33,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gr
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb
Expand Down

0 comments on commit e22356a

Please sign in to comment.