kernel: bump 5.10 to 5.10.177
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
[Refresh patches on openwrt-22.03 branch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 78a468f690)
This commit is contained in:
committed by
Hauke Mehrtens
parent
5f583d31c7
commit
dcdd8e9dee
@@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.10 = .176
|
LINUX_VERSION-5.10 = .177
|
||||||
LINUX_KERNEL_HASH-5.10.176 = ce072c60ba04173e05b2a1de3fefdeba5ac8b28b1958d92d21bdbf9b736ef793
|
LINUX_KERNEL_HASH-5.10.177 = 9f2261fea804112dcec8fa2dcc26e9c1388aa9cb7f86e5913beb00b9b5a15571
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
|
|||||||
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
|
||||||
u32 *data, int in_pm)
|
u32 *data, int in_pm)
|
||||||
{
|
{
|
||||||
@@ -1853,7 +1857,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
@@ -1859,7 +1863,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||||||
if (dev->net->features & NETIF_F_RXCSUM)
|
if (dev->net->features & NETIF_F_RXCSUM)
|
||||||
smsc95xx_rx_csum_offload(skb);
|
smsc95xx_rx_csum_offload(skb);
|
||||||
skb_trim(skb, skb->len - 4); /* remove fcs */
|
skb_trim(skb, skb->len - 4); /* remove fcs */
|
||||||
@@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
|
|||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -1871,7 +1876,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
@@ -1877,7 +1882,8 @@ static int smsc95xx_rx_fixup(struct usbn
|
||||||
if (dev->net->features & NETIF_F_RXCSUM)
|
if (dev->net->features & NETIF_F_RXCSUM)
|
||||||
smsc95xx_rx_csum_offload(ax_skb);
|
smsc95xx_rx_csum_offload(ax_skb);
|
||||||
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
|
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
|
||||||
|
|||||||
@@ -336,7 +336,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
|
|||||||
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
|
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
|
||||||
--- a/drivers/gpu/drm/i915/display/intel_display.c
|
--- a/drivers/gpu/drm/i915/display/intel_display.c
|
||||||
+++ b/drivers/gpu/drm/i915/display/intel_display.c
|
+++ b/drivers/gpu/drm/i915/display/intel_display.c
|
||||||
@@ -16562,7 +16562,6 @@ fail:
|
@@ -16563,7 +16563,6 @@ fail:
|
||||||
}
|
}
|
||||||
|
|
||||||
#define INTEL_CRTC_FUNCS \
|
#define INTEL_CRTC_FUNCS \
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201118094758.506730-1-maxi
|
|||||||
#include <drm/drm_atomic_helper.h>
|
#include <drm/drm_atomic_helper.h>
|
||||||
#include <drm/drm_dp_mst_helper.h>
|
#include <drm/drm_dp_mst_helper.h>
|
||||||
#include <drm/drm_dp_helper.h>
|
#include <drm/drm_dp_helper.h>
|
||||||
@@ -264,8 +265,10 @@ static int dm_dp_mst_get_modes(struct dr
|
@@ -283,8 +284,10 @@ static int dm_dp_mst_get_modes(struct dr
|
||||||
|
|
||||||
static struct drm_encoder *
|
static struct drm_encoder *
|
||||||
dm_mst_atomic_best_encoder(struct drm_connector *connector,
|
dm_mst_atomic_best_encoder(struct drm_connector *connector,
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
|
|||||||
|
|
||||||
--- a/arch/mips/bmips/setup.c
|
--- a/arch/mips/bmips/setup.c
|
||||||
+++ b/arch/mips/bmips/setup.c
|
+++ b/arch/mips/bmips/setup.c
|
||||||
@@ -201,4 +201,4 @@ static int __init plat_dev_init(void)
|
@@ -209,4 +209,4 @@ static int __init plat_dev_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||||||
|
|
||||||
--- a/arch/mips/bmips/setup.c
|
--- a/arch/mips/bmips/setup.c
|
||||||
+++ b/arch/mips/bmips/setup.c
|
+++ b/arch/mips/bmips/setup.c
|
||||||
@@ -31,11 +31,51 @@
|
@@ -31,13 +31,52 @@
|
||||||
|
|
||||||
#define RELO_NORMAL_VEC BIT(18)
|
#define RELO_NORMAL_VEC BIT(18)
|
||||||
|
|
||||||
@@ -55,7 +55,8 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||||||
+#define REG_BCM63268_MISC_SB ((void __iomem *)CKSEG1ADDR(0x10001814))
|
+#define REG_BCM63268_MISC_SB ((void __iomem *)CKSEG1ADDR(0x10001814))
|
||||||
+#define BCM63268_FCVO_SHIFT 21
|
+#define BCM63268_FCVO_SHIFT 21
|
||||||
+#define BCM63268_FCVO_MASK (0xf << BCM63268_FCVO_SHIFT)
|
+#define BCM63268_FCVO_MASK (0xf << BCM63268_FCVO_SHIFT)
|
||||||
+
|
|
||||||
|
extern bool bmips_rac_flush_disable;
|
||||||
|
|
||||||
static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;
|
static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;
|
||||||
|
|
||||||
@@ -67,7 +68,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||||||
struct bmips_quirk {
|
struct bmips_quirk {
|
||||||
const char *compatible;
|
const char *compatible;
|
||||||
void (*quirk_fn)(void);
|
void (*quirk_fn)(void);
|
||||||
@@ -138,17 +178,161 @@ const char *get_system_type(void)
|
@@ -146,17 +185,161 @@ const char *get_system_type(void)
|
||||||
return "Generic BMIPS kernel";
|
return "Generic BMIPS kernel";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -50,12 +50,12 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||||||
#define REG_BCM6368_DDR_PLLC ((void __iomem *)CKSEG1ADDR(0x100012a0))
|
#define REG_BCM6368_DDR_PLLC ((void __iomem *)CKSEG1ADDR(0x100012a0))
|
||||||
#define BCM6368_PLLC_P1_SHIFT 0
|
#define BCM6368_PLLC_P1_SHIFT 0
|
||||||
#define BCM6368_PLLC_P1_MASK (0xf << BCM6368_PLLC_P1_SHIFT)
|
#define BCM6368_PLLC_P1_MASK (0xf << BCM6368_PLLC_P1_SHIFT)
|
||||||
@@ -67,7 +73,21 @@
|
@@ -67,6 +73,21 @@
|
||||||
#define REG_BCM63268_MISC_SB ((void __iomem *)CKSEG1ADDR(0x10001814))
|
#define REG_BCM63268_MISC_SB ((void __iomem *)CKSEG1ADDR(0x10001814))
|
||||||
#define BCM63268_FCVO_SHIFT 21
|
#define BCM63268_FCVO_SHIFT 21
|
||||||
#define BCM63268_FCVO_MASK (0xf << BCM63268_FCVO_SHIFT)
|
#define BCM63268_FCVO_MASK (0xf << BCM63268_FCVO_SHIFT)
|
||||||
+#define BCM63268_MEMC_ADDR ((void __iomem *)CKSEG1ADDR(0x10003000))
|
+#define BCM63268_MEMC_ADDR ((void __iomem *)CKSEG1ADDR(0x10003000))
|
||||||
|
+
|
||||||
+#define SDRAM_CFG_REG 0x0
|
+#define SDRAM_CFG_REG 0x0
|
||||||
+#define SDRAM_SPACE_SHIFT 4
|
+#define SDRAM_SPACE_SHIFT 4
|
||||||
+#define SDRAM_SPACE_MASK (0xf << SDRAM_SPACE_SHIFT)
|
+#define SDRAM_SPACE_MASK (0xf << SDRAM_SPACE_SHIFT)
|
||||||
@@ -70,9 +70,9 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||||||
+
|
+
|
||||||
+#define DDR_CSEND_REG 0x8
|
+#define DDR_CSEND_REG 0x8
|
||||||
|
|
||||||
static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;
|
extern bool bmips_rac_flush_disable;
|
||||||
|
|
||||||
@@ -76,6 +96,11 @@ struct bmips_cpufreq {
|
@@ -77,6 +98,11 @@ struct bmips_cpufreq {
|
||||||
u32 (*cpu_freq)(void);
|
u32 (*cpu_freq)(void);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -84,7 +84,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||||||
struct bmips_quirk {
|
struct bmips_quirk {
|
||||||
const char *compatible;
|
const char *compatible;
|
||||||
void (*quirk_fn)(void);
|
void (*quirk_fn)(void);
|
||||||
@@ -337,9 +362,90 @@ void __init plat_time_init(void)
|
@@ -344,9 +370,90 @@ void __init plat_time_init(void)
|
||||||
mips_hpt_frequency = freq;
|
mips_hpt_frequency = freq;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|||||||
const struct bmips_quirk *q;
|
const struct bmips_quirk *q;
|
||||||
|
|
||||||
set_io_port_base(0);
|
set_io_port_base(0);
|
||||||
@@ -358,6 +464,18 @@ void __init plat_mem_setup(void)
|
@@ -365,6 +472,18 @@ void __init plat_mem_setup(void)
|
||||||
|
|
||||||
__dt_setup_arch(dtb);
|
__dt_setup_arch(dtb);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -2663,6 +2663,9 @@ static int mv88e6xxx_setup_port(struct m
|
@@ -2668,6 +2668,9 @@ static int mv88e6xxx_setup_port(struct m
|
||||||
if (dsa_is_cpu_port(ds, port))
|
if (dsa_is_cpu_port(ds, port))
|
||||||
reg = 0;
|
reg = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -3071,6 +3071,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -3074,6 +3074,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -2881,6 +2881,7 @@ static int mv88e6xxx_setup(struct dsa_sw
|
@@ -2886,6 +2886,7 @@ static int mv88e6xxx_setup(struct dsa_sw
|
||||||
|
|
||||||
chip->ds = ds;
|
chip->ds = ds;
|
||||||
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
|
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -5450,6 +5450,7 @@ static int mv88e6xxx_register_switch(str
|
@@ -5455,6 +5455,7 @@ static int mv88e6xxx_register_switch(str
|
||||||
ds->ops = &mv88e6xxx_switch_ops;
|
ds->ops = &mv88e6xxx_switch_ops;
|
||||||
ds->ageing_time_min = chip->info->age_time_coeff;
|
ds->ageing_time_min = chip->info->age_time_coeff;
|
||||||
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phy.c
|
--- a/drivers/net/phy/phy.c
|
||||||
+++ b/drivers/net/phy/phy.c
|
+++ b/drivers/net/phy/phy.c
|
||||||
@@ -58,13 +58,13 @@ static const char *phy_state_to_str(enum
|
@@ -70,13 +70,13 @@ static void phy_process_state_change(str
|
||||||
|
|
||||||
static void phy_link_up(struct phy_device *phydev)
|
static void phy_link_up(struct phy_device *phydev)
|
||||||
{
|
{
|
||||||
@@ -33,7 +33,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
phy_led_trigger_change_speed(phydev);
|
phy_led_trigger_change_speed(phydev);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -572,7 +572,7 @@ int phy_start_cable_test(struct phy_devi
|
@@ -584,7 +584,7 @@ int phy_start_cable_test(struct phy_devi
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* Mark the carrier down until the test is complete */
|
/* Mark the carrier down until the test is complete */
|
||||||
@@ -42,7 +42,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
|
|
||||||
netif_testing_on(dev);
|
netif_testing_on(dev);
|
||||||
err = phydev->drv->cable_test_start(phydev);
|
err = phydev->drv->cable_test_start(phydev);
|
||||||
@@ -643,7 +643,7 @@ int phy_start_cable_test_tdr(struct phy_
|
@@ -655,7 +655,7 @@ int phy_start_cable_test_tdr(struct phy_
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
/* Mark the carrier down until the test is complete */
|
/* Mark the carrier down until the test is complete */
|
||||||
@@ -51,7 +51,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
|
|
||||||
netif_testing_on(dev);
|
netif_testing_on(dev);
|
||||||
err = phydev->drv->cable_test_tdr_start(phydev, config);
|
err = phydev->drv->cable_test_tdr_start(phydev, config);
|
||||||
@@ -714,7 +714,7 @@ static int phy_check_link_status(struct
|
@@ -726,7 +726,7 @@ static int phy_check_link_status(struct
|
||||||
phy_link_up(phydev);
|
phy_link_up(phydev);
|
||||||
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
||||||
phydev->state = PHY_NOLINK;
|
phydev->state = PHY_NOLINK;
|
||||||
@@ -60,7 +60,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1226,7 +1226,7 @@ void phy_state_machine(struct work_struc
|
@@ -1241,7 +1241,7 @@ void phy_state_machine(struct work_struc
|
||||||
case PHY_HALTED:
|
case PHY_HALTED:
|
||||||
if (phydev->link) {
|
if (phydev->link) {
|
||||||
phydev->link = 0;
|
phydev->link = 0;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phy.c
|
--- a/drivers/net/phy/phy.c
|
||||||
+++ b/drivers/net/phy/phy.c
|
+++ b/drivers/net/phy/phy.c
|
||||||
@@ -714,7 +714,10 @@ static int phy_check_link_status(struct
|
@@ -726,7 +726,10 @@ static int phy_check_link_status(struct
|
||||||
phy_link_up(phydev);
|
phy_link_up(phydev);
|
||||||
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
||||||
phydev->state = PHY_NOLINK;
|
phydev->state = PHY_NOLINK;
|
||||||
@@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1226,7 +1229,10 @@ void phy_state_machine(struct work_struc
|
@@ -1241,7 +1244,10 @@ void phy_state_machine(struct work_struc
|
||||||
case PHY_HALTED:
|
case PHY_HALTED:
|
||||||
if (phydev->link) {
|
if (phydev->link) {
|
||||||
phydev->link = 0;
|
phydev->link = 0;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/usb/dwc2/platform.c
|
--- a/drivers/usb/dwc2/platform.c
|
||||||
+++ b/drivers/usb/dwc2/platform.c
|
+++ b/drivers/usb/dwc2/platform.c
|
||||||
@@ -477,6 +477,12 @@ static int dwc2_driver_probe(struct plat
|
@@ -465,6 +465,12 @@ static int dwc2_driver_probe(struct plat
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
return retval;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user