From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 22 Sep 2022 20:02:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.1-rc5~319^2~132
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0140a7168f8b2732f622fa2c500f1f8be212382a;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://git./linux/kernel/git/netdev/net

drivers/net/ethernet/freescale/fec.h
  7b15515fc1ca ("Revert "fec: Restart PPS after link state change"")
  40c79ce13b03 ("net: fec: add stop mode support for imx8 platform")
https://lore.kernel.org/all/20220921105337.62b41047@canb.auug.org.au/

drivers/pinctrl/pinctrl-ocelot.c
  c297561bc98a ("pinctrl: ocelot: Fix interrupt controller")
  181f604b33cd ("pinctrl: ocelot: add ability to be used in a non-mmio configuration")
https://lore.kernel.org/all/20220921110032.7cd28114@canb.auug.org.au/

tools/testing/selftests/drivers/net/bonding/Makefile
  bbb774d921e2 ("net: Add tests for bonding and team address list management")
  152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target")
https://lore.kernel.org/all/20220921110437.5b7dbd82@canb.auug.org.au/

drivers/net/can/usb/gs_usb.c
  5440428b3da6 ("can: gs_usb: gs_can_open(): fix race dev->can.state condition")
  45dfa45f52e6 ("can: gs_usb: add RX and TX hardware timestamp support")
https://lore.kernel.org/all/84f45a7d-92b6-4dc5-d7a1-072152fab6ff@tessares.net/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

0140a7168f8b2732f622fa2c500f1f8be212382a
diff --cc drivers/net/can/usb/gs_usb.c
index cc363f1,c1ff3c0..5e0d280
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@@ -956,11 -823,8 +956,12 @@@ static int gs_can_open(struct net_devic
  	if (ctrlmode & CAN_CTRLMODE_3_SAMPLES)
  		flags |= GS_CAN_MODE_TRIPLE_SAMPLE;
  
 +	/* if hardware supports timestamps, enable it */
 +	if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
 +		flags |= GS_CAN_MODE_HW_TIMESTAMP;
 +
  	/* finally start device */
+ 	dev->can.state = CAN_STATE_ERROR_ACTIVE;
  	dm->mode = cpu_to_le32(GS_CAN_MODE_START);
  	dm->flags = cpu_to_le32(flags);
  	rc = usb_control_msg(interface_to_usbdev(dev->iface),
@@@ -977,12 -842,6 +979,10 @@@
  
  	kfree(dm);
  
 +	/* start polling timestamp */
 +	if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
 +		gs_usb_timestamp_init(dev);
 +
- 	dev->can.state = CAN_STATE_ERROR_ACTIVE;
- 
  	parent->active_channels++;
  	if (!(dev->can.ctrlmode & CAN_CTRLMODE_LISTENONLY))
  		netif_start_queue(netdev);
diff --cc drivers/net/ethernet/freescale/fec.h
index dd055d7,a5fed00..b0100fe
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@@ -641,15 -639,6 +642,8 @@@ struct fec_enet_private 
  	int pps_enable;
  	unsigned int next_counter;
  
- 	struct {
- 		struct timespec64 ts_phc;
- 		u64 ns_sys;
- 		u32 at_corr;
- 		u8 at_inc_corr;
- 	} ptp_saved_state;
- 
 +	struct imx_sc_ipc *ipc_handle;
 +
  	u64 ethtool_stats[];
  };
  
diff --cc drivers/pinctrl/pinctrl-ocelot.c
index 340ca23,c7df8c5..83464e0
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@@ -2008,11 -2086,12 +2081,11 @@@ static int ocelot_pinctrl_probe(struct 
  
  	regmap_config.max_register = OCELOT_GPIO_SD_MAP * info->stride + 15 * 4;
  
 -	info->map = devm_regmap_init_mmio(dev, base, &regmap_config);
 -	if (IS_ERR(info->map)) {
 -		dev_err(dev, "Failed to create regmap\n");
 -		return PTR_ERR(info->map);
 -	}
 +	info->map = ocelot_regmap_from_resource(pdev, 0, &regmap_config);
 +	if (IS_ERR(info->map))
 +		return dev_err_probe(dev, PTR_ERR(info->map),
 +				     "Failed to create regmap\n");
- 	dev_set_drvdata(dev, info->map);
+ 	dev_set_drvdata(dev, info);
  	info->dev = dev;
  
  	/* Pinconf registers */
diff --cc tools/testing/selftests/drivers/net/bonding/Makefile
index d209f7a,1d86665..d14846f
--- a/tools/testing/selftests/drivers/net/bonding/Makefile
+++ b/tools/testing/selftests/drivers/net/bonding/Makefile
@@@ -1,7 -1,10 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0
  # Makefile for net selftests
  
- TEST_PROGS := bond-break-lacpdu-tx.sh
- TEST_PROGS += bond-lladdr-target.sh
 -TEST_PROGS := bond-break-lacpdu-tx.sh \
 -	      dev_addr_lists.sh \
 -	      bond-arp-interval-causes-panic.sh
++TEST_PROGS := \
++	bond-arp-interval-causes-panic.sh \
++	bond-break-lacpdu-tx.sh \
++	dev_addr_lists.sh
+ 
+ TEST_FILES := lag_lib.sh
  
  include ../../../lib.mk