[Intel-wired-lan] [PATCH intel-next 0/4] Add support for E810-T PTP pins

[Intel-wired-lan] [PATCH intel-next 0/4] Add support for E810-T PTP pins

[Maciej Machnikowski]

Extend the driver implementation to support PTP pins on E810-T and
derivative devices.

E810-T adapters are equipped with:
- 2 external bidirectional SMA connectors
- 1 internal TX U.FL shared with SMA1
- 1 internal RX U.FL shared with SMA2

The SMA and U.FL configuration is controlled by the external
multiplexer.

E810-T Derivatives are equipped with:
- 2 1PPS outputs on SDP20 and SDP22
- 2 1PPS inputs on SDP21 and SDP23

Maciej Machnikowski (4):
  ice: Refactor ice_aqc_link_topo_addr
  ice: Implement functions for reading and setting GPIO pins
  ice: Add support for SMA control multiplexer
  ice: Implement support for SMA and U.FL on E810-T

 drivers/net/ethernet/intel/ice/ice.h          |   1 +
 .../net/ethernet/intel/ice/ice_adminq_cmd.h   |  20 +-
 drivers/net/ethernet/intel/ice/ice_common.c   |  87 +++-
 drivers/net/ethernet/intel/ice/ice_common.h   |   7 +
 drivers/net/ethernet/intel/ice/ice_devids.h   |   2 +
 drivers/net/ethernet/intel/ice/ice_lib.c      |  15 +
 drivers/net/ethernet/intel/ice/ice_lib.h      |   1 +
 drivers/net/ethernet/intel/ice/ice_ptp.c      | 376 +++++++++++++++++-
 drivers/net/ethernet/intel/ice/ice_ptp.h      |  21 +-
 drivers/net/ethernet/intel/ice/ice_ptp_hw.c   | 155 ++++++++
 drivers/net/ethernet/intel/ice/ice_ptp_hw.h   |  22 +
 drivers/net/ethernet/intel/ice/ice_type.h     |   1 +
 12 files changed, 694 insertions(+), 14 deletions(-)

--
2.26.3

[Intel-wired-lan] [PATCH intel-next 1/4] ice: Refactor ice_aqc_link_topo_addr

[Maciej Machnikowski]

Separate link topo parameters and move to the ice_aqc_link_topo_params
in the ice_aqc_link_topo_addr.

Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
---
 drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 6 +++++-
 drivers/net/ethernet/intel/ice/ice_common.c     | 8 +++++---
 2 files changed, 10 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 6c727745bb29..941342f4be85 100644
--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
@@ -1283,7 +1283,7 @@ struct ice_aqc_set_mac_lb {
 	u8 reserved[15];
 };
 
-struct ice_aqc_link_topo_addr {
+struct ice_aqc_link_topo_params {
 	u8 lport_num;
 	u8 lport_num_valid;
 #define ICE_AQC_LINK_TOPO_PORT_NUM_VALID	BIT(0)
@@ -1309,6 +1309,10 @@ struct ice_aqc_link_topo_addr {
 #define ICE_AQC_LINK_TOPO_NODE_CTX_PROVIDED	4
 #define ICE_AQC_LINK_TOPO_NODE_CTX_OVERRIDE	5
 	u8 index;
+};
+
+struct ice_aqc_link_topo_addr {
+	struct ice_aqc_link_topo_params topo_params;
 	__le16 handle;
 #define ICE_AQC_LINK_TOPO_HANDLE_S	0
 #define ICE_AQC_LINK_TOPO_HANDLE_M	(0x3FF << ICE_AQC_LINK_TOPO_HANDLE_S)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 1a3c6b60fdca..5822589aebdc 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -240,11 +240,13 @@ ice_aq_get_link_topo_handle(struct ice_port_info *pi, u8 node_type,
 
 	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_link_topo);
 
-	cmd->addr.node_type_ctx = (ICE_AQC_LINK_TOPO_NODE_CTX_PORT <<
-				   ICE_AQC_LINK_TOPO_NODE_CTX_S);
+	cmd->addr.topo_params.node_type_ctx =
+		(ICE_AQC_LINK_TOPO_NODE_CTX_PORT <<
+		 ICE_AQC_LINK_TOPO_NODE_CTX_S);
 
 	/* set node type */
-	cmd->addr.node_type_ctx |= (ICE_AQC_LINK_TOPO_NODE_TYPE_M & node_type);
+	cmd->addr.topo_params.node_type_ctx |=
+		(ICE_AQC_LINK_TOPO_NODE_TYPE_M & node_type);
 
 	return ice_aq_send_cmd(pi->hw, &desc, NULL, 0, cd);
 }
-- 
2.26.3

[Intel-wired-lan] [PATCH intel-next 1/4] ice: Refactor ice_aqc_link_topo_addr

[Mekala, SunithaX D]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Maciej Machnikowski
> Sent: Monday, August 16, 2021 3:27 AM
> To: intel-wired-lan at lists.osuosl.org
> Cc: Machnikowski, Maciej <maciej.machnikowski@intel.com>
> Subject: [Intel-wired-lan] [PATCH intel-next 1/4] ice: Refactor ice_aqc_link_topo_addr
>
> Separate link topo parameters and move to the ice_aqc_link_topo_params in the ice_aqc_link_topo_addr.
>
> Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 6 +++++-
>  drivers/net/ethernet/intel/ice/ice_common.c     | 8 +++++---
>  2 files changed, 10 insertions(+), 4 deletions(-)
>
Tested-by: Mekala, Sunitha D <sunithax.d.mekala@intel.com > (A Contingent worker at Intel)

[Intel-wired-lan] [PATCH intel-next 1/4] ice: Refactor ice_aqc_link_topo_addr

[Paul Menzel]

Dear Maciej,


Am 16.08.21 um 12:27 schrieb Maciej Machnikowski:
> Separate link topo parameters and move to the ice_aqc_link_topo_params
> in the ice_aqc_link_topo_addr.

What do you mean by ?in the ice_aqc_link_topo_addr?? Maybe just add write:

Separate link topo parameters in structure `ice_aqc_link_topo_addr` out 
into new structure `ice_aqc_link_topo_params`.

Please add a note, why the refactoring is needed.
> 
> Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
> ---
>   drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 6 +++++-
>   drivers/net/ethernet/intel/ice/ice_common.c     | 8 +++++---
>   2 files changed, 10 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 6c727745bb29..941342f4be85 100644
> --- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> @@ -1283,7 +1283,7 @@ struct ice_aqc_set_mac_lb {
>   	u8 reserved[15];
>   };
>   
> -struct ice_aqc_link_topo_addr {
> +struct ice_aqc_link_topo_params {
>   	u8 lport_num;
>   	u8 lport_num_valid;
>   #define ICE_AQC_LINK_TOPO_PORT_NUM_VALID	BIT(0)
> @@ -1309,6 +1309,10 @@ struct ice_aqc_link_topo_addr {
>   #define ICE_AQC_LINK_TOPO_NODE_CTX_PROVIDED	4
>   #define ICE_AQC_LINK_TOPO_NODE_CTX_OVERRIDE	5
>   	u8 index;
> +};
> +
> +struct ice_aqc_link_topo_addr {
> +	struct ice_aqc_link_topo_params topo_params;
>   	__le16 handle;
>   #define ICE_AQC_LINK_TOPO_HANDLE_S	0
>   #define ICE_AQC_LINK_TOPO_HANDLE_M	(0x3FF << ICE_AQC_LINK_TOPO_HANDLE_S)
> diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
> index 1a3c6b60fdca..5822589aebdc 100644
> --- a/drivers/net/ethernet/intel/ice/ice_common.c
> +++ b/drivers/net/ethernet/intel/ice/ice_common.c
> @@ -240,11 +240,13 @@ ice_aq_get_link_topo_handle(struct ice_port_info *pi, u8 node_type,
>   
>   	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_link_topo);
>   
> -	cmd->addr.node_type_ctx = (ICE_AQC_LINK_TOPO_NODE_CTX_PORT <<
> -				   ICE_AQC_LINK_TOPO_NODE_CTX_S);
> +	cmd->addr.topo_params.node_type_ctx =
> +		(ICE_AQC_LINK_TOPO_NODE_CTX_PORT <<
> +		 ICE_AQC_LINK_TOPO_NODE_CTX_S);
>   
>   	/* set node type */
> -	cmd->addr.node_type_ctx |= (ICE_AQC_LINK_TOPO_NODE_TYPE_M & node_type);
> +	cmd->addr.topo_params.node_type_ctx |=
> +		(ICE_AQC_LINK_TOPO_NODE_TYPE_M & node_type);
>   
>   	return ice_aq_send_cmd(pi->hw, &desc, NULL, 0, cd);
>   }
> 

[Intel-wired-lan] [PATCH intel-next 2/4] ice: Implement functions for reading and setting GPIO pins

[Maciej Machnikowski]

Implement ice_aq_get_gpio and ice_aq_set_gpio for reading and changing
the state of GPIO pins described in the topology.

Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
---
 .../net/ethernet/intel/ice/ice_adminq_cmd.h   | 13 +++++
 drivers/net/ethernet/intel/ice/ice_common.c   | 58 +++++++++++++++++++
 drivers/net/ethernet/intel/ice/ice_common.h   |  6 ++
 3 files changed, 77 insertions(+)

diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
index 941342f4be85..80cd7a106303 100644
--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
@@ -1348,6 +1348,16 @@ struct ice_aqc_set_port_id_led {
 	u8 rsvd[13];
 };
 
+/* Set/Get GPIO (direct, 0x06EC/0x06ED) */
+struct ice_aqc_gpio {
+	__le16 gpio_ctrl_handle;
+#define ICE_AQC_GPIO_HANDLE_S	0
+#define ICE_AQC_GPIO_HANDLE_M	(0x3FF << ICE_AQC_GPIO_HANDLE_S)
+	u8 gpio_num;
+	u8 gpio_val;
+	u8 rsvd[12];
+};
+
 /* Read/Write SFF EEPROM command (indirect 0x06EE) */
 struct ice_aqc_sff_eeprom {
 	u8 lport_num;
@@ -1989,6 +1999,7 @@ struct ice_aq_desc {
 		struct ice_aqc_get_phy_caps get_phy;
 		struct ice_aqc_set_phy_cfg set_phy;
 		struct ice_aqc_restart_an restart_an;
+		struct ice_aqc_gpio read_write_gpio;
 		struct ice_aqc_sff_eeprom read_write_sff_param;
 		struct ice_aqc_set_port_id_led set_port_id_led;
 		struct ice_aqc_get_sw_cfg get_sw_conf;
@@ -2144,6 +2155,8 @@ enum ice_adminq_opc {
 	ice_aqc_opc_set_mac_lb				= 0x0620,
 	ice_aqc_opc_get_link_topo			= 0x06E0,
 	ice_aqc_opc_set_port_id_led			= 0x06E9,
+	ice_aqc_opc_set_gpio				= 0x06EC,
+	ice_aqc_opc_get_gpio				= 0x06ED,
 	ice_aqc_opc_sff_eeprom				= 0x06EE,
 
 	/* NVM commands */
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 5822589aebdc..d1b81e7fbef4 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -4806,6 +4806,64 @@ ice_aq_get_driver_param(struct ice_hw *hw, enum ice_aqc_driver_params idx,
 	return 0;
 }
 
+/**
+ * ice_aq_set_gpio
+ * @hw: pointer to the hw struct
+ * @gpio_ctrl_handle: GPIO controller node handle
+ * @pin_idx: IO Number of the GPIO that needs to be set
+ * @value: SW provide IO value to set in the LSB
+ * @cd: pointer to command details structure or NULL
+ *
+ * Sends 0x06EC AQ command to set the GPIO pin state that's part of the topology
+ */
+enum ice_status
+ice_aq_set_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx, bool value,
+		struct ice_sq_cd *cd)
+{
+	struct ice_aqc_gpio *cmd;
+	struct ice_aq_desc desc;
+
+	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_gpio);
+	cmd = &desc.params.read_write_gpio;
+	cmd->gpio_ctrl_handle = gpio_ctrl_handle;
+	cmd->gpio_num = pin_idx;
+	cmd->gpio_val = value ? 1 : 0;
+
+	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
+}
+
+/**
+ * ice_aq_get_gpio
+ * @hw: pointer to the hw struct
+ * @gpio_ctrl_handle: GPIO controller node handle
+ * @pin_idx: IO Number of the GPIO that needs to be set
+ * @value: IO value read
+ * @cd: pointer to command details structure or NULL
+ *
+ * Sends 0x06ED AQ command to get the value of a GPIO signal which is part of
+ * the topology
+ */
+enum ice_status
+ice_aq_get_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx,
+		bool *value, struct ice_sq_cd *cd)
+{
+	struct ice_aqc_gpio *cmd;
+	struct ice_aq_desc desc;
+	enum ice_status status;
+
+	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_gpio);
+	cmd = &desc.params.read_write_gpio;
+	cmd->gpio_ctrl_handle = gpio_ctrl_handle;
+	cmd->gpio_num = pin_idx;
+
+	status = ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
+	if (status)
+		return status;
+
+	*value = !!cmd->gpio_val;
+	return 0;
+}
+
 /**
  * ice_fw_supports_link_override
  * @hw: pointer to the hardware structure
diff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h
index fb16070f02e2..60da1af35324 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.h
+++ b/drivers/net/ethernet/intel/ice/ice_common.h
@@ -193,6 +193,12 @@ int
 ice_aq_get_driver_param(struct ice_hw *hw, enum ice_aqc_driver_params idx,
 			u32 *value, struct ice_sq_cd *cd);
 enum ice_status
+ice_aq_set_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx, bool value,
+		struct ice_sq_cd *cd);
+enum ice_status
+ice_aq_get_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx,
+		bool *value, struct ice_sq_cd *cd);
+enum ice_status
 ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,
 		    struct ice_sq_cd *cd);
 bool ice_fw_supports_lldp_fltr_ctrl(struct ice_hw *hw);
-- 
2.26.3

[Intel-wired-lan] [PATCH intel-next 2/4] ice: Implement functions for reading and setting GPIO pins

[Nguyen, Anthony L]

On Mon, 2021-08-16 at 12:27 +0200, Maciej Machnikowski wrote:
> Implement ice_aq_get_gpio and ice_aq_set_gpio for reading and
> changing
> the state of GPIO pins described in the topology.
> 
> Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
> ---

<snip>

> diff --git a/drivers/net/ethernet/intel/ice/ice_common.c
> b/drivers/net/ethernet/intel/ice/ice_common.c
> index 5822589aebdc..d1b81e7fbef4 100644
> --- a/drivers/net/ethernet/intel/ice/ice_common.c
> +++ b/drivers/net/ethernet/intel/ice/ice_common.c
> @@ -4806,6 +4806,64 @@ ice_aq_get_driver_param(struct ice_hw *hw,
> enum ice_aqc_driver_params idx,
>  	return 0;
>  }
>  
> +/**
> + * ice_aq_set_gpio
> + * @hw: pointer to the hw struct
> + * @gpio_ctrl_handle: GPIO controller node handle
> + * @pin_idx: IO Number of the GPIO that needs to be set
> + * @value: SW provide IO value to set in the LSB
> + * @cd: pointer to command details structure or NULL
> + *
> + * Sends 0x06EC AQ command to set the GPIO pin state that's part of
> the topology
> + */
> +enum ice_status
> +ice_aq_set_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx,
> bool value,
> +		struct ice_sq_cd *cd)
> +{
> +	struct ice_aqc_gpio *cmd;
> +	struct ice_aq_desc desc;
> +
> +	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_gpio);
> +	cmd = &desc.params.read_write_gpio;
> +	cmd->gpio_ctrl_handle = gpio_ctrl_handle;
> +	cmd->gpio_num = pin_idx;
> +	cmd->gpio_val = value ? 1 : 0;
> +
> +	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
> +}
> +
> +/**
> + * ice_aq_get_gpio
> + * @hw: pointer to the hw struct
> + * @gpio_ctrl_handle: GPIO controller node handle
> + * @pin_idx: IO Number of the GPIO that needs to be set
> + * @value: IO value read
> + * @cd: pointer to command details structure or NULL
> + *
> + * Sends 0x06ED AQ command to get the value of a GPIO signal which
> is part of
> + * the topology
> + */
> +enum ice_status
> +ice_aq_get_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx,
> +		bool *value, struct ice_sq_cd *cd)
> +{
> +	struct ice_aqc_gpio *cmd;
> +	struct ice_aq_desc desc;
> +	enum ice_status status;
> +
> +	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_gpio);
> +	cmd = &desc.params.read_write_gpio;
> +	cmd->gpio_ctrl_handle = gpio_ctrl_handle;
> +	cmd->gpio_num = pin_idx;
> +
> +	status = ice_aq_send_cmd(hw, &desc, NULL, 0, cd);
> +	if (status)
> +		return status;
> +
> +	*value = !!cmd->gpio_val;
> +	return 0;
> +}

This introduces new warnings:
> ../drivers/net/ethernet/intel/ice/ice_common.c:4828:31: warning:
incorrect type in assignment (different base types)
> ../drivers/net/ethernet/intel/ice/ice_common.c:4828:31:    expected
restricted __le16 [usertype] gpio_ctrl_handle
> ../drivers/net/ethernet/intel/ice/ice_common.c:4828:31:    got
unsigned short [usertype] gpio_ctrl_handle
> ../drivers/net/ethernet/intel/ice/ice_common.c:4856:31: warning:
incorrect type in assignment (different base types)
> ../drivers/net/ethernet/intel/ice/ice_common.c:4856:31:    expected
restricted __le16 [usertype] gpio_ctrl_handle
> ../drivers/net/ethernet/intel/ice/ice_common.c:4856:31:    got
unsigned short [usertype] gpio_ctrl_handle

[Intel-wired-lan] [PATCH intel-next 3/4] ice: Add support for SMA control multiplexer

[Maciej Machnikowski]

E810-T adapters have two external bidirectional SMA connectors and two internal
unidirectional U.FL connectors. Multiplexing between U.FL and SMA and SMA direction
is controlled using the PCA9575 expander.

Add support for the PCA9575 detection and control of the respective pins
of the SMA/U.FL multiplexer using the GPIO AQ API.

Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
---
 .../net/ethernet/intel/ice/ice_adminq_cmd.h   |   1 +
 drivers/net/ethernet/intel/ice/ice_common.c   |  21 +++
 drivers/net/ethernet/intel/ice/ice_common.h   |   1 +
 drivers/net/ethernet/intel/ice/ice_devids.h   |   2 +
 drivers/net/ethernet/intel/ice/ice_ptp_hw.c   | 155 ++++++++++++++++++
 drivers/net/ethernet/intel/ice/ice_ptp_hw.h   |  22 +++
 drivers/net/ethernet/intel/ice/ice_type.h     |   1 +
 7 files changed, 203 insertions(+)

diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
index 80cd7a106303..b1072a47e1b5 100644
--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
@@ -1335,6 +1335,7 @@ struct ice_aqc_link_topo_addr {
 struct ice_aqc_get_link_topo {
 	struct ice_aqc_link_topo_addr addr;
 	u8 node_part_num;
+#define ICE_AQC_GET_LINK_TOPO_NODE_NR_PCA9575	0x21
 	u8 rsvd[9];
 };
 
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index d1b81e7fbef4..eb18fb785990 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -69,6 +69,27 @@ bool ice_is_e810(struct ice_hw *hw)
 	return hw->mac_type == ICE_MAC_E810;
 }
 
+/**
+ * ice_is_e810t
+ * @hw: pointer to the hardware structure
+ *
+ * returns true if the device is E810T based, false if not.
+ */
+bool ice_is_e810t(struct ice_hw *hw)
+{
+	switch (hw->device_id) {
+	case ICE_DEV_ID_E810C_SFP:
+		if (hw->subsystem_device_id == ICE_SUBDEV_ID_E810T ||
+		    hw->subsystem_device_id == ICE_SUBDEV_ID_E810T2)
+			return true;
+		break;
+	default:
+		break;
+	}
+
+	return false;
+}
+
 /**
  * ice_clear_pf_cfg - Clear PF configuration
  * @hw: pointer to the hardware structure
diff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h
index 60da1af35324..3b3981f0a87b 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.h
+++ b/drivers/net/ethernet/intel/ice/ice_common.h
@@ -183,6 +183,7 @@ ice_stat_update40(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,
 void
 ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,
 		  u64 *prev_stat, u64 *cur_stat);
+bool ice_is_e810t(struct ice_hw *hw);
 enum ice_status
 ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,
 		     struct ice_aqc_txsched_elem_data *buf);
diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h
index 9d8194671f6a..8d2c39ee775b 100644
--- a/drivers/net/ethernet/intel/ice/ice_devids.h
+++ b/drivers/net/ethernet/intel/ice/ice_devids.h
@@ -21,6 +21,8 @@
 #define ICE_DEV_ID_E810C_QSFP		0x1592
 /* Intel(R) Ethernet Controller E810-C for SFP */
 #define ICE_DEV_ID_E810C_SFP		0x1593
+#define ICE_SUBDEV_ID_E810T		0x000E
+#define ICE_SUBDEV_ID_E810T2		0x000F
 /* Intel(R) Ethernet Controller E810-XXV for SFP */
 #define ICE_DEV_ID_E810_XXV_SFP		0x159B
 /* Intel(R) Ethernet Connection E823-C for backplane */
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
index 0e1567e4296f..ebbd5e074297 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
@@ -3139,3 +3139,158 @@ int ice_ptp_init_phc(struct ice_hw *hw)
 	else
 		return ice_ptp_init_phc_e822(hw);
 }
+
+/* E810T SMA functions
+ *
+ * The following functions operate specifically on E810T hardware and are used
+ * to access the extended GPIOs available.
+ */
+
+/**
+ * ice_get_pca9575_handle
+ * @hw: pointer to the hw struct
+ * @pca9575_handle: GPIO controller's handle
+ *
+ * Find and return the GPIO controller's handle in the netlist.
+ * When found - the value will be cached in the hw structure and following calls
+ * will return cached value
+ */
+static int
+ice_get_pca9575_handle(struct ice_hw *hw, __le16 *pca9575_handle)
+{
+	struct ice_aqc_get_link_topo *cmd;
+	struct ice_aq_desc desc;
+	int status;
+	u8 idx;
+
+	if (!hw || !pca9575_handle)
+		return ICE_ERR_PARAM;
+
+	/* If handle was read previously return cached value */
+	if (hw->io_expander_handle) {
+		*pca9575_handle = hw->io_expander_handle;
+		return 0;
+	}
+
+	/* If handle was not detected read it from the netlist */
+	cmd = &desc.params.get_link_topo;
+	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_link_topo);
+
+	/* Set node type to GPIO controller */
+	cmd->addr.topo_params.node_type_ctx =
+		(ICE_AQC_LINK_TOPO_NODE_TYPE_M &
+		 ICE_AQC_LINK_TOPO_NODE_TYPE_GPIO_CTRL);
+
+#define SW_PCA9575_SFP_TOPO_IDX		2
+#define SW_PCA9575_QSFP_TOPO_IDX	1
+
+	/* Check if the SW IO expander controlling SMA exists in the netlist. */
+	if (hw->device_id == ICE_DEV_ID_E810C_SFP)
+		idx = SW_PCA9575_SFP_TOPO_IDX;
+	else if (hw->device_id == ICE_DEV_ID_E810C_QSFP)
+		idx = SW_PCA9575_QSFP_TOPO_IDX;
+	else
+		return ICE_ERR_NOT_SUPPORTED;
+
+	cmd->addr.topo_params.index = idx;
+
+	status = ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
+	if (status)
+		return ICE_ERR_NOT_SUPPORTED;
+
+	/* Verify if we found the right IO expander type */
+	if (desc.params.get_link_topo.node_part_num !=
+		ICE_AQC_GET_LINK_TOPO_NODE_NR_PCA9575)
+		return ICE_ERR_NOT_SUPPORTED;
+
+	/* If present save the handle and return it */
+	hw->io_expander_handle = desc.params.get_link_topo.addr.handle;
+	*pca9575_handle = hw->io_expander_handle;
+
+	return 0;
+}
+
+/**
+ * ice_read_sma_ctrl_e810t
+ * @hw: pointer to the hw struct
+ * @data: pointer to data to be read from the GPIO controller
+ *
+ * Read the SMA controller state. It is connected to pins 3-7 of Port 1 of the
+ * PCA9575 expander, so only bits 3-7 in data are valid.
+ */
+int ice_read_sma_ctrl_e810t(struct ice_hw *hw, u8 *data)
+{
+	int status;
+	u16 handle;
+	u8 i;
+
+	status = ice_get_pca9575_handle(hw, &handle);
+	if (status)
+		return status;
+
+	*data = 0;
+
+	for (i = ICE_SMA_MIN_BIT_E810T; i <= ICE_SMA_MAX_BIT_E810T; i++) {
+		bool pin;
+
+		status = ice_aq_get_gpio(hw, handle, i + ICE_PCA9575_P1_OFFSET,
+					 &pin, NULL);
+		if (status)
+			break;
+		*data |= (u8)(!pin) << i;
+	}
+
+	return status;
+}
+
+/**
+ * ice_write_sma_ctrl_e810t
+ * @hw: pointer to the hw struct
+ * @data: data to be written to the GPIO controller
+ *
+ * Write the data to the SMA controller. It is connected to pins 3-7 of Port 1
+ * of the PCA9575 expander, so only bits 3-7 in data are valid.
+ */
+int ice_write_sma_ctrl_e810t(struct ice_hw *hw, u8 data)
+{
+	int status;
+	u16 handle;
+	u8 i;
+
+	status = ice_get_pca9575_handle(hw, &handle);
+	if (status)
+		return status;
+
+	for (i = ICE_SMA_MIN_BIT_E810T; i <= ICE_SMA_MAX_BIT_E810T; i++) {
+		bool pin;
+
+		pin = !(data & (1 << i));
+		status = ice_aq_set_gpio(hw, handle, i + ICE_PCA9575_P1_OFFSET,
+					 pin, NULL);
+		if (status)
+			break;
+	}
+
+	return status;
+}
+
+/**
+ * ice_is_pca9575_present
+ * @hw: pointer to the hw struct
+ *
+ * Check if the SW IO expander is present in the netlist
+ */
+bool ice_is_pca9575_present(struct ice_hw *hw)
+{
+	int status;
+	__le16 handle = 0;
+
+	if (!ice_is_e810t(hw))
+		return false;
+
+	status = ice_get_pca9575_handle(hw, &handle);
+	if (!status && handle)
+		return true;
+
+	return false;
+}
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
index 5fd3c673480c..519e75462e67 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
+++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
@@ -189,6 +189,9 @@ int ice_phy_exit_bypass_e822(struct ice_hw *hw, u8 port);
 
 /* E810 family functions */
 int ice_ptp_init_phy_e810(struct ice_hw *hw);
+int ice_read_sma_ctrl_e810t(struct ice_hw *hw, u8 *data);
+int ice_write_sma_ctrl_e810t(struct ice_hw *hw, u8 data);
+bool ice_is_pca9575_present(struct ice_hw *hw);
 
 #define PFTSYN_SEM_BYTES	4
 
@@ -421,4 +424,23 @@ int ice_ptp_init_phy_e810(struct ice_hw *hw);
 #define LOW_TX_MEMORY_BANK_START	0x03090000
 #define HIGH_TX_MEMORY_BANK_START	0x03090004
 
+/* E810T SMA controller pin control */
+#define ICE_SMA1_DIR_EN_E810T		BIT(4)
+#define ICE_SMA1_TX_EN_E810T		BIT(5)
+#define ICE_SMA2_UFL2_RX_DIS_E810T	BIT(3)
+#define ICE_SMA2_DIR_EN_E810T		BIT(6)
+#define ICE_SMA2_TX_EN_E810T		BIT(7)
+
+#define ICE_SMA1_MASK_E810T	(ICE_SMA1_DIR_EN_E810T | \
+				 ICE_SMA1_TX_EN_E810T)
+#define ICE_SMA2_MASK_E810T	(ICE_SMA2_UFL2_RX_DIS_E810T | \
+				 ICE_SMA2_DIR_EN_E810T | \
+				 ICE_SMA2_TX_EN_E810T)
+#define ICE_ALL_SMA_MASK_E810T	(ICE_SMA1_MASK_E810T | \
+				 ICE_SMA2_MASK_E810T)
+
+#define ICE_SMA_MIN_BIT_E810T	3
+#define ICE_SMA_MAX_BIT_E810T	7
+#define ICE_PCA9575_P1_OFFSET	8
+
 #endif /* _ICE_PTP_HW_H_ */
diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h
index 582225df46f4..2bd8230b1537 100644
--- a/drivers/net/ethernet/intel/ice/ice_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_type.h
@@ -938,6 +938,7 @@ struct ice_hw {
 	struct list_head rss_list_head;
 	struct ice_mbx_snapshot mbx_snapshot;
 	DECLARE_BITMAP(hw_ptype, ICE_FLOW_PTYPE_MAX);
+	__le16 io_expander_handle;
 };
 
 /* Statistics collected by each port, VSI, VEB, and S-channel */
-- 
2.26.3

[Intel-wired-lan] [PATCH intel-next 3/4] ice: Add support for SMA control multiplexer

[Nguyen, Anthony L]

On Mon, 2021-08-16 at 12:27 +0200, Maciej Machnikowski wrote:
> E810-T adapters have two external bidirectional SMA connectors and
> two internal
> unidirectional U.FL connectors. Multiplexing between U.FL and SMA and
> SMA direction
> is controlled using the PCA9575 expander.
> 
> Add support for the PCA9575 detection and control of the respective
> pins
> of the SMA/U.FL multiplexer using the GPIO AQ API.
> 
> Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
> ---

<snip>

> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> index 0e1567e4296f..ebbd5e074297 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
> @@ -3139,3 +3139,158 @@ int ice_ptp_init_phc(struct ice_hw *hw)
>  	else
>  		return ice_ptp_init_phc_e822(hw);
>  }
> +
> +/* E810T SMA functions
> + *
> + * The following functions operate specifically on E810T hardware
> and are used
> + * to access the extended GPIOs available.
> + */
> +
> +/**
> + * ice_get_pca9575_handle
> + * @hw: pointer to the hw struct
> + * @pca9575_handle: GPIO controller's handle
> + *
> + * Find and return the GPIO controller's handle in the netlist.
> + * When found - the value will be cached in the hw structure and
> following calls
> + * will return cached value
> + */
> +static int
> +ice_get_pca9575_handle(struct ice_hw *hw, __le16 *pca9575_handle)
> +{
> +	struct ice_aqc_get_link_topo *cmd;
> +	struct ice_aq_desc desc;
> +	int status;
> +	u8 idx;
> +
> +	if (!hw || !pca9575_handle)
> +		return ICE_ERR_PARAM;
> +
> +	/* If handle was read previously return cached value */
> +	if (hw->io_expander_handle) {
> +		*pca9575_handle = hw->io_expander_handle;
> +		return 0;
> +	}
> +
> +	/* If handle was not detected read it from the netlist */
> +	cmd = &desc.params.get_link_topo;
> +	ice_fill_dflt_direct_cmd_desc(&desc,
> ice_aqc_opc_get_link_topo);
> +
> +	/* Set node type to GPIO controller */
> +	cmd->addr.topo_params.node_type_ctx =
> +		(ICE_AQC_LINK_TOPO_NODE_TYPE_M &
> +		 ICE_AQC_LINK_TOPO_NODE_TYPE_GPIO_CTRL);
> +
> +#define SW_PCA9575_SFP_TOPO_IDX		2
> +#define SW_PCA9575_QSFP_TOPO_IDX	1
> +
> +	/* Check if the SW IO expander controlling SMA exists in the
> netlist. */
> +	if (hw->device_id == ICE_DEV_ID_E810C_SFP)
> +		idx = SW_PCA9575_SFP_TOPO_IDX;
> +	else if (hw->device_id == ICE_DEV_ID_E810C_QSFP)
> +		idx = SW_PCA9575_QSFP_TOPO_IDX;
> +	else
> +		return ICE_ERR_NOT_SUPPORTED;
> +
> +	cmd->addr.topo_params.index = idx;
> +
> +	status = ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
> +	if (status)
> +		return ICE_ERR_NOT_SUPPORTED;
> +
> +	/* Verify if we found the right IO expander type */
> +	if (desc.params.get_link_topo.node_part_num !=
> +		ICE_AQC_GET_LINK_TOPO_NODE_NR_PCA9575)
> +		return ICE_ERR_NOT_SUPPORTED;
> +
> +	/* If present save the handle and return it */
> +	hw->io_expander_handle = desc.params.get_link_topo.addr.handle;
> +	*pca9575_handle = hw->io_expander_handle;
> +
> +	return 0;
> +}
> +
> +/**
> + * ice_read_sma_ctrl_e810t
> + * @hw: pointer to the hw struct
> + * @data: pointer to data to be read from the GPIO controller
> + *
> + * Read the SMA controller state. It is connected to pins 3-7 of
> Port 1 of the
> + * PCA9575 expander, so only bits 3-7 in data are valid.
> + */
> +int ice_read_sma_ctrl_e810t(struct ice_hw *hw, u8 *data)
> +{
> +	int status;
> +	u16 handle;
> +	u8 i;
> +
> +	status = ice_get_pca9575_handle(hw, &handle);
> +	if (status)
> +		return status;
> +
> +	*data = 0;
> +
> +	for (i = ICE_SMA_MIN_BIT_E810T; i <= ICE_SMA_MAX_BIT_E810T;
> i++) {
> +		bool pin;
> +
> +		status = ice_aq_get_gpio(hw, handle, i +
> ICE_PCA9575_P1_OFFSET,
> +					 &pin, NULL);
> +		if (status)
> +			break;
> +		*data |= (u8)(!pin) << i;
> +	}
> +
> +	return status;
> +}
> +
> +/**
> + * ice_write_sma_ctrl_e810t
> + * @hw: pointer to the hw struct
> + * @data: data to be written to the GPIO controller
> + *
> + * Write the data to the SMA controller. It is connected to pins 3-7 
> of Port 1
> + * of the PCA9575 expander, so only bits 3-7 in data are valid.
> + */
> +int ice_write_sma_ctrl_e810t(struct ice_hw *hw, u8 data)
> +{
> +	int status;
> +	u16 handle;
> +	u8 i;
> +
> +	status = ice_get_pca9575_handle(hw, &handle);
> +	if (status)
> +		return status;
> +
> +	for (i = ICE_SMA_MIN_BIT_E810T; i <= ICE_SMA_MAX_BIT_E810T;
> i++) {
> +		bool pin;
> +
> +		pin = !(data & (1 << i));
> +		status = ice_aq_set_gpio(hw, handle, i +
> ICE_PCA9575_P1_OFFSET,
> +					 pin, NULL);
> +		if (status)
> +			break;
> +	}
> +
> +	return status;
> +}
> +
> +/**
> + * ice_is_pca9575_present
> + * @hw: pointer to the hw struct
> + *
> + * Check if the SW IO expander is present in the netlist
> + */
> +bool ice_is_pca9575_present(struct ice_hw *hw)
> +{
> +	int status;
> +	__le16 handle = 0;
> +
> +	if (!ice_is_e810t(hw))
> +		return false;
> +
> +	status = ice_get_pca9575_handle(hw, &handle);
> +	if (!status && handle)
> +		return true;
> +
> +	return false;
> +}

A couple here as well:
> ../drivers/net/ethernet/intel/ice/ice_ptp_hw.c:3227:46: warning:
incorrect type in argument 2 (different base types)
> ../drivers/net/ethernet/intel/ice/ice_ptp_hw.c:3227:46:    expected
restricted __le16 [usertype] *pca9575_handle
> ../drivers/net/ethernet/intel/ice/ice_ptp_hw.c:3227:46:    got
unsigned short *
> ../drivers/net/ethernet/intel/ice/ice_ptp_hw.c:3260:46: warning:
incorrect type in argument 2 (different base types)
> ../drivers/net/ethernet/intel/ice/ice_ptp_hw.c:3260:46:    expected
restricted __le16 [usertype] *pca9575_handle
> ../drivers/net/ethernet/intel/ice/ice_ptp_hw.c:3260:46:    got
unsigned short *

[Intel-wired-lan] [PATCH intel-next 4/4] ice: Implement support for SMA and U.FL on E810-T

[Maciej Machnikowski]

Expose SMA and U.FL connectors as ptp_pins on E810-T based adapters and allow
controlling them.

E810-T adapters are equipped with:
- 2 external bidirectional SMA connectors
- 1 internal TX U.FL
- 1 internal RX U.FL

U.FL connectors share signal lines with the SMA connectors. The TX U.FL1 share
the line with the SMA1 and the RX U.FL2 share line with the SMA2. This
dependence is controlled by the ice_verify_pin_e810t.

Additionally add support for the E810-T-based  devices which don't use the
SMA/U.FL controller. If the IO expander is not detected don't expose pins
and use 2 predefined 1PPS input and output pins.

Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
---
 drivers/net/ethernet/intel/ice/ice.h     |   1 +
 drivers/net/ethernet/intel/ice/ice_lib.c |  15 +
 drivers/net/ethernet/intel/ice/ice_lib.h |   1 +
 drivers/net/ethernet/intel/ice/ice_ptp.c | 376 ++++++++++++++++++++++-
 drivers/net/ethernet/intel/ice/ice_ptp.h |  21 +-
 5 files changed, 404 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 7662dd298877..73a203c350a5 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -160,6 +160,7 @@
 
 enum ice_feature {
 	ICE_F_DSCP,
+	ICE_F_SMA_CTRL,
 	ICE_F_MAX
 };
 
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index fa8f42e80851..327b39d7cd71 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -3890,6 +3890,19 @@ static void ice_set_feature_support(struct ice_pf *pf, enum ice_feature f)
 	set_bit(f, pf->features);
 }
 
+/**
+ * ice_clear_feature_support
+ * @pf: pointer to the struct ice_pf instance
+ * @f: feature enum to clear
+ */
+void ice_clear_feature_support(struct ice_pf *pf, enum ice_feature f)
+{
+	if (f < 0 || f >= ICE_F_MAX)
+		return;
+
+	clear_bit(f, pf->features);
+}
+
 /**
  * ice_init_feature_support
  * @pf: pointer to the struct ice_pf instance
@@ -3903,6 +3916,8 @@ void ice_init_feature_support(struct ice_pf *pf)
 	case ICE_DEV_ID_E810C_QSFP:
 	case ICE_DEV_ID_E810C_SFP:
 		ice_set_feature_support(pf, ICE_F_DSCP);
+		if (ice_is_e810t(&pf->hw))
+			ice_set_feature_support(pf, ICE_F_SMA_CTRL);
 		break;
 	default:
 		break;
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h
index 0cef9b665d8c..ddb5e641d164 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_lib.h
@@ -130,5 +130,6 @@ void ice_vsi_ctx_set_allow_override(struct ice_vsi_ctx *ctx);
 
 void ice_vsi_ctx_clear_allow_override(struct ice_vsi_ctx *ctx);
 bool ice_is_feature_supported(struct ice_pf *pf, enum ice_feature f);
+void ice_clear_feature_support(struct ice_pf *pf, enum ice_feature f);
 void ice_init_feature_support(struct ice_pf *pf);
 #endif /* !_ICE_LIB_H_ */
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 031d044ffe7d..62a6b7b1dfd0 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -8,6 +8,256 @@
 
 #define UNKNOWN_INCVAL_E822 0x100000000ULL
 
+static const struct ptp_pin_desc ice_pin_desc_e810t[] = {
+	/* name    idx   func         chan */
+	{ "GNSS",  GNSS, PTP_PF_EXTTS, 0, { 0, } },
+	{ "SMA1",  SMA1, PTP_PF_NONE, 1, { 0, } },
+	{ "U.FL1", UFL1, PTP_PF_NONE, 1, { 0, } },
+	{ "SMA2",  SMA2, PTP_PF_NONE, 2, { 0, } },
+	{ "U.FL2", UFL2, PTP_PF_NONE, 2, { 0, } },
+};
+
+/**
+ * ice_get_sma_config_e810t
+ * @hw: pointer to the hw struct
+ * @ptp_pins:pointer to the ptp_pin_desc struture
+ *
+ * Read the configuration of the SMA control logic and put it into the
+ * ptp_pin_desc structure
+ */
+static int
+ice_get_sma_config_e810t(struct ice_hw *hw, struct ptp_pin_desc *ptp_pins)
+{
+	enum ice_status status;
+	u8 data, i;
+
+	/* Read initial pin state */
+	status = ice_read_sma_ctrl_e810t(hw, &data);
+	if (status)
+		return ice_status_to_errno(status);
+
+	/* initialize with defaults */
+	for (i = 0; i < NUM_PTP_PINS_E810T; i++) {
+		snprintf(ptp_pins[i].name, sizeof(ptp_pins[i].name),
+			 "%s", ice_pin_desc_e810t[i].name);
+		ptp_pins[i].index = ice_pin_desc_e810t[i].index;
+		ptp_pins[i].func = ice_pin_desc_e810t[i].func;
+		ptp_pins[i].chan = ice_pin_desc_e810t[i].chan;
+	}
+
+	/* Parse SMA1/UFL1 */
+	switch (data & ICE_SMA1_MASK_E810T) {
+	case ICE_SMA1_MASK_E810T:
+	default:
+		ptp_pins[SMA1].func = PTP_PF_NONE;
+		ptp_pins[UFL1].func = PTP_PF_NONE;
+		break;
+	case ICE_SMA1_DIR_EN_E810T:
+		ptp_pins[SMA1].func = PTP_PF_PEROUT;
+		ptp_pins[UFL1].func = PTP_PF_NONE;
+		break;
+	case ICE_SMA1_TX_EN_E810T:
+		ptp_pins[SMA1].func = PTP_PF_EXTTS;
+		ptp_pins[UFL1].func = PTP_PF_NONE;
+		break;
+	case 0:
+		ptp_pins[SMA1].func = PTP_PF_EXTTS;
+		ptp_pins[UFL1].func = PTP_PF_PEROUT;
+		break;
+	}
+
+	/* Parse SMA2/UFL2 */
+	switch (data & ICE_SMA2_MASK_E810T) {
+	case ICE_SMA2_MASK_E810T:
+	default:
+		ptp_pins[SMA2].func = PTP_PF_NONE;
+		ptp_pins[UFL2].func = PTP_PF_NONE;
+		break;
+	case (ICE_SMA2_TX_EN_E810T | ICE_SMA2_UFL2_RX_DIS_E810T):
+		ptp_pins[SMA2].func = PTP_PF_EXTTS;
+		ptp_pins[UFL2].func = PTP_PF_NONE;
+		break;
+	case (ICE_SMA2_DIR_EN_E810T | ICE_SMA2_UFL2_RX_DIS_E810T):
+		ptp_pins[SMA2].func = PTP_PF_PEROUT;
+		ptp_pins[UFL2].func = PTP_PF_NONE;
+		break;
+	case (ICE_SMA2_DIR_EN_E810T | ICE_SMA2_TX_EN_E810T):
+		ptp_pins[SMA2].func = PTP_PF_NONE;
+		ptp_pins[UFL2].func = PTP_PF_EXTTS;
+		break;
+	case ICE_SMA2_DIR_EN_E810T:
+		ptp_pins[SMA2].func = PTP_PF_PEROUT;
+		ptp_pins[UFL2].func = PTP_PF_EXTTS;
+		break;
+	}
+
+	return 0;
+}
+
+/**
+ * ice_ptp_set_sma_config_e810t
+ * @hw: pointer to the hw struct
+ * @ptp_pins: pointer to the ptp_pin_desc struture
+ *
+ * Set the configuration of the SMA control logic based on the configuration in
+ * num_pins parameter
+ */
+static int
+ice_ptp_set_sma_config_e810t(struct ice_hw *hw,
+			    const struct ptp_pin_desc *ptp_pins)
+{
+	enum ice_status status;
+	u8 data;
+
+	/* SMA1 and UFL1 cannot be set to TX at the same time */
+	if (ptp_pins[SMA1].func == PTP_PF_PEROUT &&
+	    ptp_pins[UFL1].func == PTP_PF_PEROUT)
+		return ICE_ERR_PARAM;
+
+	/* SMA2 and UFL2 cannot be set to RX@the same time */
+	if (ptp_pins[SMA2].func == PTP_PF_EXTTS &&
+	    ptp_pins[UFL2].func == PTP_PF_EXTTS)
+		return ICE_ERR_PARAM;
+
+	/* Read initial pin state value */
+	status = ice_read_sma_ctrl_e810t(hw, &data);
+	if (status)
+		return ice_status_to_errno(status);
+
+	/* Set the right sate based on the desired configuration */
+	data &= ~ICE_SMA1_MASK_E810T;
+	if (ptp_pins[SMA1].func == PTP_PF_NONE &&
+	    ptp_pins[UFL1].func == PTP_PF_NONE) {
+		dev_info(ice_hw_to_dev(hw), "SMA1 + U.FL1 disabled");
+		data |= ICE_SMA1_MASK_E810T;
+	} else if (ptp_pins[SMA1].func == PTP_PF_EXTTS &&
+		   ptp_pins[UFL1].func == PTP_PF_NONE) {
+		dev_info(ice_hw_to_dev(hw), "SMA1 RX");
+		data |= ICE_SMA1_TX_EN_E810T;
+	} else if (ptp_pins[SMA1].func == PTP_PF_NONE &&
+		   ptp_pins[UFL1].func == PTP_PF_PEROUT) {
+		/* U.FL 1 TX will always enable SMA 1 RX */
+		dev_info(ice_hw_to_dev(hw), "SMA1 RX + U.FL1 TX");
+	} else if (ptp_pins[SMA1].func == PTP_PF_EXTTS &&
+		   ptp_pins[UFL1].func == PTP_PF_PEROUT) {
+		dev_info(ice_hw_to_dev(hw), "SMA1 RX + U.FL1 TX");
+	} else if (ptp_pins[SMA1].func == PTP_PF_PEROUT &&
+		   ptp_pins[UFL1].func == PTP_PF_NONE) {
+		dev_info(ice_hw_to_dev(hw), "SMA1 TX");
+		data |= ICE_SMA1_DIR_EN_E810T;
+	}
+
+	data &= (~ICE_SMA2_MASK_E810T);
+	if (ptp_pins[SMA2].func == PTP_PF_NONE &&
+	    ptp_pins[UFL2].func == PTP_PF_NONE) {
+		dev_info(ice_hw_to_dev(hw), "SMA2 + U.FL2 disabled");
+		data |= ICE_SMA2_MASK_E810T;
+	} else if (ptp_pins[SMA2].func == PTP_PF_EXTTS &&
+			ptp_pins[UFL2].func == PTP_PF_NONE) {
+		dev_info(ice_hw_to_dev(hw), "SMA2 RX");
+		data |= (ICE_SMA2_TX_EN_E810T |
+			 ICE_SMA2_UFL2_RX_DIS_E810T);
+	} else if (ptp_pins[SMA2].func == PTP_PF_NONE &&
+		   ptp_pins[UFL2].func == PTP_PF_EXTTS) {
+		dev_info(ice_hw_to_dev(hw), "UFL2 RX");
+		data |= (ICE_SMA2_DIR_EN_E810T | ICE_SMA2_TX_EN_E810T);
+	} else if (ptp_pins[SMA2].func == PTP_PF_PEROUT &&
+		   ptp_pins[UFL2].func == PTP_PF_NONE) {
+		dev_info(ice_hw_to_dev(hw), "SMA2 TX");
+		data |= (ICE_SMA2_DIR_EN_E810T |
+			 ICE_SMA2_UFL2_RX_DIS_E810T);
+	} else if (ptp_pins[SMA2].func == PTP_PF_PEROUT &&
+		   ptp_pins[UFL2].func == PTP_PF_EXTTS) {
+		dev_info(ice_hw_to_dev(hw), "SMA2 TX + U.FL2 RX");
+		data |= ICE_SMA2_DIR_EN_E810T;
+	}
+
+	status = ice_write_sma_ctrl_e810t(hw, data);
+	if (status)
+		return ice_status_to_errno(status);
+
+	return 0;
+}
+
+/**
+ * ice_ptp_set_sma_e810t
+ * @info: the driver's PTP info structure
+ * @pin: pin index in kernel structure
+ * @func: Pin function to be set (PTP_PF_NONE, PTP_PF_EXTTS or PTP_PF_PEROUT)
+ *
+ * Set the configuration of a single SMA pin
+ */
+static int
+ice_ptp_set_sma_e810t(struct ptp_clock_info *info, unsigned int pin,
+		      enum ptp_pin_function func)
+{
+	struct ptp_pin_desc ptp_pins[NUM_PTP_PINS_E810T];
+	struct ice_pf *pf = ptp_info_to_pf(info);
+	struct ice_hw *hw = &pf->hw;
+	int err;
+
+	if (pin < SMA1 || func > PTP_PF_PEROUT)
+		return -EOPNOTSUPP;
+
+	err = ice_get_sma_config_e810t(hw, ptp_pins);
+	if (err)
+		return err;
+
+	/* Disable the same function on the other pin sharing the channel */
+	if (pin == SMA1 && ptp_pins[UFL1].func == func)
+		ptp_pins[UFL1].func = PTP_PF_NONE;
+	if (pin == UFL1 && ptp_pins[SMA1].func == func)
+		ptp_pins[SMA1].func = PTP_PF_NONE;
+
+	if (pin == SMA2 && ptp_pins[UFL2].func == func)
+		ptp_pins[UFL2].func = PTP_PF_NONE;
+	if (pin == UFL2 && ptp_pins[SMA2].func == func)
+		ptp_pins[SMA2].func = PTP_PF_NONE;
+
+	/* Set up new pin function in the temp table */
+	ptp_pins[pin].func = func;
+
+	return ice_ptp_set_sma_config_e810t(hw, ptp_pins);
+}
+
+/**
+ * ice_verify_pin_e810t
+ * @info: the driver's PTP info structure
+ * @pin: Pin index
+ * @func: Assigned function
+ * @chan: Assigned channel
+ *
+ * Verify if pin supports requested pin function. If the Check pins consistency.
+ * Reconfigure the SMA logic attached to the given pin to enable its
+ * desired functionality
+ */
+static int
+ice_verify_pin_e810t(struct ptp_clock_info *info, unsigned int pin,
+		     enum ptp_pin_function func, unsigned int chan)
+{
+	/* Don't allow channel reassignment */
+	if (chan != ice_pin_desc_e810t[pin].chan)
+		return -EOPNOTSUPP;
+
+	/* Check if functions are properly assigned */
+	switch (func) {
+	case PTP_PF_NONE:
+		break;
+	case PTP_PF_EXTTS:
+		if (pin == UFL1)
+			return -EOPNOTSUPP;
+		break;
+	case PTP_PF_PEROUT:
+		if (pin == UFL2 || pin == GNSS)
+			return -EOPNOTSUPP;
+		break;
+	case PTP_PF_PHYSYNC:
+		return -EOPNOTSUPP;
+	}
+
+	return ice_ptp_set_sma_e810t(info, pin, func);
+}
+
 /**
  * ice_set_tx_tstamp - Enable or disable Tx timestamping
  * @pf: The PF pointer to search in
@@ -1142,17 +1392,34 @@ ice_ptp_gpio_enable_e810(struct ptp_clock_info *info,
 {
 	struct ice_pf *pf = ptp_info_to_pf(info);
 	struct ice_perout_channel clk_cfg = {0};
+	bool sma_pres = false;
 	unsigned int chan;
 	u32 gpio_pin;
 	int err;
 
+	if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL))
+		sma_pres = true;
+
 	switch (rq->type) {
 	case PTP_CLK_REQ_PEROUT:
 		chan = rq->perout.index;
-		if (chan == PPS_CLK_GEN_CHAN)
+		if (sma_pres) {
+			if (chan == ice_pin_desc_e810t[SMA1].chan)
+				clk_cfg.gpio_pin = GPIO_20;
+			else if (chan == ice_pin_desc_e810t[SMA2].chan)
+				clk_cfg.gpio_pin = GPIO_22;
+			else
+				return -1;
+		} else if (ice_is_e810t(&pf->hw)) {
+			if (chan == 0)
+				clk_cfg.gpio_pin = GPIO_20;
+			else
+				clk_cfg.gpio_pin = GPIO_22;
+		} else if (chan == PPS_CLK_GEN_CHAN) {
 			clk_cfg.gpio_pin = PPS_PIN_INDEX;
-		else
+		} else {
 			clk_cfg.gpio_pin = chan;
+		}
 
 		clk_cfg.period = ((rq->perout.period.sec * NSEC_PER_SEC) +
 				   rq->perout.period.nsec);
@@ -1164,7 +1431,19 @@ ice_ptp_gpio_enable_e810(struct ptp_clock_info *info,
 		break;
 	case PTP_CLK_REQ_EXTTS:
 		chan = rq->extts.index;
-		gpio_pin = chan;
+		if (sma_pres) {
+			if (chan < ice_pin_desc_e810t[SMA2].chan)
+				gpio_pin = GPIO_21;
+			else
+				gpio_pin = GPIO_23;
+		} else if (ice_is_e810t(&pf->hw)) {
+			if (chan == 0)
+				gpio_pin = GPIO_21;
+			else
+				gpio_pin = GPIO_23;
+		} else {
+			gpio_pin = chan;
+		}
 
 		err = ice_ptp_cfg_extts(pf, !!on, chan, gpio_pin,
 					rq->extts.flags);
@@ -1548,14 +1827,96 @@ ice_ptp_rx_hwtstamp(struct ice_ring *rx_ring,
 	}
 }
 
+/**
+ * ice_ptp_disable_sma_pins_e810t - Disable E810-T SMA pins
+ * @pf: pointer to the PF structure
+ * @info: PTP clock info structure
+ *
+ * Disable the OS access to the SMA pins. Called to clear out the OS
+ * indications of pin support when we fail to setup the E810-T SMA control
+ * register.
+ */
+static void
+ice_ptp_disable_sma_pins_e810t(struct ice_pf *pf, struct ptp_clock_info *info)
+{
+	struct device *dev = ice_pf_to_dev(pf);
+
+	dev_warn(dev, "Failed to configure E810-T SMA pin control\n");
+
+	info->enable = NULL;
+	info->verify = NULL;
+	info->n_pins = 0;
+	info->n_ext_ts = 0;
+	info->n_per_out = 0;
+}
+
+/**
+ * ice_ptp_setup_sma_pins_e810t - Setup the SMA pins
+ * @pf: pointer to the PF structure
+ * @info: PTP clock info structure
+ *
+ * Finish setting up the SMA pins by allocating pin_config, and setting it up
+ * according to the current status of the SMA. On failure, disable all of the
+ * extended SMA pin support.
+ */
+static void
+ice_ptp_setup_sma_pins_e810t(struct ice_pf *pf, struct ptp_clock_info *info)
+{
+	struct device *dev = ice_pf_to_dev(pf);
+	int err;
+
+	/* Allocate memory for kernel pins interface */
+	info->pin_config = devm_kcalloc(dev, info->n_pins,
+					sizeof(*info->pin_config), GFP_KERNEL);
+	if (!info->pin_config) {
+		ice_ptp_disable_sma_pins_e810t(pf, info);
+		return;
+	}
+
+	/* Read current SMA status */
+	err = ice_get_sma_config_e810t(&pf->hw, info->pin_config);
+	if (err) {
+		ice_ptp_disable_sma_pins_e810t(pf, info);
+		return;
+	}
+}
+
+/**
+ * ice_ptp_setup_pins_e810t - Setup PTP pins in sysfs
+ * @pf: pointer to the PF instance
+ * @info: PTP clock capabilities
+ */
+static void
+ice_ptp_setup_pins_e810t(struct ice_pf *pf, struct ptp_clock_info *info)
+{
+	/* Check if SMA controller is in the netlist */
+	if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL) &&
+	    !ice_is_pca9575_present(&pf->hw))
+		ice_clear_feature_support(pf, ICE_F_SMA_CTRL);
+
+	if (!ice_is_feature_supported(pf, ICE_F_SMA_CTRL)) {
+		info->n_ext_ts = N_EXT_TS_E810_NO_SMA;
+		info->n_per_out = N_PER_OUT_E810T_NO_SMA;
+		return;
+	}
+
+	info->n_per_out = N_PER_OUT_E810T;
+	info->n_ext_ts = N_EXT_TS_E810;
+	info->n_pins = NUM_PTP_PINS_E810T;
+	info->verify = ice_verify_pin_e810t;
+
+	/* Complete setup of the SMA pins */
+	ice_ptp_setup_sma_pins_e810t(pf, info);
+}
+
 /**
  * ice_ptp_setup_pins_e810 - Setup PTP pins in sysfs
  * @info: PTP clock capabilities
  */
 static void ice_ptp_setup_pins_e810(struct ptp_clock_info *info)
 {
-	info->n_per_out = E810_N_PER_OUT;
-	info->n_ext_ts = E810_N_EXT_TS;
+	info->n_per_out = N_PER_OUT_E810;
+	info->n_ext_ts = N_EXT_TS_E810;
 }
 
 /**
@@ -1593,7 +1954,10 @@ ice_ptp_set_funcs_e810(struct ice_pf *pf, struct ptp_clock_info *info)
 {
 	info->enable = ice_ptp_gpio_enable_e810;
 
-	ice_ptp_setup_pins_e810(info);
+	if (ice_is_e810t(&pf->hw))
+		ice_ptp_setup_pins_e810t(pf, info);
+	else
+		ice_ptp_setup_pins_e810(info);
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h
index 49d7154e627c..4a0e941793dc 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.h
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.h
@@ -9,12 +9,21 @@
 
 #include "ice_ptp_hw.h"
 
-enum ice_ptp_pin {
+enum ice_ptp_pin_e810 {
 	GPIO_20 = 0,
 	GPIO_21,
 	GPIO_22,
 	GPIO_23,
-	NUM_ICE_PTP_PIN
+	NUM_PTP_PIN_E810
+};
+
+enum ice_ptp_pin_e810t {
+	GNSS = 0,
+	SMA1,
+	UFL1,
+	SMA2,
+	UFL2,
+	NUM_PTP_PINS_E810T
 };
 
 struct ice_perout_channel {
@@ -173,8 +182,12 @@ struct ice_ptp {
 #define PPS_CLK_SRC_CHAN		2
 #define PPS_PIN_INDEX			5
 #define TIME_SYNC_PIN_INDEX		4
-#define E810_N_EXT_TS			3
-#define E810_N_PER_OUT			4
+#define N_EXT_TS_E810			3
+#define N_PER_OUT_E810			4
+#define N_PER_OUT_E810T			3
+#define N_PER_OUT_E810T_NO_SMA		2
+#define N_EXT_TS_E810_NO_SMA		2
+
 #define ETH_GLTSYN_ENA(_i)		(0x03000348 + ((_i) * 4))
 
 #if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
-- 
2.26.3

[Intel-wired-lan] [PATCH intel-next 4/4] ice: Implement support for SMA and U.FL on E810-T

[Nguyen, Anthony L]

On Mon, 2021-08-16 at 12:27 +0200, Maciej Machnikowski wrote:
> Expose SMA and U.FL connectors as ptp_pins on E810-T based adapters
> and allow
> controlling them.
> 
> E810-T adapters are equipped with:
> - 2 external bidirectional SMA connectors
> - 1 internal TX U.FL
> - 1 internal RX U.FL
> 
> U.FL connectors share signal lines with the SMA connectors. The TX
> U.FL1 share
> the line with the SMA1 and the RX U.FL2 share line with the SMA2.
> This
> dependence is controlled by the ice_verify_pin_e810t.
> 
> Additionally add support for the E810-T-based  devices which don't
> use the
> SMA/U.FL controller. If the IO expander is not detected don't expose
> pins
> and use 2 predefined 1PPS input and output pins.
> 
> Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
> ---
>  drivers/net/ethernet/intel/ice/ice.h     |   1 +
>  drivers/net/ethernet/intel/ice/ice_lib.c |  15 +
>  drivers/net/ethernet/intel/ice/ice_lib.h |   1 +
>  drivers/net/ethernet/intel/ice/ice_ptp.c | 376
> ++++++++++++++++++++++-
>  drivers/net/ethernet/intel/ice/ice_ptp.h |  21 +-
>  5 files changed, 404 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice.h
> b/drivers/net/ethernet/intel/ice/ice.h
> index 7662dd298877..73a203c350a5 100644
> --- a/drivers/net/ethernet/intel/ice/ice.h
> +++ b/drivers/net/ethernet/intel/ice/ice.h
> @@ -160,6 +160,7 @@
>  
>  enum ice_feature {
>  	ICE_F_DSCP,
> +	ICE_F_SMA_CTRL,
>  	ICE_F_MAX
>  };
>  
> diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c
> b/drivers/net/ethernet/intel/ice/ice_lib.c
> index fa8f42e80851..327b39d7cd71 100644
> --- a/drivers/net/ethernet/intel/ice/ice_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_lib.c
> @@ -3890,6 +3890,19 @@ static void ice_set_feature_support(struct
> ice_pf *pf, enum ice_feature f)
>  	set_bit(f, pf->features);
>  }
>  
> +/**
> + * ice_clear_feature_support
> + * @pf: pointer to the struct ice_pf instance
> + * @f: feature enum to clear
> + */
> +void ice_clear_feature_support(struct ice_pf *pf, enum ice_feature
> f)
> +{
> +	if (f < 0 || f >= ICE_F_MAX)
> +		return;
> +
> +	clear_bit(f, pf->features);
> +}
> +
>  /**
>   * ice_init_feature_support
>   * @pf: pointer to the struct ice_pf instance
> @@ -3903,6 +3916,8 @@ void ice_init_feature_support(struct ice_pf
> *pf)
>  	case ICE_DEV_ID_E810C_QSFP:
>  	case ICE_DEV_ID_E810C_SFP:
>  		ice_set_feature_support(pf, ICE_F_DSCP);
> +		if (ice_is_e810t(&pf->hw))
> +			ice_set_feature_support(pf, ICE_F_SMA_CTRL);
>  		break;
>  	default:
>  		break;
> diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h
> b/drivers/net/ethernet/intel/ice/ice_lib.h
> index 0cef9b665d8c..ddb5e641d164 100644
> --- a/drivers/net/ethernet/intel/ice/ice_lib.h
> +++ b/drivers/net/ethernet/intel/ice/ice_lib.h
> @@ -130,5 +130,6 @@ void ice_vsi_ctx_set_allow_override(struct
> ice_vsi_ctx *ctx);
>  
>  void ice_vsi_ctx_clear_allow_override(struct ice_vsi_ctx *ctx);
>  bool ice_is_feature_supported(struct ice_pf *pf, enum ice_feature
> f);
> +void ice_clear_feature_support(struct ice_pf *pf, enum ice_feature
> f);
>  void ice_init_feature_support(struct ice_pf *pf);
>  #endif /* !_ICE_LIB_H_ */
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c
> b/drivers/net/ethernet/intel/ice/ice_ptp.c
> index 031d044ffe7d..62a6b7b1dfd0 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -8,6 +8,256 @@
>  
>  #define UNKNOWN_INCVAL_E822 0x100000000ULL
>  
> +static const struct ptp_pin_desc ice_pin_desc_e810t[] = {
> +	/* name    idx   func         chan */
> +	{ "GNSS",  GNSS, PTP_PF_EXTTS, 0, { 0, } },
> +	{ "SMA1",  SMA1, PTP_PF_NONE, 1, { 0, } },
> +	{ "U.FL1", UFL1, PTP_PF_NONE, 1, { 0, } },
> +	{ "SMA2",  SMA2, PTP_PF_NONE, 2, { 0, } },
> +	{ "U.FL2", UFL2, PTP_PF_NONE, 2, { 0, } },
> +};
> +
> +/**
> + * ice_get_sma_config_e810t
> + * @hw: pointer to the hw struct
> + * @ptp_pins:pointer to the ptp_pin_desc struture

nit: space here

> + *
> + * Read the configuration of the SMA control logic and put it into
> the
> + * ptp_pin_desc structure
> + */
> +static int
> +ice_get_sma_config_e810t(struct ice_hw *hw, struct ptp_pin_desc
> *ptp_pins)
> +{
> +	enum ice_status status;
> +	u8 data, i;
> +
> +	/* Read initial pin state */
> +	status = ice_read_sma_ctrl_e810t(hw, &data);
> +	if (status)
> +		return ice_status_to_errno(status);
> +
> +	/* initialize with defaults */
> +	for (i = 0; i < NUM_PTP_PINS_E810T; i++) {
> +		snprintf(ptp_pins[i].name, sizeof(ptp_pins[i].name),
> +			 "%s", ice_pin_desc_e810t[i].name);
> +		ptp_pins[i].index = ice_pin_desc_e810t[i].index;
> +		ptp_pins[i].func = ice_pin_desc_e810t[i].func;
> +		ptp_pins[i].chan = ice_pin_desc_e810t[i].chan;
> +	}
> +
> +	/* Parse SMA1/UFL1 */
> +	switch (data & ICE_SMA1_MASK_E810T) {
> +	case ICE_SMA1_MASK_E810T:
> +	default:
> +		ptp_pins[SMA1].func = PTP_PF_NONE;
> +		ptp_pins[UFL1].func = PTP_PF_NONE;
> +		break;
> +	case ICE_SMA1_DIR_EN_E810T:
> +		ptp_pins[SMA1].func = PTP_PF_PEROUT;
> +		ptp_pins[UFL1].func = PTP_PF_NONE;
> +		break;
> +	case ICE_SMA1_TX_EN_E810T:
> +		ptp_pins[SMA1].func = PTP_PF_EXTTS;
> +		ptp_pins[UFL1].func = PTP_PF_NONE;
> +		break;
> +	case 0:
> +		ptp_pins[SMA1].func = PTP_PF_EXTTS;
> +		ptp_pins[UFL1].func = PTP_PF_PEROUT;
> +		break;
> +	}
> +
> +	/* Parse SMA2/UFL2 */
> +	switch (data & ICE_SMA2_MASK_E810T) {
> +	case ICE_SMA2_MASK_E810T:
> +	default:
> +		ptp_pins[SMA2].func = PTP_PF_NONE;
> +		ptp_pins[UFL2].func = PTP_PF_NONE;
> +		break;
> +	case (ICE_SMA2_TX_EN_E810T | ICE_SMA2_UFL2_RX_DIS_E810T):
> +		ptp_pins[SMA2].func = PTP_PF_EXTTS;
> +		ptp_pins[UFL2].func = PTP_PF_NONE;
> +		break;
> +	case (ICE_SMA2_DIR_EN_E810T | ICE_SMA2_UFL2_RX_DIS_E810T):
> +		ptp_pins[SMA2].func = PTP_PF_PEROUT;
> +		ptp_pins[UFL2].func = PTP_PF_NONE;
> +		break;
> +	case (ICE_SMA2_DIR_EN_E810T | ICE_SMA2_TX_EN_E810T):
> +		ptp_pins[SMA2].func = PTP_PF_NONE;
> +		ptp_pins[UFL2].func = PTP_PF_EXTTS;
> +		break;
> +	case ICE_SMA2_DIR_EN_E810T:
> +		ptp_pins[SMA2].func = PTP_PF_PEROUT;
> +		ptp_pins[UFL2].func = PTP_PF_EXTTS;
> +		break;
> +	}
> +
> +	return 0;
> +}
> +
> +/**
> + * ice_ptp_set_sma_config_e810t
> + * @hw: pointer to the hw struct
> + * @ptp_pins: pointer to the ptp_pin_desc struture
> + *
> + * Set the configuration of the SMA control logic based on the
> configuration in
> + * num_pins parameter
> + */
> +static int
> +ice_ptp_set_sma_config_e810t(struct ice_hw *hw,
> +			    const struct ptp_pin_desc *ptp_pins)

CHECK: Alignment should match open parenthesis
#192: FILE: drivers/net/ethernet/intel/ice/ice_ptp.c:107:
+ice_ptp_set_sma_config_e810t(struct ice_hw *hw,
+                           const struct ptp_pin_desc *ptp_pins)


> +{
> +	enum ice_status status;
> +	u8 data;
> +
> +	/* SMA1 and UFL1 cannot be set to TX at the same time */
> +	if (ptp_pins[SMA1].func == PTP_PF_PEROUT &&
> +	    ptp_pins[UFL1].func == PTP_PF_PEROUT)
> +		return ICE_ERR_PARAM;

This function returns an int not ice_status.

> +
> +	/* SMA2 and UFL2 cannot be set to RX at the same time */
> +	if (ptp_pins[SMA2].func == PTP_PF_EXTTS &&
> +	    ptp_pins[UFL2].func == PTP_PF_EXTTS)
> +		return ICE_ERR_PARAM;

Same comment as above

> +
> +	/* Read initial pin state value */
> +	status = ice_read_sma_ctrl_e810t(hw, &data);
> +	if (status)
> +		return ice_status_to_errno(status);
> +
> +	/* Set the right sate based on the desired configuration */
> +	data &= ~ICE_SMA1_MASK_E810T;
> +	if (ptp_pins[SMA1].func == PTP_PF_NONE &&
> +	    ptp_pins[UFL1].func == PTP_PF_NONE) {
> +		dev_info(ice_hw_to_dev(hw), "SMA1 + U.FL1 disabled");
> +		data |= ICE_SMA1_MASK_E810T;
> +	} else if (ptp_pins[SMA1].func == PTP_PF_EXTTS &&
> +		   ptp_pins[UFL1].func == PTP_PF_NONE) {
> +		dev_info(ice_hw_to_dev(hw), "SMA1 RX");
> +		data |= ICE_SMA1_TX_EN_E810T;
> +	} else if (ptp_pins[SMA1].func == PTP_PF_NONE &&
> +		   ptp_pins[UFL1].func == PTP_PF_PEROUT) {
> +		/* U.FL 1 TX will always enable SMA 1 RX */
> +		dev_info(ice_hw_to_dev(hw), "SMA1 RX + U.FL1 TX");
> +	} else if (ptp_pins[SMA1].func == PTP_PF_EXTTS &&
> +		   ptp_pins[UFL1].func == PTP_PF_PEROUT) {
> +		dev_info(ice_hw_to_dev(hw), "SMA1 RX + U.FL1 TX");
> +	} else if (ptp_pins[SMA1].func == PTP_PF_PEROUT &&
> +		   ptp_pins[UFL1].func == PTP_PF_NONE) {
> +		dev_info(ice_hw_to_dev(hw), "SMA1 TX");
> +		data |= ICE_SMA1_DIR_EN_E810T;
> +	}
> +
> +	data &= (~ICE_SMA2_MASK_E810T);
> +	if (ptp_pins[SMA2].func == PTP_PF_NONE &&
> +	    ptp_pins[UFL2].func == PTP_PF_NONE) {
> +		dev_info(ice_hw_to_dev(hw), "SMA2 + U.FL2 disabled");
> +		data |= ICE_SMA2_MASK_E810T;
> +	} else if (ptp_pins[SMA2].func == PTP_PF_EXTTS &&
> +			ptp_pins[UFL2].func == PTP_PF_NONE) {
> +		dev_info(ice_hw_to_dev(hw), "SMA2 RX");
> +		data |= (ICE_SMA2_TX_EN_E810T |
> +			 ICE_SMA2_UFL2_RX_DIS_E810T);
> +	} else if (ptp_pins[SMA2].func == PTP_PF_NONE &&
> +		   ptp_pins[UFL2].func == PTP_PF_EXTTS) {
> +		dev_info(ice_hw_to_dev(hw), "UFL2 RX");
> +		data |= (ICE_SMA2_DIR_EN_E810T | ICE_SMA2_TX_EN_E810T);
> +	} else if (ptp_pins[SMA2].func == PTP_PF_PEROUT &&
> +		   ptp_pins[UFL2].func == PTP_PF_NONE) {
> +		dev_info(ice_hw_to_dev(hw), "SMA2 TX");
> +		data |= (ICE_SMA2_DIR_EN_E810T |
> +			 ICE_SMA2_UFL2_RX_DIS_E810T);
> +	} else if (ptp_pins[SMA2].func == PTP_PF_PEROUT &&
> +		   ptp_pins[UFL2].func == PTP_PF_EXTTS) {
> +		dev_info(ice_hw_to_dev(hw), "SMA2 TX + U.FL2 RX");
> +		data |= ICE_SMA2_DIR_EN_E810T;
> +	}
> +
> +	status = ice_write_sma_ctrl_e810t(hw, data);
> +	if (status)
> +		return ice_status_to_errno(status);
> +
> +	return 0;
> +}
> +
> +/**
> + * ice_ptp_set_sma_e810t
> + * @info: the driver's PTP info structure
> + * @pin: pin index in kernel structure
> + * @func: Pin function to be set (PTP_PF_NONE, PTP_PF_EXTTS or
> PTP_PF_PEROUT)
> + *
> + * Set the configuration of a single SMA pin
> + */
> +static int
> +ice_ptp_set_sma_e810t(struct ptp_clock_info *info, unsigned int pin,
> +		      enum ptp_pin_function func)
> +{
> +	struct ptp_pin_desc ptp_pins[NUM_PTP_PINS_E810T];
> +	struct ice_pf *pf = ptp_info_to_pf(info);
> +	struct ice_hw *hw = &pf->hw;
> +	int err;
> +
> +	if (pin < SMA1 || func > PTP_PF_PEROUT)
> +		return -EOPNOTSUPP;
> +
> +	err = ice_get_sma_config_e810t(hw, ptp_pins);
> +	if (err)
> +		return err;
> +
> +	/* Disable the same function on the other pin sharing the
> channel */
> +	if (pin == SMA1 && ptp_pins[UFL1].func == func)
> +		ptp_pins[UFL1].func = PTP_PF_NONE;
> +	if (pin == UFL1 && ptp_pins[SMA1].func == func)
> +		ptp_pins[SMA1].func = PTP_PF_NONE;
> +
> +	if (pin == SMA2 && ptp_pins[UFL2].func == func)
> +		ptp_pins[UFL2].func = PTP_PF_NONE;
> +	if (pin == UFL2 && ptp_pins[SMA2].func == func)
> +		ptp_pins[SMA2].func = PTP_PF_NONE;
> +
> +	/* Set up new pin function in the temp table */
> +	ptp_pins[pin].func = func;
> +
> +	return ice_ptp_set_sma_config_e810t(hw, ptp_pins);
> +}
> +
> +/**
> + * ice_verify_pin_e810t
> + * @info: the driver's PTP info structure
> + * @pin: Pin index
> + * @func: Assigned function
> + * @chan: Assigned channel
> + *
> + * Verify if pin supports requested pin function. If the Check pins
> consistency.
> + * Reconfigure the SMA logic attached to the given pin to enable its
> + * desired functionality
> + */
> +static int
> +ice_verify_pin_e810t(struct ptp_clock_info *info, unsigned int pin,
> +		     enum ptp_pin_function func, unsigned int chan)
> +{
> +	/* Don't allow channel reassignment */
> +	if (chan != ice_pin_desc_e810t[pin].chan)
> +		return -EOPNOTSUPP;
> +
> +	/* Check if functions are properly assigned */
> +	switch (func) {
> +	case PTP_PF_NONE:
> +		break;
> +	case PTP_PF_EXTTS:
> +		if (pin == UFL1)
> +			return -EOPNOTSUPP;
> +		break;
> +	case PTP_PF_PEROUT:
> +		if (pin == UFL2 || pin == GNSS)
> +			return -EOPNOTSUPP;
> +		break;
> +	case PTP_PF_PHYSYNC:
> +		return -EOPNOTSUPP;
> +	}
> +
> +	return ice_ptp_set_sma_e810t(info, pin, func);
> +}
> +
>  /**
>   * ice_set_tx_tstamp - Enable or disable Tx timestamping
>   * @pf: The PF pointer to search in
> @@ -1142,17 +1392,34 @@ ice_ptp_gpio_enable_e810(struct
> ptp_clock_info *info,
>  {
>  	struct ice_pf *pf = ptp_info_to_pf(info);
>  	struct ice_perout_channel clk_cfg = {0};
> +	bool sma_pres = false;
>  	unsigned int chan;
>  	u32 gpio_pin;
>  	int err;
>  
> +	if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL))
> +		sma_pres = true;
> +
>  	switch (rq->type) {
>  	case PTP_CLK_REQ_PEROUT:
>  		chan = rq->perout.index;
> -		if (chan == PPS_CLK_GEN_CHAN)
> +		if (sma_pres) {
> +			if (chan == ice_pin_desc_e810t[SMA1].chan)
> +				clk_cfg.gpio_pin = GPIO_20;
> +			else if (chan == ice_pin_desc_e810t[SMA2].chan)
> +				clk_cfg.gpio_pin = GPIO_22;
> +			else
> +				return -1;
> +		} else if (ice_is_e810t(&pf->hw)) {
> +			if (chan == 0)
> +				clk_cfg.gpio_pin = GPIO_20;
> +			else
> +				clk_cfg.gpio_pin = GPIO_22;
> +		} else if (chan == PPS_CLK_GEN_CHAN) {
>  			clk_cfg.gpio_pin = PPS_PIN_INDEX;
> -		else
> +		} else {
>  			clk_cfg.gpio_pin = chan;
> +		}
>  
>  		clk_cfg.period = ((rq->perout.period.sec *
> NSEC_PER_SEC) +
>  				   rq->perout.period.nsec);
> @@ -1164,7 +1431,19 @@ ice_ptp_gpio_enable_e810(struct ptp_clock_info
> *info,
>  		break;
>  	case PTP_CLK_REQ_EXTTS:
>  		chan = rq->extts.index;
> -		gpio_pin = chan;
> +		if (sma_pres) {
> +			if (chan < ice_pin_desc_e810t[SMA2].chan)
> +				gpio_pin = GPIO_21;
> +			else
> +				gpio_pin = GPIO_23;
> +		} else if (ice_is_e810t(&pf->hw)) {
> +			if (chan == 0)
> +				gpio_pin = GPIO_21;
> +			else
> +				gpio_pin = GPIO_23;
> +		} else {
> +			gpio_pin = chan;
> +		}
>  
>  		err = ice_ptp_cfg_extts(pf, !!on, chan, gpio_pin,
>  					rq->extts.flags);
> @@ -1548,14 +1827,96 @@ ice_ptp_rx_hwtstamp(struct ice_ring *rx_ring,
>  	}
>  }
>  
> +/**
> + * ice_ptp_disable_sma_pins_e810t - Disable E810-T SMA pins
> + * @pf: pointer to the PF structure
> + * @info: PTP clock info structure
> + *
> + * Disable the OS access to the SMA pins. Called to clear out the OS
> + * indications of pin support when we fail to setup the E810-T SMA
> control
> + * register.
> + */
> +static void
> +ice_ptp_disable_sma_pins_e810t(struct ice_pf *pf, struct
> ptp_clock_info *info)
> +{
> +	struct device *dev = ice_pf_to_dev(pf);
> +
> +	dev_warn(dev, "Failed to configure E810-T SMA pin control\n");
> +
> +	info->enable = NULL;
> +	info->verify = NULL;
> +	info->n_pins = 0;
> +	info->n_ext_ts = 0;
> +	info->n_per_out = 0;
> +}
> +
> +/**
> + * ice_ptp_setup_sma_pins_e810t - Setup the SMA pins
> + * @pf: pointer to the PF structure
> + * @info: PTP clock info structure
> + *
> + * Finish setting up the SMA pins by allocating pin_config, and
> setting it up
> + * according to the current status of the SMA. On failure, disable
> all of the
> + * extended SMA pin support.
> + */
> +static void
> +ice_ptp_setup_sma_pins_e810t(struct ice_pf *pf, struct
> ptp_clock_info *info)
> +{
> +	struct device *dev = ice_pf_to_dev(pf);
> +	int err;
> +
> +	/* Allocate memory for kernel pins interface */
> +	info->pin_config = devm_kcalloc(dev, info->n_pins,
> +					sizeof(*info->pin_config),
> GFP_KERNEL);
> +	if (!info->pin_config) {
> +		ice_ptp_disable_sma_pins_e810t(pf, info);
> +		return;
> +	}
> +
> +	/* Read current SMA status */
> +	err = ice_get_sma_config_e810t(&pf->hw, info->pin_config);
> +	if (err) {
> +		ice_ptp_disable_sma_pins_e810t(pf, info);
> +		return;

Don't need to return here as there are no more operations.

> +	}
> +}
> +
> +/**
> + * ice_ptp_setup_pins_e810t - Setup PTP pins in sysfs
> + * @pf: pointer to the PF instance
> + * @info: PTP clock capabilities
> + */
> +static void
> +ice_ptp_setup_pins_e810t(struct ice_pf *pf, struct ptp_clock_info
> *info)
> +{
> +	/* Check if SMA controller is in the netlist */
> +	if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL) &&
> +	    !ice_is_pca9575_present(&pf->hw))
> +		ice_clear_feature_support(pf, ICE_F_SMA_CTRL);
> +
> +	if (!ice_is_feature_supported(pf, ICE_F_SMA_CTRL)) {
> +		info->n_ext_ts = N_EXT_TS_E810_NO_SMA;
> +		info->n_per_out = N_PER_OUT_E810T_NO_SMA;
> +		return;
> +	}
> +
> +	info->n_per_out = N_PER_OUT_E810T;
> +	info->n_ext_ts = N_EXT_TS_E810;
> +	info->n_pins = NUM_PTP_PINS_E810T;
> +	info->verify = ice_verify_pin_e810t;
> +
> +	/* Complete setup of the SMA pins */
> +	ice_ptp_setup_sma_pins_e810t(pf, info);
> +}
> +
>  /**
>   * ice_ptp_setup_pins_e810 - Setup PTP pins in sysfs
>   * @info: PTP clock capabilities
>   */
>  static void ice_ptp_setup_pins_e810(struct ptp_clock_info *info)
>  {
> -	info->n_per_out = E810_N_PER_OUT;
> -	info->n_ext_ts = E810_N_EXT_TS;
> +	info->n_per_out = N_PER_OUT_E810;
> +	info->n_ext_ts = N_EXT_TS_E810;
>  }
>  
>  /**
> @@ -1593,7 +1954,10 @@ ice_ptp_set_funcs_e810(struct ice_pf *pf,
> struct ptp_clock_info *info)
>  {
>  	info->enable = ice_ptp_gpio_enable_e810;
>  
> -	ice_ptp_setup_pins_e810(info);
> +	if (ice_is_e810t(&pf->hw))
> +		ice_ptp_setup_pins_e810t(pf, info);
> +	else
> +		ice_ptp_setup_pins_e810(info);
>  }
>  
>  /**
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h
> b/drivers/net/ethernet/intel/ice/ice_ptp.h
> index 49d7154e627c..4a0e941793dc 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.h
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.h
> @@ -9,12 +9,21 @@
>  
>  #include "ice_ptp_hw.h"
>  
> -enum ice_ptp_pin {
> +enum ice_ptp_pin_e810 {
>  	GPIO_20 = 0,
>  	GPIO_21,
>  	GPIO_22,
>  	GPIO_23,
> -	NUM_ICE_PTP_PIN
> +	NUM_PTP_PIN_E810
> +};
> +
> +enum ice_ptp_pin_e810t {
> +	GNSS = 0,
> +	SMA1,
> +	UFL1,
> +	SMA2,
> +	UFL2,
> +	NUM_PTP_PINS_E810T
>  };
>  
>  struct ice_perout_channel {
> @@ -173,8 +182,12 @@ struct ice_ptp {
>  #define PPS_CLK_SRC_CHAN		2
>  #define PPS_PIN_INDEX			5
>  #define TIME_SYNC_PIN_INDEX		4
> -#define E810_N_EXT_TS			3
> -#define E810_N_PER_OUT			4
> +#define N_EXT_TS_E810			3
> +#define N_PER_OUT_E810			4
> +#define N_PER_OUT_E810T			3
> +#define N_PER_OUT_E810T_NO_SMA		2
> +#define N_EXT_TS_E810_NO_SMA		2
> +
>  #define ETH_GLTSYN_ENA(_i)		(0x03000348 + ((_i) * 4))
>  
>  #if IS_ENABLED(CONFIG_PTP_1588_CLOCK)