ice: add i2c write command
Subsystems (4)
PATCH 1/2 ice: add i2c write command
Add the possibility to write to connected i2c devices using the AQ command. FW may reject the write if the device is not on allowlist.
--- .../net/ethernet/intel/ice/ice_adminq_cmd.h | 7 +-- drivers/net/ethernet/intel/ice/ice_common.c | 48 ++++++++++++++++++- drivers/net/ethernet/intel/ice/ice_common.h | 4 ++ 3 files changed, 55 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +4 -3
@@ -1396,7 +1396,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;
@@ -1406,7 +1406,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) */
@@ -2125,7 +2125,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; };
@@ -2242,6 +2242,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 +47 -1
60 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_common.h +4 -0
@@ -215,5 +215,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_ */
Signature · 6 lines
2.34.1 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH 2/2 ice: add write functionality for GNSS TTY
Add the possibility to write raw bytes to the GNSS module through the first TTY device. This allows user to configure the module.
Create a second read-only TTY device.
--- .../device_drivers/ethernet/intel/ice.rst | 9 + drivers/net/ethernet/intel/ice/ice.h | 4 +- drivers/net/ethernet/intel/ice/ice_gnss.c | 242 ++++++++++++++++-- drivers/net/ethernet/intel/ice/ice_gnss.h | 30 ++- 4 files changed, 254 insertions(+), 31 deletions(-)
Documentation/networking/device_drivers/ethernet/intel/ice.rst +9 -0
@@ -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
@@ -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_gnss.c +216 -26
329 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_gnss.h +27 -3
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2018-2021, Intel Corporation. */ +/* Copyright (C) 2021-2022, Intel Corporation. */ #ifndef _ICE_GNSS_H_#define _ICE_GNSS_H_
@@ -8,14 +8,34 @@#include <linux/tty_flip.h> #define ICE_E810T_GNSS_I2C_BUS 0x2 +#define ICE_GNSS_TIMER_DELAY_TIME (HZ / 10)/* 0.1 second per message */ +/* Create 2 minor devices, both using the same GNSS module. First one is RW, +* second one RO. +*/ +#define ICE_GNSS_TTY_MINOR_DEVICES 2 +#define ICE_GNSS_TTY_WRITE_BUF 250 +#define ICE_MAX_I2C_DATA_SIZE FIELD_MAX(ICE_AQC_I2C_DATA_SIZE_M) +#define ICE_MAX_I2C_WRITE_BYTES 4 + +/* u-blox ZED-F9T specific definitions */ #define ICE_GNSS_UBX_I2C_BUS_ADDR 0x42/* Data length register is big endian */ #define ICE_GNSS_UBX_DATA_LEN_H 0xFD#define ICE_GNSS_UBX_DATA_LEN_WIDTH 2#define ICE_GNSS_UBX_EMPTY_DATA 0xFF -#define ICE_GNSS_TIMER_DELAY_TIME (HZ / 10)/* 0.1 second per message */ -#define ICE_MAX_I2C_DATA_SIZE FIELD_MAX(ICE_AQC_I2C_DATA_SIZE_M) +/* For u-blox writes are performed without address so the first byte to write is +* passed as I2C addr parameter. +*/ +#define ICE_GNSS_UBX_WRITE_BYTES (ICE_MAX_I2C_WRITE_BYTES + 1)#define ICE_MAX_UBX_READ_TRIES 255 +#define ICE_MAX_UBX_ACK_READ_TRIES 4095 + +struct gnss_write_buf { +struct list_head queue; +unsigned int size; +unsigned char *buf; +}; +/** * struct gnss_serial - data used to initialize GNSS TTY port
@@ -25,6 +45,8 @@* @gnss_mutex: gnss_mutex used to protect GNSS serial operations * @kworker: kwork thread for handling periodic work * @read_work: read_work function for handling GNSS reads +* @write_work: write_work function for handling GNSS writes +* @queue: write buffers queue */ struct gnss_serial {struct ice_pf *back;
@@ -33,6 +55,8 @@ struct gnss_serial {struct mutex gnss_mutex;/* protects GNSS serial structure */ struct kthread_worker *kworker;struct kthread_delayed_work read_work; +struct kthread_work write_work; +struct list_head queue; };#if IS_ENABLED (CONFIG_TTY )
Signature · 6 lines
2.34.1 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Tony Nguyen
maintainerOn 6/23/2022 6:41 AM, Karol Kolacinski wrote:
<snip>
Quoted 15 lines
drivers/net/ethernet/intel/ice/ice_common.c +15
-0+/** +* 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
drivers/net/ethernet/intel/ice/ice_common.c ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, · line 4885
Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_common.c +10
-0+* * -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; +unsigned int i;
../drivers/net/ethernet/intel/ice/ice_common.c: In function ‘ice_aq_write_i2c’:../drivers/net/ethernet/intel/ice/ice_common.c:4885:15: warning: unused variable ‘i’ [-Wunused-variable]
unsigned int i;
Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_common.c +10
-0+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 ;
drivers/net/ethernet/intel/ice/ice_common.c ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, · line 4905
Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_common.c +10
-0+ + 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); +}
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan