Commit 6b02fd77 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Cross-merge networking fixes after downstream PR (net-6.15-rc6).

No conflicts.

Adjacent changes:

net/core/dev.c:
  08e9f2d5 ("net: Lock netdevices during dev_shutdown")
  a82dc19d ("net: avoid potential race between netdev_get_by_index_lock() and netns switch")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 46431fd5 2c89c1b6

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ Description: RO. Package current voltage in millivolt. 


What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp2_input

Date:		March 2025

KernelVersion:	6.14

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Package temperature in millidegree Celsius.
@@ -119,7 +119,7 @@ Description: RO. Package temperature in millidegree Celsius. 


What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp3_input

Date:		March 2025

KernelVersion:	6.14

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. VRAM temperature in millidegree Celsius.

Documentation/devicetree/bindings/net/ethernet-controller.yaml

+90 −7
Original line number Diff line number Diff line
@@ -50,19 +50,17 @@ properties: 
      - rev-rmii

      - moca



      # RX and TX delays are added by the MAC when required

      # RX and TX delays are provided by the PCB. See below

      - rgmii



      # RGMII with internal RX and TX delays provided by the PHY,

      # the MAC should not add the RX or TX delays in this case

      # RX and TX delays are not provided by the PCB. This is the most

      # frequent case. See below

      - rgmii-id



      # RGMII with internal RX delay provided by the PHY, the MAC

      # should not add an RX delay in this case

      # TX delay is provided by the PCB. See below

      - rgmii-rxid



      # RGMII with internal TX delay provided by the PHY, the MAC

      # should not add an TX delay in this case

      # RX delay is provided by the PCB. See below

      - rgmii-txid

      - rtbi

      - smii
@@ -263,4 +261,89 @@ allOf: 


additionalProperties: true



# Informative

# ===========

#

# 'phy-modes' & 'phy-connection-type' properties 'rgmii', 'rgmii-id',

# 'rgmii-rxid', and 'rgmii-txid' are frequently used wrongly by

# developers. This informative section clarifies their usage.

#

# The RGMII specification requires a 2ns delay between the data and

# clock signals on the RGMII bus. How this delay is implemented is not

# specified.

#

# One option is to make the clock traces on the PCB longer than the

# data traces. A sufficiently difference in length can provide the 2ns

# delay. If both the RX and TX delays are implemented in this manner,

# 'rgmii' should be used, so indicating the PCB adds the delays.

#

# If the PCB does not add these delays via extra long traces,

# 'rgmii-id' should be used. Here, 'id' refers to 'internal delay',

# where either the MAC or PHY adds the delay.

#

# If only one of the two delays are implemented via extra long clock

# lines, either 'rgmii-rxid' or 'rgmii-txid' should be used,

# indicating the MAC or PHY should implement one of the delays

# internally, while the PCB implements the other delay.

#

# Device Tree describes hardware, and in this case, it describes the

# PCB between the MAC and the PHY, if the PCB implements delays or

# not.

#

# In practice, very few PCBs make use of extra long clock lines. Hence

# any RGMII phy mode other than 'rgmii-id' is probably wrong, and is

# unlikely to be accepted during review without details provided in

# the commit description and comments in the .dts file.

#

# When the PCB does not implement the delays, the MAC or PHY must.  As

# such, this is software configuration, and so not described in Device

# Tree.

#

# The following describes how Linux implements the configuration of

# the MAC and PHY to add these delays when the PCB does not. As stated

# above, developers often get this wrong, and the aim of this section

# is reduce the frequency of these errors by Linux developers. Other

# users of the Device Tree may implement it differently, and still be

# consistent with both the normative and informative description

# above.

#

# By default in Linux, when using phylib/phylink, the MAC is expected

# to read the 'phy-mode' from Device Tree, not implement any delays,

# and pass the value to the PHY. The PHY will then implement delays as

# specified by the 'phy-mode'. The PHY should always be reconfigured

# to implement the needed delays, replacing any setting performed by

# strapping or the bootloader, etc.

#

# Experience to date is that all PHYs which implement RGMII also

# implement the ability to add or not add the needed delays. Hence

# this default is expected to work in all cases. Ignoring this default

# is likely to be questioned by Reviews, and require a strong argument

# to be accepted.

#

# There are a small number of cases where the MAC has hard coded

# delays which cannot be disabled. The 'phy-mode' only describes the

# PCB.  The inability to disable the delays in the MAC does not change

# the meaning of 'phy-mode'. It does however mean that a 'phy-mode' of

# 'rgmii' is now invalid, it cannot be supported, since both the PCB

# and the MAC and PHY adding delays cannot result in a functional

# link. Thus the MAC should report a fatal error for any modes which

# cannot be supported. When the MAC implements the delay, it must

# ensure that the PHY does not also implement the same delay. So it

# must modify the phy-mode it passes to the PHY, removing the delay it

# has added. Failure to remove the delay will result in a

# non-functioning link.

#

# Sometimes there is a need to fine tune the delays. Often the MAC or

# PHY can perform this fine tuning. In the MAC node, the Device Tree

# properties 'rx-internal-delay-ps' and 'tx-internal-delay-ps' should

# be used to indicate fine tuning performed by the MAC. The values

# expected here are small. A value of 2000ps, i.e 2ns, and a phy-mode

# of 'rgmii' will not be accepted by Reviewers.

#

# If the PHY is to perform fine tuning, the properties

# 'rx-internal-delay-ps' and 'tx-internal-delay-ps' in the PHY node

# should be used. When the PHY is implementing delays, e.g. 'rgmii-id'

# these properties should have a value near to 2000ps. If the PCB is

# implementing delays, e.g. 'rgmii', a small value can be used to fine

# tune the delay added by the PCB.

...

Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml

+7 −12
Original line number Diff line number Diff line
@@ -56,19 +56,18 @@ properties: 
        enum:

          - snps,dw-apb-ssi

          - snps,dwc-ssi-1.01a

      - description: Microsemi Ocelot/Jaguar2 SoC SPI Controller

        items:

          - enum:

              - mscc,ocelot-spi

              - mscc,jaguar2-spi

          - const: snps,dw-apb-ssi

      - description: Microchip Sparx5 SoC SPI Controller

        const: microchip,sparx5-spi

      - description: Amazon Alpine SPI Controller

        const: amazon,alpine-dw-apb-ssi

      - description: Renesas RZ/N1 SPI Controller

      - description: Vendor controllers which use snps,dw-apb-ssi as fallback

        items:

          - const: renesas,rzn1-spi

          - enum:

              - mscc,ocelot-spi

              - mscc,jaguar2-spi

              - renesas,rzn1-spi

              - sophgo,sg2042-spi

              - thead,th1520-spi

          - const: snps,dw-apb-ssi

      - description: Intel Keem Bay SPI Controller

        const: intel,keembay-ssi
@@ -88,10 +87,6 @@ properties: 
              - renesas,r9a06g032-spi # RZ/N1D

              - renesas,r9a06g033-spi # RZ/N1S

          - const: renesas,rzn1-spi   # RZ/N1

      - description: T-HEAD TH1520 SoC SPI Controller

        items:

          - const: thead,th1520-spi

          - const: snps,dw-apb-ssi



  reg:

    minItems: 1

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -2519,6 +2519,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git 
F:	arch/arm/boot/dts/nxp/imx/

F:	arch/arm/boot/dts/nxp/mxs/

F:	arch/arm64/boot/dts/freescale/

X:	Documentation/devicetree/bindings/media/i2c/

X:	arch/arm64/boot/dts/freescale/fsl-*

X:	arch/arm64/boot/dts/freescale/qoriq-*

X:	drivers/media/i2c/
@@ -8717,6 +8718,7 @@ M: Chao Yu <chao@kernel.org> 
R:	Yue Hu <zbestahu@gmail.com>

R:	Jeffle Xu <jefflexu@linux.alibaba.com>

R:	Sandeep Dhavale <dhavale@google.com>

R:	Hongbo Li <lihongbo22@huawei.com>

L:	linux-erofs@lists.ozlabs.org

S:	Maintained

W:	https://erofs.docs.kernel.org
@@ -22748,9 +22750,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 
F:	Documentation/devicetree/bindings/sound/

F:	Documentation/sound/soc/

F:	include/dt-bindings/sound/

F:	include/sound/cs-amp-lib.h

F:	include/sound/cs35l*

F:	include/sound/cs4271.h

F:	include/sound/cs42l*

F:	include/sound/madera-pdata.h

F:	include/sound/soc*

F:	include/sound/sof.h

F:	include/sound/sof/

F:	include/sound/wm*.h

F:	include/trace/events/sof*.h

F:	include/uapi/sound/asoc.h

F:	sound/soc/

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 6

PATCHLEVEL = 15

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Baby Opossum Posse



# *DOCUMENTATION*