kernel: bump 5.4 to 5.4.111
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 11 Apr 2021 13:43:19 +0000 (15:43 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 11 Apr 2021 15:35:12 +0000 (17:35 +0200)
Refreshed all patches.

The following patches were manually changed:
* 610-netfilter_match_bypass_default_checks.patch
* 611-netfilter_match_bypass_default_table.patch
* 802-can-0002-can-rx-offload-fix-long-lines.patch
* 802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
* 802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
* 802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
* 802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
* 802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch

The can-dev.ko model was moved in the upstream kernel.

Compile-tested on: x86/64, armvirt/64, ath79/generic
Runtime-tested on: x86/64, armvirt/64, ath79/generic

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
75 files changed:
include/kernel-version.mk
package/kernel/linux/modules/can.mk
target/linux/bcm4908/patches-5.4/071-v5.12-0001-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch
target/linux/bcm4908/patches-5.4/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch
target/linux/bcm4908/patches-5.4/075-v5.13-0003-net-dsa-bcm_sf2-Fill-in-BCM4908-CFP-entries.patch
target/linux/bcm4908/patches-5.4/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch
target/linux/bcm4908/patches-5.4/075-v5.13-0005-net-dsa-bcm_sf2-fix-BCM4908-RGMII-reg-s.patch
target/linux/bcm4908/patches-5.4/700-net-dsa-bcm_sf2-enable-GPHY-for-switch-probing.patch
target/linux/bcm4908/patches-5.4/701-net-dsa-bcm_sf2-keep-GPHY-enabled-on-the-BCM4908.patch
target/linux/bcm53xx/patches-5.4/034-v5.11-0011-ARM-dts-BCM5301X-Add-a-default-compatible-for-switch.patch
target/linux/bcm53xx/patches-5.4/034-v5.11-0012-ARM-dts-BCM5301X-Provide-defaults-ports-container-no.patch
target/linux/generic/hack-5.4/204-module_strip.patch
target/linux/generic/hack-5.4/721-phy_packets.patch
target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch
target/linux/generic/pending-5.4/610-netfilter_match_bypass_default_checks.patch
target/linux/generic/pending-5.4/611-netfilter_match_bypass_default_table.patch
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
target/linux/generic/pending-5.4/920-mangle_bootargs.patch
target/linux/ipq806x/patches-5.4/092-1-v5.7-qcom-cpufreq-nvmem-Add-support-for-krait-based-socs.patch
target/linux/layerscape/patches-5.4/302-dts-0006-arm64-dts-ls1012a-accumulated-change-for-ls1012a-boa.patch
target/linux/layerscape/patches-5.4/302-dts-0007-arm64-dts-ls1043a-accumulated-change-for-ls1043a-boa.patch
target/linux/layerscape/patches-5.4/302-dts-0008-arm64-dts-ls1046a-accumulated-change-to-ls1046a-boar.patch
target/linux/layerscape/patches-5.4/302-dts-0016-arm64-dts-ls104x-add-iommu-map-to-pci-controllers.patch
target/linux/layerscape/patches-5.4/302-dts-0017-arm64-dts-ls104x-make-dma-coherent-global-to-the-SoC.patch
target/linux/layerscape/patches-5.4/302-dts-0018-arm64-dts-ls104x-use-a-pseudo-bus-to-constrain-usb-d.patch
target/linux/layerscape/patches-5.4/302-dts-0026-arm64-dts-nxp-add-more-thermal-zone-support.patch
target/linux/layerscape/patches-5.4/302-dts-0036-arm64-dts-ls104x-constrain-sata-dma-address-size.patch
target/linux/layerscape/patches-5.4/302-dts-0040-arm64-dts-ls1012a-reorganize-pfe_mac-nodes.patch
target/linux/layerscape/patches-5.4/302-dts-0045-arm64-dts-Fix-DWC3-IP-VBUS-glitch-issue-on-Layerscap.patch
target/linux/layerscape/patches-5.4/302-dts-0051-arm64-dts-fsl-layerscape-fix-warnings-when-compiling.patch
target/linux/layerscape/patches-5.4/302-dts-0063-arm64-dts-fsl-remove-backplane-support.patch
target/linux/layerscape/patches-5.4/302-dts-0070-arm64-dts-ls1012a-ls1043a-ls1046a-ls1088a-ls208xa-re.patch
target/linux/layerscape/patches-5.4/302-dts-0097-LF-387-5-arm64-dts-layerscape-add-chip-specific-comp.patch
target/linux/layerscape/patches-5.4/302-dts-0098-LF-403-ARM64-dts-fsl-Add-clock-names-mclk0-for-SAI-n.patch
target/linux/layerscape/patches-5.4/302-dts-0099-arm64-dts-layerscape-apply-dma-coherent-for-dwc3-nod.patch
target/linux/layerscape/patches-5.4/302-dts-0102-LF-20-1-arm64-dts-ls1012ardb-Update-qspi-node-dts-pr.patch
target/linux/layerscape/patches-5.4/302-dts-0107-arm64-dts-ls1012ardb-Update-qspi-node-property.patch
target/linux/layerscape/patches-5.4/302-dts-0120-arm64-dts-ls1046a-fix-ippdexpcr-offset-not-correct.patch
target/linux/layerscape/patches-5.4/302-dts-0121-arm64-dts-ls1043a-update-USB-nodes-status-to-match-b.patch
target/linux/layerscape/patches-5.4/302-dts-0122-arm64-dts-ls1043a-remove-thermal-zone-5-from-dts.patch
target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch
target/linux/layerscape/patches-5.4/701-net-0381-net-dsa-Pass-pcs_poll-flag-from-driver-to-PHYLINK.patch
target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch
target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
target/linux/layerscape/patches-5.4/802-can-0008-can-flexcan-flexcan_irq_state-only-read-timestamp-if.patch
target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
target/linux/layerscape/patches-5.4/802-can-0010-can-flexcan-flexcan_irq-rename-variable-reg_iflag-re.patch
target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
target/linux/layerscape/patches-5.4/802-can-0012-can-flexcan-remove-TX-mailbox-bit-from-struct-flexca.patch
target/linux/layerscape/patches-5.4/802-can-0013-can-flexcan-convert-struct-flexcan_priv-rx_mask-1-2-.patch
target/linux/layerscape/patches-5.4/802-can-0014-can-flexcan-introduce-struct-flexcan_priv-tx_mask-an.patch
target/linux/layerscape/patches-5.4/802-can-0015-can-flexcan-flexcan_read_reg_iflag_rx-optimize-readi.patch
target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch
target/linux/layerscape/patches-5.4/802-can-0017-can-flexcan-flexcan_mailbox_read-make-use-of-flexcan.patch
target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
target/linux/layerscape/patches-5.4/802-can-0020-can-flexcan-add-CAN-FD-BRS-support.patch
target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch
target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch
target/linux/layerscape/patches-5.4/802-can-0024-can-flexcan-add-lx2160ar1-support.patch
target/linux/layerscape/patches-5.4/802-can-0025-can-flexcan-add-LPSR-mode-support-for-i.MX7D.patch
target/linux/layerscape/patches-5.4/802-can-0026-can-flexcan-fix-deadlock-when-using-self-wakeup.patch
target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
target/linux/layerscape/patches-5.4/802-can-0028-can-flexcan-Add-S32V234-support-to-FlexCAN-driver.patch
target/linux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch
target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch
target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch
target/linux/mediatek/patches-5.4/0604-net-dsa-mt7530-Add-the-support-of-MT7531-switch.patch
target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch

index aff812e57ffb05748560cd631f9a05c6c24f5f2d..52e5c11d753afdd3d67b8e19d7bc2afd6fcf02c3 100644 (file)
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .108
+LINUX_VERSION-5.4 = .111
 
-LINUX_KERNEL_HASH-5.4.108 = f212ac07c21bd33e6898fdbb2ddba2a454f74578bbe7bef8fe4dbbbc0ec52172
+LINUX_KERNEL_HASH-5.4.111 = 21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
index 58c257db5b325b9a4f265ba567998116d89036d1..3060fc0966023c20be7d8f84de5fa460130168ed 100644 (file)
@@ -28,7 +28,7 @@ define KernelPackage/can
        CONFIG_CAN_SOFTING=n \
        CONFIG_NET_EMATCH_CANID=n \
        CONFIG_CAN_DEBUG_DEVICES=n
-  FILES:=$(LINUX_DIR)/drivers/net/can/can-dev.ko \
+  FILES:=$(LINUX_DIR)/drivers/net/can/dev/can-dev.ko \
         $(LINUX_DIR)/net/can/can.ko
   AUTOLOAD:=$(call AutoProbe,can can-dev)
 endef
index 5c57bf2b9346d40a866f3bc810c266fcf21b4d29..a75898bf0c81a6b500bc2c3c6f23d6fe373a6275 100644 (file)
@@ -23,7 +23,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -2278,6 +2278,22 @@ static const struct b53_chip_data b53_sw
+@@ -2271,6 +2271,22 @@ static const struct b53_chip_data b53_sw
                .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
                .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
        },
@@ -68,7 +68,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                        offset = CORE_STS_OVERRIDE_IMP;
                else
                        offset = CORE_STS_OVERRIDE_IMP2;
-@@ -541,7 +542,8 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -543,7 +544,8 @@ static void bcm_sf2_sw_mac_config(struct
        if (port == core_readl(priv, CORE_IMP0_PRT_ID))
                return;
  
@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
        else
                offset = CORE_STS_OVERRIDE_GMIIP2_PORT(port);
-@@ -983,6 +985,30 @@ struct bcm_sf2_of_data {
+@@ -985,6 +987,30 @@ struct bcm_sf2_of_data {
        unsigned int num_cfp_rules;
  };
  
@@ -109,7 +109,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  /* Register offsets for the SWITCH_REG_* block */
  static const u16 bcm_sf2_7445_reg_offsets[] = {
        [REG_SWITCH_CNTRL]      = 0x00,
-@@ -1031,6 +1057,9 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1033,6 +1059,9 @@ static const struct bcm_sf2_of_data bcm_
  };
  
  static const struct of_device_id bcm_sf2_of_match[] = {
index 55a26ce44337450f2f950dfb2d066fccc3502637..b0626ba71e5de0a3aea3dab2702e03019f31208b 100644 (file)
@@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void bcm_sf2_intr_disable(struct bcm_sf2_priv *priv)
  {
        intrl2_0_mask_set(priv, 0xffffffff);
-@@ -732,6 +770,8 @@ static int bcm_sf2_sw_resume(struct dsa_
+@@ -734,6 +772,8 @@ static int bcm_sf2_sw_resume(struct dsa_
                return ret;
        }
  
@@ -91,7 +91,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        ret = bcm_sf2_cfp_resume(ds);
        if (ret)
                return ret;
-@@ -994,6 +1034,7 @@ struct bcm_sf2_of_data {
+@@ -996,6 +1036,7 @@ struct bcm_sf2_of_data {
        const u16 *reg_offsets;
        unsigned int core_reg_align;
        unsigned int num_cfp_rules;
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const u16 bcm_sf2_4908_reg_offsets[] = {
-@@ -1018,6 +1059,7 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1020,6 +1061,7 @@ static const struct bcm_sf2_of_data bcm_
        .core_reg_align = 0,
        .reg_offsets    = bcm_sf2_4908_reg_offsets,
        .num_cfp_rules  = 0, /* FIXME */
@@ -107,7 +107,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  /* Register offsets for the SWITCH_REG_* block */
-@@ -1128,6 +1170,7 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1130,6 +1172,7 @@ static int bcm_sf2_sw_probe(struct platf
        priv->reg_offsets = data->reg_offsets;
        priv->core_reg_align = data->core_reg_align;
        priv->num_cfp_rules = data->num_cfp_rules;
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        /* Auto-detection using standard registers will not work, so
         * provide an indication of what kind of device we are for
-@@ -1182,6 +1225,8 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1184,6 +1227,8 @@ static int bcm_sf2_sw_probe(struct platf
                return ret;
        }
  
index 8971cdae3964a7bf1501ce33debf2a47e02da7b7..06d631f691aa981dc69ca8335234eae993306e9e 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1058,7 +1058,7 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1060,7 +1060,7 @@ static const struct bcm_sf2_of_data bcm_
        .type           = BCM4908_DEVICE_ID,
        .core_reg_align = 0,
        .reg_offsets    = bcm_sf2_4908_reg_offsets,
index 9e40b321e0f652374c43e4721dce0e443f161a4e..c46fd1d3b581426988560c4abe80968dfc467279 100644 (file)
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)
  {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
-@@ -586,6 +611,7 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -588,6 +613,7 @@ static void bcm_sf2_sw_mac_config(struct
  {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
        u32 id_mode_dis = 0, port_mode;
@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        u32 reg, offset;
  
        if (port == core_readl(priv, CORE_IMP0_PRT_ID))
-@@ -615,10 +641,12 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -617,10 +643,12 @@ static void bcm_sf2_sw_mac_config(struct
                goto force_link;
        }
  
@@ -79,7 +79,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        reg &= ~ID_MODE_DIS;
        reg &= ~(PORT_MODE_MASK << PORT_MODE_SHIFT);
        reg &= ~(RX_PAUSE_EN | TX_PAUSE_EN);
-@@ -633,7 +661,7 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -635,7 +663,7 @@ static void bcm_sf2_sw_mac_config(struct
                reg |= RX_PAUSE_EN;
        }
  
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  force_link:
        /* Force link settings detected from the PHY */
-@@ -659,6 +687,7 @@ static void bcm_sf2_sw_mac_link_set(stru
+@@ -661,6 +689,7 @@ static void bcm_sf2_sw_mac_link_set(stru
                                    phy_interface_t interface, bool link)
  {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        u32 reg;
  
        if (!phy_interface_mode_is_rgmii(interface) &&
-@@ -666,13 +695,15 @@ static void bcm_sf2_sw_mac_link_set(stru
+@@ -668,13 +697,15 @@ static void bcm_sf2_sw_mac_link_set(stru
            interface != PHY_INTERFACE_MODE_REVMII)
                return;
  
index ccb18c7d51d2ede383f79c7ca979b41827ee084d..d0783ea5e7a515dae6653354884c943194f14f56 100644 (file)
@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                break;
        default:
                switch (port) {
-@@ -1077,9 +1082,7 @@ static const u16 bcm_sf2_4908_reg_offset
+@@ -1079,9 +1084,7 @@ static const u16 bcm_sf2_4908_reg_offset
        [REG_PHY_REVISION]      = 0x14,
        [REG_SPHY_CNTRL]        = 0x24,
        [REG_CROSSBAR]          = 0xc8,
index 2087559262f76190ccc06434438555aed981cd23..c9e4c67376ea7aa4691f89b737e9918e68de8e74 100644 (file)
@@ -29,7 +29,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1319,10 +1319,14 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1321,10 +1321,14 @@ static int bcm_sf2_sw_probe(struct platf
        rev = reg_readl(priv, REG_PHY_REVISION);
        priv->hw_params.gphy_rev = rev & PHY_REVISION_MASK;
  
index 2d08cd83c2fb584b173d337c8ab743ef78a7de58..5bc5bff2e9db5ad0c95fcf5c6829f6e503142cec 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -1333,6 +1333,12 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1335,6 +1335,12 @@ static int bcm_sf2_sw_probe(struct platf
                 priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff,
                 priv->irq0, priv->irq1);
  
index 6c1c39b30ba152d2cc975a5b4aed9122421cd66e..bb1ca592a69efaa47fc98a8e1ffc490fd0c1295f 100644 (file)
@@ -61,7 +61,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 +};
 --- a/arch/arm/boot/dts/bcm47094.dtsi
 +++ b/arch/arm/boot/dts/bcm47094.dtsi
-@@ -16,3 +16,7 @@
+@@ -25,3 +25,7 @@
        clock-frequency = <125000000>;
        status = "okay";
  };
index 9cdee333cbf817e3643ba87ac3cacc39a67cbd14..df868ba85fa9a87853bc9cb887e0c26ea16ce9ea 100644 (file)
@@ -95,7 +95,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
                        label = "lan4";
 --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
 +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
-@@ -219,9 +219,6 @@
+@@ -201,9 +201,6 @@
        dsa,member = <0 0>;
  
        ports {
index ca0c228e10b27bd2719c338b2bff3912842b5ebc..a207a11ee56f7577ef8f4f091836b0867d8296fc 100644 (file)
@@ -96,7 +96,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -2196,6 +2196,13 @@ config TRIM_UNUSED_KSYMS
+@@ -2195,6 +2195,13 @@ config TRIM_UNUSED_KSYMS
  
          If unsure, or if you need to build out-of-tree modules, say N.
  
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config MODULES_TREE_LOOKUP
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3142,9 +3142,11 @@ static int setup_load_info(struct load_i
+@@ -3224,9 +3224,11 @@ static int setup_load_info(struct load_i
  
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (flags & MODULE_INIT_IGNORE_VERMAGIC)
                modmagic = NULL;
  
-@@ -3165,6 +3167,7 @@ static int check_modinfo(struct module *
+@@ -3247,6 +3249,7 @@ static int check_modinfo(struct module *
                                mod->name);
                add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
        }
index 55233369ef831a5db0ef10250396b1682f21a8cb..836fc54ba2977ebb3c5289fcc6b6976611fe5649 100644 (file)
@@ -29,9 +29,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #define IFF_LIVE_RENAME_OK            IFF_LIVE_RENAME_OK
 +#define IFF_NO_IP_ALIGN                       IFF_NO_IP_ALIGN
  
- /**
-  *    struct net_device - The DEVICE structure.
-@@ -1882,6 +1884,11 @@ struct net_device {
+ /* Specifies the type of the struct net_device::ml_priv pointer */
+ enum netdev_ml_priv_type {
+@@ -1889,6 +1891,11 @@ struct net_device {
        const struct tlsdev_ops *tlsdev_ops;
  #endif
  
@@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        const struct header_ops *header_ops;
  
        unsigned int            flags;
-@@ -1964,6 +1971,10 @@ struct net_device {
+@@ -1971,6 +1978,10 @@ struct net_device {
        struct mpls_dev __rcu   *mpls_ptr;
  #endif
  
index 1f0c017680993a547b0a8446822d0a0b51d7d51f..c4c13b9695cb121131e851836e4b67910a75e20c 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1278,6 +1278,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+@@ -1277,6 +1277,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
          the unaligned access emulation.
          see arch/parisc/kernel/unaligned.c for reference
  
index 7a49ce0c39e89fcb7a3f02347e08cea759166bfe..703ac8215e3966c4d759d92946c0c6882507d2ae 100644 (file)
@@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                return -ENOMEM;
  
 @@ -818,6 +846,7 @@ copy_entries_to_user(unsigned int total_
-       const struct xt_table_info *private = xt_table_get_private_protected(table);
+       const struct xt_table_info *private = table->private;
        int ret = 0;
        const void *loc_cpu_entry;
 +      u8 flags;
index 1792534835fe31093fd5026500f1f33215462aba..baf738a8d20898b8a0080c08fed0b8d17dc89069 100644 (file)
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        /* Initialization */
 +      WARN_ON(!(table->valid_hooks & (1 << hook)));
 +      local_bh_disable();
-+      private = rcu_access_pointer(table->private);
++      private = READ_ONCE(table->private); /* Address dependency. */
 +      cpu        = smp_processor_id();
 +      table_base = private->entries;
 +
@@ -80,7 +80,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -      WARN_ON(!(table->valid_hooks & (1 << hook)));
 -      local_bh_disable();
        addend = xt_write_recseq_begin();
--      private = rcu_access_pointer(table->private);
+-      private = READ_ONCE(table->private); /* Address dependency. */
 -      cpu        = smp_processor_id();
 -      table_base = private->entries;
        jumpstack  = (struct ipt_entry **)private->jumpstack[cpu];
index 47e12b0166a007f687481063dd4d91e73c0896c5..ac7a24a049bdba4c4650178ffaf0cff4899e6f0c 100644 (file)
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1924,6 +1924,8 @@ struct net_device {
+@@ -1931,6 +1931,8 @@ struct net_device {
        struct netdev_hw_addr_list      mc;
        struct netdev_hw_addr_list      dev_addrs;
  
index 6392b9d7562dfb41fc4a02703dfc5d0e5b86a15d..a6ef897869ecb79e3fc873ceee22a76ce564a3ad 100644 (file)
@@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  
  enum gro_result {
-@@ -2092,6 +2095,7 @@ struct net_device {
+@@ -2101,6 +2104,7 @@ struct net_device {
        struct lock_class_key   addr_list_lock_key;
        bool                    proto_down;
        unsigned                wol_enabled:1;
@@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  #define to_net_dev(d) container_of(d, struct net_device, dev)
  
-@@ -2249,6 +2253,26 @@ void netif_napi_add(struct net_device *d
+@@ -2281,6 +2285,26 @@ void netif_napi_add(struct net_device *d
                    int (*poll)(struct napi_struct *, int), int weight);
  
  /**
index 45eabbd10ab99113a46289b81feacdbbc64b0b45..7523b396bad3b15427a7c3000bb739da5d3d280c 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1663,6 +1663,15 @@ config EMBEDDED
+@@ -1662,6 +1662,15 @@ config EMBEDDED
          an embedded system so certain expert options are available
          for configuration.
  
index be20756a100de660a540a78f1797136c1635191f..bdf0f8f2b9a0cd9d37a48ece29446b6e4ef201c9 100644 (file)
@@ -46,7 +46,7 @@ Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
        select PM_OPP
 --- a/drivers/cpufreq/cpufreq-dt-platdev.c
 +++ b/drivers/cpufreq/cpufreq-dt-platdev.c
-@@ -138,6 +138,11 @@ static const struct of_device_id blackli
+@@ -140,6 +140,11 @@ static const struct of_device_id blackli
        { .compatible = "ti,am43", },
        { .compatible = "ti,dra7", },
  
index 9c7626ae0b4960de29be49d07d2171b09664fc4c..413fcaf120b77a7c49ea695372ffc248c8f177b0 100644 (file)
@@ -357,7 +357,7 @@ Date:   Fri May 5 17:45:15 2017 +0800
 +};
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -260,7 +260,7 @@
+@@ -261,7 +261,7 @@
                dcfg: dcfg@1ee0000 {
                        compatible = "fsl,ls1012a-dcfg",
                                     "syscon";
@@ -366,7 +366,7 @@ Date:   Fri May 5 17:45:15 2017 +0800
                        big-endian;
                };
  
-@@ -317,13 +317,23 @@
+@@ -318,13 +318,23 @@
                        #thermal-sensor-cells = <1>;
                };
  
@@ -391,7 +391,7 @@ Date:   Fri May 5 17:45:15 2017 +0800
                        status = "disabled";
                };
  
-@@ -395,6 +405,20 @@
+@@ -396,6 +406,20 @@
                        big-endian;
                };
  
@@ -412,7 +412,7 @@ Date:   Fri May 5 17:45:15 2017 +0800
                sai1: sai@2b50000 {
                        #sound-dai-cells = <0>;
                        compatible = "fsl,vf610-sai";
-@@ -499,6 +523,46 @@
+@@ -500,6 +524,46 @@
                                        <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
index 3455811c26541ff502811537649b3b2b9a22cc5f..91f789af13f02fde16f55702db0d9dcdfb20ac2e 100644 (file)
@@ -384,7 +384,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
  &duart0 {
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -277,7 +277,7 @@
+@@ -278,7 +278,7 @@
  
                dcfg: dcfg@1ee0000 {
                        compatible = "fsl,ls1043a-dcfg", "syscon";
@@ -393,7 +393,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                        big-endian;
                };
  
-@@ -411,7 +411,7 @@
+@@ -412,7 +412,7 @@
                };
  
                i2c0: i2c@2180000 {
@@ -402,7 +402,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x2180000 0x0 0x10000>;
-@@ -421,6 +421,7 @@
+@@ -422,6 +422,7 @@
                        dmas = <&edma0 1 39>,
                               <&edma0 1 38>;
                        dma-names = "tx", "rx";
@@ -410,7 +410,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                        status = "disabled";
                };
  
-@@ -525,6 +526,72 @@
+@@ -526,6 +527,72 @@
                        #interrupt-cells = <2>;
                };
  
@@ -483,7 +483,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                lpuart0: serial@2950000 {
                        compatible = "fsl,ls1021a-lpuart";
                        reg = <0x0 0x2950000 0x0 0x1000>;
-@@ -579,6 +646,16 @@
+@@ -580,6 +647,16 @@
                        status = "disabled";
                };
  
@@ -500,7 +500,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                wdog0: wdog@2ad0000 {
                        compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt";
                        reg = <0x0 0x2ad0000 0x0 0x10000>;
-@@ -611,7 +688,10 @@
+@@ -612,7 +689,10 @@
                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
@@ -511,7 +511,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                };
  
                usb1: usb3@3000000 {
-@@ -621,7 +701,10 @@
+@@ -622,7 +702,10 @@
                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
@@ -522,7 +522,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                };
  
                usb2: usb3@3100000 {
-@@ -631,7 +714,10 @@
+@@ -632,7 +715,10 @@
                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
@@ -533,7 +533,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                };
  
                sata: sata@3200000 {
-@@ -670,9 +756,9 @@
+@@ -671,9 +757,9 @@
                        reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
                               0x40 0x00000000 0x0 0x00002000>; /* configuration space */
                        reg-names = "regs", "config";
@@ -546,7 +546,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
-@@ -696,9 +782,9 @@
+@@ -697,9 +783,9 @@
                        reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
                               0x48 0x00000000 0x0 0x00002000>; /* configuration space */
                        reg-names = "regs", "config";
@@ -559,7 +559,7 @@ Date:   Sun Jun 12 15:44:11 2016 +0800
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
-@@ -722,9 +808,9 @@
+@@ -723,9 +809,9 @@
                        reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
                               0x50 0x00000000 0x0 0x00002000>; /* configuration space */
                        reg-names = "regs", "config";
index 5079a815c21fbc5413fe15c362fbe7d9c90c2cd2..8ef6d031ef5fe8e28b9620734f49801871e80974 100644 (file)
@@ -277,7 +277,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                compatible = "spansion,m25p80";
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -376,7 +376,7 @@
+@@ -377,7 +377,7 @@
                };
  
                i2c0: i2c@2180000 {
@@ -286,7 +286,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x2180000 0x0 0x10000>;
-@@ -385,6 +385,7 @@
+@@ -386,6 +386,7 @@
                        dmas = <&edma0 1 39>,
                               <&edma0 1 38>;
                        dma-names = "tx", "rx";
@@ -294,7 +294,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                        status = "disabled";
                };
  
-@@ -409,12 +410,13 @@
+@@ -410,12 +411,13 @@
                };
  
                i2c3: i2c@21b0000 {
@@ -309,7 +309,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                        status = "disabled";
                };
  
-@@ -544,6 +546,15 @@
+@@ -545,6 +547,15 @@
                        status = "disabled";
                };
  
@@ -325,7 +325,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                wdog0: watchdog@2ad0000 {
                        compatible = "fsl,imx21-wdt";
                        reg = <0x0 0x2ad0000 0x0 0x10000>;
-@@ -576,6 +587,8 @@
+@@ -577,6 +588,8 @@
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -334,7 +334,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                };
  
                usb1: usb@3000000 {
-@@ -586,6 +599,8 @@
+@@ -587,6 +600,8 @@
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -343,7 +343,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                };
  
                usb2: usb@3100000 {
-@@ -596,6 +611,8 @@
+@@ -597,6 +612,8 @@
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -352,7 +352,7 @@ Date:   Fri May 5 17:53:27 2017 +0800
                };
  
                sata: sata@3200000 {
-@@ -637,6 +654,11 @@
+@@ -638,6 +655,11 @@
                                     <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
                };
  
index 7f6e4c61445a11c8b8e8df42c3d6dfaedf7be97c..4ca5a87884e07146a4e903973c5f5d15530b9c4d 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -807,6 +807,7 @@
+@@ -808,6 +808,7 @@
                        #size-cells = <2>;
                        device_type = "pci";
                        dma-coherent;
@@ -23,7 +23,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        num-viewport = <6>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
-@@ -833,6 +834,7 @@
+@@ -834,6 +835,7 @@
                        #size-cells = <2>;
                        device_type = "pci";
                        dma-coherent;
@@ -31,7 +31,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        num-viewport = <6>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */
-@@ -859,6 +861,7 @@
+@@ -860,6 +862,7 @@
                        #size-cells = <2>;
                        device_type = "pci";
                        dma-coherent;
@@ -41,7 +41,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000   /* downstream I/O */
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -715,6 +715,7 @@
+@@ -716,6 +716,7 @@
                        #size-cells = <2>;
                        device_type = "pci";
                        dma-coherent;
@@ -49,7 +49,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        num-viewport = <8>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
-@@ -751,6 +752,7 @@
+@@ -752,6 +753,7 @@
                        #size-cells = <2>;
                        device_type = "pci";
                        dma-coherent;
@@ -57,7 +57,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        num-viewport = <8>;
                        bus-range = <0x0 0xff>;
                        ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */
-@@ -787,6 +789,7 @@
+@@ -788,6 +790,7 @@
                        #size-cells = <2>;
                        device_type = "pci";
                        dma-coherent;
index c29b35ba86a071e7250b8ebda74d56be03c60bdb..6430e6cf33eb16b3d366c15fd6bedb2330724ef8 100644 (file)
@@ -23,7 +23,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
  
                clockgen: clocking@1ee1000 {
                        compatible = "fsl,ls1043a-clockgen";
-@@ -771,7 +772,6 @@
+@@ -772,7 +773,6 @@
                        reg-names = "ahci", "sata-ecc";
                        interrupts = <0 69 0x4>;
                        clocks = <&clockgen 4 0>;
@@ -31,7 +31,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                };
  
                msi1: msi-controller1@1571000 {
-@@ -806,7 +806,6 @@
+@@ -807,7 +807,6 @@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
@@ -39,7 +39,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        iommu-map = <0 &smmu 0 1>;      /* update by bootloader */
                        num-viewport = <6>;
                        bus-range = <0x0 0xff>;
-@@ -833,7 +832,6 @@
+@@ -834,7 +833,6 @@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
@@ -47,7 +47,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        iommu-map = <0 &smmu 0 1>;      /* update by bootloader */
                        num-viewport = <6>;
                        bus-range = <0x0 0xff>;
-@@ -860,7 +858,6 @@
+@@ -861,7 +859,6 @@
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
index ef610cbcd2f0ac73a135bb5c2947a2c65587f39d..81faace4c26e9ed83305f5fe1cac0794aacfc7bf 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -726,43 +726,51 @@
+@@ -727,43 +727,51 @@
                                 <&clockgen 4 0>;
                };
  
@@ -110,7 +110,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                sata: sata@3200000 {
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -624,40 +624,48 @@
+@@ -625,40 +625,48 @@
                                 <&clockgen 4 1>;
                };
  
index 6eba875f5c197ae3fde8473cf720ed5051a7ae43..c9a9b5d27128a7429756b3df8d80314f5cf11b88 100644 (file)
@@ -64,7 +64,7 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
  
        soc {
                compatible = "simple-bus";
-@@ -572,3 +543,9 @@
+@@ -573,3 +544,9 @@
                };
        };
  };
@@ -125,7 +125,7 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
  
        timer {
                compatible = "arm,armv8-timer";
-@@ -915,3 +884,29 @@
+@@ -916,3 +885,29 @@
  
  #include "qoriq-qman-portals.dtsi"
  #include "qoriq-bman-portals.dtsi"
@@ -206,7 +206,7 @@ Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
  
        timer {
                compatible = "arm,armv8-timer";
-@@ -882,3 +851,25 @@
+@@ -883,3 +852,25 @@
  
  #include "qoriq-qman-portals.dtsi"
  #include "qoriq-bman-portals.dtsi"
index 00bda3da06efbcf50d03e23f337718c2cb4f3e3e..486bb23c2a6dbee7b79cf59d8a914b78ff445cd1 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -695,7 +695,7 @@
+@@ -696,7 +696,7 @@
                                 <&clockgen 4 0>;
                };
  
@@ -25,7 +25,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        #address-cells = <2>;
                        #size-cells = <2>;
                        compatible = "simple-bus";
-@@ -740,15 +740,15 @@
+@@ -741,15 +741,15 @@
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                                configure-gfladj;
                        };
@@ -51,7 +51,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                msi1: msi-controller1@1571000 {
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -593,7 +593,7 @@
+@@ -594,7 +594,7 @@
                                 <&clockgen 4 1>;
                };
  
@@ -60,7 +60,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
                        #address-cells = <2>;
                        #size-cells = <2>;
                        compatible = "simple-bus";
-@@ -635,15 +635,15 @@
+@@ -636,15 +636,15 @@
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
                        };
index e410c2049206fdadbcb1e2d8402235bcb7cf5689..53e8f186c1f6f0c4887b0cbd386ae6a49d344487 100644 (file)
@@ -118,7 +118,7 @@ Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
                #size-cells = <0>;
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -529,11 +529,6 @@
+@@ -530,11 +530,6 @@
                clock-names = "pfe";
  
                status = "okay";
index ff12e44e7dc9fa984c9baed2fe52b00416fba7ff..c2b7e1fde2c3f25c27ec3e9b3d698b364ec67d6b 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -442,6 +442,7 @@
+@@ -443,6 +443,7 @@
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -28,7 +28,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                sata: sata@3200000 {
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -712,6 +712,7 @@
+@@ -713,6 +713,7 @@
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -36,7 +36,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                                configure-gfladj;
                        };
  
-@@ -725,6 +726,7 @@
+@@ -726,6 +727,7 @@
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -44,7 +44,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                                configure-gfladj;
                        };
  
-@@ -738,6 +740,7 @@
+@@ -739,6 +741,7 @@
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
@@ -54,7 +54,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
  
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -610,6 +610,7 @@
+@@ -611,6 +611,7 @@
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
@@ -62,7 +62,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                        };
  
                        usb1: usb@3000000 {
-@@ -622,6 +623,7 @@
+@@ -623,6 +624,7 @@
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
@@ -70,7 +70,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                        };
  
                        usb2: usb@3100000 {
-@@ -634,6 +636,7 @@
+@@ -635,6 +637,7 @@
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
index 2e68b8edbe4b3ae1c5078176a861a9a19a87c143..d4875bc8771842c8f2ec0748b42a2858546b05d0 100644 (file)
@@ -32,7 +32,7 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
   *
   */
  
-@@ -513,7 +514,7 @@
+@@ -514,7 +515,7 @@
                };
        };
  
index 875dfc2f8118730c5261e4204d240a0d870e9060..d65b222c334bb0f7bda8ba26a7414cd12bc8c6ae 100644 (file)
@@ -85,7 +85,7 @@ Signed-off-by: Florinel Iordache <florinel.iordache@nxp.com>
  };
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -679,11 +679,6 @@
+@@ -680,11 +680,6 @@
                                     <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
                };
  
index b77b745da633c464a3817957cf4a9042ca7ca553..baa4c79586b37f4a1dea3dab00c1e1a61458bac5 100644 (file)
@@ -34,7 +34,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
        };
  
        cpus {
-@@ -289,15 +290,21 @@
+@@ -290,15 +291,21 @@
                        #thermal-sensor-cells = <1>;
                };
  
@@ -61,7 +61,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
                i2c0: i2c@2180000 {
                        compatible = "fsl,vf610-i2c", "fsl,ls1012a-vf610-i2c";
                        #address-cells = <1>;
-@@ -496,12 +503,6 @@
+@@ -497,12 +504,6 @@
                                        <0000 0 0 4 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
@@ -106,7 +106,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
        };
  
        cpus {
-@@ -660,16 +661,6 @@
+@@ -661,16 +662,6 @@
                        status = "disabled";
                };
  
@@ -123,7 +123,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
                wdog0: wdog@2ad0000 {
                        compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt";
                        reg = <0x0 0x2ad0000 0x0 0x10000>;
-@@ -874,6 +865,19 @@
+@@ -875,6 +866,19 @@
                        big-endian;
                };
  
@@ -186,7 +186,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
        };
  
        cpus {
-@@ -560,15 +561,6 @@
+@@ -561,15 +562,6 @@
                        status = "disabled";
                };
  
@@ -202,7 +202,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
                wdog0: watchdog@2ad0000 {
                        compatible = "fsl,imx21-wdt";
                        reg = <0x0 0x2ad0000 0x0 0x10000>;
-@@ -810,6 +802,20 @@
+@@ -811,6 +803,20 @@
                        queue-sizes = <64 64>;
                        big-endian;
                };
index 63f4372d4e102b5c1a25790c071bc5a7ab7bb44a..333fecb3fd6aae094777ca9513e058da592a2137 100644 (file)
@@ -21,7 +21,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -443,7 +443,7 @@
+@@ -444,7 +444,7 @@
                };
  
                usb0: usb3@2f00000 {
@@ -32,7 +32,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
                        dr_mode = "host";
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -694,7 +694,7 @@
+@@ -695,7 +695,7 @@
                        dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
  
                        usb0: usb3@2f00000 {
@@ -41,7 +41,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
                                reg = <0x0 0x2f00000 0x0 0x10000>;
                                interrupts = <0 60 0x4>;
                                dr_mode = "host";
-@@ -708,7 +708,7 @@
+@@ -709,7 +709,7 @@
                        };
  
                        usb1: usb3@3000000 {
@@ -50,7 +50,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
                                reg = <0x0 0x3000000 0x0 0x10000>;
                                interrupts = <0 61 0x4>;
                                dr_mode = "host";
-@@ -722,7 +722,7 @@
+@@ -723,7 +723,7 @@
                        };
  
                        usb2: usb3@3100000 {
@@ -61,7 +61,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
                                dr_mode = "host";
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -593,7 +593,7 @@
+@@ -594,7 +594,7 @@
                        dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
  
                        usb0: usb@2f00000 {
@@ -70,7 +70,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
                                reg = <0x0 0x2f00000 0x0 0x10000>;
                                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
-@@ -606,7 +606,7 @@
+@@ -607,7 +607,7 @@
                        };
  
                        usb1: usb@3000000 {
@@ -79,7 +79,7 @@ Reviewed-by: Leo Li <leo.li@nxp.com>
                                reg = <0x0 0x3000000 0x0 0x10000>;
                                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode = "host";
-@@ -619,7 +619,7 @@
+@@ -620,7 +620,7 @@
                        };
  
                        usb2: usb@3100000 {
index 60013645ee8a2707897e6d64506566fc9db3c366..fd2999efab9437c830821e5571c772d0a8c0981f 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
                               <&edma0 1 44>;
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -404,8 +404,9 @@
+@@ -405,8 +405,9 @@
                        reg = <0x0 0x2b50000 0x0 0x10000>;
                        interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clockgen 4 3>, <&clockgen 4 3>,
@@ -53,7 +53,7 @@ Signed-off-by: Alison Wang <alison.wang@nxp.com>
                        dma-names = "tx", "rx";
                        dmas = <&edma0 1 47>,
                               <&edma0 1 46>;
-@@ -418,8 +419,9 @@
+@@ -419,8 +420,9 @@
                        reg = <0x0 0x2b60000 0x0 0x10000>;
                        interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clockgen 4 3>, <&clockgen 4 3>,
index 182c8ae24217f2b2783e493a3330d55bba40fcc7..5d325baabcd0c1454355e2ef9ae9d29ad082f7f3 100644 (file)
@@ -24,7 +24,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -453,6 +453,7 @@
+@@ -454,6 +454,7 @@
                        snps,dis_rxdet_inp3_quirk;
                        snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                        snps,host-vbus-glitches;
@@ -52,7 +52,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                sata: sata@3200000 {
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -705,6 +705,7 @@
+@@ -706,6 +706,7 @@
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                                snps,host-vbus-glitches;
                                configure-gfladj;
@@ -60,7 +60,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                        };
  
                        usb1: usb3@3000000 {
-@@ -719,6 +720,7 @@
+@@ -720,6 +721,7 @@
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                                snps,host-vbus-glitches;
                                configure-gfladj;
@@ -68,7 +68,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                        };
  
                        usb2: usb3@3100000 {
-@@ -733,6 +735,7 @@
+@@ -734,6 +736,7 @@
                                snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
                                snps,host-vbus-glitches;
                                configure-gfladj;
@@ -78,7 +78,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                        sata: sata@3200000 {
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -603,6 +603,7 @@
+@@ -604,6 +604,7 @@
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
                                snps,host-vbus-glitches;
@@ -86,7 +86,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                        };
  
                        usb1: usb@3000000 {
-@@ -616,6 +617,7 @@
+@@ -617,6 +618,7 @@
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
                                snps,host-vbus-glitches;
@@ -94,7 +94,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
                        };
  
                        usb2: usb@3100000 {
-@@ -629,6 +631,7 @@
+@@ -630,6 +632,7 @@
                                usb3-lpm-capable;
                                snps,dis-u1u2-when-u3-quirk;
                                snps,host-vbus-glitches;
index 1f8462e267eb1310131c6cda8ce0cad8de48d3e5..284519c6c6bcbeed6a03d8ddfc7f015b3dfe672a 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
  };
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -385,7 +385,7 @@
+@@ -386,7 +386,7 @@
                };
  
                qspi: spi@1550000 {
@@ -50,7 +50,7 @@ Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x1550000 0x0 0x10000>,
-@@ -394,7 +394,6 @@
+@@ -395,7 +395,6 @@
                        interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "qspi_en", "qspi";
                        clocks = <&clockgen 4 0>, <&clockgen 4 0>;
index 7c4e91b9e106fd780be4331cdb55a9948002f75c..19f9d80d0781817ef293885c8c36bcf2c4481182 100644 (file)
@@ -32,7 +32,7 @@ Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
                spi-tx-bus-width = <1>;
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-@@ -391,7 +391,7 @@
+@@ -392,7 +392,7 @@
                        reg = <0x0 0x1550000 0x0 0x10000>,
                                <0x0 0x40000000 0x0 0x10000000>;
                        reg-names = "QuadSPI", "QuadSPI-memory";
index 3fb96c913389c0dc91abb8d3434fc8b2ca523580..43700b8159e0fb0fca93706d97744100e8eff2ae 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-@@ -808,7 +808,7 @@
+@@ -809,7 +809,7 @@
  
                rcpm: rcpm@1ee208c {
                        compatible = "fsl,ls1046a-rcpm", "fsl,qoriq-rcpm-2.1+";
index 952238f2c4c06f273537f1bbfcd6751aac62f27f..c83fad33ab6ef1bdc8552816e500c6239d99dd95 100644 (file)
@@ -52,7 +52,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
 +};
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -706,6 +706,7 @@
+@@ -707,6 +707,7 @@
                                snps,host-vbus-glitches;
                                configure-gfladj;
                                dma-coherent;
@@ -60,7 +60,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
                        };
  
                        usb1: usb3@3000000 {
-@@ -721,6 +722,7 @@
+@@ -722,6 +723,7 @@
                                snps,host-vbus-glitches;
                                configure-gfladj;
                                dma-coherent;
@@ -68,7 +68,7 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
                        };
  
                        usb2: usb3@3100000 {
-@@ -736,6 +738,7 @@
+@@ -737,6 +739,7 @@
                                snps,host-vbus-glitches;
                                configure-gfladj;
                                dma-coherent;
index 0a9f683ea15bfda0d26c5f1e57f564e2a801bf35..887844fc0ea04a3ae261795717a7182d87b178f0 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Yuantian <andy.tang@nxp.com>
 
 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-@@ -918,8 +918,4 @@
+@@ -919,8 +919,4 @@
        thermal-zone4 {
                status = "okay";
        };
index c797963560bac1e71671c8623c4328584bfa7e2a..72b101bfb0bc5ae69ad72249593ca238934f1c25 100644 (file)
@@ -648,7 +648,7 @@ Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
  static const u32 vsc9959_gcb_regmap[] = {
 --- a/include/net/dsa.h
 +++ b/include/net/dsa.h
-@@ -554,6 +554,7 @@ struct dsa_switch_ops {
+@@ -559,6 +559,7 @@ struct dsa_switch_ops {
         */
        netdev_tx_t (*port_deferred_xmit)(struct dsa_switch *ds, int port,
                                          struct sk_buff *skb);
index bdd58022072f968cc0bae96d6fa31b223c2810cd..fe2ceee8d46bb1a861d436e08ca6dba08bd0f75d 100644 (file)
@@ -24,7 +24,7 @@ on touch") which was merged in v5.4-rc3.
 
 --- a/include/net/dsa.h
 +++ b/include/net/dsa.h
-@@ -286,6 +286,11 @@ struct dsa_switch {
+@@ -291,6 +291,11 @@ struct dsa_switch {
         */
        bool                    vlan_filtering;
  
index 88692a20209c2c21f9825e38614d615c4a0d7e2f..d90f0f6045a5f60bf86181624a4dc4be3d34382b 100644 (file)
@@ -10,8 +10,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  drivers/net/can/rx-offload.c | 39 ++++++++++++++++++++++++++-------------
  1 file changed, 26 insertions(+), 13 deletions(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -1,7 +1,8 @@
  // SPDX-License-Identifier: GPL-2.0-only
 -/*
index 26d4a90576c5517b6c14d0b611abbb4a2472ee21..b7476af00dc99037ff784e43e729ecb4ea314fb7 100644 (file)
@@ -10,8 +10,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  drivers/net/can/rx-offload.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -109,7 +109,7 @@ static int can_rx_offload_compare(struct
        cb_a = can_rx_offload_get_cb(a);
        cb_b = can_rx_offload_get_cb(b);
index 77cc9f8e1cd90fee5253184436ece240f2cc6288..56a49019bc60bf0a233d4f7cebd54342c90227fb 100644 (file)
@@ -11,8 +11,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  drivers/net/can/rx-offload.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -238,8 +238,8 @@ int can_rx_offload_irq_offload_timestamp
                skb_queue_splice_tail(&skb_queue, &offload->skb_queue);
                spin_unlock_irqrestore(&offload->skb_queue.lock, flags);
index 45a20c4af61ddd96d00f6a7ef4fc1bab1aab9c94..077521cd6af7ca6132ff5297bc612ac30305fb22 100644 (file)
@@ -13,8 +13,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  include/linux/can/rx-offload.h | 1 -
  2 files changed, 8 deletions(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -348,7 +348,6 @@ static int can_rx_offload_init_queue(str
        offload->skb_queue_len_max *= 4;
        skb_queue_head_init(&offload->skb_queue);
index c88f14f01fcc61ca92b36be583732afe69e2ef70..c985eaffd95663a866e39be98c02869acdb522a2 100644 (file)
@@ -25,7 +25,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -785,16 +785,23 @@ static inline struct flexcan_priv *rx_of
+@@ -791,16 +791,23 @@ static inline struct flexcan_priv *rx_of
        return container_of(offload, struct flexcan_priv, offload);
  }
  
@@ -52,7 +52,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        mb = flexcan_get_mb(priv, n);
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-@@ -808,7 +815,7 @@ static unsigned int flexcan_mailbox_read
+@@ -814,7 +821,7 @@ static unsigned int flexcan_mailbox_read
                code = reg_ctrl & FLEXCAN_MB_CODE_MASK;
                if ((code != FLEXCAN_MB_CODE_RX_FULL) &&
                    (code != FLEXCAN_MB_CODE_RX_OVERRUN))
@@ -61,7 +61,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
                if (code == FLEXCAN_MB_CODE_RX_OVERRUN) {
                        /* This MB was overrun, we lost data */
-@@ -818,11 +825,17 @@ static unsigned int flexcan_mailbox_read
+@@ -824,11 +831,17 @@ static unsigned int flexcan_mailbox_read
        } else {
                reg_iflag1 = priv->read(&regs->iflag1);
                if (!(reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE))
@@ -80,7 +80,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        /* increase timstamp to full 32 bit */
        *timestamp = reg_ctrl << 16;
  
-@@ -841,7 +854,7 @@ static unsigned int flexcan_mailbox_read
+@@ -847,7 +860,7 @@ static unsigned int flexcan_mailbox_read
                *(__be32 *)(cf->data + i) = data;
        }
  
@@ -89,7 +89,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
                /* Clear IRQ */
                if (n < 32)
-@@ -858,7 +871,7 @@ static unsigned int flexcan_mailbox_read
+@@ -864,7 +877,7 @@ static unsigned int flexcan_mailbox_read
         */
        priv->read(&regs->timer);
  
@@ -98,8 +98,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  }
  
  
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -139,71 +139,35 @@ static int can_rx_offload_compare(struct
  static struct sk_buff *
  can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n)
index cb0526c62c9f6e17d61b72046a4cafc97a387b2f..35c35f67a22ba7f678ca4f62a3fbf612bb459518 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -1579,7 +1579,6 @@ static int flexcan_probe(struct platform
+@@ -1585,7 +1585,6 @@ static int flexcan_probe(struct platform
        struct net_device *dev;
        struct flexcan_priv *priv;
        struct regulator *reg_xceiver;
@@ -25,7 +25,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        struct clk *clk_ipg = NULL, *clk_per = NULL;
        struct flexcan_regs __iomem *regs;
        int err, irq;
-@@ -1614,12 +1613,11 @@ static int flexcan_probe(struct platform
+@@ -1620,12 +1619,11 @@ static int flexcan_probe(struct platform
                clock_freq = clk_get_rate(clk_per);
        }
  
index 92fedc6b8c44f1b8ddef8832d768b8646d6217f4..2f839fcfc0b32877776b378c45577321ed4ec796 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -745,8 +745,6 @@ static void flexcan_irq_state(struct net
+@@ -751,8 +751,6 @@ static void flexcan_irq_state(struct net
        u32 timestamp;
        int err;
  
@@ -27,7 +27,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;
        if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
                tx_state = unlikely(reg_esr & FLEXCAN_ESR_TX_WRN) ?
-@@ -766,6 +764,8 @@ static void flexcan_irq_state(struct net
+@@ -772,6 +770,8 @@ static void flexcan_irq_state(struct net
        if (likely(new_state == priv->can.state))
                return;
  
index bd8db81f36eccc306fe00c1860538f0c20887e92..535fccaff6274cea97e0dd55ae93c9d74ef3fbb0 100644 (file)
@@ -23,7 +23,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  #define FLEXCAN_IFLAG_RX_FIFO_OVERFLOW        BIT(7)
  #define FLEXCAN_IFLAG_RX_FIFO_WARN    BIT(6)
  #define FLEXCAN_IFLAG_RX_FIFO_AVAILABLE       BIT(5)
-@@ -881,7 +881,7 @@ static inline u64 flexcan_read_reg_iflag
+@@ -887,7 +887,7 @@ static inline u64 flexcan_read_reg_iflag
        u32 iflag1, iflag2;
  
        iflag2 = priv->read(&regs->iflag2) & priv->reg_imask2_default &
@@ -32,7 +32,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        iflag1 = priv->read(&regs->iflag1) & priv->reg_imask1_default;
  
        return (u64)iflag2 << 32 | iflag1;
-@@ -931,7 +931,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -937,7 +937,7 @@ static irqreturn_t flexcan_irq(int irq,
        reg_iflag2 = priv->read(&regs->iflag2);
  
        /* transmission complete interrupt */
@@ -41,7 +41,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                u32 reg_ctrl = priv->read(&priv->tx_mb->can_ctrl);
  
                handled = IRQ_HANDLED;
-@@ -943,7 +943,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -949,7 +949,7 @@ static irqreturn_t flexcan_irq(int irq,
                /* after sending a RTR frame MB is in RX mode */
                priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
                            &priv->tx_mb->can_ctrl);
@@ -50,7 +50,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                netif_wake_queue(dev);
        }
  
-@@ -1323,7 +1323,7 @@ static int flexcan_open(struct net_devic
+@@ -1329,7 +1329,7 @@ static int flexcan_open(struct net_devic
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
        priv->reg_imask1_default = 0;
index f295fd1917e8c90988151b78856d22fac78c08d6..d893dd6cd170fc20717ea8db0de75488eea7aa6d 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -899,13 +899,13 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -905,13 +905,13 @@ static irqreturn_t flexcan_irq(int irq,
  
        /* reception interrupt */
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
index dc676ba918e32fa0af5715dec04f034758870bcc..ce0102182f719d655e144e97ae7d170c41175892 100644 (file)
@@ -49,7 +49,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        struct clk *clk_ipg;
        struct clk *clk_per;
-@@ -880,9 +880,9 @@ static inline u64 flexcan_read_reg_iflag
+@@ -886,9 +886,9 @@ static inline u64 flexcan_read_reg_iflag
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 iflag1, iflag2;
  
@@ -61,7 +61,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        return (u64)iflag2 << 32 | iflag1;
  }
-@@ -1227,8 +1227,8 @@ static int flexcan_chip_start(struct net
+@@ -1233,8 +1233,8 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -72,7 +72,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1322,8 +1322,8 @@ static int flexcan_open(struct net_devic
+@@ -1328,8 +1328,8 @@ static int flexcan_open(struct net_devic
        priv->tx_mb_idx = priv->mb_count - 1;
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
@@ -83,7 +83,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
-@@ -1335,12 +1335,12 @@ static int flexcan_open(struct net_devic
+@@ -1341,12 +1341,12 @@ static int flexcan_open(struct net_devic
  
                imask = GENMASK_ULL(priv->offload.mb_last,
                                    priv->offload.mb_first);
index 84a0b73bb6d361b5800cac1499f4e0de434b11bb..8ab8e29dbd83bacb57429833f3fd7e38bc5217c8 100644 (file)
@@ -24,7 +24,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -880,8 +880,7 @@ static inline u64 flexcan_read_reg_iflag
+@@ -886,8 +886,7 @@ static inline u64 flexcan_read_reg_iflag
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 iflag1, iflag2;
  
@@ -34,7 +34,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        iflag1 = priv->read(&regs->iflag1) & priv->rx_mask1;
  
        return (u64)iflag2 << 32 | iflag1;
-@@ -1228,7 +1227,7 @@ static int flexcan_chip_start(struct net
+@@ -1234,7 +1233,7 @@ static int flexcan_chip_start(struct net
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
        priv->write(priv->rx_mask1, &regs->imask1);
@@ -43,7 +43,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1322,9 +1321,6 @@ static int flexcan_open(struct net_devic
+@@ -1328,9 +1327,6 @@ static int flexcan_open(struct net_devic
        priv->tx_mb_idx = priv->mb_count - 1;
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-@@ -1335,12 +1331,12 @@ static int flexcan_open(struct net_devic
+@@ -1341,12 +1337,12 @@ static int flexcan_open(struct net_devic
  
                imask = GENMASK_ULL(priv->offload.mb_last,
                                    priv->offload.mb_first);
index 4822f9560737ef38e5aa337b5d5113924ed403bd..953372647204759bbfc89896894395b8f359f7fc 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        struct clk *clk_ipg;
        struct clk *clk_per;
-@@ -874,16 +874,15 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -880,16 +880,15 @@ static struct sk_buff *flexcan_mailbox_r
        return skb;
  }
  
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  }
  
  static irqreturn_t flexcan_irq(int irq, void *dev_id)
-@@ -1054,6 +1053,7 @@ static int flexcan_chip_start(struct net
+@@ -1060,6 +1059,7 @@ static int flexcan_chip_start(struct net
        struct flexcan_priv *priv = netdev_priv(dev);
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 reg_mcr, reg_ctrl, reg_ctrl2, reg_mecr;
@@ -70,7 +70,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int err, i;
        struct flexcan_mb __iomem *mb;
  
-@@ -1226,8 +1226,9 @@ static int flexcan_chip_start(struct net
+@@ -1232,8 +1232,9 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -82,7 +82,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1324,19 +1325,14 @@ static int flexcan_open(struct net_devic
+@@ -1330,19 +1331,14 @@ static int flexcan_open(struct net_devic
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
index 0b1bbf880ecd86a5f69ffab82a5c81876d8fc178..336fcd684d0c390d238cb27990cea68a7af03011 100644 (file)
@@ -39,7 +39,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u32 reg_ctrl_default;
  
        struct clk *clk_ipg;
-@@ -892,7 +892,8 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -898,7 +898,8 @@ static irqreturn_t flexcan_irq(int irq,
        struct flexcan_priv *priv = netdev_priv(dev);
        struct flexcan_regs __iomem *regs = priv->regs;
        irqreturn_t handled = IRQ_NONE;
@@ -49,7 +49,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enum can_state last_state = priv->can.state;
  
        /* reception interrupt */
-@@ -926,10 +927,10 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -932,10 +933,10 @@ static irqreturn_t flexcan_irq(int irq,
                }
        }
  
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                u32 reg_ctrl = priv->read(&priv->tx_mb->can_ctrl);
  
                handled = IRQ_HANDLED;
-@@ -941,7 +942,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -947,7 +948,7 @@ static irqreturn_t flexcan_irq(int irq,
                /* after sending a RTR frame MB is in RX mode */
                priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
                            &priv->tx_mb->can_ctrl);
@@ -71,7 +71,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                netif_wake_queue(dev);
        }
  
-@@ -1226,7 +1227,7 @@ static int flexcan_chip_start(struct net
+@@ -1232,7 +1233,7 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -80,7 +80,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        priv->write(upper_32_bits(reg_imask), &regs->imask2);
        priv->write(lower_32_bits(reg_imask), &regs->imask1);
        enable_irq(dev->irq);
-@@ -1321,6 +1322,7 @@ static int flexcan_open(struct net_devic
+@@ -1327,6 +1328,7 @@ static int flexcan_open(struct net_devic
                        flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO);
        priv->tx_mb_idx = priv->mb_count - 1;
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
index 4cf5e6d8d262137eb1de18d4db4875f9e49afb6f..c7e5e4ec4f0b23717404f6e9e32f481bcb94e5be 100644 (file)
@@ -24,7 +24,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -780,6 +780,23 @@ static void flexcan_irq_state(struct net
+@@ -786,6 +786,23 @@ static void flexcan_irq_state(struct net
                dev->stats.rx_fifo_errors++;
  }
  
@@ -48,7 +48,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
  {
        return container_of(offload, struct flexcan_priv, offload);
-@@ -874,17 +891,6 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -880,17 +897,6 @@ static struct sk_buff *flexcan_mailbox_r
        return skb;
  }
  
index 03b717d283e6cacd8f92043530db2cfc92250172..f67ae187631a8ce53933426eef07c52e81179fcd 100644 (file)
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -792,11 +792,24 @@ static inline u64 flexcan_read64_mask(st
+@@ -798,11 +798,24 @@ static inline u64 flexcan_read64_mask(st
        return reg & mask;
  }
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
  {
        return container_of(offload, struct flexcan_priv, offload);
-@@ -933,7 +946,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -939,7 +952,7 @@ static irqreturn_t flexcan_irq(int irq,
                }
        }
  
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        /* transmission complete interrupt */
        if (reg_iflag_tx & priv->tx_mask) {
-@@ -948,7 +961,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -954,7 +967,7 @@ static irqreturn_t flexcan_irq(int irq,
                /* after sending a RTR frame MB is in RX mode */
                priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
                            &priv->tx_mb->can_ctrl);
index 03001370179cc1789004efc837a3a3e44d75deff..b94992fac5e45d3812adf92adacadc72a671b527 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -885,15 +885,10 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -891,15 +891,10 @@ static struct sk_buff *flexcan_mailbox_r
        }
  
   mark_as_read:
index 45febf96464ad806ab7eb99375b0aa76d81f7b62..73e67b273fa8aff6aca12be7d1b27cb5a7f2c923 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -629,10 +629,10 @@ static int flexcan_get_berr_counter(cons
+@@ -635,10 +635,10 @@ static int flexcan_get_berr_counter(cons
  static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        const struct flexcan_priv *priv = netdev_priv(dev);
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int i;
  
        if (can_dropped_invalid_skb(dev, skb))
-@@ -640,18 +640,18 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -646,18 +646,18 @@ static netdev_tx_t flexcan_start_xmit(st
  
        netif_stop_queue(dev);
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
        }
  
-@@ -823,7 +823,7 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -829,7 +829,7 @@ static struct sk_buff *flexcan_mailbox_r
        struct flexcan_regs __iomem *regs = priv->regs;
        struct flexcan_mb __iomem *mb;
        struct sk_buff *skb;
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u32 reg_ctrl, reg_id, reg_iflag1;
        int i;
  
-@@ -860,8 +860,8 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -866,8 +866,8 @@ static struct sk_buff *flexcan_mailbox_r
                reg_ctrl = priv->read(&mb->can_ctrl);
        }
  
@@ -73,7 +73,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                skb = ERR_PTR(-ENOMEM);
                goto mark_as_read;
        }
-@@ -871,17 +871,17 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -877,17 +877,17 @@ static struct sk_buff *flexcan_mailbox_r
  
        reg_id = priv->read(&mb->can_id);
        if (reg_ctrl & FLEXCAN_MB_CNT_IDE)
@@ -97,8 +97,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        }
  
   mark_as_read:
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -51,11 +51,11 @@ static int can_rx_offload_napi_poll(stru
  
        while ((work_done < quota) &&
index d8b9b1e5d696524477474e142498da2be8d93f89..ee0dbd179ea8ba70a65980d0cbdcdcdb4c55b233 100644 (file)
@@ -124,7 +124,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  /* FlexCAN module is essentially modelled as a little-endian IP in most
   * SoCs, i.e the registers as well as the message buffer areas are
   * implemented in a little-endian fashion.
-@@ -632,7 +686,7 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -638,7 +692,7 @@ static netdev_tx_t flexcan_start_xmit(st
        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
        u32 can_id;
        u32 data;
@@ -133,7 +133,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        int i;
  
        if (can_dropped_invalid_skb(dev, skb))
-@@ -650,6 +704,9 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -656,6 +710,9 @@ static netdev_tx_t flexcan_start_xmit(st
        if (cfd->can_id & CAN_RTR_FLAG)
                ctrl |= FLEXCAN_MB_CNT_RTR;
  
@@ -143,7 +143,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        for (i = 0; i < cfd->len; i += sizeof(u32)) {
                data = be32_to_cpup((__be32 *)&cfd->data[i]);
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
-@@ -860,7 +917,10 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -866,7 +923,10 @@ static struct sk_buff *flexcan_mailbox_r
                reg_ctrl = priv->read(&mb->can_ctrl);
        }
  
@@ -155,7 +155,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if (unlikely(!skb)) {
                skb = ERR_PTR(-ENOMEM);
                goto mark_as_read;
-@@ -875,9 +935,17 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -881,9 +941,17 @@ static struct sk_buff *flexcan_mailbox_r
        else
                cfd->can_id = (reg_id >> 18) & CAN_SFF_MASK;
  
@@ -176,7 +176,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        for (i = 0; i < cfd->len; i += sizeof(u32)) {
                __be32 data = cpu_to_be32(priv->read(&mb->data[i / sizeof(u32)]));
-@@ -1022,27 +1090,14 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -1028,27 +1096,14 @@ static irqreturn_t flexcan_irq(int irq,
  
  static void flexcan_set_bittiming(struct net_device *dev)
  {
@@ -209,7 +209,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)
                reg |= FLEXCAN_CTRL_LPB;
        if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
-@@ -1053,9 +1108,102 @@ static void flexcan_set_bittiming(struct
+@@ -1059,9 +1114,102 @@ static void flexcan_set_bittiming(struct
        netdev_dbg(dev, "writing ctrl=0x%08x\n", reg);
        priv->write(reg, &regs->ctrl);
  
@@ -315,7 +315,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  }
  
  /* flexcan_chip_start
-@@ -1067,7 +1215,7 @@ static int flexcan_chip_start(struct net
+@@ -1073,7 +1221,7 @@ static int flexcan_chip_start(struct net
  {
        struct flexcan_priv *priv = netdev_priv(dev);
        struct flexcan_regs __iomem *regs = priv->regs;
@@ -324,7 +324,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u64 reg_imask;
        int err, i;
        struct flexcan_mb __iomem *mb;
-@@ -1166,6 +1314,26 @@ static int flexcan_chip_start(struct net
+@@ -1172,6 +1320,26 @@ static int flexcan_chip_start(struct net
        netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
        priv->write(reg_ctrl, &regs->ctrl);
  
@@ -351,7 +351,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
                reg_ctrl2 = priv->read(&regs->ctrl2);
                reg_ctrl2 |= FLEXCAN_CTRL2_EACEN | FLEXCAN_CTRL2_RRS;
-@@ -1306,6 +1474,12 @@ static int flexcan_open(struct net_devic
+@@ -1312,6 +1480,12 @@ static int flexcan_open(struct net_devic
        struct flexcan_priv *priv = netdev_priv(dev);
        int err;
  
@@ -364,7 +364,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        err = pm_runtime_get_sync(priv->dev);
        if (err < 0) {
                pm_runtime_put_noidle(priv->dev);
-@@ -1324,7 +1498,10 @@ static int flexcan_open(struct net_devic
+@@ -1330,7 +1504,10 @@ static int flexcan_open(struct net_devic
        if (err)
                goto out_transceiver_disable;
  
@@ -376,7 +376,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) +
                         (sizeof(priv->regs->mb[1]) / priv->mb_size);
  
-@@ -1676,6 +1853,18 @@ static int flexcan_probe(struct platform
+@@ -1682,6 +1859,18 @@ static int flexcan_probe(struct platform
        priv->devtype_data = devtype_data;
        priv->reg_xceiver = reg_xceiver;
  
index 1c6476e03ac867d1079bed3a519a9a6d52044f1e..28e58ade3fccf85b26804827e87d0bd17c89b039 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -704,9 +704,13 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -710,9 +710,13 @@ static netdev_tx_t flexcan_start_xmit(st
        if (cfd->can_id & CAN_RTR_FLAG)
                ctrl |= FLEXCAN_MB_CNT_RTR;
  
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        for (i = 0; i < cfd->len; i += sizeof(u32)) {
                data = be32_to_cpup((__be32 *)&cfd->data[i]);
                priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
-@@ -937,6 +941,9 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -943,6 +947,9 @@ static struct sk_buff *flexcan_mailbox_r
  
        if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {
                cfd->len = can_dlc2len(get_canfd_dlc((reg_ctrl >> 16) & 0xf));
index 3ff0d65d11d9e36639b3cfa58af051be47738a50..33459923fad2c7611caeb82062f8e7382a1d1bbc 100644 (file)
@@ -31,7 +31,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
  /* FLEXCAN memory error control register (MECR) bits */
  #define FLEXCAN_MECR_ECRWRDIS         BIT(31)
-@@ -1326,6 +1327,7 @@ static int flexcan_chip_start(struct net
+@@ -1332,6 +1333,7 @@ static int flexcan_chip_start(struct net
                reg_fdctrl = priv->read(&regs->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
                reg_fdctrl &= ~(FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3));
                reg_mcr = priv->read(&regs->mcr) & ~FLEXCAN_MCR_FDEN;
@@ -39,7 +39,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
                /* support BRS when set CAN FD mode
                 * 64 bytes payload per MB and 7 MBs per RAM block by default
-@@ -1335,10 +1337,14 @@ static int flexcan_chip_start(struct net
+@@ -1341,10 +1343,14 @@ static int flexcan_chip_start(struct net
                        reg_fdctrl |= FLEXCAN_FDCTRL_FDRATE;
                        reg_fdctrl |= FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3);
                        reg_mcr |= FLEXCAN_MCR_FDEN;
@@ -54,7 +54,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        }
  
        if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
-@@ -1862,7 +1868,7 @@ static int flexcan_probe(struct platform
+@@ -1868,7 +1874,7 @@ static int flexcan_probe(struct platform
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD) {
                if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
index 7efa29e1d00978231d7806c2f3528569d394c5cb..26dbb02c7956f09d8c1b30a883f8efd6595a2da4 100644 (file)
@@ -31,7 +31,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
  /* FLEXCAN FD Bit Timing register (FDCBT) bits */
  #define FLEXCAN_FDCBT_FPRESDIV(x)     (((x) & 0x3ff) << 20)
-@@ -1102,7 +1105,7 @@ static void flexcan_set_bittiming(struct
+@@ -1108,7 +1111,7 @@ static void flexcan_set_bittiming(struct
        struct can_bittiming *bt = &priv->can.bittiming;
        struct can_bittiming *dbt = &priv->can.data_bittiming;
        struct flexcan_regs __iomem *regs = priv->regs;
@@ -40,7 +40,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        reg = priv->read(&regs->ctrl);
        reg &= ~(FLEXCAN_CTRL_LPB | FLEXCAN_CTRL_SMP | FLEXCAN_CTRL_LOM);
-@@ -1174,6 +1177,19 @@ static void flexcan_set_bittiming(struct
+@@ -1180,6 +1183,19 @@ static void flexcan_set_bittiming(struct
                                        FLEXCAN_FDCBT_FPROPSEG(dbt->prop_seg);
                        priv->write(reg_fdcbt, &regs->fdcbt);
  
@@ -60,7 +60,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                        if (bt->brp != dbt->brp)
                                netdev_warn(dev, "Warning!! data brp = %d and brp = %d don't match.\n"
                                            "flexcan may not work. consider using different bitrate or data bitrate\n",
-@@ -1325,6 +1341,7 @@ static int flexcan_chip_start(struct net
+@@ -1331,6 +1347,7 @@ static int flexcan_chip_start(struct net
        /* FDCTRL */
        if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
                reg_fdctrl = priv->read(&regs->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
index aacf2782e0aeb7778b4b21fc8f738db5bc001d3b..16a224faf0bfd4f57ce475faf51fa9e3de178ccd 100644 (file)
@@ -52,7 +52,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
        .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
                FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
-@@ -1769,6 +1776,7 @@ out_put_node:
+@@ -1775,6 +1782,7 @@ out_put_node:
  }
  
  static const struct of_device_id flexcan_of_match[] = {
index 1fc212d1b7dfe2aa6af8041e5662762aea77aa41..c4737398bf0cea95d2cb849037a511fad84c457e 100644 (file)
@@ -35,7 +35,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
        .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
                FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
-@@ -1785,6 +1792,7 @@ static const struct of_device_id flexcan
+@@ -1791,6 +1798,7 @@ static const struct of_device_id flexcan
        { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
        { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
        { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
index 85164096f35bf2f6a090c5c9d71f59b71fbcdd26..b8349e6d6dd0de4a5eb21b64c6b8ec0844a2a48f 100644 (file)
@@ -28,7 +28,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  #include <linux/regmap.h>
  
  #define DRV_NAME                      "flexcan"
-@@ -1965,9 +1966,7 @@ static int __maybe_unused flexcan_suspen
+@@ -1971,9 +1972,7 @@ static int __maybe_unused flexcan_suspen
                        if (err)
                                return err;
                } else {
@@ -39,7 +39,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
                }
                netif_stop_queue(dev);
                netif_device_detach(dev);
-@@ -1993,7 +1992,9 @@ static int __maybe_unused flexcan_resume
+@@ -1999,7 +1998,9 @@ static int __maybe_unused flexcan_resume
                        if (err)
                                return err;
                } else {
index a17133280fb389636ef23ba45f325c877cf76097..2d55cb9401f6e5b47187229864032af9160dde76 100644 (file)
@@ -47,7 +47,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
  /* FLEXCAN Bit Timing register (CBT) bits */
  #define FLEXCAN_CBT_BTF                       BIT(31)
-@@ -1056,6 +1055,12 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -1062,6 +1061,12 @@ static irqreturn_t flexcan_irq(int irq,
  
        reg_esr = priv->read(&regs->esr);
  
index c3c43394ff31cd184631ca517adf172d3e1fbfd0..29104bd14efcbe502aaeab35ab5fec0c85f4f50a 100644 (file)
@@ -126,7 +126,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
  
        reg_mcr = priv->read(&regs->mcr);
-@@ -1776,11 +1820,6 @@ static int flexcan_setup_stop_mode(struc
+@@ -1782,11 +1826,6 @@ static int flexcan_setup_stop_mode(struc
                gpr_np->full_name, priv->stm.req_gpr, priv->stm.req_bit,
                priv->stm.ack_gpr, priv->stm.ack_bit);
  
@@ -138,7 +138,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
        return 0;
  
  out_put_node:
-@@ -1788,6 +1827,30 @@ out_put_node:
+@@ -1794,6 +1833,30 @@ out_put_node:
        return ret;
  }
  
@@ -169,7 +169,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  static const struct of_device_id flexcan_of_match[] = {
        { .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, },
        { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
-@@ -1930,9 +1993,19 @@ static int flexcan_probe(struct platform
+@@ -1936,9 +1999,19 @@ static int flexcan_probe(struct platform
        devm_can_led_init(dev);
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) {
index 657082caec009e860469c76e7972012ba0ce9467..b12534c8d30def2df24769367afef12a5f9974eb 100644 (file)
@@ -36,7 +36,7 @@ Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
  static const struct can_bittiming_const flexcan_bittiming_const = {
        .name = DRV_NAME,
        .tseg1_min = 4,
-@@ -1862,6 +1867,8 @@ static const struct of_device_id flexcan
+@@ -1868,6 +1873,8 @@ static const struct of_device_id flexcan
        { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
        { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
        { .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, },
index f122a502a471a7640885aa8ecff3065992d157eb..4c939e8017d843be46ba7b900c8d08ef5ca83d2b 100644 (file)
@@ -12,7 +12,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/b53/b53_common.c
 +++ b/drivers/net/dsa/b53/b53_common.c
-@@ -1291,7 +1291,9 @@ EXPORT_SYMBOL(b53_phylink_mac_link_down)
+@@ -1284,7 +1284,9 @@ EXPORT_SYMBOL(b53_phylink_mac_link_down)
  void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,
                             unsigned int mode,
                             phy_interface_t interface,
@@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                     const struct switchdev_obj_port_vlan *vlan);
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -634,7 +634,9 @@ static void bcm_sf2_sw_mac_link_down(str
+@@ -636,7 +636,9 @@ static void bcm_sf2_sw_mac_link_down(str
  static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,
                                   unsigned int mode,
                                   phy_interface_t interface,
@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -1452,7 +1452,9 @@ static void mt7530_phylink_mac_link_down
+@@ -1450,7 +1450,9 @@ static void mt7530_phylink_mac_link_down
  static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port,
                                       unsigned int mode,
                                       phy_interface_t interface,
@@ -103,7 +103,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
 --- a/include/net/dsa.h
 +++ b/include/net/dsa.h
-@@ -401,7 +401,9 @@ struct dsa_switch_ops {
+@@ -406,7 +406,9 @@ struct dsa_switch_ops {
        void    (*phylink_mac_link_up)(struct dsa_switch *ds, int port,
                                       unsigned int mode,
                                       phy_interface_t interface,
@@ -128,7 +128,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/net/dsa/dsa_priv.h
 +++ b/net/dsa/dsa_priv.h
-@@ -180,9 +180,11 @@ void dsa_port_phylink_mac_link_down(stru
+@@ -192,9 +192,11 @@ void dsa_port_phylink_mac_link_down(stru
                                    unsigned int mode,
                                    phy_interface_t interface);
  void dsa_port_phylink_mac_link_up(struct phylink_config *config,
index ae153847dcee92c552e47915c0e65b30bc833caf..de5b2607783150730cdc9a781f47134f4dc86d07 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -490,17 +490,6 @@ mt7530_mib_reset(struct dsa_switch *ds)
+@@ -488,17 +488,6 @@ mt7530_mib_reset(struct dsa_switch *ds)
        mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE);
  }
  
@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int mt7530_phy_read(struct dsa_switch *ds, int port, int regnum)
  {
        struct mt7530_priv *priv = ds->priv;
-@@ -674,7 +663,7 @@ mt7530_port_enable(struct dsa_switch *ds
+@@ -672,7 +661,7 @@ mt7530_port_enable(struct dsa_switch *ds
        priv->ports[port].enable = true;
        mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
                   priv->ports[port].pm);
@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        mutex_unlock(&priv->reg_mutex);
  
-@@ -697,7 +686,7 @@ mt7530_port_disable(struct dsa_switch *d
+@@ -695,7 +684,7 @@ mt7530_port_disable(struct dsa_switch *d
        priv->ports[port].enable = false;
        mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
                   PCR_MATRIX_CLR);
@@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        mutex_unlock(&priv->reg_mutex);
  }
-@@ -1407,8 +1396,7 @@ static void mt7530_phylink_mac_config(st
+@@ -1405,8 +1394,7 @@ static void mt7530_phylink_mac_config(st
  
        mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port));
        mcr_new = mcr_cur;
@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN |
                   PMCR_BACKPR_EN | PMCR_FORCE_MODE;
  
-@@ -1416,26 +1404,6 @@ static void mt7530_phylink_mac_config(st
+@@ -1414,26 +1402,6 @@ static void mt7530_phylink_mac_config(st
        if (port == 5 && dsa_is_user_port(ds, 5))
                mcr_new |= PMCR_EXT_PHY;
  
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (mcr_new != mcr_cur)
                mt7530_write(priv, MT7530_PMCR_P(port), mcr_new);
  }
-@@ -1446,7 +1414,7 @@ static void mt7530_phylink_mac_link_down
+@@ -1444,7 +1412,7 @@ static void mt7530_phylink_mac_link_down
  {
        struct mt7530_priv *priv = ds->priv;
  
@@ -97,7 +97,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port,
-@@ -1457,8 +1425,31 @@ static void mt7530_phylink_mac_link_up(s
+@@ -1455,8 +1423,31 @@ static void mt7530_phylink_mac_link_up(s
                                       bool tx_pause, bool rx_pause)
  {
        struct mt7530_priv *priv = ds->priv;
index b86c5b8283218eb5a3c363947b46e6a4462ba86d..04189e8e313a92fa9d99b8ee6202923d86b95bd2 100644 (file)
@@ -47,7 +47,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                return -EINVAL;
        }
  
-@@ -1344,12 +1346,11 @@ mt7530_setup(struct dsa_switch *ds)
+@@ -1342,12 +1344,11 @@ mt7530_setup(struct dsa_switch *ds)
        return 0;
  }
  
@@ -63,7 +63,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  
        switch (port) {
        case 0: /* Internal phy */
-@@ -1358,33 +1359,114 @@ static void mt7530_phylink_mac_config(st
+@@ -1356,33 +1357,114 @@ static void mt7530_phylink_mac_config(st
        case 3:
        case 4:
                if (state->interface != PHY_INTERFACE_MODE_GMII)
@@ -189,7 +189,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                return;
        }
  
-@@ -1452,61 +1534,44 @@ static void mt7530_phylink_mac_link_up(s
+@@ -1450,61 +1532,44 @@ static void mt7530_phylink_mac_link_up(s
        mt7530_set(priv, MT7530_PMCR_P(port), mcr);
  }
  
@@ -274,7 +274,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
        phylink_set(mask, Pause);
        phylink_set(mask, Asym_Pause);
  
-@@ -1602,12 +1667,45 @@ static int mt7530_set_mac_eee(struct dsa
+@@ -1600,12 +1665,45 @@ static int mt7530_set_mac_eee(struct dsa
        return 0;
  }
  
@@ -323,7 +323,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
        .get_ethtool_stats      = mt7530_get_ethtool_stats,
        .get_sset_count         = mt7530_get_sset_count,
        .port_enable            = mt7530_port_enable,
-@@ -1624,18 +1722,43 @@ static const struct dsa_switch_ops mt753
+@@ -1622,18 +1720,43 @@ static const struct dsa_switch_ops mt753
        .port_vlan_del          = mt7530_port_vlan_del,
        .port_mirror_add        = mt7530_port_mirror_add,
        .port_mirror_del        = mt7530_port_mirror_del,
@@ -372,7 +372,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
        { /* sentinel */ },
  };
  MODULE_DEVICE_TABLE(of, mt7530_of_match);
-@@ -1673,8 +1796,21 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -1671,8 +1794,21 @@ mt7530_probe(struct mdio_device *mdiodev
        /* Get the hardware identifier from the devicetree node.
         * We will need it for some of the clock and regulator setup.
         */
index 1e6126eb7f37250cd199c84764fd3c9532255791..9333f03aaf9c0ef1bebe0f53a6cef4f8687e3276 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  _mt7530_read(struct mt7530_dummy_poll *p)
  {
        struct mii_bus          *bus = p->priv->bus;
-@@ -483,6 +489,108 @@ mt7530_pad_clk_setup(struct dsa_switch *
+@@ -481,6 +487,108 @@ mt7530_pad_clk_setup(struct dsa_switch *
        return 0;
  }
  
@@ -150,7 +150,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static void
  mt7530_mib_reset(struct dsa_switch *ds)
  {
-@@ -507,6 +615,217 @@ static int mt7530_phy_write(struct dsa_s
+@@ -505,6 +613,217 @@ static int mt7530_phy_write(struct dsa_s
        return mdiobus_write_nested(priv->bus, port, regnum, val);
  }
  
@@ -368,7 +368,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static void
  mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset,
                   uint8_t *data)
-@@ -623,9 +942,14 @@ unlock_exit:
+@@ -621,9 +940,14 @@ unlock_exit:
  }
  
  static int
@@ -385,7 +385,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
        /* Enable Mediatek header mode on the cpu port */
        mt7530_write(priv, MT7530_PVC_P(port),
                     PORT_SPEC_TAG);
-@@ -638,7 +962,7 @@ mt7530_cpu_port_enable(struct mt7530_pri
+@@ -636,7 +960,7 @@ mt7530_cpu_port_enable(struct mt7530_pri
                mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));
  
        /* CPU port gets connected to all user ports of
@@ -394,7 +394,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
         */
        mt7530_write(priv, MT7530_PCR_P(port),
                     PCR_MATRIX(dsa_user_ports(priv->ds)));
-@@ -1132,27 +1456,42 @@ mt7530_port_vlan_del(struct dsa_switch *
+@@ -1130,27 +1454,42 @@ mt7530_port_vlan_del(struct dsa_switch *
        return 0;
  }
  
@@ -444,7 +444,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  
        val = mt7530_read(priv, MT7530_PCR_P(port));
        if (ingress) {
-@@ -1167,7 +1506,7 @@ static int mt7530_port_mirror_add(struct
+@@ -1165,7 +1504,7 @@ static int mt7530_port_mirror_add(struct
        return 0;
  }
  
@@ -453,7 +453,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                                   struct dsa_mall_mirror_tc_entry *mirror)
  {
        struct mt7530_priv *priv = ds->priv;
-@@ -1184,9 +1523,9 @@ static void mt7530_port_mirror_del(struc
+@@ -1182,9 +1521,9 @@ static void mt7530_port_mirror_del(struc
        mt7530_write(priv, MT7530_PCR_P(port), val);
  
        if (!priv->mirror_rx && !priv->mirror_tx) {
@@ -466,7 +466,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
        }
  }
  
-@@ -1292,7 +1631,7 @@ mt7530_setup(struct dsa_switch *ds)
+@@ -1290,7 +1629,7 @@ mt7530_setup(struct dsa_switch *ds)
                           PCR_MATRIX_CLR);
  
                if (dsa_is_cpu_port(ds, i))
@@ -475,7 +475,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                else
                        mt7530_port_disable(ds, i);
  
-@@ -1346,6 +1685,118 @@ mt7530_setup(struct dsa_switch *ds)
+@@ -1344,6 +1683,118 @@ mt7530_setup(struct dsa_switch *ds)
        return 0;
  }
  
@@ -594,7 +594,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static bool
  mt7530_phy_mode_supported(struct dsa_switch *ds, int port,
                          const struct phylink_link_state *state)
-@@ -1384,6 +1835,47 @@ unsupported:
+@@ -1382,6 +1833,47 @@ unsupported:
        return false;
  }
  
@@ -642,7 +642,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static bool
  mt753x_phy_mode_supported(struct dsa_switch *ds, int port,
                          const struct phylink_link_state *state)
-@@ -1416,6 +1908,227 @@ mt7530_mac_config(struct dsa_switch *ds,
+@@ -1414,6 +1906,227 @@ mt7530_mac_config(struct dsa_switch *ds,
        return 0;
  }
  
@@ -870,7 +870,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static int
  mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
                  const struct phylink_link_state *state)
-@@ -1451,6 +2164,8 @@ mt753x_phylink_mac_config(struct dsa_swi
+@@ -1449,6 +2162,8 @@ mt753x_phylink_mac_config(struct dsa_swi
                if (mt753x_mac_config(ds, port, mode, state) < 0)
                        goto unsupported;
  
@@ -879,7 +879,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                break;
        case 6: /* 1st cpu port */
                if (priv->p6_interface == state->interface)
-@@ -1470,7 +2185,8 @@ unsupported:
+@@ -1468,7 +2183,8 @@ unsupported:
                return;
        }
  
@@ -889,7 +889,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                dev_err(ds->dev, "%s: in-band negotiation unsupported\n",
                        __func__);
                return;
-@@ -1480,7 +2196,7 @@ unsupported:
+@@ -1478,7 +2194,7 @@ unsupported:
        mcr_new = mcr_cur;
        mcr_new &= ~PMCR_LINK_SETTINGS_MASK;
        mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN |
@@ -898,7 +898,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  
        /* Are we connected to external phy */
        if (port == 5 && dsa_is_user_port(ds, 5))
-@@ -1490,7 +2206,18 @@ unsupported:
+@@ -1488,7 +2204,18 @@ unsupported:
                mt7530_write(priv, MT7530_PMCR_P(port), mcr_new);
  }
  
@@ -918,7 +918,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                                         unsigned int mode,
                                         phy_interface_t interface)
  {
-@@ -1499,7 +2226,19 @@ static void mt7530_phylink_mac_link_down
+@@ -1497,7 +2224,19 @@ static void mt7530_phylink_mac_link_down
        mt7530_clear(priv, MT7530_PMCR_P(port), PMCR_LINK_SETTINGS_MASK);
  }
  
@@ -939,7 +939,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                                       unsigned int mode,
                                       phy_interface_t interface,
                                       struct phy_device *phydev,
-@@ -1509,18 +2248,29 @@ static void mt7530_phylink_mac_link_up(s
+@@ -1507,18 +2246,29 @@ static void mt7530_phylink_mac_link_up(s
        struct mt7530_priv *priv = ds->priv;
        u32 mcr;
  
@@ -971,7 +971,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                break;
        }
        if (duplex == DUPLEX_FULL) {
-@@ -1534,6 +2284,45 @@ static void mt7530_phylink_mac_link_up(s
+@@ -1532,6 +2282,45 @@ static void mt7530_phylink_mac_link_up(s
        mt7530_set(priv, MT7530_PMCR_P(port), mcr);
  }
  
@@ -1017,7 +1017,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static void
  mt7530_mac_port_validate(struct dsa_switch *ds, int port,
                         unsigned long *supported)
-@@ -1542,6 +2331,14 @@ mt7530_mac_port_validate(struct dsa_swit
+@@ -1540,6 +2329,14 @@ mt7530_mac_port_validate(struct dsa_swit
                phylink_set(supported, 1000baseX_Full);
  }
  
@@ -1032,7 +1032,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static void
  mt753x_phylink_validate(struct dsa_switch *ds, int port,
                        unsigned long *supported,
-@@ -1558,7 +2355,8 @@ mt753x_phylink_validate(struct dsa_switc
+@@ -1556,7 +2353,8 @@ mt753x_phylink_validate(struct dsa_switc
  
        phylink_set_port_modes(mask);
  
@@ -1042,7 +1042,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
                phylink_set(mask, 10baseT_Half);
                phylink_set(mask, 10baseT_Full);
                phylink_set(mask, 100baseT_Half);
-@@ -1577,6 +2375,11 @@ mt753x_phylink_validate(struct dsa_switc
+@@ -1575,6 +2373,11 @@ mt753x_phylink_validate(struct dsa_switc
  
        linkmode_and(supported, supported, mask);
        linkmode_and(state->advertising, state->advertising, mask);
@@ -1054,7 +1054,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  }
  
  static int
-@@ -1667,6 +2470,63 @@ static int mt7530_set_mac_eee(struct dsa
+@@ -1665,6 +2468,63 @@ static int mt7530_set_mac_eee(struct dsa
        return 0;
  }
  
@@ -1118,7 +1118,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
  static int
  mt753x_phylink_mac_link_state(struct dsa_switch *ds, int port,
                              struct phylink_link_state *state)
-@@ -1720,13 +2580,14 @@ static const struct dsa_switch_ops mt753
+@@ -1718,13 +2578,14 @@ static const struct dsa_switch_ops mt753
        .port_vlan_prepare      = mt7530_port_vlan_prepare,
        .port_vlan_add          = mt7530_port_vlan_add,
        .port_vlan_del          = mt7530_port_vlan_del,
@@ -1137,7 +1137,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
        .get_mac_eee            = mt7530_get_mac_eee,
        .set_mac_eee            = mt7530_set_mac_eee,
  };
-@@ -1754,11 +2615,26 @@ static const struct mt753x_info mt753x_t
+@@ -1752,11 +2613,26 @@ static const struct mt753x_info mt753x_t
                .mac_port_get_state = mt7530_phylink_mac_link_state,
                .mac_port_config = mt7530_mac_config,
        },
index 53b6413cf34f68acdcf758d8dc33ecb71ae528cd..69b5000177444e78ac7b4c4f093499dca28a05f0 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  #include <linux/crc32.h>
  #include <linux/if_vlan.h>
  #include <linux/uaccess.h>
-@@ -4363,6 +4364,22 @@ static void rtl_tally_reset(struct r8152
+@@ -4335,6 +4336,22 @@ static void rtl_tally_reset(struct r8152
        ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
  }
  
@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  static void r8152b_init(struct r8152 *tp)
  {
        u32 ocp_data;
-@@ -4404,6 +4421,8 @@ static void r8152b_init(struct r8152 *tp
+@@ -4376,6 +4393,8 @@ static void r8152b_init(struct r8152 *tp
        ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
        ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
        ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  }
  
  static void r8153_init(struct r8152 *tp)
-@@ -4533,6 +4552,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -4510,6 +4529,8 @@ static void r8153_init(struct r8152 *tp)
                tp->coalesce = COALESCE_SLOW;
                break;
        }
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  }
  
  static void r8153b_init(struct r8152 *tp)
-@@ -4609,6 +4630,8 @@ static void r8153b_init(struct r8152 *tp
+@@ -4586,6 +4607,8 @@ static void r8153b_init(struct r8152 *tp
        rtl_tally_reset(tp);
  
        tp->coalesce = 15000;   /* 15 us */