Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.113
Browse files Browse the repository at this point in the history 
All 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>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed Apr 30, 2022
1 parent d9ea9c0 commit e08942e
Show file tree
Hide file tree
Showing 15 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
View file
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .112
LINUX_KERNEL_HASH-5.10.112 = 8c6c1dc361ebb1ef63a7666b2069c9d7cdcec8ebb706b03780af1c8bb03b4aa5
LINUX_VERSION-5.10 = .113
LINUX_KERNEL_HASH-5.10.113 = 82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc
22 changes: 11 additions & 11 deletions target/linux/at91/patches-5.10/115-net-macb-add-userio-bits-as-platform-configuration.patch
View file
Expand Up @@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#ifdef CONFIG_MACB_USE_HWSTAMP
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3823,15 +3823,15 @@ static int macb_init(struct platform_dev
@@ -3831,15 +3831,15 @@ static int macb_init(struct platform_dev
if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) {
val = 0;
if (phy_interface_mode_is_rgmii(bp->phy_interface))
Expand All @@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

macb_or_gem_writel(bp, USRIO, val);
}
@@ -4349,6 +4349,13 @@ static int fu540_c000_init(struct platfo
@@ -4357,6 +4357,13 @@ static int fu540_c000_init(struct platfo
return macb_init(pdev);
}

Expand All @@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct macb_config fu540_c000_config = {
.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |
MACB_CAPS_GEM_HAS_PTP,
@@ -4356,12 +4363,14 @@ static const struct macb_config fu540_c0
@@ -4364,12 +4371,14 @@ static const struct macb_config fu540_c0
.clk_init = fu540_c000_clk_init,
.init = fu540_c000_init,
.jumbo_max_len = 10240,
Expand All @@ -98,39 +98,39 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};

static const struct macb_config sama5d3macb_config = {
@@ -4369,6 +4378,7 @@ static const struct macb_config sama5d3m
@@ -4377,6 +4386,7 @@ static const struct macb_config sama5d3m
| MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,
.clk_init = macb_clk_init,
.init = macb_init,
+ .usrio = &macb_default_usrio,
};

static const struct macb_config pc302gem_config = {
@@ -4376,6 +4386,7 @@ static const struct macb_config pc302gem
@@ -4384,6 +4394,7 @@ static const struct macb_config pc302gem
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
+ .usrio = &macb_default_usrio,
};

static const struct macb_config sama5d2_config = {
@@ -4383,6 +4394,7 @@ static const struct macb_config sama5d2_
@@ -4391,6 +4402,7 @@ static const struct macb_config sama5d2_
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
+ .usrio = &macb_default_usrio,
};

static const struct macb_config sama5d3_config = {
@@ -4392,6 +4404,7 @@ static const struct macb_config sama5d3_
@@ -4400,6 +4412,7 @@ static const struct macb_config sama5d3_
.clk_init = macb_clk_init,
.init = macb_init,
.jumbo_max_len = 10240,
+ .usrio = &macb_default_usrio,
};

static const struct macb_config sama5d4_config = {
@@ -4399,18 +4412,21 @@ static const struct macb_config sama5d4_
@@ -4407,18 +4420,21 @@ static const struct macb_config sama5d4_
.dma_burst_length = 4,
.clk_init = macb_clk_init,
.init = macb_init,
Expand All @@ -152,23 +152,23 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};

static const struct macb_config zynqmp_config = {
@@ -4421,6 +4437,7 @@ static const struct macb_config zynqmp_c
@@ -4429,6 +4445,7 @@ static const struct macb_config zynqmp_c
.clk_init = macb_clk_init,
.init = macb_init,
.jumbo_max_len = 10240,
+ .usrio = &macb_default_usrio,
};

static const struct macb_config zynq_config = {
@@ -4429,6 +4446,7 @@ static const struct macb_config zynq_con
@@ -4437,6 +4454,7 @@ static const struct macb_config zynq_con
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
+ .usrio = &macb_default_usrio,
};

static const struct of_device_id macb_dt_ids[] = {
@@ -4549,6 +4567,8 @@ static int macb_probe(struct platform_de
@@ -4557,6 +4575,8 @@ static int macb_probe(struct platform_de
bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;
device_set_wakeup_capable(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);

Expand Down
8 changes: 4 additions & 4 deletions target/linux/at91/patches-5.10/117-net-macb-add-function-to-disable-all-macb-clocks.patch
View file
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3598,6 +3598,20 @@ static void macb_probe_queues(void __iom
@@ -3606,6 +3606,20 @@ static void macb_probe_queues(void __iom
*num_queues = hweight32(*queue_mask);
}

Expand All @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
struct clk **hclk, struct clk **tx_clk,
struct clk **rx_clk, struct clk **tsu_clk)
@@ -4660,11 +4674,7 @@ err_out_free_netdev:
@@ -4668,11 +4682,7 @@ err_out_free_netdev:
free_netdev(dev);

err_disable_clocks:
Expand All @@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev);
pm_runtime_dont_use_autosuspend(&pdev->dev);
@@ -4689,11 +4699,8 @@ static int macb_remove(struct platform_d
@@ -4697,11 +4707,8 @@ static int macb_remove(struct platform_d
pm_runtime_disable(&pdev->dev);
pm_runtime_dont_use_autosuspend(&pdev->dev);
if (!pm_runtime_suspended(&pdev->dev)) {
Expand All @@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
pm_runtime_set_suspended(&pdev->dev);
}
phylink_destroy(bp->phylink);
@@ -4872,13 +4879,10 @@ static int __maybe_unused macb_runtime_s
@@ -4880,13 +4887,10 @@ static int __maybe_unused macb_runtime_s
struct net_device *netdev = dev_get_drvdata(dev);
struct macb *bp = netdev_priv(netdev);

Expand Down
4 changes: 2 additions & 2 deletions target/linux/at91/patches-5.10/118-net-macb-unprepare-clocks-in-case-of-failure.patch
View file
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4330,8 +4330,10 @@ static int fu540_c000_clk_init(struct pl
@@ -4338,8 +4338,10 @@ static int fu540_c000_clk_init(struct pl
return err;

mgmt = devm_kzalloc(&pdev->dev, sizeof(*mgmt), GFP_KERNEL);
Expand All @@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

init.name = "sifive-gemgxl-mgmt";
init.ops = &fu540_c000_ops;
@@ -4342,16 +4344,26 @@ static int fu540_c000_clk_init(struct pl
@@ -4350,16 +4352,26 @@ static int fu540_c000_clk_init(struct pl
mgmt->hw.init = &init;

*tx_clk = devm_clk_register(&pdev->dev, &mgmt->hw);
Expand Down
6 changes: 3 additions & 3 deletions target/linux/at91/patches-5.10/119-net-macb-add-support-for-sama7g5-gem-interface.patch
View file
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4382,6 +4382,14 @@ static const struct macb_usrio_config ma
@@ -4390,6 +4390,14 @@ static const struct macb_usrio_config ma
.refclk = MACB_BIT(CLKEN),
};

Expand All @@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct macb_config fu540_c000_config = {
.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |
MACB_CAPS_GEM_HAS_PTP,
@@ -4475,6 +4483,14 @@ static const struct macb_config zynq_con
@@ -4483,6 +4491,14 @@ static const struct macb_config zynq_con
.usrio = &macb_default_usrio,
};

Expand All @@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "cdns,at32ap7000-macb" },
{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
@@ -4492,6 +4508,7 @@ static const struct of_device_id macb_dt
@@ -4500,6 +4516,7 @@ static const struct of_device_id macb_dt
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
{ .compatible = "cdns,zynq-gem", .data = &zynq_config },
{ .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },
Expand Down
4 changes: 2 additions & 2 deletions target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch
View file
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4491,6 +4491,14 @@ static const struct macb_config sama7g5_
@@ -4499,6 +4499,14 @@ static const struct macb_config sama7g5_
.usrio = &sama7g5_usrio,
};

Expand All @@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "cdns,at32ap7000-macb" },
{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
@@ -4509,6 +4517,7 @@ static const struct of_device_id macb_dt
@@ -4517,6 +4525,7 @@ static const struct of_device_id macb_dt
{ .compatible = "cdns,zynq-gem", .data = &zynq_config },
{ .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },
{ .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config },
Expand Down
8 changes: 4 additions & 4 deletions ...et/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
View file
Expand Up @@ -238,7 +238,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
while (!(at_xdmac_chan_read(atchan, AT_XDMAC_CIS) & AT_XDMAC_CIS_FIS))
cpu_relax();
}
@@ -1760,7 +1810,7 @@ static int at_xdmac_device_pause(struct
@@ -1762,7 +1812,7 @@ static int at_xdmac_device_pause(struct
return 0;

spin_lock_irqsave(&atchan->lock, flags);
Expand All @@ -247,7 +247,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
while (at_xdmac_chan_read(atchan, AT_XDMAC_CC)
& (AT_XDMAC_CC_WRIP | AT_XDMAC_CC_RDIP))
cpu_relax();
@@ -1783,7 +1833,7 @@ static int at_xdmac_device_resume(struct
@@ -1785,7 +1835,7 @@ static int at_xdmac_device_resume(struct
return 0;
}

Expand All @@ -256,7 +256,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
spin_unlock_irqrestore(&atchan->lock, flags);

@@ -1985,6 +2035,10 @@ static int at_xdmac_probe(struct platfor
@@ -1987,6 +2037,10 @@ static int at_xdmac_probe(struct platfor
atxdmac->regs = base;
atxdmac->irq = irq;

Expand All @@ -267,7 +267,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
atxdmac->clk = devm_clk_get(&pdev->dev, "dma_clk");
if (IS_ERR(atxdmac->clk)) {
dev_err(&pdev->dev, "can't get dma_clk\n");
@@ -2127,6 +2181,10 @@ static const struct dev_pm_ops atmel_xdm
@@ -2129,6 +2183,10 @@ static const struct dev_pm_ops atmel_xdm
static const struct of_device_id atmel_xdmac_dt_ids[] = {
{
.compatible = "atmel,sama5d4-dma",
Expand Down
4 changes: 2 additions & 2 deletions ...et/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
View file
Expand Up @@ -71,7 +71,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
};

static inline void __iomem *at_xdmac_chan_reg_base(struct at_xdmac *atxdmac, unsigned int chan_nb)
@@ -1996,6 +2017,30 @@ static int atmel_xdmac_resume(struct dev
@@ -1998,6 +2019,30 @@ static int atmel_xdmac_resume(struct dev
}
#endif /* CONFIG_PM_SLEEP */

Expand Down Expand Up @@ -102,7 +102,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
static int at_xdmac_probe(struct platform_device *pdev)
{
struct at_xdmac *atxdmac;
@@ -2140,6 +2185,8 @@ static int at_xdmac_probe(struct platfor
@@ -2142,6 +2187,8 @@ static int at_xdmac_probe(struct platfor
dev_info(&pdev->dev, "%d channels, mapped at 0x%p\n",
nr_channels, atxdmac->regs);

Expand Down
6 changes: 3 additions & 3 deletions ...et/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch
View file
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3860,6 +3860,13 @@ static int macb_init(struct platform_dev
@@ -3868,6 +3868,13 @@ static int macb_init(struct platform_dev
return 0;
}

Expand All @@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#if defined(CONFIG_OF)
/* 1518 rounded up */
#define AT91ETHER_MAX_RBUFF_SZ 0x600
@@ -4375,13 +4382,6 @@ static int fu540_c000_init(struct platfo
@@ -4383,13 +4390,6 @@ static int fu540_c000_init(struct platfo
return macb_init(pdev);
}

Expand All @@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct macb_usrio_config sama7g5_usrio = {
.mii = 0,
.rmii = 1,
@@ -4530,6 +4530,7 @@ static const struct macb_config default_
@@ -4538,6 +4538,7 @@ static const struct macb_config default_
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
Expand Down
4 changes: 2 additions & 2 deletions target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
View file
Expand Up @@ -799,7 +799,7 @@
*sum = csum_fold(csum_partial(diff, sizeof(diff),
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -500,7 +500,7 @@ static inline bool is_etherdev_addr(cons
@@ -499,7 +499,7 @@ static inline bool is_etherdev_addr(cons
* @b: Pointer to Ethernet header
*
* Compare two Ethernet headers, returns 0 if equal.
Expand All @@ -808,7 +808,7 @@
* aligned OR the platform can handle unaligned access. This is the
* case for all packets coming into netif_receive_skb or similar
* entry points.
@@ -523,11 +523,12 @@ static inline unsigned long compare_ethe
@@ -522,11 +522,12 @@ static inline unsigned long compare_ethe
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
return fold;
#else
Expand Down
2 changes: 1 addition & 1 deletion .../bcm27xx/patches-5.10/950-0383-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
View file
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

--- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
@@ -299,6 +299,7 @@ static int rpi_touchscreen_enable(struct
@@ -299,6 +299,7 @@ static int rpi_touchscreen_prepare(struc
int i;

rpi_touchscreen_i2c_write(ts, REG_POWERON, 1);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/bcm27xx/patches-5.10/950-0562-drm-vc4-dsi-Introduce-a-variant-structure.patch
View file
Expand Up @@ -66,7 +66,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201203132543.861591-5-maxi
struct vc4_dsi_encoder {
@@ -837,7 +848,7 @@ static void vc4_dsi_encoder_enable(struc

ret = pm_runtime_get_sync(dev);
ret = pm_runtime_resume_and_get(dev);
if (ret) {
- DRM_ERROR("Failed to runtime PM enable on DSI%d\n", dsi->port);
+ DRM_ERROR("Failed to runtime PM enable on DSI%d\n", dsi->variant->port);
Expand Down
4 changes: 2 additions & 2 deletions ...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View file
Expand Up @@ -423,15 +423,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (bgmac->irq < 0)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4479,7 +4479,6 @@ static int macb_probe(struct platform_de
@@ -4487,7 +4487,6 @@ static int macb_probe(struct platform_de
struct net_device *dev;
struct resource *regs;
void __iomem *mem;
- const char *mac;
struct macb *bp;
int err, val;

@@ -4592,15 +4591,11 @@ static int macb_probe(struct platform_de
@@ -4600,15 +4599,11 @@ static int macb_probe(struct platform_de
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR)
bp->rx_intr_mask |= MACB_BIT(RXUBR);

Expand Down
6 changes: 3 additions & 3 deletions target/linux/generic/pending-5.10/630-packet_socket_type.patch
View file
Expand Up @@ -87,15 +87,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;

@@ -3325,6 +3327,7 @@ static int packet_create(struct net *net
@@ -3330,6 +3332,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock);
po->rollover = NULL;
po->prot_hook.func = packet_rcv;
+ po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);

if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -3969,6 +3972,16 @@ packet_setsockopt(struct socket *sock, i
@@ -3974,6 +3977,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0;
}
Expand All @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default:
return -ENOPROTOOPT;
}
@@ -4025,6 +4038,13 @@ static int packet_getsockopt(struct sock
@@ -4030,6 +4043,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
Expand Down

0 comments on commit e08942e

Please sign in to comment.