Commit 23758867 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.1-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from 802.15.4 (Zigbee et al).

  Current release - regressions:

   - ipa: fix bugs in the register conversion for IPA v3.1 and v3.5.1

  Current release - new code bugs:

   - mptcp: fix abba deadlock on fastopen

   - eth: stmmac: rk3588: allow multiple gmac controllers in one system

  Previous releases - regressions:

   - ip: rework the fix for dflt addr selection for connected nexthop

   - net: couple more fixes for misinterpreting bits in struct page
     after the signature was added

  Previous releases - always broken:

   - ipv6: ensure sane device mtu in tunnels

   - openvswitch: switch from WARN to pr_warn on a user-triggerable path

   - ethtool: eeprom: fix null-deref on genl_info in dump

   - ieee802154: more return code fixes for corner cases in
     dgram_sendmsg

   - mac802154: fix link-quality-indicator recording

   - eth: mlx5: fixes for IPsec, PTP timestamps, OvS and conntrack
     offload

   - eth: fec: limit register access on i.MX6UL

   - eth: bcm4908_enet: update TX stats after actual transmission

   - can: rcar_canfd: improve IRQ handling for RZ/G2L

  Misc:

   - genetlink: piggy back on the newly added resv_op_start to enforce
     more sanity checks on new commands"

* tag 'net-6.1-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits)
  net: enetc: survive memory pressure without crashing
  kcm: do not sense pfmemalloc status in kcm_sendpage()
  net: do not sense pfmemalloc status in skb_append_pagefrags()
  net/mlx5e: Fix macsec sci endianness at rx sa update
  net/mlx5e: Fix wrong bitwise comparison usage in macsec_fs_rx_add_rule function
  net/mlx5e: Fix macsec rx security association (SA) update/delete
  net/mlx5e: Fix macsec coverity issue at rx sa update
  net/mlx5: Fix crash during sync firmware reset
  net/mlx5: Update fw fatal reporter state on PCI handlers successful recover
  net/mlx5e: TC, Fix cloned flow attr instance dests are not zeroed
  net/mlx5e: TC, Reject forwarding from internal port to internal port
  net/mlx5: Fix possible use-after-free in async command interface
  net/mlx5: ASO, Create the ASO SQ with the correct timestamp format
  net/mlx5e: Update restore chain id for slow path packets
  net/mlx5e: Extend SKB room check to include PTP-SQ
  net/mlx5: DR, Fix matcher disconnect error flow
  net/mlx5: Wait for firmware to enable CRS before pci_restore_state
  net/mlx5e: Do not increment ESN when updating IPsec ESN state
  netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed
  netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed
  ...
parents 7dd257d0 84ce1ca3

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -15436,6 +15436,7 @@ S: Maintained 
W:	http://openvswitch.org

F:	include/uapi/linux/openvswitch.h

F:	net/openvswitch/

F:	tools/testing/selftests/net/openvswitch/









OPERATING PERFORMANCE POINTS (OPP)









M:	Viresh Kumar <vireshk@kernel.org>
































drivers/net/can/mscan/mpc5xxx_can.c



+5
−3






























Original line number
Diff line number
Diff line







@@ -322,14 +322,14 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)







					       &mscan_clksrc);









	if (!priv->can.clock.freq) {









		dev_err(&ofdev->dev, "couldn't get MSCAN clock properties\n");









		goto exit_free_mscan;









		goto exit_put_clock;









	}



















	err = register_mscandev(dev, mscan_clksrc);









	if (err) {









		dev_err(&ofdev->dev, "registering %s failed (err=%d)\n",









			DRV_NAME, err);









		goto exit_free_mscan;









		goto exit_put_clock;









	}



















	dev_info(&ofdev->dev, "MSCAN at 0x%p, irq %d, clock %d Hz\n",








@@ -337,7 +337,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)

















	return 0;



















exit_free_mscan:









exit_put_clock:









	if (data->put_clock)









		data->put_clock(ofdev);









	free_candev(dev);









exit_dispose_irq:









	irq_dispose_mapping(irq);
































drivers/net/can/rcar/rcar_canfd.c



+11
−13






























Original line number
Diff line number
Diff line







@@ -1157,11 +1157,13 @@ static void rcar_canfd_handle_global_receive(struct rcar_canfd_global *gpriv, u3







{









	struct rcar_canfd_channel *priv = gpriv->ch[ch];









	u32 ridx = ch + RCANFD_RFFIFO_IDX;









	u32 sts;









	u32 sts, cc;



















	/* Handle Rx interrupts */









	sts = rcar_canfd_read(priv->base, RCANFD_RFSTS(gpriv, ridx));









	if (likely(sts & RCANFD_RFSTS_RFIF)) {









	cc = rcar_canfd_read(priv->base, RCANFD_RFCC(gpriv, ridx));









	if (likely(sts & RCANFD_RFSTS_RFIF &&









		   cc & RCANFD_RFCC_RFIE)) {









		if (napi_schedule_prep(&priv->napi)) {









			/* Disable Rx FIFO interrupts */









			rcar_canfd_clear_bit(priv->base,








@@ -1244,11 +1246,9 @@ static void rcar_canfd_handle_channel_tx(struct rcar_canfd_global *gpriv, u32 ch

















static irqreturn_t rcar_canfd_channel_tx_interrupt(int irq, void *dev_id)









{









	struct rcar_canfd_global *gpriv = dev_id;









	u32 ch;









	struct rcar_canfd_channel *priv = dev_id;



















	for_each_set_bit(ch, &gpriv->channels_mask, gpriv->max_channels)









		rcar_canfd_handle_channel_tx(gpriv, ch);









	rcar_canfd_handle_channel_tx(priv->gpriv, priv->channel);



















	return IRQ_HANDLED;









}








@@ -1276,11 +1276,9 @@ static void rcar_canfd_handle_channel_err(struct rcar_canfd_global *gpriv, u32 c

















static irqreturn_t rcar_canfd_channel_err_interrupt(int irq, void *dev_id)









{









	struct rcar_canfd_global *gpriv = dev_id;









	u32 ch;









	struct rcar_canfd_channel *priv = dev_id;



















	for_each_set_bit(ch, &gpriv->channels_mask, gpriv->max_channels)









		rcar_canfd_handle_channel_err(gpriv, ch);









	rcar_canfd_handle_channel_err(priv->gpriv, priv->channel);



















	return IRQ_HANDLED;









}








@@ -1721,6 +1719,7 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,







	priv->ndev = ndev;









	priv->base = gpriv->base;









	priv->channel = ch;









	priv->gpriv = gpriv;









	priv->can.clock.freq = fcan_freq;









	dev_info(&pdev->dev, "can_clk rate is %u\n", priv->can.clock.freq);


















@@ -1749,7 +1748,7 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,







		}









		err = devm_request_irq(&pdev->dev, err_irq,









				       rcar_canfd_channel_err_interrupt, 0,









				       irq_name, gpriv);









				       irq_name, priv);









		if (err) {









			dev_err(&pdev->dev, "devm_request_irq CH Err(%d) failed, error %d\n",









				err_irq, err);








@@ -1763,7 +1762,7 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,







		}









		err = devm_request_irq(&pdev->dev, tx_irq,









				       rcar_canfd_channel_tx_interrupt, 0,









				       irq_name, gpriv);









				       irq_name, priv);









		if (err) {









			dev_err(&pdev->dev, "devm_request_irq Tx (%d) failed, error %d\n",









				tx_irq, err);








@@ -1789,7 +1788,6 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,

















	priv->can.do_set_mode = rcar_canfd_do_set_mode;









	priv->can.do_get_berr_counter = rcar_canfd_get_berr_counter;









	priv->gpriv = gpriv;









	SET_NETDEV_DEV(ndev, &pdev->dev);



















	netif_napi_add_weight(ndev, &priv->napi, rcar_canfd_rx_poll,
































drivers/net/can/spi/mcp251x.c



+4
−1






























Original line number
Diff line number
Diff line







@@ -1415,11 +1415,14 @@ static int mcp251x_can_probe(struct spi_device *spi)

















	ret = mcp251x_gpio_setup(priv);









	if (ret)









		goto error_probe;









		goto out_unregister_candev;



















	netdev_info(net, "MCP%x successfully initialized.\n", priv->model);









	return 0;



















out_unregister_candev:









	unregister_candev(net);



















error_probe:









	destroy_workqueue(priv->wq);









	priv->wq = NULL;
































drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -1875,7 +1875,7 @@ static int kvaser_usb_hydra_start_chip(struct kvaser_usb_net_priv *priv)







{









	int err;



















	init_completion(&priv->start_comp);









	reinit_completion(&priv->start_comp);



















	err = kvaser_usb_hydra_send_simple_cmd(priv->dev, CMD_START_CHIP_REQ,









					       priv->channel);








@@ -1893,7 +1893,7 @@ static int kvaser_usb_hydra_stop_chip(struct kvaser_usb_net_priv *priv)







{









	int err;



















	init_completion(&priv->stop_comp);









	reinit_completion(&priv->stop_comp);



















	/* Make sure we do not report invalid BUS_OFF from CMD_CHIP_STATE_EVENT









	 * see comment in kvaser_usb_hydra_update_state()