kernel: bump 5.15 to 5.15.160
No manual changes needed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit c569b7d21a)
This commit is contained in:
@@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .159
|
LINUX_VERSION-5.15 = .160
|
||||||
LINUX_KERNEL_HASH-5.15.159 = 3478fe50225e9c88e09cf114f38e3fb71e82d9fdcc356aa1257d721199b341c5
|
LINUX_KERNEL_HASH-5.15.160 = f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
|
|
||||||
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
||||||
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
||||||
@@ -2615,7 +2615,7 @@ static void bcmgenet_init_tx_ring(struct
|
@@ -2621,7 +2621,7 @@ static void bcmgenet_init_tx_ring(struct
|
||||||
|
|
||||||
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
|
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
|
||||||
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
|
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
|
||||||
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
/* Disable rate control for now */
|
/* Disable rate control for now */
|
||||||
bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
|
bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
|
||||||
TDMA_FLOW_PERIOD);
|
TDMA_FLOW_PERIOD);
|
||||||
@@ -4093,9 +4093,12 @@ static int bcmgenet_probe(struct platfor
|
@@ -4103,9 +4103,12 @@ static int bcmgenet_probe(struct platfor
|
||||||
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
|
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
|
||||||
|
|
||||||
/* Set default coalescing parameters */
|
/* Set default coalescing parameters */
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||||||
|
|
||||||
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
|
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
|
||||||
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
|
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
|
||||||
@@ -292,6 +292,8 @@ int bcmgenet_mii_probe(struct net_device
|
@@ -296,6 +296,8 @@ int bcmgenet_mii_probe(struct net_device
|
||||||
/* Communicate the integrated PHY revision */
|
/* Communicate the integrated PHY revision */
|
||||||
if (priv->internal_phy)
|
if (priv->internal_phy)
|
||||||
phy_flags = priv->gphy_rev;
|
phy_flags = priv->gphy_rev;
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
|
|
||||||
static inline void bcmgenet_writel(u32 value, void __iomem *offset)
|
static inline void bcmgenet_writel(u32 value, void __iomem *offset)
|
||||||
{
|
{
|
||||||
@@ -2446,6 +2449,11 @@ static void reset_umac(struct bcmgenet_p
|
@@ -2450,6 +2453,11 @@ static void reset_umac(struct bcmgenet_p
|
||||||
bcmgenet_rbuf_ctrl_set(priv, 0);
|
bcmgenet_rbuf_ctrl_set(priv, 0);
|
||||||
udelay(10);
|
udelay(10);
|
||||||
|
|
||||||
@@ -47,5 +47,5 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
/* issue soft reset and disable MAC while updating its registers */
|
/* issue soft reset and disable MAC while updating its registers */
|
||||||
|
spin_lock_bh(&priv->reg_lock);
|
||||||
bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);
|
bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);
|
||||||
udelay(2);
|
|
||||||
|
|||||||
Reference in New Issue
Block a user