Commit 5fc31936 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from can, bluetooth and ipsec.

  This contains a last minute revert of a recent GRE patch, mostly to
  allow me stating there are no known regressions outstanding.

  Current release - regressions:

   - revert "gre: Fix IPv6 link-local address generation."

   - eth: ti: am65-cpsw: fix NAPI registration sequence

  Previous releases - regressions:

   - ipv6: fix memleak of nhc_pcpu_rth_output in fib_check_nh_v6_gw().

   - mptcp: fix data stream corruption in the address announcement

   - bluetooth: fix connection regression between LE and non-LE adapters

   - can:
       - flexcan: only change CAN state when link up in system PM
       - ucan: fix out of bound read in strscpy() source

  Previous releases - always broken:

   - lwtunnel: fix reentry loops

   - ipv6: fix TCP GSO segmentation with NAT

   - xfrm: force software GSO only in tunnel mode

   - eth: ti: icssg-prueth: add lock to stats

  Misc:

   - add Andrea Mayer as a maintainer of SRv6"

* tag 'net-6.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (33 commits)
  MAINTAINERS: Add Andrea Mayer as a maintainer of SRv6
  Revert "gre: Fix IPv6 link-local address generation."
  Revert "selftests: Add IPv6 link-local address generation tests for GRE devices."
  net/neighbor: add missing policy for NDTPA_QUEUE_LENBYTES
  tools headers: Sync uapi/asm-generic/socket.h with the kernel sources
  mptcp: Fix data stream corruption in the address announcement
  selftests: net: test for lwtunnel dst ref loops
  net: ipv6: ioam6: fix lwtunnel_output() loop
  net: lwtunnel: fix recursion loops
  net: ti: icssg-prueth: Add lock to stats
  net: atm: fix use after free in lec_send()
  xsk: fix an integer overflow in xp_create_and_assign_umem()
  net: stmmac: dwc-qos-eth: use devm_kzalloc() for AXI data
  selftests: drv-net: use defer in the ping test
  phy: fix xa_alloc_cyclic() error handling
  dpll: fix xa_alloc_cyclic() error handling
  devlink: fix xa_alloc_cyclic() error handling
  ipv6: Set errno after ip_fib_metrics_init() in ip6_route_info_create().
  ipv6: Fix memleak of nhc_pcpu_rth_output in fib_check_nh_v6_gw().
  net: ipv6: fix TCP GSO segmentation with NAT
  ...
parents 80c4c254 feaee98c

Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ allOf: 
            const: renesas,r8a779h0-canfd

    then:

      patternProperties:

        "^channel[5-7]$": false

        "^channel[4-7]$": false

    else:

      if:

        not:

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -16660,6 +16660,17 @@ F: net/mptcp/ 
F:	tools/testing/selftests/bpf/*/*mptcp*.[ch]

F:	tools/testing/selftests/net/mptcp/









NETWORKING [SRv6]









M:	Andrea Mayer <andrea.mayer@uniroma2.it>









L:	netdev@vger.kernel.org









S:	Maintained









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









F:	include/linux/seg6*









F:	include/net/seg6*









F:	include/uapi/linux/seg6*









F:	net/ipv6/seg6*









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

















NETWORKING [TCP]









M:	Eric Dumazet <edumazet@google.com>









M:	Neal Cardwell <ncardwell@google.com>
































drivers/dpll/dpll_core.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -505,7 +505,7 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,







	xa_init_flags(&pin->parent_refs, XA_FLAGS_ALLOC);









	ret = xa_alloc_cyclic(&dpll_pin_xa, &pin->id, pin, xa_limit_32b,









			      &dpll_pin_xa_id, GFP_KERNEL);









	if (ret)









	if (ret < 0)









		goto err_xa_alloc;









	return pin;









err_xa_alloc:
































drivers/net/can/flexcan/flexcan-core.c



+15
−3






























Original line number
Diff line number
Diff line







@@ -2260,14 +2260,19 @@ static int __maybe_unused flexcan_suspend(struct device *device)

















			flexcan_chip_interrupts_disable(dev);



















			err = flexcan_transceiver_disable(priv);









			if (err)









				return err;



















			err = pinctrl_pm_select_sleep_state(device);









			if (err)









				return err;









		}









		netif_stop_queue(dev);









		netif_device_detach(dev);









	}



















		priv->can.state = CAN_STATE_SLEEPING;









	}



















	return 0;









}








@@ -2278,7 +2283,6 @@ static int __maybe_unused flexcan_resume(struct device *device)







	struct flexcan_priv *priv = netdev_priv(dev);









	int err;



















	priv->can.state = CAN_STATE_ERROR_ACTIVE;









	if (netif_running(dev)) {









		netif_device_attach(dev);









		netif_start_queue(dev);








@@ -2292,12 +2296,20 @@ static int __maybe_unused flexcan_resume(struct device *device)







			if (err)









				return err;



















			err = flexcan_chip_start(dev);









			err = flexcan_transceiver_enable(priv);









			if (err)









				return err;



















			err = flexcan_chip_start(dev);









			if (err) {









				flexcan_transceiver_disable(priv);









				return err;









			}



















			flexcan_chip_interrupts_enable(dev);









		}



















		priv->can.state = CAN_STATE_ERROR_ACTIVE;









	}



















	return 0;
































drivers/net/can/rcar/rcar_canfd.c



+11
−17






























Original line number
Diff line number
Diff line







@@ -787,22 +787,14 @@ static void rcar_canfd_configure_controller(struct rcar_canfd_global *gpriv)







}



















static void rcar_canfd_configure_afl_rules(struct rcar_canfd_global *gpriv,









					   u32 ch)









					   u32 ch, u32 rule_entry)









{









	u32 cfg;









	int offset, start, page, num_rules = RCANFD_CHANNEL_NUMRULES;









	int offset, page, num_rules = RCANFD_CHANNEL_NUMRULES;









	u32 rule_entry_index = rule_entry % 16;









	u32 ridx = ch + RCANFD_RFFIFO_IDX;



















	if (ch == 0) {









		start = 0; /* Channel 0 always starts from 0th rule */









	} else {









		/* Get number of Channel 0 rules and adjust */









		cfg = rcar_canfd_read(gpriv->base, RCANFD_GAFLCFG(ch));









		start = RCANFD_GAFLCFG_GETRNC(gpriv, 0, cfg);









	}



















	/* Enable write access to entry */









	page = RCANFD_GAFL_PAGENUM(start);









	page = RCANFD_GAFL_PAGENUM(rule_entry);









	rcar_canfd_set_bit(gpriv->base, RCANFD_GAFLECTR,









			   (RCANFD_GAFLECTR_AFLPN(gpriv, page) |









			    RCANFD_GAFLECTR_AFLDAE));








@@ -818,13 +810,13 @@ static void rcar_canfd_configure_afl_rules(struct rcar_canfd_global *gpriv,







		offset = RCANFD_C_GAFL_OFFSET;



















	/* Accept all IDs */









	rcar_canfd_write(gpriv->base, RCANFD_GAFLID(offset, start), 0);









	rcar_canfd_write(gpriv->base, RCANFD_GAFLID(offset, rule_entry_index), 0);









	/* IDE or RTR is not considered for matching */









	rcar_canfd_write(gpriv->base, RCANFD_GAFLM(offset, start), 0);









	rcar_canfd_write(gpriv->base, RCANFD_GAFLM(offset, rule_entry_index), 0);









	/* Any data length accepted */









	rcar_canfd_write(gpriv->base, RCANFD_GAFLP0(offset, start), 0);









	rcar_canfd_write(gpriv->base, RCANFD_GAFLP0(offset, rule_entry_index), 0);









	/* Place the msg in corresponding Rx FIFO entry */









	rcar_canfd_set_bit(gpriv->base, RCANFD_GAFLP1(offset, start),









	rcar_canfd_set_bit(gpriv->base, RCANFD_GAFLP1(offset, rule_entry_index),









			   RCANFD_GAFLP1_GAFLFDP(ridx));



















	/* Disable write access to page */








@@ -1851,6 +1843,7 @@ static int rcar_canfd_probe(struct platform_device *pdev)







	unsigned long channels_mask = 0;









	int err, ch_irq, g_irq;









	int g_err_irq, g_recc_irq;









	u32 rule_entry = 0;









	bool fdmode = true;			/* CAN FD only mode - default */









	char name[9] = "channelX";









	int i;








@@ -2023,7 +2016,8 @@ static int rcar_canfd_probe(struct platform_device *pdev)







		rcar_canfd_configure_tx(gpriv, ch);



















		/* Configure receive rules */









		rcar_canfd_configure_afl_rules(gpriv, ch);









		rcar_canfd_configure_afl_rules(gpriv, ch, rule_entry);









		rule_entry += RCANFD_CHANNEL_NUMRULES;









	}



















	/* Configure common interrupts */