Commit 502c6f8c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2022-07-21

This series contains updates to ice driver only.

Karol adds implementation for GNSS write; data is written to the GNSS
module through TTY device using u-blox UBX protocol.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: add write functionality for GNSS TTY
  ice: add i2c write command
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7074732c d6b98c8d

Documentation/networking/device_drivers/ethernet/intel/ice.rst

+9 −0
Original line number Diff line number Diff line
@@ -901,6 +901,15 @@ To enable/disable UDP Segmentation Offload, issue the following command:: 


  # ethtool -K <ethX> tx-udp-segmentation [off|on]



GNSS module

-----------

Allows user to read messages from the GNSS module and write supported commands.

If the module is physically present, driver creates 2 TTYs for each supported

device in /dev, ttyGNSS_<device>:<function>_0 and _1. First one (_0) is RW and

the second one is RO.

The protocol of write commands is dependent on the GNSS module as the driver

writes raw bytes from the TTY to the GNSS i2c. Please refer to the module

documentation for details.



Performance Optimization

========================

drivers/net/ethernet/intel/ice/ice.h

+2 −2
Original line number Diff line number Diff line
@@ -545,8 +545,8 @@ struct ice_pf { 
	u32 msg_enable;

	struct ice_ptp ptp;

	struct tty_driver *ice_gnss_tty_driver;

	struct tty_port gnss_tty_port;

	struct gnss_serial *gnss_serial;

	struct tty_port *gnss_tty_port[ICE_GNSS_TTY_MINOR_DEVICES];

	struct gnss_serial *gnss_serial[ICE_GNSS_TTY_MINOR_DEVICES];

	u16 num_rdma_msix;		/* Total MSIX vectors for RDMA driver */

	u16 rdma_base_vector;

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+4 −3
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ struct ice_aqc_get_link_topo { 
	u8 rsvd[9];

};



/* Read I2C (direct, 0x06E2) */

/* Read/Write I2C (direct, 0x06E2/0x06E3) */

struct ice_aqc_i2c {

	struct ice_aqc_link_topo_addr topo_addr;

	__le16 i2c_addr;
@@ -1405,7 +1405,7 @@ struct ice_aqc_i2c { 


	u8 rsvd;

	__le16 i2c_bus_addr;

	u8 rsvd2[4];

	u8 i2c_data[4]; /* Used only by write command, reserved in read. */

};



/* Read I2C Response (direct, 0x06E2) */
@@ -2124,7 +2124,7 @@ struct ice_aq_desc { 
		struct ice_aqc_get_link_status get_link_status;

		struct ice_aqc_event_lan_overflow lan_overflow;

		struct ice_aqc_get_link_topo get_link_topo;

		struct ice_aqc_i2c read_i2c;

		struct ice_aqc_i2c read_write_i2c;

		struct ice_aqc_read_i2c_resp read_i2c_resp;

	} params;

};
@@ -2241,6 +2241,7 @@ enum ice_adminq_opc { 
	ice_aqc_opc_set_mac_lb				= 0x0620,

	ice_aqc_opc_get_link_topo			= 0x06E0,

	ice_aqc_opc_read_i2c				= 0x06E2,

	ice_aqc_opc_write_i2c				= 0x06E3,

	ice_aqc_opc_set_port_id_led			= 0x06E9,

	ice_aqc_opc_set_gpio				= 0x06EC,

	ice_aqc_opc_get_gpio				= 0x06ED,

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

+46 −1
Original line number Diff line number Diff line
@@ -4823,7 +4823,7 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, 
	int status;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_read_i2c);

	cmd = &desc.params.read_i2c;

	cmd = &desc.params.read_write_i2c;



	if (!data)

		return -EINVAL;
@@ -4850,6 +4850,51 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, 
	return status;

}



/**

 * ice_aq_write_i2c

 * @hw: pointer to the hw struct

 * @topo_addr: topology address for a device to communicate with

 * @bus_addr: 7-bit I2C bus address

 * @addr: I2C memory address (I2C offset) with up to 16 bits

 * @params: I2C parameters: bit [4] - I2C address type, bits [3:0] - data size to write (0-7 bytes)

 * @data: pointer to data (0 to 4 bytes) to be written to the I2C device

 * @cd: pointer to command details structure or NULL

 *

 * Write I2C (0x06E3)

 *

 * * Return:

 * * 0             - Successful write to the i2c device

 * * -EINVAL       - Data size greater than 4 bytes

 * * -EIO          - FW error

 */

int

ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr,

		 u16 bus_addr, __le16 addr, u8 params, u8 *data,

		 struct ice_sq_cd *cd)

{

	struct ice_aq_desc desc = { 0 };

	struct ice_aqc_i2c *cmd;

	u8 data_size;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_write_i2c);

	cmd = &desc.params.read_write_i2c;



	data_size = FIELD_GET(ICE_AQC_I2C_DATA_SIZE_M, params);



	/* data_size limited to 4 */

	if (data_size > 4)

		return -EINVAL;



	cmd->i2c_bus_addr = cpu_to_le16(bus_addr);

	cmd->topo_addr = topo_addr;

	cmd->i2c_params = params;

	cmd->i2c_addr = addr;



	memcpy(cmd->i2c_data, data, data_size);



	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

}



/**

 * ice_aq_set_driver_param - Set driver parameter to share via firmware

 * @hw: pointer to the HW struct

drivers/net/ethernet/intel/ice/ice_common.h

+4 −0
Original line number Diff line number Diff line
@@ -214,5 +214,9 @@ int 
ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr,

		u16 bus_addr, __le16 addr, u8 params, u8 *data,

		struct ice_sq_cd *cd);

int

ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr,

		 u16 bus_addr, __le16 addr, u8 params, u8 *data,

		 struct ice_sq_cd *cd);

bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw);

#endif /* _ICE_COMMON_H_ */