Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.115
Browse files Browse the repository at this point in the history 
Removed upstreamed:
  backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
  pending-5.10/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B

Signed-off-by: John Audia <therealgraysky@proton.me>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed May 16, 2022
1 parent 8592df6 commit b754b0c
Show file tree
Hide file tree
Showing 28 changed files with 45 additions and 161 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
View file
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .114
LINUX_KERNEL_HASH-5.10.114 = 07d09fb57ce355f4659097e6b538853c00cdded6d3e010b6de9a3244d9b30526
LINUX_VERSION-5.10 = .115
LINUX_KERNEL_HASH-5.10.115 = f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71
2 changes: 1 addition & 1 deletion ...t/linux/generic/backport-5.10/731-v5.12-net-dsa-mt7530-MT7530-optional-GPIO-support.patch
View file
Expand Up @@ -137,7 +137,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static int
mt7530_setup(struct dsa_switch *ds)
{
@@ -1675,6 +1779,12 @@ mt7530_setup(struct dsa_switch *ds)
@@ -1676,6 +1780,12 @@ mt7530_setup(struct dsa_switch *ds)
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...t/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
View file
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2371,6 +2371,17 @@ static void mt753x_phylink_mac_link_up(s
@@ -2372,6 +2372,17 @@ static void mt753x_phylink_mac_link_up(s
mcr |= PMCR_RX_FC_EN;
}

Expand All @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mt7530_set(priv, MT7530_PMCR_P(port), mcr);
}

@@ -2601,6 +2612,36 @@ mt753x_phy_write(struct dsa_switch *ds,
@@ -2602,6 +2613,36 @@ mt753x_phy_write(struct dsa_switch *ds,
return priv->info->phy_write(ds, port, regnum, val);
}

Expand Down Expand Up @@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct dsa_switch_ops mt7530_switch_ops = {
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
@@ -2629,6 +2670,8 @@ static const struct dsa_switch_ops mt753
@@ -2630,6 +2671,8 @@ static const struct dsa_switch_ops mt753
.phylink_mac_an_restart = mt753x_phylink_mac_an_restart,
.phylink_mac_link_down = mt753x_phylink_mac_link_down,
.phylink_mac_link_up = mt753x_phylink_mac_link_up,
Expand Down
10 changes: 5 additions & 5 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 @@ -1327,7 +1327,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -1202,7 +1202,7 @@ static int sun8i_dwmac_probe(struct plat
@@ -1203,7 +1203,7 @@ static int sun8i_dwmac_probe(struct plat
if (ret)
return -EINVAL;

Expand Down Expand Up @@ -1478,15 +1478,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (ret)
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -1267,7 +1267,6 @@ static int cpsw_probe_dt(struct cpsw_com
@@ -1269,7 +1269,6 @@ static int cpsw_probe_dt(struct cpsw_com

for_each_child_of_node(tmp_node, port_np) {
struct cpsw_slave_data *slave_data;
- const void *mac_addr;
u32 port_id;

ret = of_property_read_u32(port_np, "reg", &port_id);
@@ -1326,10 +1325,8 @@ static int cpsw_probe_dt(struct cpsw_com
@@ -1328,10 +1327,8 @@ static int cpsw_probe_dt(struct cpsw_com
goto err_node_put;
}

Expand Down Expand Up @@ -1641,15 +1641,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1113,7 +1113,6 @@ static int xemaclite_of_probe(struct pla
@@ -1122,7 +1122,6 @@ static int xemaclite_of_probe(struct pla
struct net_device *ndev = NULL;
struct net_local *lp = NULL;
struct device *dev = &ofdev->dev;
- const void *mac_address;

int rc = 0;

@@ -1155,12 +1154,9 @@ static int xemaclite_of_probe(struct pla
@@ -1164,12 +1163,9 @@ static int xemaclite_of_probe(struct pla
lp->next_rx_buf_to_use = 0x0;
lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/backport-5.10/762-v5.11-net-dsa-mt7530-support-setting-MTU.patch
View file
Expand Up @@ -73,7 +73,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static void
mt7530_stp_state_set(struct dsa_switch *ds, int port, u8 state)
{
@@ -2652,6 +2699,8 @@ static const struct dsa_switch_ops mt753
@@ -2653,6 +2700,8 @@ static const struct dsa_switch_ops mt753
.get_sset_count = mt7530_get_sset_count,
.port_enable = mt7530_port_enable,
.port_disable = mt7530_port_disable,
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/backport-5.10/763-v5.11-net-dsa-mt7530-enable-MTU-normalization.patch
View file
Expand Up @@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>

if (priv->id == ID_MT7530) {
regulator_set_voltage(priv->core_pwr, 1000000, 1000000);
@@ -1947,6 +1948,7 @@ mt7531_setup(struct dsa_switch *ds)
@@ -1948,6 +1949,7 @@ mt7531_setup(struct dsa_switch *ds)
}

ds->configure_vlan_while_not_filtering = true;
Expand Down
2 changes: 1 addition & 1 deletion ...et/linux/generic/backport-5.10/764-v5.11-net-dsa-mt7530-support-setting-ageing-time.patch
View file
Expand Up @@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
{
struct mt7530_priv *priv = ds->priv;
@@ -2699,6 +2739,7 @@ static const struct dsa_switch_ops mt753
@@ -2700,6 +2740,7 @@ static const struct dsa_switch_ops mt753
.phy_write = mt753x_phy_write,
.get_ethtool_stats = mt7530_get_ethtool_stats,
.get_sset_count = mt7530_get_sset_count,
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/backport-5.10/770-v5.15-net-dsa-mt7530-support-MDB-operations.patch
View file
Expand Up @@ -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)
{
struct mt7530_dummy_poll p;
@@ -2745,11 +2813,15 @@ static const struct dsa_switch_ops mt753
@@ -2746,11 +2814,15 @@ static const struct dsa_switch_ops mt753
.port_change_mtu = mt7530_port_change_mtu,
.port_max_mtu = mt7530_port_max_mtu,
.port_stp_state_set = mt7530_stp_state_set,
Expand Down
6 changes: 3 additions & 3 deletions target/linux/generic/backport-5.10/772-v5.14-net-dsa-mt7530-add-interrupt-support.patch
View file
Expand Up @@ -305,7 +305,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int
mt7530_setup(struct dsa_switch *ds)
{
@@ -2749,24 +2964,20 @@ static int
@@ -2750,24 +2965,20 @@ static int
mt753x_setup(struct dsa_switch *ds)
{
struct mt7530_priv *priv = ds->priv;
Expand Down Expand Up @@ -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,
@@ -2803,8 +3014,6 @@ static const struct dsa_switch_ops mt753
@@ -2804,8 +3015,6 @@ static const struct dsa_switch_ops mt753
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
.get_strings = mt7530_get_strings,
Expand All @@ -349,7 +349,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
.get_ethtool_stats = mt7530_get_ethtool_stats,
.get_sset_count = mt7530_get_sset_count,
.set_ageing_time = mt7530_set_ageing_time,
@@ -2987,6 +3196,9 @@ mt7530_remove(struct mdio_device *mdiode
@@ -2988,6 +3197,9 @@ mt7530_remove(struct mdio_device *mdiode
dev_err(priv->dev, "Failed to disable io pwr: %d\n",
ret);

Expand Down
6 changes: 3 additions & 3 deletions ...c/backport-5.10/850-v5.17-0003-PCI-aardvark-Add-support-for-DEVCAP2-DEVCTL2-LNKCAP2.patch
View file
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -883,8 +883,13 @@ advk_pci_bridge_emul_pcie_conf_read(stru
@@ -885,8 +885,13 @@ advk_pci_bridge_emul_pcie_conf_read(stru

case PCI_EXP_DEVCAP:
case PCI_EXP_DEVCTL:
Expand All @@ -35,7 +35,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
default:
return PCI_BRIDGE_EMUL_NOT_HANDLED;
}
@@ -898,10 +903,6 @@ advk_pci_bridge_emul_pcie_conf_write(str
@@ -900,10 +905,6 @@ advk_pci_bridge_emul_pcie_conf_write(str
struct advk_pcie *pcie = bridge->data;

switch (reg) {
Expand All @@ -46,7 +46,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
case PCI_EXP_LNKCTL:
advk_writel(pcie, new, PCIE_CORE_PCIEXP_CAP + reg);
if (new & PCI_EXP_LNKCTL_RL)
@@ -923,6 +924,12 @@ advk_pci_bridge_emul_pcie_conf_write(str
@@ -925,6 +926,12 @@ advk_pci_bridge_emul_pcie_conf_write(str
advk_writel(pcie, new, PCIE_ISR0_REG);
break;

Expand Down
59 changes: 0 additions & 59 deletions target/linux/generic/backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...c/backport-5.10/850-v5.17-0005-PCI-aardvark-Comment-actions-in-driver-remove-method.patch
View file
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1696,11 +1696,13 @@ static int advk_pcie_remove(struct platf
@@ -1692,11 +1692,13 @@ static int advk_pcie_remove(struct platf
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
int i;

Expand Down
4 changes: 2 additions & 2 deletions ...c/backport-5.10/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
View file
Expand Up @@ -19,15 +19,15 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1694,6 +1694,7 @@ static int advk_pcie_remove(struct platf
@@ -1690,6 +1690,7 @@ static int advk_pcie_remove(struct platf
{
struct advk_pcie *pcie = platform_get_drvdata(pdev);
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
+ u32 val;
int i;

/* Remove PCI bus with all devices */
@@ -1702,6 +1703,11 @@ static int advk_pcie_remove(struct platf
@@ -1698,6 +1699,11 @@ static int advk_pcie_remove(struct platf
pci_remove_root_bus(bridge->bus);
pci_unlock_rescan_remove();

Expand Down
2 changes: 1 addition & 1 deletion ...c/backport-5.10/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch
View file
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1708,6 +1708,27 @@ static int advk_pcie_remove(struct platf
@@ -1704,6 +1704,27 @@ static int advk_pcie_remove(struct platf
val &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
advk_writel(pcie, val, PCIE_CORE_CMD_STATUS_REG);

Expand Down
2 changes: 1 addition & 1 deletion .../generic/backport-5.10/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch
View file
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1733,6 +1733,9 @@ static int advk_pcie_remove(struct platf
@@ -1729,6 +1729,9 @@ static int advk_pcie_remove(struct platf
advk_pcie_remove_msi_irq_domain(pcie);
advk_pcie_remove_irq_domain(pcie);

Expand Down
2 changes: 1 addition & 1 deletion ...eneric/backport-5.10/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch
View file
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1736,6 +1736,10 @@ static int advk_pcie_remove(struct platf
@@ -1732,6 +1732,10 @@ static int advk_pcie_remove(struct platf
/* Free config space for emulated root bridge */
pci_bridge_emul_cleanup(&pcie->bridge);

Expand Down
2 changes: 1 addition & 1 deletion ...c/backport-5.10/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch
View file
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1740,6 +1740,11 @@ static int advk_pcie_remove(struct platf
@@ -1736,6 +1736,11 @@ static int advk_pcie_remove(struct platf
if (pcie->reset_gpio)
gpiod_set_value_cansleep(pcie->reset_gpio, 1);

Expand Down
2 changes: 1 addition & 1 deletion ...c/backport-5.10/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch
View file
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1749,6 +1749,9 @@ static int advk_pcie_remove(struct platf
@@ -1745,6 +1745,9 @@ static int advk_pcie_remove(struct platf
for (i = 0; i < OB_WIN_COUNT; i++)
advk_pcie_disable_ob_win(pcie, i);

Expand Down
57 changes: 0 additions & 57 deletions ...t/linux/generic/pending-5.10/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch
View file

This file was deleted.

0 comments on commit b754b0c

Please sign in to comment.