kernel: bump 4.9 to 4.9.96
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Tue, 24 Apr 2018 12:19:43 +0000 (12:19 +0000)
committerMathias Kresin <dev@kresin.me>
Thu, 26 Apr 2018 06:53:54 +0000 (08:53 +0200)
Refresh patches, following required reworking:

ar71xx/patches-4.9/930-chipidea-pullup.patch
layerscape/patches-4.9/302-dts-support-layercape.patch
sunxi/patches-4.9/0052-stmmac-form-4-12.patch

Fixes for CVEs:
CVE-2018-1108
CVE-2018-1092

Tested on: ar71xx Archer C7 v2

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Tested-by: Arjen de Korte <build+openwrt@de-korte.org>
46 files changed:
include/kernel-version.mk
target/linux/ar71xx/patches-4.9/432-spi-rb4xx-spi-driver.patch
target/linux/ar71xx/patches-4.9/433-spi-rb4xx-cpld-driver.patch
target/linux/ar71xx/patches-4.9/435-spi-vsc7385_driver.patch
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
target/linux/ar71xx/patches-4.9/930-chipidea-pullup.patch
target/linux/ath25/patches-4.9/130-watchdog.patch
target/linux/bcm53xx/patches-4.9/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
target/linux/brcm2708/patches-4.9/950-0021-clk-bcm2835-Mark-GPIO-clocks-enabled-at-boot-as-crit.patch
target/linux/brcm2708/patches-4.9/950-0026-Register-the-clocks-early-during-the-boot-process.patch
target/linux/brcm2708/patches-4.9/950-0139-usb-dwc2-Avoid-suspending-if-we-re-in-gadget-mode-18.patch
target/linux/brcm2708/patches-4.9/950-0152-clk-bcm-Support-rate-change-propagation-on-bcm2835-c.patch
target/linux/brcm2708/patches-4.9/950-0153-clk-bcm-Allow-rate-change-propagation-to-PLLH_AUX-on.patch
target/linux/brcm2708/patches-4.9/950-0154-clk-bcm-Fix-maybe-uninitialized-warning-in-bcm2835_c.patch
target/linux/brcm2708/patches-4.9/950-0155-clk-bcm2835-Don-t-rate-change-PLLs-on-behalf-of-DSI-.patch
target/linux/brcm2708/patches-4.9/950-0156-clk-bcm2835-Register-the-DSI0-DSI1-pixel-clocks.patch
target/linux/brcm2708/patches-4.9/950-0157-clk-bcm2835-Add-leaf-clock-measurement-support-disab.patch
target/linux/brcm2708/patches-4.9/950-0185-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch
target/linux/brcm47xx/patches-4.9/831-old_gpio_wdt.patch
target/linux/generic/backport-4.9/050-usb-dwc2-Remove-unnecessary-kfree.patch
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
target/linux/generic/hack-4.9/204-module_strip.patch
target/linux/generic/hack-4.9/902-debloat_proc.patch
target/linux/generic/pending-4.9/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
target/linux/generic/pending-4.9/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
target/linux/generic/pending-4.9/701-phy_extension.patch
target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch
target/linux/generic/pending-4.9/920-mangle_bootargs.patch
target/linux/ipq806x/patches-4.9/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
target/linux/lantiq/patches-4.9/0026-NET-multi-phy-support.patch
target/linux/lantiq/patches-4.9/0090-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-contro.patch
target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch
target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch
target/linux/layerscape/patches-4.9/302-dts-support-layercape.patch
target/linux/layerscape/patches-4.9/401-mtd-spi-nor-support-layerscape.patch
target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
target/linux/layerscape/patches-4.9/803-cpufreq-support-layerscape.patch
target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch
target/linux/layerscape/patches-4.9/813-qe-support-layerscape.patch
target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch
target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
target/linux/sunxi/patches-4.9/0052-stmmac-form-4-12.patch

index 3e9ddaa..9191bdd 100644 (file)
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .71
 LINUX_VERSION-4.4 = .121
-LINUX_VERSION-4.9 = .91
+LINUX_VERSION-4.9 = .96
 LINUX_VERSION-4.14 = .34
 
 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
 LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
-LINUX_KERNEL_HASH-4.9.91 = 60caa752ec9fa1c426f6a2f37db3f268d0961b67a723b6443949112167b39832
+LINUX_KERNEL_HASH-4.9.96 = 826f596eb5197f8b17304649c2990dd7b766f5c79076cae79f4261c40cea877f
 LINUX_KERNEL_HASH-4.14.34 = 782b6c4c85275c382c820e1934d3e6003ef468f43cfc5e7c22bc07c331a12bb9
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
index 5428d3d..e896d0b 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
-@@ -534,6 +534,12 @@ config SPI_QUP
+@@ -533,6 +533,12 @@ config SPI_QUP
          This driver can also be built as a module.  If so, the module
          will be called spi_qup.
  
index b1cd6a5..c44acab 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
-@@ -762,6 +762,13 @@ config SPI_TLE62X0
+@@ -761,6 +761,13 @@ config SPI_TLE62X0
          sysfs interface, with each line presented as a kind of GPIO
          exposing both switch control and diagnostic feedback.
  
index fe6acde..f9f1f7a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
-@@ -769,6 +769,11 @@ config SPI_RB4XX_CPLD
+@@ -768,6 +768,11 @@ config SPI_RB4XX_CPLD
          SPI driver for the Xilinx CPLD chip present on the
          MikroTik RB4xx boards.
  
index 464a930..4c59876 100644 (file)
                case IPV6_2292HOPOPTS:
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
-@@ -395,7 +395,7 @@ static void ip6gre_err(struct sk_buff *s
+@@ -397,7 +397,7 @@ static void ip6gre_err(struct sk_buff *s
                return;
        ipv6h = (const struct ipv6hdr *)skb->data;
        greh = (const struct gre_base_hdr *)(skb->data + offset);
  
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3892,14 +3892,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3894,14 +3894,16 @@ static bool tcp_parse_aligned_timestamp(
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  
index ce31595..1c4ef38 100644 (file)
@@ -22,7 +22,7 @@
  {
        ci_hdrc_gadget_destroy(ci);
        ci_hdrc_host_destroy(ci);
--      if (ci->is_otg)
+-      if (ci->is_otg && ci->roles[CI_ROLE_GADGET])
 +      if (!ci->dp_always_pullup && ci->roles[CI_ROLE_GADGET])
                ci_hdrc_otg_destroy(ci);
  }
@@ -37,8 +37,8 @@
        ret = hw_device_init(ci, base);
        if (ret < 0) {
                dev_err(dev, "can't initialize hardware\n");
-@@ -955,7 +958,7 @@ static int ci_hdrc_probe(struct platform
-               goto deinit_phy;
+@@ -963,7 +966,7 @@ static int ci_hdrc_probe(struct platform
+               goto deinit_gadget;
        }
  
 -      if (ci->is_otg && ci->roles[CI_ROLE_GADGET]) {
index fef3ac0..7009dd9 100644 (file)
 +MODULE_ALIAS("platform:" DRIVER_NAME);
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1554,6 +1554,13 @@ config PIC32_DMT
+@@ -1555,6 +1555,13 @@ config PIC32_DMT
          To compile this driver as a loadable module, choose M here.
          The module will be called pic32-dmt.
  
index 665c978..caed9ec 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1190,6 +1190,18 @@ static const struct flash_info *spi_nor_
+@@ -1194,6 +1194,18 @@ static const struct flash_info *spi_nor_
        }
        dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
                id[0], id[1], id[2]);
index 152f9ab..fc66261 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1266,6 +1266,15 @@ static struct clk_hw *bcm2835_register_c
+@@ -1268,6 +1268,15 @@ static struct clk_hw *bcm2835_register_c
        init.name = data->name;
        init.flags = data->flags | CLK_IGNORE_UNUSED;
  
index be69c17..ec174b0 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
 
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1907,8 +1907,15 @@ static int bcm2835_clk_probe(struct plat
+@@ -1909,8 +1909,15 @@ static int bcm2835_clk_probe(struct plat
        if (ret)
                return ret;
  
@@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
  }
  
  static const struct of_device_id bcm2835_clk_of_match[] = {
-@@ -1925,7 +1932,11 @@ static struct platform_driver bcm2835_cl
+@@ -1927,7 +1934,11 @@ static struct platform_driver bcm2835_cl
        .probe          = bcm2835_clk_probe,
  };
  
index 50e1f47..9f6049b 100644 (file)
@@ -39,7 +39,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
 
 --- a/drivers/usb/dwc2/hcd.c
 +++ b/drivers/usb/dwc2/hcd.c
-@@ -4366,6 +4366,9 @@ static int _dwc2_hcd_suspend(struct usb_
+@@ -4369,6 +4369,9 @@ static int _dwc2_hcd_suspend(struct usb_
        if (!HCD_HW_ACCESSIBLE(hcd))
                goto unlock;
  
index d8617dd..0fa32dc 100644 (file)
@@ -34,7 +34,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        u32 ctl_reg;
        u32 div_reg;
  
-@@ -1021,10 +1024,60 @@ bcm2835_clk_is_pllc(struct clk_hw *hw)
+@@ -1023,10 +1026,60 @@ bcm2835_clk_is_pllc(struct clk_hw *hw)
        return strncmp(clk_hw_get_name(hw), "pllc", 4) == 0;
  }
  
@@ -96,7 +96,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        struct clk_hw *parent, *best_parent = NULL;
        bool current_parent_is_pllc;
        unsigned long rate, best_rate = 0;
-@@ -1052,9 +1105,8 @@ static int bcm2835_clock_determine_rate(
+@@ -1054,9 +1107,8 @@ static int bcm2835_clock_determine_rate(
                if (bcm2835_clk_is_pllc(parent) && !current_parent_is_pllc)
                        continue;
  
@@ -108,7 +108,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
                if (rate > best_rate && rate <= req->rate) {
                        best_parent = parent;
                        best_prate = prate;
-@@ -1275,6 +1327,13 @@ static struct clk_hw *bcm2835_register_c
+@@ -1277,6 +1329,13 @@ static struct clk_hw *bcm2835_register_c
        if ((cprman_read(cprman, data->ctl_reg) & CM_ENABLE) == 0)
                init.flags &= ~CLK_IS_CRITICAL;
  
index 57517a9..bab7161 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
 
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1874,7 +1874,12 @@ static const struct bcm2835_clk_desc clk
+@@ -1876,7 +1876,12 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_VECCTL,
                .div_reg = CM_VECDIV,
                .int_bits = 4,
index 4ed9911..a40245b 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
 
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1033,7 +1033,7 @@ static unsigned long bcm2835_clock_choos
+@@ -1035,7 +1035,7 @@ static unsigned long bcm2835_clock_choos
        struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
        struct bcm2835_cprman *cprman = clock->cprman;
        const struct bcm2835_clock_data *data = clock->data;
index 1382204..842e576 100644 (file)
@@ -31,7 +31,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  };
  
  struct bcm2835_clock_data {
-@@ -1256,7 +1257,7 @@ bcm2835_register_pll_divider(struct bcm2
+@@ -1258,7 +1259,7 @@ bcm2835_register_pll_divider(struct bcm2
        init.num_parents = 1;
        init.name = divider_name;
        init.ops = &bcm2835_pll_divider_clk_ops;
@@ -40,7 +40,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        divider = devm_kzalloc(cprman->dev, sizeof(*divider), GFP_KERNEL);
        if (!divider)
-@@ -1479,7 +1480,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1481,7 +1482,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLA_CORE,
                .load_mask = CM_PLLA_LOADCORE,
                .hold_mask = CM_PLLA_HOLDCORE,
@@ -50,7 +50,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLA_PER]      = REGISTER_PLL_DIV(
                .name = "plla_per",
                .source_pll = "plla",
-@@ -1487,7 +1489,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1489,7 +1491,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLA_PER,
                .load_mask = CM_PLLA_LOADPER,
                .hold_mask = CM_PLLA_HOLDPER,
@@ -60,7 +60,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLA_DSI0]     = REGISTER_PLL_DIV(
                .name = "plla_dsi0",
                .source_pll = "plla",
-@@ -1503,7 +1506,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1505,7 +1508,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLA_CCP2,
                .load_mask = CM_PLLA_LOADCCP2,
                .hold_mask = CM_PLLA_HOLDCCP2,
@@ -70,7 +70,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* PLLB is used for the ARM's clock. */
        [BCM2835_PLLB]          = REGISTER_PLL(
-@@ -1527,7 +1531,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1529,7 +1533,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLB_ARM,
                .load_mask = CM_PLLB_LOADARM,
                .hold_mask = CM_PLLB_HOLDARM,
@@ -80,7 +80,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /*
         * PLLC is the core PLL, used to drive the core VPU clock.
-@@ -1556,7 +1561,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1558,7 +1563,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLC_CORE0,
                .load_mask = CM_PLLC_LOADCORE0,
                .hold_mask = CM_PLLC_HOLDCORE0,
@@ -90,7 +90,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLC_CORE1]    = REGISTER_PLL_DIV(
                .name = "pllc_core1",
                .source_pll = "pllc",
-@@ -1564,7 +1570,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1566,7 +1572,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLC_CORE1,
                .load_mask = CM_PLLC_LOADCORE1,
                .hold_mask = CM_PLLC_HOLDCORE1,
@@ -100,7 +100,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLC_CORE2]    = REGISTER_PLL_DIV(
                .name = "pllc_core2",
                .source_pll = "pllc",
-@@ -1572,7 +1579,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1574,7 +1581,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLC_CORE2,
                .load_mask = CM_PLLC_LOADCORE2,
                .hold_mask = CM_PLLC_HOLDCORE2,
@@ -110,7 +110,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLC_PER]      = REGISTER_PLL_DIV(
                .name = "pllc_per",
                .source_pll = "pllc",
-@@ -1580,7 +1588,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1582,7 +1590,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLC_PER,
                .load_mask = CM_PLLC_LOADPER,
                .hold_mask = CM_PLLC_HOLDPER,
@@ -120,7 +120,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /*
         * PLLD is the display PLL, used to drive DSI display panels.
-@@ -1609,7 +1618,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1611,7 +1620,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLD_CORE,
                .load_mask = CM_PLLD_LOADCORE,
                .hold_mask = CM_PLLD_HOLDCORE,
@@ -130,7 +130,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLD_PER]      = REGISTER_PLL_DIV(
                .name = "plld_per",
                .source_pll = "plld",
-@@ -1617,7 +1627,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1619,7 +1629,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLD_PER,
                .load_mask = CM_PLLD_LOADPER,
                .hold_mask = CM_PLLD_HOLDPER,
@@ -140,7 +140,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLD_DSI0]     = REGISTER_PLL_DIV(
                .name = "plld_dsi0",
                .source_pll = "plld",
-@@ -1662,7 +1673,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1664,7 +1675,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLH_RCAL,
                .load_mask = CM_PLLH_LOADRCAL,
                .hold_mask = 0,
@@ -150,7 +150,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLH_AUX]      = REGISTER_PLL_DIV(
                .name = "pllh_aux",
                .source_pll = "pllh",
-@@ -1670,7 +1682,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1672,7 +1684,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLH_AUX,
                .load_mask = CM_PLLH_LOADAUX,
                .hold_mask = 0,
@@ -160,7 +160,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_PLLH_PIX]      = REGISTER_PLL_DIV(
                .name = "pllh_pix",
                .source_pll = "pllh",
-@@ -1678,7 +1691,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1680,7 +1693,8 @@ static const struct bcm2835_clk_desc clk
                .a2w_reg = A2W_PLLH_PIX,
                .load_mask = CM_PLLH_LOADPIX,
                .hold_mask = 0,
index 61fae23..0a06cab 100644 (file)
@@ -76,7 +76,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* Must be last */
        struct clk_hw_onecell_data onecell;
-@@ -911,6 +932,9 @@ static long bcm2835_clock_rate_from_divi
+@@ -913,6 +934,9 @@ static long bcm2835_clock_rate_from_divi
        const struct bcm2835_clock_data *data = clock->data;
        u64 temp;
  
@@ -86,7 +86,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        /*
         * The divisor is a 12.12 fixed point field, but only some of
         * the bits are populated in any given clock.
-@@ -934,7 +958,12 @@ static unsigned long bcm2835_clock_get_r
+@@ -936,7 +960,12 @@ static unsigned long bcm2835_clock_get_r
        struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
        struct bcm2835_cprman *cprman = clock->cprman;
        const struct bcm2835_clock_data *data = clock->data;
@@ -100,7 +100,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        return bcm2835_clock_rate_from_divisor(clock, parent_rate, div);
  }
-@@ -1213,7 +1242,7 @@ static struct clk_hw *bcm2835_register_p
+@@ -1215,7 +1244,7 @@ static struct clk_hw *bcm2835_register_p
        memset(&init, 0, sizeof(init));
  
        /* All of the PLLs derive from the external oscillator. */
@@ -109,7 +109,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        init.num_parents = 1;
        init.name = data->name;
        init.ops = &bcm2835_pll_clk_ops;
-@@ -1299,18 +1328,22 @@ static struct clk_hw *bcm2835_register_c
+@@ -1301,18 +1330,22 @@ static struct clk_hw *bcm2835_register_c
        struct bcm2835_clock *clock;
        struct clk_init_data init;
        const char *parents[1 << CM_SRC_BITS];
@@ -139,7 +139,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        }
  
        memset(&init, 0, sizeof(init));
-@@ -1446,6 +1479,47 @@ static const char *const bcm2835_clock_v
+@@ -1448,6 +1481,47 @@ static const char *const bcm2835_clock_v
        __VA_ARGS__)
  
  /*
@@ -187,7 +187,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
   * the real definition of all the pll, pll_dividers and clocks
   * these make use of the above REGISTER_* macros
   */
-@@ -1908,6 +1982,18 @@ static const struct bcm2835_clk_desc clk
+@@ -1910,6 +1984,18 @@ static const struct bcm2835_clk_desc clk
                .div_reg = CM_DSI1EDIV,
                .int_bits = 4,
                .frac_bits = 8),
@@ -206,7 +206,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* the gates */
  
-@@ -1966,8 +2052,19 @@ static int bcm2835_clk_probe(struct plat
+@@ -1968,8 +2054,19 @@ static int bcm2835_clk_probe(struct plat
        if (IS_ERR(cprman->regs))
                return PTR_ERR(cprman->regs);
  
index f419086..d10f600 100644 (file)
@@ -107,7 +107,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  };
  
  struct bcm2835_gate_data {
-@@ -1012,6 +1071,17 @@ static int bcm2835_clock_on(struct clk_h
+@@ -1014,6 +1073,17 @@ static int bcm2835_clock_on(struct clk_h
                     CM_GATE);
        spin_unlock(&cprman->regs_lock);
  
@@ -125,7 +125,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        return 0;
  }
  
-@@ -1778,7 +1848,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1780,7 +1850,8 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_OTPCTL,
                .div_reg = CM_OTPDIV,
                .int_bits = 4,
@@ -135,7 +135,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        /*
         * Used for a 1Mhz clock for the system clocksource, and also used
         * bythe watchdog timer and the camera pulse generator.
-@@ -1812,13 +1883,15 @@ static const struct bcm2835_clk_desc clk
+@@ -1814,13 +1885,15 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_H264CTL,
                .div_reg = CM_H264DIV,
                .int_bits = 4,
@@ -153,7 +153,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /*
         * Secondary SDRAM clock.  Used for low-voltage modes when the PLL
-@@ -1829,13 +1902,15 @@ static const struct bcm2835_clk_desc clk
+@@ -1831,13 +1904,15 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_SDCCTL,
                .div_reg = CM_SDCDIV,
                .int_bits = 6,
@@ -171,7 +171,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        /*
         * VPU clock.  This doesn't have an enable bit, since it drives
         * the bus for everything else, and is special so it doesn't need
-@@ -1849,7 +1924,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1851,7 +1926,8 @@ static const struct bcm2835_clk_desc clk
                .int_bits = 12,
                .frac_bits = 8,
                .flags = CLK_IS_CRITICAL,
@@ -181,7 +181,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* clocks with per parent mux */
        [BCM2835_CLOCK_AVEO]    = REGISTER_PER_CLK(
-@@ -1857,19 +1933,22 @@ static const struct bcm2835_clk_desc clk
+@@ -1859,19 +1935,22 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_AVEOCTL,
                .div_reg = CM_AVEODIV,
                .int_bits = 4,
@@ -207,7 +207,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_CLOCK_DFT]     = REGISTER_PER_CLK(
                .name = "dft",
                .ctl_reg = CM_DFTCTL,
-@@ -1881,7 +1960,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1883,7 +1962,8 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_DPICTL,
                .div_reg = CM_DPIDIV,
                .int_bits = 4,
@@ -217,7 +217,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* Arasan EMMC clock */
        [BCM2835_CLOCK_EMMC]    = REGISTER_PER_CLK(
-@@ -1889,7 +1969,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1891,7 +1971,8 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_EMMCCTL,
                .div_reg = CM_EMMCDIV,
                .int_bits = 4,
@@ -227,7 +227,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* General purpose (GPIO) clocks */
        [BCM2835_CLOCK_GP0]     = REGISTER_PER_CLK(
-@@ -1898,7 +1979,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1900,7 +1981,8 @@ static const struct bcm2835_clk_desc clk
                .div_reg = CM_GP0DIV,
                .int_bits = 12,
                .frac_bits = 12,
@@ -237,7 +237,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_CLOCK_GP1]     = REGISTER_PER_CLK(
                .name = "gp1",
                .ctl_reg = CM_GP1CTL,
-@@ -1906,7 +1988,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1908,7 +1990,8 @@ static const struct bcm2835_clk_desc clk
                .int_bits = 12,
                .frac_bits = 12,
                .flags = CLK_IS_CRITICAL,
@@ -247,7 +247,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
        [BCM2835_CLOCK_GP2]     = REGISTER_PER_CLK(
                .name = "gp2",
                .ctl_reg = CM_GP2CTL,
-@@ -1921,40 +2004,46 @@ static const struct bcm2835_clk_desc clk
+@@ -1923,40 +2006,46 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_HSMCTL,
                .div_reg = CM_HSMDIV,
                .int_bits = 4,
@@ -300,7 +300,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* TV encoder clock.  Only operating frequency is 108Mhz.  */
        [BCM2835_CLOCK_VEC]     = REGISTER_PER_CLK(
-@@ -1967,7 +2056,8 @@ static const struct bcm2835_clk_desc clk
+@@ -1969,7 +2058,8 @@ static const struct bcm2835_clk_desc clk
                 * Allow rate change propagation only on PLLH_AUX which is
                 * assigned index 7 in the parent array.
                 */
@@ -310,7 +310,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
        /* dsi clocks */
        [BCM2835_CLOCK_DSI0E]   = REGISTER_PER_CLK(
-@@ -1975,25 +2065,29 @@ static const struct bcm2835_clk_desc clk
+@@ -1977,25 +2067,29 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_DSI0ECTL,
                .div_reg = CM_DSI0EDIV,
                .int_bits = 4,
index c8e7151..a8e5e1b 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1370,6 +1370,11 @@ bcm2835_register_pll_divider(struct bcm2
+@@ -1372,6 +1372,11 @@ bcm2835_register_pll_divider(struct bcm2
        divider->div.hw.init = &init;
        divider->div.table = NULL;
  
index 09d449a..021f752 100644 (file)
@@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
                cma-192 = <0>,"-0+1-2-3-4";
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1302,6 +1302,8 @@ static const struct clk_ops bcm2835_vpu_
+@@ -1304,6 +1304,8 @@ static const struct clk_ops bcm2835_vpu_
        .debug_init = bcm2835_clock_debug_init,
  };
  
@@ -57,7 +57,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
                                           const struct bcm2835_pll_data *data)
  {
-@@ -1318,6 +1320,9 @@ static struct clk_hw *bcm2835_register_p
+@@ -1320,6 +1322,9 @@ static struct clk_hw *bcm2835_register_p
        init.ops = &bcm2835_pll_clk_ops;
        init.flags = CLK_IGNORE_UNUSED;
  
@@ -67,7 +67,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        pll = kzalloc(sizeof(*pll), GFP_KERNEL);
        if (!pll)
                return NULL;
-@@ -1371,8 +1376,10 @@ bcm2835_register_pll_divider(struct bcm2
+@@ -1373,8 +1378,10 @@ bcm2835_register_pll_divider(struct bcm2
        divider->div.table = NULL;
  
        if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) {
@@ -80,7 +80,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        }
  
        divider->cprman = cprman;
-@@ -2108,6 +2115,8 @@ static const struct bcm2835_clk_desc clk
+@@ -2110,6 +2117,8 @@ static const struct bcm2835_clk_desc clk
                .ctl_reg = CM_PERIICTL),
  };
  
@@ -89,7 +89,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  /*
   * Permanently take a reference on the parent of the SDRAM clock.
   *
-@@ -2127,6 +2136,19 @@ static int bcm2835_mark_sdc_parent_criti
+@@ -2129,6 +2138,19 @@ static int bcm2835_mark_sdc_parent_criti
        return clk_prepare_enable(parent);
  }
  
@@ -109,7 +109,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  static int bcm2835_clk_probe(struct platform_device *pdev)
  {
        struct device *dev = &pdev->dev;
-@@ -2136,6 +2158,7 @@ static int bcm2835_clk_probe(struct plat
+@@ -2138,6 +2160,7 @@ static int bcm2835_clk_probe(struct plat
        const struct bcm2835_clk_desc *desc;
        const size_t asize = ARRAY_SIZE(clk_desc_array);
        size_t i;
@@ -117,7 +117,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
        int ret;
  
        cprman = devm_kzalloc(dev, sizeof(*cprman) +
-@@ -2151,6 +2174,13 @@ static int bcm2835_clk_probe(struct plat
+@@ -2153,6 +2176,13 @@ static int bcm2835_clk_probe(struct plat
        if (IS_ERR(cprman->regs))
                return PTR_ERR(cprman->regs);
  
index ac71864..3eb67df 100644 (file)
@@ -4,7 +4,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
 
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1388,6 +1388,15 @@ config WDT_MTX1
+@@ -1389,6 +1389,15 @@ config WDT_MTX1
          Hardware driver for the MTX-1 boards. This is a watchdog timer that
          will reboot the machine after a 100 seconds timer expired.
  
index 01bf798..3bb486c 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
 
 --- a/drivers/usb/dwc2/hcd.c
 +++ b/drivers/usb/dwc2/hcd.c
-@@ -5185,7 +5185,6 @@ error3:
+@@ -5188,7 +5188,6 @@ error3:
  error2:
        usb_put_hcd(hcd);
  error1:
index 477c498..8d51e1b 100644 (file)
@@ -1095,7 +1095,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA);
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -2684,7 +2684,7 @@ static int stmmac_poll(struct napi_struc
+@@ -2693,7 +2693,7 @@ static int stmmac_poll(struct napi_struc
  
        work_done = stmmac_rx(priv, budget);
        if (work_done < budget) {
@@ -1150,7 +1150,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return work_done;
 --- a/drivers/net/ethernet/ti/cpsw.c
 +++ b/drivers/net/ethernet/ti/cpsw.c
-@@ -839,7 +839,7 @@ static int cpsw_rx_poll(struct napi_stru
+@@ -843,7 +843,7 @@ static int cpsw_rx_poll(struct napi_stru
        }
  
        if (num_rx < budget) {
index 3dc0c88..c6484a8 100644 (file)
@@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config MODULES_TREE_LOOKUP
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -2954,9 +2954,11 @@ static struct module *setup_load_info(st
+@@ -2968,9 +2968,11 @@ static struct module *setup_load_info(st
  
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
@@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (flags & MODULE_INIT_IGNORE_VERMAGIC)
                modmagic = NULL;
  
-@@ -2977,6 +2979,7 @@ static int check_modinfo(struct module *
+@@ -2991,6 +2993,7 @@ static int check_modinfo(struct module *
                                mod->name);
                add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
        }
index 01c67c2..ae2dad6 100644 (file)
@@ -243,7 +243,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  }
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -1798,10 +1798,12 @@ static int __init setup_vmstat(void)
+@@ -1796,10 +1796,12 @@ static int __init setup_vmstat(void)
        cpu_notifier_register_done();
  #endif
  #ifdef CONFIG_PROC_FS
index c8258e5..87b12b9 100644 (file)
@@ -23,7 +23,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com>
 
 --- a/drivers/net/ethernet/intel/e1000e/netdev.c
 +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -5072,7 +5072,7 @@ static bool e1000e_has_link(struct e1000
+@@ -5078,7 +5078,7 @@ static bool e1000e_has_link(struct e1000
  
        /* get_link_status is set on LSC (link status) interrupt or
         * Rx sequence error interrupt.  get_link_status will stay
@@ -32,7 +32,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com>
         * for copper adapters ONLY
         */
        switch (hw->phy.media_type) {
-@@ -5090,7 +5090,7 @@ static bool e1000e_has_link(struct e1000
+@@ -5096,7 +5096,7 @@ static bool e1000e_has_link(struct e1000
                break;
        case e1000_media_type_internal_serdes:
                ret_val = hw->mac.ops.check_for_link(hw);
index 76d0310..1d44cdb 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1212,6 +1212,49 @@ static struct mtd_info * __init open_mtd
+@@ -1223,6 +1223,49 @@ static struct mtd_info * __init open_mtd
        return mtd;
  }
  
@@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static int __init ubi_init(void)
  {
        int err, i, k;
-@@ -1295,6 +1338,12 @@ static int __init ubi_init(void)
+@@ -1306,6 +1349,12 @@ static int __init ubi_init(void)
                }
        }
  
index aeefcaf..b922be6 100644 (file)
@@ -143,7 +143,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        }
        return &ip6n->tnls[prio][h];
  }
-@@ -381,6 +392,12 @@ ip6_tnl_dev_uninit(struct net_device *de
+@@ -384,6 +395,12 @@ ip6_tnl_dev_uninit(struct net_device *de
        struct net *net = t->net;
        struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
  
@@ -156,7 +156,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        if (dev == ip6n->fb_tnl_dev)
                RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
        else
-@@ -777,6 +794,107 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
+@@ -780,6 +797,107 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
  }
  EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
  
@@ -264,7 +264,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
                         const struct tnl_ptk_info *tpi,
                         struct metadata_dst *tun_dst,
-@@ -829,6 +947,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
+@@ -832,6 +950,27 @@ static int __ip6_tnl_rcv(struct ip6_tnl
        skb_reset_network_header(skb);
        memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
  
@@ -292,7 +292,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        __skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
  
        err = dscp_ecn_decapsulate(tunnel, ipv6h, skb);
-@@ -958,6 +1097,7 @@ static void init_tel_txopt(struct ipv6_t
+@@ -961,6 +1100,7 @@ static void init_tel_txopt(struct ipv6_t
        opt->ops.opt_nflen = 8;
  }
  
@@ -300,7 +300,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  /**
   * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
   *   @t: the outgoing tunnel device
-@@ -1292,6 +1432,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1298,6 +1438,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
  {
        struct ip6_tnl *t = netdev_priv(dev);
        struct ipv6hdr *ipv6h = ipv6_hdr(skb);
@@ -308,7 +308,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        int encap_limit = -1;
        __u16 offset;
        struct flowi6 fl6;
-@@ -1350,6 +1491,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1356,6 +1497,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
                        fl6.flowi6_mark = skb->mark;
        }
  
@@ -327,7 +327,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
                return -1;
  
-@@ -1477,6 +1630,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+@@ -1483,6 +1636,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
        t->parms.flowinfo = p->flowinfo;
        t->parms.link = p->link;
        t->parms.proto = p->proto;
@@ -342,7 +342,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        dst_cache_reset(&t->dst_cache);
        ip6_tnl_link_config(t);
        return 0;
-@@ -1515,6 +1676,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+@@ -1521,6 +1682,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
        p->flowinfo = u->flowinfo;
        p->link = u->link;
        p->proto = u->proto;
@@ -350,7 +350,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        memcpy(p->name, u->name, sizeof(u->name));
  }
  
-@@ -1892,6 +2054,15 @@ static int ip6_tnl_validate(struct nlatt
+@@ -1898,6 +2060,15 @@ static int ip6_tnl_validate(struct nlatt
        return 0;
  }
  
@@ -366,7 +366,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  static void ip6_tnl_netlink_parms(struct nlattr *data[],
                                  struct __ip6_tnl_parm *parms)
  {
-@@ -1926,6 +2097,46 @@ static void ip6_tnl_netlink_parms(struct
+@@ -1932,6 +2103,46 @@ static void ip6_tnl_netlink_parms(struct
  
        if (data[IFLA_IPTUN_COLLECT_METADATA])
                parms->collect_md = true;
@@ -413,7 +413,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  }
  
  static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
-@@ -2035,6 +2246,12 @@ static void ip6_tnl_dellink(struct net_d
+@@ -2041,6 +2252,12 @@ static void ip6_tnl_dellink(struct net_d
  
  static size_t ip6_tnl_get_size(const struct net_device *dev)
  {
@@ -426,7 +426,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        return
                /* IFLA_IPTUN_LINK */
                nla_total_size(4) +
-@@ -2062,6 +2279,24 @@ static size_t ip6_tnl_get_size(const str
+@@ -2068,6 +2285,24 @@ static size_t ip6_tnl_get_size(const str
                nla_total_size(2) +
                /* IFLA_IPTUN_COLLECT_METADATA */
                nla_total_size(0) +
@@ -451,7 +451,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
                0;
  }
  
-@@ -2069,6 +2304,9 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2075,6 +2310,9 @@ static int ip6_tnl_fill_info(struct sk_b
  {
        struct ip6_tnl *tunnel = netdev_priv(dev);
        struct __ip6_tnl_parm *parm = &tunnel->parms;
@@ -461,7 +461,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  
        if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
            nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -2077,9 +2315,27 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2083,9 +2321,27 @@ static int ip6_tnl_fill_info(struct sk_b
            nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
            nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
            nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
@@ -490,7 +490,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
        if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
            nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
            nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
-@@ -2117,6 +2373,7 @@ static const struct nla_policy ip6_tnl_p
+@@ -2123,6 +2379,7 @@ static const struct nla_policy ip6_tnl_p
        [IFLA_IPTUN_ENCAP_SPORT]        = { .type = NLA_U16 },
        [IFLA_IPTUN_ENCAP_DPORT]        = { .type = NLA_U16 },
        [IFLA_IPTUN_COLLECT_METADATA]   = { .type = NLA_FLAG },
index 85293a2..ad3a157 100644 (file)
@@ -141,7 +141,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  static const struct rt6_info ip6_blk_hole_entry_template = {
        .dst = {
                .__refcnt       = ATOMIC_INIT(1),
-@@ -1967,6 +1984,11 @@ static struct rt6_info *ip6_route_info_c
+@@ -1970,6 +1987,11 @@ static struct rt6_info *ip6_route_info_c
                        rt->dst.output = ip6_pkt_prohibit_out;
                        rt->dst.input = ip6_pkt_prohibit;
                        break;
@@ -153,7 +153,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                case RTN_THROW:
                case RTN_UNREACHABLE:
                default:
-@@ -2610,6 +2632,17 @@ static int ip6_pkt_prohibit_out(struct n
+@@ -2613,6 +2635,17 @@ static int ip6_pkt_prohibit_out(struct n
        return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  
@@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /*
   *    Allocate a dst for local (unicast / anycast) address.
   */
-@@ -2845,7 +2878,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2848,7 +2881,8 @@ static int rtm_to_fib6_config(struct sk_
        if (rtm->rtm_type == RTN_UNREACHABLE ||
            rtm->rtm_type == RTN_BLACKHOLE ||
            rtm->rtm_type == RTN_PROHIBIT ||
@@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                cfg->fc_flags |= RTF_REJECT;
  
        if (rtm->rtm_type == RTN_LOCAL)
-@@ -3217,6 +3251,9 @@ static int rt6_fill_node(struct net *net
+@@ -3220,6 +3254,9 @@ static int rt6_fill_node(struct net *net
                case -EACCES:
                        rtm->rtm_type = RTN_PROHIBIT;
                        break;
@@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                case -EAGAIN:
                        rtm->rtm_type = RTN_THROW;
                        break;
-@@ -3493,6 +3530,8 @@ static int ip6_route_dev_notify(struct n
+@@ -3496,6 +3533,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
                net->ipv6.ip6_prohibit_entry->dst.dev = dev;
                net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
                net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
                net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -3719,6 +3758,17 @@ static int __net_init ip6_route_net_init
+@@ -3722,6 +3761,17 @@ static int __net_init ip6_route_net_init
        net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
        dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
                         ip6_template_metrics, true);
@@ -218,7 +218,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #endif
  
        net->ipv6.sysctl.flush_delay = 0;
-@@ -3737,6 +3787,8 @@ out:
+@@ -3740,6 +3790,8 @@ out:
        return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  out_ip6_prohibit_entry:
        kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
-@@ -3754,6 +3806,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3757,6 +3809,7 @@ static void __net_exit ip6_route_net_exi
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
        kfree(net->ipv6.ip6_prohibit_entry);
        kfree(net->ipv6.ip6_blk_hole_entry);
@@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #endif
        dst_entries_destroy(&net->ipv6.ip6_dst_ops);
  }
-@@ -3827,6 +3880,9 @@ void __init ip6_route_init_special_entri
+@@ -3830,6 +3883,9 @@ void __init ip6_route_init_special_entri
        init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
        init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
        init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
index 86a64d8..4d1f6c4 100644 (file)
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        __u16                   tc_index;       /* traffic control index */
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -4542,6 +4542,9 @@ static enum gro_result dev_gro_receive(s
+@@ -4550,6 +4550,9 @@ static enum gro_result dev_gro_receive(s
        enum gro_result ret;
        int grow;
  
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!(skb->dev->features & NETIF_F_GRO))
                goto normal;
  
-@@ -5830,6 +5833,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5838,6 +5841,48 @@ static void __netdev_adjacent_dev_unlink
                                           &upper_dev->adj_list.lower);
  }
  
@@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static int __netdev_upper_dev_link(struct net_device *dev,
                                   struct net_device *upper_dev, bool master,
                                   void *upper_priv, void *upper_info)
-@@ -5902,6 +5947,7 @@ static int __netdev_upper_dev_link(struc
+@@ -5910,6 +5955,7 @@ static int __netdev_upper_dev_link(struc
                        goto rollback_lower_mesh;
        }
  
@@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
                                            &changeupper_info.info);
        ret = notifier_to_errno(ret);
-@@ -6028,6 +6074,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6036,6 +6082,7 @@ void netdev_upper_dev_unlink(struct net_
        list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
                __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
  
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
                                      &changeupper_info.info);
  }
-@@ -6628,6 +6675,7 @@ int dev_set_mac_address(struct net_devic
+@@ -6636,6 +6683,7 @@ int dev_set_mac_address(struct net_devic
        if (err)
                return err;
        dev->addr_assign_type = NET_ADDR_SET;
index 4569336..628e1d3 100644 (file)
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -466,6 +466,50 @@ int phy_ethtool_ksettings_get(struct phy
+@@ -472,6 +472,50 @@ int phy_ethtool_ksettings_get(struct phy
  }
  EXPORT_SYMBOL(phy_ethtool_ksettings_get);
  
index e3a1c8a..1cb51a2 100644 (file)
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  {
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
-@@ -396,6 +396,11 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE
+@@ -410,6 +410,11 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE
          This may be set to 1 or 0 to enable or disable them all, or
          to a bitmask as described in Documentation/sysrq.txt.
  
index ec2f340..3422f41 100644 (file)
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
        help
 --- a/init/main.c
 +++ b/init/main.c
-@@ -352,6 +352,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -353,6 +353,29 @@ static inline void setup_nr_cpu_ids(void
  static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  #endif
  
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -505,6 +528,7 @@ asmlinkage __visible void __init start_k
+@@ -506,6 +529,7 @@ asmlinkage __visible void __init start_k
        pr_notice("%s", linux_banner);
        setup_arch(&command_line);
        mm_init_cpumask(&init_mm);
index 478dad7..be1a7e5 100644 (file)
@@ -157,7 +157,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  }
 --- a/init/main.c
 +++ b/init/main.c
-@@ -88,6 +88,10 @@
+@@ -89,6 +89,10 @@
  #include <asm/sections.h>
  #include <asm/cacheflush.h>
  
@@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  static int kernel_init(void *);
  
  extern void init_IRQ(void);
-@@ -539,6 +543,18 @@ asmlinkage __visible void __init start_k
+@@ -540,6 +544,18 @@ asmlinkage __visible void __init start_k
        page_alloc_init();
  
        pr_notice("Kernel command line: %s\n", boot_command_line);
index 6046d6c..eb6acdb 100644 (file)
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -1032,7 +1032,8 @@ void phy_state_machine(struct work_struc
+@@ -1038,7 +1038,8 @@ void phy_state_machine(struct work_struc
                /* If the link is down, give up on negotiation for now */
                if (!phydev->link) {
                        phydev->state = PHY_NOLINK;
@@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
                        phydev->adjust_link(phydev->attached_dev);
                        break;
                }
-@@ -1124,7 +1125,8 @@ void phy_state_machine(struct work_struc
+@@ -1130,7 +1131,8 @@ void phy_state_machine(struct work_struc
                        netif_carrier_on(phydev->attached_dev);
                } else {
                        phydev->state = PHY_NOLINK;
@@ -31,7 +31,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
                }
  
                phydev->adjust_link(phydev->attached_dev);
-@@ -1136,7 +1138,8 @@ void phy_state_machine(struct work_struc
+@@ -1142,7 +1144,8 @@ void phy_state_machine(struct work_struc
        case PHY_HALTED:
                if (phydev->link) {
                        phydev->link = 0;
index 64597ce..da48ae3 100644 (file)
@@ -65,7 +65,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 +};
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
-@@ -404,6 +404,14 @@ config SPI_NUC900
+@@ -403,6 +403,14 @@ config SPI_NUC900
        help
          SPI driver for Nuvoton NUC900 series ARM SoCs
  
index 77e54f8..a284d8b 100644 (file)
@@ -421,7 +421,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
   *    These are the defined Ethernet Protocol ID's.
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -6622,9 +6622,18 @@ int dev_set_mtu(struct net_device *dev,
+@@ -6630,9 +6630,18 @@ int dev_set_mtu(struct net_device *dev,
        if (new_mtu == dev->mtu)
                return 0;
  
index 0276ebe..52dfced 100644 (file)
@@ -335,7 +335,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        return 1;
 --- a/arch/arm64/include/asm/pgtable-prot.h
 +++ b/arch/arm64/include/asm/pgtable-prot.h
-@@ -42,6 +42,7 @@
+@@ -48,6 +48,7 @@
  #define PROT_NORMAL_NC                (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_NC))
  #define PROT_NORMAL_WT                (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_WT))
  #define PROT_NORMAL           (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL))
index 361f43c..37dc5ee 100644 (file)
@@ -340,7 +340,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                        reg = <0x0 0x1570e08 0x0 0x8>;
                        msi-controller;
                        interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
-@@ -137,16 +144,17 @@
+@@ -137,11 +144,12 @@
                        compatible = "fsl,ifc", "simple-bus";
                        reg = <0x0 0x1530000 0x0 0x10000>;
                        interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -354,12 +354,6 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                        big-endian;
                };
  
-               esdhc: esdhc@1560000 {
--                      compatible = "fsl,esdhc";
-+                      compatible = "fsl,ls1021a-esdhc","fsl,esdhc";
-                       reg = <0x0 0x1560000 0x0 0x10000>;
-                       interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-frequency = <0>;
 @@ -163,7 +171,7 @@
                              <0x0 0x20220520 0x0 0x4>;
                        reg-names = "ahci", "sata-ecc";
index 6ffc2e1..9d84968 100644 (file)
@@ -768,7 +768,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        { "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
        {
                "w25q32dw", INFO(0xef6016, 0, 64 * 1024,  64,
-@@ -1192,6 +1216,53 @@ static const struct flash_info *spi_nor_
+@@ -1196,6 +1220,53 @@ static const struct flash_info *spi_nor_
                id[0], id[1], id[2]);
        return ERR_PTR(-ENODEV);
  }
@@ -822,7 +822,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
  static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
                        size_t *retlen, u_char *buf)
-@@ -1411,7 +1482,7 @@ static int macronix_quad_enable(struct s
+@@ -1415,7 +1486,7 @@ static int macronix_quad_enable(struct s
   * Write status Register and configuration register with 2 bytes
   * The first byte will be written to the status register, while the
   * second byte will be written to the configuration register.
@@ -831,7 +831,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
   */
  static int write_sr_cr(struct spi_nor *nor, u16 val)
  {
-@@ -1459,6 +1530,24 @@ static int spansion_quad_enable(struct s
+@@ -1463,6 +1534,24 @@ static int spansion_quad_enable(struct s
        return 0;
  }
  
@@ -856,7 +856,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  static int set_quad_mode(struct spi_nor *nor, const struct flash_info *info)
  {
        int status;
-@@ -1605,9 +1694,25 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1609,9 +1698,25 @@ int spi_nor_scan(struct spi_nor *nor, co
                write_sr(nor, 0);
                spi_nor_wait_till_ready(nor);
        }
@@ -882,7 +882,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        mtd->priv = nor;
        mtd->type = MTD_NORFLASH;
        mtd->writesize = 1;
-@@ -1641,6 +1746,8 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1645,6 +1750,8 @@ int spi_nor_scan(struct spi_nor *nor, co
                nor->flags |= SNOR_F_USE_FSR;
        if (info->flags & SPI_NOR_HAS_TB)
                nor->flags |= SNOR_F_HAS_SR_TB;
@@ -891,7 +891,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
  #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
        /* prefer "small sector" erase if possible */
-@@ -1680,9 +1787,15 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1684,9 +1791,15 @@ int spi_nor_scan(struct spi_nor *nor, co
        /* Some devices cannot do fast-read, no matter what DT tells us */
        if (info->flags & SPI_NOR_NO_FR)
                nor->flash_read = SPI_NOR_NORMAL;
@@ -910,7 +910,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                ret = set_quad_mode(nor, info);
                if (ret) {
                        dev_err(dev, "quad mode not supported\n");
-@@ -1695,6 +1808,9 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1699,6 +1812,9 @@ int spi_nor_scan(struct spi_nor *nor, co
  
        /* Default commands */
        switch (nor->flash_read) {
index 197fd9c..acc75cd 100644 (file)
@@ -1618,7 +1618,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                .config_intr = &marvell_config_intr,
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
-@@ -585,7 +585,7 @@ int phy_mii_ioctl(struct phy_device *phy
+@@ -591,7 +591,7 @@ int phy_mii_ioctl(struct phy_device *phy
                return 0;
  
        case SIOCSHWTSTAMP:
@@ -1627,7 +1627,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                        return phydev->drv->hwtstamp(phydev, ifr);
                /* fall through */
  
-@@ -610,6 +610,9 @@ static int phy_start_aneg_priv(struct ph
+@@ -616,6 +616,9 @@ static int phy_start_aneg_priv(struct ph
        bool trigger = 0;
        int err;
  
@@ -1637,7 +1637,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        mutex_lock(&phydev->lock);
  
        if (AUTONEG_DISABLE == phydev->autoneg)
-@@ -1009,7 +1012,7 @@ void phy_state_machine(struct work_struc
+@@ -1015,7 +1018,7 @@ void phy_state_machine(struct work_struc
  
        old_state = phydev->state;
  
@@ -1646,7 +1646,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                phydev->drv->link_change_notify(phydev);
  
        switch (phydev->state) {
-@@ -1311,6 +1314,9 @@ EXPORT_SYMBOL(phy_write_mmd_indirect);
+@@ -1317,6 +1320,9 @@ EXPORT_SYMBOL(phy_write_mmd_indirect);
   */
  int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
  {
@@ -1656,7 +1656,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        /* According to 802.3az,the EEE is supported only in full duplex-mode.
         * Also EEE feature is active when core is operating with MII, GMII
         * or RGMII (all kinds). Internal PHYs are also allowed to proceed and
-@@ -1388,6 +1394,9 @@ EXPORT_SYMBOL(phy_init_eee);
+@@ -1394,6 +1400,9 @@ EXPORT_SYMBOL(phy_init_eee);
   */
  int phy_get_eee_err(struct phy_device *phydev)
  {
@@ -1666,7 +1666,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        return phy_read_mmd_indirect(phydev, MDIO_PCS_EEE_WK_ERR, MDIO_MMD_PCS);
  }
  EXPORT_SYMBOL(phy_get_eee_err);
-@@ -1404,6 +1413,9 @@ int phy_ethtool_get_eee(struct phy_devic
+@@ -1410,6 +1419,9 @@ int phy_ethtool_get_eee(struct phy_devic
  {
        int val;
  
@@ -1676,7 +1676,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        /* Get Supported EEE */
        val = phy_read_mmd_indirect(phydev, MDIO_PCS_EEE_ABLE, MDIO_MMD_PCS);
        if (val < 0)
-@@ -1437,6 +1449,9 @@ int phy_ethtool_set_eee(struct phy_devic
+@@ -1443,6 +1455,9 @@ int phy_ethtool_set_eee(struct phy_devic
  {
        int val = ethtool_adv_to_mmd_eee_adv_t(data->advertised);
  
@@ -1686,7 +1686,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        /* Mask prohibited EEE modes */
        val &= ~phydev->eee_broken_modes;
  
-@@ -1448,7 +1463,7 @@ EXPORT_SYMBOL(phy_ethtool_set_eee);
+@@ -1454,7 +1469,7 @@ EXPORT_SYMBOL(phy_ethtool_set_eee);
  
  int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
  {
@@ -1695,7 +1695,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                return phydev->drv->set_wol(phydev, wol);
  
        return -EOPNOTSUPP;
-@@ -1457,7 +1472,7 @@ EXPORT_SYMBOL(phy_ethtool_set_wol);
+@@ -1463,7 +1478,7 @@ EXPORT_SYMBOL(phy_ethtool_set_wol);
  
  void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
  {
index 465f909..ac9b4b0 100644 (file)
@@ -328,7 +328,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                pr_info("Freescale QorIQ CPU frequency scaling driver\n");
 --- a/drivers/firmware/psci.c
 +++ b/drivers/firmware/psci.c
-@@ -418,8 +418,12 @@ CPUIDLE_METHOD_OF_DECLARE(psci, "psci",
+@@ -437,8 +437,12 @@ CPUIDLE_METHOD_OF_DECLARE(psci, "psci",
  
  static int psci_system_suspend(unsigned long unused)
  {
@@ -343,7 +343,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  }
  
  static int psci_system_suspend_enter(suspend_state_t state)
-@@ -439,6 +443,8 @@ static void __init psci_init_system_susp
+@@ -458,6 +462,8 @@ static void __init psci_init_system_susp
        if (!IS_ENABLED(CONFIG_SUSPEND))
                return;
  
@@ -352,7 +352,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        ret = psci_features(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND));
  
        if (ret != PSCI_RET_NOT_SUPPORTED)
-@@ -516,6 +522,8 @@ static void __init psci_0_2_set_function
+@@ -562,6 +568,8 @@ static void __init psci_0_2_set_function
        arm_pm_restart = psci_sys_reset;
  
        pm_power_off = psci_sys_poweroff;
index 67c32dc..4b32417 100644 (file)
@@ -482,7 +482,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        sdhci_get_of_property(pdev);
 --- a/drivers/mmc/host/sdhci.c
 +++ b/drivers/mmc/host/sdhci.c
-@@ -1624,26 +1624,24 @@ static void sdhci_set_ios(struct mmc_hos
+@@ -1631,26 +1631,24 @@ static void sdhci_set_ios(struct mmc_hos
  
        ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
  
@@ -523,7 +523,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                if (!host->preset_enabled) {
                        sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
                        /*
-@@ -1956,7 +1954,7 @@ static int sdhci_prepare_hs400_tuning(st
+@@ -1963,7 +1961,7 @@ static int sdhci_prepare_hs400_tuning(st
        return 0;
  }
  
@@ -532,7 +532,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  {
        struct sdhci_host *host = mmc_priv(mmc);
        u16 ctrl;
-@@ -2015,6 +2013,9 @@ static int sdhci_execute_tuning(struct m
+@@ -2022,6 +2020,9 @@ static int sdhci_execute_tuning(struct m
                return err;
        }
  
@@ -542,7 +542,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
        ctrl |= SDHCI_CTRL_EXEC_TUNING;
        if (host->quirks2 & SDHCI_QUIRK2_TUNING_WORK_AROUND)
-@@ -2127,9 +2128,10 @@ static int sdhci_execute_tuning(struct m
+@@ -2134,9 +2135,10 @@ static int sdhci_execute_tuning(struct m
  
                ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
  
@@ -556,7 +556,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        } while (ctrl & SDHCI_CTRL_EXEC_TUNING);
  
        /*
-@@ -2165,6 +2167,7 @@ out_unlock:
+@@ -2172,6 +2174,7 @@ out_unlock:
        spin_unlock_irqrestore(&host->lock, flags);
        return err;
  }
@@ -564,7 +564,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
  static int sdhci_select_drive_strength(struct mmc_card *card,
                                       unsigned int max_dtr, int host_drv,
-@@ -2997,6 +3000,8 @@ struct sdhci_host *sdhci_alloc_host(stru
+@@ -3004,6 +3007,8 @@ struct sdhci_host *sdhci_alloc_host(stru
  
        host->flags = SDHCI_SIGNALING_330;
  
index c143130..1dfa46e 100644 (file)
@@ -1162,7 +1162,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        /* Move to next BD in the ring */
        if (!(bd_status & T_W_S))
 @@ -457,7 +457,7 @@ static int hdlc_rx_done(struct ucc_hdlc_
-       struct sk_buff *skb;
+       struct sk_buff *skb = NULL;
        hdlc_device *hdlc = dev_to_hdlc(dev);
        struct qe_bd *bd;
 -      u32 bd_status;
index 69bbb41..e6ca144 100644 (file)
  
        /* reserved for future extensions */
        if (config.flags)
-@@ -703,7 +705,7 @@ static void stmmac_release_ptp(struct st
+@@ -712,7 +714,7 @@ static void stmmac_release_ptp(struct st
  static void stmmac_adjust_link(struct net_device *dev)
  {
        struct stmmac_priv *priv = netdev_priv(dev);
        unsigned long flags;
        int new_state = 0;
        unsigned int fc = priv->flow_ctrl, pause_time = priv->pause;
-@@ -756,9 +758,9 @@ static void stmmac_adjust_link(struct ne
+@@ -765,9 +767,9 @@ static void stmmac_adjust_link(struct ne
                                stmmac_hw_fix_mac_speed(priv);
                                break;
                        default:
                                break;
                        }
  
-@@ -811,10 +813,10 @@ static void stmmac_check_pcs_mode(struct
+@@ -820,10 +822,10 @@ static void stmmac_check_pcs_mode(struct
                    (interface == PHY_INTERFACE_MODE_RGMII_ID) ||
                    (interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
                    (interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
                        priv->hw->pcs = STMMAC_PCS_SGMII;
                }
        }
-@@ -849,15 +851,15 @@ static int stmmac_init_phy(struct net_de
+@@ -858,15 +860,15 @@ static int stmmac_init_phy(struct net_de
  
                snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
                         priv->plat->phy_addr);
                if (!phydev)
                        return -ENODEV;
  
-@@ -890,10 +892,8 @@ static int stmmac_init_phy(struct net_de
+@@ -899,10 +901,8 @@ static int stmmac_init_phy(struct net_de
        if (phydev->is_pseudo_fixed_link)
                phydev->irq = PHY_POLL;
  
  
        return 0;
  }
-@@ -979,7 +979,8 @@ static int stmmac_init_rx_buffers(struct
+@@ -988,7 +988,8 @@ static int stmmac_init_rx_buffers(struct
  
        skb = __netdev_alloc_skb_ip_align(priv->dev, priv->dma_buf_sz, flags);
        if (!skb) {
                return -ENOMEM;
        }
        priv->rx_skbuff[i] = skb;
-@@ -987,15 +988,15 @@ static int stmmac_init_rx_buffers(struct
+@@ -996,15 +997,15 @@ static int stmmac_init_rx_buffers(struct
                                                priv->dma_buf_sz,
                                                DMA_FROM_DEVICE);
        if (dma_mapping_error(priv->device, priv->rx_skbuff_dma[i])) {
  
        if ((priv->hw->mode->init_desc3) &&
            (priv->dma_buf_sz == BUF_SIZE_16KiB))
-@@ -1037,13 +1038,14 @@ static int init_dma_desc_rings(struct ne
+@@ -1046,13 +1047,14 @@ static int init_dma_desc_rings(struct ne
  
        priv->dma_buf_sz = bfsize;
  
        for (i = 0; i < DMA_RX_SIZE; i++) {
                struct dma_desc *p;
                if (priv->extend_desc)
-@@ -1055,10 +1057,9 @@ static int init_dma_desc_rings(struct ne
+@@ -1064,10 +1066,9 @@ static int init_dma_desc_rings(struct ne
                if (ret)
                        goto err_init_rx_buffers;
  
        }
        priv->cur_rx = 0;
        priv->dirty_rx = (unsigned int)(i - DMA_RX_SIZE);
-@@ -1313,7 +1314,7 @@ static void stmmac_tx_clean(struct stmma
+@@ -1322,7 +1323,7 @@ static void stmmac_tx_clean(struct stmma
        unsigned int bytes_compl = 0, pkts_compl = 0;
        unsigned int entry = priv->dirty_tx;
  
  
        priv->xstats.tx_clean++;
  
-@@ -1384,22 +1385,17 @@ static void stmmac_tx_clean(struct stmma
+@@ -1393,22 +1394,17 @@ static void stmmac_tx_clean(struct stmma
        netdev_completed_queue(priv->dev, pkts_compl, bytes_compl);
  
        if (unlikely(netif_queue_stopped(priv->dev) &&
  }
  
  static inline void stmmac_enable_dma_irq(struct stmmac_priv *priv)
-@@ -1503,7 +1499,7 @@ static void stmmac_mmc_setup(struct stmm
+@@ -1512,7 +1508,7 @@ static void stmmac_mmc_setup(struct stmm
                dwmac_mmc_ctrl(priv->mmcaddr, mode);
                memset(&priv->mmc, 0, sizeof(struct stmmac_counters));
        } else
  }
  
  /**
-@@ -1516,18 +1512,18 @@ static void stmmac_mmc_setup(struct stmm
+@@ -1525,18 +1521,18 @@ static void stmmac_mmc_setup(struct stmm
  static void stmmac_selec_desc_mode(struct stmmac_priv *priv)
  {
        if (priv->plat->enh_desc) {
                priv->hw->desc = &ndesc_ops;
        }
  }
-@@ -1568,8 +1564,8 @@ static void stmmac_check_ether_addr(stru
+@@ -1577,8 +1573,8 @@ static void stmmac_check_ether_addr(stru
                                             priv->dev->dev_addr, 0);
                if (!is_valid_ether_addr(priv->dev->dev_addr))
                        eth_hw_addr_random(priv->dev);
        }
  }
  
-@@ -1583,16 +1579,12 @@ static void stmmac_check_ether_addr(stru
+@@ -1592,16 +1588,12 @@ static void stmmac_check_ether_addr(stru
   */
  static int stmmac_init_dma_engine(struct stmmac_priv *priv)
  {
        }
  
        if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
-@@ -1604,8 +1596,8 @@ static int stmmac_init_dma_engine(struct
+@@ -1613,8 +1605,8 @@ static int stmmac_init_dma_engine(struct
                return ret;
        }
  
  
        if (priv->synopsys_id >= DWMAC_CORE_4_00) {
                priv->rx_tail_addr = priv->dma_rx_phy +
-@@ -1677,7 +1669,8 @@ static int stmmac_hw_setup(struct net_de
+@@ -1686,7 +1678,8 @@ static int stmmac_hw_setup(struct net_de
        /* DMA initialization and SW reset */
        ret = stmmac_init_dma_engine(priv);
        if (ret < 0) {
                return ret;
        }
  
-@@ -1706,7 +1699,7 @@ static int stmmac_hw_setup(struct net_de
+@@ -1715,7 +1708,7 @@ static int stmmac_hw_setup(struct net_de
  
        ret = priv->hw->mac->rx_ipc(priv->hw);
        if (!ret) {
                priv->plat->rx_coe = STMMAC_RX_COE_NONE;
                priv->hw->rx_csum = 0;
        }
-@@ -1731,10 +1724,11 @@ static int stmmac_hw_setup(struct net_de
+@@ -1740,10 +1733,11 @@ static int stmmac_hw_setup(struct net_de
  #ifdef CONFIG_DEBUG_FS
        ret = stmmac_init_fs(dev);
        if (ret < 0)
        priv->hw->dma->start_tx(priv->ioaddr);
        priv->hw->dma->start_rx(priv->ioaddr);
  
-@@ -1789,8 +1783,9 @@ static int stmmac_open(struct net_device
+@@ -1798,8 +1792,9 @@ static int stmmac_open(struct net_device
            priv->hw->pcs != STMMAC_PCS_RTBI) {
                ret = stmmac_init_phy(dev);
                if (ret) {
                        return ret;
                }
        }
-@@ -1805,33 +1800,36 @@ static int stmmac_open(struct net_device
+@@ -1814,33 +1809,36 @@ static int stmmac_open(struct net_device
  
        ret = alloc_dma_desc_resources(priv);
        if (ret < 0) {
                goto init_error;
        }
  
-@@ -1840,8 +1838,9 @@ static int stmmac_open(struct net_device
+@@ -1849,8 +1847,9 @@ static int stmmac_open(struct net_device
                ret = request_irq(priv->wol_irq, stmmac_interrupt,
                                  IRQF_SHARED, dev->name, dev);
                if (unlikely(ret < 0)) {
                        goto wolirq_error;
                }
        }
-@@ -1851,8 +1850,9 @@ static int stmmac_open(struct net_device
+@@ -1860,8 +1859,9 @@ static int stmmac_open(struct net_device
                ret = request_irq(priv->lpi_irq, stmmac_interrupt, IRQF_SHARED,
                                  dev->name, dev);
                if (unlikely(ret < 0)) {
                        goto lpiirq_error;
                }
        }
-@@ -1871,8 +1871,8 @@ wolirq_error:
+@@ -1880,8 +1880,8 @@ wolirq_error:
  init_error:
        free_dma_desc_resources(priv);
  dma_desc_error:
  
        return ret;
  }
-@@ -1891,10 +1891,9 @@ static int stmmac_release(struct net_dev
+@@ -1900,10 +1900,9 @@ static int stmmac_release(struct net_dev
                del_timer_sync(&priv->eee_ctrl_timer);
  
        /* Stop and disconnect the PHY */
        }
  
        netif_stop_queue(dev);
-@@ -1954,13 +1953,13 @@ static void stmmac_tso_allocator(struct
+@@ -1963,13 +1962,13 @@ static void stmmac_tso_allocator(struct
                priv->cur_tx = STMMAC_GET_ENTRY(priv->cur_tx, DMA_TX_SIZE);
                desc = priv->dma_tx + priv->cur_tx;
  
                        0, 0);
  
                tmp_len -= TSO_MAX_BUFF_SIZE;
-@@ -2005,8 +2004,6 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2014,8 +2013,6 @@ static netdev_tx_t stmmac_tso_xmit(struc
        u8 proto_hdr_len;
        int i;
  
        /* Compute header lengths */
        proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
  
-@@ -2016,9 +2013,10 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2025,9 +2022,10 @@ static netdev_tx_t stmmac_tso_xmit(struc
                if (!netif_queue_stopped(dev)) {
                        netif_stop_queue(dev);
                        /* This is a hard error, log it. */
                return NETDEV_TX_BUSY;
        }
  
-@@ -2056,11 +2054,11 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2065,11 +2063,11 @@ static netdev_tx_t stmmac_tso_xmit(struc
        priv->tx_skbuff_dma[first_entry].len = skb_headlen(skb);
        priv->tx_skbuff[first_entry] = skb;
  
  
        /* If needed take extra descriptors to fill the remaining payload */
        tmp_pay_len = pay_len - TSO_MAX_BUFF_SIZE;
-@@ -2089,8 +2087,8 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2098,8 +2096,8 @@ static netdev_tx_t stmmac_tso_xmit(struc
        priv->cur_tx = STMMAC_GET_ENTRY(priv->cur_tx, DMA_TX_SIZE);
  
        if (unlikely(stmmac_tx_avail(priv) <= (MAX_SKB_FRAGS + 1))) {
                netif_stop_queue(dev);
        }
  
-@@ -2134,7 +2132,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2143,7 +2141,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
         * descriptor and then barrier is needed to make sure that
         * all is coherent before granting the DMA engine.
         */
  
        if (netif_msg_pktdata(priv)) {
                pr_info("%s: curr=%d dirty=%d f=%d, e=%d, f_p=%p, nfrags %d\n",
-@@ -2153,11 +2151,9 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2162,11 +2160,9 @@ static netdev_tx_t stmmac_tso_xmit(struc
        priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, priv->tx_tail_addr,
                                       STMMAC_CHAN0);
  
        dev_err(priv->device, "Tx dma map failed\n");
        dev_kfree_skb(skb);
        priv->dev->stats.tx_dropped++;
-@@ -2189,14 +2185,13 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2198,14 +2194,13 @@ static netdev_tx_t stmmac_xmit(struct sk
                        return stmmac_tso_xmit(skb, dev);
        }
  
                }
                return NETDEV_TX_BUSY;
        }
-@@ -2249,13 +2244,11 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2258,13 +2253,11 @@ static netdev_tx_t stmmac_xmit(struct sk
  
                priv->tx_skbuff[entry] = NULL;
  
  
                priv->tx_skbuff_dma[entry].map_as_page = true;
                priv->tx_skbuff_dma[entry].len = len;
-@@ -2273,9 +2266,10 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2282,9 +2275,10 @@ static netdev_tx_t stmmac_xmit(struct sk
        if (netif_msg_pktdata(priv)) {
                void *tx_head;
  
  
                if (priv->extend_desc)
                        tx_head = (void *)priv->dma_etx;
-@@ -2284,13 +2278,13 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2293,13 +2287,13 @@ static netdev_tx_t stmmac_xmit(struct sk
  
                priv->hw->desc->display_ring(tx_head, DMA_TX_SIZE, false);
  
                netif_stop_queue(dev);
        }
  
-@@ -2326,13 +2320,11 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2335,13 +2329,11 @@ static netdev_tx_t stmmac_xmit(struct sk
                if (dma_mapping_error(priv->device, des))
                        goto dma_map_err;
  
  
                priv->tx_skbuff_dma[first_entry].len = nopaged_len;
                priv->tx_skbuff_dma[first_entry].last_segment = last_segment;
-@@ -2353,7 +2345,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2362,7 +2354,7 @@ static netdev_tx_t stmmac_xmit(struct sk
                 * descriptor and then barrier is needed to make sure that
                 * all is coherent before granting the DMA engine.
                 */
        }
  
        netdev_sent_queue(dev, skb->len);
-@@ -2364,12 +2356,10 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2373,12 +2365,10 @@ static netdev_tx_t stmmac_xmit(struct sk
                priv->hw->dma->set_tx_tail_ptr(priv->ioaddr, priv->tx_tail_addr,
                                               STMMAC_CHAN0);
  
        dev_kfree_skb(skb);
        priv->dev->stats.tx_dropped++;
        return NETDEV_TX_OK;
-@@ -2440,16 +2430,16 @@ static inline void stmmac_rx_refill(stru
+@@ -2449,16 +2439,16 @@ static inline void stmmac_rx_refill(stru
                                           DMA_FROM_DEVICE);
                        if (dma_mapping_error(priv->device,
                                              priv->rx_skbuff_dma[entry])) {
                        }
                        if (priv->hw->mode->refill_desc3)
                                priv->hw->mode->refill_desc3(priv, p);
-@@ -2457,17 +2447,17 @@ static inline void stmmac_rx_refill(stru
+@@ -2466,17 +2456,17 @@ static inline void stmmac_rx_refill(stru
                        if (priv->rx_zeroc_thresh > 0)
                                priv->rx_zeroc_thresh--;
  
  
                entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE);
        }
-@@ -2491,7 +2481,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2500,7 +2490,7 @@ static int stmmac_rx(struct stmmac_priv
        if (netif_msg_rx_status(priv)) {
                void *rx_head;
  
                if (priv->extend_desc)
                        rx_head = (void *)priv->dma_erx;
                else
-@@ -2553,9 +2543,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2562,9 +2552,9 @@ static int stmmac_rx(struct stmmac_priv
                        unsigned int des;
  
                        if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00))
  
                        frame_len = priv->hw->desc->get_rx_frame_len(p, coe);
  
-@@ -2564,9 +2554,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2573,9 +2563,9 @@ static int stmmac_rx(struct stmmac_priv
                         *  ignored
                         */
                        if (frame_len > priv->dma_buf_sz) {
                                priv->dev->stats.rx_length_errors++;
                                break;
                        }
-@@ -2578,11 +2568,11 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2587,11 +2577,11 @@ static int stmmac_rx(struct stmmac_priv
                                frame_len -= ETH_FCS_LEN;
  
                        if (netif_msg_rx_status(priv)) {
                        }
  
                        /* The zero-copy is always used for all the sizes
-@@ -2619,8 +2609,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2628,8 +2618,9 @@ static int stmmac_rx(struct stmmac_priv
                        } else {
                                skb = priv->rx_skbuff[entry];
                                if (unlikely(!skb)) {
                                        priv->dev->stats.rx_dropped++;
                                        break;
                                }
-@@ -2636,7 +2627,8 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2645,7 +2636,8 @@ static int stmmac_rx(struct stmmac_priv
                        }
  
                        if (netif_msg_pktdata(priv)) {
                                print_pkt(skb->data, frame_len);
                        }
  
-@@ -2739,7 +2731,7 @@ static int stmmac_change_mtu(struct net_
+@@ -2748,7 +2740,7 @@ static int stmmac_change_mtu(struct net_
        int max_mtu;
  
        if (netif_running(dev)) {
                return -EBUSY;
        }
  
-@@ -2831,7 +2823,7 @@ static irqreturn_t stmmac_interrupt(int
+@@ -2840,7 +2832,7 @@ static irqreturn_t stmmac_interrupt(int
                pm_wakeup_event(priv->device, 0);
  
        if (unlikely(!dev)) {
                return IRQ_NONE;
        }
  
-@@ -2889,7 +2881,6 @@ static void stmmac_poll_controller(struc
+@@ -2898,7 +2890,6 @@ static void stmmac_poll_controller(struc
   */
  static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
  {
        int ret = -EOPNOTSUPP;
  
        if (!netif_running(dev))
-@@ -2899,9 +2890,9 @@ static int stmmac_ioctl(struct net_devic
+@@ -2908,9 +2899,9 @@ static int stmmac_ioctl(struct net_devic
        case SIOCGMIIPHY:
        case SIOCGMIIREG:
        case SIOCSMIIREG:
                break;
        case SIOCSHWTSTAMP:
                ret = stmmac_hwtstamp_ioctl(dev, rq);
-@@ -2929,14 +2920,17 @@ static void sysfs_display_ring(void *hea
+@@ -2938,14 +2929,17 @@ static void sysfs_display_ring(void *hea
                        x = *(u64 *) ep;
                        seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
                                   i, (unsigned int)virt_to_phys(ep),
                        p++;
                }
                seq_printf(seq, "\n");
-@@ -2968,6 +2962,8 @@ static int stmmac_sysfs_ring_open(struct
+@@ -2977,6 +2971,8 @@ static int stmmac_sysfs_ring_open(struct
        return single_open(file, stmmac_sysfs_ring_read, inode->i_private);
  }
  
  static const struct file_operations stmmac_rings_status_fops = {
        .owner = THIS_MODULE,
        .open = stmmac_sysfs_ring_open,
-@@ -2990,11 +2986,11 @@ static int stmmac_sysfs_dma_cap_read(str
+@@ -2999,11 +2995,11 @@ static int stmmac_sysfs_dma_cap_read(str
        seq_printf(seq, "\tDMA HW features\n");
        seq_printf(seq, "==============================\n");
  
                   (priv->dma_cap.half_duplex) ? "Y" : "N");
        seq_printf(seq, "\tHash Filter: %s\n",
                   (priv->dma_cap.hash_filter) ? "Y" : "N");
-@@ -3012,9 +3008,9 @@ static int stmmac_sysfs_dma_cap_read(str
+@@ -3021,9 +3017,9 @@ static int stmmac_sysfs_dma_cap_read(str
                   (priv->dma_cap.rmon) ? "Y" : "N");
        seq_printf(seq, "\tIEEE 1588-2002 Time Stamp: %s\n",
                   (priv->dma_cap.time_stamp) ? "Y" : "N");
                   (priv->dma_cap.eee) ? "Y" : "N");
        seq_printf(seq, "\tAV features: %s\n", (priv->dma_cap.av) ? "Y" : "N");
        seq_printf(seq, "\tChecksum Offload in TX: %s\n",
-@@ -3061,8 +3057,7 @@ static int stmmac_init_fs(struct net_dev
+@@ -3070,8 +3066,7 @@ static int stmmac_init_fs(struct net_dev
        priv->dbgfs_dir = debugfs_create_dir(dev->name, stmmac_fs_dir);
  
        if (!priv->dbgfs_dir || IS_ERR(priv->dbgfs_dir)) {
  
                return -ENOMEM;
        }
-@@ -3074,7 +3069,7 @@ static int stmmac_init_fs(struct net_dev
+@@ -3083,7 +3078,7 @@ static int stmmac_init_fs(struct net_dev
                                    &stmmac_rings_status_fops);
  
        if (!priv->dbgfs_rings_status || IS_ERR(priv->dbgfs_rings_status)) {
                debugfs_remove_recursive(priv->dbgfs_dir);
  
                return -ENOMEM;
-@@ -3086,7 +3081,7 @@ static int stmmac_init_fs(struct net_dev
+@@ -3095,7 +3090,7 @@ static int stmmac_init_fs(struct net_dev
                                            dev, &stmmac_dma_cap_fops);
  
        if (!priv->dbgfs_dma_cap || IS_ERR(priv->dbgfs_dma_cap)) {
                debugfs_remove_recursive(priv->dbgfs_dir);
  
                return -ENOMEM;
-@@ -3158,11 +3153,11 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3167,11 +3162,11 @@ static int stmmac_hw_init(struct stmmac_
        } else {
                if (chain_mode) {
                        priv->hw->mode = &chain_mode_ops;
                        priv->mode = STMMAC_RING_MODE;
                }
        }
-@@ -3170,7 +3165,7 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3179,7 +3174,7 @@ static int stmmac_hw_init(struct stmmac_
        /* Get the HW capability (new GMAC newer than 3.50a) */
        priv->hw_cap_support = stmmac_get_hw_features(priv);
        if (priv->hw_cap_support) {
  
                /* We can override some gmac/dma configuration fields: e.g.
                 * enh_desc, tx_coe (e.g. that are passed through the
-@@ -3195,8 +3190,9 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3204,8 +3199,9 @@ static int stmmac_hw_init(struct stmmac_
                else if (priv->dma_cap.rx_coe_type1)
                        priv->plat->rx_coe = STMMAC_RX_COE_TYPE1;
  
  
        /* To use alternate (extended), normal or GMAC4 descriptor structures */
        if (priv->synopsys_id >= DWMAC_CORE_4_00)
-@@ -3206,20 +3202,20 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3215,20 +3211,20 @@ static int stmmac_hw_init(struct stmmac_
  
        if (priv->plat->rx_coe) {
                priv->hw->rx_csum = priv->plat->rx_coe;
  
        return 0;
  }
-@@ -3278,8 +3274,8 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3287,8 +3283,8 @@ int stmmac_dvr_probe(struct device *devi
  
        priv->stmmac_clk = devm_clk_get(priv->device, STMMAC_RESOURCE_NAME);
        if (IS_ERR(priv->stmmac_clk)) {
                /* If failed to obtain stmmac_clk and specific clk_csr value
                 * is NOT passed from the platform, probe fail.
                 */
-@@ -3328,7 +3324,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3337,7 +3333,7 @@ int stmmac_dvr_probe(struct device *devi
        if ((priv->plat->tso_en) && (priv->dma_cap.tsoen)) {
                ndev->hw_features |= NETIF_F_TSO;
                priv->tso = true;
        }
        ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA;
        ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
-@@ -3348,13 +3344,13 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3357,13 +3353,13 @@ int stmmac_dvr_probe(struct device *devi
         */
        if ((priv->synopsys_id >= DWMAC_CORE_3_50) && (!priv->plat->riwt_off)) {
                priv->use_riwt = 1;
  
        /* If a specific clk_csr value is passed from the platform
         * this means that the CSR Clock Range selection cannot be
-@@ -3375,15 +3371,17 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3384,15 +3380,17 @@ int stmmac_dvr_probe(struct device *devi
                /* MDIO bus Registration */
                ret = stmmac_mdio_register(ndev);
                if (ret < 0) {
                goto error_netdev_register;
        }
  
-@@ -3394,7 +3392,7 @@ error_netdev_register:
+@@ -3403,7 +3401,7 @@ error_netdev_register:
            priv->hw->pcs != STMMAC_PCS_TBI &&
            priv->hw->pcs != STMMAC_PCS_RTBI)
                stmmac_mdio_unregister(ndev);
        netif_napi_del(&priv->napi);
  error_hw_init:
        clk_disable_unprepare(priv->pclk);
-@@ -3418,7 +3416,7 @@ int stmmac_dvr_remove(struct device *dev
+@@ -3427,7 +3425,7 @@ int stmmac_dvr_remove(struct device *dev
        struct net_device *ndev = dev_get_drvdata(dev);
        struct stmmac_priv *priv = netdev_priv(ndev);
  
  
        priv->hw->dma->stop_rx(priv->ioaddr);
        priv->hw->dma->stop_tx(priv->ioaddr);
-@@ -3456,8 +3454,8 @@ int stmmac_suspend(struct device *dev)
+@@ -3465,8 +3463,8 @@ int stmmac_suspend(struct device *dev)
        if (!ndev || !netif_running(ndev))
                return 0;
  
  
        spin_lock_irqsave(&priv->lock, flags);
  
-@@ -3551,8 +3549,8 @@ int stmmac_resume(struct device *dev)
+@@ -3560,8 +3558,8 @@ int stmmac_resume(struct device *dev)
  
        spin_unlock_irqrestore(&priv->lock, flags);
  
index 31d0456..95eb3de 100644 (file)
   *  a proprietary structure used to pass information to the driver.
   *  Description:
   *  This function configures the MAC to enable/disable both outgoing(TX)
-@@ -612,7 +609,7 @@ static int stmmac_hwtstamp_ioctl(struct
+@@ -621,7 +618,7 @@ static int stmmac_hwtstamp_ioctl(struct
  
                /* program Sub Second Increment reg */
                sec_inc = priv->hw->ptp->config_sub_second_increment(
                        priv->plat->has_gmac4);
                temp = div_u64(1000000000ULL, sec_inc);
  
-@@ -622,7 +619,7 @@ static int stmmac_hwtstamp_ioctl(struct
+@@ -631,7 +628,7 @@ static int stmmac_hwtstamp_ioctl(struct
                 * where, freq_div_ratio = 1e9ns/sec_inc
                 */
                temp = (u64)(temp << 32);
                priv->hw->ptp->config_addend(priv->ptpaddr,
                                             priv->default_addend);
  
-@@ -650,18 +647,6 @@ static int stmmac_init_ptp(struct stmmac
+@@ -659,18 +656,6 @@ static int stmmac_init_ptp(struct stmmac
        if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))
                return -EOPNOTSUPP;
  
        priv->adv_ts = 0;
        /* Check if adv_ts can be enabled for dwmac 4.x core */
        if (priv->plat->has_gmac4 && priv->dma_cap.atime_stamp)
-@@ -688,8 +673,8 @@ static int stmmac_init_ptp(struct stmmac
+@@ -697,8 +682,8 @@ static int stmmac_init_ptp(struct stmmac
  
  static void stmmac_release_ptp(struct stmmac_priv *priv)
  {
        stmmac_ptp_unregister(priv);
  }
  
-@@ -710,7 +695,7 @@ static void stmmac_adjust_link(struct ne
+@@ -719,7 +704,7 @@ static void stmmac_adjust_link(struct ne
        int new_state = 0;
        unsigned int fc = priv->flow_ctrl, pause_time = priv->pause;
  
                return;
  
        spin_lock_irqsave(&priv->lock, flags);
-@@ -737,33 +722,36 @@ static void stmmac_adjust_link(struct ne
+@@ -746,33 +731,36 @@ static void stmmac_adjust_link(struct ne
                        new_state = 1;
                        switch (phydev->speed) {
                        case 1000:
                        priv->speed = phydev->speed;
                }
  
-@@ -776,8 +764,8 @@ static void stmmac_adjust_link(struct ne
+@@ -785,8 +773,8 @@ static void stmmac_adjust_link(struct ne
        } else if (priv->oldlink) {
                new_state = 1;
                priv->oldlink = 0;
        }
  
        if (new_state && netif_msg_link(priv))
-@@ -839,8 +827,8 @@ static int stmmac_init_phy(struct net_de
+@@ -848,8 +836,8 @@ static int stmmac_init_phy(struct net_de
        int interface = priv->plat->interface;
        int max_speed = priv->plat->max_speed;
        priv->oldlink = 0;
  
        if (priv->plat->phy_node) {
                phydev = of_phy_connect(dev, priv->plat->phy_node,
-@@ -892,9 +880,7 @@ static int stmmac_init_phy(struct net_de
+@@ -901,9 +889,7 @@ static int stmmac_init_phy(struct net_de
        if (phydev->is_pseudo_fixed_link)
                phydev->irq = PHY_POLL;
  
        return 0;
  }
  
-@@ -1020,7 +1006,7 @@ static void stmmac_free_rx_buffers(struc
+@@ -1029,7 +1015,7 @@ static void stmmac_free_rx_buffers(struc
   * @dev: net device structure
   * @flags: gfp flag.
   * Description: this function initializes the DMA RX/TX descriptors
   * modes.
   */
  static int init_dma_desc_rings(struct net_device *dev, gfp_t flags)
-@@ -1133,13 +1119,6 @@ static void dma_free_tx_skbufs(struct st
+@@ -1142,13 +1128,6 @@ static void dma_free_tx_skbufs(struct st
        int i;
  
        for (i = 0; i < DMA_TX_SIZE; i++) {
                if (priv->tx_skbuff_dma[i].buf) {
                        if (priv->tx_skbuff_dma[i].map_as_page)
                                dma_unmap_page(priv->device,
-@@ -1153,7 +1132,7 @@ static void dma_free_tx_skbufs(struct st
+@@ -1162,7 +1141,7 @@ static void dma_free_tx_skbufs(struct st
                                                 DMA_TO_DEVICE);
                }
  
                        dev_kfree_skb_any(priv->tx_skbuff[i]);
                        priv->tx_skbuff[i] = NULL;
                        priv->tx_skbuff_dma[i].buf = 0;
-@@ -1277,6 +1256,28 @@ static void free_dma_desc_resources(stru
+@@ -1286,6 +1265,28 @@ static void free_dma_desc_resources(stru
  }
  
  /**
   *  stmmac_dma_operation_mode - HW DMA operation mode
   *  @priv: driver private structure
   *  Description: it is used for configuring the DMA operation mode register in
-@@ -1677,10 +1678,6 @@ static int stmmac_hw_setup(struct net_de
+@@ -1686,10 +1687,6 @@ static int stmmac_hw_setup(struct net_de
        /* Copy the MAC addr into the HW  */
        priv->hw->mac->set_umac_addr(priv->hw, dev->dev_addr, 0);
  
        /* PS and related bits will be programmed according to the speed */
        if (priv->hw->pcs) {
                int speed = priv->plat->mac_port_sel_speed;
-@@ -1697,6 +1694,10 @@ static int stmmac_hw_setup(struct net_de
+@@ -1706,6 +1703,10 @@ static int stmmac_hw_setup(struct net_de
        /* Initialize the MAC Core */
        priv->hw->mac->core_init(priv->hw, dev->mtu);
  
        ret = priv->hw->mac->rx_ipc(priv->hw);
        if (!ret) {
                netdev_warn(priv->dev, "RX IPC Checksum Offload disabled\n");
-@@ -1717,8 +1718,10 @@ static int stmmac_hw_setup(struct net_de
+@@ -1726,8 +1727,10 @@ static int stmmac_hw_setup(struct net_de
  
        if (init_ptp) {
                ret = stmmac_init_ptp(priv);
        }
  
  #ifdef CONFIG_DEBUG_FS
-@@ -1732,11 +1735,6 @@ static int stmmac_hw_setup(struct net_de
+@@ -1741,11 +1744,6 @@ static int stmmac_hw_setup(struct net_de
        priv->hw->dma->start_tx(priv->ioaddr);
        priv->hw->dma->start_rx(priv->ioaddr);
  
        priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS;
  
        if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) {
-@@ -2526,7 +2524,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2535,7 +2533,7 @@ static int stmmac_rx(struct stmmac_priv
                if (unlikely(status == discard_frame)) {
                        priv->dev->stats.rx_errors++;
                        if (priv->hwts_rx_en && !priv->extend_desc) {
                                 * with timestamp value, hence reinitialize
                                 * them in stmmac_rx_refill() function so that
                                 * device can reuse it.
-@@ -2549,7 +2547,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2558,7 +2556,7 @@ static int stmmac_rx(struct stmmac_priv
  
                        frame_len = priv->hw->desc->get_rx_frame_len(p, coe);
  
                         *  (preallocated during init) then the packet is
                         *  ignored
                         */
-@@ -2769,7 +2767,7 @@ static netdev_features_t stmmac_fix_feat
+@@ -2778,7 +2776,7 @@ static netdev_features_t stmmac_fix_feat
        /* Some GMAC devices have a bugged Jumbo frame support that
         * needs to have the Tx COE disabled for oversized frames
         * (due to limited buffer sizes). In this case we disable
         */
        if (priv->plat->bugged_jumbo && (dev->mtu > ETH_DATA_LEN))
                features &= ~NETIF_F_CSUM_MASK;
-@@ -2915,9 +2913,7 @@ static void sysfs_display_ring(void *hea
+@@ -2924,9 +2922,7 @@ static void sysfs_display_ring(void *hea
        struct dma_desc *p = (struct dma_desc *)head;
  
        for (i = 0; i < size; i++) {
                        seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
                                   i, (unsigned int)virt_to_phys(ep),
                                   le32_to_cpu(ep->basic.des0),
-@@ -2926,7 +2922,6 @@ static void sysfs_display_ring(void *hea
+@@ -2935,7 +2931,6 @@ static void sysfs_display_ring(void *hea
                                   le32_to_cpu(ep->basic.des3));
                        ep++;
                } else {
                        seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
                                   i, (unsigned int)virt_to_phys(ep),
                                   le32_to_cpu(p->des0), le32_to_cpu(p->des1),
-@@ -2996,7 +2991,7 @@ static int stmmac_sysfs_dma_cap_read(str
+@@ -3005,7 +3000,7 @@ static int stmmac_sysfs_dma_cap_read(str
                   (priv->dma_cap.hash_filter) ? "Y" : "N");
        seq_printf(seq, "\tMultiple MAC address registers: %s\n",
                   (priv->dma_cap.multi_addr) ? "Y" : "N");
                   (priv->dma_cap.pcs) ? "Y" : "N");
        seq_printf(seq, "\tSMA (MDIO) Interface: %s\n",
                   (priv->dma_cap.sma_mdio) ? "Y" : "N");
-@@ -3272,44 +3267,8 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3281,44 +3276,8 @@ int stmmac_dvr_probe(struct device *devi
        if ((phyaddr >= 0) && (phyaddr <= 31))
                priv->plat->phy_addr = phyaddr;
  
  
        /* Init MAC and get the capabilities */
        ret = stmmac_hw_init(priv);
-@@ -3395,10 +3354,6 @@ error_netdev_register:
+@@ -3404,10 +3363,6 @@ error_netdev_register:
  error_mdio_register:
        netif_napi_del(&priv->napi);
  error_hw_init:
        free_netdev(ndev);
  
        return ret;
-@@ -3424,10 +3379,10 @@ int stmmac_dvr_remove(struct device *dev
+@@ -3433,10 +3388,10 @@ int stmmac_dvr_remove(struct device *dev
        stmmac_set_mac(priv->ioaddr, false);
        netif_carrier_off(ndev);
        unregister_netdev(ndev);
        if (priv->hw->pcs != STMMAC_PCS_RGMII &&
            priv->hw->pcs != STMMAC_PCS_TBI &&
            priv->hw->pcs != STMMAC_PCS_RTBI)
-@@ -3476,14 +3431,14 @@ int stmmac_suspend(struct device *dev)
+@@ -3485,14 +3440,14 @@ int stmmac_suspend(struct device *dev)
                stmmac_set_mac(priv->ioaddr, false);
                pinctrl_pm_select_sleep_state(priv->device);
                /* Disable clock in case of PWM is off */
        return 0;
  }
  EXPORT_SYMBOL_GPL(stmmac_suspend);
-@@ -3516,9 +3471,9 @@ int stmmac_resume(struct device *dev)
+@@ -3525,9 +3480,9 @@ int stmmac_resume(struct device *dev)
                priv->irq_wake = 0;
        } else {
                pinctrl_pm_select_default_state(priv->device);
index 1356a4b..aa6b813 100644 (file)
        }
  }
  
-@@ -477,7 +552,10 @@ static int stmmac_hwtstamp_ioctl(struct
-                       /* PTP v1, UDP, any kind of event packet */
-                       config.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
-                       /* take time stamp for all event messages */
--                      snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
-+                      if (priv->plat->has_gmac4)
-+                              snap_type_sel = PTP_GMAC4_TCR_SNAPTYPSEL_1;
-+                      else
-+                              snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
-                       ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
-                       ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
-@@ -509,7 +587,10 @@ static int stmmac_hwtstamp_ioctl(struct
-                       config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;
-                       ptp_v2 = PTP_TCR_TSVER2ENA;
-                       /* take time stamp for all event messages */
--                      snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
-+                      if (priv->plat->has_gmac4)
-+                              snap_type_sel = PTP_GMAC4_TCR_SNAPTYPSEL_1;
-+                      else
-+                              snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
-                       ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
-                       ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
-@@ -543,7 +624,10 @@ static int stmmac_hwtstamp_ioctl(struct
-                       config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
-                       ptp_v2 = PTP_TCR_TSVER2ENA;
-                       /* take time stamp for all event messages */
--                      snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
-+                      if (priv->plat->has_gmac4)
-+                              snap_type_sel = PTP_GMAC4_TCR_SNAPTYPSEL_1;
-+                      else
-+                              snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
-                       ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
-                       ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
-@@ -679,6 +763,19 @@ static void stmmac_release_ptp(struct st
+@@ -688,6 +763,19 @@ static void stmmac_release_ptp(struct st
  }
  
  /**
   * stmmac_adjust_link - adjusts the link parameters
   * @dev: net device structure
   * Description: this is the helper called by the physical abstraction layer
-@@ -693,7 +790,6 @@ static void stmmac_adjust_link(struct ne
+@@ -702,7 +790,6 @@ static void stmmac_adjust_link(struct ne
        struct phy_device *phydev = dev->phydev;
        unsigned long flags;
        int new_state = 0;
  
        if (!phydev)
                return;
-@@ -715,8 +811,7 @@ static void stmmac_adjust_link(struct ne
+@@ -724,8 +811,7 @@ static void stmmac_adjust_link(struct ne
                }
                /* Flow Control operation */
                if (phydev->pause)
  
                if (phydev->speed != priv->speed) {
                        new_state = 1;
-@@ -884,22 +979,56 @@ static int stmmac_init_phy(struct net_de
+@@ -893,22 +979,56 @@ static int stmmac_init_phy(struct net_de
        return 0;
  }
  
 +
 +              /* Display RX ring */
 +              priv->hw->desc->display_ring(head_rx, DMA_RX_SIZE, true);
-       }
++      }
 +}
 +
 +static void stmmac_display_tx_rings(struct stmmac_priv *priv)
 +                      head_tx = (void *)tx_q->dma_etx;
 +              else
 +                      head_tx = (void *)tx_q->dma_tx;
--      /* Display Rx ring */
--      priv->hw->desc->display_ring(head_rx, DMA_RX_SIZE, true);
--      /* Display Tx ring */
--      priv->hw->desc->display_ring(head_tx, DMA_TX_SIZE, false);
++
 +              priv->hw->desc->display_ring(head_tx, DMA_TX_SIZE, false);
-+      }
+       }
 +}
 +
 +static void stmmac_display_rings(struct stmmac_priv *priv)
 +{
 +      /* Display RX ring */
 +      stmmac_display_rx_rings(priv);
-+
+-      /* Display Rx ring */
+-      priv->hw->desc->display_ring(head_rx, DMA_RX_SIZE, true);
+-      /* Display Tx ring */
+-      priv->hw->desc->display_ring(head_tx, DMA_TX_SIZE, false);
 +      /* Display TX ring */
 +      stmmac_display_tx_rings(priv);
  }
  
  static int stmmac_set_bfsize(int mtu, int bufsize)
-@@ -919,48 +1048,88 @@ static int stmmac_set_bfsize(int mtu, in
+@@ -928,48 +1048,88 @@ static int stmmac_set_bfsize(int mtu, in
  }
  
  /**
        struct sk_buff *skb;
  
        skb = __netdev_alloc_skb_ip_align(priv->dev, priv->dma_buf_sz, flags);
-@@ -969,20 +1138,20 @@ static int stmmac_init_rx_buffers(struct
+@@ -978,20 +1138,20 @@ static int stmmac_init_rx_buffers(struct
                           "%s: Rx init fails; skb is NULL\n", __func__);
                return -ENOMEM;
        }
  
        if ((priv->hw->mode->init_desc3) &&
            (priv->dma_buf_sz == BUF_SIZE_16KiB))
-@@ -991,30 +1160,71 @@ static int stmmac_init_rx_buffers(struct
+@@ -1000,30 +1160,71 @@ static int stmmac_init_rx_buffers(struct
        return 0;
  }
  
  
        if (priv->hw->mode->set_16kib_bfsize)
                bfsize = priv->hw->mode->set_16kib_bfsize(dev->mtu);
-@@ -1024,235 +1234,409 @@ static int init_dma_desc_rings(struct ne
+@@ -1033,235 +1234,409 @@ static int init_dma_desc_rings(struct ne
  
        priv->dma_buf_sz = bfsize;
  
 -                      p = priv->dma_rx + i;
 +      for (queue = 0; queue < rx_count; queue++) {
 +              struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
-+
+-              ret = stmmac_init_rx_buffers(priv, p, i, flags);
+-              if (ret)
+-                      goto err_init_rx_buffers;
 +              netif_dbg(priv, probe, priv->dev,
 +                        "(%s) dma_rx_phy=0x%08x\n", __func__,
 +                        (u32)rx_q->dma_rx_phy);
-+
+-              netif_dbg(priv, probe, priv->dev, "[%p]\t[%p]\t[%x]\n",
+-                        priv->rx_skbuff[i], priv->rx_skbuff[i]->data,
+-                        (unsigned int)priv->rx_skbuff_dma[i]);
 +              for (i = 0; i < DMA_RX_SIZE; i++) {
 +                      struct dma_desc *p;
 +
 +                                rx_q->rx_skbuff[i], rx_q->rx_skbuff[i]->data,
 +                                (unsigned int)rx_q->rx_skbuff_dma[i]);
 +              }
--              ret = stmmac_init_rx_buffers(priv, p, i, flags);
--              if (ret)
--                      goto err_init_rx_buffers;
++
 +              rx_q->cur_rx = 0;
 +              rx_q->dirty_rx = (unsigned int)(i - DMA_RX_SIZE);
--              netif_dbg(priv, probe, priv->dev, "[%p]\t[%p]\t[%x]\n",
--                        priv->rx_skbuff[i], priv->rx_skbuff[i]->data,
--                        (unsigned int)priv->rx_skbuff_dma[i]);
++
 +              stmmac_clear_rx_descriptors(priv, queue);
 +
 +              /* Setup the chained descriptor addresses */
 +err_dma_buffers:
 +      free_dma_tx_desc_resources(priv);
 +
-       return ret;
- }
++      return ret;
++}
++
 +/**
 + * alloc_dma_desc_resources - alloc TX/RX resources.
 + * @priv: private structure
 +
 +      ret = alloc_dma_tx_desc_resources(priv);
 +
-+      return ret;
-+}
-+
+       return ret;
+ }
 +/**
 + * free_dma_desc_resources - free dma desc resources
 + * @priv: private structure
  }
  
  /**
-@@ -1262,19 +1646,104 @@ static void free_dma_desc_resources(stru
+@@ -1271,19 +1646,104 @@ static void free_dma_desc_resources(stru
   */
  static void stmmac_mac_enable_rx_queues(struct stmmac_priv *priv)
  {
  }
  
  /**
-@@ -1285,11 +1754,20 @@ static void stmmac_mac_enable_rx_queues(
+@@ -1294,11 +1754,20 @@ static void stmmac_mac_enable_rx_queues(
   */
  static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
  {
                /*
                 * In case of GMAC, SF mode can be enabled
                 * to perform the TX COE in HW. This depends on:
-@@ -1297,37 +1775,53 @@ static void stmmac_dma_operation_mode(st
+@@ -1306,37 +1775,53 @@ static void stmmac_dma_operation_mode(st
                 * 2) There is no bugged Jumbo frame support
                 *    that needs to not insert csum in the TDES.
                 */
  
                status = priv->hw->desc->tx_status(&priv->dev->stats,
                                                      &priv->xstats, p,
-@@ -1348,48 +1842,51 @@ static void stmmac_tx_clean(struct stmma
+@@ -1357,48 +1842,51 @@ static void stmmac_tx_clean(struct stmma
                        stmmac_get_tx_hwtstamp(priv, p, skb);
                }
  
        }
  
        if ((priv->eee_enabled) && (!priv->tx_path_in_lpi_mode)) {
-@@ -1399,45 +1896,76 @@ static void stmmac_tx_clean(struct stmma
+@@ -1408,45 +1896,76 @@ static void stmmac_tx_clean(struct stmma
        netif_tx_unlock(priv->dev);
  }
  
  }
  
  /**
-@@ -1449,31 +1977,43 @@ static void stmmac_tx_err(struct stmmac_
+@@ -1458,31 +1977,43 @@ static void stmmac_tx_err(struct stmmac_
   */
  static void stmmac_dma_interrupt(struct stmmac_priv *priv)
  {
  }
  
  /**
-@@ -1580,6 +2120,13 @@ static void stmmac_check_ether_addr(stru
+@@ -1589,6 +2120,13 @@ static void stmmac_check_ether_addr(stru
   */
  static int stmmac_init_dma_engine(struct stmmac_priv *priv)
  {
        int atds = 0;
        int ret = 0;
  
-@@ -1597,19 +2144,49 @@ static int stmmac_init_dma_engine(struct
+@@ -1606,19 +2144,49 @@ static int stmmac_init_dma_engine(struct
                return ret;
        }
  
        }
  
        if (priv->plat->axi && priv->hw->dma->axi)
-@@ -1627,8 +2204,12 @@ static int stmmac_init_dma_engine(struct
+@@ -1636,8 +2204,12 @@ static int stmmac_init_dma_engine(struct
  static void stmmac_tx_timer(unsigned long data)
  {
        struct stmmac_priv *priv = (struct stmmac_priv *)data;
  }
  
  /**
-@@ -1650,6 +2231,196 @@ static void stmmac_init_tx_coalesce(stru
+@@ -1659,6 +2231,196 @@ static void stmmac_init_tx_coalesce(stru
        add_timer(&priv->txtimer);
  }
  
  /**
   * stmmac_hw_setup - setup mac in a usable state.
   *  @dev : pointer to the device structure.
-@@ -1665,6 +2436,9 @@ static void stmmac_init_tx_coalesce(stru
+@@ -1674,6 +2436,9 @@ static void stmmac_init_tx_coalesce(stru
  static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
  {
        struct stmmac_priv *priv = netdev_priv(dev);
        int ret;
  
        /* DMA initialization and SW reset */
-@@ -1694,9 +2468,9 @@ static int stmmac_hw_setup(struct net_de
+@@ -1703,9 +2468,9 @@ static int stmmac_hw_setup(struct net_de
        /* Initialize the MAC Core */
        priv->hw->mac->core_init(priv->hw, dev->mtu);
  
  
        ret = priv->hw->mac->rx_ipc(priv->hw);
        if (!ret) {
-@@ -1706,10 +2480,7 @@ static int stmmac_hw_setup(struct net_de
+@@ -1715,10 +2480,7 @@ static int stmmac_hw_setup(struct net_de
        }
  
        /* Enable the MAC Rx/Tx */
  
        /* Set the HW DMA mode and the COE */
        stmmac_dma_operation_mode(priv);
-@@ -1717,6 +2488,10 @@ static int stmmac_hw_setup(struct net_de
+@@ -1726,6 +2488,10 @@ static int stmmac_hw_setup(struct net_de
        stmmac_mmc_setup(priv);
  
        if (init_ptp) {
                ret = stmmac_init_ptp(priv);
                if (ret == -EOPNOTSUPP)
                        netdev_warn(priv->dev, "PTP not supported by HW\n");
-@@ -1731,35 +2506,37 @@ static int stmmac_hw_setup(struct net_de
+@@ -1740,35 +2506,37 @@ static int stmmac_hw_setup(struct net_de
                            __func__);
  #endif
        /* Start the ball rolling... */
  /**
   *  stmmac_open - open entry point of the driver
   *  @dev : pointer to the device structure.
-@@ -1828,7 +2605,7 @@ static int stmmac_open(struct net_device
+@@ -1837,7 +2605,7 @@ static int stmmac_open(struct net_device
                netdev_err(priv->dev,
                           "%s: ERROR: allocating the IRQ %d (error: %d)\n",
                           __func__, dev->irq, ret);
        }
  
        /* Request the Wake IRQ in case of another line is used for WoL */
-@@ -1855,8 +2632,8 @@ static int stmmac_open(struct net_device
+@@ -1864,8 +2632,8 @@ static int stmmac_open(struct net_device
                }
        }
  
  
        return 0;
  
-@@ -1865,7 +2642,12 @@ lpiirq_error:
+@@ -1874,7 +2642,12 @@ lpiirq_error:
                free_irq(priv->wol_irq, dev);
  wolirq_error:
        free_irq(dev->irq, dev);
  init_error:
        free_dma_desc_resources(priv);
  dma_desc_error:
-@@ -1894,9 +2676,9 @@ static int stmmac_release(struct net_dev
+@@ -1903,9 +2676,9 @@ static int stmmac_release(struct net_dev
                phy_disconnect(dev->phydev);
        }
  
  
        del_timer_sync(&priv->txtimer);
  
-@@ -1908,14 +2690,13 @@ static int stmmac_release(struct net_dev
+@@ -1917,14 +2690,13 @@ static int stmmac_release(struct net_dev
                free_irq(priv->lpi_irq, dev);
  
        /* Stop TX/RX DMA and clear the descriptors */
  
        netif_carrier_off(dev);
  
-@@ -1934,22 +2715,24 @@ static int stmmac_release(struct net_dev
+@@ -1943,22 +2715,24 @@ static int stmmac_release(struct net_dev
   *  @des: buffer start address
   *  @total_len: total length to fill in descriptors
   *  @last_segmant: condition for the last descriptor
  
                desc->des0 = cpu_to_le32(des + (total_len - tmp_len));
                buff_size = tmp_len >= TSO_MAX_BUFF_SIZE ?
-@@ -1957,7 +2740,7 @@ static void stmmac_tso_allocator(struct
+@@ -1966,7 +2740,7 @@ static void stmmac_tso_allocator(struct
  
                priv->hw->desc->prepare_tso_tx_desc(desc, 0, buff_size,
                        0, 1,
                        0, 0);
  
                tmp_len -= TSO_MAX_BUFF_SIZE;
-@@ -1993,23 +2776,28 @@ static void stmmac_tso_allocator(struct
+@@ -2002,23 +2776,28 @@ static void stmmac_tso_allocator(struct
   */
  static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
  {
                        /* This is a hard error, log it. */
                        netdev_err(priv->dev,
                                   "%s: Tx Ring full when queue awake\n",
-@@ -2024,10 +2812,10 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2033,10 +2812,10 @@ static netdev_tx_t stmmac_tso_xmit(struc
  
        /* set new MSS value if needed */
        if (mss != priv->mss) {
        }
  
        if (netif_msg_tx_queued(priv)) {
-@@ -2037,9 +2825,9 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2046,9 +2825,9 @@ static netdev_tx_t stmmac_tso_xmit(struc
                        skb->data_len);
        }
  
        first = desc;
  
        /* first descriptor: fill Headers on Buf1 */
-@@ -2048,9 +2836,8 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2057,9 +2836,8 @@ static netdev_tx_t stmmac_tso_xmit(struc
        if (dma_mapping_error(priv->device, des))
                goto dma_map_err;
  
  
        first->des0 = cpu_to_le32(des);
  
-@@ -2061,7 +2848,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2070,7 +2848,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
        /* If needed take extra descriptors to fill the remaining payload */
        tmp_pay_len = pay_len - TSO_MAX_BUFF_SIZE;
  
  
        /* Prepare fragments */
        for (i = 0; i < nfrags; i++) {
-@@ -2070,24 +2857,34 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2079,24 +2857,34 @@ static netdev_tx_t stmmac_tso_xmit(struc
                des = skb_frag_dma_map(priv->device, frag, 0,
                                       skb_frag_size(frag),
                                       DMA_TO_DEVICE);
        }
  
        dev->stats.tx_bytes += skb->len;
-@@ -2119,7 +2916,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2128,7 +2916,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
        priv->hw->desc->prepare_tso_tx_desc(first, 1,
                        proto_hdr_len,
                        pay_len,
                        tcp_hdrlen(skb) / 4, (skb->len - proto_hdr_len));
  
        /* If context desc is used to change MSS */
-@@ -2134,20 +2931,20 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2143,20 +2931,20 @@ static netdev_tx_t stmmac_tso_xmit(struc
  
        if (netif_msg_pktdata(priv)) {
                pr_info("%s: curr=%d dirty=%d f=%d, e=%d, f_p=%p, nfrags %d\n",
  
        return NETDEV_TX_OK;
  
-@@ -2171,21 +2968,27 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2180,21 +2968,27 @@ static netdev_tx_t stmmac_xmit(struct sk
        struct stmmac_priv *priv = netdev_priv(dev);
        unsigned int nopaged_len = skb_headlen(skb);
        int i, csum_insertion = 0, is_jumbo = 0;
                        /* This is a hard error, log it. */
                        netdev_err(priv->dev,
                                   "%s: Tx Ring full when queue awake\n",
-@@ -2197,20 +3000,18 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2206,20 +3000,18 @@ static netdev_tx_t stmmac_xmit(struct sk
        if (priv->tx_path_in_lpi_mode)
                stmmac_disable_eee_mode(priv);
  
        enh_desc = priv->plat->enh_desc;
        /* To program the descriptors according to the size of the frame */
        if (enh_desc)
-@@ -2218,7 +3019,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2227,7 +3019,7 @@ static netdev_tx_t stmmac_xmit(struct sk
  
        if (unlikely(is_jumbo) && likely(priv->synopsys_id <
                                         DWMAC_CORE_4_00)) {
                if (unlikely(entry < 0))
                        goto dma_map_err;
        }
-@@ -2231,48 +3032,56 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2240,48 +3032,56 @@ static netdev_tx_t stmmac_xmit(struct sk
                entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE);
  
                if (likely(priv->extend_desc))
  
                priv->hw->desc->display_ring(tx_head, DMA_TX_SIZE, false);
  
-@@ -2280,10 +3089,10 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2289,10 +3089,10 @@ static netdev_tx_t stmmac_xmit(struct sk
                print_pkt(skb->data, skb->len);
        }
  
        }
  
        dev->stats.tx_bytes += skb->len;
-@@ -2318,14 +3127,14 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2327,14 +3127,14 @@ static netdev_tx_t stmmac_xmit(struct sk
                if (dma_mapping_error(priv->device, des))
                        goto dma_map_err;
  
  
                if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
                             priv->hwts_tx_en)) {
-@@ -2337,7 +3146,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2346,7 +3146,7 @@ static netdev_tx_t stmmac_xmit(struct sk
                /* Prepare the first descriptor setting the OWN bit too */
                priv->hw->desc->prepare_tx_desc(first, 1, nopaged_len,
                                                csum_insertion, priv->mode, 1,
  
                /* The own bit must be the latest setting done when prepare the
                 * descriptor and then barrier is needed to make sure that
-@@ -2346,13 +3155,13 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2355,13 +3155,13 @@ static netdev_tx_t stmmac_xmit(struct sk
                dma_wmb();
        }
  
  
        return NETDEV_TX_OK;
  
-@@ -2380,9 +3189,9 @@ static void stmmac_rx_vlan(struct net_de
+@@ -2389,9 +3189,9 @@ static void stmmac_rx_vlan(struct net_de
  }
  
  
                return 0;
  
        return 1;
-@@ -2391,30 +3200,33 @@ static inline int stmmac_rx_threshold_co
+@@ -2400,30 +3200,33 @@ static inline int stmmac_rx_threshold_co
  /**
   * stmmac_rx_refill - refill used skb preallocated buffers
   * @priv: driver private structure
                                if (unlikely(net_ratelimit()))
                                        dev_err(priv->device,
                                                "fail to alloc skb entry %d\n",
-@@ -2422,28 +3234,28 @@ static inline void stmmac_rx_refill(stru
+@@ -2431,28 +3234,28 @@ static inline void stmmac_rx_refill(stru
                                break;
                        }
  
  
                        netif_dbg(priv, rx_status, priv->dev,
                                  "refill entry #%d\n", entry);
-@@ -2459,31 +3271,33 @@ static inline void stmmac_rx_refill(stru
+@@ -2468,31 +3271,33 @@ static inline void stmmac_rx_refill(stru
  
                entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE);
        }
  
                priv->hw->desc->display_ring(rx_head, DMA_RX_SIZE, true);
        }
-@@ -2493,9 +3307,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2502,9 +3307,9 @@ static int stmmac_rx(struct stmmac_priv
                struct dma_desc *np;
  
                if (priv->extend_desc)
  
                /* read the status of the incoming frame */
                status = priv->hw->desc->rx_status(&priv->dev->stats,
-@@ -2506,20 +3320,20 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2515,20 +3320,20 @@ static int stmmac_rx(struct stmmac_priv
  
                count++;
  
                                                           entry);
                if (unlikely(status == discard_frame)) {
                        priv->dev->stats.rx_errors++;
-@@ -2529,9 +3343,9 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2538,9 +3343,9 @@ static int stmmac_rx(struct stmmac_priv
                                 * them in stmmac_rx_refill() function so that
                                 * device can reuse it.
                                 */
                                                 priv->dma_buf_sz,
                                                 DMA_FROM_DEVICE);
                        }
-@@ -2579,7 +3393,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2588,7 +3393,7 @@ static int stmmac_rx(struct stmmac_priv
                         */
                        if (unlikely(!priv->plat->has_gmac4 &&
                                     ((frame_len < priv->rx_copybreak) ||
                                skb = netdev_alloc_skb_ip_align(priv->dev,
                                                                frame_len);
                                if (unlikely(!skb)) {
-@@ -2591,21 +3405,21 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2600,21 +3405,21 @@ static int stmmac_rx(struct stmmac_priv
                                }
  
                                dma_sync_single_for_cpu(priv->device,
                                if (unlikely(!skb)) {
                                        netdev_err(priv->dev,
                                                   "%s: Inconsistent Rx chain\n",
-@@ -2614,12 +3428,12 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2623,12 +3428,12 @@ static int stmmac_rx(struct stmmac_priv
                                        break;
                                }
                                prefetch(skb->data - NET_IP_ALIGN);
                                                 priv->dma_buf_sz,
                                                 DMA_FROM_DEVICE);
                        }
-@@ -2641,7 +3455,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2650,7 +3455,7 @@ static int stmmac_rx(struct stmmac_priv
                        else
                                skb->ip_summed = CHECKSUM_UNNECESSARY;
  
  
                        priv->dev->stats.rx_packets++;
                        priv->dev->stats.rx_bytes += frame_len;
-@@ -2649,7 +3463,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2658,7 +3463,7 @@ static int stmmac_rx(struct stmmac_priv
                entry = next_entry;
        }
  
  
        priv->xstats.rx_pkt_n += count;
  
-@@ -2666,16 +3480,24 @@ static int stmmac_rx(struct stmmac_priv
+@@ -2675,16 +3480,24 @@ static int stmmac_rx(struct stmmac_priv
   */
  static int stmmac_poll(struct napi_struct *napi, int budget)
  {
        }
        return work_done;
  }
-@@ -2691,9 +3513,12 @@ static int stmmac_poll(struct napi_struc
+@@ -2700,9 +3513,12 @@ static int stmmac_poll(struct napi_struc
  static void stmmac_tx_timeout(struct net_device *dev)
  {
        struct stmmac_priv *priv = netdev_priv(dev);
  }
  
  /**
-@@ -2816,6 +3641,12 @@ static irqreturn_t stmmac_interrupt(int
+@@ -2825,6 +3641,12 @@ static irqreturn_t stmmac_interrupt(int
  {
        struct net_device *dev = (struct net_device *)dev_id;
        struct stmmac_priv *priv = netdev_priv(dev);
  
        if (priv->irq_wake)
                pm_wakeup_event(priv->device, 0);
-@@ -2829,16 +3660,30 @@ static irqreturn_t stmmac_interrupt(int
+@@ -2838,16 +3660,30 @@ static irqreturn_t stmmac_interrupt(int
        if ((priv->plat->has_gmac) || (priv->plat->has_gmac4)) {
                int status = priv->hw->mac->host_irq_status(priv->hw,
                                                            &priv->xstats);
                }
  
                /* PCS link status */
-@@ -2923,7 +3768,7 @@ static void sysfs_display_ring(void *hea
+@@ -2932,7 +3768,7 @@ static void sysfs_display_ring(void *hea
                        ep++;
                } else {
                        seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
                                   le32_to_cpu(p->des0), le32_to_cpu(p->des1),
                                   le32_to_cpu(p->des2), le32_to_cpu(p->des3));
                        p++;
-@@ -2936,17 +3781,40 @@ static int stmmac_sysfs_ring_read(struct
+@@ -2945,17 +3781,40 @@ static int stmmac_sysfs_ring_read(struct
  {
        struct net_device *dev = seq->private;
        struct stmmac_priv *priv = netdev_priv(dev);
        }
  
        return 0;
-@@ -3229,11 +4097,14 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3238,11 +4097,14 @@ int stmmac_dvr_probe(struct device *devi
                     struct plat_stmmacenet_data *plat_dat,
                     struct stmmac_resources *res)
  {
        if (!ndev)
                return -ENOMEM;
  
-@@ -3275,6 +4146,10 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3284,6 +4146,10 @@ int stmmac_dvr_probe(struct device *devi
        if (ret)
                goto error_hw_init;
  
        ndev->netdev_ops = &stmmac_netdev_ops;
  
        ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-@@ -3307,7 +4182,12 @@ int stmmac_dvr_probe(struct device *devi
+@@ -3316,7 +4182,12 @@ int stmmac_dvr_probe(struct device *devi
                         "Enable RX Mitigation via HW Watchdog Timer\n");
        }
  
  
        spin_lock_init(&priv->lock);
  
-@@ -3352,7 +4232,11 @@ error_netdev_register:
+@@ -3361,7 +4232,11 @@ error_netdev_register:
            priv->hw->pcs != STMMAC_PCS_RTBI)
                stmmac_mdio_unregister(ndev);
  error_mdio_register:
  error_hw_init:
        free_netdev(ndev);
  
-@@ -3373,10 +4257,9 @@ int stmmac_dvr_remove(struct device *dev
+@@ -3382,10 +4257,9 @@ int stmmac_dvr_remove(struct device *dev
  
        netdev_info(priv->dev, "%s: removing driver", __func__);
  
        netif_carrier_off(ndev);
        unregister_netdev(ndev);
        if (priv->plat->stmmac_rst)
-@@ -3415,20 +4298,19 @@ int stmmac_suspend(struct device *dev)
+@@ -3424,20 +4298,19 @@ int stmmac_suspend(struct device *dev)
        spin_lock_irqsave(&priv->lock, flags);
  
        netif_device_detach(ndev);
                pinctrl_pm_select_sleep_state(priv->device);
                /* Disable clock in case of PWM is off */
                clk_disable(priv->plat->pclk);
-@@ -3444,6 +4326,31 @@ int stmmac_suspend(struct device *dev)
+@@ -3453,6 +4326,31 @@ int stmmac_suspend(struct device *dev)
  EXPORT_SYMBOL_GPL(stmmac_suspend);
  
  /**
   * stmmac_resume - resume callback
   * @dev: device pointer
   * Description: when resume this function is invoked to setup the DMA and CORE
-@@ -3483,10 +4390,8 @@ int stmmac_resume(struct device *dev)
+@@ -3492,10 +4390,8 @@ int stmmac_resume(struct device *dev)
  
        spin_lock_irqsave(&priv->lock, flags);
  
        /* reset private mss value to force mss context settings at
         * next tso xmit (only used for gmac4).
         */
-@@ -3498,9 +4403,9 @@ int stmmac_resume(struct device *dev)
+@@ -3507,9 +4403,9 @@ int stmmac_resume(struct device *dev)
        stmmac_init_tx_coalesce(priv);
        stmmac_set_rx_mode(ndev);
  
                plat->clk_ptp_rate = clk_get_rate(plat->clk_ptp_ref);
                dev_dbg(&pdev->dev, "PTP rate %d\n", plat->clk_ptp_rate);
        }
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
-@@ -59,7 +59,8 @@
- /* Enable Snapshot for Messages Relevant to Master */
- #define       PTP_TCR_TSMSTRENA       BIT(15)
- /* Select PTP packets for Taking Snapshots */
--#define       PTP_TCR_SNAPTYPSEL_1    GENMASK(17, 16)
-+#define       PTP_TCR_SNAPTYPSEL_1    BIT(16)
-+#define       PTP_GMAC4_TCR_SNAPTYPSEL_1      GENMASK(17, 16)
- /* Enable MAC address for PTP Frame Filtering */
- #define       PTP_TCR_TSENMACADDR     BIT(18)
 --- a/include/linux/stmmac.h
 +++ b/include/linux/stmmac.h
 @@ -28,6 +28,9 @@