From: Paolo Abeni <pabeni@redhat.com>
To: Tony Nguyen <anthony.l.nguyen@intel.com>,
davem@davemloft.net, kuba@kernel.org, edumazet@google.com
Cc: Karol Kolacinski <karol.kolacinski@intel.com>,
netdev@vger.kernel.org, richardcochran@gmail.com,
Gurucharan <gurucharanx.g@intel.com>
Subject: Re: [PATCH net-next 2/3] ice: add i2c write command
Date: Thu, 19 May 2022 15:40:29 +0200 [thread overview]
Message-ID: <a4438af4d2a45b137172ed24f4ca362f8e4bf143.camel@redhat.com> (raw)
In-Reply-To: <20220517211935.1949447-3-anthony.l.nguyen@intel.com>
On Tue, 2022-05-17 at 14:19 -0700, Tony Nguyen wrote:
> From: Karol Kolacinski <karol.kolacinski@intel.com>
>
> 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.
>
> Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
> Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
> ---
> .../net/ethernet/intel/ice/ice_adminq_cmd.h | 7 +--
> drivers/net/ethernet/intel/ice/ice_common.c | 51 ++++++++++++++++++-
> drivers/net/ethernet/intel/ice/ice_common.h | 4 ++
> 3 files changed, 58 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> index b25e27c4d887..bedc19f12cbd 100644
> --- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> @@ -1401,7 +1401,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;
> @@ -1411,7 +1411,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) */
> @@ -2130,7 +2130,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;
> };
> @@ -2247,6 +2247,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,
> diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
> index 9619bdb9e49a..1999c19a786e 100644
> --- a/drivers/net/ethernet/intel/ice/ice_common.c
> +++ b/drivers/net/ethernet/intel/ice/ice_common.c
> @@ -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,55 @@ 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;
> + unsigned int i;
> + 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;
> +
> + for (i = 0; i < data_size; i++) {
> + cmd->i2c_data[i] = *data;
> + data++;
> + }
Why not:
memcpy(cmd->i2c_data, data, data_size);
?
Thanks!
Paolo
next prev parent reply other threads:[~2022-05-19 13:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 21:19 [PATCH net-next 0/3][pull request] 100GbE Intel Wired LAN Driver Updates 2022-05-17 Tony Nguyen
2022-05-17 21:19 ` [PATCH net-next 1/3] ice: remove u16 arithmetic in ice_gnss Tony Nguyen
2022-05-17 21:19 ` [PATCH net-next 2/3] ice: add i2c write command Tony Nguyen
2022-05-19 13:40 ` Paolo Abeni [this message]
2022-05-23 17:02 ` Kolacinski, Karol
2022-05-17 21:19 ` [PATCH net-next 3/3] ice: add write functionality for GNSS TTY Tony Nguyen
2022-05-19 4:57 ` Jakub Kicinski
2022-05-23 16:56 ` Kolacinski, Karol
2022-05-23 17:58 ` Jakub Kicinski
2022-06-23 13:39 ` Kolacinski, Karol
2022-06-23 16:07 ` Jakub Kicinski
2022-05-19 13:45 ` Paolo Abeni
2022-05-23 16:58 ` Kolacinski, Karol
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a4438af4d2a45b137172ed24f4ca362f8e4bf143.camel@redhat.com \
--to=pabeni@redhat.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gurucharanx.g@intel.com \
--cc=karol.kolacinski@intel.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).