kernel: refresh patches

manually refresh kernel patches

Signed-off-by: Goetz Goerisch <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18924
Signed-off-by: Robert Marko <[email protected]>

diff --git a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
index 56712a2b48d320035f02d4f967621cbc299ccd06..9f346943ccbd89efd013512d2ce3acc4c5e5f3ca 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
@@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell <[email protected]>
         * For devices with more than one control interface, we assume the
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c
-@@ -2254,6 +2254,8 @@ static const struct usb_audio_quirk_flag
+@@ -2258,6 +2258,8 @@ static const struct usb_audio_quirk_flag
                   QUIRK_FLAG_ALIGN_TRANSFER),
        DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
                   QUIRK_FLAG_ALIGN_TRANSFER),

diff --git a/target/linux/bcm27xx/patches-6.6/950-0301-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/target/linux/bcm27xx/patches-6.6/950-0301-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
index e3a07581f829673fc72bf45773aa2ca8be2b4722..d838b0f8527259747c700b362a82cdc901d887c7 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0301-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0301-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3376,6 +3376,31 @@ static const struct panel_desc rocktech_
+@@ -3377,6 +3377,31 @@ static const struct panel_desc rocktech_
        .connector_type = DRM_MODE_CONNECTOR_DPI,
  };
  
@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
  static const struct display_timing rocktech_rk070er9427_timing = {
        .pixelclock = { 26400000, 33300000, 46800000 },
        .hactive = { 800, 800, 800 },
-@@ -4452,6 +4477,9 @@ static const struct of_device_id platfor
+@@ -4453,6 +4478,9 @@ static const struct of_device_id platfor
                .compatible = "rocktech,rk043fn48h",
                .data = &rocktech_rk043fn48h,
        }, {

diff --git a/target/linux/bcm27xx/patches-6.6/950-0343-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-6.6/950-0343-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
index 49493e67a9cdc67544c37c4445501527134ca5eb..5019e794e55f30a2c22a1ff1684adafc14beb867 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0343-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0343-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
@@ -13,7 +13,7 @@ Acked-by: Maxime Ripard <[email protected]>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2035,6 +2035,32 @@ static const struct panel_desc friendlya
+@@ -2036,6 +2036,32 @@ static const struct panel_desc friendlya
        },
  };
  
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <[email protected]>
  static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
        .clock = 9000,
        .hdisplay = 480,
-@@ -4327,6 +4353,9 @@ static const struct of_device_id platfor
+@@ -4328,6 +4354,9 @@ static const struct of_device_id platfor
                .compatible = "friendlyarm,hd702e",
                .data = &friendlyarm_hd702e,
        }, {

diff --git a/target/linux/bcm27xx/patches-6.6/950-0359-mm-page_alloc-cma-introduce-a-customisable-threshold.patch b/target/linux/bcm27xx/patches-6.6/950-0359-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
index 8cf8a05098cb97b63c68c09b238edd47d4c37d2c..08eb5aa74251a550ff8b5a00a888320c1a37aba9 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0359-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0359-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
@@ -48,7 +48,7 @@ Signed-off-by: David Plowman <[email protected]>
  /*
   * A cached value of the page's pageblock's migratetype, used when the page is
   * put on a pcplist. Used to avoid the pageblock migratetype lookup when
-@@ -2109,12 +2130,13 @@ __rmqueue(struct zone *zone, unsigned in
+@@ -2108,12 +2129,13 @@ __rmqueue(struct zone *zone, unsigned in
        if (IS_ENABLED(CONFIG_CMA)) {
                /*
                 * Balance movable allocations between regular and CMA areas by

diff --git a/target/linux/bcm27xx/patches-6.6/950-0401-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch b/target/linux/bcm27xx/patches-6.6/950-0401-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
index 394109d5658be93653d2ec9274723de19d97be11..3ca1f8c520f457f4a275bea4646d1c42fed1f98a 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0401-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0401-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
@@ -126,7 +126,7 @@ Signed-off-by: Phil Elwell <[email protected]>
        - MEDIA_BUS_FMT_RGB666_1X24_CPADHI
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2241,6 +2241,38 @@ static const struct panel_desc innolux_a
+@@ -2242,6 +2242,38 @@ static const struct panel_desc innolux_a
        .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
  };
  
@@ -165,7 +165,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  static const struct drm_display_mode innolux_at070tn92_mode = {
        .clock = 33333,
        .hdisplay = 800,
-@@ -4377,6 +4409,9 @@ static const struct of_device_id platfor
+@@ -4378,6 +4410,9 @@ static const struct of_device_id platfor
                .compatible = "innolux,at043tn24",
                .data = &innolux_at043tn24,
        }, {

diff --git a/target/linux/bcm27xx/patches-6.6/950-0464-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch b/target/linux/bcm27xx/patches-6.6/950-0464-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch
index 9ff7a6d0ad3f06766a0d8436cf0dd39f9116b382..c2c73a8c96464926651415f30bc85b10830caaae 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0464-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0464-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch
@@ -450,7 +450,7 @@ Signed-off-by: Jose Maria Casanova Crespo <[email protected]>
  
        return NULL;
  }
-@@ -392,8 +508,18 @@ v3d_sched_init(struct v3d_dev *v3d)
+@@ -406,8 +522,18 @@ v3d_sched_init(struct v3d_dev *v3d)
        int hw_jobs_limit = 1;
        int job_hang_limit = 0;
        int hang_limit_ms = 500;
@@ -469,7 +469,7 @@ Signed-off-by: Jose Maria Casanova Crespo <[email protected]>
        ret = drm_sched_init(&v3d->queue[V3D_BIN].sched,
                             &v3d_bin_sched_ops,
                             hw_jobs_limit, job_hang_limit,
-@@ -447,9 +573,20 @@ void
+@@ -461,9 +587,20 @@ void
  v3d_sched_fini(struct v3d_dev *v3d)
  {
        enum v3d_queue q;

diff --git a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch
index 9882230654470d3382cecf6cff86f8a008d7058a..31a173a2e08ca8a5624ca5664bc0802243d387fb 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch
@@ -199,7 +199,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
        snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
                 bp->pdev->name, bp->pdev->id);
        bp->mii_bus->priv = bp;
-@@ -1648,6 +1665,11 @@ static int macb_rx(struct macb_queue *qu
+@@ -1641,6 +1658,11 @@ static int macb_rx(struct macb_queue *qu
  
                macb_init_rx_ring(queue);
                queue_writel(queue, RBQP, queue->rx_ring_dma);
@@ -211,7 +211,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  
                macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
  
-@@ -1948,8 +1970,9 @@ static irqreturn_t macb_interrupt(int ir
+@@ -1941,8 +1963,9 @@ static irqreturn_t macb_interrupt(int ir
                                queue_writel(queue, ISR, MACB_BIT(TCOMP) |
                                                         MACB_BIT(TXUBR));
  
@@ -222,7 +222,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
                                wmb(); // ensure softirq can see update
                        }
  
-@@ -2404,6 +2427,11 @@ static netdev_tx_t macb_start_xmit(struc
+@@ -2397,6 +2420,11 @@ static netdev_tx_t macb_start_xmit(struc
        skb_tx_timestamp(skb);
  
        spin_lock_irq(&bp->lock);
@@ -234,7 +234,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
        macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));
        spin_unlock_irq(&bp->lock);
  
-@@ -2778,6 +2806,37 @@ static void macb_configure_dma(struct ma
+@@ -2771,6 +2799,37 @@ static void macb_configure_dma(struct ma
        }
  }
  
@@ -272,7 +272,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  static void macb_init_hw(struct macb *bp)
  {
        u32 config;
-@@ -2806,6 +2865,11 @@ static void macb_init_hw(struct macb *bp
+@@ -2799,6 +2858,11 @@ static void macb_init_hw(struct macb *bp
        if (bp->caps & MACB_CAPS_JUMBO)
                bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK;
  
@@ -284,7 +284,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
        macb_configure_dma(bp);
  
        /* Enable RX partial store and forward and set watermark */
-@@ -3170,6 +3234,52 @@ static void gem_get_ethtool_strings(stru
+@@ -3163,6 +3227,52 @@ static void gem_get_ethtool_strings(stru
        }
  }
  
@@ -337,7 +337,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  static struct net_device_stats *macb_get_stats(struct net_device *dev)
  {
        struct macb *bp = netdev_priv(dev);
-@@ -3764,6 +3874,8 @@ static const struct ethtool_ops macb_eth
+@@ -3757,6 +3867,8 @@ static const struct ethtool_ops macb_eth
  };
  
  static const struct ethtool_ops gem_ethtool_ops = {
@@ -346,7 +346,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
        .get_regs_len           = macb_get_regs_len,
        .get_regs               = macb_get_regs,
        .get_wol                = macb_get_wol,
-@@ -3773,6 +3885,8 @@ static const struct ethtool_ops gem_etht
+@@ -3766,6 +3878,8 @@ static const struct ethtool_ops gem_etht
        .get_ethtool_stats      = gem_get_ethtool_stats,
        .get_strings            = gem_get_ethtool_strings,
        .get_sset_count         = gem_get_sset_count,
@@ -355,7 +355,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
        .get_link_ksettings     = macb_get_link_ksettings,
        .set_link_ksettings     = macb_set_link_ksettings,
        .get_ringparam          = macb_get_ringparam,
-@@ -5069,6 +5183,11 @@ static int macb_probe(struct platform_de
+@@ -5062,6 +5176,11 @@ static int macb_probe(struct platform_de
                        }
                }
        }
@@ -367,7 +367,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
        spin_lock_init(&bp->lock);
        spin_lock_init(&bp->stats_lock);
  
-@@ -5125,6 +5244,21 @@ static int macb_probe(struct platform_de
+@@ -5118,6 +5237,21 @@ static int macb_probe(struct platform_de
        else
                bp->phy_interface = interface;
  
@@ -389,7 +389,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
        /* IP specific init */
        err = init(pdev);
        if (err)
-@@ -5201,6 +5335,19 @@ static int macb_remove(struct platform_d
+@@ -5194,6 +5328,19 @@ static int macb_remove(struct platform_d
        return 0;
  }
  
@@ -409,7 +409,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  static int __maybe_unused macb_suspend(struct device *dev)
  {
        struct net_device *netdev = dev_get_drvdata(dev);
-@@ -5415,6 +5562,7 @@ static const struct dev_pm_ops macb_pm_o
+@@ -5408,6 +5555,7 @@ static const struct dev_pm_ops macb_pm_o
  static struct platform_driver macb_driver = {
        .probe          = macb_probe,
        .remove         = macb_remove,

diff --git a/target/linux/bcm27xx/patches-6.6/950-0555-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch b/target/linux/bcm27xx/patches-6.6/950-0555-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch
index 4e8134287692b50ad2b49d56c58e5db8c1c915fe..965571e533e1c932bf7059e07033b9f52bc73cd3 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0555-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0555-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch
@@ -660,7 +660,7 @@ v2: fix kernel panic with debug-fs interface to list registers
  
        return fence;
  }
-@@ -459,7 +465,8 @@ v3d_csd_job_timedout(struct drm_sched_jo
+@@ -471,7 +477,8 @@ v3d_csd_job_timedout(struct drm_sched_jo
  {
        struct v3d_csd_job *job = to_csd_job(sched_job);
        struct v3d_dev *v3d = job->base.v3d;
@@ -668,5 +668,5 @@ v2: fix kernel panic with debug-fs interface to list registers
 +      u32 batches = V3D_CORE_READ(0, (v3d->ver < 71 ? V3D_CSD_CURRENT_CFG4 :
 +                                                      V3D_V7_CSD_CURRENT_CFG4));
  
-       /* If we've made progress, skip reset and let the timer get
-        * rearmed.
+       /* If we've made progress, skip reset, add the job to the pending
+        * list, and let the timer get rearmed.

diff --git a/target/linux/bcm27xx/patches-6.6/950-0636-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch b/target/linux/bcm27xx/patches-6.6/950-0636-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
index b72020d7e4173e5e0b02063b9dfb956609a8a745..667841c8f56ab25fa948513334db19e1004daace 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0636-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0636-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
@@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3438,11 +3438,11 @@ static const struct panel_desc rocktech_
+@@ -3439,11 +3439,11 @@ static const struct panel_desc rocktech_
  };
  
  static const struct drm_display_mode raspberrypi_7inch_mode = {

diff --git a/target/linux/bcm27xx/patches-6.6/950-0757-drm-panel-add-panel-dsi.patch b/target/linux/bcm27xx/patches-6.6/950-0757-drm-panel-add-panel-dsi.patch
index 4e9ba92a1883ac626307ea5d9757d327b6cfd700..f62410aeaac6ac0dd8d9aa16fafa933bdfd48ce3 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-0757-drm-panel-add-panel-dsi.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0757-drm-panel-add-panel-dsi.patch
@@ -23,7 +23,7 @@ Signed-off-by: Timon Skerutsch <[email protected]>
  
  /**
   * struct panel_desc - Describes a simple panel.
-@@ -4903,6 +4904,9 @@ static const struct panel_desc_dsi osd10
+@@ -4904,6 +4905,9 @@ static const struct panel_desc_dsi osd10
        .lanes = 4,
  };
  
@@ -33,7 +33,7 @@ Signed-off-by: Timon Skerutsch <[email protected]>
  static const struct of_device_id dsi_of_match[] = {
        {
                .compatible = "auo,b080uan01",
-@@ -4926,20 +4930,137 @@ static const struct of_device_id dsi_of_
+@@ -4927,20 +4931,137 @@ static const struct of_device_id dsi_of_
                .compatible = "osddisplays,osd101t2045-53ts",
                .data = &osd101t2045_53ts
        }, {

diff --git a/target/linux/bcm27xx/patches-6.6/950-1069-drm-panel-simple-Fix-7inch-panel-mode-for-misalignme.patch b/target/linux/bcm27xx/patches-6.6/950-1069-drm-panel-simple-Fix-7inch-panel-mode-for-misalignme.patch
index 6a413ec90bfa339f8d8f26e84ae85cdfde5f043b..eacc9c8b811a8e0233cdeda4ce913d4775a4dd51 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-1069-drm-panel-simple-Fix-7inch-panel-mode-for-misalignme.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-1069-drm-panel-simple-Fix-7inch-panel-mode-for-misalignme.patch
@@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3421,11 +3421,11 @@ static const struct drm_display_mode ras
+@@ -3422,11 +3422,11 @@ static const struct drm_display_mode ras
        .hdisplay = 800,
        .hsync_start = 800 + 59,
        .hsync_end = 800 + 59 + 2,

diff --git a/target/linux/bcm27xx/patches-6.6/950-1070-drm-panel-simple-Increase-pixel-clock-on-Pi-7inch-pa.patch b/target/linux/bcm27xx/patches-6.6/950-1070-drm-panel-simple-Increase-pixel-clock-on-Pi-7inch-pa.patch
index 68129c8de9ef5be5bd8fbdace90a1f64a520ddeb..9c1094bd9be1732d5d24c6891eadc195248eea81 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-1070-drm-panel-simple-Increase-pixel-clock-on-Pi-7inch-pa.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-1070-drm-panel-simple-Increase-pixel-clock-on-Pi-7inch-pa.patch
@@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3417,11 +3417,11 @@ static const struct panel_desc rocktech_
+@@ -3418,11 +3418,11 @@ static const struct panel_desc rocktech_
  };
  
  static const struct drm_display_mode raspberrypi_7inch_mode = {

diff --git a/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch b/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch
index c34d1c87203538e53d1759fb7fd9f49a637a3b0e..6a9b7b36bd40750dc4a98d7999c5075771734450 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-1423-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
 
 --- a/drivers/net/ethernet/cadence/macb_main.c
 +++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -5030,6 +5030,17 @@ static const struct macb_config versal_c
+@@ -5023,6 +5023,17 @@ static const struct macb_config versal_c
        .usrio = &macb_default_usrio,
  };
  
@@ -33,7 +33,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
  static const struct of_device_id macb_dt_ids[] = {
        { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
        { .compatible = "cdns,macb" },
-@@ -5050,6 +5061,7 @@ static const struct of_device_id macb_dt
+@@ -5043,6 +5054,7 @@ static const struct of_device_id macb_dt
        { .compatible = "microchip,mpfs-macb", .data = &mpfs_config },
        { .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config },
        { .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config },

diff --git a/target/linux/bcm27xx/patches-6.6/950-1438-nvme-pci-Disable-Host-Memory-Buffer-usage.patch b/target/linux/bcm27xx/patches-6.6/950-1438-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
index 02c4dc449899e405310b4e3e8e130d8e835e2928..777d134313c7122a52289d226297dc41fb117787 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-1438-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-1438-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/nvme/host/pci.c
 +++ b/drivers/nvme/host/pci.c
-@@ -1948,6 +1948,7 @@ static void nvme_free_host_mem(struct nv
+@@ -1950,6 +1950,7 @@ static void nvme_free_host_mem(struct nv
        dev->nr_host_mem_descs = 0;
  }
  
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
                u32 chunk_size)
  {
-@@ -2016,9 +2017,11 @@ out:
+@@ -2018,9 +2019,11 @@ out:
        dev->host_mem_descs = NULL;
        return -ENOMEM;
  }
@@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <[email protected]>
        u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
        u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
        u64 chunk_size;
-@@ -2031,6 +2034,7 @@ static int nvme_alloc_host_mem(struct nv
+@@ -2033,6 +2036,7 @@ static int nvme_alloc_host_mem(struct nv
                        nvme_free_host_mem(dev);
                }
        }

diff --git a/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch b/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch
index a13516a04ea36158191e4ac728e4c034d8068149..b5d65b7fedd380733ef04746bbdb45f5afa65fe3 100644 (file)
--- a/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-1553-drm-v3d-Associate-a-V3D-tech-revision-to-all-support.patch
@@ -436,7 +436,7 @@ Signed-off-by: Maíra Canal <[email protected]>
        for (i = 1; i <= csd_cfg_reg_count; i++)
                V3D_CORE_WRITE(0, csd_cfg0_reg + 4 * i, job->args.cfg[i]);
        /* CFG0 write kicks off the job. */
-@@ -475,7 +475,7 @@ v3d_csd_job_timedout(struct drm_sched_jo
+@@ -487,7 +487,7 @@ v3d_csd_job_timedout(struct drm_sched_jo
  {
        struct v3d_csd_job *job = to_csd_job(sched_job);
        struct v3d_dev *v3d = job->base.v3d;
@@ -444,4 +444,4 @@ Signed-off-by: Maíra Canal <[email protected]>
 +      u32 batches = V3D_CORE_READ(0, (v3d->ver < V3D_GEN_71 ? V3D_CSD_CURRENT_CFG4 :
                                                        V3D_V7_CSD_CURRENT_CFG4));
  
-       /* If we've made progress, skip reset and let the timer get
+       /* If we've made progress, skip reset, add the job to the pending

diff --git a/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch b/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch
index fcc6a1f14fa1785e15f0862e771ef8076cf19e1f..223fce786e808818f306dc2eee70ab9941659a6d 100644 (file)
--- a/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch
+++ b/target/linux/generic/pending-6.6/680-net-add-TCP-fraglist-GRO-support.patch
@@ -379,7 +379,7 @@ Signe-off-by: Felix Fietkau <[email protected]>
        skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4;
 --- a/net/ipv4/udp_offload.c
 +++ b/net/ipv4/udp_offload.c
-@@ -474,33 +474,6 @@ out:
+@@ -533,33 +533,6 @@ out:
        return segs;
  }
  

diff --git a/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch b/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
index 3b44c9aeab944674c60f65dcadc8b528b696a972..cd3c9df2bbd03510bfa246d9286079d51435f442 100644 (file)
--- a/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
+++ b/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -5133,6 +5133,8 @@ static int mtk_probe(struct platform_dev
+@@ -5064,6 +5064,8 @@ static int mtk_probe(struct platform_dev
         * for NAPI to work
         */
        init_dummy_netdev(&eth->dummy_dev);

diff --git a/target/linux/generic/pending-6.6/734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch b/target/linux/generic/pending-6.6/734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch
index 7274c4a817d6431dd4cac15b869aee24028418f9..c97df557c68fb329f58dd4442824263741b3cc08 100644 (file)
--- a/target/linux/generic/pending-6.6/734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch
+++ b/target/linux/generic/pending-6.6/734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch
@@ -25,7 +25,7 @@ Signed-off-by: Chad Monroe <[email protected]>
  /* QDMA Flow Control Register */
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3323,12 +3323,14 @@ static int mtk_start_dma(struct mtk_eth
+@@ -3313,12 +3313,14 @@ static int mtk_start_dma(struct mtk_eth
                       MTK_TX_BT_32DWORDS | MTK_NDP_CO_PRO |
                       MTK_RX_2B_OFFSET | MTK_TX_WB_DDONE;
  

diff --git a/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch b/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
index fc1a388387f19fbbb963286258b229924b896ed7..4d718f9fa086b5d7b1c78ae0db614b1f72265c9c 100644 (file)
--- a/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
+++ b/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
@@ -490,7 +490,7 @@ Signed-off-by: Daniel Golle <[email protected]>
        .mac_finish = mtk_mac_finish,
        .mac_link_down = mtk_mac_link_down,
        .mac_link_up = mtk_mac_link_up,
-@@ -3431,6 +3572,9 @@ static int mtk_open(struct net_device *d
+@@ -3421,6 +3562,9 @@ static int mtk_open(struct net_device *d
  
        ppe_num = eth->soc->ppe_num;
  
@@ -500,7 +500,7 @@ Signed-off-by: Daniel Golle <[email protected]>
        err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
        if (err) {
                netdev_err(dev, "%s: could not attach PHY: %d\n", __func__,
-@@ -3581,6 +3725,9 @@ static int mtk_stop(struct net_device *d
+@@ -3571,6 +3715,9 @@ static int mtk_stop(struct net_device *d
        for (i = 0; i < ARRAY_SIZE(eth->ppe); i++)
                mtk_ppe_stop(eth->ppe[i]);
  
@@ -510,7 +510,7 @@ Signed-off-by: Daniel Golle <[email protected]>
        return 0;
  }
  
-@@ -4667,6 +4814,7 @@ static const struct net_device_ops mtk_n
+@@ -4600,6 +4747,7 @@ static const struct net_device_ops mtk_n
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  {
        const __be32 *_id = of_get_property(np, "reg", NULL);
@@ -518,7 +518,7 @@ Signed-off-by: Daniel Golle <[email protected]>
        phy_interface_t phy_mode;
        struct phylink *phylink;
        struct mtk_mac *mac;
-@@ -4705,16 +4853,41 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4636,16 +4784,41 @@ static int mtk_add_mac(struct mtk_eth *e
        mac->id = id;
        mac->hw = eth;
        mac->of_node = np;
@@ -568,7 +568,7 @@ Signed-off-by: Daniel Golle <[email protected]>
        }
  
        memset(mac->hwlro_ip, 0, sizeof(mac->hwlro_ip));
-@@ -4797,8 +4970,21 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4728,8 +4901,21 @@ static int mtk_add_mac(struct mtk_eth *e
                phy_interface_zero(mac->phylink_config.supported_interfaces);
                __set_bit(PHY_INTERFACE_MODE_INTERNAL,
                          mac->phylink_config.supported_interfaces);
@@ -590,7 +590,7 @@ Signed-off-by: Daniel Golle <[email protected]>
        phylink = phylink_create(&mac->phylink_config,
                                 of_fwnode_handle(mac->of_node),
                                 phy_mode, &mtk_phylink_ops);
-@@ -4849,6 +5035,26 @@ free_netdev:
+@@ -4780,6 +4966,26 @@ free_netdev:
        return err;
  }
  
@@ -617,7 +617,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev)
  {
        struct net_device *dev, *tmp;
-@@ -4995,7 +5201,8 @@ static int mtk_probe(struct platform_dev
+@@ -4926,7 +5132,8 @@ static int mtk_probe(struct platform_dev
                        regmap_write(cci, 0, 3);
        }
  
@@ -627,7 +627,7 @@ Signed-off-by: Daniel Golle <[email protected]>
                err = mtk_sgmii_init(eth);
  
                if (err)
-@@ -5106,6 +5313,24 @@ static int mtk_probe(struct platform_dev
+@@ -5037,6 +5244,24 @@ static int mtk_probe(struct platform_dev
                }
        }
  
@@ -652,7 +652,7 @@ Signed-off-by: Daniel Golle <[email protected]>
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT)) {
                err = devm_request_irq(eth->dev, eth->irq[0],
                                       mtk_handle_irq, 0,
-@@ -5209,6 +5434,11 @@ static int mtk_remove(struct platform_de
+@@ -5140,6 +5365,11 @@ static int mtk_remove(struct platform_de
                mtk_stop(eth->netdev[i]);
                mac = netdev_priv(eth->netdev[i]);
                phylink_disconnect_phy(mac->phylink);

diff --git a/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch b/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch
index f8b3bb84595f04ee872da17e08985e13e8b2a084..83f7efe6369bb1bdab3e0c545ff5291bfeb647ec 100644 (file)
--- a/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch
+++ b/target/linux/generic/pending-6.6/738-01-net-ethernet-mtk_eth_soc-reduce-rx-ring-size-for-older.patch
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -5470,7 +5470,7 @@ static const struct mtk_soc_data mt2701_
+@@ -5459,7 +5459,7 @@ static const struct mtk_soc_data mt7622_
                .desc_size = sizeof(struct mtk_rx_dma),
                .irq_done_mask = MTK_RX_DONE_INT,
                .dma_l4_valid = RX_DMA_L4_VALID,
@@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
                .dma_max_len = MTK_TX_DMA_BUF_LEN,
                .dma_len_offset = 16,
        },
-@@ -5498,7 +5498,7 @@ static const struct mtk_soc_data mt7621_
+@@ -5488,7 +5488,7 @@ static const struct mtk_soc_data mt7623_
                .desc_size = sizeof(struct mtk_rx_dma),
                .irq_done_mask = MTK_RX_DONE_INT,
                .dma_l4_valid = RX_DMA_L4_VALID,
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
                .dma_max_len = MTK_TX_DMA_BUF_LEN,
                .dma_len_offset = 16,
        },
-@@ -5528,7 +5528,7 @@ static const struct mtk_soc_data mt7622_
+@@ -5514,7 +5514,7 @@ static const struct mtk_soc_data mt7629_
                .desc_size = sizeof(struct mtk_rx_dma),
                .irq_done_mask = MTK_RX_DONE_INT,
                .dma_l4_valid = RX_DMA_L4_VALID,
@@ -57,48 +57,3 @@ Signed-off-by: Felix Fietkau <[email protected]>
                .dma_max_len = MTK_TX_DMA_BUF_LEN,
                .dma_len_offset = 16,
        },
-@@ -5557,7 +5557,7 @@ static const struct mtk_soc_data mt7623_
-               .desc_size = sizeof(struct mtk_rx_dma),
-               .irq_done_mask = MTK_RX_DONE_INT,
-               .dma_l4_valid = RX_DMA_L4_VALID,
--              .dma_size = MTK_DMA_SIZE(2K),
-+              .dma_size = MTK_DMA_SIZE(512),
-               .dma_max_len = MTK_TX_DMA_BUF_LEN,
-               .dma_len_offset = 16,
-       },
-@@ -5583,7 +5583,7 @@ static const struct mtk_soc_data mt7629_
-               .desc_size = sizeof(struct mtk_rx_dma),
-               .irq_done_mask = MTK_RX_DONE_INT,
-               .dma_l4_valid = RX_DMA_L4_VALID,
--              .dma_size = MTK_DMA_SIZE(2K),
-+              .dma_size = MTK_DMA_SIZE(512),
-               .dma_max_len = MTK_TX_DMA_BUF_LEN,
-               .dma_len_offset = 16,
-       },
-@@ -5615,7 +5615,7 @@ static const struct mtk_soc_data mt7981_
-               .dma_l4_valid = RX_DMA_L4_VALID_V2,
-               .dma_max_len = MTK_TX_DMA_BUF_LEN,
-               .dma_len_offset = 16,
--              .dma_size = MTK_DMA_SIZE(2K),
-+              .dma_size = MTK_DMA_SIZE(512),
-       },
- };
- 
-@@ -5645,7 +5645,7 @@ static const struct mtk_soc_data mt7986_
-               .dma_l4_valid = RX_DMA_L4_VALID_V2,
-               .dma_max_len = MTK_TX_DMA_BUF_LEN,
-               .dma_len_offset = 16,
--              .dma_size = MTK_DMA_SIZE(2K),
-+              .dma_size = MTK_DMA_SIZE(1K),
-       },
- };
- 
-@@ -5698,7 +5698,7 @@ static const struct mtk_soc_data rt5350_
-               .dma_l4_valid = RX_DMA_L4_VALID_PDMA,
-               .dma_max_len = MTK_TX_DMA_BUF_LEN,
-               .dma_len_offset = 16,
--              .dma_size = MTK_DMA_SIZE(2K),
-+              .dma_size = MTK_DMA_SIZE(256),
-       },
- };
- 

diff --git a/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch b/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch
index 349af33524e6c638b893cf40a067bb286ffa1aad..3ca41b2a03e351be510804a4c28c634782887d41 100644 (file)
--- a/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch
+++ b/target/linux/generic/pending-6.6/738-02-net-ethernet-mtk_eth_soc-do-not-enable-page-pool-sta.patch
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
        help
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4582,6 +4582,7 @@ static int mtk_get_sset_count(struct net
+@@ -4572,6 +4572,7 @@ static int mtk_get_sset_count(struct net
  
  static void mtk_ethtool_pp_stats(struct mtk_eth *eth, u64 *data)
  {
@@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
        struct page_pool_stats stats = {};
        int i;
  
-@@ -4594,6 +4595,7 @@ static void mtk_ethtool_pp_stats(struct
+@@ -4584,6 +4585,7 @@ static void mtk_ethtool_pp_stats(struct
                page_pool_get_stats(ring->page_pool, &stats);
        }
        page_pool_ethtool_stats_get(data, &stats);