Merge git:https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR. No conflicts. Adjacent changes: net/core/page_pool_user.c 0b11b1c ("netdev: let netlink core handle -EMSGSIZE errors") 429679d ("page_pool: fix netlink dump stop/resume") Signed-off-by: Jakub Kicinski <[email protected]>
torvalds · Mar 7, 2024 · e3afe5d · e3afe5d
2 parents a148f82 + df47935
commit e3afe5d
Show file tree

Hide file tree

Showing 233 changed files with 2,718 additions and 1,427 deletions.
diff --git a/Documentation/devicetree/bindings/net/renesas,ethertsn.yaml b/Documentation/devicetree/bindings/net/renesas,ethertsn.yaml
@@ -65,9 +65,11 @@ properties:
 
  rx-internal-delay-ps:
  enum: [0, 1800]
+ default: 0
 
  tx-internal-delay-ps:
  enum: [0, 2000]
+ default: 0
 
  '#address-cells':
  const: 1

diff --git a/Documentation/driver-api/dpll.rst b/Documentation/driver-api/dpll.rst
@@ -545,7 +545,7 @@ In such scenario, dpll device input signal shall be also configurable
 to drive dpll with signal recovered from the PHY netdevice.
 This is done by exposing a pin to the netdevice - attaching pin to the
 netdevice itself with
-``netdev_dpll_pin_set(struct net_device *dev, struct dpll_pin *dpll_pin)``.
+``dpll_netdev_pin_set(struct net_device *dev, struct dpll_pin *dpll_pin)``.
 Exposed pin id handle ``DPLL_A_PIN_ID`` is then identifiable by the user
 as it is attached to rtnetlink respond to get ``RTM_NEWLINK`` command in
 nested attribute ``IFLA_DPLL_PIN``.
diff --git a/Documentation/virt/hyperv/index.rst b/Documentation/virt/hyperv/index.rst
@@ -10,3 +10,4 @@ Hyper-V Enlightenments
  overview
  vmbus
  clocks
+ vpci
diff --git a/Documentation/virt/hyperv/vpci.rst b/Documentation/virt/hyperv/vpci.rst
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -1395,6 +1395,7 @@ F: drivers/hwmon/max31760.c
 
 ANALOGBITS PLL LIBRARIES
 M: Paul Walmsley <[email protected]>
+M: Samuel Holland <[email protected]>
 S: Supported
 F: drivers/clk/analogbits/*
 F: include/linux/clk/analogbits*
@@ -2156,7 +2157,7 @@ M: Shawn Guo <[email protected]>
 M: Sascha Hauer <[email protected]>
 R: Pengutronix Kernel Team <[email protected]>
 R: Fabio Estevam <[email protected]>
-R: NXP Linux Team <linux-imx@nxp.com>
+L: imx@lists.linux.dev
 L: [email protected] (moderated for non-subscribers)
 S: Maintained
 T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@ -8505,7 +8506,7 @@ FREESCALE IMX / MXC FEC DRIVER
 M: Wei Fang <[email protected]>
 R: Shenwei Wang <[email protected]>
 R: Clark Wang <[email protected]>
-R: NXP Linux Team <linux-imx@nxp.com>
+L: imx@lists.linux.dev
 L: [email protected]
 S: Maintained
 F: Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -8540,7 +8541,7 @@ F: drivers/i2c/busses/i2c-imx.c
 FREESCALE IMX LPI2C DRIVER
 M: Dong Aisheng <[email protected]>
 L: [email protected]
-L: linux-imx@nxp.com
+L: imx@lists.linux.dev
 S: Maintained
 F: Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
 F: drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -15747,7 +15748,7 @@ F: drivers/iio/gyro/fxas21002c_spi.c
 NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
 M: Haibo Chen <[email protected]>
 L: [email protected]
-L: linux-imx@nxp.com
+L: imx@lists.linux.dev
 S: Maintained
 F: Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
 F: Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
@@ -15784,15 +15785,15 @@ F: drivers/gpu/drm/imx/dcss/
 NXP i.MX 8QXP ADC DRIVER
 M: Cai Huoqing <[email protected]>
 M: Haibo Chen <[email protected]>
-L: linux-imx@nxp.com
+L: imx@lists.linux.dev
 L: [email protected]
 S: Maintained
 F: Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
 F: drivers/iio/adc/imx8qxp-adc.c
 
 NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
 M: Mirela Rabulea <[email protected]>
-R: NXP Linux Team <linux-imx@nxp.com>
+L: imx@lists.linux.dev
 L: [email protected]
 S: Maintained
 F: Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
@@ -15802,7 +15803,7 @@ NXP i.MX CLOCK DRIVERS
 M: Abel Vesa <[email protected]>
 R: Peng Fan <[email protected]>
 L: [email protected]
-L: linux-imx@nxp.com
+L: imx@lists.linux.dev
 S: Maintained
 T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
 F: Documentation/devicetree/bindings/clock/imx*
@@ -16763,6 +16764,7 @@ F: drivers/pci/controller/dwc/*layerscape*
 PCI DRIVER FOR FU740
 M: Paul Walmsley <[email protected]>
 M: Greentime Hu <[email protected]>
+M: Samuel Holland <[email protected]>
 L: [email protected]
 S: Maintained
 F: Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
@@ -19680,7 +19682,7 @@ F: drivers/mmc/host/sdhci-of-at91.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
 M: Haibo Chen <[email protected]>
-L: linux-imx@nxp.com
+L: imx@lists.linux.dev
 L: [email protected]
 S: Maintained
 F: drivers/mmc/host/sdhci-esdhc-imx.c
@@ -20015,36 +20017,15 @@ S: Maintained
 F: drivers/watchdog/simatic-ipc-wdt.c
 
 SIFIVE DRIVERS
-M: Palmer Dabbelt <[email protected]>
 M: Paul Walmsley <[email protected]>
+M: Samuel Holland <[email protected]>
 L: [email protected]
 S: Supported
+F: drivers/dma/sf-pdma/
 N: sifive
+K: fu[57]40
 K: [^@]sifive
 
-SIFIVE CACHE DRIVER
-M: Conor Dooley <[email protected]>
-L: [email protected]
-S: Maintained
-F: Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
-F: drivers/cache/sifive_ccache.c
-
-SIFIVE FU540 SYSTEM-ON-CHIP
-M: Paul Walmsley <[email protected]>
-M: Palmer Dabbelt <[email protected]>
-L: [email protected]
-S: Supported
-T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git
-N: fu540
-K: fu540
-
-SIFIVE PDMA DRIVER
-M: Green Wan <[email protected]>
-S: Maintained
-F: Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
-F: drivers/dma/sf-pdma/
-
-
 SILEAD TOUCHSCREEN DRIVER
 M: Hans de Goede <[email protected]>
 L: [email protected]
@@ -20253,8 +20234,8 @@ F: Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
 F: drivers/net/ethernet/socionext/sni_ave.c
 
 SOCIONEXT (SNI) NETSEC NETWORK DRIVER
-M: Jassi Brar <[email protected]>
 M: Ilias Apalodimas <[email protected]>
+M: Masahisa Kojima <[email protected]>
 L: [email protected]
 S: Maintained
 F: Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 8
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Hurr durr I'ma ninja sloth
 
 # *DOCUMENTATION*

diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
@@ -834,16 +834,6 @@
  <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;
  clock-names = "pix", "axi";
  status = "disabled";
-
- port {
- #address-cells = <1>;
- #size-cells = <0>;
-
- lcdif_out_mipi_dsi: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&mipi_dsi_in_lcdif>;
- };
- };
  };
 
  mipi_csi: mipi-csi@30750000 {
@@ -895,22 +885,6 @@
  samsung,esc-clock-frequency = <20000000>;
  samsung,pll-clock-frequency = <24000000>;
  status = "disabled";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- mipi_dsi_in_lcdif: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&lcdif_out_mipi_dsi>;
- };
- };
- };
  };
  };
 

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
@@ -297,6 +297,7 @@ CONFIG_FB_MODE_HELPERS=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_L4F00242T03=y
 CONFIG_LCD_PLATFORM=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_GPIO=y
 CONFIG_FRAMEBUFFER_CONSOLE=y

diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
@@ -42,5 +42,6 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-manta.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-pi.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-transpeed-8k618-t.dtb
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi
@@ -255,7 +255,7 @@
  <&clk IMX8MP_AUDIO_PLL2_OUT>;
  assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
  assigned-clock-rates = <13000000>, <13000000>, <156000000>;
- reset-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;
  status = "disabled";
 
  ports {

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -1820,7 +1820,7 @@
  compatible = "fsl,imx8mp-ldb";
  reg = <0x5c 0x4>, <0x128 0x4>;
  reg-names = "ldb", "lvds";
- clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
+ clocks = <&clk IMX8MP_CLK_MEDIA_LDB_ROOT>;
  clock-names = "ldb";
  assigned-clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
  assigned-clock-parents = <&clk IMX8MP_VIDEO_PLL1_OUT>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts b/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts
@@ -175,7 +175,7 @@
  status = "okay";
 
  phy-handle = <&mgbe0_phy>;
- phy-mode = "usxgmii";
+ phy-mode = "10gbase-r";
 
  mdio {
  #address-cells = <1>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
@@ -1459,7 +1459,7 @@
  <&mc TEGRA234_MEMORY_CLIENT_MGBEAWR &emc>;
  interconnect-names = "dma-mem", "write";
  iommus = <&smmu_niso0 TEGRA234_SID_MGBE>;
- power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEA>;
+ power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEB>;
  status = "disabled";
  };
 
@@ -1493,7 +1493,7 @@
  <&mc TEGRA234_MEMORY_CLIENT_MGBEBWR &emc>;
  interconnect-names = "dma-mem", "write";
  iommus = <&smmu_niso0 TEGRA234_SID_MGBE_VF1>;
- power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEB>;
+ power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEC>;
  status = "disabled";
  };
 
@@ -1527,7 +1527,7 @@
  <&mc TEGRA234_MEMORY_CLIENT_MGBECWR &emc>;
  interconnect-names = "dma-mem", "write";
  iommus = <&smmu_niso0 TEGRA234_SID_MGBE_VF2>;
- power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEC>;
+ power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBED>;
  status = "disabled";
  };
 

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -457,25 +457,6 @@
  };
  };
 
- mpm: interrupt-controller {
- compatible = "qcom,mpm";
- qcom,rpm-msg-ram = <&apss_mpm>;
- interrupts = <GIC_SPI 171 IRQ_TYPE_EDGE_RISING>;
- mboxes = <&apcs_glb 1>;
- interrupt-controller;
- #interrupt-cells = <2>;
- #power-domain-cells = <0>;
- interrupt-parent = <&intc>;
- qcom,mpm-pin-count = <96>;
- qcom,mpm-pin-map = <2 184>, /* TSENS1 upper_lower_int */
- <52 243>, /* DWC3_PRI ss_phy_irq */
- <79 347>, /* DWC3_PRI hs_phy_irq */
- <80 352>, /* DWC3_SEC hs_phy_irq */
- <81 347>, /* QUSB2_PHY_PRI DP+DM */
- <82 352>, /* QUSB2_PHY_SEC DP+DM */
- <87 326>; /* SPMI */
- };
-
  psci {
  compatible = "arm,psci-1.0";
  method = "smc";
@@ -765,15 +746,8 @@
  };
 
  rpm_msg_ram: sram@68000 {
- compatible = "qcom,rpm-msg-ram", "mmio-sram";
+ compatible = "qcom,rpm-msg-ram";
  reg = <0x00068000 0x6000>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 0x00068000 0x7000>;
-
- apss_mpm: sram@1b8 {
- reg = <0x1b8 0x48>;
- };
  };
 
  qfprom@74000 {
@@ -856,8 +830,8 @@
  reg = <0x004ad000 0x1000>, /* TM */
  <0x004ac000 0x1000>; /* SROT */
  #qcom,sensors = <8>;
- interrupts-extended = <&mpm 2 IRQ_TYPE_LEVEL_HIGH>,
-    <&intc GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>;
  interrupt-names = "uplow", "critical";
  #thermal-sensor-cells = <1>;
  };
@@ -1363,7 +1337,6 @@
  interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
  gpio-controller;
  gpio-ranges = <&tlmm 0 0 150>;
- wakeup-parent = <&mpm>;
  #gpio-cells = <2>;
  interrupt-controller;
  #interrupt-cells = <2>;
@@ -1891,7 +1864,7 @@
  <0x0400a000 0x002100>;
  reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
  interrupt-names = "periph_irq";
- interrupts-extended = <&mpm 87 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>;
  qcom,ee = <0>;
  qcom,channel = <0>;
  #address-cells = <2>;
@@ -3052,8 +3025,8 @@
  #size-cells = <1>;
  ranges;
 
- interrupts-extended = <&mpm 79 IRQ_TYPE_LEVEL_HIGH>,
-    <&mpm 52 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;
  interrupt-names = "hs_phy_irq", "ss_phy_irq";
 
  clocks = <&gcc GCC_SYS_NOC_USB3_AXI_CLK>,

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -563,6 +563,8 @@
 };
 
 &pcie4 {
+ max-link-speed = <2>;
+
  perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>;
  wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>;
 

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -722,6 +722,8 @@
 };
 
 &pcie4 {
+ max-link-speed = <2>;
+
  perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>;
  wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>;
 

diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -1304,6 +1304,9 @@
  &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>,
  <&system_noc MASTER_QUP_0 RPM_ALWAYS_TAG
  &bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>;
+ interconnect-names = "qup-core",
+ "qup-config",
+ "qup-memory";
  #address-cells = <1>;
  #size-cells = <0>;
  status = "disabled";