kernel: bump 5.15 to 5.15.72
Removed upstreamed: generic/pending-5.15/722-net-mt7531-only-do-PLL-once-after-the-reset.patch[1] bcm53xx/patches-5.15/082-v6.0-clk-iproc-Do-not-rely-on-node-name-for-correct-PLL-s.patch[2] All other patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200, mvebu/cortexa72 Run-tested: bcm2711/RPi4B, mt7622/RT3200, mvebu/cortexa72 (RB5009UG+S+IN) 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.72&id=5de02ab84aeca765da0e4d8e999af35325ac67c2 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.72&id=ab5c5787ab5ecdc4a7ea20b4ef542579e1beb49d Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
committed by
Hauke Mehrtens
parent
e2da6a0a59
commit
9110126620
@@ -652,7 +652,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
||||
"Section %d Node %d Zone %d Lastcpupid %d Kasantag %d\n",
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -7411,6 +7411,7 @@ static void __meminit pgdat_init_interna
|
||||
@@ -7456,6 +7456,7 @@ static void __meminit pgdat_init_interna
|
||||
|
||||
pgdat_page_ext_init(pgdat);
|
||||
lruvec_init(&pgdat->__lruvec);
|
||||
|
||||
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
||||
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -7557,7 +7557,7 @@ static void __init alloc_node_mem_map(st
|
||||
@@ -7602,7 +7602,7 @@ static void __init alloc_node_mem_map(st
|
||||
if (pgdat == NODE_DATA(0)) {
|
||||
mem_map = NODE_DATA(0)->node_mem_map;
|
||||
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
|
||||
--- a/drivers/net/phy/phy_device.c
|
||||
+++ b/drivers/net/phy/phy_device.c
|
||||
@@ -1744,6 +1744,9 @@ void phy_detach(struct phy_device *phyde
|
||||
@@ -1746,6 +1746,9 @@ void phy_detach(struct phy_device *phyde
|
||||
struct module *ndev_owner = NULL;
|
||||
struct mii_bus *bus;
|
||||
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
From 9fec662b54fc956b776df15c704e996c61292850 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Couzens <lynxis@fe80.eu>
|
||||
Date: Sat, 13 Aug 2022 13:05:09 +0200
|
||||
Subject: [PATCH 02/10] net: mt7531: only do PLL once after the reset
|
||||
|
||||
Move the PLL init of the switch out of the pad configuration of the port
|
||||
6 (usally cpu port).
|
||||
|
||||
Fix a unidirectional 100 mbit limitation on 1 gbit or 2.5 gbit links for
|
||||
outbound traffic on port 5 or port 6.
|
||||
|
||||
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
|
||||
---
|
||||
drivers/net/dsa/mt7530.c | 15 +++++++++------
|
||||
1 file changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -506,14 +506,19 @@ static bool mt7531_dual_sgmii_supported(
|
||||
static int
|
||||
mt7531_pad_setup(struct dsa_switch *ds, phy_interface_t interface)
|
||||
{
|
||||
- struct mt7530_priv *priv = ds->priv;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+mt7531_pll_setup(struct mt7530_priv *priv)
|
||||
+{
|
||||
u32 top_sig;
|
||||
u32 hwstrap;
|
||||
u32 xtal;
|
||||
u32 val;
|
||||
|
||||
if (mt7531_dual_sgmii_supported(priv))
|
||||
- return 0;
|
||||
+ return;
|
||||
|
||||
val = mt7530_read(priv, MT7531_CREV);
|
||||
top_sig = mt7530_read(priv, MT7531_TOP_SIG_SR);
|
||||
@@ -592,8 +597,6 @@ mt7531_pad_setup(struct dsa_switch *ds,
|
||||
val |= EN_COREPLL;
|
||||
mt7530_write(priv, MT7531_PLLGP_EN, val);
|
||||
usleep_range(25, 35);
|
||||
-
|
||||
- return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -2326,6 +2329,8 @@ mt7531_setup(struct dsa_switch *ds)
|
||||
SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST |
|
||||
SYS_CTRL_REG_RST);
|
||||
|
||||
+ mt7531_pll_setup(priv);
|
||||
+
|
||||
if (mt7531_dual_sgmii_supported(priv)) {
|
||||
priv->p5_intf_sel = P5_INTF_SEL_GMAC5_SGMII;
|
||||
|
||||
@@ -2882,8 +2887,6 @@ mt7531_cpu_port_config(struct dsa_switch
|
||||
case 6:
|
||||
interface = PHY_INTERFACE_MODE_2500BASEX;
|
||||
|
||||
- mt7531_pad_setup(ds, interface);
|
||||
-
|
||||
priv->p6_interface = interface;
|
||||
break;
|
||||
default:
|
||||
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
/**
|
||||
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
||||
* @tf: Target ATA taskfile
|
||||
@@ -4576,6 +4589,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
@@ -4580,6 +4593,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
if (tag < 0)
|
||||
return NULL;
|
||||
}
|
||||
@@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
qc = __ata_qc_from_tag(ap, tag);
|
||||
qc->tag = qc->hw_tag = tag;
|
||||
@@ -5354,6 +5370,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
@@ -5358,6 +5374,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
ap->stats.unhandled_irq = 1;
|
||||
ap->stats.idle_irq = 1;
|
||||
#endif
|
||||
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
ata_sff_port_init(ap);
|
||||
|
||||
return ap;
|
||||
@@ -5389,6 +5408,12 @@ static void ata_host_release(struct kref
|
||||
@@ -5393,6 +5412,12 @@ static void ata_host_release(struct kref
|
||||
|
||||
kfree(ap->pmp_link);
|
||||
kfree(ap->slave_link);
|
||||
@@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
kfree(ap);
|
||||
host->ports[i] = NULL;
|
||||
}
|
||||
@@ -5795,7 +5820,23 @@ int ata_host_register(struct ata_host *h
|
||||
@@ -5799,7 +5824,23 @@ int ata_host_register(struct ata_host *h
|
||||
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
||||
host->ports[i]->local_port_no = i + 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user