kernel: bump 6.12 to 6.12.30

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.30

All patches automatically rebased.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/18877
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch b/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch
index 4f311ab00197d2948a3cfbef3fc6d60944f1ee4d..1a508a1125ec70256fa6a10ebd4088285052375c 100644 (file)
--- a/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch
@@ -18626,7 +18626,7 @@ Signed-off-by: j-schambacher <joerg@hifiberry.com>
         * For devices with more than one control interface, we assume the
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c
-@@ -2354,6 +2354,8 @@ static const struct usb_audio_quirk_flag
+@@ -2358,6 +2358,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.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch b/target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch
index b7d438746553acd6d1c3dac7c07e381994427894..e7363a90790808a33d9e96179027c49581642f9b 100644 (file)
--- a/target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0308-gpio-pca953x-Add-ti-tca9554-compatible-string.patch
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/gpio/gpio-pca953x.c
 +++ b/drivers/gpio/gpio-pca953x.c
-@@ -1300,6 +1300,7 @@ static const struct of_device_id pca953x
+@@ -1306,6 +1306,7 @@ static const struct of_device_id pca953x
        { .compatible = "ti,tca9535", .data = OF_953X(16, PCA_INT), },
        { .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), },
        { .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), },

diff --git a/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch b/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch
index 5a902e3e1bca5a08c17dca9f71c5c0100d8f915a..6b4058b725144e121a1de0c274fb31d6831fe94f 100644 (file)
--- a/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch
@@ -199,7 +199,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        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 <jonathan@raspberrypi.com>
  
                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 <jonathan@raspberrypi.com>
                                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 <jonathan@raspberrypi.com>
        macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));
        spin_unlock_irq(&bp->lock);
  
-@@ -2810,6 +2838,37 @@ static void macb_configure_dma(struct ma
+@@ -2803,6 +2831,37 @@ static void macb_configure_dma(struct ma
        }
  }
  
@@ -272,7 +272,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  static void macb_init_hw(struct macb *bp)
  {
        u32 config;
-@@ -2838,6 +2897,11 @@ static void macb_init_hw(struct macb *bp
+@@ -2831,6 +2890,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 <jonathan@raspberrypi.com>
        macb_configure_dma(bp);
  
        /* Enable RX partial store and forward and set watermark */
-@@ -3202,6 +3266,52 @@ static void gem_get_ethtool_strings(stru
+@@ -3195,6 +3259,52 @@ static void gem_get_ethtool_strings(stru
        }
  }
  
@@ -337,7 +337,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  static struct net_device_stats *macb_get_stats(struct net_device *dev)
  {
        struct macb *bp = netdev_priv(dev);
-@@ -3786,6 +3896,8 @@ static const struct ethtool_ops macb_eth
+@@ -3779,6 +3889,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 <jonathan@raspberrypi.com>
        .get_regs_len           = macb_get_regs_len,
        .get_regs               = macb_get_regs,
        .get_wol                = macb_get_wol,
-@@ -3795,6 +3907,8 @@ static const struct ethtool_ops gem_etht
+@@ -3788,6 +3900,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 <jonathan@raspberrypi.com>
        .get_link_ksettings     = macb_get_link_ksettings,
        .set_link_ksettings     = macb_set_link_ksettings,
        .get_ringparam          = macb_get_ringparam,
-@@ -5116,6 +5230,11 @@ static int macb_probe(struct platform_de
+@@ -5109,6 +5223,11 @@ static int macb_probe(struct platform_de
                        }
                }
        }
@@ -367,7 +367,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        spin_lock_init(&bp->lock);
        spin_lock_init(&bp->stats_lock);
  
-@@ -5172,6 +5291,21 @@ static int macb_probe(struct platform_de
+@@ -5165,6 +5284,21 @@ static int macb_probe(struct platform_de
        else
                bp->phy_interface = interface;
  
@@ -389,7 +389,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
        /* IP specific init */
        err = init(pdev);
        if (err)
-@@ -5246,6 +5380,19 @@ static void macb_remove(struct platform_
+@@ -5239,6 +5373,19 @@ static void macb_remove(struct platform_
        }
  }
  
@@ -409,7 +409,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  static int __maybe_unused macb_suspend(struct device *dev)
  {
        struct net_device *netdev = dev_get_drvdata(dev);
-@@ -5499,6 +5646,7 @@ static const struct dev_pm_ops macb_pm_o
+@@ -5492,6 +5639,7 @@ static const struct dev_pm_ops macb_pm_o
  static struct platform_driver macb_driver = {
        .probe          = macb_probe,
        .remove_new     = macb_remove,

diff --git a/target/linux/bcm27xx/patches-6.12/950-0565-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch b/target/linux/bcm27xx/patches-6.12/950-0565-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch
index de99306cb685b575abc9b6bc8bab166cdee546ef..947cb02dda9bcb18b978ac45e6047044f85f9440 100644 (file)
--- a/target/linux/bcm27xx/patches-6.12/950-0565-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0565-net-macb-Add-support-for-Raspberry-Pi-RP1-ethernet-c.patch
@@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/net/ethernet/cadence/macb_main.c
 +++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -5079,6 +5079,17 @@ static const struct macb_config versal_c
+@@ -5072,6 +5072,17 @@ static const struct macb_config versal_c
        .usrio = &macb_default_usrio,
  };
  
@@ -33,7 +33,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  static const struct of_device_id macb_dt_ids[] = {
        { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
        { .compatible = "cdns,macb" },
-@@ -5099,6 +5110,7 @@ static const struct of_device_id macb_dt
+@@ -5092,6 +5103,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.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch b/target/linux/bcm27xx/patches-6.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
index 8208a10d600f6e88bbe2fbbd5e7cd44bdb4f7d75..874ddc47c12b24b01c258e419fc52258601b703e 100644 (file)
--- a/target/linux/bcm27xx/patches-6.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/nvme/host/pci.c
 +++ b/drivers/nvme/host/pci.c
-@@ -2081,6 +2081,7 @@ static void nvme_free_host_mem(struct nv
+@@ -2083,6 +2083,7 @@ static void nvme_free_host_mem(struct nv
        dev->nr_host_mem_descs = 0;
  }
  
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
                u32 chunk_size)
  {
-@@ -2149,9 +2150,11 @@ out:
+@@ -2151,9 +2152,11 @@ out:
        dev->host_mem_descs = NULL;
        return -ENOMEM;
  }
@@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        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;
-@@ -2164,6 +2167,7 @@ static int nvme_alloc_host_mem(struct nv
+@@ -2166,6 +2169,7 @@ static int nvme_alloc_host_mem(struct nv
                        nvme_free_host_mem(dev);
                }
        }

diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12
index 19f5f7f477d58de151bbc84d112a6cc3dbcc94be..3f710bc5ee3ddacc181e08dd28bebf457f996c1b 100644 (file)
--- a/target/linux/generic/kernel-6.12
+++ b/target/linux/generic/kernel-6.12
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .29
-LINUX_KERNEL_HASH-6.12.29 = e8b2ec7e2338ccb9c86de7154f6edcaadfce80907493c143e85a82776bb5064d
+LINUX_VERSION-6.12 = .30
+LINUX_KERNEL_HASH-6.12.30 = df046a48971e40ce0b2e003e7e55b6b1e7da2912120eb216d5d6c8450c9cf82e