Commit 236f3873 authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
ice: add PTP auxiliary bus support

Michal Michalik says:

Auxiliary bus allows exchanging information between PFs, which allows
both fixing problems and simplifying new features implementation.
The auxiliary bus is enabled for all devices supported by ice driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7c7dd1d6 170911bb

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

+12 −0
Original line number Diff line number Diff line
@@ -673,6 +673,18 @@ static inline bool ice_vector_ch_enabled(struct ice_q_vector *qv) 
	return !!qv->ch; /* Enable it to run with TC */

}



/**

 * ice_ptp_pf_handles_tx_interrupt - Check if PF handles Tx interrupt

 * @pf: Board private structure

 *

 * Return true if this PF should respond to the Tx timestamp interrupt

 * indication in the miscellaneous OICR interrupt handler.

 */

static inline bool ice_ptp_pf_handles_tx_interrupt(struct ice_pf *pf)

{

	return pf->ptp.tx_interrupt_mode != ICE_PTP_TX_INTERRUPT_NONE;

}



/**

 * ice_irq_dynamic_ena - Enable default interrupt generation settings

 * @hw: pointer to HW struct

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

+0 −10
Original line number Diff line number Diff line
@@ -2358,16 +2358,6 @@ struct ice_aqc_driver_shared_params { 
	__le32 addr_low;

};



enum ice_aqc_driver_params {

	/* OS clock index for PTP timer Domain 0 */

	ICE_AQC_DRIVER_PARAM_CLK_IDX_TMR0 = 0,

	/* OS clock index for PTP timer Domain 1 */

	ICE_AQC_DRIVER_PARAM_CLK_IDX_TMR1,



	/* Add new parameters above */

	ICE_AQC_DRIVER_PARAM_MAX = 16,

};



/* Lan Queue Overflow Event (direct, 0x1001) */

struct ice_aqc_event_lan_overflow {

	__le32 prtdcb_ruptq;

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

+0 −75
Original line number Diff line number Diff line
@@ -5720,81 +5720,6 @@ ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, 
	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

 * @idx: parameter index to set

 * @value: the value to set the parameter to

 * @cd: pointer to command details structure or NULL

 *

 * Set the value of one of the software defined parameters. All PFs connected

 * to this device can read the value using ice_aq_get_driver_param.

 *

 * Note that firmware provides no synchronization or locking, and will not

 * save the parameter value during a device reset. It is expected that

 * a single PF will write the parameter value, while all other PFs will only

 * read it.

 */

int

ice_aq_set_driver_param(struct ice_hw *hw, enum ice_aqc_driver_params idx,

			u32 value, struct ice_sq_cd *cd)

{

	struct ice_aqc_driver_shared_params *cmd;

	struct ice_aq_desc desc;



	if (idx >= ICE_AQC_DRIVER_PARAM_MAX)

		return -EIO;



	cmd = &desc.params.drv_shared_params;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_driver_shared_params);



	cmd->set_or_get_op = ICE_AQC_DRIVER_PARAM_SET;

	cmd->param_indx = idx;

	cmd->param_val = cpu_to_le32(value);



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

}



/**

 * ice_aq_get_driver_param - Get driver parameter shared via firmware

 * @hw: pointer to the HW struct

 * @idx: parameter index to set

 * @value: storage to return the shared parameter

 * @cd: pointer to command details structure or NULL

 *

 * Get the value of one of the software defined parameters.

 *

 * Note that firmware provides no synchronization or locking. It is expected

 * that only a single PF will write a given parameter.

 */

int

ice_aq_get_driver_param(struct ice_hw *hw, enum ice_aqc_driver_params idx,

			u32 *value, struct ice_sq_cd *cd)

{

	struct ice_aqc_driver_shared_params *cmd;

	struct ice_aq_desc desc;

	int status;



	if (idx >= ICE_AQC_DRIVER_PARAM_MAX)

		return -EIO;



	cmd = &desc.params.drv_shared_params;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_driver_shared_params);



	cmd->set_or_get_op = ICE_AQC_DRIVER_PARAM_GET;

	cmd->param_indx = idx;



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

	if (status)

		return status;



	*value = le32_to_cpu(cmd->param_val);



	return 0;

}



/**

 * ice_aq_set_gpio

 * @hw: pointer to the hw struct

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

+0 −6
Original line number Diff line number Diff line
@@ -253,12 +253,6 @@ int 
ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,

		     struct ice_aqc_txsched_elem_data *buf);

int

ice_aq_set_driver_param(struct ice_hw *hw, enum ice_aqc_driver_params idx,

			u32 value, struct ice_sq_cd *cd);

int

ice_aq_get_driver_param(struct ice_hw *hw, enum ice_aqc_driver_params idx,

			u32 *value, struct ice_sq_cd *cd);

int

ice_aq_set_gpio(struct ice_hw *hw, u16 gpio_ctrl_handle, u8 pin_idx, bool value,

		struct ice_sq_cd *cd);

int

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

+1 −1
Original line number Diff line number Diff line
@@ -3285,7 +3285,7 @@ ice_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) 
				SOF_TIMESTAMPING_RX_HARDWARE |

				SOF_TIMESTAMPING_RAW_HARDWARE;



	info->phc_index = ice_get_ptp_clock_index(pf);

	info->phc_index = ice_ptp_clock_index(pf);



	info->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);