kernel: bump 5.15 to 5.15.132

Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.132

Removed upstreamed:
	bcm53xx/patches-5.15/037-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch[1]
	bcm53xx/patches-5.15/037-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch[2]
	bcm53xx/patches-5.15/037-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch[3]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=b35f3ca1877e024887df205ede952863d65dad36
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=2840d9b9c8750be270fb1153ccd5b983cbb5d592
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=f086e859ddc252c32f0438edff241859c0f022ce

Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <therealgraysky@proton.me>

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 0423befe74f95f07a691cf963c7f381f08902464..96feed23e078d4c6a25da01b9881e876d3118ae6 100644 (file)
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .131
-LINUX_KERNEL_HASH-5.15.131 = 997c3391f439fb6fe32f1938fe089a046b840a5cde9a2215b6745144f8b24c69
+LINUX_VERSION-5.15 = .132
+LINUX_KERNEL_HASH-5.15.132 = 4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac

diff --git a/target/linux/ath79/patches-5.15/400-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.15/400-mtd-nor-support-mtd-name-from-device-tree.patch
index 163bafdb2e5b346376ca519e6919fcd2c1f9e7fc..7db6346c37e4180d998ae82c0e2b92a015c6a36a 100644 (file)
--- a/target/linux/ath79/patches-5.15/400-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/ath79/patches-5.15/400-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
 
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
 
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c

-@@ -3107,6 +3107,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3108,6 +3108,7 @@ int spi_nor_scan(struct spi_nor *nor, co

        struct device *dev = nor->dev;
        struct mtd_info *mtd = &nor->mtd;
        struct device_node *np = spi_nor_get_flash_node(nor);
        struct device *dev = nor->dev;
        struct mtd_info *mtd = &nor->mtd;
        struct device_node *np = spi_nor_get_flash_node(nor);


@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
        int ret;
        int i;
  
        int ret;
        int i;
  

-@@ -3161,7 +3162,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3162,7 +3163,12 @@ int spi_nor_scan(struct spi_nor *nor, co

        if (ret)
                return ret;
  
        if (ret)
                return ret;
  

diff --git a/target/linux/ath79/patches-5.15/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/900-unaligned_access_hacks.patch
index 1971b9cd0101855805a5e610d1f9614e3dee4d6b..53f5b1472d9c5a2a53b176fafb428aec23d0c4f7 100644 (file)
--- a/target/linux/ath79/patches-5.15/900-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.15/900-unaligned_access_hacks.patch
@@ -750,7 +750,7 @@ SVN-Revision: 35130
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c

-@@ -4158,14 +4158,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4157,14 +4157,16 @@ static bool tcp_parse_aligned_timestamp(

  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  

diff --git a/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch b/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch
index a87d6acd0caf3bf00ec3cfcd34aacbe25250b017..ce14834fa71b6312c30462b0473de9be0188540a 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch
+++ b/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch
@@ -14,7 +14,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 
 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c

-@@ -2998,6 +2998,7 @@ int brcmnand_probe(struct platform_devic
+@@ -3033,6 +3033,7 @@ int brcmnand_probe(struct platform_devic

  
        dev_set_drvdata(dev, ctrl);
        ctrl->dev = dev;
  
        dev_set_drvdata(dev, ctrl);
        ctrl->dev = dev;


@@ -22,7 +22,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  
        init_completion(&ctrl->done);
        init_completion(&ctrl->dma_done);
  
        init_completion(&ctrl->done);
        init_completion(&ctrl->dma_done);

-@@ -3138,8 +3139,6 @@ int brcmnand_probe(struct platform_devic
+@@ -3173,8 +3174,6 @@ int brcmnand_probe(struct platform_devic

         * interesting ways
         */
        if (soc) {
         * interesting ways
         */
        if (soc) {

diff --git a/target/linux/bcm47xx/patches-5.15/101-v5.18-mtd-rawnand-brcmnand-Allow-SoC-to-provide-I-O-operations.patch b/target/linux/bcm47xx/patches-5.15/101-v5.18-mtd-rawnand-brcmnand-Allow-SoC-to-provide-I-O-operations.patch
index 8da2535865531244d6a58925f41ca00d6a5944ef..60671658fedf854ad1d8f10fd8946c01b15be4c1 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/101-v5.18-mtd-rawnand-brcmnand-Allow-SoC-to-provide-I-O-operations.patch
+++ b/target/linux/bcm47xx/patches-5.15/101-v5.18-mtd-rawnand-brcmnand-Allow-SoC-to-provide-I-O-operations.patch
@@ -84,7 +84,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  }
  
  static inline void edu_writel(struct brcmnand_controller *ctrl,
  }
  
  static inline void edu_writel(struct brcmnand_controller *ctrl,

-@@ -3000,6 +3018,12 @@ int brcmnand_probe(struct platform_devic
+@@ -3035,6 +3053,12 @@ int brcmnand_probe(struct platform_devic

        ctrl->dev = dev;
        ctrl->soc = soc;
  
        ctrl->dev = dev;
        ctrl->soc = soc;
  

diff --git a/target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch b/target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
index d7eab183d6c61648d95f6eff229d30e7cb34dd81..d514998fd72ace2364dded4e2355f7a0c9ab4c1a 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
+++ b/target/linux/bcm47xx/patches-5.15/102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch
@@ -16,7 +16,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 
 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c

-@@ -2771,7 +2771,7 @@ static const struct nand_controller_ops
+@@ -2806,7 +2806,7 @@ static const struct nand_controller_ops

  static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
  {
        struct brcmnand_controller *ctrl = host->ctrl;
  static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
  {
        struct brcmnand_controller *ctrl = host->ctrl;


@@ -25,7 +25,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
        struct mtd_info *mtd;
        struct nand_chip *chip;
        int ret;
        struct mtd_info *mtd;
        struct nand_chip *chip;
        int ret;

-@@ -2779,7 +2779,7 @@ static int brcmnand_init_cs(struct brcmn
+@@ -2814,7 +2814,7 @@ static int brcmnand_init_cs(struct brcmn

  
        ret = of_property_read_u32(dn, "reg", &host->cs);
        if (ret) {
  
        ret = of_property_read_u32(dn, "reg", &host->cs);
        if (ret) {


@@ -34,7 +34,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                return -ENXIO;
        }
  
                return -ENXIO;
        }
  

-@@ -2788,13 +2788,13 @@ static int brcmnand_init_cs(struct brcmn
+@@ -2823,13 +2823,13 @@ static int brcmnand_init_cs(struct brcmn

  
        nand_set_flash_node(chip, dn);
        nand_set_controller_data(chip, host);
  
        nand_set_flash_node(chip, dn);
        nand_set_controller_data(chip, host);

diff --git a/target/linux/bcm47xx/patches-5.15/103-v5.18-mtd-rawnand-brcmnand-Move-OF-operations-out-of-brcmnand_init_cs.patch b/target/linux/bcm47xx/patches-5.15/103-v5.18-mtd-rawnand-brcmnand-Move-OF-operations-out-of-brcmnand_init_cs.patch
index e2fa72add1c4afbd4b0aa8bbfe5cb114cc135a73..2e2c05a43244adffb40ff613766a1c26b005871d 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/103-v5.18-mtd-rawnand-brcmnand-Move-OF-operations-out-of-brcmnand_init_cs.patch
+++ b/target/linux/bcm47xx/patches-5.15/103-v5.18-mtd-rawnand-brcmnand-Move-OF-operations-out-of-brcmnand_init_cs.patch
@@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 
 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c

-@@ -2768,7 +2768,7 @@ static const struct nand_controller_ops
+@@ -2803,7 +2803,7 @@ static const struct nand_controller_ops

        .attach_chip = brcmnand_attach_chip,
  };
  
        .attach_chip = brcmnand_attach_chip,
  };
  


@@ -26,7 +26,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  {
        struct brcmnand_controller *ctrl = host->ctrl;
        struct device *dev = ctrl->dev;
  {
        struct brcmnand_controller *ctrl = host->ctrl;
        struct device *dev = ctrl->dev;

-@@ -2777,16 +2777,9 @@ static int brcmnand_init_cs(struct brcmn
+@@ -2812,16 +2812,9 @@ static int brcmnand_init_cs(struct brcmn

        int ret;
        u16 cfg_offs;
  
        int ret;
        u16 cfg_offs;
  


@@ -43,7 +43,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
        nand_set_controller_data(chip, host);
        mtd->name = devm_kasprintf(dev, GFP_KERNEL, "brcmnand.%d",
                                   host->cs);
        nand_set_controller_data(chip, host);
        mtd->name = devm_kasprintf(dev, GFP_KERNEL, "brcmnand.%d",
                                   host->cs);

-@@ -3193,7 +3186,16 @@ int brcmnand_probe(struct platform_devic
+@@ -3228,7 +3221,16 @@ int brcmnand_probe(struct platform_devic

                        host->pdev = pdev;
                        host->ctrl = ctrl;
  
                        host->pdev = pdev;
                        host->ctrl = ctrl;
  

diff --git a/target/linux/bcm47xx/patches-5.15/104-v5.18-mtd-rawnand-brcmnand-Allow-working-without-interrupts.patch b/target/linux/bcm47xx/patches-5.15/104-v5.18-mtd-rawnand-brcmnand-Allow-working-without-interrupts.patch
index bdf325d732eb052431bdb4481c7390ff91208aa1..0845a7bfa329aa9c748f3abfe244510b158695ea 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/104-v5.18-mtd-rawnand-brcmnand-Allow-working-without-interrupts.patch
+++ b/target/linux/bcm47xx/patches-5.15/104-v5.18-mtd-rawnand-brcmnand-Allow-working-without-interrupts.patch
@@ -23,7 +23,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
        unsigned int            dma_irq;
        int                     nand_version;
  
        unsigned int            dma_irq;
        int                     nand_version;
  

-@@ -1610,7 +1610,7 @@ static bool brcmstb_nand_wait_for_comple
+@@ -1642,7 +1642,7 @@ static bool brcmstb_nand_wait_for_comple

        bool err = false;
        int sts;
  
        bool err = false;
        int sts;
  


@@ -32,7 +32,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                /* switch to interrupt polling and PIO mode */
                disable_ctrl_irqs(ctrl);
                sts = bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY,
                /* switch to interrupt polling and PIO mode */
                disable_ctrl_irqs(ctrl);
                sts = bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY,

-@@ -3144,33 +3144,29 @@ int brcmnand_probe(struct platform_devic
+@@ -3179,33 +3179,29 @@ int brcmnand_probe(struct platform_devic

        }
  
        /* IRQ */
        }
  
        /* IRQ */

diff --git a/target/linux/bcm47xx/patches-5.15/106-v5.18-mtd-rawnand-brcmnand-Allow-platform-data-instantation.patch b/target/linux/bcm47xx/patches-5.15/106-v5.18-mtd-rawnand-brcmnand-Allow-platform-data-instantation.patch
index 31d686b9557b41c7dab5bd18c52bb19eb79d432f..bf9b410102a38cf81f2693fdd4cc3dad2c8b41f1 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/106-v5.18-mtd-rawnand-brcmnand-Allow-platform-data-instantation.patch
+++ b/target/linux/bcm47xx/patches-5.15/106-v5.18-mtd-rawnand-brcmnand-Allow-platform-data-instantation.patch
@@ -23,7 +23,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  #include <linux/err.h>
  #include <linux/completion.h>
  #include <linux/interrupt.h>
  #include <linux/err.h>
  #include <linux/completion.h>
  #include <linux/interrupt.h>

-@@ -2768,7 +2769,8 @@ static const struct nand_controller_ops
+@@ -2803,7 +2804,8 @@ static const struct nand_controller_ops

        .attach_chip = brcmnand_attach_chip,
  };
  
        .attach_chip = brcmnand_attach_chip,
  };
  


@@ -33,7 +33,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  {
        struct brcmnand_controller *ctrl = host->ctrl;
        struct device *dev = ctrl->dev;
  {
        struct brcmnand_controller *ctrl = host->ctrl;
        struct device *dev = ctrl->dev;

-@@ -2821,7 +2823,7 @@ static int brcmnand_init_cs(struct brcmn
+@@ -2856,7 +2858,7 @@ static int brcmnand_init_cs(struct brcmn

        if (ret)
                return ret;
  
        if (ret)
                return ret;
  


@@ -42,7 +42,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
        if (ret)
                nand_cleanup(chip);
  
        if (ret)
                nand_cleanup(chip);
  

-@@ -2990,17 +2992,15 @@ static int brcmnand_edu_setup(struct pla
+@@ -3025,17 +3027,15 @@ static int brcmnand_edu_setup(struct pla

  
  int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
  {
  
  int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
  {


@@ -63,7 +63,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                return -ENODEV;
  
        ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);
                return -ENODEV;
  
        ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);

-@@ -3027,7 +3027,7 @@ int brcmnand_probe(struct platform_devic
+@@ -3062,7 +3062,7 @@ int brcmnand_probe(struct platform_devic

        /* NAND register range */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        ctrl->nand_base = devm_ioremap_resource(dev, res);
        /* NAND register range */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        ctrl->nand_base = devm_ioremap_resource(dev, res);


@@ -72,7 +72,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                return PTR_ERR(ctrl->nand_base);
  
        /* Enable clock before using NAND registers */
                return PTR_ERR(ctrl->nand_base);
  
        /* Enable clock before using NAND registers */

-@@ -3171,7 +3171,6 @@ int brcmnand_probe(struct platform_devic
+@@ -3206,7 +3206,6 @@ int brcmnand_probe(struct platform_devic

  
        for_each_available_child_of_node(dn, child) {
                if (of_device_is_compatible(child, "brcm,nandcs")) {
  
        for_each_available_child_of_node(dn, child) {
                if (of_device_is_compatible(child, "brcm,nandcs")) {


@@ -80,7 +80,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  
                        host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
                        if (!host) {
  
                        host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
                        if (!host) {

-@@ -3191,7 +3190,7 @@ int brcmnand_probe(struct platform_devic
+@@ -3226,7 +3225,7 @@ int brcmnand_probe(struct platform_devic

  
                        nand_set_flash_node(&host->chip, child);
  
  
                        nand_set_flash_node(&host->chip, child);
  


@@ -89,7 +89,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                        if (ret) {
                                devm_kfree(dev, host);
                                continue; /* Try all chip-selects */
                        if (ret) {
                                devm_kfree(dev, host);
                                continue; /* Try all chip-selects */

-@@ -3201,6 +3200,32 @@ int brcmnand_probe(struct platform_devic
+@@ -3236,6 +3235,32 @@ int brcmnand_probe(struct platform_devic

                }
        }
  
                }
        }
  

diff --git a/target/linux/bcm53xx/patches-5.15/030-v5.16-0019-ARM-dts-BCM53573-Describe-on-SoC-BCM53125-rev-4-swit.patch b/target/linux/bcm53xx/patches-5.15/030-v5.16-0019-ARM-dts-BCM53573-Describe-on-SoC-BCM53125-rev-4-swit.patch
index 3a5438c228241fad5c84bee9317092dca9f15fe5..914117cb2cb8727d793f008366bfb32f4fa46865 100644 (file)
--- a/target/linux/bcm53xx/patches-5.15/030-v5.16-0019-ARM-dts-BCM53573-Describe-on-SoC-BCM53125-rev-4-swit.patch
+++ b/target/linux/bcm53xx/patches-5.15/030-v5.16-0019-ARM-dts-BCM53573-Describe-on-SoC-BCM53125-rev-4-swit.patch
@@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/arch/arm/boot/dts/bcm53573.dtsi
 +++ b/arch/arm/boot/dts/bcm53573.dtsi
 
 --- a/arch/arm/boot/dts/bcm53573.dtsi
 +++ b/arch/arm/boot/dts/bcm53573.dtsi

-@@ -180,6 +180,24 @@
+@@ -183,6 +183,24 @@

  
                gmac0: ethernet@5000 {
                        reg = <0x5000 0x1000>;
  
                gmac0: ethernet@5000 {
                        reg = <0x5000 0x1000>;

diff --git a/target/linux/bcm53xx/patches-5.15/034-v6.0-0001-ARM-dts-broadcom-align-gpio-key-node-names-with-dtsc.patch b/target/linux/bcm53xx/patches-5.15/034-v6.0-0001-ARM-dts-broadcom-align-gpio-key-node-names-with-dtsc.patch
index 33d675297e3b65e6ea5c74d9a775a3d7b7f9c915..f929dc3b6067a5b2d87679d629b8648086e1d150 100644 (file)
--- a/target/linux/bcm53xx/patches-5.15/034-v6.0-0001-ARM-dts-broadcom-align-gpio-key-node-names-with-dtsc.patch
+++ b/target/linux/bcm53xx/patches-5.15/034-v6.0-0001-ARM-dts-broadcom-align-gpio-key-node-names-with-dtsc.patch
@@ -213,7 +213,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                        gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 --- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
                        gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
 --- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts

-@@ -25,13 +25,13 @@
+@@ -26,13 +26,13 @@

        gpio-keys {
                compatible = "gpio-keys";
  
        gpio-keys {
                compatible = "gpio-keys";
  

diff --git a/target/linux/bcm53xx/patches-5.15/037-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.patch b/target/linux/bcm53xx/patches-5.15/037-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.patch
index 7836d560a16967d05329c8c4e975ae6aa1fb999a..e7a1835d47a978a3d8974de402657550f9aadbfe 100644 (file)
--- a/target/linux/bcm53xx/patches-5.15/037-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.patch
+++ b/target/linux/bcm53xx/patches-5.15/037-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.patch
@@ -21,7 +21,7 @@ Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
 
 --- a/arch/arm/boot/dts/bcm53573.dtsi
 +++ b/arch/arm/boot/dts/bcm53573.dtsi
 
 --- a/arch/arm/boot/dts/bcm53573.dtsi
 +++ b/arch/arm/boot/dts/bcm53573.dtsi

-@@ -156,8 +156,6 @@
+@@ -159,8 +159,6 @@

                        };
  
                        ohci: usb@d000 {
                        };
  
                        ohci: usb@d000 {

diff --git a/target/linux/bcm53xx/patches-5.15/037-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch b/target/linux/bcm53xx/patches-5.15/037-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch
deleted file mode 100644 (file)
index 86a52aa..0000000
--- a/target/linux/bcm53xx/patches-5.15/037-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3392ef368d9b04622fe758b1079b512664b6110a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 7 Jul 2023 13:40:03 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Add cells sizes to PCIe node
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes:
-arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#address-cells' is a required property
-        From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yaml
-arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#size-cells' is a required property
-        From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yaml
-
-Two properties that need to be added later are "device_type" and
-"ranges". Adding "device_type" on its own causes a new warning and the
-value of "ranges" needs to be determined yet.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20230707114004.2740-3-zajec5@gmail.com
-Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
----
- arch/arm/boot/dts/broadcom/bcm53573.dtsi | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/arm/boot/dts/bcm53573.dtsi
-+++ b/arch/arm/boot/dts/bcm53573.dtsi
-@@ -127,6 +127,9 @@
- 
-               pcie0: pcie@2000 {
-                       reg = <0x00002000 0x1000>;
-+
-+                      #address-cells = <3>;
-+                      #size-cells = <2>;
-               };
- 
-               usb2: usb2@4000 {

diff --git a/target/linux/bcm53xx/patches-5.15/037-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch b/target/linux/bcm53xx/patches-5.15/037-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch
deleted file mode 100644 (file)
index 28d8994..0000000
--- a/target/linux/bcm53xx/patches-5.15/037-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c0fd6b3d0778ceab40205315ccef74568490f17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 7 Jul 2023 13:40:04 +0200
-Subject: [PATCH] ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Switch away from deprecated properties.
-
-This fixes:
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-sck: False schema does not allow [[3, 21, 0]]
-        From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-miso: False schema does not allow [[3, 22, 0]]
-        From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-mosi: False schema does not allow [[3, 23, 0]]
-        From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: 'sck-gpios' is a required property
-        From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: Unevaluated properties are not allowed ('gpio-miso', 'gpio-mosi', 'gpio-sck' were unexpected)
-        From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20230707114004.2740-4-zajec5@gmail.com
-Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
----
- arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/bcm947189acdbmr.dts
-+++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
-@@ -60,9 +60,9 @@
-       spi {
-               compatible = "spi-gpio";
-               num-chipselects = <1>;
--              gpio-sck = <&chipcommon 21 0>;
--              gpio-miso = <&chipcommon 22 0>;
--              gpio-mosi = <&chipcommon 23 0>;
-+              sck-gpios = <&chipcommon 21 0>;
-+              miso-gpios = <&chipcommon 22 0>;
-+              mosi-gpios = <&chipcommon 23 0>;
-               cs-gpios = <&chipcommon 24 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;

diff --git a/target/linux/bcm53xx/patches-5.15/037-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch b/target/linux/bcm53xx/patches-5.15/037-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch
deleted file mode 100644 (file)
index 6ae8aad..0000000
--- a/target/linux/bcm53xx/patches-5.15/037-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Aleksey Nasibulin <alealexpro100@ya.ru>
-Date: Wed, 12 Jul 2023 03:40:17 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys
- EA6500 V2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Linksys ea6500-v2 have 256MB of ram. Currently we only use 128MB.
-Expand the definition to use all the available RAM.
-
-Fixes: 03e96644d7a8 ("ARM: dts: BCM5301X: Add basic DT for Linksys EA6500 V2")
-Signed-off-by: Aleksey Nasibulin <alealexpro100@ya.ru>
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-Cc: stable@vger.kernel.org
-Acked-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20230712014017.28123-1-ansuelsmth@gmail.com
-Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
----
- arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
-+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
-@@ -19,7 +19,8 @@
- 
-       memory@0 {
-               device_type = "memory";
--              reg = <0x00000000 0x08000000>;
-+              reg = <0x00000000 0x08000000>,
-+                    <0x88000000 0x08000000>;
-       };
- 
-       gpio-keys {

diff --git a/target/linux/bcm53xx/patches-5.15/037-v6.6-0009-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch b/target/linux/bcm53xx/patches-5.15/037-v6.6-0009-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch
index 07dd9296b69359e7fc5eda44cdf055b906bbc96d..7930c52b162ab13535d5ca4250bdfcdad5316cc4 100644 (file)
--- a/target/linux/bcm53xx/patches-5.15/037-v6.6-0009-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch
+++ b/target/linux/bcm53xx/patches-5.15/037-v6.6-0009-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch
@@ -37,7 +37,7 @@ Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
 
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts

-@@ -45,3 +45,16 @@
+@@ -58,3 +58,16 @@

                };
        };
  };
                };
        };
  };


@@ -56,7 +56,7 @@ Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
 +};
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 +};
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts

-@@ -81,3 +81,16 @@
+@@ -94,3 +94,16 @@

                };
        };
  };
                };
        };
  };

diff --git a/target/linux/bcm53xx/patches-5.15/037-v6.6-0015-ARM-dts-BCM53573-Disable-second-Ethernet-on-Luxul-de.patch b/target/linux/bcm53xx/patches-5.15/037-v6.6-0015-ARM-dts-BCM53573-Disable-second-Ethernet-on-Luxul-de.patch
index 166f602452a9048f5137876eb4d45eb0f96be59e..e9e347075d7a7636b4f9fd40860230a139ed9db1 100644 (file)
--- a/target/linux/bcm53xx/patches-5.15/037-v6.6-0015-ARM-dts-BCM53573-Disable-second-Ethernet-on-Luxul-de.patch
+++ b/target/linux/bcm53xx/patches-5.15/037-v6.6-0015-ARM-dts-BCM53573-Disable-second-Ethernet-on-Luxul-de.patch
@@ -19,7 +19,7 @@ Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
 
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts

-@@ -60,3 +60,7 @@
+@@ -73,3 +73,7 @@

                };
        };
  };
                };
        };
  };


@@ -29,7 +29,7 @@ Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
 +};
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 +};
 --- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
 +++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts

-@@ -96,3 +96,7 @@
+@@ -109,3 +109,7 @@

                };
        };
  };
                };
        };
  };

diff --git a/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch b/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
index 5cd6e03dc60779dcf7bf2f56b32e78ca99df9150..40e51b4294a75a794741cf8e72ee35c40784d8a2 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-07-mm-multi-gen-LRU-exploit-locality-in-rmap.patch
@@ -110,7 +110,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 
 --- a/include/linux/memcontrol.h
 +++ b/include/linux/memcontrol.h
 
 --- a/include/linux/memcontrol.h
 +++ b/include/linux/memcontrol.h

-@@ -442,6 +442,7 @@ static inline struct obj_cgroup *__page_
+@@ -447,6 +447,7 @@ static inline struct obj_cgroup *__page_

   * - LRU isolation
   * - lock_page_memcg()
   * - exclusive reference
   * - LRU isolation
   * - lock_page_memcg()
   * - exclusive reference


@@ -118,7 +118,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
   *
   * For a kmem page a caller should hold an rcu read lock to protect memcg
   * associated with a kmem page from being released.
   *
   * For a kmem page a caller should hold an rcu read lock to protect memcg
   * associated with a kmem page from being released.

-@@ -497,6 +498,7 @@ static inline struct mem_cgroup *page_me
+@@ -502,6 +503,7 @@ static inline struct mem_cgroup *page_me

   * - LRU isolation
   * - lock_page_memcg()
   * - exclusive reference
   * - LRU isolation
   * - lock_page_memcg()
   * - exclusive reference


@@ -126,7 +126,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
   *
   * For a kmem page a caller should hold an rcu read lock to protect memcg
   * associated with a kmem page from being released.
   *
   * For a kmem page a caller should hold an rcu read lock to protect memcg
   * associated with a kmem page from being released.

-@@ -953,6 +955,23 @@ void unlock_page_memcg(struct page *page
+@@ -958,6 +960,23 @@ void unlock_page_memcg(struct page *page

  
  void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val);
  
  
  void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val);
  


@@ -150,7 +150,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  /* idx can be of type enum memcg_stat_item or node_stat_item */
  static inline void mod_memcg_state(struct mem_cgroup *memcg,
                                   int idx, int val)
  /* idx can be of type enum memcg_stat_item or node_stat_item */
  static inline void mod_memcg_state(struct mem_cgroup *memcg,
                                   int idx, int val)

-@@ -1369,6 +1388,18 @@ static inline void unlock_page_memcg(str
+@@ -1374,6 +1393,18 @@ static inline void unlock_page_memcg(str

  {
  }
  
  {
  }
  

diff --git a/target/linux/generic/backport-5.15/020-v6.1-08-mm-multi-gen-LRU-support-page-table-walks.patch b/target/linux/generic/backport-5.15/020-v6.1-08-mm-multi-gen-LRU-support-page-table-walks.patch
index e6ce94e3d4fcac108e2379c3c3b58877db50130e..c89d3c2542814b09ab4f9afe132954cc9c3e8506 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.1-08-mm-multi-gen-LRU-support-page-table-walks.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-08-mm-multi-gen-LRU-support-page-table-walks.patch
@@ -167,7 +167,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
                BUG_ON(active_mm != old_mm);
 --- a/include/linux/memcontrol.h
 +++ b/include/linux/memcontrol.h
                BUG_ON(active_mm != old_mm);
 --- a/include/linux/memcontrol.h
 +++ b/include/linux/memcontrol.h

-@@ -348,6 +348,11 @@ struct mem_cgroup {
+@@ -353,6 +353,11 @@ struct mem_cgroup {

        struct deferred_split deferred_split_queue;
  #endif
  
        struct deferred_split deferred_split_queue;
  #endif
  

diff --git a/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch b/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch
index f54e828de1060000d4280f30f0398fec741135b3..6010e617b863e40cd525f4f658549827ec502f31 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch
+++ b/target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch
@@ -69,7 +69,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 
 --- a/include/linux/memcontrol.h
 +++ b/include/linux/memcontrol.h
 
 --- a/include/linux/memcontrol.h
 +++ b/include/linux/memcontrol.h

-@@ -818,6 +818,11 @@ static inline void obj_cgroup_put(struct
+@@ -823,6 +823,11 @@ static inline void obj_cgroup_put(struct

        percpu_ref_put(&objcg->refcnt);
  }
  
        percpu_ref_put(&objcg->refcnt);
  }
  


@@ -81,7 +81,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  static inline void mem_cgroup_put(struct mem_cgroup *memcg)
  {
        if (memcg)
  static inline void mem_cgroup_put(struct mem_cgroup *memcg)
  {
        if (memcg)

-@@ -1283,6 +1288,11 @@ struct mem_cgroup *mem_cgroup_from_css(s
+@@ -1288,6 +1293,11 @@ struct mem_cgroup *mem_cgroup_from_css(s

        return NULL;
  }
  
        return NULL;
  }
  

diff --git a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch
index 3bdba8728cfadefd38be569641604703b76d3841..1ec260a2e6a750c3f99ea92b1b6681111b554cda 100644 (file)
--- a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch
+++ b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch
@@ -22,7 +22,7 @@ Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.16469
 
 --- a/drivers/net/veth.c
 +++ b/drivers/net/veth.c
 
 --- a/drivers/net/veth.c
 +++ b/drivers/net/veth.c

-@@ -501,7 +501,7 @@ static int veth_xdp_xmit(struct net_devi
+@@ -503,7 +503,7 @@ static int veth_xdp_xmit(struct net_devi

                struct xdp_frame *frame = frames[i];
                void *ptr = veth_xdp_to_ptr(frame);
  
                struct xdp_frame *frame = frames[i];
                void *ptr = veth_xdp_to_ptr(frame);
  


@@ -31,7 +31,7 @@ Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.16469
                             __ptr_ring_produce(&rq->xdp_ring, ptr)))
                        break;
                nxmit++;
                             __ptr_ring_produce(&rq->xdp_ring, ptr)))
                        break;
                nxmit++;

-@@ -862,7 +862,7 @@ static int veth_xdp_rcv(struct veth_rq *
+@@ -864,7 +864,7 @@ static int veth_xdp_rcv(struct veth_rq *

                        /* ndo_xdp_xmit */
                        struct xdp_frame *frame = veth_ptr_to_xdp(ptr);
  
                        /* ndo_xdp_xmit */
                        struct xdp_frame *frame = veth_ptr_to_xdp(ptr);
  

diff --git a/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch b/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch
index 31b44f117079b2b977de50f133b28941b4939060..cab980a6dceef8df913d5433a194edb02350de7f 100644 (file)
--- a/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch
+++ b/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch
@@ -20,7 +20,7 @@ Link: https://lore.kernel.org/bpf/d5dc039c3d4123426e7023a488c449181a7bc57f.16469
 
 --- a/drivers/net/veth.c
 +++ b/drivers/net/veth.c
 
 --- a/drivers/net/veth.c
 +++ b/drivers/net/veth.c

-@@ -1471,9 +1471,14 @@ static int veth_xdp_set(struct net_devic
+@@ -1473,9 +1473,14 @@ static int veth_xdp_set(struct net_devic

                        goto err;
                }
  
                        goto err;
                }
  

diff --git a/target/linux/generic/backport-5.15/702-v5.19-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/generic/backport-5.15/702-v5.19-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch
index d6de92a487360ff904993ae16411786a12234dd7..3e7612b0d90c17a9d8e1949a2431f98c6e957f0b 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch
@@ -196,7 +196,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                                  ring->dma_size * sizeof(*ring->dma),
                                  ring->dma,
                                  ring->phys);
                                  ring->dma_size * sizeof(*ring->dma),
                                  ring->dma,
                                  ring->phys);

-@@ -2162,7 +2163,7 @@ static void mtk_dma_free(struct mtk_eth
+@@ -2165,7 +2166,7 @@ static void mtk_dma_free(struct mtk_eth

                if (eth->netdev[i])
                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {
                if (eth->netdev[i])
                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {


@@ -205,7 +205,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                                  MTK_DMA_SIZE * sizeof(struct mtk_tx_dma),
                                  eth->scratch_ring,
                                  eth->phy_scratch_ring);
                                  MTK_DMA_SIZE * sizeof(struct mtk_tx_dma),
                                  eth->scratch_ring,
                                  eth->phy_scratch_ring);

-@@ -2514,6 +2515,8 @@ static void mtk_dim_tx(struct work_struc
+@@ -2517,6 +2518,8 @@ static void mtk_dim_tx(struct work_struc

  
  static int mtk_hw_init(struct mtk_eth *eth)
  {
  
  static int mtk_hw_init(struct mtk_eth *eth)
  {


@@ -214,7 +214,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        int i, val, ret;
  
        if (test_and_set_bit(MTK_HW_INIT, &eth->state))
        int i, val, ret;
  
        if (test_and_set_bit(MTK_HW_INIT, &eth->state))

-@@ -2526,6 +2529,10 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2529,6 +2532,10 @@ static int mtk_hw_init(struct mtk_eth *e

        if (ret)
                goto err_disable_pm;
  
        if (ret)
                goto err_disable_pm;
  


@@ -225,7 +225,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
                ret = device_reset(eth->dev);
                if (ret) {
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
                ret = device_reset(eth->dev);
                if (ret) {

-@@ -3072,6 +3079,35 @@ free_netdev:
+@@ -3075,6 +3082,35 @@ free_netdev:

        return err;
  }
  
        return err;
  }
  


@@ -261,7 +261,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static int mtk_probe(struct platform_device *pdev)
  {
        struct device_node *mac_np;
  static int mtk_probe(struct platform_device *pdev)
  {
        struct device_node *mac_np;

-@@ -3085,6 +3121,7 @@ static int mtk_probe(struct platform_dev
+@@ -3088,6 +3124,7 @@ static int mtk_probe(struct platform_dev

        eth->soc = of_device_get_match_data(&pdev->dev);
  
        eth->dev = &pdev->dev;
        eth->soc = of_device_get_match_data(&pdev->dev);
  
        eth->dev = &pdev->dev;


@@ -269,7 +269,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        eth->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(eth->base))
                return PTR_ERR(eth->base);
        eth->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(eth->base))
                return PTR_ERR(eth->base);

-@@ -3133,6 +3170,16 @@ static int mtk_probe(struct platform_dev
+@@ -3136,6 +3173,16 @@ static int mtk_probe(struct platform_dev

                }
        }
  
                }
        }
  

diff --git a/target/linux/generic/backport-5.15/702-v5.19-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch b/target/linux/generic/backport-5.15/702-v5.19-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch
index 06f948823612dd390e696eb07e55cdd308199a26..ba72a796ee3f74d9f7e0b87adf51b7b7d80cf3bc 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  static int mtk_msg_level = -1;
  module_param_named(msg_level, mtk_msg_level, int, 0);
  
  static int mtk_msg_level = -1;
  module_param_named(msg_level, mtk_msg_level, int, 0);

-@@ -3202,6 +3203,22 @@ static int mtk_probe(struct platform_dev
+@@ -3205,6 +3206,22 @@ static int mtk_probe(struct platform_dev

                }
        }
  
                }
        }
  

diff --git a/target/linux/generic/backport-5.15/702-v5.19-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch b/target/linux/generic/backport-5.15/702-v5.19-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch
index 1951a1d6764f0f48d465501c314f27a4d65ba2f7..030a3346768afcba600e2870a93e321c7ef9cdc6 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-07-net-ethernet-mtk_eth_soc-allocate-struct-mtk_ppe-sep.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -2335,7 +2335,7 @@ static int mtk_open(struct net_device *d
+@@ -2338,7 +2338,7 @@ static int mtk_open(struct net_device *d

                        return err;
                }
  
                        return err;
                }
  


@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                        gdm_config = MTK_GDMA_TO_PPE;
  
                mtk_gdm_config(eth, gdm_config);
                        gdm_config = MTK_GDMA_TO_PPE;
  
                mtk_gdm_config(eth, gdm_config);

-@@ -2409,7 +2409,7 @@ static int mtk_stop(struct net_device *d
+@@ -2412,7 +2412,7 @@ static int mtk_stop(struct net_device *d

        mtk_dma_free(eth);
  
        if (eth->soc->offload_version)
        mtk_dma_free(eth);
  
        if (eth->soc->offload_version)


@@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        return 0;
  }
  
        return 0;
  }

-@@ -3294,10 +3294,11 @@ static int mtk_probe(struct platform_dev
+@@ -3297,10 +3297,11 @@ static int mtk_probe(struct platform_dev

        }
  
        if (eth->soc->offload_version) {
        }
  
        if (eth->soc->offload_version) {

diff --git a/target/linux/generic/backport-5.15/702-v5.19-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch b/target/linux/generic/backport-5.15/702-v5.19-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch
index 9213f28b2a0aa4ef49ad4efe2f96635180c26e7a..0bb3f906accfe5046b86136fa5d1ba11e45038cc 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-08-net-ethernet-mtk_eth_soc-rework-hardware-flow-table-.patch
@@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX &&
                    (trxd.rxd2 & RX_DMA_VTAG))
                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
                if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX &&
                    (trxd.rxd2 & RX_DMA_VTAG))
                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),

-@@ -3294,7 +3300,7 @@ static int mtk_probe(struct platform_dev
+@@ -3297,7 +3303,7 @@ static int mtk_probe(struct platform_dev

        }
  
        if (eth->soc->offload_version) {
        }
  
        if (eth->soc->offload_version) {

diff --git a/target/linux/generic/backport-5.15/702-v5.19-13-net-ethernet-mtk_eth_soc-use-standard-property-for-c.patch b/target/linux/generic/backport-5.15/702-v5.19-13-net-ethernet-mtk_eth_soc-use-standard-property-for-c.patch
index 5a7561798d55d27daf34ceb78418afa606c02a27..fe5b9263df9a585f506779f447d60c3391bd5cd4 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-13-net-ethernet-mtk_eth_soc-use-standard-property-for-c.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-13-net-ethernet-mtk_eth_soc-use-standard-property-for-c.patch
@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                mediatek,hifsys = <&hifsys>;
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
                mediatek,hifsys = <&hifsys>;
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3181,7 +3181,7 @@ static int mtk_probe(struct platform_dev
+@@ -3184,7 +3184,7 @@ static int mtk_probe(struct platform_dev

                struct regmap *cci;
  
                cci = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
                struct regmap *cci;
  
                cci = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,

diff --git a/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch b/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch
index 5bf44cc772dcaad382f47d0e271b426b331136d0..cadebbfa7551ecb5174577ed349adf3f17f41ef5 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch
@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        mtk_w32(eth, eth->phy_scratch_ring, MTK_QDMA_FQ_HEAD);
        }
  
        mtk_w32(eth, eth->phy_scratch_ring, MTK_QDMA_FQ_HEAD);

-@@ -2170,6 +2173,7 @@ static int mtk_dma_init(struct mtk_eth *
+@@ -2173,6 +2176,7 @@ static int mtk_dma_init(struct mtk_eth *

  
  static void mtk_dma_free(struct mtk_eth *eth)
  {
  
  static void mtk_dma_free(struct mtk_eth *eth)
  {


@@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int i;
  
        for (i = 0; i < MTK_MAC_COUNT; i++)
        int i;
  
        for (i = 0; i < MTK_MAC_COUNT; i++)

-@@ -2177,9 +2181,8 @@ static void mtk_dma_free(struct mtk_eth
+@@ -2180,9 +2184,8 @@ static void mtk_dma_free(struct mtk_eth

                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {
                dma_free_coherent(eth->dma_dev,
                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {
                dma_free_coherent(eth->dma_dev,


@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                eth->scratch_ring = NULL;
                eth->phy_scratch_ring = 0;
        }
                eth->scratch_ring = NULL;
                eth->phy_scratch_ring = 0;
        }

-@@ -3384,6 +3387,9 @@ static const struct mtk_soc_data mt2701_
+@@ -3387,6 +3390,9 @@ static const struct mtk_soc_data mt2701_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,


@@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7621_data = {
  };
  
  static const struct mtk_soc_data mt7621_data = {

-@@ -3392,6 +3398,9 @@ static const struct mtk_soc_data mt7621_
+@@ -3395,6 +3401,9 @@ static const struct mtk_soc_data mt7621_

        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,


@@ -105,7 +105,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7622_data = {
  };
  
  static const struct mtk_soc_data mt7622_data = {

-@@ -3401,6 +3410,9 @@ static const struct mtk_soc_data mt7622_
+@@ -3404,6 +3413,9 @@ static const struct mtk_soc_data mt7622_

        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,


@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7623_data = {
  };
  
  static const struct mtk_soc_data mt7623_data = {

-@@ -3409,6 +3421,9 @@ static const struct mtk_soc_data mt7623_
+@@ -3412,6 +3424,9 @@ static const struct mtk_soc_data mt7623_

        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .offload_version = 2,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .offload_version = 2,


@@ -125,7 +125,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7629_data = {
  };
  
  static const struct mtk_soc_data mt7629_data = {

-@@ -3417,6 +3432,9 @@ static const struct mtk_soc_data mt7629_
+@@ -3420,6 +3435,9 @@ static const struct mtk_soc_data mt7629_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,


@@ -135,7 +135,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data rt5350_data = {
  };
  
  static const struct mtk_soc_data rt5350_data = {

-@@ -3424,6 +3442,9 @@ static const struct mtk_soc_data rt5350_
+@@ -3427,6 +3445,9 @@ static const struct mtk_soc_data rt5350_

        .hw_features = MTK_HW_FEATURES_MT7628,
        .required_clks = MT7628_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES_MT7628,
        .required_clks = MT7628_CLKS_BITMAP,
        .required_pctl = false,

diff --git a/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch b/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch
index 127312baeca240ee70ce4df98bef89e6755682bc..525882c956b2df853e1cf9d95a5703744bcfb1c6 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch
@@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                ring->dma = NULL;
        }
  }
                ring->dma = NULL;
        }
  }

-@@ -3399,6 +3398,7 @@ static const struct mtk_soc_data mt2701_
+@@ -3402,6 +3401,7 @@ static const struct mtk_soc_data mt2701_

        .required_pctl = true,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
        .required_pctl = true,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),


@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3410,6 +3410,7 @@ static const struct mtk_soc_data mt7621_
+@@ -3413,6 +3413,7 @@ static const struct mtk_soc_data mt7621_

        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),


@@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3422,6 +3423,7 @@ static const struct mtk_soc_data mt7622_
+@@ -3425,6 +3426,7 @@ static const struct mtk_soc_data mt7622_

        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),


@@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3433,6 +3435,7 @@ static const struct mtk_soc_data mt7623_
+@@ -3436,6 +3438,7 @@ static const struct mtk_soc_data mt7623_

        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),


@@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3444,6 +3447,7 @@ static const struct mtk_soc_data mt7629_
+@@ -3447,6 +3450,7 @@ static const struct mtk_soc_data mt7629_

        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),


@@ -74,7 +74,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3454,6 +3458,7 @@ static const struct mtk_soc_data rt5350_
+@@ -3457,6 +3461,7 @@ static const struct mtk_soc_data rt5350_

        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),

diff --git a/target/linux/generic/backport-5.15/702-v5.19-26-net-ethernet-mtk_eth_soc-introduce-device-register-m.patch b/target/linux/generic/backport-5.15/702-v5.19-26-net-ethernet-mtk_eth_soc-introduce-device-register-m.patch
index d694578b33e1a9cdf8e469835fa3b42d88ec4f1c..11941d5c37436c1f1bdc076f43b6d0ebf8c271a3 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-26-net-ethernet-mtk_eth_soc-introduce-device-register-m.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-26-net-ethernet-mtk_eth_soc-introduce-device-register-m.patch
@@ -345,7 +345,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return 0;
  }
  
        return 0;
  }

-@@ -2126,9 +2185,9 @@ static int mtk_dma_busy_wait(struct mtk_
+@@ -2129,9 +2188,9 @@ static int mtk_dma_busy_wait(struct mtk_

        u32 val;
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
        u32 val;
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))


@@ -357,7 +357,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        ret = readx_poll_timeout_atomic(__raw_readl, eth->base + reg, val,
                                        !(val & (MTK_RX_DMA_BUSY | MTK_TX_DMA_BUSY)),
  
        ret = readx_poll_timeout_atomic(__raw_readl, eth->base + reg, val,
                                        !(val & (MTK_RX_DMA_BUSY | MTK_TX_DMA_BUSY)),

-@@ -2186,8 +2245,8 @@ static int mtk_dma_init(struct mtk_eth *
+@@ -2189,8 +2248,8 @@ static int mtk_dma_init(struct mtk_eth *

                 * automatically
                 */
                mtk_w32(eth, FC_THRES_DROP_MODE | FC_THRES_DROP_EN |
                 * automatically
                 */
                mtk_w32(eth, FC_THRES_DROP_MODE | FC_THRES_DROP_EN |


@@ -368,7 +368,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        return 0;
        }
  
        return 0;

-@@ -2261,13 +2320,14 @@ static irqreturn_t mtk_handle_irq_tx(int
+@@ -2264,13 +2323,14 @@ static irqreturn_t mtk_handle_irq_tx(int

  static irqreturn_t mtk_handle_irq(int irq, void *_eth)
  {
        struct mtk_eth *eth = _eth;
  static irqreturn_t mtk_handle_irq(int irq, void *_eth)
  {
        struct mtk_eth *eth = _eth;


@@ -387,7 +387,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        mtk_handle_irq_tx(irq, _eth);
        }
  
                        mtk_handle_irq_tx(irq, _eth);
        }
  

-@@ -2291,6 +2351,7 @@ static void mtk_poll_controller(struct n
+@@ -2294,6 +2354,7 @@ static void mtk_poll_controller(struct n

  static int mtk_start_dma(struct mtk_eth *eth)
  {
        u32 rx_2b_offset = (NET_IP_ALIGN == 2) ? MTK_RX_2B_OFFSET : 0;
  static int mtk_start_dma(struct mtk_eth *eth)
  {
        u32 rx_2b_offset = (NET_IP_ALIGN == 2) ? MTK_RX_2B_OFFSET : 0;


@@ -395,7 +395,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int err;
  
        err = mtk_dma_init(eth);
        int err;
  
        err = mtk_dma_init(eth);

-@@ -2305,16 +2366,15 @@ static int mtk_start_dma(struct mtk_eth
+@@ -2308,16 +2369,15 @@ static int mtk_start_dma(struct mtk_eth

                        MTK_TX_BT_32DWORDS | MTK_NDP_CO_PRO |
                        MTK_RX_DMA_EN | MTK_RX_2B_OFFSET |
                        MTK_RX_BT_32DWORDS,
                        MTK_TX_BT_32DWORDS | MTK_NDP_CO_PRO |
                        MTK_RX_DMA_EN | MTK_RX_2B_OFFSET |
                        MTK_RX_BT_32DWORDS,


@@ -415,7 +415,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        return 0;
        }
  
        return 0;

-@@ -2440,8 +2500,8 @@ static int mtk_stop(struct net_device *d
+@@ -2443,8 +2503,8 @@ static int mtk_stop(struct net_device *d

        cancel_work_sync(&eth->tx_dim.work);
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
        cancel_work_sync(&eth->tx_dim.work);
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))


@@ -426,7 +426,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        mtk_dma_free(eth);
  
  
        mtk_dma_free(eth);
  

-@@ -2495,6 +2555,7 @@ static void mtk_dim_rx(struct work_struc
+@@ -2498,6 +2558,7 @@ static void mtk_dim_rx(struct work_struc

  {
        struct dim *dim = container_of(work, struct dim, work);
        struct mtk_eth *eth = container_of(dim, struct mtk_eth, rx_dim);
  {
        struct dim *dim = container_of(work, struct dim, work);
        struct mtk_eth *eth = container_of(dim, struct mtk_eth, rx_dim);


@@ -434,7 +434,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        struct dim_cq_moder cur_profile;
        u32 val, cur;
  
        struct dim_cq_moder cur_profile;
        u32 val, cur;
  

-@@ -2502,7 +2563,7 @@ static void mtk_dim_rx(struct work_struc
+@@ -2505,7 +2566,7 @@ static void mtk_dim_rx(struct work_struc

                                                dim->profile_ix);
        spin_lock_bh(&eth->dim_lock);
  
                                                dim->profile_ix);
        spin_lock_bh(&eth->dim_lock);
  


@@ -443,7 +443,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        val &= MTK_PDMA_DELAY_TX_MASK;
        val |= MTK_PDMA_DELAY_RX_EN;
  
        val &= MTK_PDMA_DELAY_TX_MASK;
        val |= MTK_PDMA_DELAY_RX_EN;
  

-@@ -2512,9 +2573,9 @@ static void mtk_dim_rx(struct work_struc
+@@ -2515,9 +2576,9 @@ static void mtk_dim_rx(struct work_struc

        cur = min_t(u32, cur_profile.pkts, MTK_PDMA_DELAY_PINT_MASK);
        val |= cur << MTK_PDMA_DELAY_RX_PINT_SHIFT;
  
        cur = min_t(u32, cur_profile.pkts, MTK_PDMA_DELAY_PINT_MASK);
        val |= cur << MTK_PDMA_DELAY_RX_PINT_SHIFT;
  


@@ -455,7 +455,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        spin_unlock_bh(&eth->dim_lock);
  
  
        spin_unlock_bh(&eth->dim_lock);
  

-@@ -2525,6 +2586,7 @@ static void mtk_dim_tx(struct work_struc
+@@ -2528,6 +2589,7 @@ static void mtk_dim_tx(struct work_struc

  {
        struct dim *dim = container_of(work, struct dim, work);
        struct mtk_eth *eth = container_of(dim, struct mtk_eth, tx_dim);
  {
        struct dim *dim = container_of(work, struct dim, work);
        struct mtk_eth *eth = container_of(dim, struct mtk_eth, tx_dim);


@@ -463,7 +463,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        struct dim_cq_moder cur_profile;
        u32 val, cur;
  
        struct dim_cq_moder cur_profile;
        u32 val, cur;
  

-@@ -2532,7 +2594,7 @@ static void mtk_dim_tx(struct work_struc
+@@ -2535,7 +2597,7 @@ static void mtk_dim_tx(struct work_struc

                                                dim->profile_ix);
        spin_lock_bh(&eth->dim_lock);
  
                                                dim->profile_ix);
        spin_lock_bh(&eth->dim_lock);
  


@@ -472,7 +472,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        val &= MTK_PDMA_DELAY_RX_MASK;
        val |= MTK_PDMA_DELAY_TX_EN;
  
        val &= MTK_PDMA_DELAY_RX_MASK;
        val |= MTK_PDMA_DELAY_TX_EN;
  

-@@ -2542,9 +2604,9 @@ static void mtk_dim_tx(struct work_struc
+@@ -2545,9 +2607,9 @@ static void mtk_dim_tx(struct work_struc

        cur = min_t(u32, cur_profile.pkts, MTK_PDMA_DELAY_PINT_MASK);
        val |= cur << MTK_PDMA_DELAY_TX_PINT_SHIFT;
  
        cur = min_t(u32, cur_profile.pkts, MTK_PDMA_DELAY_PINT_MASK);
        val |= cur << MTK_PDMA_DELAY_TX_PINT_SHIFT;
  


@@ -484,7 +484,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        spin_unlock_bh(&eth->dim_lock);
  
  
        spin_unlock_bh(&eth->dim_lock);
  

-@@ -2555,6 +2617,7 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2558,6 +2620,7 @@ static int mtk_hw_init(struct mtk_eth *e

  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
                       ETHSYS_DMA_AG_MAP_PPE;
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
                       ETHSYS_DMA_AG_MAP_PPE;


@@ -492,7 +492,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int i, val, ret;
  
        if (test_and_set_bit(MTK_HW_INIT, &eth->state))
        int i, val, ret;
  
        if (test_and_set_bit(MTK_HW_INIT, &eth->state))

-@@ -2629,10 +2692,10 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2632,10 +2695,10 @@ static int mtk_hw_init(struct mtk_eth *e

        mtk_rx_irq_disable(eth, ~0);
  
        /* FE int grouping */
        mtk_rx_irq_disable(eth, ~0);
  
        /* FE int grouping */


@@ -507,7 +507,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  
        return 0;
        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  
        return 0;

-@@ -3164,14 +3227,6 @@ static int mtk_probe(struct platform_dev
+@@ -3167,14 +3230,6 @@ static int mtk_probe(struct platform_dev

        if (IS_ERR(eth->base))
                return PTR_ERR(eth->base);
  
        if (IS_ERR(eth->base))
                return PTR_ERR(eth->base);
  


@@ -522,7 +522,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
                eth->rx_dma_l4_valid = RX_DMA_L4_VALID_PDMA;
                eth->ip_align = NET_IP_ALIGN;
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
                eth->rx_dma_l4_valid = RX_DMA_L4_VALID_PDMA;
                eth->ip_align = NET_IP_ALIGN;

-@@ -3405,6 +3460,7 @@ static int mtk_remove(struct platform_de
+@@ -3408,6 +3463,7 @@ static int mtk_remove(struct platform_de

  }
  
  static const struct mtk_soc_data mt2701_data = {
  }
  
  static const struct mtk_soc_data mt2701_data = {


@@ -530,7 +530,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .caps = MT7623_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .caps = MT7623_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,

-@@ -3416,6 +3472,7 @@ static const struct mtk_soc_data mt2701_
+@@ -3419,6 +3475,7 @@ static const struct mtk_soc_data mt2701_

  };
  
  static const struct mtk_soc_data mt7621_data = {
  };
  
  static const struct mtk_soc_data mt7621_data = {


@@ -538,7 +538,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .caps = MT7621_CAPS,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7621_CLKS_BITMAP,
        .caps = MT7621_CAPS,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7621_CLKS_BITMAP,

-@@ -3428,6 +3485,7 @@ static const struct mtk_soc_data mt7621_
+@@ -3431,6 +3488,7 @@ static const struct mtk_soc_data mt7621_

  };
  
  static const struct mtk_soc_data mt7622_data = {
  };
  
  static const struct mtk_soc_data mt7622_data = {


@@ -546,7 +546,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .ana_rgc3 = 0x2028,
        .caps = MT7622_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,
        .ana_rgc3 = 0x2028,
        .caps = MT7622_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,

-@@ -3441,6 +3499,7 @@ static const struct mtk_soc_data mt7622_
+@@ -3444,6 +3502,7 @@ static const struct mtk_soc_data mt7622_

  };
  
  static const struct mtk_soc_data mt7623_data = {
  };
  
  static const struct mtk_soc_data mt7623_data = {


@@ -554,7 +554,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .caps = MT7623_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .caps = MT7623_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,

-@@ -3453,6 +3512,7 @@ static const struct mtk_soc_data mt7623_
+@@ -3456,6 +3515,7 @@ static const struct mtk_soc_data mt7623_

  };
  
  static const struct mtk_soc_data mt7629_data = {
  };
  
  static const struct mtk_soc_data mt7629_data = {


@@ -562,7 +562,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .ana_rgc3 = 0x128,
        .caps = MT7629_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,
        .ana_rgc3 = 0x128,
        .caps = MT7629_CAPS | MTK_HWLRO,
        .hw_features = MTK_HW_FEATURES,

-@@ -3465,6 +3525,7 @@ static const struct mtk_soc_data mt7629_
+@@ -3468,6 +3528,7 @@ static const struct mtk_soc_data mt7629_

  };
  
  static const struct mtk_soc_data rt5350_data = {
  };
  
  static const struct mtk_soc_data rt5350_data = {

diff --git a/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch b/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch
index 548d62a027143c85a35af13e7ca4a2edc9818879..91739ddd34162a256d3327908a0ffbf905ad85a1 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch
@@ -403,7 +403,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return 0;
  }
  
        return 0;
  }

-@@ -2298,7 +2406,7 @@ static irqreturn_t mtk_handle_irq_rx(int
+@@ -2301,7 +2409,7 @@ static irqreturn_t mtk_handle_irq_rx(int

        eth->rx_events++;
        if (likely(napi_schedule_prep(&eth->rx_napi))) {
                __napi_schedule(&eth->rx_napi);
        eth->rx_events++;
        if (likely(napi_schedule_prep(&eth->rx_napi))) {
                __napi_schedule(&eth->rx_napi);


@@ -412,7 +412,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        return IRQ_HANDLED;
        }
  
        return IRQ_HANDLED;

-@@ -2322,8 +2430,10 @@ static irqreturn_t mtk_handle_irq(int ir
+@@ -2325,8 +2433,10 @@ static irqreturn_t mtk_handle_irq(int ir

        struct mtk_eth *eth = _eth;
        const struct mtk_reg_map *reg_map = eth->soc->reg_map;
  
        struct mtk_eth *eth = _eth;
        const struct mtk_reg_map *reg_map = eth->soc->reg_map;
  


@@ -425,7 +425,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        mtk_handle_irq_rx(irq, _eth);
        }
        if (mtk_r32(eth, reg_map->tx_irq_mask) & MTK_TX_DONE_INT) {
                        mtk_handle_irq_rx(irq, _eth);
        }
        if (mtk_r32(eth, reg_map->tx_irq_mask) & MTK_TX_DONE_INT) {

-@@ -2341,16 +2451,16 @@ static void mtk_poll_controller(struct n
+@@ -2344,16 +2454,16 @@ static void mtk_poll_controller(struct n

        struct mtk_eth *eth = mac->hw;
  
        mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
        struct mtk_eth *eth = mac->hw;
  
        mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);


@@ -445,7 +445,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        const struct mtk_reg_map *reg_map = eth->soc->reg_map;
        int err;
  
        const struct mtk_reg_map *reg_map = eth->soc->reg_map;
        int err;
  

-@@ -2361,12 +2471,19 @@ static int mtk_start_dma(struct mtk_eth
+@@ -2364,12 +2474,19 @@ static int mtk_start_dma(struct mtk_eth

        }
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
        }
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {


@@ -471,7 +471,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                mtk_w32(eth,
                        MTK_RX_DMA_EN | rx_2b_offset |
                        MTK_RX_BT_32DWORDS | MTK_MULTI_EN,
                mtk_w32(eth,
                        MTK_RX_DMA_EN | rx_2b_offset |
                        MTK_RX_BT_32DWORDS | MTK_MULTI_EN,

-@@ -2440,7 +2557,7 @@ static int mtk_open(struct net_device *d
+@@ -2443,7 +2560,7 @@ static int mtk_open(struct net_device *d

                napi_enable(&eth->tx_napi);
                napi_enable(&eth->rx_napi);
                mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
                napi_enable(&eth->tx_napi);
                napi_enable(&eth->rx_napi);
                mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);


@@ -480,7 +480,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                refcount_set(&eth->dma_refcnt, 1);
        }
        else
                refcount_set(&eth->dma_refcnt, 1);
        }
        else

-@@ -2492,7 +2609,7 @@ static int mtk_stop(struct net_device *d
+@@ -2495,7 +2612,7 @@ static int mtk_stop(struct net_device *d

        mtk_gdm_config(eth, MTK_GDMA_DROP_ALL);
  
        mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
        mtk_gdm_config(eth, MTK_GDMA_DROP_ALL);
  
        mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);


@@ -489,7 +489,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        napi_disable(&eth->tx_napi);
        napi_disable(&eth->rx_napi);
  
        napi_disable(&eth->tx_napi);
        napi_disable(&eth->rx_napi);
  

-@@ -2652,9 +2769,25 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2655,9 +2772,25 @@ static int mtk_hw_init(struct mtk_eth *e

                return 0;
        }
  
                return 0;
        }
  


@@ -518,7 +518,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        if (eth->pctl) {
                /* Set GE2 driving and slew rate */
  
        if (eth->pctl) {
                /* Set GE2 driving and slew rate */

-@@ -2693,11 +2826,47 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2696,11 +2829,47 @@ static int mtk_hw_init(struct mtk_eth *e

  
        /* FE int grouping */
        mtk_w32(eth, MTK_TX_DONE_INT, reg_map->pdma.int_grp);
  
        /* FE int grouping */
        mtk_w32(eth, MTK_TX_DONE_INT, reg_map->pdma.int_grp);


@@ -568,7 +568,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return 0;
  
  err_disable_pm:
        return 0;
  
  err_disable_pm:

-@@ -3227,12 +3396,8 @@ static int mtk_probe(struct platform_dev
+@@ -3230,12 +3399,8 @@ static int mtk_probe(struct platform_dev

        if (IS_ERR(eth->base))
                return PTR_ERR(eth->base);
  
        if (IS_ERR(eth->base))
                return PTR_ERR(eth->base);
  


@@ -582,7 +582,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        spin_lock_init(&eth->page_lock);
        spin_lock_init(&eth->tx_irq_lock);
  
        spin_lock_init(&eth->page_lock);
        spin_lock_init(&eth->tx_irq_lock);

-@@ -3468,6 +3633,10 @@ static const struct mtk_soc_data mt2701_
+@@ -3471,6 +3636,10 @@ static const struct mtk_soc_data mt2701_

        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),


@@ -593,7 +593,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3481,6 +3650,10 @@ static const struct mtk_soc_data mt7621_
+@@ -3484,6 +3653,10 @@ static const struct mtk_soc_data mt7621_

        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),


@@ -604,7 +604,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3495,6 +3668,10 @@ static const struct mtk_soc_data mt7622_
+@@ -3498,6 +3671,10 @@ static const struct mtk_soc_data mt7622_

        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),


@@ -615,7 +615,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3508,6 +3685,10 @@ static const struct mtk_soc_data mt7623_
+@@ -3511,6 +3688,10 @@ static const struct mtk_soc_data mt7623_

        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),


@@ -626,7 +626,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3521,6 +3702,10 @@ static const struct mtk_soc_data mt7629_
+@@ -3524,6 +3705,10 @@ static const struct mtk_soc_data mt7629_

        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),


@@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
        },
  };
  

-@@ -3533,6 +3718,10 @@ static const struct mtk_soc_data rt5350_
+@@ -3536,6 +3721,10 @@ static const struct mtk_soc_data rt5350_

        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

diff --git a/target/linux/generic/backport-5.15/702-v5.19-30-net-ethernet-mtk_eth_soc-introduce-support-for-mt798.patch b/target/linux/generic/backport-5.15/702-v5.19-30-net-ethernet-mtk_eth_soc-introduce-support-for-mt798.patch
index 2df4b265a9b29e3a304b35451e06a5fb6e94d5b9..713d24b3c99108b5f4d34b00b05cc57d170c3b35 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-30-net-ethernet-mtk_eth_soc-introduce-support-for-mt798.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-30-net-ethernet-mtk_eth_soc-introduce-support-for-mt798.patch
@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg)
  };
  
  void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg)

-@@ -3705,6 +3742,21 @@ static const struct mtk_soc_data mt7629_
+@@ -3708,6 +3745,21 @@ static const struct mtk_soc_data mt7629_

        },
  };
  
        },
  };
  


@@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static const struct mtk_soc_data rt5350_data = {
        .reg_map = &mt7628_reg_map,
        .caps = MT7628_CAPS,
  static const struct mtk_soc_data rt5350_data = {
        .reg_map = &mt7628_reg_map,
        .caps = MT7628_CAPS,

-@@ -3727,6 +3779,7 @@ const struct of_device_id of_mtk_match[]
+@@ -3730,6 +3782,7 @@ const struct of_device_id of_mtk_match[]

        { .compatible = "mediatek,mt7622-eth", .data = &mt7622_data},
        { .compatible = "mediatek,mt7623-eth", .data = &mt7623_data},
        { .compatible = "mediatek,mt7629-eth", .data = &mt7629_data},
        { .compatible = "mediatek,mt7622-eth", .data = &mt7622_data},
        { .compatible = "mediatek,mt7623-eth", .data = &mt7623_data},
        { .compatible = "mediatek,mt7629-eth", .data = &mt7629_data},

diff --git a/target/linux/generic/backport-5.15/702-v5.19-33-net-ethernet-mtk_eth_soc-enable-rx-cksum-offload-for.patch b/target/linux/generic/backport-5.15/702-v5.19-33-net-ethernet-mtk_eth_soc-enable-rx-cksum-offload-for.patch
index 2ad7b5792e9b66e5a4218db23fc98cf069102ece..b05faa9c4b7b958ccd78e27e88085d49b9349380 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-33-net-ethernet-mtk_eth_soc-enable-rx-cksum-offload-for.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-33-net-ethernet-mtk_eth_soc-enable-rx-cksum-offload-for.patch
@@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                else
                        skb_checksum_none_assert(skb);
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                else
                        skb_checksum_none_assert(skb);

-@@ -3752,6 +3758,7 @@ static const struct mtk_soc_data mt7986_
+@@ -3755,6 +3761,7 @@ static const struct mtk_soc_data mt7986_

                .txd_size = sizeof(struct mtk_tx_dma_v2),
                .rxd_size = sizeof(struct mtk_rx_dma_v2),
                .rx_irq_done_mask = MTK_RX_DONE_INT_V2,
                .txd_size = sizeof(struct mtk_tx_dma_v2),
                .rxd_size = sizeof(struct mtk_rx_dma_v2),
                .rx_irq_done_mask = MTK_RX_DONE_INT_V2,

diff --git a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
index 919da4d1ef198fcccad39d8510413a2fa896ed31..2f8128b3f305512cf69fe1a2c9d8dfd76c0afc1c 100644 (file)
--- a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
+++ b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
@@ -726,7 +726,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
         * to advertise both, only report advertising at 2500BaseX.
 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
 +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
         * to advertise both, only report advertising at 2500BaseX.
 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
 +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

-@@ -6347,15 +6347,14 @@ static void mvpp2_phylink_validate(struc
+@@ -6352,15 +6352,14 @@ static void mvpp2_phylink_validate(struc

                goto empty_set;
        }
  
                goto empty_set;
        }
  

diff --git a/target/linux/generic/backport-5.15/704-01-v5.17-net-mtk_eth_soc-populate-supported_interfaces-member.patch b/target/linux/generic/backport-5.15/704-01-v5.17-net-mtk_eth_soc-populate-supported_interfaces-member.patch
index f6279bf13d8b74515110a6a0f96fe80c21b76aff..b26b15e60d4af3efdd6703ec4a07dbb2ca7eac23 100644 (file)
--- a/target/linux/generic/backport-5.15/704-01-v5.17-net-mtk_eth_soc-populate-supported_interfaces-member.patch
+++ b/target/linux/generic/backport-5.15/704-01-v5.17-net-mtk_eth_soc-populate-supported_interfaces-member.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3348,6 +3348,26 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3351,6 +3351,26 @@ static int mtk_add_mac(struct mtk_eth *e

  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;
  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;

diff --git a/target/linux/generic/backport-5.15/704-04-v5.17-net-mtk_eth_soc-use-phylink_generic_validate.patch b/target/linux/generic/backport-5.15/704-04-v5.17-net-mtk_eth_soc-use-phylink_generic_validate.patch
index 84c02992122057ae7f18c22efebdfa2e8bfbe6ef..6d52e4e37fec63a8c787eb3a562c344bd17481b8 100644 (file)
--- a/target/linux/generic/backport-5.15/704-04-v5.17-net-mtk_eth_soc-use-phylink_generic_validate.patch
+++ b/target/linux/generic/backport-5.15/704-04-v5.17-net-mtk_eth_soc-use-phylink_generic_validate.patch
@@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .mac_pcs_get_state = mtk_mac_pcs_get_state,
        .mac_an_restart = mtk_mac_an_restart,
        .mac_config = mtk_mac_config,
        .mac_pcs_get_state = mtk_mac_pcs_get_state,
        .mac_an_restart = mtk_mac_an_restart,
        .mac_config = mtk_mac_config,

-@@ -3310,6 +3262,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3313,6 +3265,9 @@ static int mtk_add_mac(struct mtk_eth *e

  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;
  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;

diff --git a/target/linux/generic/backport-5.15/704-05-v5.17-net-mtk_eth_soc-mark-as-a-legacy_pre_march2020-drive.patch b/target/linux/generic/backport-5.15/704-05-v5.17-net-mtk_eth_soc-mark-as-a-legacy_pre_march2020-drive.patch
index a6fbde5c8920675aa59a8928dec4999977b6be6c..381c51b81ae3a1c0557d2fc83e6ac7a7ac5b63a3 100644 (file)
--- a/target/linux/generic/backport-5.15/704-05-v5.17-net-mtk_eth_soc-mark-as-a-legacy_pre_march2020-drive.patch
+++ b/target/linux/generic/backport-5.15/704-05-v5.17-net-mtk_eth_soc-mark-as-a-legacy_pre_march2020-drive.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3262,6 +3262,10 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3265,6 +3265,10 @@ static int mtk_add_mac(struct mtk_eth *e

  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;
  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;

diff --git a/target/linux/generic/backport-5.15/704-06-v5.19-eth-mtk_eth_soc-remove-a-copy-of-the-NAPI_POLL_WEIGH.patch b/target/linux/generic/backport-5.15/704-06-v5.19-eth-mtk_eth_soc-remove-a-copy-of-the-NAPI_POLL_WEIGH.patch
index 63f4ef13e120175172ea06a8eae5386625c94724..887ff565784a059b76ef4c1c204f7720390d74b3 100644 (file)
--- a/target/linux/generic/backport-5.15/704-06-v5.19-eth-mtk_eth_soc-remove-a-copy-of-the-NAPI_POLL_WEIGH.patch
+++ b/target/linux/generic/backport-5.15/704-06-v5.19-eth-mtk_eth_soc-remove-a-copy-of-the-NAPI_POLL_WEIGH.patch
@@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3561,9 +3561,9 @@ static int mtk_probe(struct platform_dev
+@@ -3564,9 +3564,9 @@ static int mtk_probe(struct platform_dev

         */
        init_dummy_netdev(&eth->dummy_dev);
        netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx,
         */
        init_dummy_netdev(&eth->dummy_dev);
        netif_napi_add(&eth->dummy_dev, &eth->tx_napi, mtk_napi_tx,

diff --git a/target/linux/generic/backport-5.15/704-07-v5.19-mtk_eth_soc-remove-unused-mac-mode.patch b/target/linux/generic/backport-5.15/704-07-v5.19-mtk_eth_soc-remove-unused-mac-mode.patch
index ff3c422f26e38c9e622cbf904e4da4922aac94a9..58aa54f4e53c9fd9665173ebd6f6120930ee52b5 100644 (file)
--- a/target/linux/generic/backport-5.15/704-07-v5.19-mtk_eth_soc-remove-unused-mac-mode.patch
+++ b/target/linux/generic/backport-5.15/704-07-v5.19-mtk_eth_soc-remove-unused-mac-mode.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3257,7 +3257,6 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3260,7 +3260,6 @@ static int mtk_add_mac(struct mtk_eth *e

  
        /* mac config is not set */
        mac->interface = PHY_INTERFACE_MODE_NA;
  
        /* mac config is not set */
        mac->interface = PHY_INTERFACE_MODE_NA;

diff --git a/target/linux/generic/backport-5.15/704-11-v5.19-net-mtk_eth_soc-correct-802.3z-duplex-setting.patch b/target/linux/generic/backport-5.15/704-11-v5.19-net-mtk_eth_soc-correct-802.3z-duplex-setting.patch
index e9e3e1f745248cbbfbde4a01a0d3253aa58f2f79..951c8fea84d85c7efbcf55c6fc20fd13bcb4b3b5 100644 (file)
--- a/target/linux/generic/backport-5.15/704-11-v5.19-net-mtk_eth_soc-correct-802.3z-duplex-setting.patch
+++ b/target/linux/generic/backport-5.15/704-11-v5.19-net-mtk_eth_soc-correct-802.3z-duplex-setting.patch
@@ -38,7 +38,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        mcr &= ~(MAC_MCR_SPEED_100 | MAC_MCR_SPEED_1000 |
                 MAC_MCR_FORCE_DPX | MAC_MCR_FORCE_TX_FC |
                 MAC_MCR_FORCE_RX_FC);
        mcr &= ~(MAC_MCR_SPEED_100 | MAC_MCR_SPEED_1000 |
                 MAC_MCR_FORCE_DPX | MAC_MCR_FORCE_TX_FC |
                 MAC_MCR_FORCE_RX_FC);

-@@ -3261,9 +3271,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3264,9 +3274,7 @@ static int mtk_add_mac(struct mtk_eth *e

  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;
  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;

diff --git a/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch b/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch
index 60e83a16513af7558abf14946dea4dab2784dc20..49b2355ce408483d8bac23b6f7c103643a51ef92 100644 (file)
--- a/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch
+++ b/target/linux/generic/backport-5.15/706-01-v6.0-net-ethernet-mtk_eth_soc-add-basic-XDP-support.patch
@@ -208,7 +208,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                struct page_pool *pp;
  
                pp = mtk_create_page_pool(eth, &ring->xdp_q, ring_no,
                struct page_pool *pp;
  
                pp = mtk_create_page_pool(eth, &ring->xdp_q, ring_no,

-@@ -2710,6 +2785,48 @@ static int mtk_stop(struct net_device *d
+@@ -2713,6 +2788,48 @@ static int mtk_stop(struct net_device *d

        return 0;
  }
  
        return 0;
  }
  


@@ -257,7 +257,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void ethsys_reset(struct mtk_eth *eth, u32 reset_bits)
  {
        regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL,
  static void ethsys_reset(struct mtk_eth *eth, u32 reset_bits)
  {
        regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL,

-@@ -2988,6 +3105,12 @@ static int mtk_change_mtu(struct net_dev
+@@ -2991,6 +3108,12 @@ static int mtk_change_mtu(struct net_dev

        struct mtk_eth *eth = mac->hw;
        u32 mcr_cur, mcr_new;
  
        struct mtk_eth *eth = mac->hw;
        u32 mcr_cur, mcr_new;
  


@@ -270,7 +270,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (!MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
                mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
                mcr_new = mcr_cur & ~MAC_MCR_MAX_RX_MASK;
        if (!MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
                mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
                mcr_new = mcr_cur & ~MAC_MCR_MAX_RX_MASK;

-@@ -3314,6 +3437,7 @@ static const struct net_device_ops mtk_n
+@@ -3317,6 +3440,7 @@ static const struct net_device_ops mtk_n

        .ndo_poll_controller    = mtk_poll_controller,
  #endif
        .ndo_setup_tc           = mtk_eth_setup_tc,
        .ndo_poll_controller    = mtk_poll_controller,
  #endif
        .ndo_setup_tc           = mtk_eth_setup_tc,

diff --git a/target/linux/generic/backport-5.15/706-03-v6.0-net-ethernet-mtk_eth_soc-add-xmit-XDP-support.patch b/target/linux/generic/backport-5.15/706-03-v6.0-net-ethernet-mtk_eth_soc-add-xmit-XDP-support.patch
index 8c134500117266b6d2e785a462a962d5430c34c1..f774f9875d9dead0cc6d0172dec0ab52db6b787f 100644 (file)
--- a/target/linux/generic/backport-5.15/706-03-v6.0-net-ethernet-mtk_eth_soc-add-xmit-XDP-support.patch
+++ b/target/linux/generic/backport-5.15/706-03-v6.0-net-ethernet-mtk_eth_soc-add-xmit-XDP-support.patch
@@ -304,7 +304,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                }
  
                mtk_tx_unmap(eth, tx_buf, true);
                }
  
                mtk_tx_unmap(eth, tx_buf, true);

-@@ -3460,6 +3609,7 @@ static const struct net_device_ops mtk_n
+@@ -3463,6 +3612,7 @@ static const struct net_device_ops mtk_n

  #endif
        .ndo_setup_tc           = mtk_eth_setup_tc,
        .ndo_bpf                = mtk_xdp,
  #endif
        .ndo_setup_tc           = mtk_eth_setup_tc,
        .ndo_bpf                = mtk_xdp,

diff --git a/target/linux/generic/backport-5.15/706-04-v6.0-net-ethernet-mtk_eth_soc-add-support-for-page_pool_g.patch b/target/linux/generic/backport-5.15/706-04-v6.0-net-ethernet-mtk_eth_soc-add-support-for-page_pool_g.patch
index 3108d67da49c5e5046af88449a152d515435edeb..d3d95a34b80f0d1f8f5ee2defd283dbc2dae4cd4 100644 (file)
--- a/target/linux/generic/backport-5.15/706-04-v6.0-net-ethernet-mtk_eth_soc-add-support-for-page_pool_g.patch
+++ b/target/linux/generic/backport-5.15/706-04-v6.0-net-ethernet-mtk_eth_soc-add-support-for-page_pool_g.patch
@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
          MediaTek SoC family.
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
          MediaTek SoC family.
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3471,11 +3471,18 @@ static void mtk_get_strings(struct net_d
+@@ -3474,11 +3474,18 @@ static void mtk_get_strings(struct net_d

        int i;
  
        switch (stringset) {
        int i;
  
        switch (stringset) {


@@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                break;
        }
  }
                break;
        }
  }

-@@ -3483,13 +3490,35 @@ static void mtk_get_strings(struct net_d
+@@ -3486,13 +3493,35 @@ static void mtk_get_strings(struct net_d

  static int mtk_get_sset_count(struct net_device *dev, int sset)
  {
        switch (sset) {
  static int mtk_get_sset_count(struct net_device *dev, int sset)
  {
        switch (sset) {


@@ -84,7 +84,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void mtk_get_ethtool_stats(struct net_device *dev,
                                  struct ethtool_stats *stats, u64 *data)
  {
  static void mtk_get_ethtool_stats(struct net_device *dev,
                                  struct ethtool_stats *stats, u64 *data)
  {

-@@ -3517,6 +3546,8 @@ static void mtk_get_ethtool_stats(struct
+@@ -3520,6 +3549,8 @@ static void mtk_get_ethtool_stats(struct

  
                for (i = 0; i < ARRAY_SIZE(mtk_ethtool_stats); i++)
                        *data_dst++ = *(data_src + mtk_ethtool_stats[i].offset);
  
                for (i = 0; i < ARRAY_SIZE(mtk_ethtool_stats); i++)
                        *data_dst++ = *(data_src + mtk_ethtool_stats[i].offset);

diff --git a/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch b/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch
index dbc338cf35145051852e6b7687e915b302889047..66e2778709dd3062b662d8a4dbb023d395d0e3d8 100644 (file)
--- a/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch
+++ b/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch
@@ -57,7 +57,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  };
  
  /* strings used by ethtool */
  };
  
  /* strings used by ethtool */

-@@ -2925,6 +2929,7 @@ static int mtk_open(struct net_device *d
+@@ -2928,6 +2932,7 @@ static int mtk_open(struct net_device *d

  
        /* we run 2 netdevs on the same dma ring so we only bring it up once */
        if (!refcount_read(&eth->dma_refcnt)) {
  
        /* we run 2 netdevs on the same dma ring so we only bring it up once */
        if (!refcount_read(&eth->dma_refcnt)) {


@@ -65,7 +65,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                u32 gdm_config = MTK_GDMA_TO_PDMA;
                int err;
  
                u32 gdm_config = MTK_GDMA_TO_PDMA;
                int err;
  

-@@ -2934,15 +2939,15 @@ static int mtk_open(struct net_device *d
+@@ -2937,15 +2942,15 @@ static int mtk_open(struct net_device *d

                        return err;
                }
  
                        return err;
                }
  


@@ -84,7 +84,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                refcount_set(&eth->dma_refcnt, 1);
        }
        else
                refcount_set(&eth->dma_refcnt, 1);
        }
        else

-@@ -4041,7 +4046,9 @@ static int mtk_probe(struct platform_dev
+@@ -4044,7 +4049,9 @@ static int mtk_probe(struct platform_dev

        }
  
        if (eth->soc->offload_version) {
        }
  
        if (eth->soc->offload_version) {

diff --git a/target/linux/generic/backport-5.15/714-v6.0-net-ethernet-mtk_eth_soc-move-ppe-table-hash-offset-.patch b/target/linux/generic/backport-5.15/714-v6.0-net-ethernet-mtk_eth_soc-move-ppe-table-hash-offset-.patch
index 7cc0ab225ebeeb34a2ed20f202ce4a0aa05df3da..1dfcc862d611c48a945a3b341206be233abc14b4 100644 (file)
--- a/target/linux/generic/backport-5.15/714-v6.0-net-ethernet-mtk_eth_soc-move-ppe-table-hash-offset-.patch
+++ b/target/linux/generic/backport-5.15/714-v6.0-net-ethernet-mtk_eth_soc-move-ppe-table-hash-offset-.patch
@@ -44,7 +44,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4144,6 +4144,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4147,6 +4147,7 @@ static const struct mtk_soc_data mt7621_

        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,


@@ -52,7 +52,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4162,6 +4163,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4165,6 +4166,7 @@ static const struct mtk_soc_data mt7622_

        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,


@@ -60,7 +60,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4179,6 +4181,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4182,6 +4184,7 @@ static const struct mtk_soc_data mt7623_

        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .offload_version = 2,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .offload_version = 2,


@@ -68,7 +68,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4212,6 +4215,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4215,6 +4218,7 @@ static const struct mtk_soc_data mt7986_

        .caps = MT7986_CAPS,
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,
        .caps = MT7986_CAPS,
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,

diff --git a/target/linux/generic/backport-5.15/715-v6.0-net-ethernet-mtk_eth_soc-add-the-capability-to-run-m.patch b/target/linux/generic/backport-5.15/715-v6.0-net-ethernet-mtk_eth_soc-add-the-capability-to-run-m.patch
index 6b21a82352e9cd980715c23cbb84aea7eb4d6fec..e779d3b344e8f8e6e4cb9dcec6f3075e98aaf321 100644 (file)
--- a/target/linux/generic/backport-5.15/715-v6.0-net-ethernet-mtk_eth_soc-add-the-capability-to-run-m.patch
+++ b/target/linux/generic/backport-5.15/715-v6.0-net-ethernet-mtk_eth_soc-add-the-capability-to-run-m.patch
@@ -57,7 +57,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  
                if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) {
                        if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
  
                if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) {
                        if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {

-@@ -2930,7 +2930,8 @@ static int mtk_open(struct net_device *d
+@@ -2933,7 +2933,8 @@ static int mtk_open(struct net_device *d

        /* we run 2 netdevs on the same dma ring so we only bring it up once */
        if (!refcount_read(&eth->dma_refcnt)) {
                const struct mtk_soc_data *soc = eth->soc;
        /* we run 2 netdevs on the same dma ring so we only bring it up once */
        if (!refcount_read(&eth->dma_refcnt)) {
                const struct mtk_soc_data *soc = eth->soc;


@@ -67,7 +67,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                int err;
  
                err = mtk_start_dma(eth);
                int err;
  
                err = mtk_start_dma(eth);

-@@ -2939,8 +2940,11 @@ static int mtk_open(struct net_device *d
+@@ -2942,8 +2943,11 @@ static int mtk_open(struct net_device *d

                        return err;
                }
  
                        return err;
                }
  


@@ -81,7 +81,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  
                mtk_gdm_config(eth, gdm_config);
  
  
                mtk_gdm_config(eth, gdm_config);
  

-@@ -2985,6 +2989,7 @@ static int mtk_stop(struct net_device *d
+@@ -2988,6 +2992,7 @@ static int mtk_stop(struct net_device *d

  {
        struct mtk_mac *mac = netdev_priv(dev);
        struct mtk_eth *eth = mac->hw;
  {
        struct mtk_mac *mac = netdev_priv(dev);
        struct mtk_eth *eth = mac->hw;


@@ -89,7 +89,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  
        phylink_stop(mac->phylink);
  
  
        phylink_stop(mac->phylink);
  

-@@ -3012,8 +3017,8 @@ static int mtk_stop(struct net_device *d
+@@ -3015,8 +3020,8 @@ static int mtk_stop(struct net_device *d

  
        mtk_dma_free(eth);
  
  
        mtk_dma_free(eth);
  


@@ -100,7 +100,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  
        return 0;
  }
  
        return 0;
  }

-@@ -4046,12 +4051,19 @@ static int mtk_probe(struct platform_dev
+@@ -4049,12 +4054,19 @@ static int mtk_probe(struct platform_dev

        }
  
        if (eth->soc->offload_version) {
        }
  
        if (eth->soc->offload_version) {

diff --git a/target/linux/generic/backport-5.15/716-v6.0-net-ethernet-mtk_eth_soc-move-wdma_base-definitions-.patch b/target/linux/generic/backport-5.15/716-v6.0-net-ethernet-mtk_eth_soc-move-wdma_base-definitions-.patch
index 92de6e7963784e2fb0e704ecdce778e06ca7996b..f93285642d1c597b88d6b21c7e95323b8ae72470 100644 (file)
--- a/target/linux/generic/backport-5.15/716-v6.0-net-ethernet-mtk_eth_soc-move-wdma_base-definitions-.patch
+++ b/target/linux/generic/backport-5.15/716-v6.0-net-ethernet-mtk_eth_soc-move-wdma_base-definitions-.patch
@@ -39,7 +39,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  };
  
  /* strings used by ethtool */
  };
  
  /* strings used by ethtool */

-@@ -3963,16 +3971,12 @@ static int mtk_probe(struct platform_dev
+@@ -3966,16 +3974,12 @@ static int mtk_probe(struct platform_dev

        for (i = 0;; i++) {
                struct device_node *np = of_parse_phandle(pdev->dev.of_node,
                                                          "mediatek,wed", i);
        for (i = 0;; i++) {
                struct device_node *np = of_parse_phandle(pdev->dev.of_node,
                                                          "mediatek,wed", i);

diff --git a/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch b/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch
index fdafba43d81cd46e86a0fd353c466fb41ce5d141..656a60b15a2ed6c27da4effad888ad770b79dc2e 100644 (file)
--- a/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch
+++ b/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch
@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4161,6 +4161,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4164,6 +4164,7 @@ static const struct mtk_soc_data mt7621_

        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,


@@ -29,7 +29,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4180,6 +4181,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4183,6 +4184,7 @@ static const struct mtk_soc_data mt7622_

        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,


@@ -37,7 +37,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4198,6 +4200,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4201,6 +4203,7 @@ static const struct mtk_soc_data mt7623_

        .required_pctl = true,
        .offload_version = 2,
        .hash_offset = 2,
        .required_pctl = true,
        .offload_version = 2,
        .hash_offset = 2,

diff --git a/target/linux/generic/backport-5.15/721-v6.0-net-ethernet-mtk_eth_wed-add-wed-support-for-mt7986-.patch b/target/linux/generic/backport-5.15/721-v6.0-net-ethernet-mtk_eth_wed-add-wed-support-for-mt7986-.patch
index f87fc4c451a4148c70bedb637cb2e88e72b35a7b..f28997c7b2d5dccf8ab377142516a53918f49c4a 100644 (file)
--- a/target/linux/generic/backport-5.15/721-v6.0-net-ethernet-mtk_eth_wed-add-wed-support-for-mt7986-.patch
+++ b/target/linux/generic/backport-5.15/721-v6.0-net-ethernet-mtk_eth_wed-add-wed-support-for-mt7986-.patch
@@ -26,7 +26,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3888,6 +3888,7 @@ void mtk_eth_set_dma_device(struct mtk_e
+@@ -3891,6 +3891,7 @@ void mtk_eth_set_dma_device(struct mtk_e

  
  static int mtk_probe(struct platform_device *pdev)
  {
  
  static int mtk_probe(struct platform_device *pdev)
  {


@@ -34,7 +34,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        struct device_node *mac_np;
        struct mtk_eth *eth;
        int err, i;
        struct device_node *mac_np;
        struct mtk_eth *eth;
        int err, i;

-@@ -3968,16 +3969,31 @@ static int mtk_probe(struct platform_dev
+@@ -3971,16 +3972,31 @@ static int mtk_probe(struct platform_dev

                }
        }
  
                }
        }
  

diff --git a/target/linux/generic/backport-5.15/723-v6.0-net-ethernet-mtk_eth_soc-introduce-flow-offloading-s.patch b/target/linux/generic/backport-5.15/723-v6.0-net-ethernet-mtk_eth_soc-introduce-flow-offloading-s.patch
index 50ea41240b8b50546edb396ce37e029d61c67c77..f10878da43a856ccc3337d3a21f06df49d6a71d7 100644 (file)
--- a/target/linux/generic/backport-5.15/723-v6.0-net-ethernet-mtk_eth_soc-introduce-flow-offloading-s.patch
+++ b/target/linux/generic/backport-5.15/723-v6.0-net-ethernet-mtk_eth_soc-introduce-flow-offloading-s.patch
@@ -49,7 +49,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
                        mtk_ppe_check_skb(eth->ppe[0], skb, hash);
  
                if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
                        mtk_ppe_check_skb(eth->ppe[0], skb, hash);
  

-@@ -4177,7 +4178,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4180,7 +4181,7 @@ static const struct mtk_soc_data mt7621_

        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,


@@ -58,7 +58,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4197,7 +4198,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4200,7 +4201,7 @@ static const struct mtk_soc_data mt7622_

        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,


@@ -67,7 +67,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4216,7 +4217,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4219,7 +4220,7 @@ static const struct mtk_soc_data mt7623_

        .required_pctl = true,
        .offload_version = 2,
        .hash_offset = 2,
        .required_pctl = true,
        .offload_version = 2,
        .hash_offset = 2,


@@ -76,7 +76,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4248,9 +4249,11 @@ static const struct mtk_soc_data mt7986_
+@@ -4251,9 +4252,11 @@ static const struct mtk_soc_data mt7986_

        .reg_map = &mt7986_reg_map,
        .ana_rgc3 = 0x128,
        .caps = MT7986_CAPS,
        .reg_map = &mt7986_reg_map,
        .ana_rgc3 = 0x128,
        .caps = MT7986_CAPS,

diff --git a/target/linux/generic/backport-5.15/724-v6.2-net-ethernet-mtk_eth_soc-enable-flow-offloading-supp.patch b/target/linux/generic/backport-5.15/724-v6.2-net-ethernet-mtk_eth_soc-enable-flow-offloading-supp.patch
index cd4747672de35ab1974506452463bb207379ef81..aba5673b76d875b903057eea9c694f420e708484 100644 (file)
--- a/target/linux/generic/backport-5.15/724-v6.2-net-ethernet-mtk_eth_soc-enable-flow-offloading-supp.patch
+++ b/target/linux/generic/backport-5.15/724-v6.2-net-ethernet-mtk_eth_soc-enable-flow-offloading-supp.patch
@@ -16,7 +16,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4252,6 +4252,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4255,6 +4255,7 @@ static const struct mtk_soc_data mt7986_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,

diff --git a/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch b/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch
index 624e0178bf8c17f76a5a8c5e95cc742bcbfce674..7ebe8566a041d2330868c1176c347aaf25010fe8 100644 (file)
--- a/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch
+++ b/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4004,19 +4004,23 @@ static int mtk_probe(struct platform_dev
+@@ -4007,19 +4007,23 @@ static int mtk_probe(struct platform_dev

                        eth->irq[i] = platform_get_irq(pdev, i);
                if (eth->irq[i] < 0) {
                        dev_err(&pdev->dev, "no IRQ%d resource found\n", i);
                        eth->irq[i] = platform_get_irq(pdev, i);
                if (eth->irq[i] < 0) {
                        dev_err(&pdev->dev, "no IRQ%d resource found\n", i);


@@ -45,7 +45,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        }
                        eth->clks[i] = NULL;
                }
                        }
                        eth->clks[i] = NULL;
                }

-@@ -4027,7 +4031,7 @@ static int mtk_probe(struct platform_dev
+@@ -4030,7 +4034,7 @@ static int mtk_probe(struct platform_dev

  
        err = mtk_hw_init(eth);
        if (err)
  
        err = mtk_hw_init(eth);
        if (err)


@@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        eth->hwlro = MTK_HAS_CAPS(eth->soc->caps, MTK_HWLRO);
  
  
        eth->hwlro = MTK_HAS_CAPS(eth->soc->caps, MTK_HWLRO);
  

-@@ -4125,6 +4129,8 @@ err_free_dev:
+@@ -4128,6 +4132,8 @@ err_free_dev:

        mtk_free_dev(eth);
  err_deinit_hw:
        mtk_hw_deinit(eth);
        mtk_free_dev(eth);
  err_deinit_hw:
        mtk_hw_deinit(eth);


@@ -63,7 +63,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return err;
  }
  
        return err;
  }

-@@ -4144,6 +4150,7 @@ static int mtk_remove(struct platform_de
+@@ -4147,6 +4153,7 @@ static int mtk_remove(struct platform_de

                phylink_disconnect_phy(mac->phylink);
        }
  
                phylink_disconnect_phy(mac->phylink);
        }
  

diff --git a/target/linux/generic/backport-5.15/728-v6.1-04-net-ethernet-mtk_eth_soc-fix-resource-leak-in-error-.patch b/target/linux/generic/backport-5.15/728-v6.1-04-net-ethernet-mtk_eth_soc-fix-resource-leak-in-error-.patch
index ae3acfef725b85065b0880d4413ff390d0fb1d87..9c526ecec93ad7f47f9b589d33f8e32108f5a49e 100644 (file)
--- a/target/linux/generic/backport-5.15/728-v6.1-04-net-ethernet-mtk_eth_soc-fix-resource-leak-in-error-.patch
+++ b/target/linux/generic/backport-5.15/728-v6.1-04-net-ethernet-mtk_eth_soc-fix-resource-leak-in-error-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4087,13 +4087,13 @@ static int mtk_probe(struct platform_dev
+@@ -4090,13 +4090,13 @@ static int mtk_probe(struct platform_dev

                                                   eth->soc->offload_version, i);
                        if (!eth->ppe[i]) {
                                err = -ENOMEM;
                                                   eth->soc->offload_version, i);
                        if (!eth->ppe[i]) {
                                err = -ENOMEM;

diff --git a/target/linux/generic/backport-5.15/728-v6.1-05-net-ethernet-mtk_eth_soc-fix-memory-leak-in-error-pa.patch b/target/linux/generic/backport-5.15/728-v6.1-05-net-ethernet-mtk_eth_soc-fix-memory-leak-in-error-pa.patch
index b0f5723f7bf1b6650d6ffc252f3ebb991c9f0047..55c9b35238b735ad4602b496fd006876b09486aa 100644 (file)
--- a/target/linux/generic/backport-5.15/728-v6.1-05-net-ethernet-mtk_eth_soc-fix-memory-leak-in-error-pa.patch
+++ b/target/linux/generic/backport-5.15/728-v6.1-05-net-ethernet-mtk_eth_soc-fix-memory-leak-in-error-pa.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4087,13 +4087,13 @@ static int mtk_probe(struct platform_dev
+@@ -4090,13 +4090,13 @@ static int mtk_probe(struct platform_dev

                                                   eth->soc->offload_version, i);
                        if (!eth->ppe[i]) {
                                err = -ENOMEM;
                                                   eth->soc->offload_version, i);
                        if (!eth->ppe[i]) {
                                err = -ENOMEM;


@@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        }
  
        for (i = 0; i < MTK_MAX_DEVS; i++) {
        }
  
        for (i = 0; i < MTK_MAX_DEVS; i++) {

-@@ -4103,7 +4103,7 @@ static int mtk_probe(struct platform_dev
+@@ -4106,7 +4106,7 @@ static int mtk_probe(struct platform_dev

                err = register_netdev(eth->netdev[i]);
                if (err) {
                        dev_err(eth->dev, "error bringing up device\n");
                err = register_netdev(eth->netdev[i]);
                if (err) {
                        dev_err(eth->dev, "error bringing up device\n");


@@ -46,7 +46,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                } else
                        netif_info(eth, probe, eth->netdev[i],
                                   "mediatek frame engine at 0x%08lx, irq %d\n",
                } else
                        netif_info(eth, probe, eth->netdev[i],
                                   "mediatek frame engine at 0x%08lx, irq %d\n",

-@@ -4123,7 +4123,8 @@ static int mtk_probe(struct platform_dev
+@@ -4126,7 +4126,8 @@ static int mtk_probe(struct platform_dev

  
        return 0;
  
  
        return 0;
  

diff --git a/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch b/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch
index 78f5f1859e4fe552219b69ae640f86ffeaa175dd..9206be370f818c1bd034308c35d3a89182a5de20 100644 (file)
--- a/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch
+++ b/target/linux/generic/backport-5.15/729-06-v6.1-net-ethernet-mtk_eth_soc-do-not-overwrite-mtu-config.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3176,6 +3176,30 @@ static void mtk_dim_tx(struct work_struc
+@@ -3179,6 +3179,30 @@ static void mtk_dim_tx(struct work_struc

        dim->state = DIM_START_MEASURE;
  }
  
        dim->state = DIM_START_MEASURE;
  }
  


@@ -45,7 +45,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int mtk_hw_init(struct mtk_eth *eth)
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
  static int mtk_hw_init(struct mtk_eth *eth)
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |

-@@ -3250,8 +3274,16 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3253,8 +3277,16 @@ static int mtk_hw_init(struct mtk_eth *e

         * up with the more appropriate value when mtk_mac_config call is being
         * invoked.
         */
         * up with the more appropriate value when mtk_mac_config call is being
         * invoked.
         */


@@ -63,7 +63,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        /* Indicates CDM to parse the MTK special tag from CPU
         * which also is working out for untag packets.
  
        /* Indicates CDM to parse the MTK special tag from CPU
         * which also is working out for untag packets.

-@@ -3350,7 +3382,6 @@ static int mtk_change_mtu(struct net_dev
+@@ -3353,7 +3385,6 @@ static int mtk_change_mtu(struct net_dev

        int length = new_mtu + MTK_RX_ETH_HLEN;
        struct mtk_mac *mac = netdev_priv(dev);
        struct mtk_eth *eth = mac->hw;
        int length = new_mtu + MTK_RX_ETH_HLEN;
        struct mtk_mac *mac = netdev_priv(dev);
        struct mtk_eth *eth = mac->hw;


@@ -71,7 +71,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        if (rcu_access_pointer(eth->prog) &&
            length > MTK_PP_MAX_BUF_SIZE) {
  
        if (rcu_access_pointer(eth->prog) &&
            length > MTK_PP_MAX_BUF_SIZE) {

-@@ -3358,23 +3389,7 @@ static int mtk_change_mtu(struct net_dev
+@@ -3361,23 +3392,7 @@ static int mtk_change_mtu(struct net_dev

                return -EINVAL;
        }
  
                return -EINVAL;
        }
  

diff --git a/target/linux/generic/backport-5.15/729-07-v6.1-net-ethernet-mtk_eth_soc-remove-cpu_relax-in-mtk_pen.patch b/target/linux/generic/backport-5.15/729-07-v6.1-net-ethernet-mtk_eth_soc-remove-cpu_relax-in-mtk_pen.patch
index 5b8768899dd16061aad4d791b0b546813ad50fe2..063415c618195d917ded49e235783751558c7b39 100644 (file)
--- a/target/linux/generic/backport-5.15/729-07-v6.1-net-ethernet-mtk_eth_soc-remove-cpu_relax-in-mtk_pen.patch
+++ b/target/linux/generic/backport-5.15/729-07-v6.1-net-ethernet-mtk_eth_soc-remove-cpu_relax-in-mtk_pen.patch
@@ -12,7 +12,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3420,11 +3420,8 @@ static void mtk_pending_work(struct work
+@@ -3423,11 +3423,8 @@ static void mtk_pending_work(struct work

        rtnl_lock();
  
        dev_dbg(eth->dev, "[%s][%d] reset\n", __func__, __LINE__);
        rtnl_lock();
  
        dev_dbg(eth->dev, "[%s][%d] reset\n", __func__, __LINE__);


@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        /* stop all devices to make sure that dma is properly shut down */
        for (i = 0; i < MTK_MAC_COUNT; i++) {
                if (!eth->netdev[i])
        /* stop all devices to make sure that dma is properly shut down */
        for (i = 0; i < MTK_MAC_COUNT; i++) {
                if (!eth->netdev[i])

-@@ -3458,7 +3455,7 @@ static void mtk_pending_work(struct work
+@@ -3461,7 +3458,7 @@ static void mtk_pending_work(struct work

  
        dev_dbg(eth->dev, "[%s][%d] reset done\n", __func__, __LINE__);
  
  
        dev_dbg(eth->dev, "[%s][%d] reset done\n", __func__, __LINE__);
  

diff --git a/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch b/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch
index 12aa3ebf6a7cefd4b314aca9133174c5a6babb8d..30be5b392bf6d3772efb509464ea6e203b03dbdc 100644 (file)
--- a/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch
+++ b/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3239,16 +3239,17 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3242,16 +3242,17 @@ static int mtk_hw_init(struct mtk_eth *e

                return 0;
        }
  
                return 0;
        }
  

diff --git a/target/linux/generic/backport-5.15/729-18-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_reset-util.patch b/target/linux/generic/backport-5.15/729-18-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_reset-util.patch
index 45b85c06cb529dc458f8e3506a35d8ebb0ff064c..3ab5dba434ecf08c85a0e9cbe03f5f35a8cd9492 100644 (file)
--- a/target/linux/generic/backport-5.15/729-18-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_reset-util.patch
+++ b/target/linux/generic/backport-5.15/729-18-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_reset-util.patch
@@ -16,7 +16,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3200,6 +3200,27 @@ static void mtk_set_mcr_max_rx(struct mt
+@@ -3203,6 +3203,27 @@ static void mtk_set_mcr_max_rx(struct mt

                mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
  }
  
                mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
  }
  


@@ -44,7 +44,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  static int mtk_hw_init(struct mtk_eth *eth)
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
  static int mtk_hw_init(struct mtk_eth *eth)
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |

-@@ -3239,22 +3260,9 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3242,22 +3263,9 @@ static int mtk_hw_init(struct mtk_eth *e

                return 0;
        }
  
                return 0;
        }
  

diff --git a/target/linux/generic/backport-5.15/729-19-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_warm_reset.patch b/target/linux/generic/backport-5.15/729-19-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_warm_reset.patch
index 35004462d25248c8870dc7ce5e385885db843f82..deb39477ec73fbc5a8759ec5e6ab87945ea50eb5 100644 (file)
--- a/target/linux/generic/backport-5.15/729-19-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_warm_reset.patch
+++ b/target/linux/generic/backport-5.15/729-19-v6.3-net-ethernet-mtk_eth_soc-introduce-mtk_hw_warm_reset.patch
@@ -17,7 +17,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3221,7 +3221,54 @@ static void mtk_hw_reset(struct mtk_eth
+@@ -3224,7 +3224,54 @@ static void mtk_hw_reset(struct mtk_eth

                             0x3ffffff);
  }
  
                             0x3ffffff);
  }
  


@@ -73,7 +73,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
                       ETHSYS_DMA_AG_MAP_PPE;
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
                       ETHSYS_DMA_AG_MAP_PPE;

-@@ -3260,7 +3307,12 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3263,7 +3310,12 @@ static int mtk_hw_init(struct mtk_eth *e

                return 0;
        }
  
                return 0;
        }
  


@@ -87,7 +87,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
                /* Set FE to PDMAv2 if necessary */
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
                /* Set FE to PDMAv2 if necessary */

-@@ -3448,7 +3500,7 @@ static void mtk_pending_work(struct work
+@@ -3451,7 +3503,7 @@ static void mtk_pending_work(struct work

        if (eth->dev->pins)
                pinctrl_select_state(eth->dev->pins->p,
                                     eth->dev->pins->default_state);
        if (eth->dev->pins)
                pinctrl_select_state(eth->dev->pins->p,
                                     eth->dev->pins->default_state);


@@ -96,7 +96,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        /* restart DMA and enable IRQs */
        for (i = 0; i < MTK_MAC_COUNT; i++) {
  
        /* restart DMA and enable IRQs */
        for (i = 0; i < MTK_MAC_COUNT; i++) {

-@@ -4050,7 +4102,7 @@ static int mtk_probe(struct platform_dev
+@@ -4053,7 +4105,7 @@ static int mtk_probe(struct platform_dev

        eth->msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE);
        INIT_WORK(&eth->pending_work, mtk_pending_work);
  
        eth->msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE);
        INIT_WORK(&eth->pending_work, mtk_pending_work);
  

diff --git a/target/linux/generic/backport-5.15/729-20-v6.3-net-ethernet-mtk_eth_soc-align-reset-procedure-to-ve.patch b/target/linux/generic/backport-5.15/729-20-v6.3-net-ethernet-mtk_eth_soc-align-reset-procedure-to-ve.patch
index 7dde9a54824d2c6cb50383e02a660fd6b6cb219a..b3812cccbbdbde069079da4e0ee25040e93ef57b 100644 (file)
--- a/target/linux/generic/backport-5.15/729-20-v6.3-net-ethernet-mtk_eth_soc-align-reset-procedure-to-ve.patch
+++ b/target/linux/generic/backport-5.15/729-20-v6.3-net-ethernet-mtk_eth_soc-align-reset-procedure-to-ve.patch
@@ -16,7 +16,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -2786,14 +2786,29 @@ static void mtk_dma_free(struct mtk_eth
+@@ -2789,14 +2789,29 @@ static void mtk_dma_free(struct mtk_eth

        kfree(eth->scratch_head);
  }
  
        kfree(eth->scratch_head);
  }
  


@@ -48,7 +48,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        schedule_work(&eth->pending_work);
  }
  
        schedule_work(&eth->pending_work);
  }
  

-@@ -3275,15 +3290,17 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3278,15 +3293,17 @@ static int mtk_hw_init(struct mtk_eth *e

        const struct mtk_reg_map *reg_map = eth->soc->reg_map;
        int i, val, ret;
  
        const struct mtk_reg_map *reg_map = eth->soc->reg_map;
        int i, val, ret;
  


@@ -72,7 +72,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        if (eth->ethsys)
                regmap_update_bits(eth->ethsys, ETHSYS_DMA_AG_MAP, dma_mask,
  
        if (eth->ethsys)
                regmap_update_bits(eth->ethsys, ETHSYS_DMA_AG_MAP, dma_mask,

-@@ -3409,8 +3426,10 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3412,8 +3429,10 @@ static int mtk_hw_init(struct mtk_eth *e

        return 0;
  
  err_disable_pm:
        return 0;
  
  err_disable_pm:


@@ -85,7 +85,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        return ret;
  }
  
        return ret;
  }

-@@ -3472,30 +3491,53 @@ static int mtk_do_ioctl(struct net_devic
+@@ -3475,30 +3494,53 @@ static int mtk_do_ioctl(struct net_devic

        return -EOPNOTSUPP;
  }
  
        return -EOPNOTSUPP;
  }
  


@@ -148,7 +148,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        if (eth->dev->pins)
                pinctrl_select_state(eth->dev->pins->p,
  
        if (eth->dev->pins)
                pinctrl_select_state(eth->dev->pins->p,

-@@ -3506,15 +3548,19 @@ static void mtk_pending_work(struct work
+@@ -3509,15 +3551,19 @@ static void mtk_pending_work(struct work

        for (i = 0; i < MTK_MAC_COUNT; i++) {
                if (!test_bit(i, &restart))
                        continue;
        for (i = 0; i < MTK_MAC_COUNT; i++) {
                if (!test_bit(i, &restart))
                        continue;

diff --git a/target/linux/generic/backport-5.15/729-21-v6.3-net-ethernet-mtk_eth_soc-add-dma-checks-to-mtk_hw_re.patch b/target/linux/generic/backport-5.15/729-21-v6.3-net-ethernet-mtk_eth_soc-add-dma-checks-to-mtk_hw_re.patch
index bc8b9a332747167ff6904c22d3afac5cb4cf59c9..633c66f1c2f6c85c790e9163a4dbe2715115207a 100644 (file)
--- a/target/linux/generic/backport-5.15/729-21-v6.3-net-ethernet-mtk_eth_soc-add-dma-checks-to-mtk_hw_re.patch
+++ b/target/linux/generic/backport-5.15/729-21-v6.3-net-ethernet-mtk_eth_soc-add-dma-checks-to-mtk_hw_re.patch
@@ -49,7 +49,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  };
  
  /* strings used by ethtool */
  };
  
  /* strings used by ethtool */

-@@ -3283,6 +3289,102 @@ static void mtk_hw_warm_reset(struct mtk
+@@ -3286,6 +3292,102 @@ static void mtk_hw_warm_reset(struct mtk

                        val, rst_mask);
  }
  
                        val, rst_mask);
  }
  


@@ -152,7 +152,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  static int mtk_hw_init(struct mtk_eth *eth, bool reset)
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
  static int mtk_hw_init(struct mtk_eth *eth, bool reset)
  {
        u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |

-@@ -3598,6 +3700,7 @@ static int mtk_cleanup(struct mtk_eth *e
+@@ -3601,6 +3703,7 @@ static int mtk_cleanup(struct mtk_eth *e

        mtk_unreg_dev(eth);
        mtk_free_dev(eth);
        cancel_work_sync(&eth->pending_work);
        mtk_unreg_dev(eth);
        mtk_free_dev(eth);
        cancel_work_sync(&eth->pending_work);


@@ -160,7 +160,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        return 0;
  }
  
        return 0;
  }

-@@ -4035,6 +4138,7 @@ static int mtk_probe(struct platform_dev
+@@ -4038,6 +4141,7 @@ static int mtk_probe(struct platform_dev

  
        eth->rx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
        INIT_WORK(&eth->rx_dim.work, mtk_dim_rx);
  
        eth->rx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
        INIT_WORK(&eth->rx_dim.work, mtk_dim_rx);


@@ -168,7 +168,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        eth->tx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
        INIT_WORK(&eth->tx_dim.work, mtk_dim_tx);
  
        eth->tx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
        INIT_WORK(&eth->tx_dim.work, mtk_dim_tx);

-@@ -4239,6 +4343,8 @@ static int mtk_probe(struct platform_dev
+@@ -4242,6 +4346,8 @@ static int mtk_probe(struct platform_dev

                       NAPI_POLL_WEIGHT);
  
        platform_set_drvdata(pdev, eth);
                       NAPI_POLL_WEIGHT);
  
        platform_set_drvdata(pdev, eth);

diff --git a/target/linux/generic/backport-5.15/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch b/target/linux/generic/backport-5.15/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
index ae0e0e959106fa8a9ecdbd898d25a7418f0d29f5..1f61be0a1fb8a711fe627f60cf3fef393667be92 100644 (file)
--- a/target/linux/generic/backport-5.15/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
+++ b/target/linux/generic/backport-5.15/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
@@ -14,7 +14,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3629,6 +3629,11 @@ static void mtk_pending_work(struct work
+@@ -3632,6 +3632,11 @@ static void mtk_pending_work(struct work

        set_bit(MTK_RESETTING, &eth->state);
  
        mtk_prepare_for_reset(eth);
        set_bit(MTK_RESETTING, &eth->state);
  
        mtk_prepare_for_reset(eth);


@@ -26,7 +26,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        /* stop all devices to make sure that dma is properly shut down */
        for (i = 0; i < MTK_MAC_COUNT; i++) {
  
        /* stop all devices to make sure that dma is properly shut down */
        for (i = 0; i < MTK_MAC_COUNT; i++) {

-@@ -3666,6 +3671,8 @@ static void mtk_pending_work(struct work
+@@ -3669,6 +3674,8 @@ static void mtk_pending_work(struct work

  
        clear_bit(MTK_RESETTING, &eth->state);
  
  
        clear_bit(MTK_RESETTING, &eth->state);
  

diff --git a/target/linux/generic/backport-5.15/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch b/target/linux/generic/backport-5.15/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch
index b3412df9e0ccef315fac1e79c13816c0dee88fdb..8b6d9e908f2e1af13167ee11703e74c4ac8aaf91 100644 (file)
--- a/target/linux/generic/backport-5.15/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch
+++ b/target/linux/generic/backport-5.15/730-02-v6.3-net-ethernet-mtk_eth_soc-increase-tx-ring-side-for-Q.patch
@@ -122,7 +122,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                                  ring->dma_pdma, ring->phys_pdma);
                ring->dma_pdma = NULL;
        }
                                  ring->dma_pdma, ring->phys_pdma);
                ring->dma_pdma = NULL;
        }

-@@ -2774,7 +2780,7 @@ static void mtk_dma_free(struct mtk_eth
+@@ -2777,7 +2783,7 @@ static void mtk_dma_free(struct mtk_eth

                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {
                dma_free_coherent(eth->dma_dev,
                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {
                dma_free_coherent(eth->dma_dev,

diff --git a/target/linux/generic/backport-5.15/730-03-v6.3-net-ethernet-mtk_eth_soc-avoid-port_mg-assignment-on.patch b/target/linux/generic/backport-5.15/730-03-v6.3-net-ethernet-mtk_eth_soc-avoid-port_mg-assignment-on.patch
index af987c42e25a9565bc37eda385e68ee31e4f91cb..391727b30d3f4d4d6bf6830c50d6c47775fb0b5c 100644 (file)
--- a/target/linux/generic/backport-5.15/730-03-v6.3-net-ethernet-mtk_eth_soc-avoid-port_mg-assignment-on.patch
+++ b/target/linux/generic/backport-5.15/730-03-v6.3-net-ethernet-mtk_eth_soc-avoid-port_mg-assignment-on.patch
@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4422,7 +4422,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4425,7 +4425,7 @@ static const struct mtk_soc_data mt7621_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,


@@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        .hash_offset = 2,
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {
        .hash_offset = 2,
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {

-@@ -4461,7 +4461,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4464,7 +4464,7 @@ static const struct mtk_soc_data mt7623_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,

diff --git a/target/linux/generic/backport-5.15/730-04-v6.3-net-ethernet-mtk_eth_soc-implement-multi-queue-suppo.patch b/target/linux/generic/backport-5.15/730-04-v6.3-net-ethernet-mtk_eth_soc-implement-multi-queue-suppo.patch
index 2e2299c932fcf06171e126dee442c9cc6a35eecc..8e743dd02a374e2c35a12ed7447361ebfbe20fc4 100644 (file)
--- a/target/linux/generic/backport-5.15/730-04-v6.3-net-ethernet-mtk_eth_soc-implement-multi-queue-suppo.patch
+++ b/target/linux/generic/backport-5.15/730-04-v6.3-net-ethernet-mtk_eth_soc-implement-multi-queue-suppo.patch
@@ -424,7 +424,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        } else {
                mtk_w32(eth, ring->phys_pdma, MT7628_TX_BASE_PTR0);
                mtk_w32(eth, ring_size, MT7628_TX_MAX_CNT0);
        } else {
                mtk_w32(eth, ring->phys_pdma, MT7628_TX_BASE_PTR0);
                mtk_w32(eth, ring_size, MT7628_TX_MAX_CNT0);

-@@ -2904,7 +3020,7 @@ static int mtk_start_dma(struct mtk_eth
+@@ -2907,7 +3023,7 @@ static int mtk_start_dma(struct mtk_eth

                if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))
                        val |= MTK_MUTLI_CNT | MTK_RESV_BUF |
                               MTK_WCOMP_EN | MTK_DMAD_WR_WDONE |
                if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))
                        val |= MTK_MUTLI_CNT | MTK_RESV_BUF |
                               MTK_WCOMP_EN | MTK_DMAD_WR_WDONE |


@@ -433,7 +433,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                else
                        val |= MTK_RX_BT_32DWORDS;
                mtk_w32(eth, val, reg_map->qdma.glo_cfg);
                else
                        val |= MTK_RX_BT_32DWORDS;
                mtk_w32(eth, val, reg_map->qdma.glo_cfg);

-@@ -2950,6 +3066,45 @@ static void mtk_gdm_config(struct mtk_et
+@@ -2953,6 +3069,45 @@ static void mtk_gdm_config(struct mtk_et

        mtk_w32(eth, 0, MTK_RST_GL);
  }
  
        mtk_w32(eth, 0, MTK_RST_GL);
  }
  


@@ -479,7 +479,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static int mtk_open(struct net_device *dev)
  {
        struct mtk_mac *mac = netdev_priv(dev);
  static int mtk_open(struct net_device *dev)
  {
        struct mtk_mac *mac = netdev_priv(dev);

-@@ -2994,7 +3149,8 @@ static int mtk_open(struct net_device *d
+@@ -2997,7 +3152,8 @@ static int mtk_open(struct net_device *d

                refcount_inc(&eth->dma_refcnt);
  
        phylink_start(mac->phylink);
                refcount_inc(&eth->dma_refcnt);
  
        phylink_start(mac->phylink);


@@ -489,7 +489,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return 0;
  }
  
        return 0;
  }
  

-@@ -3700,8 +3856,12 @@ static int mtk_unreg_dev(struct mtk_eth
+@@ -3703,8 +3859,12 @@ static int mtk_unreg_dev(struct mtk_eth

        int i;
  
        for (i = 0; i < MTK_MAC_COUNT; i++) {
        int i;
  
        for (i = 0; i < MTK_MAC_COUNT; i++) {


@@ -502,7 +502,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                unregister_netdev(eth->netdev[i]);
        }
  
                unregister_netdev(eth->netdev[i]);
        }
  

-@@ -3918,6 +4078,23 @@ static int mtk_set_rxnfc(struct net_devi
+@@ -3921,6 +4081,23 @@ static int mtk_set_rxnfc(struct net_devi

        return ret;
  }
  
        return ret;
  }
  


@@ -526,7 +526,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static const struct ethtool_ops mtk_ethtool_ops = {
        .get_link_ksettings     = mtk_get_link_ksettings,
        .set_link_ksettings     = mtk_set_link_ksettings,
  static const struct ethtool_ops mtk_ethtool_ops = {
        .get_link_ksettings     = mtk_get_link_ksettings,
        .set_link_ksettings     = mtk_set_link_ksettings,

-@@ -3952,6 +4129,7 @@ static const struct net_device_ops mtk_n
+@@ -3955,6 +4132,7 @@ static const struct net_device_ops mtk_n

        .ndo_setup_tc           = mtk_eth_setup_tc,
        .ndo_bpf                = mtk_xdp,
        .ndo_xdp_xmit           = mtk_xdp_xmit,
        .ndo_setup_tc           = mtk_eth_setup_tc,
        .ndo_bpf                = mtk_xdp,
        .ndo_xdp_xmit           = mtk_xdp_xmit,


@@ -534,7 +534,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  };
  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)

-@@ -3961,6 +4139,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3964,6 +4142,7 @@ static int mtk_add_mac(struct mtk_eth *e

        struct phylink *phylink;
        struct mtk_mac *mac;
        int id, err;
        struct phylink *phylink;
        struct mtk_mac *mac;
        int id, err;


@@ -542,7 +542,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        if (!_id) {
                dev_err(eth->dev, "missing mac id\n");
  
        if (!_id) {
                dev_err(eth->dev, "missing mac id\n");

-@@ -3978,7 +4157,10 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3981,7 +4160,10 @@ static int mtk_add_mac(struct mtk_eth *e

                return -EINVAL;
        }
  
                return -EINVAL;
        }
  


@@ -554,7 +554,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!eth->netdev[id]) {
                dev_err(eth->dev, "alloc_etherdev failed\n");
                return -ENOMEM;
        if (!eth->netdev[id]) {
                dev_err(eth->dev, "alloc_etherdev failed\n");
                return -ENOMEM;

-@@ -4086,6 +4268,11 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4089,6 +4271,11 @@ static int mtk_add_mac(struct mtk_eth *e

        else
                eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;
  
        else
                eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;
  

diff --git a/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch b/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
index f9d822ad447bb67a2316288492acb460213bc60d..3733b7279f91b60198e5e5647429e6b03941deb3 100644 (file)
--- a/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
+++ b/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
@@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                }
  
                skb_record_rx_queue(skb, 0);
                }
  
                skb_record_rx_queue(skb, 0);

-@@ -2800,15 +2807,30 @@ static netdev_features_t mtk_fix_feature
+@@ -2803,15 +2810,30 @@ static netdev_features_t mtk_fix_feature

  
  static int mtk_set_features(struct net_device *dev, netdev_features_t features)
  {
  
  static int mtk_set_features(struct net_device *dev, netdev_features_t features)
  {


@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  }
  
  /* wait for DMA to finish whatever it is doing before we start using it again */
  }
  
  /* wait for DMA to finish whatever it is doing before we start using it again */

-@@ -3105,11 +3127,45 @@ found:
+@@ -3108,11 +3130,45 @@ found:

        return NOTIFY_DONE;
  }
  
        return NOTIFY_DONE;
  }
  


@@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
        if (err) {
  
        err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
        if (err) {

-@@ -3632,6 +3688,10 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3635,6 +3691,10 @@ static int mtk_hw_init(struct mtk_eth *e

         */
        val = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
        mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
         */
        val = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
        mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);


@@ -146,7 +146,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        /* Enable RX VLan Offloading */
        mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);
  
        /* Enable RX VLan Offloading */
        mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);

-@@ -3848,6 +3908,12 @@ static int mtk_free_dev(struct mtk_eth *
+@@ -3851,6 +3911,12 @@ static int mtk_free_dev(struct mtk_eth *

                free_netdev(eth->netdev[i]);
        }
  
                free_netdev(eth->netdev[i]);
        }
  

diff --git a/target/linux/generic/backport-5.15/730-10-v6.3-net-ethernet-mtk_eth_soc-drop-packets-to-WDMA-if-the.patch b/target/linux/generic/backport-5.15/730-10-v6.3-net-ethernet-mtk_eth_soc-drop-packets-to-WDMA-if-the.patch
index 0bf48b0780013249d2629c3ab554d79ed986b1e6..9c2843a6c9c34d98626b520c86b359b0563a75fc 100644 (file)
--- a/target/linux/generic/backport-5.15/730-10-v6.3-net-ethernet-mtk_eth_soc-drop-packets-to-WDMA-if-the.patch
+++ b/target/linux/generic/backport-5.15/730-10-v6.3-net-ethernet-mtk_eth_soc-drop-packets-to-WDMA-if-the.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3712,9 +3712,12 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3715,9 +3715,12 @@ static int mtk_hw_init(struct mtk_eth *e

        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {

diff --git a/target/linux/generic/backport-5.15/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch b/target/linux/generic/backport-5.15/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
index 08bf608bc1217bab4776ae4bbd8ed5a2f17df1e1..5a4d343a72cf39deed18bd91501189e65bd13c3a 100644 (file)
--- a/target/linux/generic/backport-5.15/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
+++ b/target/linux/generic/backport-5.15/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3143,7 +3143,8 @@ static int mtk_open(struct net_device *d
+@@ -3146,7 +3146,8 @@ static int mtk_open(struct net_device *d

        struct mtk_eth *eth = mac->hw;
        int i, err;
  
        struct mtk_eth *eth = mac->hw;
        int i, err;
  


@@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) {
                        struct metadata_dst *md_dst = eth->dsa_meta[i];
  
                for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) {
                        struct metadata_dst *md_dst = eth->dsa_meta[i];
  

-@@ -3160,7 +3161,8 @@ static int mtk_open(struct net_device *d
+@@ -3163,7 +3164,8 @@ static int mtk_open(struct net_device *d

                }
        } else {
                /* Hardware special tag parsing needs to be disabled if at least
                }
        } else {
                /* Hardware special tag parsing needs to be disabled if at least

diff --git a/target/linux/generic/backport-5.15/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch b/target/linux/generic/backport-5.15/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
index efab99ada006efa5d93f9a427e4cd63243d9c49b..e93e62125d458a611bafe237fb0a498b86a614e9 100644 (file)
--- a/target/linux/generic/backport-5.15/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
+++ b/target/linux/generic/backport-5.15/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
@@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3078,7 +3078,7 @@ static void mtk_gdm_config(struct mtk_et
+@@ -3081,7 +3081,7 @@ static void mtk_gdm_config(struct mtk_et

  
                val |= config;
  
  
                val |= config;
  


@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        val |= MTK_GDMA_SPECIAL_TAG;
  
                mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
                        val |= MTK_GDMA_SPECIAL_TAG;
  
                mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));

-@@ -3143,8 +3143,7 @@ static int mtk_open(struct net_device *d
+@@ -3146,8 +3146,7 @@ static int mtk_open(struct net_device *d

        struct mtk_eth *eth = mac->hw;
        int i, err;
  
        struct mtk_eth *eth = mac->hw;
        int i, err;
  


@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) {
                        struct metadata_dst *md_dst = eth->dsa_meta[i];
  
                for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) {
                        struct metadata_dst *md_dst = eth->dsa_meta[i];
  

-@@ -3161,8 +3160,7 @@ static int mtk_open(struct net_device *d
+@@ -3164,8 +3163,7 @@ static int mtk_open(struct net_device *d

                }
        } else {
                /* Hardware special tag parsing needs to be disabled if at least
                }
        } else {
                /* Hardware special tag parsing needs to be disabled if at least

diff --git a/target/linux/generic/backport-5.15/733-v6.3-18-net-ethernet-mtk_eth_soc-add-support-for-MT7981.patch b/target/linux/generic/backport-5.15/733-v6.3-18-net-ethernet-mtk_eth_soc-add-support-for-MT7981.patch
index 1ae4e83363232ef7227c944cc80f5cb3fe147734..b59638e772b80c3119a1973b96089150e19d4816 100644 (file)
--- a/target/linux/generic/backport-5.15/733-v6.3-18-net-ethernet-mtk_eth_soc-add-support-for-MT7981.patch
+++ b/target/linux/generic/backport-5.15/733-v6.3-18-net-ethernet-mtk_eth_soc-add-support-for-MT7981.patch
@@ -51,7 +51,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                mtk_eth_path_name(path), __func__, updated);
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
                mtk_eth_path_name(path), __func__, updated);
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4749,6 +4749,26 @@ static const struct mtk_soc_data mt7629_
+@@ -4752,6 +4752,26 @@ static const struct mtk_soc_data mt7629_

        },
  };
  
        },
  };
  


@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static const struct mtk_soc_data mt7986_data = {
        .reg_map = &mt7986_reg_map,
        .ana_rgc3 = 0x128,
  static const struct mtk_soc_data mt7986_data = {
        .reg_map = &mt7986_reg_map,
        .ana_rgc3 = 0x128,

-@@ -4791,6 +4811,7 @@ const struct of_device_id of_mtk_match[]
+@@ -4794,6 +4814,7 @@ const struct of_device_id of_mtk_match[]

        { .compatible = "mediatek,mt7622-eth", .data = &mt7622_data},
        { .compatible = "mediatek,mt7623-eth", .data = &mt7623_data},
        { .compatible = "mediatek,mt7629-eth", .data = &mt7629_data},
        { .compatible = "mediatek,mt7622-eth", .data = &mt7622_data},
        { .compatible = "mediatek,mt7623-eth", .data = &mt7623_data},
        { .compatible = "mediatek,mt7629-eth", .data = &mt7629_data},

diff --git a/target/linux/generic/backport-5.15/733-v6.3-20-net-ethernet-mtk_eth_soc-switch-to-external-PCS-driv.patch b/target/linux/generic/backport-5.15/733-v6.3-20-net-ethernet-mtk_eth_soc-switch-to-external-PCS-driv.patch
index 42a700d543921906498d792a373638ac681fff49..c55d6b6428caf1a897ea6f2dc999d186da36c547 100644 (file)
--- a/target/linux/generic/backport-5.15/733-v6.3-20-net-ethernet-mtk_eth_soc-switch-to-external-PCS-driv.patch
+++ b/target/linux/generic/backport-5.15/733-v6.3-20-net-ethernet-mtk_eth_soc-switch-to-external-PCS-driv.patch
@@ -60,7 +60,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        }
  
        return NULL;
        }
  
        return NULL;

-@@ -3960,8 +3961,17 @@ static int mtk_unreg_dev(struct mtk_eth
+@@ -3963,8 +3964,17 @@ static int mtk_unreg_dev(struct mtk_eth

        return 0;
  }
  
        return 0;
  }
  


@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        mtk_unreg_dev(eth);
        mtk_free_dev(eth);
        cancel_work_sync(&eth->pending_work);
        mtk_unreg_dev(eth);
        mtk_free_dev(eth);
        cancel_work_sync(&eth->pending_work);

-@@ -4401,6 +4411,36 @@ void mtk_eth_set_dma_device(struct mtk_e
+@@ -4404,6 +4414,36 @@ void mtk_eth_set_dma_device(struct mtk_e

        rtnl_unlock();
  }
  
        rtnl_unlock();
  }
  


@@ -115,7 +115,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static int mtk_probe(struct platform_device *pdev)
  {
        struct resource *res = NULL;
  static int mtk_probe(struct platform_device *pdev)
  {
        struct resource *res = NULL;

-@@ -4464,13 +4504,7 @@ static int mtk_probe(struct platform_dev
+@@ -4467,13 +4507,7 @@ static int mtk_probe(struct platform_dev

        }
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SGMII)) {
        }
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SGMII)) {


@@ -130,7 +130,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
                if (err)
                        return err;
  
                if (err)
                        return err;

-@@ -4481,14 +4515,17 @@ static int mtk_probe(struct platform_dev
+@@ -4484,14 +4518,17 @@ static int mtk_probe(struct platform_dev

                                                            "mediatek,pctl");
                if (IS_ERR(eth->pctl)) {
                        dev_err(&pdev->dev, "no pctl regmap found\n");
                                                            "mediatek,pctl");
                if (IS_ERR(eth->pctl)) {
                        dev_err(&pdev->dev, "no pctl regmap found\n");


@@ -151,7 +151,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        }
  
        if (eth->soc->offload_version) {
        }
  
        if (eth->soc->offload_version) {

-@@ -4649,6 +4686,8 @@ err_deinit_hw:
+@@ -4652,6 +4689,8 @@ err_deinit_hw:

        mtk_hw_deinit(eth);
  err_wed_exit:
        mtk_wed_exit();
        mtk_hw_deinit(eth);
  err_wed_exit:
        mtk_wed_exit();

diff --git a/target/linux/generic/backport-5.15/733-v6.4-24-net-ethernet-mtk_eth_soc-ppe-add-support-for-flow-ac.patch b/target/linux/generic/backport-5.15/733-v6.4-24-net-ethernet-mtk_eth_soc-ppe-add-support-for-flow-ac.patch
index 51ebcfe8f11901eead1170a3ed6bb3e46de0608b..1c804f29b67e58631212de601f0be681831377ab 100644 (file)
--- a/target/linux/generic/backport-5.15/733-v6.4-24-net-ethernet-mtk_eth_soc-ppe-add-support-for-flow-ac.patch
+++ b/target/linux/generic/backport-5.15/733-v6.4-24-net-ethernet-mtk_eth_soc-ppe-add-support-for-flow-ac.patch
@@ -53,7 +53,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4635,8 +4635,8 @@ static int mtk_probe(struct platform_dev
+@@ -4638,8 +4638,8 @@ static int mtk_probe(struct platform_dev

                for (i = 0; i < num_ppe; i++) {
                        u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;
  
                for (i = 0; i < num_ppe; i++) {
                        u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;
  


@@ -64,7 +64,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
                        if (!eth->ppe[i]) {
                                err = -ENOMEM;
                                goto err_deinit_ppe;
                        if (!eth->ppe[i]) {
                                err = -ENOMEM;
                                goto err_deinit_ppe;

-@@ -4762,6 +4762,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4765,6 +4765,7 @@ static const struct mtk_soc_data mt7622_

        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,


@@ -72,7 +72,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),

-@@ -4799,6 +4800,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4802,6 +4803,7 @@ static const struct mtk_soc_data mt7629_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,


@@ -80,7 +80,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4819,6 +4821,7 @@ static const struct mtk_soc_data mt7981_
+@@ -4822,6 +4824,7 @@ static const struct mtk_soc_data mt7981_

        .offload_version = 2,
        .hash_offset = 4,
        .foe_entry_size = sizeof(struct mtk_foe_entry),
        .offload_version = 2,
        .hash_offset = 4,
        .foe_entry_size = sizeof(struct mtk_foe_entry),


@@ -88,7 +88,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma_v2),
                .rxd_size = sizeof(struct mtk_rx_dma_v2),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma_v2),
                .rxd_size = sizeof(struct mtk_rx_dma_v2),

-@@ -4839,6 +4842,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4842,6 +4845,7 @@ static const struct mtk_soc_data mt7986_

        .offload_version = 2,
        .hash_offset = 4,
        .foe_entry_size = sizeof(struct mtk_foe_entry),
        .offload_version = 2,
        .hash_offset = 4,
        .foe_entry_size = sizeof(struct mtk_foe_entry),

diff --git a/target/linux/generic/backport-5.15/733-v6.4-26-net-ethernet-mtk_eth_soc-drop-generic-vlan-rx-offloa.patch b/target/linux/generic/backport-5.15/733-v6.4-26-net-ethernet-mtk_eth_soc-drop-generic-vlan-rx-offloa.patch
index f6c70e7e6aff02566edf24434226320f91aaaaff..6126dfeadc2e94a5c273920ab1801f98668b945d 100644 (file)
--- a/target/linux/generic/backport-5.15/733-v6.4-26-net-ethernet-mtk_eth_soc-drop-generic-vlan-rx-offloa.patch
+++ b/target/linux/generic/backport-5.15/733-v6.4-26-net-ethernet-mtk_eth_soc-drop-generic-vlan-rx-offloa.patch
@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                skb_record_rx_queue(skb, 0);
                napi_gro_receive(napi, skb);
  
                skb_record_rx_queue(skb, 0);
                napi_gro_receive(napi, skb);
  

-@@ -2831,29 +2814,11 @@ static netdev_features_t mtk_fix_feature
+@@ -2834,29 +2817,11 @@ static netdev_features_t mtk_fix_feature

  
  static int mtk_set_features(struct net_device *dev, netdev_features_t features)
  {
  
  static int mtk_set_features(struct net_device *dev, netdev_features_t features)
  {


@@ -100,7 +100,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return 0;
  }
  
        return 0;
  }
  

-@@ -3167,30 +3132,6 @@ static int mtk_open(struct net_device *d
+@@ -3170,30 +3135,6 @@ static int mtk_open(struct net_device *d

        struct mtk_eth *eth = mac->hw;
        int i, err;
  
        struct mtk_eth *eth = mac->hw;
        int i, err;
  


@@ -131,7 +131,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
        if (err) {
                netdev_err(dev, "%s: could not attach PHY: %d\n", __func__,
        err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
        if (err) {
                netdev_err(dev, "%s: could not attach PHY: %d\n", __func__,

-@@ -3231,6 +3172,35 @@ static int mtk_open(struct net_device *d
+@@ -3234,6 +3175,35 @@ static int mtk_open(struct net_device *d

        phylink_start(mac->phylink);
        netif_tx_start_all_queues(dev);
  
        phylink_start(mac->phylink);
        netif_tx_start_all_queues(dev);
  


@@ -167,7 +167,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return 0;
  }
  
        return 0;
  }
  

-@@ -3715,10 +3685,9 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3718,10 +3688,9 @@ static int mtk_hw_init(struct mtk_eth *e

        if (!MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
                val = mtk_r32(eth, MTK_CDMP_IG_CTRL);
                mtk_w32(eth, val | MTK_CDMP_STAG_EN, MTK_CDMP_IG_CTRL);
        if (!MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
                val = mtk_r32(eth, MTK_CDMP_IG_CTRL);
                mtk_w32(eth, val | MTK_CDMP_STAG_EN, MTK_CDMP_IG_CTRL);


@@ -180,7 +180,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        /* set interrupt delays based on current Net DIM sample */
        mtk_dim_rx(&eth->rx_dim.work);
  
        /* set interrupt delays based on current Net DIM sample */
        mtk_dim_rx(&eth->rx_dim.work);

-@@ -4358,7 +4327,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4361,7 +4330,7 @@ static int mtk_add_mac(struct mtk_eth *e

                eth->netdev[id]->hw_features |= NETIF_F_LRO;
  
        eth->netdev[id]->vlan_features = eth->soc->hw_features &
                eth->netdev[id]->hw_features |= NETIF_F_LRO;
  
        eth->netdev[id]->vlan_features = eth->soc->hw_features &

diff --git a/target/linux/generic/backport-5.15/750-v6.5-01-net-ethernet-mtk_ppe-add-MTK_FOE_ENTRY_V-1-2-_SIZE-m.patch b/target/linux/generic/backport-5.15/750-v6.5-01-net-ethernet-mtk_ppe-add-MTK_FOE_ENTRY_V-1-2-_SIZE-m.patch
index 0ba8bb8ec43ac1023c772fa464d916b83845f8dd..ad63dd61963626dd87520630fb3290c59a21c88d 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-01-net-ethernet-mtk_ppe-add-MTK_FOE_ENTRY_V-1-2-_SIZE-m.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-01-net-ethernet-mtk_ppe-add-MTK_FOE_ENTRY_V-1-2-_SIZE-m.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4711,7 +4711,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4714,7 +4714,7 @@ static const struct mtk_soc_data mt7621_

        .required_pctl = false,
        .offload_version = 1,
        .hash_offset = 2,
        .required_pctl = false,
        .offload_version = 1,
        .hash_offset = 2,


@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4732,7 +4732,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4735,7 +4735,7 @@ static const struct mtk_soc_data mt7622_

        .offload_version = 2,
        .hash_offset = 2,
        .has_accounting = true,
        .offload_version = 2,
        .hash_offset = 2,
        .has_accounting = true,


@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4751,7 +4751,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4754,7 +4754,7 @@ static const struct mtk_soc_data mt7623_

        .required_pctl = true,
        .offload_version = 1,
        .hash_offset = 2,
        .required_pctl = true,
        .offload_version = 1,
        .hash_offset = 2,


@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4789,8 +4789,8 @@ static const struct mtk_soc_data mt7981_
+@@ -4792,8 +4792,8 @@ static const struct mtk_soc_data mt7981_

        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 4,
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 4,


@@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma_v2),
                .rxd_size = sizeof(struct mtk_rx_dma_v2),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma_v2),
                .rxd_size = sizeof(struct mtk_rx_dma_v2),

-@@ -4810,8 +4810,8 @@ static const struct mtk_soc_data mt7986_
+@@ -4813,8 +4813,8 @@ static const struct mtk_soc_data mt7986_

        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 4,
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 4,

diff --git a/target/linux/generic/backport-5.15/750-v6.5-02-net-ethernet-mtk_eth_soc-remove-incorrect-PLL-config.patch b/target/linux/generic/backport-5.15/750-v6.5-02-net-ethernet-mtk_eth_soc-remove-incorrect-PLL-config.patch
index 681022078cb8d60d499fab91314b1e8a83cf60b9..c502c4c28c4ac47c7eb81dcce858de4445867fc0 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-02-net-ethernet-mtk_eth_soc-remove-incorrect-PLL-config.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-02-net-ethernet-mtk_eth_soc-remove-incorrect-PLL-config.patch
@@ -95,7 +95,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
                                /* mt7623_pad_clk_setup */
                                for (i = 0 ; i < NUM_TRGMII_CTRL; i++)
  
                                /* mt7623_pad_clk_setup */
                                for (i = 0 ; i < NUM_TRGMII_CTRL; i++)

-@@ -4286,13 +4258,19 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4289,13 +4261,19 @@ static int mtk_add_mac(struct mtk_eth *e

        mac->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
                MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;
  
        mac->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
                MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;
  


@@ -121,7 +121,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  
        if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_TRGMII) && !mac->id)
                __set_bit(PHY_INTERFACE_MODE_TRGMII,
  
        if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_TRGMII) && !mac->id)
                __set_bit(PHY_INTERFACE_MODE_TRGMII,

-@@ -4752,6 +4730,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4755,6 +4733,7 @@ static const struct mtk_soc_data mt7623_

        .offload_version = 1,
        .hash_offset = 2,
        .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,
        .offload_version = 1,
        .hash_offset = 2,
        .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,

diff --git a/target/linux/generic/backport-5.15/750-v6.5-03-net-ethernet-mtk_eth_soc-remove-mac_pcs_get_state-an.patch b/target/linux/generic/backport-5.15/750-v6.5-03-net-ethernet-mtk_eth_soc-remove-mac_pcs_get_state-an.patch
index 816f98ecc537cc37ca11332e125f33e6d0d93151..21ca0b1c08ca78a2a66f2be98432d38eda2bb82e 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-03-net-ethernet-mtk_eth_soc-remove-mac_pcs_get_state-an.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-03-net-ethernet-mtk_eth_soc-remove-mac_pcs_get_state-an.patch
@@ -70,7 +70,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        .mac_config = mtk_mac_config,
        .mac_finish = mtk_mac_finish,
        .mac_link_down = mtk_mac_link_down,
        .mac_config = mtk_mac_config,
        .mac_finish = mtk_mac_finish,
        .mac_link_down = mtk_mac_link_down,

-@@ -4253,8 +4220,6 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4256,8 +4223,6 @@ static int mtk_add_mac(struct mtk_eth *e

  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;
  
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;

diff --git a/target/linux/generic/backport-5.15/750-v6.5-05-net-ethernet-mtk_eth_soc-add-version-in-mtk_soc_data.patch b/target/linux/generic/backport-5.15/750-v6.5-05-net-ethernet-mtk_eth_soc-add-version-in-mtk_soc_data.patch
index d836acc4b04503f5255e74a486dff7482785de3e..d1d692002d12a4f29fd430efa85ecfb10a57c64d 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-05-net-ethernet-mtk_eth_soc-add-version-in-mtk_soc_data.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-05-net-ethernet-mtk_eth_soc-add-version-in-mtk_soc_data.patch
@@ -132,7 +132,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                        rxd->rxd5 = 0;
                        rxd->rxd6 = 0;
                        rxd->rxd7 = 0;
                        rxd->rxd5 = 0;
                        rxd->rxd6 = 0;
                        rxd->rxd7 = 0;

-@@ -2967,7 +2967,7 @@ static int mtk_start_dma(struct mtk_eth
+@@ -2970,7 +2970,7 @@ static int mtk_start_dma(struct mtk_eth

                       MTK_TX_BT_32DWORDS | MTK_NDP_CO_PRO |
                       MTK_RX_2B_OFFSET | MTK_TX_WB_DDONE;
  
                       MTK_TX_BT_32DWORDS | MTK_NDP_CO_PRO |
                       MTK_RX_2B_OFFSET | MTK_TX_WB_DDONE;
  


@@ -141,7 +141,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                        val |= MTK_MUTLI_CNT | MTK_RESV_BUF |
                               MTK_WCOMP_EN | MTK_DMAD_WR_WDONE |
                               MTK_CHK_DDONE_EN | MTK_LEAKY_BUCKET_EN;
                        val |= MTK_MUTLI_CNT | MTK_RESV_BUF |
                               MTK_WCOMP_EN | MTK_DMAD_WR_WDONE |
                               MTK_CHK_DDONE_EN | MTK_LEAKY_BUCKET_EN;

-@@ -3111,7 +3111,7 @@ static int mtk_open(struct net_device *d
+@@ -3114,7 +3114,7 @@ static int mtk_open(struct net_device *d

        phylink_start(mac->phylink);
        netif_tx_start_all_queues(dev);
  
        phylink_start(mac->phylink);
        netif_tx_start_all_queues(dev);
  


@@ -150,7 +150,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                return 0;
  
        if (mtk_uses_dsa(dev) && !eth->prog) {
                return 0;
  
        if (mtk_uses_dsa(dev) && !eth->prog) {

-@@ -3376,7 +3376,7 @@ static void mtk_hw_reset(struct mtk_eth
+@@ -3379,7 +3379,7 @@ static void mtk_hw_reset(struct mtk_eth

  {
        u32 val;
  
  {
        u32 val;
  


@@ -159,7 +159,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN, 0);
                val = RSTCTRL_PPE0_V2;
        } else {
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN, 0);
                val = RSTCTRL_PPE0_V2;
        } else {

-@@ -3388,7 +3388,7 @@ static void mtk_hw_reset(struct mtk_eth
+@@ -3391,7 +3391,7 @@ static void mtk_hw_reset(struct mtk_eth

  
        ethsys_reset(eth, RSTCTRL_ETH | RSTCTRL_FE | val);
  
  
        ethsys_reset(eth, RSTCTRL_ETH | RSTCTRL_FE | val);
  


@@ -168,7 +168,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
                             0x3ffffff);
  }
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
                             0x3ffffff);
  }

-@@ -3414,7 +3414,7 @@ static void mtk_hw_warm_reset(struct mtk
+@@ -3417,7 +3417,7 @@ static void mtk_hw_warm_reset(struct mtk

                return;
        }
  
                return;
        }
  


@@ -177,7 +177,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0_V2;
        else
                rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0;
                rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0_V2;
        else
                rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0;

-@@ -3584,7 +3584,7 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3587,7 +3587,7 @@ static int mtk_hw_init(struct mtk_eth *e

        else
                mtk_hw_reset(eth);
  
        else
                mtk_hw_reset(eth);
  


@@ -186,7 +186,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                /* Set FE to PDMAv2 if necessary */
                val = mtk_r32(eth, MTK_FE_GLO_MISC);
                mtk_w32(eth,  val | BIT(4), MTK_FE_GLO_MISC);
                /* Set FE to PDMAv2 if necessary */
                val = mtk_r32(eth, MTK_FE_GLO_MISC);
                mtk_w32(eth,  val | BIT(4), MTK_FE_GLO_MISC);

-@@ -3621,7 +3621,7 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3624,7 +3624,7 @@ static int mtk_hw_init(struct mtk_eth *e

         */
        val = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
        mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
         */
        val = mtk_r32(eth, MTK_CDMQ_IG_CTRL);
        mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);


@@ -195,7 +195,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                val = mtk_r32(eth, MTK_CDMP_IG_CTRL);
                mtk_w32(eth, val | MTK_CDMP_STAG_EN, MTK_CDMP_IG_CTRL);
  
                val = mtk_r32(eth, MTK_CDMP_IG_CTRL);
                mtk_w32(eth, val | MTK_CDMP_STAG_EN, MTK_CDMP_IG_CTRL);
  

-@@ -3643,7 +3643,7 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3646,7 +3646,7 @@ static int mtk_hw_init(struct mtk_eth *e

        mtk_w32(eth, eth->soc->txrx.rx_irq_done_mask, reg_map->qdma.int_grp + 4);
        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  
        mtk_w32(eth, eth->soc->txrx.rx_irq_done_mask, reg_map->qdma.int_grp + 4);
        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  


@@ -204,7 +204,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                /* PSE should not drop port8 and port9 packets from WDMA Tx */
                mtk_w32(eth, 0x00000300, PSE_DROP_CFG);
  
                /* PSE should not drop port8 and port9 packets from WDMA Tx */
                mtk_w32(eth, 0x00000300, PSE_DROP_CFG);
  

-@@ -4432,7 +4432,7 @@ static int mtk_probe(struct platform_dev
+@@ -4435,7 +4435,7 @@ static int mtk_probe(struct platform_dev

                }
        }
  
                }
        }
  


@@ -213,7 +213,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
                if (!res) {
                        err = -EINVAL;
                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
                if (!res) {
                        err = -EINVAL;

-@@ -4540,9 +4540,8 @@ static int mtk_probe(struct platform_dev
+@@ -4543,9 +4543,8 @@ static int mtk_probe(struct platform_dev

        }
  
        if (eth->soc->offload_version) {
        }
  
        if (eth->soc->offload_version) {


@@ -224,7 +224,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                num_ppe = min_t(u32, ARRAY_SIZE(eth->ppe), num_ppe);
                for (i = 0; i < num_ppe; i++) {
                        u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;
                num_ppe = min_t(u32, ARRAY_SIZE(eth->ppe), num_ppe);
                for (i = 0; i < num_ppe; i++) {
                        u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;

-@@ -4636,6 +4635,7 @@ static const struct mtk_soc_data mt2701_
+@@ -4639,6 +4638,7 @@ static const struct mtk_soc_data mt2701_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,


@@ -232,7 +232,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4652,6 +4652,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4655,6 +4655,7 @@ static const struct mtk_soc_data mt7621_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,


@@ -240,7 +240,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        .offload_version = 1,
        .hash_offset = 2,
        .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,
        .offload_version = 1,
        .hash_offset = 2,
        .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,

-@@ -4672,6 +4673,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4675,6 +4676,7 @@ static const struct mtk_soc_data mt7622_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,


@@ -248,7 +248,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        .offload_version = 2,
        .hash_offset = 2,
        .has_accounting = true,
        .offload_version = 2,
        .hash_offset = 2,
        .has_accounting = true,

-@@ -4692,6 +4694,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4695,6 +4697,7 @@ static const struct mtk_soc_data mt7623_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,


@@ -256,7 +256,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        .offload_version = 1,
        .hash_offset = 2,
        .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,
        .offload_version = 1,
        .hash_offset = 2,
        .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,

-@@ -4714,6 +4717,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4717,6 +4720,7 @@ static const struct mtk_soc_data mt7629_

        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,
        .has_accounting = true,
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,
        .has_accounting = true,


@@ -264,7 +264,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),

-@@ -4731,6 +4735,7 @@ static const struct mtk_soc_data mt7981_
+@@ -4734,6 +4738,7 @@ static const struct mtk_soc_data mt7981_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7981_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7981_CLKS_BITMAP,
        .required_pctl = false,


@@ -272,7 +272,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        .offload_version = 2,
        .hash_offset = 4,
        .has_accounting = true,
        .offload_version = 2,
        .hash_offset = 4,
        .has_accounting = true,

-@@ -4752,6 +4757,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4755,6 +4760,7 @@ static const struct mtk_soc_data mt7986_

        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,


@@ -280,7 +280,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        .offload_version = 2,
        .hash_offset = 4,
        .has_accounting = true,
        .offload_version = 2,
        .hash_offset = 4,
        .has_accounting = true,

-@@ -4772,6 +4778,7 @@ static const struct mtk_soc_data rt5350_
+@@ -4775,6 +4781,7 @@ static const struct mtk_soc_data rt5350_

        .hw_features = MTK_HW_FEATURES_MT7628,
        .required_clks = MT7628_CLKS_BITMAP,
        .required_pctl = false,
        .hw_features = MTK_HW_FEATURES_MT7628,
        .required_clks = MT7628_CLKS_BITMAP,
        .required_pctl = false,

diff --git a/target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch b/target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
index 58729cec5215106786b0fd5bcaeb327c4fee3774..281291252b45a55383be66ea56f14e230e93b4f0 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                             !eth->netdev[mac]))
                        goto release_desc;
  
                             !eth->netdev[mac]))
                        goto release_desc;
  

-@@ -2841,7 +2841,7 @@ static void mtk_dma_free(struct mtk_eth
+@@ -2844,7 +2844,7 @@ static void mtk_dma_free(struct mtk_eth

        const struct mtk_soc_data *soc = eth->soc;
        int i;
  
        const struct mtk_soc_data *soc = eth->soc;
        int i;
  


@@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                if (eth->netdev[i])
                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {
                if (eth->netdev[i])
                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {

-@@ -2995,8 +2995,13 @@ static void mtk_gdm_config(struct mtk_et
+@@ -2998,8 +2998,13 @@ static void mtk_gdm_config(struct mtk_et

        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
                return;
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
                return;
  


@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
                /* default setup the forward port to send frame to PDMA */
                val &= ~0xffff;
  
                /* default setup the forward port to send frame to PDMA */
                val &= ~0xffff;

-@@ -3006,7 +3011,7 @@ static void mtk_gdm_config(struct mtk_et
+@@ -3009,7 +3014,7 @@ static void mtk_gdm_config(struct mtk_et

  
                val |= config;
  
  
                val |= config;
  


@@ -87,7 +87,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                        val |= MTK_GDMA_SPECIAL_TAG;
  
                mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
                        val |= MTK_GDMA_SPECIAL_TAG;
  
                mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));

-@@ -3605,15 +3610,15 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3608,15 +3613,15 @@ static int mtk_hw_init(struct mtk_eth *e

         * up with the more appropriate value when mtk_mac_config call is being
         * invoked.
         */
         * up with the more appropriate value when mtk_mac_config call is being
         * invoked.
         */


@@ -109,7 +109,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        }
  
        /* Indicates CDM to parse the MTK special tag from CPU
        }
  
        /* Indicates CDM to parse the MTK special tag from CPU

-@@ -3793,7 +3798,7 @@ static void mtk_pending_work(struct work
+@@ -3796,7 +3801,7 @@ static void mtk_pending_work(struct work

        mtk_prepare_for_reset(eth);
  
        /* stop all devices to make sure that dma is properly shut down */
        mtk_prepare_for_reset(eth);
  
        /* stop all devices to make sure that dma is properly shut down */


@@ -118,7 +118,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                if (!eth->netdev[i] || !netif_running(eth->netdev[i]))
                        continue;
  
                if (!eth->netdev[i] || !netif_running(eth->netdev[i]))
                        continue;
  

-@@ -3809,8 +3814,8 @@ static void mtk_pending_work(struct work
+@@ -3812,8 +3817,8 @@ static void mtk_pending_work(struct work

        mtk_hw_init(eth, true);
  
        /* restart DMA and enable IRQs */
        mtk_hw_init(eth, true);
  
        /* restart DMA and enable IRQs */


@@ -129,7 +129,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                        continue;
  
                if (mtk_open(eth->netdev[i])) {
                        continue;
  
                if (mtk_open(eth->netdev[i])) {

-@@ -3837,7 +3842,7 @@ static int mtk_free_dev(struct mtk_eth *
+@@ -3840,7 +3845,7 @@ static int mtk_free_dev(struct mtk_eth *

  {
        int i;
  
  {
        int i;
  


@@ -138,7 +138,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                if (!eth->netdev[i])
                        continue;
                free_netdev(eth->netdev[i]);
                if (!eth->netdev[i])
                        continue;
                free_netdev(eth->netdev[i]);

-@@ -3856,7 +3861,7 @@ static int mtk_unreg_dev(struct mtk_eth
+@@ -3859,7 +3864,7 @@ static int mtk_unreg_dev(struct mtk_eth

  {
        int i;
  
  {
        int i;
  


@@ -147,7 +147,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                struct mtk_mac *mac;
                if (!eth->netdev[i])
                        continue;
                struct mtk_mac *mac;
                if (!eth->netdev[i])
                        continue;

-@@ -4157,7 +4162,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4160,7 +4165,7 @@ static int mtk_add_mac(struct mtk_eth *e

        }
  
        id = be32_to_cpup(_id);
        }
  
        id = be32_to_cpup(_id);


@@ -156,7 +156,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                dev_err(eth->dev, "%d is not a valid mac id\n", id);
                return -EINVAL;
        }
                dev_err(eth->dev, "%d is not a valid mac id\n", id);
                return -EINVAL;
        }

-@@ -4302,7 +4307,7 @@ void mtk_eth_set_dma_device(struct mtk_e
+@@ -4305,7 +4310,7 @@ void mtk_eth_set_dma_device(struct mtk_e

  
        rtnl_lock();
  
  
        rtnl_lock();
  


@@ -165,7 +165,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                dev = eth->netdev[i];
  
                if (!dev || !(dev->flags & IFF_UP))
                dev = eth->netdev[i];
  
                if (!dev || !(dev->flags & IFF_UP))

-@@ -4610,7 +4615,7 @@ static int mtk_remove(struct platform_de
+@@ -4613,7 +4618,7 @@ static int mtk_remove(struct platform_de

        int i;
  
        /* stop all devices to make sure that dma is properly shut down */
        int i;
  
        /* stop all devices to make sure that dma is properly shut down */

diff --git a/target/linux/generic/backport-5.15/750-v6.5-08-net-ethernet-mtk_eth_soc-add-NETSYS_V3-version-suppo.patch b/target/linux/generic/backport-5.15/750-v6.5-08-net-ethernet-mtk_eth_soc-add-NETSYS_V3-version-suppo.patch
index 09f59c291ce92d3fc95bcbd756c44893c53eb3da..abfda59339a1862c3ad47780947eb330894dc766 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-08-net-ethernet-mtk_eth_soc-add-NETSYS_V3-version-suppo.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-08-net-ethernet-mtk_eth_soc-add-NETSYS_V3-version-suppo.patch
@@ -167,7 +167,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
                        budget--;
                }
  
                        budget--;
                }

-@@ -3648,7 +3676,24 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3651,7 +3679,24 @@ static int mtk_hw_init(struct mtk_eth *e

        mtk_w32(eth, eth->soc->txrx.rx_irq_done_mask, reg_map->qdma.int_grp + 4);
        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  
        mtk_w32(eth, eth->soc->txrx.rx_irq_done_mask, reg_map->qdma.int_grp + 4);
        mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
  


@@ -193,7 +193,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                /* PSE should not drop port8 and port9 packets from WDMA Tx */
                mtk_w32(eth, 0x00000300, PSE_DROP_CFG);
  
                /* PSE should not drop port8 and port9 packets from WDMA Tx */
                mtk_w32(eth, 0x00000300, PSE_DROP_CFG);
  

-@@ -4210,7 +4255,11 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4213,7 +4258,11 @@ static int mtk_add_mac(struct mtk_eth *e

        }
        spin_lock_init(&mac->hw_stats->stats_lock);
        u64_stats_init(&mac->hw_stats->syncp);
        }
        spin_lock_init(&mac->hw_stats->stats_lock);
        u64_stats_init(&mac->hw_stats->syncp);

diff --git a/target/linux/generic/backport-5.15/750-v6.5-11-net-ethernet-mtk_eth_soc-add-basic-support-for-MT798.patch b/target/linux/generic/backport-5.15/750-v6.5-11-net-ethernet-mtk_eth_soc-add-basic-support-for-MT798.patch
index 028c28b1f74c5259fd2f1a6e8856e2cf147e4050..cc08ef133882b503ad5c20d3ab1b33a9654ba83a 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-11-net-ethernet-mtk_eth_soc-add-basic-support-for-MT798.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-11-net-ethernet-mtk_eth_soc-add-basic-support-for-MT798.patch
@@ -263,7 +263,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        data |= TX_DMA_SWC_V2 | QID_BITS_V2(info->qid);
        WRITE_ONCE(desc->txd4, data);
  
        data |= TX_DMA_SWC_V2 | QID_BITS_V2(info->qid);
        WRITE_ONCE(desc->txd4, data);
  

-@@ -4304,6 +4433,17 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4307,6 +4436,17 @@ static int mtk_add_mac(struct mtk_eth *e

                          mac->phylink_config.supported_interfaces);
        }
  
                          mac->phylink_config.supported_interfaces);
        }
  


@@ -281,7 +281,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        phylink = phylink_create(&mac->phylink_config,
                                 of_fwnode_handle(mac->of_node),
                                 phy_mode, &mtk_phylink_ops);
        phylink = phylink_create(&mac->phylink_config,
                                 of_fwnode_handle(mac->of_node),
                                 phy_mode, &mtk_phylink_ops);

-@@ -4826,6 +4966,24 @@ static const struct mtk_soc_data mt7986_
+@@ -4829,6 +4969,24 @@ static const struct mtk_soc_data mt7986_

        },
  };
  
        },
  };
  


@@ -306,7 +306,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static const struct mtk_soc_data rt5350_data = {
        .reg_map = &mt7628_reg_map,
        .caps = MT7628_CAPS,
  static const struct mtk_soc_data rt5350_data = {
        .reg_map = &mt7628_reg_map,
        .caps = MT7628_CAPS,

-@@ -4844,14 +5002,15 @@ static const struct mtk_soc_data rt5350_
+@@ -4847,14 +5005,15 @@ static const struct mtk_soc_data rt5350_

  };
  
  const struct of_device_id of_mtk_match[] = {
  };
  
  const struct of_device_id of_mtk_match[] = {

diff --git a/target/linux/generic/backport-5.15/750-v6.5-13-net-ethernet-mtk_eth_soc-enable-nft-hw-flowtable_off.patch b/target/linux/generic/backport-5.15/750-v6.5-13-net-ethernet-mtk_eth_soc-enable-nft-hw-flowtable_off.patch
index b32670d7a4960497ef9361b468b6ec8e1a04eb8c..ebfb1f0c35c45ea16649ec430a40d9e3fe581bb3 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-13-net-ethernet-mtk_eth_soc-enable-nft-hw-flowtable_off.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-13-net-ethernet-mtk_eth_soc-enable-nft-hw-flowtable_off.patch
@@ -18,7 +18,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4974,6 +4974,9 @@ static const struct mtk_soc_data mt7988_
+@@ -4977,6 +4977,9 @@ static const struct mtk_soc_data mt7988_

        .required_clks = MT7988_CLKS_BITMAP,
        .required_pctl = false,
        .version = 3,
        .required_clks = MT7988_CLKS_BITMAP,
        .required_pctl = false,
        .version = 3,

diff --git a/target/linux/generic/backport-5.15/750-v6.5-14-net-ethernet-mtk_eth_soc-support-per-flow-accounting.patch b/target/linux/generic/backport-5.15/750-v6.5-14-net-ethernet-mtk_eth_soc-support-per-flow-accounting.patch
index f314550af64c3153c5ac010710b9d4a009e266d0..aab3b848a6c7f8e4e3afa63b82cde07ae58524f3 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-14-net-ethernet-mtk_eth_soc-support-per-flow-accounting.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-14-net-ethernet-mtk_eth_soc-support-per-flow-accounting.patch
@@ -20,7 +20,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4976,6 +4976,7 @@ static const struct mtk_soc_data mt7988_
+@@ -4979,6 +4979,7 @@ static const struct mtk_soc_data mt7988_

        .version = 3,
        .offload_version = 2,
        .hash_offset = 4,
        .version = 3,
        .offload_version = 2,
        .hash_offset = 4,

diff --git a/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch b/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch
index 5f6651b7b02cf02e0a0e4cc5a053062f5cc3668c..2d750abb45ab8573e9948878a4d5457defce398e 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3538,19 +3538,34 @@ static void mtk_hw_reset(struct mtk_eth
+@@ -3541,19 +3541,34 @@ static void mtk_hw_reset(struct mtk_eth

  {
        u32 val;
  
  {
        u32 val;
  


@@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
                             0x3ffffff);
  }
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
                             0x3ffffff);
  }

-@@ -3576,13 +3591,21 @@ static void mtk_hw_warm_reset(struct mtk
+@@ -3579,13 +3594,21 @@ static void mtk_hw_warm_reset(struct mtk

                return;
        }
  
                return;
        }
  


@@ -83,7 +83,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, rst_mask, rst_mask);
  
  
        regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, rst_mask, rst_mask);
  

-@@ -3934,11 +3957,17 @@ static void mtk_prepare_for_reset(struct
+@@ -3937,11 +3960,17 @@ static void mtk_prepare_for_reset(struct

        u32 val;
        int i;
  
        u32 val;
        int i;
  


@@ -106,7 +106,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        /* adjust PPE configurations to prepare for reset */
        for (i = 0; i < ARRAY_SIZE(eth->ppe); i++)
  
        /* adjust PPE configurations to prepare for reset */
        for (i = 0; i < ARRAY_SIZE(eth->ppe); i++)

-@@ -3999,11 +4028,18 @@ static void mtk_pending_work(struct work
+@@ -4002,11 +4031,18 @@ static void mtk_pending_work(struct work

                }
        }
  
                }
        }
  

diff --git a/target/linux/generic/backport-5.15/750-v6.5-18-net-ethernet-mtk_eth_soc-add-support-for-in-SoC-SRAM.patch b/target/linux/generic/backport-5.15/750-v6.5-18-net-ethernet-mtk_eth_soc-add-support-for-in-SoC-SRAM.patch
index 67ba1a5f0a57cbb4c2733d4baa76f3de6e165912..52bd017300836bc4236c5474fa33df7f5c289a4a 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-18-net-ethernet-mtk_eth_soc-add-support-for-in-SoC-SRAM.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-18-net-ethernet-mtk_eth_soc-add-support-for-in-SoC-SRAM.patch
@@ -123,7 +123,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                dma_free_coherent(eth->dma_dev,
                                  ring->dma_size * eth->soc->txrx.rxd_size,
                                  ring->dma, ring->phys);
                dma_free_coherent(eth->dma_dev,
                                  ring->dma_size * eth->soc->txrx.rxd_size,
                                  ring->dma, ring->phys);

-@@ -3001,7 +3025,7 @@ static void mtk_dma_free(struct mtk_eth
+@@ -3004,7 +3028,7 @@ static void mtk_dma_free(struct mtk_eth

        for (i = 0; i < MTK_MAX_DEVS; i++)
                if (eth->netdev[i])
                        netdev_reset_queue(eth->netdev[i]);
        for (i = 0; i < MTK_MAX_DEVS; i++)
                if (eth->netdev[i])
                        netdev_reset_queue(eth->netdev[i]);


@@ -132,7 +132,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                dma_free_coherent(eth->dma_dev,
                                  MTK_QDMA_RING_SIZE * soc->txrx.txd_size,
                                  eth->scratch_ring, eth->phy_scratch_ring);
                dma_free_coherent(eth->dma_dev,
                                  MTK_QDMA_RING_SIZE * soc->txrx.txd_size,
                                  eth->scratch_ring, eth->phy_scratch_ring);

-@@ -3009,13 +3033,13 @@ static void mtk_dma_free(struct mtk_eth
+@@ -3012,13 +3036,13 @@ static void mtk_dma_free(struct mtk_eth

                eth->phy_scratch_ring = 0;
        }
        mtk_tx_clean(eth);
                eth->phy_scratch_ring = 0;
        }
        mtk_tx_clean(eth);


@@ -149,7 +149,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        }
  
        kfree(eth->scratch_head);
        }
  
        kfree(eth->scratch_head);

-@@ -4585,7 +4609,7 @@ static int mtk_sgmii_init(struct mtk_eth
+@@ -4588,7 +4612,7 @@ static int mtk_sgmii_init(struct mtk_eth

  
  static int mtk_probe(struct platform_device *pdev)
  {
  
  static int mtk_probe(struct platform_device *pdev)
  {


@@ -158,7 +158,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        struct device_node *mac_np;
        struct mtk_eth *eth;
        int err, i;
        struct device_node *mac_np;
        struct mtk_eth *eth;
        int err, i;

-@@ -4605,6 +4629,20 @@ static int mtk_probe(struct platform_dev
+@@ -4608,6 +4632,20 @@ static int mtk_probe(struct platform_dev

        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
                eth->ip_align = NET_IP_ALIGN;
  
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
                eth->ip_align = NET_IP_ALIGN;
  


@@ -179,7 +179,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        spin_lock_init(&eth->page_lock);
        spin_lock_init(&eth->tx_irq_lock);
        spin_lock_init(&eth->rx_irq_lock);
        spin_lock_init(&eth->page_lock);
        spin_lock_init(&eth->tx_irq_lock);
        spin_lock_init(&eth->rx_irq_lock);

-@@ -4668,6 +4706,18 @@ static int mtk_probe(struct platform_dev
+@@ -4671,6 +4709,18 @@ static int mtk_probe(struct platform_dev

                        err = -EINVAL;
                        goto err_destroy_sgmii;
                }
                        err = -EINVAL;
                        goto err_destroy_sgmii;
                }

diff --git a/target/linux/generic/backport-5.15/750-v6.5-19-net-ethernet-mtk_eth_soc-support-36-bit-DMA-addressi.patch b/target/linux/generic/backport-5.15/750-v6.5-19-net-ethernet-mtk_eth_soc-support-36-bit-DMA-addressi.patch
index 175db56c37bf8c29911fd0f5fba5fbf389895b67..26c5889545459b9427d202649f7c76408453bab8 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-19-net-ethernet-mtk_eth_soc-support-36-bit-DMA-addressi.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-19-net-ethernet-mtk_eth_soc-support-36-bit-DMA-addressi.patch
@@ -90,7 +90,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                                         ring->buf_size, DMA_FROM_DEVICE);
                        mtk_rx_put_buff(ring, ring->data[i], false);
                }
                                         ring->buf_size, DMA_FROM_DEVICE);
                        mtk_rx_put_buff(ring, ring->data[i], false);
                }

-@@ -4643,6 +4661,14 @@ static int mtk_probe(struct platform_dev
+@@ -4646,6 +4664,14 @@ static int mtk_probe(struct platform_dev

                }
        }
  
                }
        }
  

diff --git a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
index 96c89f41c48f7889728e03bde32777f2cee610c2..13a16b6fa0824044f19073e8b3ae495f286b45b3 100644 (file)
--- a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
+++ b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
@@ -105,7 +105,7 @@ Subject: [PATCH] kernel: add block fit partition parser
        /* everything is up and running, commence */
        err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
        if (err)
        /* everything is up and running, commence */
        err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
        if (err)

-@@ -598,6 +610,11 @@ static bool blk_add_partition(struct gen
+@@ -595,6 +607,11 @@ static bool blk_add_partition(struct gen

            (state->parts[p].flags & ADDPART_FLAG_RAID))
                md_autodetect_dev(part->bd_dev);
  
            (state->parts[p].flags & ADDPART_FLAG_RAID))
                md_autodetect_dev(part->bd_dev);
  

diff --git a/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch
index f61c078521e2cecba9e26e619f6d592dd82955f1..383dfe397ff432570529e7fbe3b0f7bca5d12f30 100644 (file)
--- a/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch
+++ b/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  #include <linux/crc32.h>
  #include <linux/if_vlan.h>
  #include <linux/uaccess.h>
  #include <linux/crc32.h>
  #include <linux/if_vlan.h>
  #include <linux/uaccess.h>

-@@ -6886,6 +6887,22 @@ static void rtl_tally_reset(struct r8152
+@@ -6889,6 +6890,22 @@ static void rtl_tally_reset(struct r8152

        ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
  }
  
        ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
  }
  


@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  static void r8152b_init(struct r8152 *tp)
  {
        u32 ocp_data;
  static void r8152b_init(struct r8152 *tp)
  {
        u32 ocp_data;

-@@ -6927,6 +6944,8 @@ static void r8152b_init(struct r8152 *tp
+@@ -6930,6 +6947,8 @@ static void r8152b_init(struct r8152 *tp

        ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
        ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
        ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
        ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
        ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
        ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);


@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  }
  
  static void r8153_init(struct r8152 *tp)
  }
  
  static void r8153_init(struct r8152 *tp)

-@@ -7067,6 +7086,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -7070,6 +7089,8 @@ static void r8153_init(struct r8152 *tp)

                tp->coalesce = COALESCE_SLOW;
                break;
        }
                tp->coalesce = COALESCE_SLOW;
                break;
        }


@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  }
  
  static void r8153b_init(struct r8152 *tp)
  }
  
  static void r8153b_init(struct r8152 *tp)

-@@ -7149,6 +7170,8 @@ static void r8153b_init(struct r8152 *tp
+@@ -7152,6 +7173,8 @@ static void r8153b_init(struct r8152 *tp

        rtl_tally_reset(tp);
  
        tp->coalesce = 15000;   /* 15 us */
        rtl_tally_reset(tp);
  
        tp->coalesce = 15000;   /* 15 us */

diff --git a/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch b/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
index 5c1ce01a2ce93d8d1507bc993cf2fd1aa4e7e8c1..11f4f556e86391280a2f68934d039b7844a9cc81 100644 (file)
--- a/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
@@ -77,7 +77,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
                                                          u32));
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
                                                          u32));
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,

-@@ -1986,9 +2000,11 @@ static void __sk_free(struct sock *sk)
+@@ -1987,9 +2001,11 @@ static void __sk_free(struct sock *sk)

        if (likely(sk->sk_net_refcnt))
                sock_inuse_add(sock_net(sk), -1);
  
        if (likely(sk->sk_net_refcnt))
                sock_inuse_add(sock_net(sk), -1);
  

diff --git a/target/linux/generic/hack-5.15/902-debloat_proc.patch b/target/linux/generic/hack-5.15/902-debloat_proc.patch
index 7528df483e52792305342ea2eccc1f3bd1564b58..58c2026c48e2c80b455933324f89e8ab6ff7eb0b 100644 (file)
--- a/target/linux/generic/hack-5.15/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.15/902-debloat_proc.patch
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!pe)
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
        if (!pe)
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c

-@@ -3968,6 +3968,8 @@ static const struct seq_operations vmall
+@@ -3986,6 +3986,8 @@ static const struct seq_operations vmall

  
  static int __init proc_vmalloc_init(void)
  {
  
  static int __init proc_vmalloc_init(void)
  {


@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c

-@@ -3880,6 +3880,8 @@ static __net_initdata struct pernet_oper
+@@ -3881,6 +3881,8 @@ static __net_initdata struct pernet_oper

  
  static int __init proto_init(void)
  {
  
  static int __init proto_init(void)
  {


@@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
  
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c

-@@ -3024,11 +3024,13 @@ static const struct seq_operations fib_r
+@@ -3025,11 +3025,13 @@ static const struct seq_operations fib_r

  
  int __net_init fib_proc_init(struct net *net)
  {
  
  int __net_init fib_proc_init(struct net *net)
  {


@@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                        fib_triestat_seq_show, NULL))
                goto out2;
  
                        fib_triestat_seq_show, NULL))
                goto out2;
  

-@@ -3039,17 +3041,21 @@ int __net_init fib_proc_init(struct net
+@@ -3040,17 +3042,21 @@ int __net_init fib_proc_init(struct net

        return 0;
  
  out3:
        return 0;
  
  out3:

diff --git a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
index d12bc9c3d59b6c8f8585f48d70c77b9496165cc4..0a12132de36b56ced4ed8bf0c90c5c8cade7625d 100644 (file)
--- a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
+++ b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
@@ -193,7 +193,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
        default y
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
        default y
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c

-@@ -1271,6 +1271,8 @@ static u8 spi_nor_convert_3to4_erase(u8
+@@ -1272,6 +1272,8 @@ static u8 spi_nor_convert_3to4_erase(u8

  
  static bool spi_nor_has_uniform_erase(const struct spi_nor *nor)
  {
  
  static bool spi_nor_has_uniform_erase(const struct spi_nor *nor)
  {


@@ -202,7 +202,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
        return !!nor->params->erase_map.uniform_erase_type;
  }
  
        return !!nor->params->erase_map.uniform_erase_type;
  }
  

-@@ -2400,6 +2402,7 @@ static int spi_nor_select_erase(struct s
+@@ -2401,6 +2403,7 @@ static int spi_nor_select_erase(struct s

  {
        struct spi_nor_erase_map *map = &nor->params->erase_map;
        const struct spi_nor_erase_type *erase = NULL;
  {
        struct spi_nor_erase_map *map = &nor->params->erase_map;
        const struct spi_nor_erase_type *erase = NULL;


@@ -210,7 +210,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
        struct mtd_info *mtd = &nor->mtd;
        u32 wanted_size = nor->info->sector_size;
        int i;
        struct mtd_info *mtd = &nor->mtd;
        u32 wanted_size = nor->info->sector_size;
        int i;

-@@ -2432,8 +2435,9 @@ static int spi_nor_select_erase(struct s
+@@ -2433,8 +2436,9 @@ static int spi_nor_select_erase(struct s

         */
        for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
                if (map->erase_type[i].size) {
         */
        for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
                if (map->erase_type[i].size) {


@@ -222,7 +222,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
                }
        }
  
                }
        }
  

-@@ -2441,6 +2445,9 @@ static int spi_nor_select_erase(struct s
+@@ -2442,6 +2446,9 @@ static int spi_nor_select_erase(struct s

                return -EINVAL;
  
        mtd->erasesize = erase->size;
                return -EINVAL;
  
        mtd->erasesize = erase->size;

diff --git a/target/linux/generic/pending-5.15/479-mtd-spi-nor-add-xtx-xt25f128b.patch b/target/linux/generic/pending-5.15/479-mtd-spi-nor-add-xtx-xt25f128b.patch
index 5a064b714bfdcd5b81f0345b6cb5945d15570017..3e1958c8a0926746a2144fdb60f41f5633c969c8 100644 (file)
--- a/target/linux/generic/pending-5.15/479-mtd-spi-nor-add-xtx-xt25f128b.patch
+++ b/target/linux/generic/pending-5.15/479-mtd-spi-nor-add-xtx-xt25f128b.patch
@@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +};
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
 +};
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c

-@@ -1859,6 +1859,7 @@ static const struct spi_nor_manufacturer
+@@ -1860,6 +1860,7 @@ static const struct spi_nor_manufacturer

        &spi_nor_winbond,
        &spi_nor_xilinx,
        &spi_nor_xmc,
        &spi_nor_winbond,
        &spi_nor_xilinx,
        &spi_nor_xmc,

diff --git a/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index 86bd9664e5555293a1a88efbe3ae0d1bcd34b18e..351d5864a1f8b11dfcaa16dd0a89984ca0294566 100644 (file)
--- a/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  static void rt_fibinfo_free(struct rtable __rcu **rtp)
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
  static void rt_fibinfo_free(struct rtable __rcu **rtp)
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c

-@@ -2772,6 +2772,7 @@ static const char *const rtn_type_names[
+@@ -2773,6 +2773,7 @@ static const char *const rtn_type_names[

        [RTN_THROW] = "THROW",
        [RTN_NAT] = "NAT",
        [RTN_XRESOLVE] = "XRESOLVE",
        [RTN_THROW] = "THROW",
        [RTN_NAT] = "NAT",
        [RTN_XRESOLVE] = "XRESOLVE",

diff --git a/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch b/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
index 2eb6dc133cf0394da7156065c63a8aebb82f75ee..67cff4d22bac1b245303333b53bca272c8e532f5 100644 (file)
--- a/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
+++ b/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -3096,8 +3096,8 @@ static irqreturn_t mtk_handle_irq_rx(int
+@@ -3099,8 +3099,8 @@ static irqreturn_t mtk_handle_irq_rx(int

  
        eth->rx_events++;
        if (likely(napi_schedule_prep(&eth->rx_napi))) {
  
        eth->rx_events++;
        if (likely(napi_schedule_prep(&eth->rx_napi))) {


@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        }
  
        return IRQ_HANDLED;
        }
  
        return IRQ_HANDLED;

-@@ -3109,8 +3109,8 @@ static irqreturn_t mtk_handle_irq_tx(int
+@@ -3112,8 +3112,8 @@ static irqreturn_t mtk_handle_irq_tx(int

  
        eth->tx_events++;
        if (likely(napi_schedule_prep(&eth->tx_napi))) {
  
        eth->tx_events++;
        if (likely(napi_schedule_prep(&eth->tx_napi))) {


@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        }
  
        return IRQ_HANDLED;
        }
  
        return IRQ_HANDLED;

-@@ -4884,6 +4884,8 @@ static int mtk_probe(struct platform_dev
+@@ -4887,6 +4887,8 @@ static int mtk_probe(struct platform_dev

         * for NAPI to work
         */
        init_dummy_netdev(&eth->dummy_dev);
         * for NAPI to work
         */
        init_dummy_netdev(&eth->dummy_dev);

diff --git a/target/linux/generic/pending-5.15/732-03-net-ethernet-mtk_eth_soc-fix-remaining-throughput-re.patch b/target/linux/generic/pending-5.15/732-03-net-ethernet-mtk_eth_soc-fix-remaining-throughput-re.patch
index 305d63d5b731f80b1ad983e9571c4450c7313aeb..cc6c9e91bf7294c8eba325aa8b3c91daf9b0ec39 100644 (file)
--- a/target/linux/generic/pending-5.15/732-03-net-ethernet-mtk_eth_soc-fix-remaining-throughput-re.patch
+++ b/target/linux/generic/pending-5.15/732-03-net-ethernet-mtk_eth_soc-fix-remaining-throughput-re.patch
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        switch (speed) {
        case SPEED_2500:
        case SPEED_1000:
        switch (speed) {
        case SPEED_2500:
        case SPEED_1000:

-@@ -3289,6 +3290,9 @@ found:
+@@ -3292,6 +3293,9 @@ found:

        if (dp->index >= MTK_QDMA_NUM_QUEUES)
                return NOTIFY_DONE;
  
        if (dp->index >= MTK_QDMA_NUM_QUEUES)
                return NOTIFY_DONE;
  

diff --git a/target/linux/generic/pending-5.15/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch b/target/linux/generic/pending-5.15/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
index cc5cf935fd95adcaa18f0255643501be83f48b99..b85b1364e181341bf0b6e8494670d1a8f85366c1 100644 (file)
--- a/target/linux/generic/pending-5.15/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
+++ b/target/linux/generic/pending-5.15/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
@@ -478,7 +478,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static const struct phylink_mac_ops mtk_phylink_ops = {
        .validate = phylink_generic_validate,
        .mac_select_pcs = mtk_mac_select_pcs,
  static const struct phylink_mac_ops mtk_phylink_ops = {
        .validate = phylink_generic_validate,
        .mac_select_pcs = mtk_mac_select_pcs,

-@@ -4559,8 +4673,21 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4562,8 +4676,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);
                phy_interface_zero(mac->phylink_config.supported_interfaces);
                __set_bit(PHY_INTERFACE_MODE_INTERNAL,
                          mac->phylink_config.supported_interfaces);


@@ -500,7 +500,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        phylink = phylink_create(&mac->phylink_config,
                                 of_fwnode_handle(mac->of_node),
                                 phy_mode, &mtk_phylink_ops);
        phylink = phylink_create(&mac->phylink_config,
                                 of_fwnode_handle(mac->of_node),
                                 phy_mode, &mtk_phylink_ops);

-@@ -4753,6 +4880,13 @@ static int mtk_probe(struct platform_dev
+@@ -4756,6 +4883,13 @@ static int mtk_probe(struct platform_dev

  
                if (err)
                        return err;
  
                if (err)
                        return err;

diff --git a/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch b/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
index f2bfd14b18de319f160da8458dcf3da860a9c29d..2a57a7ef03505aad4abec47ff39be336a8977e01 100644 (file)
--- a/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
+++ b/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch
@@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
 
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
 
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c

-@@ -4352,6 +4352,15 @@ int skb_gro_receive(struct sk_buff *p, s
+@@ -4358,6 +4358,15 @@ int skb_gro_receive(struct sk_buff *p, s

        if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
                return -E2BIG;
  
        if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush))
                return -E2BIG;
  

diff --git a/target/linux/mediatek/patches-5.15/436-drivers-mtd-spi-nor-Add-calibration-support-for-spi-.patch b/target/linux/mediatek/patches-5.15/436-drivers-mtd-spi-nor-Add-calibration-support-for-spi-.patch
index 25a7cd38614d2634b9ab730ba1957dcddef6a279..61712982fb26074ba08b4742ace81c7431e8c8be 100644 (file)
--- a/target/linux/mediatek/patches-5.15/436-drivers-mtd-spi-nor-Add-calibration-support-for-spi-.patch
+++ b/target/linux/mediatek/patches-5.15/436-drivers-mtd-spi-nor-Add-calibration-support-for-spi-.patch
@@ -26,7 +26,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
  
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c

-@@ -3060,6 +3060,18 @@ static void spi_nor_debugfs_init(struct
+@@ -3061,6 +3061,18 @@ static void spi_nor_debugfs_init(struct

                                         info->id_len, info->id);
  }
  
                                         info->id_len, info->id);
  }
  


@@ -45,7 +45,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
                                                       const char *name)
  {
  static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
                                                       const char *name)
  {

-@@ -3133,6 +3145,9 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3134,6 +3146,9 @@ int spi_nor_scan(struct spi_nor *nor, co

        if (!nor->bouncebuf)
                return -ENOMEM;
  
        if (!nor->bouncebuf)
                return -ENOMEM;
  

diff --git a/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 163bafdb2e5b346376ca519e6919fcd2c1f9e7fc..7db6346c37e4180d998ae82c0e2b92a015c6a36a 100644 (file)
--- a/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
 
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
 
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c

-@@ -3107,6 +3107,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3108,6 +3108,7 @@ int spi_nor_scan(struct spi_nor *nor, co

        struct device *dev = nor->dev;
        struct mtd_info *mtd = &nor->mtd;
        struct device_node *np = spi_nor_get_flash_node(nor);
        struct device *dev = nor->dev;
        struct mtd_info *mtd = &nor->mtd;
        struct device_node *np = spi_nor_get_flash_node(nor);


@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
        int ret;
        int i;
  
        int ret;
        int i;
  

-@@ -3161,7 +3162,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3162,7 +3163,12 @@ int spi_nor_scan(struct spi_nor *nor, co

        if (ret)
                return ret;
  
        if (ret)
                return ret;
  

diff --git a/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch b/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
index 4fd05fe64ed74e0d030477a61141b48599082762..4cbb84efc6ca7a770ef7a6aa2022127186f419d0 100644 (file)
--- a/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
+++ b/target/linux/ramips/patches-5.15/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
@@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 +};
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
 +};
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c

-@@ -1843,6 +1843,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
+@@ -1844,6 +1844,7 @@ int spi_nor_sr2_bit7_quad_enable(struct

  
  static const struct spi_nor_manufacturer *manufacturers[] = {
        &spi_nor_atmel,
  
  static const struct spi_nor_manufacturer *manufacturers[] = {
        &spi_nor_atmel,

diff --git a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
index 632e66eab470fe7dbe228a2ac2343d296319dc91..ff492e7f6c7d37d25f4faea2709b1fbb2002d690 100644 (file)
--- a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
+++ b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
@@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4554,6 +4554,7 @@ static const struct net_device_ops mtk_n
+@@ -4557,6 +4557,7 @@ static const struct net_device_ops mtk_n

  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  {
  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  {


@@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        const __be32 *_id = of_get_property(np, "reg", NULL);
        phy_interface_t phy_mode;
        struct phylink *phylink;
        const __be32 *_id = of_get_property(np, "reg", NULL);
        phy_interface_t phy_mode;
        struct phylink *phylink;

-@@ -4725,6 +4726,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4728,6 +4729,9 @@ static int mtk_add_mac(struct mtk_eth *e

                register_netdevice_notifier(&mac->device_notifier);
        }
  
                register_netdevice_notifier(&mac->device_notifier);
        }
  

diff --git a/target/linux/realtek/patches-5.15/318-add-rtl83xx-clk-support.patch b/target/linux/realtek/patches-5.15/318-add-rtl83xx-clk-support.patch
index c63c165cd28449d6eb6b7ba33b96c91f80b65183..7d063d4faaa3dfd83a56a0db59471f4cacc117fc 100644 (file)
--- a/target/linux/realtek/patches-5.15/318-add-rtl83xx-clk-support.patch
+++ b/target/linux/realtek/patches-5.15/318-add-rtl83xx-clk-support.patch
@@ -13,7 +13,7 @@ Submitted-by: Markus Stockhausen <markus.stockhausen@gmx.de>
 
 --- a/drivers/clk/Kconfig
 +++ b/drivers/clk/Kconfig
 
 --- a/drivers/clk/Kconfig
 +++ b/drivers/clk/Kconfig

-@@ -405,6 +405,7 @@ source "drivers/clk/mstar/Kconfig"
+@@ -406,6 +406,7 @@ source "drivers/clk/mstar/Kconfig"

  source "drivers/clk/mvebu/Kconfig"
  source "drivers/clk/pistachio/Kconfig"
  source "drivers/clk/qcom/Kconfig"
  source "drivers/clk/mvebu/Kconfig"
  source "drivers/clk/pistachio/Kconfig"
  source "drivers/clk/qcom/Kconfig"

diff --git a/target/linux/uml/patches-5.15/102-pseudo-random-mac.patch b/target/linux/uml/patches-5.15/102-pseudo-random-mac.patch
index 045d2d0dbd9ae3788515d5547d54d182e606337a..6806bb8a8a62948c9accf83d54e8ee90d96a2112 100644 (file)
--- a/target/linux/uml/patches-5.15/102-pseudo-random-mac.patch
+++ b/target/linux/uml/patches-5.15/102-pseudo-random-mac.patch
@@ -11,7 +11,7 @@ Applies to vanilla kernel 3.9.4.
 ===============================================================================
 --- a/arch/um/drivers/Kconfig
 +++ b/arch/um/drivers/Kconfig
 ===============================================================================
 --- a/arch/um/drivers/Kconfig
 +++ b/arch/um/drivers/Kconfig

-@@ -146,6 +146,20 @@ config UML_NET
+@@ -136,6 +136,20 @@ config UML_NET

          enable at least one of the following transport options to actually
          make use of UML networking.
  
          enable at least one of the following transport options to actually
          make use of UML networking.