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

531e93d1 · Linus Torvalds <[email protected]> · 2019-10-19 17:09:11 -04:00

Pull networking fixes from David Miller:
 "I was battling a cold after some recent trips, so quite a bit piled up
  meanwhile, sorry about that.

  Highlights:

   1) Fix fd leak in various bpf selftests, from Brian Vazquez.

   2) Fix crash in xsk when device doesn't support some methods, from
      Magnus Karlsson.

   3) Fix various leaks and use-after-free in rxrpc, from David Howells.

   4) Fix several SKB leaks due to confusion of who owns an SKB and who
      should release it in the llc code. From Eric Biggers.

   5) Kill a bunc of KCSAN warnings in TCP, from Eric Dumazet.

   6) Jumbo packets don't work after resume on r8169, as the BIOS resets
      the chip into non-jumbo mode during suspend. From Heiner Kallweit.

   7) Corrupt L2 header during MPLS push, from Davide Caratti.

   8) Prevent possible infinite loop in tc_ctl_action, from Eric
      Dumazet.

   9) Get register bits right in bcmgenet driver, based upon chip
      version. From Florian Fainelli.

  10) Fix mutex problems in microchip DSA driver, from Marek Vasut.

  11) Cure race between route lookup and invalidation in ipv4, from Wei
      Wang.

  12) Fix performance regression due to false sharing in 'net'
      structure, from Eric Dumazet"

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (145 commits)
  net: reorder 'struct net' fields to avoid false sharing
  net: dsa: fix switch tree list
  net: ethernet: dwmac-sun8i: show message only when switching to promisc
  net: aquantia: add an error handling in aq_nic_set_multicast_list
  net: netem: correct the parent's backlog when corrupted packet was dropped
  net: netem: fix error path for corrupted GSO frames
  macb: propagate errors when getting optional clocks
  xen/netback: fix error path of xenvif_connect_data()
  net: hns3: fix mis-counting IRQ vector numbers issue
  net: usb: lan78xx: Connect PHY before registering MAC
  vsock/virtio: discard packets if credit is not respected
  vsock/virtio: send a credit update when buffer size is changed
  mlxsw: spectrum_trap: Push Ethernet header before reporting trap
  net: ensure correct skb->tstamp in various fragmenters
  net: bcmgenet: reset 40nm EPHY on energy detect
  net: bcmgenet: soft reset 40nm EPHYs before MAC init
  net: phy: bcm7xxx: define soft_reset for 40nm EPHY
  net: bcmgenet: don't set phydev->link from MAC
  net: Update address for MediaTek ethernet driver in MAINTAINERS
  ipv4: fix race condition between route lookup and invalidation
  ...

Commit: 531e93d11470aa2e14e6a3febef50d9bc7bab7a1
Parents: 998d7551 · 2a06b898

Merge commit. Changes below are compared with the first parent: 998d7551.

Changes

179 files changed · +1486 −892

File	Status	Add	Del	Content
Documentation/networking/device_drivers/pensando/ionic.rst	modified	+3	−1	View file
Documentation/networking/net_dim.txt	modified	+18	−18	View file
MAINTAINERS	modified	+3	−3	View file
arch/arm/boot/dts/mt7629-rfb.dts	modified	+12	−1	View file
arch/arm/boot/dts/mt7629.dtsi	modified	+0	−2	View file
drivers/net/bonding/bond_main.c	modified	+1	−1	View file
drivers/net/dsa/b53/b53_common.c	modified	+0	−1	View file
drivers/net/dsa/microchip/ksz8795.c	modified	+0	−4	View file
drivers/net/dsa/microchip/ksz8795_spi.c	modified	+4	−3	View file
drivers/net/dsa/microchip/ksz9477_i2c.c	modified	+4	−2	View file
drivers/net/dsa/microchip/ksz9477_reg.h	modified	+2	−2	View file
drivers/net/dsa/microchip/ksz9477_spi.c	modified	+4	−2	View file
drivers/net/dsa/microchip/ksz_common.c	modified	+1	−1	View file
drivers/net/dsa/microchip/ksz_common.h	modified	+17	−3	View file
drivers/net/dsa/sja1105/sja1105.h	modified	+2	−2	View file
drivers/net/dsa/sja1105/sja1105_dynamic_config.h	modified	+2	−2	View file
drivers/net/dsa/sja1105/sja1105_ptp.h	modified	+2	−2	View file
drivers/net/dsa/sja1105/sja1105_static_config.h	modified	+2	−2	View file
drivers/net/dsa/sja1105/sja1105_tas.h	modified	+2	−2	View file
drivers/net/ethernet/aquantia/atlantic/aq_main.c	modified	+1	−3	View file
drivers/net/ethernet/aquantia/atlantic/aq_nic.c	modified	+18	−16	View file
drivers/net/ethernet/aquantia/atlantic/aq_ring.c	modified	+2	−1	View file
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c	modified	+18	−5	View file
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c	modified	+15	−2	View file
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h	modified	+5	−2	View file
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h	modified	+19	−0	View file
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c	modified	+1	−1	View file
drivers/net/ethernet/broadcom/Kconfig	modified	+3	−1	View file
drivers/net/ethernet/broadcom/genet/bcmgenet.c	modified	+26	−15	View file
drivers/net/ethernet/broadcom/genet/bcmgenet.h	modified	+2	−1	View file
drivers/net/ethernet/broadcom/genet/bcmmii.c	modified	+56	−61	View file
drivers/net/ethernet/cadence/macb_main.c	modified	+6	−6	View file
drivers/net/ethernet/cavium/common/cavium_ptp.h	modified	+1	−1	View file
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c	modified	+49	−1	View file
drivers/net/ethernet/freescale/dpaa2/dpni.h	modified	+4	−1	View file
drivers/net/ethernet/hisilicon/hns3/hnae3.h	modified	+2	−0	View file
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	modified	+20	−1	View file
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	modified	+1	−0	View file
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c	modified	+9	−2	View file
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c	modified	+25	−3	View file
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h	modified	+1	−0	View file
drivers/net/ethernet/i825xx/lasi_82596.c	modified	+3	−1	View file
drivers/net/ethernet/i825xx/lib82596.c	modified	+2	−2	View file
drivers/net/ethernet/i825xx/sni_82596.c	modified	+3	−1	View file
drivers/net/ethernet/ibm/ibmvnic.c	modified	+3	−5	View file
drivers/net/ethernet/mediatek/mtk_eth_soc.c	modified	+1	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c	modified	+4	−6	View file
drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c	modified	+1	−0	View file
drivers/net/ethernet/nxp/lpc_eth.c	modified	+0	−3	View file
drivers/net/ethernet/pensando/ionic/ionic_lif.h	modified	+2	−0	View file
drivers/net/ethernet/pensando/ionic/ionic_stats.c	modified	+19	−10	View file
drivers/net/ethernet/realtek/r8169_main.c	modified	+11	−24	View file
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c	modified	+2	−1	View file
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c	modified	+1	−1	View file
drivers/net/ethernet/stmicro/stmmac/dwmac5.c	modified	+1	−0	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	modified	+9	−5	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c	modified	+1	−1	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c	modified	+9	−2	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c	modified	+1	−1	View file
drivers/net/ethernet/ti/davinci_cpdma.c	modified	+1	−1	View file
drivers/net/netdevsim/fib.c	modified	+2	−1	View file
drivers/net/phy/bcm7xxx.c	modified	+1	−0	View file
drivers/net/phy/micrel.c	modified	+37	−5	View file
drivers/net/phy/phy-c45.c	modified	+2	−0	View file
drivers/net/phy/phy.c	modified	+0	−3	View file
drivers/net/phy/phy_device.c	modified	+10	−1	View file
drivers/net/phy/phylink.c	modified	+1	−1	View file
drivers/net/tun.c	modified	+2	−2	View file
drivers/net/usb/hso.c	modified	+9	−4	View file
drivers/net/usb/lan78xx.c	modified	+6	−6	View file
drivers/net/usb/qmi_wwan.c	modified	+1	−0	View file
drivers/net/usb/sr9800.c	modified	+1	−1	View file
drivers/net/wireless/ath/ath10k/core.c	modified	+9	−6	View file
drivers/net/wireless/intel/iwlwifi/fw/acpi.c	modified	+6	−4	View file
drivers/net/wireless/intel/iwlwifi/fw/dbg.c	modified	+1	−0	View file
drivers/net/wireless/intel/iwlwifi/iwl-io.h	modified	+6	−6	View file
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	modified	+30	−13	View file
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c	modified	+5	−4	View file
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c	modified	+25	−11	View file
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	modified	+137	−137	View file
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	modified	+19	−6	View file
drivers/net/wireless/mac80211_hwsim.c	modified	+1	−1	View file
drivers/net/wireless/ralink/rt2x00/rt2x00.h	modified	+0	−1	View file
drivers/net/wireless/ralink/rt2x00/rt2x00debug.c	modified	+1	−1	View file
drivers/net/xen-netback/interface.c	modified	+0	−1	View file
drivers/nfc/pn533/usb.c	modified	+8	−1	View file
drivers/ptp/Kconfig	modified	+2	−2	View file
drivers/s390/net/qeth_l2_main.c	modified	+15	−8	View file
drivers/xen/pvcalls-back.c	modified	+1	−1	View file
include/linux/micrel_phy.h	modified	+1	−1	View file
include/linux/skbuff.h	modified	+3	−2	View file
include/linux/tcp.h	modified	+3	−3	View file
include/net/cfg80211.h	modified	+8	−0	View file
include/net/llc_conn.h	modified	+1	−1	View file
include/net/net_namespace.h	modified	+17	−8	View file
include/net/request_sock.h	modified	+2	−2	View file
include/net/sctp/sctp.h	modified	+5	−0	View file
include/net/sock.h	modified	+22	−11	View file
include/net/tcp.h	modified	+6	−4	View file
include/trace/events/rxrpc.h	modified	+9	−9	View file
include/trace/events/sock.h	modified	+2	−2	View file
net/bridge/netfilter/nf_conntrack_bridge.c	modified	+3	−0	View file
net/core/datagram.c	modified	+1	−1	View file
net/core/filter.c	modified	+5	−3	View file
net/core/net_namespace.c	modified	+11	−6	View file
net/core/request_sock.c	modified	+1	−1	View file
net/core/skbuff.c	modified	+13	−10	View file
net/core/sock.c	modified	+18	−14	View file
net/dsa/dsa2.c	modified	+1	−1	View file
net/ipv4/inet_connection_sock.c	modified	+3	−3	View file
net/ipv4/inet_diag.c	modified	+1	−1	View file
net/ipv4/ip_output.c	modified	+3	−0	View file
net/ipv4/route.c	modified	+7	−4	View file
net/ipv4/tcp.c	modified	+45	−30	View file
net/ipv4/tcp_diag.c	modified	+3	−2	View file
net/ipv4/tcp_fastopen.c	modified	+1	−1	View file
net/ipv4/tcp_input.c	modified	+22	−15	View file
net/ipv4/tcp_ipv4.c	modified	+17	−13	View file
net/ipv4/tcp_minisocks.c	modified	+11	−6	View file
net/ipv4/tcp_output.c	modified	+16	−16	View file
net/ipv4/tcp_timer.c	modified	+6	−5	View file
net/ipv6/ip6_gre.c	modified	+1	−0	View file
net/ipv6/ip6_output.c	modified	+3	−0	View file
net/ipv6/netfilter.c	modified	+3	−0	View file
net/ipv6/tcp_ipv6.c	modified	+10	−8	View file
net/llc/af_llc.c	modified	+20	−14	View file
net/llc/llc_c_ac.c	modified	+6	−2	View file
net/llc/llc_conn.c	modified	+18	−51	View file
net/llc/llc_if.c	modified	+8	−4	View file
net/llc/llc_s_ac.c	modified	+9	−3	View file
net/llc/llc_sap.c	modified	+8	−15	View file
net/mac80211/mlme.c	modified	+3	−2	View file
net/mac80211/rx.c	modified	+10	−1	View file
net/mac80211/scan.c	modified	+28	−2	View file
net/netfilter/nf_conntrack_core.c	modified	+2	−2	View file
net/openvswitch/actions.c	modified	+3	−2	View file
net/rxrpc/ar-internal.h	modified	+1	−0	View file
net/rxrpc/call_accept.c	modified	+3	−2	View file
net/rxrpc/call_object.c	modified	+20	−14	View file
net/rxrpc/conn_client.c	modified	+7	−2	View file
net/rxrpc/conn_object.c	modified	+7	−6	View file
net/rxrpc/conn_service.c	modified	+1	−1	View file
net/rxrpc/peer_event.c	modified	+9	−2	View file
net/rxrpc/peer_object.c	modified	+10	−6	View file
net/rxrpc/recvmsg.c	modified	+3	−3	View file
net/rxrpc/sendmsg.c	modified	+2	−1	View file
net/sched/act_api.c	modified	+13	−10	View file
net/sched/act_mirred.c	modified	+5	−1	View file
net/sched/act_mpls.c	modified	+8	−4	View file
net/sched/cls_api.c	modified	+33	−3	View file
net/sched/em_meta.c	modified	+2	−2	View file
net/sched/sch_api.c	modified	+1	−2	View file
net/sched/sch_etf.c	modified	+1	−1	View file
net/sched/sch_netem.c	modified	+8	−3	View file
net/sched/sch_taprio.c	modified	+4	−0	View file
net/sctp/diag.c	modified	+1	−1	View file
net/sctp/input.c	modified	+11	−5	View file
net/sctp/socket.c	modified	+2	−2	View file
net/smc/smc_core.c	modified	+4	−1	View file
net/smc/smc_rx.c	modified	+21	−8	View file
net/tipc/socket.c	modified	+4	−4	View file
net/vmw_vsock/virtio_transport_common.c	modified	+14	−3	View file
net/wireless/nl80211.c	modified	+1	−1	View file
net/wireless/reg.c	modified	+1	−0	View file
net/wireless/reg.h	modified	+0	−8	View file
net/wireless/scan.c	modified	+13	−10	View file
net/wireless/wext-sme.c	modified	+6	−2	View file
net/x25/x25_dev.c	modified	+1	−1	View file
net/xdp/xsk.c	modified	+27	−15	View file
samples/bpf/asm_goto_workaround.h	modified	+12	−1	View file
samples/bpf/task_fd_query_user.c	modified	+1	−0	View file
tools/bpf/Makefile	modified	+5	−1	View file
tools/lib/bpf/Makefile	modified	+23	−10	View file
tools/lib/bpf/libbpf_internal.h	modified	+16	−0	View file
tools/lib/bpf/xsk.c	modified	+2	−2	View file
tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c	modified	+1	−1	View file
tools/testing/selftests/bpf/prog_tests/tcp_rtt.c	modified	+2	−1	View file
tools/testing/selftests/bpf/test_flow_dissector.sh	modified	+3	−0	View file
tools/testing/selftests/bpf/test_lwt_ip_encap.sh	modified	+3	−3	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/networking/device_drivers/pensando/ionic.rst

View file

diff --git a/Documentation/networking/device_drivers/pensando/ionic.rst b/Documentation/networking/device_drivers/pensando/ionic.rst
index 67b6839..1393589 100644
--- a/Documentation/networking/device_drivers/pensando/ionic.rst
+++ b/Documentation/networking/device_drivers/pensando/ionic.rst
@@ -36,8 +36,10 @@ Support
 =======
 For general Linux networking support, please use the netdev mailing
 list, which is monitored by Pensando personnel::
+
   [email protected]
 
 For more specific support needs, please use the Pensando driver support
 email::
-	[email protected]
+
+  [email protected]

Documentation/networking/net_dim.txt

View file

diff --git a/Documentation/networking/net_dim.txt b/Documentation/networking/net_dim.txt
index 9cb31c5..9bdb7d5 100644
--- a/Documentation/networking/net_dim.txt
+++ b/Documentation/networking/net_dim.txt
@@ -92,16 +92,16 @@ under some conditions.
 Part III: Registering a Network Device to DIM
 ==============================================
 
-Net DIM API exposes the main function net_dim(struct net_dim *dim,
-struct net_dim_sample end_sample). This function is the entry point to the Net
+Net DIM API exposes the main function net_dim(struct dim *dim,
+struct dim_sample end_sample). This function is the entry point to the Net
 DIM algorithm and has to be called every time the driver would like to check if
 it should change interrupt moderation parameters. The driver should provide two
-data structures: struct net_dim and struct net_dim_sample. Struct net_dim
+data structures: struct dim and struct dim_sample. Struct dim
 describes the state of DIM for a specific object (RX queue, TX queue,
 other queues, etc.). This includes the current selected profile, previous data
 samples, the callback function provided by the driver and more.
-Struct net_dim_sample describes a data sample, which will be compared to the
-data sample stored in struct net_dim in order to decide on the algorithm's next
+Struct dim_sample describes a data sample, which will be compared to the
+data sample stored in struct dim in order to decide on the algorithm's next
 step. The sample should include bytes, packets and interrupts, measured by
 the driver.
 
@@ -110,9 +110,9 @@ main net_dim() function. The recommended method is to call net_dim() on each
 interrupt. Since Net DIM has a built-in moderation and it might decide to skip
 iterations under certain conditions, there is no need to moderate the net_dim()
 calls as well. As mentioned above, the driver needs to provide an object of type
-struct net_dim to the net_dim() function call. It is advised for each entity
-using Net DIM to hold a struct net_dim as part of its data structure and use it
-as the main Net DIM API object. The struct net_dim_sample should hold the latest
+struct dim to the net_dim() function call. It is advised for each entity
+using Net DIM to hold a struct dim as part of its data structure and use it
+as the main Net DIM API object. The struct dim_sample should hold the latest
 bytes, packets and interrupts count. No need to perform any calculations, just
 include the raw data.
 
@@ -132,19 +132,19 @@ usage is not complete but it should make the outline of the usage clear.
 
 my_driver.c:
 
-#include <linux/net_dim.h>
+#include <linux/dim.h>
 
 /* Callback for net DIM to schedule on a decision to change moderation */
 void my_driver_do_dim_work(struct work_struct *work)
 {
-	/* Get struct net_dim from struct work_struct */
-	struct net_dim *dim = container_of(work, struct net_dim,
-					   work);
+	/* Get struct dim from struct work_struct */
+	struct dim *dim = container_of(work, struct dim,
+				       work);
 	/* Do interrupt moderation related stuff */
 	...
 
 	/* Signal net DIM work is done and it should move to next iteration */
-	dim->state = NET_DIM_START_MEASURE;
+	dim->state = DIM_START_MEASURE;
 }
 
 /* My driver's interrupt handler */
@@ -152,13 +152,13 @@ int my_driver_handle_interrupt(struct my_driver_entity *my_entity, ...)
 {
 	...
 	/* A struct to hold current measured data */
-	struct net_dim_sample dim_sample;
+	struct dim_sample dim_sample;
 	...
 	/* Initiate data sample struct with current data */
-	net_dim_sample(my_entity->events,
-		       my_entity->packets,
-		       my_entity->bytes,
-		       &dim_sample);
+	dim_update_sample(my_entity->events,
+		          my_entity->packets,
+		          my_entity->bytes,
+		          &dim_sample);
 	/* Call net DIM */
 	net_dim(&my_entity->dim, dim_sample);
 	...

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 0154674..e51a68b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9122,7 +9122,7 @@ F:	drivers/auxdisplay/ks0108.c
 F:	include/linux/ks0108.h
 
 L3MDEV
-M:	David Ahern <[email protected]>
+M:	David Ahern <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	net/l3mdev
@@ -10255,7 +10255,7 @@ MEDIATEK ETHERNET DRIVER
 M:	Felix Fietkau <[email protected]>
 M:	John Crispin <[email protected]>
 M:	Sean Wang <[email protected]>
-M:	Nelson Chang <[email protected]>
+M:	Mark Lee <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/ethernet/mediatek/
@@ -17433,7 +17433,7 @@ F:	include/linux/regulator/
 K:	regulator_get_optional
 
 VRF
-M:	David Ahern <[email protected]>
+M:	David Ahern <[email protected]>
 M:	Shrijeet Mukherjee <[email protected]>
 L:	[email protected]
 S:	Maintained

arch/arm/boot/dts/mt7629-rfb.dts

View file

diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts
index 3621b7d..9980c10 100644
--- a/arch/arm/boot/dts/mt7629-rfb.dts
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
@@ -66,9 +66,21 @@
 	pinctrl-1 = <&ephy_leds_pins>;
 	status = "okay";
 
+	gmac0: mac@0 {
+		compatible = "mediatek,eth-mac";
+		reg = <0>;
+		phy-mode = "2500base-x";
+		fixed-link {
+			speed = <2500>;
+			full-duplex;
+			pause;
+		};
+	};
+
 	gmac1: mac@1 {
 		compatible = "mediatek,eth-mac";
 		reg = <1>;
+		phy-mode = "gmii";
 		phy-handle = <&phy0>;
 	};
 
@@ -78,7 +90,6 @@
 
 		phy0: ethernet-phy@0 {
 			reg = <0>;
-			phy-mode = "gmii";
 		};
 	};
 };

arch/arm/boot/dts/mt7629.dtsi

View file

diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
index 9608bc2..867b881 100644
--- a/arch/arm/boot/dts/mt7629.dtsi
+++ b/arch/arm/boot/dts/mt7629.dtsi
@@ -468,14 +468,12 @@
 			compatible = "mediatek,mt7629-sgmiisys", "syscon";
 			reg = <0x1b128000 0x3000>;
 			#clock-cells = <1>;
-			mediatek,physpeed = "2500";
 		};
 
 		sgmiisys1: syscon@1b130000 {
 			compatible = "mediatek,mt7629-sgmiisys", "syscon";
 			reg = <0x1b130000 0x3000>;
 			#clock-cells = <1>;
-			mediatek,physpeed = "2500";
 		};
 	};
 };

drivers/net/bonding/bond_main.c

View file

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 931d9d9..21d8fcc 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4039,7 +4039,7 @@ out:
 		 * this to-be-skipped slave to send a packet out.
 		 */
 		old_arr = rtnl_dereference(bond->slave_arr);
-		for (idx = 0; idx < old_arr->count; idx++) {
+		for (idx = 0; old_arr != NULL && idx < old_arr->count; idx++) {
 			if (skipslave == old_arr->arr[idx]) {
 				old_arr->arr[idx] =
 				    old_arr->arr[old_arr->count-1];

drivers/net/dsa/b53/b53_common.c

View file

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 526ba2a..cc35363 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1845,7 +1845,6 @@ int b53_mirror_add(struct dsa_switch *ds, int port,
 		loc = B53_EG_MIR_CTL;
 
 	b53_read16(dev, B53_MGMT_PAGE, loc, &reg);
-	reg &= ~MIRROR_MASK;
 	reg |= BIT(port);
 	b53_write16(dev, B53_MGMT_PAGE, loc, reg);
 

drivers/net/dsa/microchip/ksz8795.c

View file

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index a23d3ff..24a5e99 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1224,10 +1224,6 @@ static int ksz8795_switch_init(struct ksz_device *dev)
 {
 	int i;
 
-	mutex_init(&dev->stats_mutex);
-	mutex_init(&dev->alu_mutex);
-	mutex_init(&dev->vlan_mutex);
-
 	dev->ds->ops = &ksz8795_switch_ops;
 
 	for (i = 0; i < ARRAY_SIZE(ksz8795_switch_chips); i++) {

drivers/net/dsa/microchip/ksz8795_spi.c

View file

diff --git a/drivers/net/dsa/microchip/ksz8795_spi.c b/drivers/net/dsa/microchip/ksz8795_spi.c
index d0f8153..8b00f8e 100644
--- a/drivers/net/dsa/microchip/ksz8795_spi.c
+++ b/drivers/net/dsa/microchip/ksz8795_spi.c
@@ -25,6 +25,7 @@ KSZ_REGMAP_TABLE(ksz8795, 16, SPI_ADDR_SHIFT,
 
 static int ksz8795_spi_probe(struct spi_device *spi)
 {
+	struct regmap_config rc;
 	struct ksz_device *dev;
 	int i, ret;
 
@@ -33,9 +34,9 @@ static int ksz8795_spi_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	for (i = 0; i < ARRAY_SIZE(ksz8795_regmap_config); i++) {
-		dev->regmap[i] = devm_regmap_init_spi(spi,
-						      &ksz8795_regmap_config
-						      [i]);
+		rc = ksz8795_regmap_config[i];
+		rc.lock_arg = &dev->regmap_mutex;
+		dev->regmap[i] = devm_regmap_init_spi(spi, &rc);
 		if (IS_ERR(dev->regmap[i])) {
 			ret = PTR_ERR(dev->regmap[i]);
 			dev_err(&spi->dev,

drivers/net/dsa/microchip/ksz9477_i2c.c

View file

diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/ksz9477_i2c.c
index 0b1e01f..fdffd9e 100644
--- a/drivers/net/dsa/microchip/ksz9477_i2c.c
+++ b/drivers/net/dsa/microchip/ksz9477_i2c.c
@@ -17,6 +17,7 @@ KSZ_REGMAP_TABLE(ksz9477, not_used, 16, 0, 0);
 static int ksz9477_i2c_probe(struct i2c_client *i2c,
 			     const struct i2c_device_id *i2c_id)
 {
+	struct regmap_config rc;
 	struct ksz_device *dev;
 	int i, ret;
 
@@ -25,8 +26,9 @@ static int ksz9477_i2c_probe(struct i2c_client *i2c,
 		return -ENOMEM;
 
 	for (i = 0; i < ARRAY_SIZE(ksz9477_regmap_config); i++) {
-		dev->regmap[i] = devm_regmap_init_i2c(i2c,
-					&ksz9477_regmap_config[i]);
+		rc = ksz9477_regmap_config[i];
+		rc.lock_arg = &dev->regmap_mutex;
+		dev->regmap[i] = devm_regmap_init_i2c(i2c, &rc);
 		if (IS_ERR(dev->regmap[i])) {
 			ret = PTR_ERR(dev->regmap[i]);
 			dev_err(&i2c->dev,

drivers/net/dsa/microchip/ksz9477_reg.h

View file

diff --git a/drivers/net/dsa/microchip/ksz9477_reg.h b/drivers/net/dsa/microchip/ksz9477_reg.h
index 2938e89..16939f2 100644
--- a/drivers/net/dsa/microchip/ksz9477_reg.h
+++ b/drivers/net/dsa/microchip/ksz9477_reg.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0
- *
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
  * Microchip KSZ9477 register definitions
  *
  * Copyright (C) 2017-2018 Microchip Technology Inc.

drivers/net/dsa/microchip/ksz9477_spi.c

View file

diff --git a/drivers/net/dsa/microchip/ksz9477_spi.c b/drivers/net/dsa/microchip/ksz9477_spi.c
index f4198d6..c5f6495 100644
--- a/drivers/net/dsa/microchip/ksz9477_spi.c
+++ b/drivers/net/dsa/microchip/ksz9477_spi.c
@@ -24,6 +24,7 @@ KSZ_REGMAP_TABLE(ksz9477, 32, SPI_ADDR_SHIFT,
 
 static int ksz9477_spi_probe(struct spi_device *spi)
 {
+	struct regmap_config rc;
 	struct ksz_device *dev;
 	int i, ret;
 
@@ -32,8 +33,9 @@ static int ksz9477_spi_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	for (i = 0; i < ARRAY_SIZE(ksz9477_regmap_config); i++) {
-		dev->regmap[i] = devm_regmap_init_spi(spi,
-					&ksz9477_regmap_config[i]);
+		rc = ksz9477_regmap_config[i];
+		rc.lock_arg = &dev->regmap_mutex;
+		dev->regmap[i] = devm_regmap_init_spi(spi, &rc);
 		if (IS_ERR(dev->regmap[i])) {
 			ret = PTR_ERR(dev->regmap[i]);
 			dev_err(&spi->dev,

drivers/net/dsa/microchip/ksz_common.c

View file

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index b0b870f..fe47180 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -436,7 +436,7 @@ int ksz_switch_register(struct ksz_device *dev,
 	}
 
 	mutex_init(&dev->dev_mutex);
-	mutex_init(&dev->stats_mutex);
+	mutex_init(&dev->regmap_mutex);
 	mutex_init(&dev->alu_mutex);
 	mutex_init(&dev->vlan_mutex);
 

drivers/net/dsa/microchip/ksz_common.h

View file

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index dd60d08..a20ebb7 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0
- * Microchip switch driver common header
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Microchip switch driver common header
  *
  * Copyright (C) 2017-2019 Microchip Technology Inc.
  */
@@ -47,7 +47,7 @@ struct ksz_device {
 	const char *name;
 
 	struct mutex dev_mutex;		/* device access */
-	struct mutex stats_mutex;	/* status access */
+	struct mutex regmap_mutex;	/* regmap access */
 	struct mutex alu_mutex;		/* ALU access */
 	struct mutex vlan_mutex;	/* vlan access */
 	const struct ksz_dev_ops *dev_ops;
@@ -290,6 +290,18 @@ static inline void ksz_pwrite32(struct ksz_device *dev, int port, int offset,
 	ksz_write32(dev, dev->dev_ops->get_port_addr(port, offset), data);
 }
 
+static inline void ksz_regmap_lock(void *__mtx)
+{
+	struct mutex *mtx = __mtx;
+	mutex_lock(mtx);
+}
+
+static inline void ksz_regmap_unlock(void *__mtx)
+{
+	struct mutex *mtx = __mtx;
+	mutex_unlock(mtx);
+}
+
 /* Regmap tables generation */
 #define KSZ_SPI_OP_RD		3
 #define KSZ_SPI_OP_WR		2
@@ -314,6 +326,8 @@ static inline void ksz_pwrite32(struct ksz_device *dev, int port, int offset,
 		.write_flag_mask =					\
 			KSZ_SPI_OP_FLAG_MASK(KSZ_SPI_OP_WR, swp,	\
 					     regbits, regpad),		\
+		.lock = ksz_regmap_lock,				\
+		.unlock = ksz_regmap_unlock,				\
 		.reg_format_endian = REGMAP_ENDIAN_BIG,			\
 		.val_format_endian = REGMAP_ENDIAN_BIG			\
 	}

drivers/net/dsa/sja1105/sja1105.h

View file

diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h
index e53e494..fbb564c 100644
--- a/drivers/net/dsa/sja1105/sja1105.h
+++ b/drivers/net/dsa/sja1105/sja1105.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0
- * Copyright (c) 2018, Sensor-Technik Wiedemann GmbH
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2018, Sensor-Technik Wiedemann GmbH
  * Copyright (c) 2018-2019, Vladimir Oltean <[email protected]>
  */
 #ifndef _SJA1105_H

drivers/net/dsa/sja1105/sja1105_dynamic_config.h

View file

diff --git a/drivers/net/dsa/sja1105/sja1105_dynamic_config.h b/drivers/net/dsa/sja1105/sja1105_dynamic_config.h
index 740dadf..1fc0d13 100644
--- a/drivers/net/dsa/sja1105/sja1105_dynamic_config.h
+++ b/drivers/net/dsa/sja1105/sja1105_dynamic_config.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0
- * Copyright (c) 2019, Vladimir Oltean <[email protected]>
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2019, Vladimir Oltean <[email protected]>
  */
 #ifndef _SJA1105_DYNAMIC_CONFIG_H
 #define _SJA1105_DYNAMIC_CONFIG_H

drivers/net/dsa/sja1105/sja1105_ptp.h

View file

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.h b/drivers/net/dsa/sja1105/sja1105_ptp.h
index af456b0..394e12a 100644
--- a/drivers/net/dsa/sja1105/sja1105_ptp.h
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0
- * Copyright (c) 2019, Vladimir Oltean <[email protected]>
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2019, Vladimir Oltean <[email protected]>
  */
 #ifndef _SJA1105_PTP_H
 #define _SJA1105_PTP_H

drivers/net/dsa/sja1105/sja1105_static_config.h

View file

diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.h b/drivers/net/dsa/sja1105/sja1105_static_config.h
index 7f87022..f4a5c5c 100644
--- a/drivers/net/dsa/sja1105/sja1105_static_config.h
+++ b/drivers/net/dsa/sja1105/sja1105_static_config.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 2016-2018, NXP Semiconductors
+/* SPDX-License-Identifier: BSD-3-Clause */
+/* Copyright (c) 2016-2018, NXP Semiconductors
  * Copyright (c) 2018-2019, Vladimir Oltean <[email protected]>
  */
 #ifndef _SJA1105_STATIC_CONFIG_H

drivers/net/dsa/sja1105/sja1105_tas.h

View file

diff --git a/drivers/net/dsa/sja1105/sja1105_tas.h b/drivers/net/dsa/sja1105/sja1105_tas.h
index 0b803c3..0aad212 100644
--- a/drivers/net/dsa/sja1105/sja1105_tas.h
+++ b/drivers/net/dsa/sja1105/sja1105_tas.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0
- * Copyright (c) 2019, Vladimir Oltean <[email protected]>
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2019, Vladimir Oltean <[email protected]>
  */
 #ifndef _SJA1105_TAS_H
 #define _SJA1105_TAS_H

drivers/net/ethernet/aquantia/atlantic/aq_main.c

View file

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
index b4a0fb2..bb65dd3 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
@@ -194,9 +194,7 @@ static void aq_ndev_set_multicast_settings(struct net_device *ndev)
 {
 	struct aq_nic_s *aq_nic = netdev_priv(ndev);
 
-	aq_nic_set_packet_filter(aq_nic, ndev->flags);
-
-	aq_nic_set_multicast_list(aq_nic, ndev);
+	(void)aq_nic_set_multicast_list(aq_nic, ndev);
 }
 
 static int aq_ndo_vlan_rx_add_vid(struct net_device *ndev, __be16 proto,

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

View file

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 8f66e78..137c1de 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -631,9 +631,12 @@ err_exit:
 
 int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)
 {
-	unsigned int packet_filter = self->packet_filter;
+	const struct aq_hw_ops *hw_ops = self->aq_hw_ops;
+	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;
+	unsigned int packet_filter = ndev->flags;
 	struct netdev_hw_addr *ha = NULL;
 	unsigned int i = 0U;
+	int err = 0;
 
 	self->mc_list.count = 0;
 	if (netdev_uc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
@@ -641,29 +644,28 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)
 	} else {
 		netdev_for_each_uc_addr(ha, ndev) {
 			ether_addr_copy(self->mc_list.ar[i++], ha->addr);
-
-			if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)
-				break;
 		}
 	}
 
-	if (i + netdev_mc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
-		packet_filter |= IFF_ALLMULTI;
-	} else {
-		netdev_for_each_mc_addr(ha, ndev) {
-			ether_addr_copy(self->mc_list.ar[i++], ha->addr);
-
-			if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)
-				break;
+	cfg->is_mc_list_enabled = !!(packet_filter & IFF_MULTICAST);
+	if (cfg->is_mc_list_enabled) {
+		if (i + netdev_mc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
+			packet_filter |= IFF_ALLMULTI;
+		} else {
+			netdev_for_each_mc_addr(ha, ndev) {
+				ether_addr_copy(self->mc_list.ar[i++],
+						ha->addr);
+			}
 		}
 	}
 
 	if (i > 0 && i <= AQ_HW_MULTICAST_ADDRESS_MAX) {
-		packet_filter |= IFF_MULTICAST;
 		self->mc_list.count = i;
-		self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
-						       self->mc_list.ar,
-						       self->mc_list.count);
+		err = hw_ops->hw_multicast_list_set(self->aq_hw,
+						    self->mc_list.ar,
+						    self->mc_list.count);
+		if (err < 0)
+			return err;
 	}
 	return aq_nic_set_packet_filter(self, packet_filter);
 }

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

View file

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
index 3901d79..76bdbe1 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
@@ -313,6 +313,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
 					break;
 
 				buff->is_error |= buff_->is_error;
+				buff->is_cso_err |= buff_->is_cso_err;
 
 			} while (!buff_->is_eop);
 
@@ -320,7 +321,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
 				err = 0;
 				goto err_exit;
 			}
-			if (buff->is_error) {
+			if (buff->is_error || buff->is_cso_err) {
 				buff_ = buff;
 				do {
 					next_ = buff_->next,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

View file

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index 30f7fc4..2ad3fa6 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -818,14 +818,15 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,
 				     cfg->is_vlan_force_promisc);
 
 	hw_atl_rpfl2multicast_flr_en_set(self,
-					 IS_FILTER_ENABLED(IFF_ALLMULTI), 0);
+					 IS_FILTER_ENABLED(IFF_ALLMULTI) &&
+					 IS_FILTER_ENABLED(IFF_MULTICAST), 0);
 
 	hw_atl_rpfl2_accept_all_mc_packets_set(self,
-					       IS_FILTER_ENABLED(IFF_ALLMULTI));
+					      IS_FILTER_ENABLED(IFF_ALLMULTI) &&
+					      IS_FILTER_ENABLED(IFF_MULTICAST));
 
 	hw_atl_rpfl2broadcast_en_set(self, IS_FILTER_ENABLED(IFF_BROADCAST));
 
-	cfg->is_mc_list_enabled = IS_FILTER_ENABLED(IFF_MULTICAST);
 
 	for (i = HW_ATL_B0_MAC_MIN; i < HW_ATL_B0_MAC_MAX; ++i)
 		hw_atl_rpfl2_uc_flr_en_set(self,
@@ -968,14 +969,26 @@ static int hw_atl_b0_hw_interrupt_moderation_set(struct aq_hw_s *self)
 
 static int hw_atl_b0_hw_stop(struct aq_hw_s *self)
 {
+	int err;
+	u32 val;
+
 	hw_atl_b0_hw_irq_disable(self, HW_ATL_B0_INT_MASK);
 
 	/* Invalidate Descriptor Cache to prevent writing to the cached
 	 * descriptors and to the data pointer of those descriptors
 	 */
-	hw_atl_rdm_rx_dma_desc_cache_init_set(self, 1);
+	hw_atl_rdm_rx_dma_desc_cache_init_tgl(self);
 
-	return aq_hw_err_from_flags(self);
+	err = aq_hw_err_from_flags(self);
+
+	if (err)
+		goto err_exit;
+
+	readx_poll_timeout_atomic(hw_atl_rdm_rx_dma_desc_cache_init_done_get,
+				  self, val, val == 1, 1000U, 10000U);
+
+err_exit:
+	return err;
 }
 
 static int hw_atl_b0_hw_ring_tx_stop(struct aq_hw_s *self,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c

View file

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
index 1149812..6f34069 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
@@ -606,12 +606,25 @@ void hw_atl_rpb_rx_flow_ctl_mode_set(struct aq_hw_s *aq_hw, u32 rx_flow_ctl_mode
 			    HW_ATL_RPB_RX_FC_MODE_SHIFT, rx_flow_ctl_mode);
 }
 
-void hw_atl_rdm_rx_dma_desc_cache_init_set(struct aq_hw_s *aq_hw, u32 init)
+void hw_atl_rdm_rx_dma_desc_cache_init_tgl(struct aq_hw_s *aq_hw)
 {
+	u32 val;
+
+	val = aq_hw_read_reg_bit(aq_hw, HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR,
+				 HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK,
+				 HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT);
+
 	aq_hw_write_reg_bit(aq_hw, HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR,
 			    HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK,
 			    HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT,