Commit 2c1a4185 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-12-13 (ice, i40e)

This series contains updates to ice and i40e drivers.

Michal Schmidt prevents possible out-of-bounds access for ice.

Ivan Vecera corrects value for MDIO clause 45 on i40e.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  i40e: Fix ST code value for Clause 45
  ice: fix theoretical out-of-bounds access in ethtool link modes
====================

Link: https://lore.kernel.org/r/20231213220827.1311772-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 70f010da 9b3daf2b

drivers/net/ethernet/intel/i40e/i40e_register.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ 
#define I40E_GLGEN_MSCA_OPCODE_SHIFT 26

#define I40E_GLGEN_MSCA_OPCODE_MASK(_i) I40E_MASK(_i, I40E_GLGEN_MSCA_OPCODE_SHIFT)

#define I40E_GLGEN_MSCA_STCODE_SHIFT 28

#define I40E_GLGEN_MSCA_STCODE_MASK I40E_MASK(0x1, I40E_GLGEN_MSCA_STCODE_SHIFT)

#define I40E_GLGEN_MSCA_STCODE_MASK(_i) I40E_MASK(_i, I40E_GLGEN_MSCA_STCODE_SHIFT)

#define I40E_GLGEN_MSCA_MDICMD_SHIFT 30

#define I40E_GLGEN_MSCA_MDICMD_MASK I40E_MASK(0x1, I40E_GLGEN_MSCA_MDICMD_SHIFT)

#define I40E_GLGEN_MSCA_MDIINPROGEN_SHIFT 31

drivers/net/ethernet/intel/i40e/i40e_type.h

+2 −2
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *); 
#define I40E_QTX_CTL_VM_QUEUE	0x1

#define I40E_QTX_CTL_PF_QUEUE	0x2



#define I40E_MDIO_CLAUSE22_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK

#define I40E_MDIO_CLAUSE22_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK(1)

#define I40E_MDIO_CLAUSE22_OPCODE_WRITE_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(1)

#define I40E_MDIO_CLAUSE22_OPCODE_READ_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(2)



#define I40E_MDIO_CLAUSE45_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK

#define I40E_MDIO_CLAUSE45_STCODE_MASK		I40E_GLGEN_MSCA_STCODE_MASK(0)

#define I40E_MDIO_CLAUSE45_OPCODE_ADDRESS_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(0)

#define I40E_MDIO_CLAUSE45_OPCODE_WRITE_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(1)

#define I40E_MDIO_CLAUSE45_OPCODE_READ_MASK	I40E_GLGEN_MSCA_OPCODE_MASK(3)

drivers/net/ethernet/intel/ice/ice_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -1850,14 +1850,14 @@ ice_phy_type_to_ethtool(struct net_device *netdev, 
	linkmode_zero(ks->link_modes.supported);

	linkmode_zero(ks->link_modes.advertising);



	for (i = 0; i < BITS_PER_TYPE(u64); i++) {

	for (i = 0; i < ARRAY_SIZE(phy_type_low_lkup); i++) {

		if (phy_types_low & BIT_ULL(i))

			ice_linkmode_set_bit(&phy_type_low_lkup[i], ks,

					     req_speeds, advert_phy_type_lo,

					     i);

	}



	for (i = 0; i < BITS_PER_TYPE(u64); i++) {

	for (i = 0; i < ARRAY_SIZE(phy_type_high_lkup); i++) {

		if (phy_types_high & BIT_ULL(i))

			ice_linkmode_set_bit(&phy_type_high_lkup[i], ks,

					     req_speeds, advert_phy_type_hi,