kernel: bump 5.10 to 5.10.112

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>
This commit is contained in:
John Audia 2022-04-20 06:44:30 -04:00 committed by Hauke Mehrtens
parent b8ed98b100
commit cab20be008
10 changed files with 24 additions and 26 deletions

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

View File

@ -1,8 +1,6 @@
Index: linux-5.15.31/net/ethernet/eth.c --- a/net/ethernet/eth.c
=================================================================== +++ b/net/ethernet/eth.c
--- linux-5.15.31.orig/net/ethernet/eth.c @@ -545,6 +545,63 @@ int eth_platform_get_mac_address(struct
+++ linux-5.15.31/net/ethernet/eth.c
@@ -544,6 +544,63 @@ int eth_platform_get_mac_address(struct
} }
EXPORT_SYMBOL(eth_platform_get_mac_address); EXPORT_SYMBOL(eth_platform_get_mac_address);
@ -64,9 +62,9 @@ Index: linux-5.15.31/net/ethernet/eth.c
+}; +};
+ +
/** /**
* nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named * Obtain the MAC address from an nvmem cell named 'mac-address' associated
* 'mac-address' associated with given device. * with given device.
@@ -557,19 +614,23 @@ int nvmem_get_mac_address(struct device @@ -558,19 +615,23 @@ int nvmem_get_mac_address(struct device
{ {
struct nvmem_cell *cell; struct nvmem_cell *cell;
const void *mac; const void *mac;

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
{ {

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.
*/ */

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) {

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;

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,

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;

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;
} }

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);