ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-02 09:18:05 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.112

Browse Source 
Manually rebased:
  ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit cab20be008591f89dd89c4e444cdf022fa7f57eb)
This commit is contained in:
John Audia 2022-04-20 06:44:30 -04:00 committed by Hauke Mehrtens
parent fa8e050c4b
commit e9c14fa85f
11 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.10
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .111 LINUX_VERSION-5.10 = .112
LINUX_KERNEL_HASH-5.10.111 = 1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a LINUX_KERNEL_HASH-5.10.112 = 8c6c1dc361ebb1ef63a7666b2069c9d7cdcec8ebb706b03780af1c8bb03b4aa5

6
target/linux/ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch
View File

@ -14,13 +14,13 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/drivers/net/mdio/mdio-bitbang.c --- a/drivers/net/mdio/mdio-bitbang.c
+++ b/drivers/net/mdio/mdio-bitbang.c +++ b/drivers/net/mdio/mdio-bitbang.c
@@ -14,6 +14,7 @@ @@ -15,6 +15,7 @@
* Vitaly Bordug <vbordug@ru.mvista.com>
*/ */
#include <linux/delay.h>
+#include <linux/irqflags.h> +#include <linux/irqflags.h>
#include <linux/module.h>
#include <linux/mdio-bitbang.h> #include <linux/mdio-bitbang.h>
#include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
@@ -153,7 +154,9 @@ static int mdiobb_read(struct mii_bus *b @@ -153,7 +154,9 @@ static int mdiobb_read(struct mii_bus *b
{ {

4
target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
View File

@ -201,7 +201,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5605,17 +5605,19 @@ static void dm_update_crtc_active_planes @@ -5606,17 +5606,19 @@ static void dm_update_crtc_active_planes
} }
static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc, static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
@ -225,7 +225,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
WARN_ON(1); WARN_ON(1);
return ret; return ret;
} }
@@ -5626,8 +5628,8 @@ static int dm_crtc_helper_atomic_check(s @@ -5627,8 +5629,8 @@ static int dm_crtc_helper_atomic_check(s
* planes are disabled, which is not supported by the hardware. And there is legacy * planes are disabled, which is not supported by the hardware. And there is legacy
* userspace which stops using the HW cursor altogether in response to the resulting EINVAL. * userspace which stops using the HW cursor altogether in response to the resulting EINVAL.
*/ */

2
target/linux/bcm27xx/patches-5.10/950-0527-drm-connector-Create-a-helper-to-attach-the-hdr_outp.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6531,9 +6531,7 @@ void amdgpu_dm_connector_init_helper(str @@ -6532,9 +6532,7 @@ void amdgpu_dm_connector_init_helper(str
if (connector_type == DRM_MODE_CONNECTOR_HDMIA || if (connector_type == DRM_MODE_CONNECTOR_HDMIA ||
connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
connector_type == DRM_MODE_CONNECTOR_eDP) { connector_type == DRM_MODE_CONNECTOR_eDP) {

4
target/linux/bcm27xx/patches-5.10/950-0528-drm-connector-Add-helper-to-compare-HDR-metadata.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5476,25 +5476,6 @@ static int fill_hdr_info_packet(const st @@ -5477,25 +5477,6 @@ static int fill_hdr_info_packet(const st
return 0; return 0;
} }
@ -47,7 +47,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static int static int
amdgpu_dm_connector_atomic_check(struct drm_connector *conn, amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
struct drm_atomic_state *state) struct drm_atomic_state *state)
@@ -5510,7 +5491,7 @@ amdgpu_dm_connector_atomic_check(struct @@ -5511,7 +5492,7 @@ amdgpu_dm_connector_atomic_check(struct
if (!crtc) if (!crtc)
return 0; return 0;

2
target/linux/bcm27xx/patches-5.10/950-0689-drm-automatic-legacy-gamma-support.patch
View File

@ -42,7 +42,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4992,7 +4992,6 @@ static void dm_disable_vblank(struct drm @@ -4993,7 +4993,6 @@ static void dm_disable_vblank(struct drm
static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
.reset = dm_crtc_reset_state, .reset = dm_crtc_reset_state,
.destroy = amdgpu_dm_crtc_destroy, .destroy = amdgpu_dm_crtc_destroy,

2
target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@ -1294,7 +1294,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -398,7 +398,7 @@ static int socfpga_dwmac_probe(struct pl @@ -395,7 +395,7 @@ static int socfpga_dwmac_probe(struct pl
if (ret) if (ret)
return ret; return ret;

8
target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
--- a/drivers/net/dsa/mt7530.c --- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c
@@ -1000,9 +1000,6 @@ mt753x_cpu_port_enable(struct dsa_switch @@ -998,9 +998,6 @@ mt753x_cpu_port_enable(struct dsa_switch
mt7530_write(priv, MT7530_PVC_P(port), mt7530_write(priv, MT7530_PVC_P(port),
PORT_SPEC_TAG); PORT_SPEC_TAG);
@ -24,7 +24,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
/* Set CPU port number */ /* Set CPU port number */
if (priv->id == ID_MT7621) if (priv->id == ID_MT7621)
mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port)); mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));
@@ -1138,6 +1135,20 @@ mt7530_stp_state_set(struct dsa_switch * @@ -1131,6 +1128,20 @@ mt7530_stp_state_set(struct dsa_switch *
} }
static int static int
@ -45,7 +45,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
mt7530_port_bridge_join(struct dsa_switch *ds, int port, mt7530_port_bridge_join(struct dsa_switch *ds, int port,
struct net_device *bridge) struct net_device *bridge)
{ {
@@ -1357,6 +1368,63 @@ err: @@ -1331,6 +1342,63 @@ err:
} }
static int static int
@ -109,7 +109,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid) mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid)
{ {
struct mt7530_dummy_poll p; struct mt7530_dummy_poll p;
@@ -2794,11 +2862,15 @@ static const struct dsa_switch_ops mt753 @@ -2745,11 +2813,15 @@ static const struct dsa_switch_ops mt753
.port_change_mtu = mt7530_port_change_mtu, .port_change_mtu = mt7530_port_change_mtu,
.port_max_mtu = mt7530_port_max_mtu, .port_max_mtu = mt7530_port_max_mtu,
.port_stp_state_set = mt7530_stp_state_set, .port_stp_state_set = mt7530_stp_state_set,

26
target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
@@ -602,18 +603,14 @@ mt7530_mib_reset(struct dsa_switch *ds) @@ -600,18 +601,14 @@ mt7530_mib_reset(struct dsa_switch *ds)
mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE); mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE);
} }
@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return mdiobus_write_nested(priv->bus, port, regnum, val); return mdiobus_write_nested(priv->bus, port, regnum, val);
} }
@@ -791,9 +788,8 @@ out: @@ -789,9 +786,8 @@ out:
} }
static int static int
@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int devad; int devad;
int ret; int ret;
@@ -809,10 +805,9 @@ mt7531_ind_phy_read(struct dsa_switch *d @@ -807,10 +803,9 @@ mt7531_ind_phy_read(struct dsa_switch *d
} }
static int static int
@ -71,7 +71,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int devad; int devad;
int ret; int ret;
@@ -828,6 +823,22 @@ mt7531_ind_phy_write(struct dsa_switch * @@ -826,6 +821,22 @@ mt7531_ind_phy_write(struct dsa_switch *
return ret; return ret;
} }
@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void static void
mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset, mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset,
uint8_t *data) uint8_t *data)
@@ -1824,6 +1835,210 @@ mt7530_setup_gpio(struct mt7530_priv *pr @@ -1793,6 +1804,210 @@ mt7530_setup_gpio(struct mt7530_priv *pr
return devm_gpiochip_add_data(dev, gc, priv); return devm_gpiochip_add_data(dev, gc, priv);
} }
@ -305,7 +305,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int static int
mt7530_setup(struct dsa_switch *ds) mt7530_setup(struct dsa_switch *ds)
{ {
@@ -2798,24 +3013,20 @@ static int @@ -2749,24 +2964,20 @@ static int
mt753x_setup(struct dsa_switch *ds) mt753x_setup(struct dsa_switch *ds)
{ {
struct mt7530_priv *priv = ds->priv; struct mt7530_priv *priv = ds->priv;
@ -340,7 +340,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} }
static int mt753x_get_mac_eee(struct dsa_switch *ds, int port, static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,
@@ -2852,8 +3063,6 @@ static const struct dsa_switch_ops mt753 @@ -2803,8 +3014,6 @@ static const struct dsa_switch_ops mt753
.get_tag_protocol = mtk_get_tag_protocol, .get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup, .setup = mt753x_setup,
.get_strings = mt7530_get_strings, .get_strings = mt7530_get_strings,
@ -349,7 +349,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
.get_ethtool_stats = mt7530_get_ethtool_stats, .get_ethtool_stats = mt7530_get_ethtool_stats,
.get_sset_count = mt7530_get_sset_count, .get_sset_count = mt7530_get_sset_count,
.set_ageing_time = mt7530_set_ageing_time, .set_ageing_time = mt7530_set_ageing_time,
@@ -3036,6 +3245,9 @@ mt7530_remove(struct mdio_device *mdiode @@ -2987,6 +3196,9 @@ mt7530_remove(struct mdio_device *mdiode
dev_err(priv->dev, "Failed to disable io pwr: %d\n", dev_err(priv->dev, "Failed to disable io pwr: %d\n",
ret); ret);
@ -369,7 +369,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#define MT7530_CPU_PORT 6 #define MT7530_CPU_PORT 6
#define MT7530_NUM_FDB_RECORDS 2048 #define MT7530_NUM_FDB_RECORDS 2048
#define MT7530_ALL_MEMBERS 0xff #define MT7530_ALL_MEMBERS 0xff
@@ -401,6 +402,12 @@ enum mt7531_sgmii_force_duplex { @@ -392,6 +393,12 @@ enum mt7531_sgmii_force_duplex {
#define SYS_CTRL_SW_RST BIT(1) #define SYS_CTRL_SW_RST BIT(1)
#define SYS_CTRL_REG_RST BIT(0) #define SYS_CTRL_REG_RST BIT(0)
@ -382,7 +382,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Register for PHY Indirect Access Control */ /* Register for PHY Indirect Access Control */
#define MT7531_PHY_IAC 0x701C #define MT7531_PHY_IAC 0x701C
#define MT7531_PHY_ACS_ST BIT(31) #define MT7531_PHY_ACS_ST BIT(31)
@@ -722,6 +729,8 @@ static const char *p5_intf_modes(unsigne @@ -713,6 +720,8 @@ static const char *p5_intf_modes(unsigne
} }
} }
@ -391,7 +391,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* struct mt753x_info - This is the main data structure for holding the specific /* struct mt753x_info - This is the main data structure for holding the specific
* part for each supported device * part for each supported device
* @sw_setup: Holding the handler to a device initialization * @sw_setup: Holding the handler to a device initialization
@@ -746,8 +755,8 @@ struct mt753x_info { @@ -737,8 +746,8 @@ struct mt753x_info {
enum mt753x_id id; enum mt753x_id id;
int (*sw_setup)(struct dsa_switch *ds); int (*sw_setup)(struct dsa_switch *ds);
@ -402,7 +402,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int (*pad_setup)(struct dsa_switch *ds, phy_interface_t interface); int (*pad_setup)(struct dsa_switch *ds, phy_interface_t interface);
int (*cpu_port_config)(struct dsa_switch *ds, int port); int (*cpu_port_config)(struct dsa_switch *ds, int port);
bool (*phy_mode_supported)(struct dsa_switch *ds, int port, bool (*phy_mode_supported)(struct dsa_switch *ds, int port,
@@ -781,6 +790,10 @@ struct mt753x_info { @@ -772,6 +781,10 @@ struct mt753x_info {
* registers * registers
* @p6_interface Holding the current port 6 interface * @p6_interface Holding the current port 6 interface
* @p5_intf_sel: Holding the current port 5 interface select * @p5_intf_sel: Holding the current port 5 interface select
@ -413,7 +413,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
*/ */
struct mt7530_priv { struct mt7530_priv {
struct device *dev; struct device *dev;
@@ -802,6 +815,9 @@ struct mt7530_priv { @@ -793,6 +806,9 @@ struct mt7530_priv {
struct mt7530_port ports[MT7530_NUM_PORTS]; struct mt7530_port ports[MT7530_NUM_PORTS];
/* protect among processes for registers access*/ /* protect among processes for registers access*/
struct mutex reg_mutex; struct mutex reg_mutex;

8
target/linux/generic/pending-5.10/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/** /**
* ata_build_rw_tf - Build ATA taskfile for given read/write request * ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile * @tf: Target ATA taskfile
@@ -4548,6 +4561,9 @@ struct ata_queued_cmd *ata_qc_new_init(s @@ -4551,6 +4564,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0) if (tag < 0)
return NULL; return NULL;
} }
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag); qc = __ata_qc_from_tag(ap, tag);
qc->tag = qc->hw_tag = tag; qc->tag = qc->hw_tag = tag;
@@ -5326,6 +5342,9 @@ struct ata_port *ata_port_alloc(struct a @@ -5329,6 +5345,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1; ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1; ap->stats.idle_irq = 1;
#endif #endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap); ata_sff_port_init(ap);
return ap; return ap;
@@ -5361,6 +5380,12 @@ static void ata_host_release(struct kref @@ -5364,6 +5383,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link); kfree(ap->pmp_link);
kfree(ap->slave_link); kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap); kfree(ap);
host->ports[i] = NULL; host->ports[i] = NULL;
} }
@@ -5767,7 +5792,23 @@ int ata_host_register(struct ata_host *h @@ -5770,7 +5795,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1; host->ports[i]->local_port_no = i + 1;
} }

4
target/linux/oxnas/patches-5.10/999-libata-hacks.patch
View File

@ -15,7 +15,7 @@
/* initialize internal qc */ /* initialize internal qc */
qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL);
@@ -4555,6 +4563,9 @@ struct ata_queued_cmd *ata_qc_new_init(s @@ -4558,6 +4566,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL; return NULL;
@ -25,7 +25,7 @@
/* libsas case */ /* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) { if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap); tag = ata_sas_allocate_tag(ap);
@@ -4600,6 +4611,8 @@ void ata_qc_free(struct ata_queued_cmd * @@ -4603,6 +4614,8 @@ void ata_qc_free(struct ata_queued_cmd *
qc->tag = ATA_TAG_POISON; qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST) if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap); ata_sas_free_tag(tag, ap);