Commit 885fe693 authored by Maciej Machnikowski's avatar Maciej Machnikowski Committed by Tony Nguyen
Browse files

ice: Add support for SMA control multiplexer 



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: default avatarMaciej Machnikowski <maciej.machnikowski@intel.com>
Tested-by: default avatarSunitha Mekala <sunithax.d.mekala@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 3bb6324b

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

+1 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,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];

};

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

+21 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −0
Original line number Diff line number Diff line
@@ -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);

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

+2 −0
Original line number Diff line number Diff line
@@ -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 */

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

+151 −0
Original line number Diff line number Diff line
@@ -649,3 +649,154 @@ int ice_clear_phy_tstamp(struct ice_hw *hw, u8 block, u8 idx) 
{

	return ice_clear_phy_tstamp_e810(hw, block, idx);

}



/* 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, u16 *pca9575_handle)

{

	struct ice_aqc_get_link_topo *cmd;

	struct ice_aq_desc desc;

	int status;

	u8 idx;



	/* 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 -EOPNOTSUPP;



	cmd->addr.topo_params.index = idx;



	status = ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);

	if (status)

		return -EOPNOTSUPP;



	/* 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 -EOPNOTSUPP;



	/* If present save the handle and return it */

	hw->io_expander_handle =

		le16_to_cpu(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)

{

	u16 handle = 0;

	int status;



	if (!ice_is_e810t(hw))

		return false;



	status = ice_get_pca9575_handle(hw, &handle);



	return !status && handle;

}