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

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from CAN and WPAN.

  Still quite a few bugs from this release. This pull is a bit smaller
  because major subtrees went into the previous one. Or maybe people
  took spring break off?

  Current release - regressions:

   - phy: micrel: correct KSZ9131RNX EEE capabilities and advertisement

  Current release - new code bugs:

   - eth: wangxun: fix vector length of interrupt cause

   - vsock/loopback: consistently protect the packet queue with
     sk_buff_head.lock

   - virtio/vsock: fix header length on skb merging

   - wpan: ca8210: fix unsigned mac_len comparison with zero

  Previous releases - regressions:

   - eth: stmmac: don't reject VLANs when IFF_PROMISC is set

   - eth: smsc911x: avoid PHY being resumed when interface is not up

   - eth: mtk_eth_soc: fix tx throughput regression with direct 1G links

   - eth: bnx2x: use the right build_skb() helper after core rework

   - wwan: iosm: fix 7560 modem crash on use on unsupported channel

  Previous releases - always broken:

   - eth: sfc: don't overwrite offload features at NIC reset

   - eth: r8169: fix RTL8168H and RTL8107E rx crc error

   - can: j1939: prevent deadlock by moving j1939_sk_errqueue()

   - virt: vmxnet3: use GRO callback when UPT is enabled

   - virt: xen: don't do grant copy across page boundary

   - phy: dp83869: fix default value for tx-/rx-internal-delay

   - dsa: ksz8: fix multiple issues with ksz8_fdb_dump

   - eth: mvpp2: fix classification/RSS of VLAN and fragmented packets

   - eth: mtk_eth_soc: fix flow block refcounting logic

  Misc:

   - constify fwnode pointers in SFP handling"

* tag 'net-6.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (55 commits)
  net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow
  net: ethernet: mtk_eth_soc: fix L2 offloading with DSA untag offload
  net: ethernet: mtk_eth_soc: fix flow block refcounting logic
  net: mvneta: fix potential double-frees in mvneta_txq_sw_deinit()
  net: dsa: sync unicast and multicast addresses for VLAN filters too
  net: dsa: mv88e6xxx: Enable IGMP snooping on user ports only
  xen/netback: use same error messages for same errors
  test/vsock: new skbuff appending test
  virtio/vsock: WARN_ONCE() for invalid state of socket
  virtio/vsock: fix header length on skb merging
  bnxt_en: Add missing 200G link speed reporting
  bnxt_en: Fix typo in PCI id to device description string mapping
  bnxt_en: Fix reporting of test result in ethtool selftest
  i40e: fix registers dump after run ethtool adapter self test
  bnx2x: use the right build_skb() helper
  net: ipa: compute DMA pool size properly
  net: wwan: iosm: fixes 7560 modem crash
  net: ethernet: mtk_eth_soc: fix tx throughput regression with direct 1G links
  ice: fix invalid check for empty list in ice_sched_assoc_vsi_to_agg()
  ice: add profile conflict check for AVF FDIR
  ...
parents b527ac44 92453132

MAINTAINERS

+1 −6
Original line number Diff line number Diff line
@@ -8216,6 +8216,7 @@ F: drivers/net/ethernet/freescale/dpaa 








FREESCALE QORIQ DPAA FMAN DRIVER









M:	Madalin Bucur <madalin.bucur@nxp.com>









R:	Sean Anderson <sean.anderson@seco.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/fsl-fman.txt








@@ -14656,10 +14657,8 @@ F:	net/ipv4/nexthop.c















NFC SUBSYSTEM









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









L:	linux-nfc@lists.01.org (subscribers-only)









L:	netdev@vger.kernel.org









S:	Maintained









B:	mailto:linux-nfc@lists.01.org









F:	Documentation/devicetree/bindings/net/nfc/









F:	drivers/nfc/









F:	include/linux/platform_data/nfcmrvl.h








@@ -14670,7 +14669,6 @@ F:	net/nfc/







NFC VIRTUAL NCI DEVICE DRIVER









M:	Bongsu Jeon <bongsu.jeon@samsung.com>









L:	netdev@vger.kernel.org









L:	linux-nfc@lists.01.org (subscribers-only)









S:	Supported









F:	drivers/nfc/virtual_ncidev.c









F:	tools/testing/selftests/nci/








@@ -15042,7 +15040,6 @@ F:	Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml







F:	sound/soc/codecs/tfa989x.c

















NXP-NCI NFC DRIVER









L:	linux-nfc@lists.01.org (subscribers-only)









S:	Orphan









F:	Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml









F:	drivers/nfc/nxp-nci








@@ -18487,7 +18484,6 @@ F:	include/media/drv-intf/s3c_camif.h















SAMSUNG S3FWRN5 NFC DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









L:	linux-nfc@lists.01.org (subscribers-only)









S:	Maintained









F:	Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml









F:	drivers/nfc/s3fwrn5








@@ -20980,7 +20976,6 @@ F:	drivers/iio/magnetometer/tmag5273.c







TI TRF7970A NFC DRIVER









M:	Mark Greer <mgreer@animalcreek.com>









L:	linux-wireless@vger.kernel.org









L:	linux-nfc@lists.01.org (subscribers-only)









S:	Supported









F:	Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml









F:	drivers/nfc/trf7970a.c

























drivers/net/dsa/b53/b53_mmap.c



+14
−0






























Original line number
Diff line number
Diff line







@@ -216,6 +216,18 @@ static int b53_mmap_write64(struct b53_device *dev, u8 page, u8 reg,







	return 0;









}



















static int b53_mmap_phy_read16(struct b53_device *dev, int addr, int reg,









			       u16 *value)









{









	return -EIO;









}



















static int b53_mmap_phy_write16(struct b53_device *dev, int addr, int reg,









				u16 value)









{









	return -EIO;









}



















static const struct b53_io_ops b53_mmap_ops = {









	.read8 = b53_mmap_read8,









	.read16 = b53_mmap_read16,








@@ -227,6 +239,8 @@ static const struct b53_io_ops b53_mmap_ops = {







	.write32 = b53_mmap_write32,









	.write48 = b53_mmap_write48,









	.write64 = b53_mmap_write64,









	.phy_read16 = b53_mmap_phy_read16,









	.phy_write16 = b53_mmap_phy_write16,









};



















static int b53_mmap_probe_of(struct platform_device *pdev,
































drivers/net/dsa/microchip/ksz8795.c



+5
−6






























Original line number
Diff line number
Diff line







@@ -958,15 +958,14 @@ int ksz8_fdb_dump(struct ksz_device *dev, int port,







	u16 entries = 0;









	u8 timestamp = 0;









	u8 fid;









	u8 member;









	struct alu_struct alu;









	u8 src_port;









	u8 mac[ETH_ALEN];



















	do {









		alu.is_static = false;









		ret = ksz8_r_dyn_mac_table(dev, i, alu.mac, &fid, &member,









		ret = ksz8_r_dyn_mac_table(dev, i, mac, &fid, &src_port,









					   &timestamp, &entries);









		if (!ret && (member & BIT(port))) {









			ret = cb(alu.mac, alu.fid, alu.is_static, data);









		if (!ret && port == src_port) {









			ret = cb(mac, fid, false, data);









			if (ret)









				break;









		}
































drivers/net/dsa/microchip/ksz8863_smi.c



+0
−9






























Original line number
Diff line number
Diff line







@@ -82,22 +82,16 @@ static const struct regmap_bus regmap_smi[] = {







	{









		.read = ksz8863_mdio_read,









		.write = ksz8863_mdio_write,









		.max_raw_read = 1,









		.max_raw_write = 1,









	},









	{









		.read = ksz8863_mdio_read,









		.write = ksz8863_mdio_write,









		.val_format_endian_default = REGMAP_ENDIAN_BIG,









		.max_raw_read = 2,









		.max_raw_write = 2,









	},









	{









		.read = ksz8863_mdio_read,









		.write = ksz8863_mdio_write,









		.val_format_endian_default = REGMAP_ENDIAN_BIG,









		.max_raw_read = 4,









		.max_raw_write = 4,









	}









};


















@@ -108,7 +102,6 @@ static const struct regmap_config ksz8863_regmap_config[] = {







		.pad_bits = 24,









		.val_bits = 8,









		.cache_type = REGCACHE_NONE,









		.use_single_read = 1,









		.lock = ksz_regmap_lock,









		.unlock = ksz_regmap_unlock,









	},








@@ -118,7 +111,6 @@ static const struct regmap_config ksz8863_regmap_config[] = {







		.pad_bits = 24,









		.val_bits = 16,









		.cache_type = REGCACHE_NONE,









		.use_single_read = 1,









		.lock = ksz_regmap_lock,









		.unlock = ksz_regmap_unlock,









	},








@@ -128,7 +120,6 @@ static const struct regmap_config ksz8863_regmap_config[] = {







		.pad_bits = 24,









		.val_bits = 32,









		.cache_type = REGCACHE_NONE,









		.use_single_read = 1,









		.lock = ksz_regmap_lock,









		.unlock = ksz_regmap_unlock,









	}
































drivers/net/dsa/microchip/ksz_common.c



+6
−6






























Original line number
Diff line number
Diff line







@@ -404,13 +404,13 @@ static const u32 ksz8863_masks[] = {







	[VLAN_TABLE_VALID]		= BIT(19),









	[STATIC_MAC_TABLE_VALID]	= BIT(19),









	[STATIC_MAC_TABLE_USE_FID]	= BIT(21),









	[STATIC_MAC_TABLE_FID]		= GENMASK(29, 26),









	[STATIC_MAC_TABLE_FID]		= GENMASK(25, 22),









	[STATIC_MAC_TABLE_OVERRIDE]	= BIT(20),









	[STATIC_MAC_TABLE_FWD_PORTS]	= GENMASK(18, 16),









	[DYNAMIC_MAC_TABLE_ENTRIES_H]	= GENMASK(5, 0),









	[DYNAMIC_MAC_TABLE_MAC_EMPTY]	= BIT(7),









	[DYNAMIC_MAC_TABLE_ENTRIES_H]	= GENMASK(1, 0),









	[DYNAMIC_MAC_TABLE_MAC_EMPTY]	= BIT(2),









	[DYNAMIC_MAC_TABLE_NOT_READY]	= BIT(7),









	[DYNAMIC_MAC_TABLE_ENTRIES]	= GENMASK(31, 28),









	[DYNAMIC_MAC_TABLE_ENTRIES]	= GENMASK(31, 24),









	[DYNAMIC_MAC_TABLE_FID]		= GENMASK(19, 16),









	[DYNAMIC_MAC_TABLE_SRC_PORT]	= GENMASK(21, 20),









	[DYNAMIC_MAC_TABLE_TIMESTAMP]	= GENMASK(23, 22),








@@ -420,10 +420,10 @@ static u8 ksz8863_shifts[] = {







	[VLAN_TABLE_MEMBERSHIP_S]	= 16,









	[STATIC_MAC_FWD_PORTS]		= 16,









	[STATIC_MAC_FID]		= 22,









	[DYNAMIC_MAC_ENTRIES_H]		= 3,









	[DYNAMIC_MAC_ENTRIES_H]		= 8,









	[DYNAMIC_MAC_ENTRIES]		= 24,









	[DYNAMIC_MAC_FID]		= 16,









	[DYNAMIC_MAC_TIMESTAMP]		= 24,









	[DYNAMIC_MAC_TIMESTAMP]		= 22,









	[DYNAMIC_MAC_SRC_PORT]		= 20,









};