Commit 634ec1fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Paolo Abeni:
 "Including fixes from CAN

  Current release - regressions:

    - udp: do not use skb_release_head_state() before
      skb_attempt_defer_free()

    - gro_cells: use nested-BH locking for gro_cell

    - dpll: zl3073x: increase maximum size of flash utility

  Previous releases - regressions:

    - core: fix lockdep splat on device unregister

    - tcp: fix tcp_tso_should_defer() vs large RTT

    - tls:
        - don't rely on tx_work during send()
        - wait for pending async decryptions if tls_strp_msg_hold fails

    - can: j1939: add missing calls in NETDEV_UNREGISTER notification
      handler

    - eth: lan78xx: fix lost EEPROM write timeout in
      lan78xx_write_raw_eeprom

  Previous releases - always broken:

    - ip6_tunnel: prevent perpetual tunnel growth

    - dpll: zl3073x: handle missing or corrupted flash configuration

    - can: m_can: fix pm_runtime and CAN state handling

    - eth:
        - ixgbe: fix too early devlink_free() in ixgbe_remove()
        - ixgbevf: fix mailbox API compatibility
        - gve: Check valid ts bit on RX descriptor before hw timestamping
        - idpf: cleanup remaining SKBs in PTP flows
        - r8169: fix packet truncation after S4 resume on RTL8168H/RTL8111H"

* tag 'net-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (50 commits)
  udp: do not use skb_release_head_state() before skb_attempt_defer_free()
  net: usb: lan78xx: fix use of improperly initialized dev->chipid in lan78xx_reset
  netdevsim: set the carrier when the device goes up
  selftests: tls: add test for short splice due to full skmsg
  selftests: net: tls: add tests for cmsg vs MSG_MORE
  tls: don't rely on tx_work during send()
  tls: wait for pending async decryptions if tls_strp_msg_hold fails
  tls: always set record_type in tls_process_cmsg
  tls: wait for async encrypt in case of error during latter iterations of sendmsg
  tls: trim encrypted message to match the plaintext on short splice
  tg3: prevent use of uninitialized remote_adv and local_adv variables
  MAINTAINERS: new entry for IPv6 IOAM
  gve: Check valid ts bit on RX descriptor before hw timestamping
  net: core: fix lockdep splat on device unregister
  MAINTAINERS: add myself as maintainer for b53
  selftests: net: check jq command is supported
  net: airoha: Take into account out-of-order tx completions in airoha_dev_xmit()
  tcp: fix tcp_tso_should_defer() vs large RTT
  r8152: add error handling in rtl8152_driver_init
  usbnet: Fix using smp_processor_id() in preemptible code warnings
  ...
parents ef254855 6de1dec1

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com> 
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Domen Puncer <domen@coderock.org>

Dong Aisheng <aisheng.dong@nxp.com> <b29396@freescale.com>

Douglas Gilbert <dougg@torque.net>

Drew Fustini <fustini@kernel.org> <drew@pdp7.com>

<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>

Documentation/networking/can.rst

+67 −4
Original line number Diff line number Diff line
@@ -1398,10 +1398,9 @@ second bit timing has to be specified in order to enable the CAN FD bitrate. 
Additionally CAN FD capable CAN controllers support up to 64 bytes of

payload. The representation of this length in can_frame.len and

canfd_frame.len for userspace applications and inside the Linux network

layer is a plain value from 0 .. 64 instead of the CAN 'data length code'.

The data length code was a 1:1 mapping to the payload length in the Classical

CAN frames anyway. The payload length to the bus-relevant DLC mapping is

only performed inside the CAN drivers, preferably with the helper

layer is a plain value from 0 .. 64 instead of the Classical CAN length

which ranges from 0 to 8. The payload length to the bus-relevant DLC mapping

is only performed inside the CAN drivers, preferably with the helper

functions can_fd_dlc2len() and can_fd_len2dlc().



The CAN netdevice driver capabilities can be distinguished by the network
@@ -1465,6 +1464,70 @@ Example when 'fd-non-iso on' is added on this switchable CAN FD adapter:: 
   can <FD,FD-NON-ISO> state ERROR-ACTIVE (berr-counter tx 0 rx 0) restart-ms 0





Transmitter Delay Compensation

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



At high bit rates, the propagation delay from the TX pin to the RX pin of

the transceiver might become greater than the actual bit time causing

measurement errors: the RX pin would still be measuring the previous bit.



The Transmitter Delay Compensation (thereafter, TDC) resolves this problem

by introducing a Secondary Sample Point (SSP) equal to the distance, in

minimum time quantum, from the start of the bit time on the TX pin to the

actual measurement on the RX pin. The SSP is calculated as the sum of two

configurable values: the TDC Value (TDCV) and the TDC offset (TDCO).



TDC, if supported by the device, can be configured together with CAN-FD

using the ip tool's "tdc-mode" argument as follow:



**omitted**

	When no "tdc-mode" option is provided, the kernel will automatically

	decide whether TDC should be turned on, in which case it will

	calculate a default TDCO and use the TDCV as measured by the

	device. This is the recommended method to use TDC.



**"tdc-mode off"**

	TDC is explicitly disabled.



**"tdc-mode auto"**

	The user must provide the "tdco" argument. The TDCV will be

	automatically calculated by the device. This option is only

	available if the device supports the TDC-AUTO CAN controller mode.



**"tdc-mode manual"**

	The user must provide both the "tdco" and "tdcv" arguments. This

	option is only available if the device supports the TDC-MANUAL CAN

	controller mode.



Note that some devices may offer an additional parameter: "tdcf" (TDC Filter

window). If supported by your device, this can be added as an optional

argument to either "tdc-mode auto" or "tdc-mode manual".



Example configuring a 500 kbit/s arbitration bitrate, a 5 Mbit/s data

bitrate, a TDCO of 15 minimum time quantum and a TDCV automatically measured

by the device::



    $ ip link set can0 up type can bitrate 500000 \

                                   fd on dbitrate 4000000 \

				   tdc-mode auto tdco 15

    $ ip -details link show can0

    5: can0: <NOARP,UP,LOWER_UP,ECHO> mtu 72 qdisc pfifo_fast state UP \

             mode DEFAULT group default qlen 10

        link/can  promiscuity 0 allmulti 0 minmtu 72 maxmtu 72

        can <FD,TDC-AUTO> state ERROR-ACTIVE restart-ms 0

          bitrate 500000 sample-point 0.875

          tq 12 prop-seg 69 phase-seg1 70 phase-seg2 20 sjw 10 brp 1

          ES582.1/ES584.1: tseg1 2..256 tseg2 2..128 sjw 1..128 brp 1..512 \

          brp_inc 1

          dbitrate 4000000 dsample-point 0.750

          dtq 12 dprop-seg 7 dphase-seg1 7 dphase-seg2 5 dsjw 2 dbrp 1

          tdco 15 tdcf 0

          ES582.1/ES584.1: dtseg1 2..32 dtseg2 1..16 dsjw 1..8 dbrp 1..32 \

          dbrp_inc 1

          tdco 0..127 tdcf 0..127

          clock 80000000





Supported CAN Hardware

----------------------

Documentation/networking/seg6-sysctl.rst

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ seg6_require_hmac - INTEGER 


	Default is 0.



/proc/sys/net/ipv6/seg6_* variables:

====================================



seg6_flowlabel - INTEGER

	Controls the behaviour of computing the flowlabel of outer

	IPv6 header in case of SR T.encaps

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -4804,6 +4804,7 @@ F: drivers/net/ethernet/broadcom/b44.* 








BROADCOM B53/SF2 ETHERNET SWITCH DRIVER









M:	Florian Fainelli <florian.fainelli@broadcom.com>









M:	Jonas Gorski <jonas.gorski@gmail.com>









L:	netdev@vger.kernel.org









L:	openwrt-devel@lists.openwrt.org (subscribers-only)









S:	Supported








@@ -18013,6 +18014,16 @@ X:	net/rfkill/







X:	net/wireless/









X:	tools/testing/selftests/net/can/

















NETWORKING [IOAM]









M:	Justin Iurman <justin.iurman@uliege.be>









S:	Maintained









F:	Documentation/networking/ioam6*









F:	include/linux/ioam6*









F:	include/net/ioam6*









F:	include/uapi/linux/ioam6*









F:	net/ipv6/ioam6*









F:	tools/testing/selftests/net/ioam6*

















NETWORKING [IPSEC]









M:	Steffen Klassert <steffen.klassert@secunet.com>









M:	Herbert Xu <herbert@gondor.apana.org.au>

























drivers/dpll/zl3073x/core.c



+21
−0






























Original line number
Diff line number
Diff line







@@ -1038,8 +1038,29 @@ zl3073x_dev_phase_meas_setup(struct zl3073x_dev *zldev)







int zl3073x_dev_start(struct zl3073x_dev *zldev, bool full)









{









	struct zl3073x_dpll *zldpll;









	u8 info;









	int rc;



















	rc = zl3073x_read_u8(zldev, ZL_REG_INFO, &info);









	if (rc) {









		dev_err(zldev->dev, "Failed to read device status info\n");









		return rc;









	}



















	if (!FIELD_GET(ZL_INFO_READY, info)) {









		/* The ready bit indicates that the firmware was successfully









		 * configured and is ready for normal operation. If it is









		 * cleared then the configuration stored in flash is wrong









		 * or missing. In this situation the driver will expose









		 * only devlink interface to give an opportunity to flash









		 * the correct config.









		 */









		dev_info(zldev->dev,









			 "FW not fully ready - missing or corrupted config\n");



















		return 0;









	}



















	if (full) {









		/* Fetch device state */









		rc = zl3073x_dev_state_fetch(zldev);