mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
Merge branch 'intel-wired-lan-driver-updates-2023-12-01-ice'
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2023-12-01 (ice)
This series contains updates to ice driver only.
Konrad provides temperature reporting via hwmon.
Arkadiusz adds reporting of Clock Generation Unit (CGU) information via
devlink info.
Pawel adjusts error messaging for ntuple filters to account for additional
possibility for encountering an error.
Karol ensures that all timestamps occurring around reset are processed and
renames some E822 functions to convey additional usage for E823 devices.
Jake provides mechanism to ensure that all timestamps on E822 devices
are processed.
The following are changes since commit 15bc81212f:
octeon_ep: set backpressure watermark for RX queues
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 100GbE
====================
Link: https://lore.kernel.org/r/20231201180845.219494-1-anthony.l.nguyen@intel.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni
commit
333f339616
18 changed files with 627 additions and 297 deletions
|
|
@ -38,6 +38,10 @@ The ``ice`` driver reports the following versions
|
|||
- fixed
|
||||
- K65390-000
|
||||
- The Product Board Assembly (PBA) identifier of the board.
|
||||
* - ``cgu.id``
|
||||
- fixed
|
||||
- 36
|
||||
- The Clock Generation Unit (CGU) hardware revision identifier.
|
||||
* - ``fw.mgmt``
|
||||
- running
|
||||
- 2.1.7
|
||||
|
|
@ -104,6 +108,11 @@ The ``ice`` driver reports the following versions
|
|||
- running
|
||||
- 0xee16ced7
|
||||
- The first 4 bytes of the hash of the netlist module contents.
|
||||
* - ``fw.cgu``
|
||||
- running
|
||||
- 8032.16973825.6021
|
||||
- The version of Clock Generation Unit (CGU). Format:
|
||||
<CGU type>.<configuration version>.<firmware version>.
|
||||
|
||||
Flash Update
|
||||
============
|
||||
|
|
|
|||
|
|
@ -299,6 +299,17 @@ config ICE
|
|||
To compile this driver as a module, choose M here. The module
|
||||
will be called ice.
|
||||
|
||||
config ICE_HWMON
|
||||
bool "Intel(R) Ethernet Connection E800 Series Support HWMON support"
|
||||
default y
|
||||
depends on ICE && HWMON && !(ICE=y && HWMON=m)
|
||||
help
|
||||
Say Y if you want to expose thermal sensor data on Intel devices.
|
||||
|
||||
Some of our devices contain internal thermal sensors.
|
||||
This data is available via the hwmon sysfs interface and exposes
|
||||
the onboard sensors.
|
||||
|
||||
config ICE_SWITCHDEV
|
||||
bool "Switchdev Support"
|
||||
default y
|
||||
|
|
|
|||
|
|
@ -49,3 +49,4 @@ ice-$(CONFIG_RFS_ACCEL) += ice_arfs.o
|
|||
ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o
|
||||
ice-$(CONFIG_ICE_SWITCHDEV) += ice_eswitch.o ice_eswitch_br.o
|
||||
ice-$(CONFIG_GNSS) += ice_gnss.o
|
||||
ice-$(CONFIG_ICE_HWMON) += ice_hwmon.o
|
||||
|
|
|
|||
|
|
@ -655,6 +655,7 @@ struct ice_pf {
|
|||
#define ICE_MAX_VF_AGG_NODES 32
|
||||
struct ice_agg_node vf_agg_node[ICE_MAX_VF_AGG_NODES];
|
||||
struct ice_dplls dplls;
|
||||
struct device *hwmon_dev;
|
||||
};
|
||||
|
||||
extern struct workqueue_struct *ice_lag_wq;
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ struct ice_aqc_list_caps_elem {
|
|||
#define ICE_AQC_CAPS_NET_VER 0x004C
|
||||
#define ICE_AQC_CAPS_PENDING_NET_VER 0x004D
|
||||
#define ICE_AQC_CAPS_RDMA 0x0051
|
||||
#define ICE_AQC_CAPS_SENSOR_READING 0x0067
|
||||
#define ICE_AQC_CAPS_PCIE_RESET_AVOIDANCE 0x0076
|
||||
#define ICE_AQC_CAPS_POST_UPDATE_RESET_RESTRICT 0x0077
|
||||
#define ICE_AQC_CAPS_NVM_MGMT 0x0080
|
||||
|
|
@ -1413,6 +1414,30 @@ struct ice_aqc_get_phy_rec_clk_out {
|
|||
__le16 node_handle;
|
||||
};
|
||||
|
||||
/* Get sensor reading (direct 0x0632) */
|
||||
struct ice_aqc_get_sensor_reading {
|
||||
u8 sensor;
|
||||
u8 format;
|
||||
u8 reserved[6];
|
||||
__le32 addr_high;
|
||||
__le32 addr_low;
|
||||
};
|
||||
|
||||
/* Get sensor reading response (direct 0x0632) */
|
||||
struct ice_aqc_get_sensor_reading_resp {
|
||||
union {
|
||||
u8 raw[8];
|
||||
/* Output data for sensor 0x00, format 0x00 */
|
||||
struct _packed {
|
||||
s8 temp;
|
||||
u8 temp_warning_threshold;
|
||||
u8 temp_critical_threshold;
|
||||
u8 temp_fatal_threshold;
|
||||
u8 reserved[4];
|
||||
} s0f0;
|
||||
} data;
|
||||
};
|
||||
|
||||
struct ice_aqc_link_topo_params {
|
||||
u8 lport_num;
|
||||
u8 lport_num_valid;
|
||||
|
|
@ -2443,6 +2468,8 @@ struct ice_aq_desc {
|
|||
struct ice_aqc_restart_an restart_an;
|
||||
struct ice_aqc_set_phy_rec_clk_out set_phy_rec_clk_out;
|
||||
struct ice_aqc_get_phy_rec_clk_out get_phy_rec_clk_out;
|
||||
struct ice_aqc_get_sensor_reading get_sensor_reading;
|
||||
struct ice_aqc_get_sensor_reading_resp get_sensor_reading_resp;
|
||||
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;
|
||||
|
|
@ -2618,6 +2645,7 @@ enum ice_adminq_opc {
|
|||
ice_aqc_opc_set_mac_lb = 0x0620,
|
||||
ice_aqc_opc_set_phy_rec_clk_out = 0x0630,
|
||||
ice_aqc_opc_get_phy_rec_clk_out = 0x0631,
|
||||
ice_aqc_opc_get_sensor_reading = 0x0632,
|
||||
ice_aqc_opc_get_link_topo = 0x06E0,
|
||||
ice_aqc_opc_read_i2c = 0x06E2,
|
||||
ice_aqc_opc_write_i2c = 0x06E3,
|
||||
|
|
|
|||
|
|
@ -2710,6 +2710,26 @@ ice_parse_fdir_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p,
|
|||
dev_p->num_flow_director_fltr);
|
||||
}
|
||||
|
||||
/**
|
||||
* ice_parse_sensor_reading_cap - Parse ICE_AQC_CAPS_SENSOR_READING cap
|
||||
* @hw: pointer to the HW struct
|
||||
* @dev_p: pointer to device capabilities structure
|
||||
* @cap: capability element to parse
|
||||
*
|
||||
* Parse ICE_AQC_CAPS_SENSOR_READING for device capability for reading
|
||||
* enabled sensors.
|
||||
*/
|
||||
static void
|
||||
ice_parse_sensor_reading_cap(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p,
|
||||
struct ice_aqc_list_caps_elem *cap)
|
||||
{
|
||||
dev_p->supported_sensors = le32_to_cpu(cap->number);
|
||||
|
||||
ice_debug(hw, ICE_DBG_INIT,
|
||||
"dev caps: supported sensors (bitmap) = 0x%x\n",
|
||||
dev_p->supported_sensors);
|
||||
}
|
||||
|
||||
/**
|
||||
* ice_parse_dev_caps - Parse device capabilities
|
||||
* @hw: pointer to the HW struct
|
||||
|
|
@ -2755,9 +2775,12 @@ ice_parse_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p,
|
|||
case ICE_AQC_CAPS_1588:
|
||||
ice_parse_1588_dev_caps(hw, dev_p, &cap_resp[i]);
|
||||
break;
|
||||
case ICE_AQC_CAPS_FD:
|
||||
case ICE_AQC_CAPS_FD:
|
||||
ice_parse_fdir_dev_caps(hw, dev_p, &cap_resp[i]);
|
||||
break;
|
||||
case ICE_AQC_CAPS_SENSOR_READING:
|
||||
ice_parse_sensor_reading_cap(hw, dev_p, &cap_resp[i]);
|
||||
break;
|
||||
default:
|
||||
/* Don't list common capabilities as unknown */
|
||||
if (!found)
|
||||
|
|
@ -5540,6 +5563,35 @@ ice_aq_get_phy_rec_clk_out(struct ice_hw *hw, u8 *phy_output, u8 *port_num,
|
|||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* ice_aq_get_sensor_reading
|
||||
* @hw: pointer to the HW struct
|
||||
* @data: pointer to data to be read from the sensor
|
||||
*
|
||||
* Get sensor reading (0x0632)
|
||||
*/
|
||||
int ice_aq_get_sensor_reading(struct ice_hw *hw,
|
||||
struct ice_aqc_get_sensor_reading_resp *data)
|
||||
{
|
||||
struct ice_aqc_get_sensor_reading *cmd;
|
||||
struct ice_aq_desc desc;
|
||||
int status;
|
||||
|
||||
ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_sensor_reading);
|
||||
cmd = &desc.params.get_sensor_reading;
|
||||
#define ICE_INTERNAL_TEMP_SENSOR_FORMAT 0
|
||||
#define ICE_INTERNAL_TEMP_SENSOR 0
|
||||
cmd->sensor = ICE_INTERNAL_TEMP_SENSOR;
|
||||
cmd->format = ICE_INTERNAL_TEMP_SENSOR_FORMAT;
|
||||
|
||||
status = ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);
|
||||
if (!status)
|
||||
memcpy(data, &desc.params.get_sensor_reading_resp,
|
||||
sizeof(*data));
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* ice_replay_pre_init - replay pre initialization
|
||||
* @hw: pointer to the HW struct
|
||||
|
|
|
|||
|
|
@ -241,6 +241,8 @@ ice_aq_set_phy_rec_clk_out(struct ice_hw *hw, u8 phy_output, bool enable,
|
|||
int
|
||||
ice_aq_get_phy_rec_clk_out(struct ice_hw *hw, u8 *phy_output, u8 *port_num,
|
||||
u8 *flags, u16 *node_handle);
|
||||
int ice_aq_get_sensor_reading(struct ice_hw *hw,
|
||||
struct ice_aqc_get_sensor_reading_resp *data);
|
||||
void
|
||||
ice_stat_update40(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,
|
||||
u64 *prev_stat, u64 *cur_stat);
|
||||
|
|
|
|||
|
|
@ -193,6 +193,24 @@ ice_info_pending_netlist_build(struct ice_pf __always_unused *pf,
|
|||
snprintf(ctx->buf, sizeof(ctx->buf), "0x%08x", netlist->hash);
|
||||
}
|
||||
|
||||
static void ice_info_cgu_fw_build(struct ice_pf *pf, struct ice_info_ctx *ctx)
|
||||
{
|
||||
u32 id, cfg_ver, fw_ver;
|
||||
|
||||
if (!ice_is_feature_supported(pf, ICE_F_CGU))
|
||||
return;
|
||||
if (ice_aq_get_cgu_info(&pf->hw, &id, &cfg_ver, &fw_ver))
|
||||
return;
|
||||
snprintf(ctx->buf, sizeof(ctx->buf), "%u.%u.%u", id, cfg_ver, fw_ver);
|
||||
}
|
||||
|
||||
static void ice_info_cgu_id(struct ice_pf *pf, struct ice_info_ctx *ctx)
|
||||
{
|
||||
if (!ice_is_feature_supported(pf, ICE_F_CGU))
|
||||
return;
|
||||
snprintf(ctx->buf, sizeof(ctx->buf), "%u", pf->hw.cgu_part_number);
|
||||
}
|
||||
|
||||
#define fixed(key, getter) { ICE_VERSION_FIXED, key, getter, NULL }
|
||||
#define running(key, getter) { ICE_VERSION_RUNNING, key, getter, NULL }
|
||||
#define stored(key, getter, fallback) { ICE_VERSION_STORED, key, getter, fallback }
|
||||
|
|
@ -235,6 +253,8 @@ static const struct ice_devlink_version {
|
|||
running("fw.app.bundle_id", ice_info_ddp_pkg_bundle_id),
|
||||
combined("fw.netlist", ice_info_netlist_ver, ice_info_pending_netlist_ver),
|
||||
combined("fw.netlist.build", ice_info_netlist_build, ice_info_pending_netlist_build),
|
||||
fixed("cgu.id", ice_info_cgu_id),
|
||||
running("fw.cgu", ice_info_cgu_fw_build),
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -668,7 +668,7 @@ ice_fdir_set_hw_fltr_rule(struct ice_pf *pf, struct ice_flow_seg_info *seg,
|
|||
* then return error.
|
||||
*/
|
||||
if (hw->fdir_fltr_cnt[flow]) {
|
||||
dev_err(dev, "Failed to add filter. Flow director filters on each port must have the same input set.\n");
|
||||
dev_err(dev, "Failed to add filter. Flow director filters on each port must have the same input set.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -770,7 +770,7 @@ ice_fdir_set_hw_fltr_rule(struct ice_pf *pf, struct ice_flow_seg_info *seg,
|
|||
ice_flow_rem_entry(hw, ICE_BLK_FD, entry1_h);
|
||||
err_prof:
|
||||
ice_flow_rem_prof(hw, ICE_BLK_FD, prof_id);
|
||||
dev_err(dev, "Failed to add filter. Flow director filters on each port must have the same input set.\n");
|
||||
dev_err(dev, "Failed to add filter. Flow director filters on each port must have the same input set.\n");
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
@ -1853,6 +1853,7 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)
|
|||
struct ice_pf *pf;
|
||||
struct ice_hw *hw;
|
||||
int fltrs_needed;
|
||||
u32 max_location;
|
||||
u16 tunnel_port;
|
||||
int ret;
|
||||
|
||||
|
|
@ -1884,8 +1885,10 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (fsp->location >= ice_get_fdir_cnt_all(hw)) {
|
||||
dev_err(dev, "Failed to add filter. The maximum number of flow director filters has been reached.\n");
|
||||
max_location = ice_get_fdir_cnt_all(hw);
|
||||
if (fsp->location >= max_location) {
|
||||
dev_err(dev, "Failed to add filter. The number of ntuple filters or provided location exceed max %d.\n",
|
||||
max_location);
|
||||
return -ENOSPC;
|
||||
}
|
||||
|
||||
|
|
@ -1893,7 +1896,7 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)
|
|||
fltrs_needed = ice_get_open_tunnel_port(hw, &tunnel_port, TNL_ALL) ? 2 : 1;
|
||||
if (!ice_fdir_find_fltr_by_idx(hw, fsp->location) &&
|
||||
ice_fdir_num_avail_fltr(hw, pf->vsi[vsi->idx]) < fltrs_needed) {
|
||||
dev_err(dev, "Failed to add filter. The maximum number of flow director filters has been reached.\n");
|
||||
dev_err(dev, "Failed to add filter. The maximum number of flow director filters has been reached.\n");
|
||||
return -ENOSPC;
|
||||
}
|
||||
|
||||
|
|
|
|||
126
drivers/net/ethernet/intel/ice/ice_hwmon.c
Normal file
126
drivers/net/ethernet/intel/ice/ice_hwmon.c
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/* Copyright (C) 2023, Intel Corporation. */
|
||||
|
||||
#include "ice.h"
|
||||
#include "ice_hwmon.h"
|
||||
#include "ice_adminq_cmd.h"
|
||||
|
||||
#include <linux/hwmon.h>
|
||||
|
||||
#define TEMP_FROM_REG(reg) ((reg) * 1000)
|
||||
|
||||
static const struct hwmon_channel_info *ice_hwmon_info[] = {
|
||||
HWMON_CHANNEL_INFO(temp,
|
||||
HWMON_T_INPUT | HWMON_T_MAX |
|
||||
HWMON_T_CRIT | HWMON_T_EMERGENCY),
|
||||
NULL
|
||||
};
|
||||
|
||||
static int ice_hwmon_read(struct device *dev, enum hwmon_sensor_types type,
|
||||
u32 attr, int channel, long *val)
|
||||
{
|
||||
struct ice_aqc_get_sensor_reading_resp resp;
|
||||
struct ice_pf *pf = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
if (type != hwmon_temp)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = ice_aq_get_sensor_reading(&pf->hw, &resp);
|
||||
if (ret) {
|
||||
dev_warn_ratelimited(dev,
|
||||
"%s HW read failure (%d)\n",
|
||||
__func__,
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
switch (attr) {
|
||||
case hwmon_temp_input:
|
||||
*val = TEMP_FROM_REG(resp.data.s0f0.temp);
|
||||
break;
|
||||
case hwmon_temp_max:
|
||||
*val = TEMP_FROM_REG(resp.data.s0f0.temp_warning_threshold);
|
||||
break;
|
||||
case hwmon_temp_crit:
|
||||
*val = TEMP_FROM_REG(resp.data.s0f0.temp_critical_threshold);
|
||||
break;
|
||||
case hwmon_temp_emergency:
|
||||
*val = TEMP_FROM_REG(resp.data.s0f0.temp_fatal_threshold);
|
||||
break;
|
||||
default:
|
||||
dev_dbg(dev, "%s unsupported attribute (%d)\n",
|
||||
__func__, attr);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static umode_t ice_hwmon_is_visible(const void *data,
|
||||
enum hwmon_sensor_types type, u32 attr,
|
||||
int channel)
|
||||
{
|
||||
if (type != hwmon_temp)
|
||||
return 0;
|
||||
|
||||
switch (attr) {
|
||||
case hwmon_temp_input:
|
||||
case hwmon_temp_crit:
|
||||
case hwmon_temp_max:
|
||||
case hwmon_temp_emergency:
|
||||
return 0444;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct hwmon_ops ice_hwmon_ops = {
|
||||
.is_visible = ice_hwmon_is_visible,
|
||||
.read = ice_hwmon_read
|
||||
};
|
||||
|
||||
static const struct hwmon_chip_info ice_chip_info = {
|
||||
.ops = &ice_hwmon_ops,
|
||||
.info = ice_hwmon_info
|
||||
};
|
||||
|
||||
static bool ice_is_internal_reading_supported(struct ice_pf *pf)
|
||||
{
|
||||
/* Only the first PF will report temperature for a chip.
|
||||
* Note that internal temp reading is not supported
|
||||
* for older FW (< v4.30).
|
||||
*/
|
||||
if (pf->hw.pf_id)
|
||||
return false;
|
||||
|
||||
unsigned long sensors = pf->hw.dev_caps.supported_sensors;
|
||||
|
||||
return _test_bit(ICE_SENSOR_SUPPORT_E810_INT_TEMP_BIT, &sensors);
|
||||
};
|
||||
|
||||
void ice_hwmon_init(struct ice_pf *pf)
|
||||
{
|
||||
struct device *dev = ice_pf_to_dev(pf);
|
||||
struct device *hdev;
|
||||
|
||||
if (!ice_is_internal_reading_supported(pf))
|
||||
return;
|
||||
|
||||
hdev = hwmon_device_register_with_info(dev, "ice", pf, &ice_chip_info,
|
||||
NULL);
|
||||
if (IS_ERR(hdev)) {
|
||||
dev_warn(dev,
|
||||
"hwmon_device_register_with_info returns error (%ld)",
|
||||
PTR_ERR(hdev));
|
||||
return;
|
||||
}
|
||||
pf->hwmon_dev = hdev;
|
||||
}
|
||||
|
||||
void ice_hwmon_exit(struct ice_pf *pf)
|
||||
{
|
||||
if (!pf->hwmon_dev)
|
||||
return;
|
||||
hwmon_device_unregister(pf->hwmon_dev);
|
||||
}
|
||||
15
drivers/net/ethernet/intel/ice/ice_hwmon.h
Normal file
15
drivers/net/ethernet/intel/ice/ice_hwmon.h
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/* Copyright (C) 2023, Intel Corporation. */
|
||||
|
||||
#ifndef _ICE_HWMON_H_
|
||||
#define _ICE_HWMON_H_
|
||||
|
||||
#ifdef CONFIG_ICE_HWMON
|
||||
void ice_hwmon_init(struct ice_pf *pf);
|
||||
void ice_hwmon_exit(struct ice_pf *pf);
|
||||
#else /* CONFIG_ICE_HWMON */
|
||||
static inline void ice_hwmon_init(struct ice_pf *pf) { }
|
||||
static inline void ice_hwmon_exit(struct ice_pf *pf) { }
|
||||
#endif /* CONFIG_ICE_HWMON */
|
||||
|
||||
#endif /* _ICE_HWMON_H_ */
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
#include "ice_dcb_lib.h"
|
||||
#include "ice_dcb_nl.h"
|
||||
#include "ice_devlink.h"
|
||||
#include "ice_hwmon.h"
|
||||
/* Including ice_trace.h with CREATE_TRACE_POINTS defined will generate the
|
||||
* ice tracepoint functions. This must be done exactly once across the
|
||||
* ice driver.
|
||||
|
|
@ -3150,7 +3151,7 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)
|
|||
|
||||
if (oicr & PFINT_OICR_TSYN_TX_M) {
|
||||
ena_mask &= ~PFINT_OICR_TSYN_TX_M;
|
||||
if (!hw->reset_ongoing && ice_ptp_pf_handles_tx_interrupt(pf))
|
||||
if (ice_ptp_pf_handles_tx_interrupt(pf))
|
||||
set_bit(ICE_MISC_THREAD_TX_TSTAMP, pf->misc_thread);
|
||||
}
|
||||
|
||||
|
|
@ -4687,6 +4688,8 @@ static void ice_init_features(struct ice_pf *pf)
|
|||
|
||||
if (ice_init_lag(pf))
|
||||
dev_warn(dev, "Failed to init link aggregation support\n");
|
||||
|
||||
ice_hwmon_init(pf);
|
||||
}
|
||||
|
||||
static void ice_deinit_features(struct ice_pf *pf)
|
||||
|
|
@ -5212,6 +5215,8 @@ static void ice_remove(struct pci_dev *pdev)
|
|||
ice_free_vfs(pf);
|
||||
}
|
||||
|
||||
ice_hwmon_exit(pf);
|
||||
|
||||
ice_service_task_stop(pf);
|
||||
ice_aq_cancel_waiting_tasks(pf);
|
||||
set_bit(ICE_DOWN, pf->state);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#define E810_OUT_PROP_DELAY_NS 1
|
||||
|
||||
#define UNKNOWN_INCVAL_E822 0x100000000ULL
|
||||
#define UNKNOWN_INCVAL_E82X 0x100000000ULL
|
||||
|
||||
static const struct ptp_pin_desc ice_pin_desc_e810t[] = {
|
||||
/* name idx func chan */
|
||||
|
|
@ -705,7 +705,9 @@ static enum ice_tx_tstamp_work ice_ptp_tx_tstamp_owner(struct ice_pf *pf)
|
|||
|
||||
/* Read the Tx ready status first */
|
||||
err = ice_get_phy_tx_tstamp_ready(&pf->hw, i, &tstamp_ready);
|
||||
if (err || tstamp_ready)
|
||||
if (err)
|
||||
break;
|
||||
else if (tstamp_ready)
|
||||
return ICE_TX_TSTAMP_WORK_PENDING;
|
||||
}
|
||||
|
||||
|
|
@ -875,7 +877,7 @@ ice_ptp_release_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx)
|
|||
}
|
||||
|
||||
/**
|
||||
* ice_ptp_init_tx_e822 - Initialize tracking for Tx timestamps
|
||||
* ice_ptp_init_tx_e82x - Initialize tracking for Tx timestamps
|
||||
* @pf: Board private structure
|
||||
* @tx: the Tx tracking structure to initialize
|
||||
* @port: the port this structure tracks
|
||||
|
|
@ -886,11 +888,11 @@ ice_ptp_release_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx)
|
|||
* registers into chunks based on the port number.
|
||||
*/
|
||||
static int
|
||||
ice_ptp_init_tx_e822(struct ice_pf *pf, struct ice_ptp_tx *tx, u8 port)
|
||||
ice_ptp_init_tx_e82x(struct ice_pf *pf, struct ice_ptp_tx *tx, u8 port)
|
||||
{
|
||||
tx->block = port / ICE_PORTS_PER_QUAD;
|
||||
tx->offset = (port % ICE_PORTS_PER_QUAD) * INDEX_PER_PORT_E822;
|
||||
tx->len = INDEX_PER_PORT_E822;
|
||||
tx->offset = (port % ICE_PORTS_PER_QUAD) * INDEX_PER_PORT_E82X;
|
||||
tx->len = INDEX_PER_PORT_E82X;
|
||||
tx->verify_cached = 0;
|
||||
|
||||
return ice_ptp_alloc_tx_tracker(tx);
|
||||
|
|
@ -1093,10 +1095,10 @@ static u64 ice_base_incval(struct ice_pf *pf)
|
|||
|
||||
if (ice_is_e810(hw))
|
||||
incval = ICE_PTP_NOMINAL_INCVAL_E810;
|
||||
else if (ice_e822_time_ref(hw) < NUM_ICE_TIME_REF_FREQ)
|
||||
incval = ice_e822_nominal_incval(ice_e822_time_ref(hw));
|
||||
else if (ice_e82x_time_ref(hw) < NUM_ICE_TIME_REF_FREQ)
|
||||
incval = ice_e82x_nominal_incval(ice_e82x_time_ref(hw));
|
||||
else
|
||||
incval = UNKNOWN_INCVAL_E822;
|
||||
incval = UNKNOWN_INCVAL_E82X;
|
||||
|
||||
dev_dbg(ice_pf_to_dev(pf), "PTP: using base increment value of 0x%016llx\n",
|
||||
incval);
|
||||
|
|
@ -1125,10 +1127,10 @@ static int ice_ptp_check_tx_fifo(struct ice_ptp_port *port)
|
|||
|
||||
/* need to read FIFO state */
|
||||
if (offs == 0 || offs == 1)
|
||||
err = ice_read_quad_reg_e822(hw, quad, Q_REG_FIFO01_STATUS,
|
||||
err = ice_read_quad_reg_e82x(hw, quad, Q_REG_FIFO01_STATUS,
|
||||
&val);
|
||||
else
|
||||
err = ice_read_quad_reg_e822(hw, quad, Q_REG_FIFO23_STATUS,
|
||||
err = ice_read_quad_reg_e82x(hw, quad, Q_REG_FIFO23_STATUS,
|
||||
&val);
|
||||
|
||||
if (err) {
|
||||
|
|
@ -1156,7 +1158,7 @@ static int ice_ptp_check_tx_fifo(struct ice_ptp_port *port)
|
|||
dev_dbg(ice_pf_to_dev(pf),
|
||||
"Port %d Tx FIFO still not empty; resetting quad %d\n",
|
||||
port->port_num, quad);
|
||||
ice_ptp_reset_ts_memory_quad_e822(hw, quad);
|
||||
ice_ptp_reset_ts_memory_quad_e82x(hw, quad);
|
||||
port->tx_fifo_busy_cnt = FIFO_OK;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1201,8 +1203,8 @@ static void ice_ptp_wait_for_offsets(struct kthread_work *work)
|
|||
|
||||
tx_err = ice_ptp_check_tx_fifo(port);
|
||||
if (!tx_err)
|
||||
tx_err = ice_phy_cfg_tx_offset_e822(hw, port->port_num);
|
||||
rx_err = ice_phy_cfg_rx_offset_e822(hw, port->port_num);
|
||||
tx_err = ice_phy_cfg_tx_offset_e82x(hw, port->port_num);
|
||||
rx_err = ice_phy_cfg_rx_offset_e82x(hw, port->port_num);
|
||||
if (tx_err || rx_err) {
|
||||
/* Tx and/or Rx offset not yet configured, try again later */
|
||||
kthread_queue_delayed_work(pf->ptp.kworker,
|
||||
|
|
@ -1231,7 +1233,7 @@ ice_ptp_port_phy_stop(struct ice_ptp_port *ptp_port)
|
|||
|
||||
kthread_cancel_delayed_work_sync(&ptp_port->ov_work);
|
||||
|
||||
err = ice_stop_phy_timer_e822(hw, port, true);
|
||||
err = ice_stop_phy_timer_e82x(hw, port, true);
|
||||
if (err)
|
||||
dev_err(ice_pf_to_dev(pf), "PTP failed to set PHY port %d down, err %d\n",
|
||||
port, err);
|
||||
|
|
@ -1274,7 +1276,7 @@ ice_ptp_port_phy_restart(struct ice_ptp_port *ptp_port)
|
|||
ptp_port->tx_fifo_busy_cnt = 0;
|
||||
|
||||
/* Start the PHY timer in Vernier mode */
|
||||
err = ice_start_phy_timer_e822(hw, port);
|
||||
err = ice_start_phy_timer_e82x(hw, port);
|
||||
if (err)
|
||||
goto out_unlock;
|
||||
|
||||
|
|
@ -1323,7 +1325,7 @@ void ice_ptp_link_change(struct ice_pf *pf, u8 port, bool linkup)
|
|||
case ICE_PHY_E810:
|
||||
/* Do not reconfigure E810 PHY */
|
||||
return;
|
||||
case ICE_PHY_E822:
|
||||
case ICE_PHY_E82X:
|
||||
ice_ptp_port_phy_restart(ptp_port);
|
||||
return;
|
||||
default:
|
||||
|
|
@ -1349,7 +1351,7 @@ static int ice_ptp_tx_ena_intr(struct ice_pf *pf, bool ena, u32 threshold)
|
|||
ice_ptp_reset_ts_memory(hw);
|
||||
|
||||
for (quad = 0; quad < ICE_MAX_QUAD; quad++) {
|
||||
err = ice_read_quad_reg_e822(hw, quad, Q_REG_TX_MEM_GBL_CFG,
|
||||
err = ice_read_quad_reg_e82x(hw, quad, Q_REG_TX_MEM_GBL_CFG,
|
||||
&val);
|
||||
if (err)
|
||||
break;
|
||||
|
|
@ -1363,7 +1365,7 @@ static int ice_ptp_tx_ena_intr(struct ice_pf *pf, bool ena, u32 threshold)
|
|||
val &= ~Q_REG_TX_MEM_GBL_CFG_INTR_ENA_M;
|
||||
}
|
||||
|
||||
err = ice_write_quad_reg_e822(hw, quad, Q_REG_TX_MEM_GBL_CFG,
|
||||
err = ice_write_quad_reg_e82x(hw, quad, Q_REG_TX_MEM_GBL_CFG,
|
||||
val);
|
||||
if (err)
|
||||
break;
|
||||
|
|
@ -1601,7 +1603,7 @@ static int ice_ptp_cfg_clkout(struct ice_pf *pf, unsigned int chan,
|
|||
if (ice_is_e810(hw))
|
||||
start_time -= E810_OUT_PROP_DELAY_NS;
|
||||
else
|
||||
start_time -= ice_e822_pps_delay(ice_e822_time_ref(hw));
|
||||
start_time -= ice_e82x_pps_delay(ice_e82x_time_ref(hw));
|
||||
|
||||
/* 2. Write TARGET time */
|
||||
wr32(hw, GLTSYN_TGT_L(chan, tmr_idx), lower_32_bits(start_time));
|
||||
|
|
@ -1840,7 +1842,7 @@ ice_ptp_settime64(struct ptp_clock_info *info, const struct timespec64 *ts)
|
|||
ice_ptp_enable_all_clkout(pf);
|
||||
|
||||
/* Recalibrate and re-enable timestamp blocks for E822/E823 */
|
||||
if (hw->phy_model == ICE_PHY_E822)
|
||||
if (hw->phy_model == ICE_PHY_E82X)
|
||||
ice_ptp_restart_all_phy(pf);
|
||||
exit:
|
||||
if (err) {
|
||||
|
|
@ -2440,6 +2442,54 @@ enum ice_tx_tstamp_work ice_ptp_process_ts(struct ice_pf *pf)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* ice_ptp_maybe_trigger_tx_interrupt - Trigger Tx timstamp interrupt
|
||||
* @pf: Board private structure
|
||||
*
|
||||
* The device PHY issues Tx timestamp interrupts to the driver for processing
|
||||
* timestamp data from the PHY. It will not interrupt again until all
|
||||
* current timestamp data is read. In rare circumstances, it is possible that
|
||||
* the driver fails to read all outstanding data.
|
||||
*
|
||||
* To avoid getting permanently stuck, periodically check if the PHY has
|
||||
* outstanding timestamp data. If so, trigger an interrupt from software to
|
||||
* process this data.
|
||||
*/
|
||||
static void ice_ptp_maybe_trigger_tx_interrupt(struct ice_pf *pf)
|
||||
{
|
||||
struct device *dev = ice_pf_to_dev(pf);
|
||||
struct ice_hw *hw = &pf->hw;
|
||||
bool trigger_oicr = false;
|
||||
unsigned int i;
|
||||
|
||||
if (ice_is_e810(hw))
|
||||
return;
|
||||
|
||||
if (!ice_pf_src_tmr_owned(pf))
|
||||
return;
|
||||
|
||||
for (i = 0; i < ICE_MAX_QUAD; i++) {
|
||||
u64 tstamp_ready;
|
||||
int err;
|
||||
|
||||
err = ice_get_phy_tx_tstamp_ready(&pf->hw, i, &tstamp_ready);
|
||||
if (!err && tstamp_ready) {
|
||||
trigger_oicr = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (trigger_oicr) {
|
||||
/* Trigger a software interrupt, to ensure this data
|
||||
* gets processed.
|
||||
*/
|
||||
dev_dbg(dev, "PTP periodic task detected waiting timestamps. Triggering Tx timestamp interrupt now.\n");
|
||||
|
||||
wr32(hw, PFINT_OICR, PFINT_OICR_TSYN_TX_M);
|
||||
ice_flush(hw);
|
||||
}
|
||||
}
|
||||
|
||||
static void ice_ptp_periodic_work(struct kthread_work *work)
|
||||
{
|
||||
struct ice_ptp *ptp = container_of(work, struct ice_ptp, work.work);
|
||||
|
|
@ -2451,6 +2501,8 @@ static void ice_ptp_periodic_work(struct kthread_work *work)
|
|||
|
||||
err = ice_ptp_update_cached_phctime(pf);
|
||||
|
||||
ice_ptp_maybe_trigger_tx_interrupt(pf);
|
||||
|
||||
/* Run twice a second or reschedule if phc update failed */
|
||||
kthread_queue_delayed_work(ptp->kworker, &ptp->work,
|
||||
msecs_to_jiffies(err ? 10 : 500));
|
||||
|
|
@ -2468,12 +2520,10 @@ void ice_ptp_reset(struct ice_pf *pf)
|
|||
int err, itr = 1;
|
||||
u64 time_diff;
|
||||
|
||||
if (test_bit(ICE_PFR_REQ, pf->state))
|
||||
if (test_bit(ICE_PFR_REQ, pf->state) ||
|
||||
!ice_pf_src_tmr_owned(pf))
|
||||
goto pfr;
|
||||
|
||||
if (!ice_pf_src_tmr_owned(pf))
|
||||
goto reset_ts;
|
||||
|
||||
err = ice_ptp_init_phc(hw);
|
||||
if (err)
|
||||
goto err;
|
||||
|
|
@ -2517,10 +2567,6 @@ void ice_ptp_reset(struct ice_pf *pf)
|
|||
goto err;
|
||||
}
|
||||
|
||||
reset_ts:
|
||||
/* Restart the PHY timestamping block */
|
||||
ice_ptp_reset_phy_timestamping(pf);
|
||||
|
||||
pfr:
|
||||
/* Init Tx structures */
|
||||
if (ice_is_e810(&pf->hw)) {
|
||||
|
|
@ -2528,7 +2574,7 @@ void ice_ptp_reset(struct ice_pf *pf)
|
|||
} else {
|
||||
kthread_init_delayed_work(&ptp->port.ov_work,
|
||||
ice_ptp_wait_for_offsets);
|
||||
err = ice_ptp_init_tx_e822(pf, &ptp->port.tx,
|
||||
err = ice_ptp_init_tx_e82x(pf, &ptp->port.tx,
|
||||
ptp->port.port_num);
|
||||
}
|
||||
if (err)
|
||||
|
|
@ -2536,6 +2582,11 @@ void ice_ptp_reset(struct ice_pf *pf)
|
|||
|
||||
set_bit(ICE_FLAG_PTP, pf->flags);
|
||||
|
||||
/* Restart the PHY timestamping block */
|
||||
if (!test_bit(ICE_PFR_REQ, pf->state) &&
|
||||
ice_pf_src_tmr_owned(pf))
|
||||
ice_ptp_restart_all_phy(pf);
|
||||
|
||||
/* Start periodic work going */
|
||||
kthread_queue_delayed_work(ptp->kworker, &ptp->work, 0);
|
||||
|
||||
|
|
@ -2896,11 +2947,11 @@ static int ice_ptp_init_port(struct ice_pf *pf, struct ice_ptp_port *ptp_port)
|
|||
switch (hw->phy_model) {
|
||||
case ICE_PHY_E810:
|
||||
return ice_ptp_init_tx_e810(pf, &ptp_port->tx);
|
||||
case ICE_PHY_E822:
|
||||
case ICE_PHY_E82X:
|
||||
kthread_init_delayed_work(&ptp_port->ov_work,
|
||||
ice_ptp_wait_for_offsets);
|
||||
|
||||
return ice_ptp_init_tx_e822(pf, &ptp_port->tx,
|
||||
return ice_ptp_init_tx_e82x(pf, &ptp_port->tx,
|
||||
ptp_port->port_num);
|
||||
default:
|
||||
return -ENODEV;
|
||||
|
|
@ -2987,7 +3038,7 @@ static void ice_ptp_remove_auxbus_device(struct ice_pf *pf)
|
|||
static void ice_ptp_init_tx_interrupt_mode(struct ice_pf *pf)
|
||||
{
|
||||
switch (pf->hw.phy_model) {
|
||||
case ICE_PHY_E822:
|
||||
case ICE_PHY_E82X:
|
||||
/* E822 based PHY has the clock owner process the interrupt
|
||||
* for all ports.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ struct ice_ptp_tx {
|
|||
|
||||
/* Quad and port information for initializing timestamp blocks */
|
||||
#define INDEX_PER_QUAD 64
|
||||
#define INDEX_PER_PORT_E822 16
|
||||
#define INDEX_PER_PORT_E82X 16
|
||||
#define INDEX_PER_PORT_E810 64
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
*/
|
||||
/* Constants defined for the PTP 1588 clock hardware. */
|
||||
|
||||
/* struct ice_time_ref_info_e822
|
||||
/* struct ice_time_ref_info_e82x
|
||||
*
|
||||
* E822 hardware can use different sources as the reference for the PTP
|
||||
* hardware clock. Each clock has different characteristics such as a slightly
|
||||
* different frequency, etc.
|
||||
*
|
||||
* This lookup table defines several constants that depend on the current time
|
||||
* reference. See the struct ice_time_ref_info_e822 for information about the
|
||||
* reference. See the struct ice_time_ref_info_e82x for information about the
|
||||
* meaning of each constant.
|
||||
*/
|
||||
const struct ice_time_ref_info_e822 e822_time_ref[NUM_ICE_TIME_REF_FREQ] = {
|
||||
const struct ice_time_ref_info_e82x e822_time_ref[NUM_ICE_TIME_REF_FREQ] = {
|
||||
/* ICE_TIME_REF_FREQ_25_000 -> 25 MHz */
|
||||
{
|
||||
/* pll_freq */
|
||||
|
|
@ -81,7 +81,7 @@ const struct ice_time_ref_info_e822 e822_time_ref[NUM_ICE_TIME_REF_FREQ] = {
|
|||
},
|
||||
};
|
||||
|
||||
const struct ice_cgu_pll_params_e822 e822_cgu_params[NUM_ICE_TIME_REF_FREQ] = {
|
||||
const struct ice_cgu_pll_params_e82x e822_cgu_params[NUM_ICE_TIME_REF_FREQ] = {
|
||||
/* ICE_TIME_REF_FREQ_25_000 -> 25 MHz */
|
||||
{
|
||||
/* refclk_pre_div */
|
||||
|
|
@ -155,7 +155,7 @@ const struct ice_cgu_pll_params_e822 e822_cgu_params[NUM_ICE_TIME_REF_FREQ] = {
|
|||
},
|
||||
};
|
||||
|
||||
/* struct ice_vernier_info_e822
|
||||
/* struct ice_vernier_info_e82x
|
||||
*
|
||||
* E822 hardware calibrates the delay of the timestamp indication from the
|
||||
* actual packet transmission or reception during the initialization of the
|
||||
|
|
@ -168,7 +168,7 @@ const struct ice_cgu_pll_params_e822 e822_cgu_params[NUM_ICE_TIME_REF_FREQ] = {
|
|||
* used by this link speed, and that the register should be cleared by writing
|
||||
* 0. Other values specify the clock frequency in Hz.
|
||||
*/
|
||||
const struct ice_vernier_info_e822 e822_vernier[NUM_ICE_PTP_LNK_SPD] = {
|
||||
const struct ice_vernier_info_e82x e822_vernier[NUM_ICE_PTP_LNK_SPD] = {
|
||||
/* ICE_PTP_LNK_SPD_1G */
|
||||
{
|
||||
/* tx_par_clk */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -42,7 +42,7 @@ enum ice_ptp_fec_mode {
|
|||
};
|
||||
|
||||
/**
|
||||
* struct ice_time_ref_info_e822
|
||||
* struct ice_time_ref_info_e82x
|
||||
* @pll_freq: Frequency of PLL that drives timer ticks in Hz
|
||||
* @nominal_incval: increment to generate nanoseconds in GLTSYN_TIME_L
|
||||
* @pps_delay: propagation delay of the PPS output signal
|
||||
|
|
@ -50,14 +50,14 @@ enum ice_ptp_fec_mode {
|
|||
* Characteristic information for the various TIME_REF sources possible in the
|
||||
* E822 devices
|
||||
*/
|
||||
struct ice_time_ref_info_e822 {
|
||||
struct ice_time_ref_info_e82x {
|
||||
u64 pll_freq;
|
||||
u64 nominal_incval;
|
||||
u8 pps_delay;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ice_vernier_info_e822
|
||||
* struct ice_vernier_info_e82x
|
||||
* @tx_par_clk: Frequency used to calculate P_REG_PAR_TX_TUS
|
||||
* @rx_par_clk: Frequency used to calculate P_REG_PAR_RX_TUS
|
||||
* @tx_pcs_clk: Frequency used to calculate P_REG_PCS_TX_TUS
|
||||
|
|
@ -80,7 +80,7 @@ struct ice_time_ref_info_e822 {
|
|||
* different link speeds, either the deskew marker for multi-lane link speeds
|
||||
* or the Reed Solomon gearbox marker for RS-FEC.
|
||||
*/
|
||||
struct ice_vernier_info_e822 {
|
||||
struct ice_vernier_info_e82x {
|
||||
u32 tx_par_clk;
|
||||
u32 rx_par_clk;
|
||||
u32 tx_pcs_clk;
|
||||
|
|
@ -95,7 +95,7 @@ struct ice_vernier_info_e822 {
|
|||
};
|
||||
|
||||
/**
|
||||
* struct ice_cgu_pll_params_e822
|
||||
* struct ice_cgu_pll_params_e82x
|
||||
* @refclk_pre_div: Reference clock pre-divisor
|
||||
* @feedback_div: Feedback divisor
|
||||
* @frac_n_div: Fractional divisor
|
||||
|
|
@ -104,7 +104,7 @@ struct ice_vernier_info_e822 {
|
|||
* Clock Generation Unit parameters used to program the PLL based on the
|
||||
* selected TIME_REF frequency.
|
||||
*/
|
||||
struct ice_cgu_pll_params_e822 {
|
||||
struct ice_cgu_pll_params_e82x {
|
||||
u32 refclk_pre_div;
|
||||
u32 feedback_div;
|
||||
u32 frac_n_div;
|
||||
|
|
@ -124,7 +124,7 @@ enum ice_phy_rclk_pins {
|
|||
};
|
||||
|
||||
#define ICE_E810_RCLK_PINS_NUM (ICE_RCLKB_PIN + 1)
|
||||
#define ICE_E822_RCLK_PINS_NUM (ICE_RCLKA_PIN + 1)
|
||||
#define ICE_E82X_RCLK_PINS_NUM (ICE_RCLKA_PIN + 1)
|
||||
#define E810T_CGU_INPUT_C827(_phy, _pin) ((_phy) * ICE_E810_RCLK_PINS_NUM + \
|
||||
(_pin) + ZL_REF1P)
|
||||
|
||||
|
|
@ -183,16 +183,16 @@ struct ice_cgu_pin_desc {
|
|||
};
|
||||
|
||||
extern const struct
|
||||
ice_cgu_pll_params_e822 e822_cgu_params[NUM_ICE_TIME_REF_FREQ];
|
||||
ice_cgu_pll_params_e82x e822_cgu_params[NUM_ICE_TIME_REF_FREQ];
|
||||
|
||||
#define E810C_QSFP_C827_0_HANDLE 2
|
||||
#define E810C_QSFP_C827_1_HANDLE 3
|
||||
|
||||
/* Table of constants related to possible TIME_REF sources */
|
||||
extern const struct ice_time_ref_info_e822 e822_time_ref[NUM_ICE_TIME_REF_FREQ];
|
||||
extern const struct ice_time_ref_info_e82x e822_time_ref[NUM_ICE_TIME_REF_FREQ];
|
||||
|
||||
/* Table of constants for Vernier calibration on E822 */
|
||||
extern const struct ice_vernier_info_e822 e822_vernier[NUM_ICE_PTP_LNK_SPD];
|
||||
extern const struct ice_vernier_info_e82x e822_vernier[NUM_ICE_PTP_LNK_SPD];
|
||||
|
||||
/* Increment value to generate nanoseconds in the GLTSYN_TIME_L register for
|
||||
* the E810 devices. Based off of a PLL with an 812.5 MHz frequency.
|
||||
|
|
@ -215,23 +215,23 @@ int ice_ptp_init_phc(struct ice_hw *hw);
|
|||
int ice_get_phy_tx_tstamp_ready(struct ice_hw *hw, u8 block, u64 *tstamp_ready);
|
||||
|
||||
/* E822 family functions */
|
||||
int ice_read_quad_reg_e822(struct ice_hw *hw, u8 quad, u16 offset, u32 *val);
|
||||
int ice_write_quad_reg_e822(struct ice_hw *hw, u8 quad, u16 offset, u32 val);
|
||||
void ice_ptp_reset_ts_memory_quad_e822(struct ice_hw *hw, u8 quad);
|
||||
int ice_read_quad_reg_e82x(struct ice_hw *hw, u8 quad, u16 offset, u32 *val);
|
||||
int ice_write_quad_reg_e82x(struct ice_hw *hw, u8 quad, u16 offset, u32 val);
|
||||
void ice_ptp_reset_ts_memory_quad_e82x(struct ice_hw *hw, u8 quad);
|
||||
|
||||
/**
|
||||
* ice_e822_time_ref - Get the current TIME_REF from capabilities
|
||||
* ice_e82x_time_ref - Get the current TIME_REF from capabilities
|
||||
* @hw: pointer to the HW structure
|
||||
*
|
||||
* Returns the current TIME_REF from the capabilities structure.
|
||||
*/
|
||||
static inline enum ice_time_ref_freq ice_e822_time_ref(struct ice_hw *hw)
|
||||
static inline enum ice_time_ref_freq ice_e82x_time_ref(struct ice_hw *hw)
|
||||
{
|
||||
return hw->func_caps.ts_func_info.time_ref;
|
||||
}
|
||||
|
||||
/**
|
||||
* ice_set_e822_time_ref - Set new TIME_REF
|
||||
* ice_set_e82x_time_ref - Set new TIME_REF
|
||||
* @hw: pointer to the HW structure
|
||||
* @time_ref: new TIME_REF to set
|
||||
*
|
||||
|
|
@ -239,31 +239,31 @@ static inline enum ice_time_ref_freq ice_e822_time_ref(struct ice_hw *hw)
|
|||
* change, such as an update to the CGU registers.
|
||||
*/
|
||||
static inline void
|
||||
ice_set_e822_time_ref(struct ice_hw *hw, enum ice_time_ref_freq time_ref)
|
||||
ice_set_e82x_time_ref(struct ice_hw *hw, enum ice_time_ref_freq time_ref)
|
||||
{
|
||||
hw->func_caps.ts_func_info.time_ref = time_ref;
|
||||
}
|
||||
|
||||
static inline u64 ice_e822_pll_freq(enum ice_time_ref_freq time_ref)
|
||||
static inline u64 ice_e82x_pll_freq(enum ice_time_ref_freq time_ref)
|
||||
{
|
||||
return e822_time_ref[time_ref].pll_freq;
|
||||
}
|
||||
|
||||
static inline u64 ice_e822_nominal_incval(enum ice_time_ref_freq time_ref)
|
||||
static inline u64 ice_e82x_nominal_incval(enum ice_time_ref_freq time_ref)
|
||||
{
|
||||
return e822_time_ref[time_ref].nominal_incval;
|
||||
}
|
||||
|
||||
static inline u64 ice_e822_pps_delay(enum ice_time_ref_freq time_ref)
|
||||
static inline u64 ice_e82x_pps_delay(enum ice_time_ref_freq time_ref)
|
||||
{
|
||||
return e822_time_ref[time_ref].pps_delay;
|
||||
}
|
||||
|
||||
/* E822 Vernier calibration functions */
|
||||
int ice_stop_phy_timer_e822(struct ice_hw *hw, u8 port, bool soft_reset);
|
||||
int ice_start_phy_timer_e822(struct ice_hw *hw, u8 port);
|
||||
int ice_phy_cfg_tx_offset_e822(struct ice_hw *hw, u8 port);
|
||||
int ice_phy_cfg_rx_offset_e822(struct ice_hw *hw, u8 port);
|
||||
int ice_stop_phy_timer_e82x(struct ice_hw *hw, u8 port, bool soft_reset);
|
||||
int ice_start_phy_timer_e82x(struct ice_hw *hw, u8 port);
|
||||
int ice_phy_cfg_tx_offset_e82x(struct ice_hw *hw, u8 port);
|
||||
int ice_phy_cfg_rx_offset_e82x(struct ice_hw *hw, u8 port);
|
||||
|
||||
/* E810 family functions */
|
||||
int ice_ptp_init_phy_e810(struct ice_hw *hw);
|
||||
|
|
|
|||
|
|
@ -377,6 +377,8 @@ struct ice_hw_func_caps {
|
|||
struct ice_ts_func_info ts_func_info;
|
||||
};
|
||||
|
||||
#define ICE_SENSOR_SUPPORT_E810_INT_TEMP_BIT 0
|
||||
|
||||
/* Device wide capabilities */
|
||||
struct ice_hw_dev_caps {
|
||||
struct ice_hw_common_caps common_cap;
|
||||
|
|
@ -385,6 +387,11 @@ struct ice_hw_dev_caps {
|
|||
u32 num_flow_director_fltr; /* Number of FD filters available */
|
||||
struct ice_ts_dev_info ts_dev_info;
|
||||
u32 num_funcs;
|
||||
/* bitmap of supported sensors
|
||||
* bit 0 - internal temperature sensor
|
||||
* bit 31:1 - Reserved
|
||||
*/
|
||||
u32 supported_sensors;
|
||||
};
|
||||
|
||||
/* MAC info */
|
||||
|
|
@ -827,7 +834,7 @@ struct ice_mbx_data {
|
|||
enum ice_phy_model {
|
||||
ICE_PHY_UNSUP = -1,
|
||||
ICE_PHY_E810 = 1,
|
||||
ICE_PHY_E822,
|
||||
ICE_PHY_E82X,
|
||||
};
|
||||
|
||||
/* Port hardware description */
|
||||
|
|
@ -910,10 +917,9 @@ struct ice_hw {
|
|||
/* INTRL granularity in 1 us */
|
||||
u8 intrl_gran;
|
||||
|
||||
#define ICE_PHY_PER_NAC_E822 1
|
||||
#define ICE_MAX_QUAD 2
|
||||
#define ICE_QUADS_PER_PHY_E822 2
|
||||
#define ICE_PORTS_PER_PHY_E822 8
|
||||
#define ICE_QUADS_PER_PHY_E82X 2
|
||||
#define ICE_PORTS_PER_PHY_E82X 8
|
||||
#define ICE_PORTS_PER_QUAD 4
|
||||
#define ICE_PORTS_PER_PHY_E810 4
|
||||
#define ICE_NUM_EXTERNAL_PORTS (ICE_MAX_QUAD * ICE_PORTS_PER_QUAD)
|
||||
|
|
|
|||
Loading…
Reference in a new issue