Skip to content

Commit 56a643a

Browse files
orospPaolo Abeni
authored andcommitted
ice: fix missing SMA pin initialization in DPLL subsystem
The DPLL SMA/U.FL pin redesign introduced ice_dpll_sw_pin_frequency_get() which gates frequency reporting on the pin's active flag. This flag is determined by ice_dpll_sw_pins_update() from the PCA9575 GPIO expander state. Before the redesign, SMA pins were exposed as direct HW input/output pins and ice_dpll_frequency_get() returned the CGU frequency unconditionally — the PCA9575 state was never consulted. The PCA9575 powers on with all outputs high, setting ICE_SMA1_DIR_EN, ICE_SMA1_TX_EN, ICE_SMA2_DIR_EN and ICE_SMA2_TX_EN. Nothing in the driver writes the register during initialization, so ice_dpll_sw_pins_update() sees all pins as inactive and ice_dpll_sw_pin_frequency_get() permanently returns 0 Hz for every SW pin. Fix this by writing a default SMA configuration in ice_dpll_init_info_sw_pins(): clear all SMA bits, then set SMA1 and SMA2 as active inputs (DIR_EN=0) with U.FL1 output and U.FL2 input disabled. Each SMA/U.FL pair shares a physical signal path so only one pin per pair can be active at a time. U.FL pins still report frequency 0 after this fix: U.FL1 (output-only) is disabled by ICE_SMA1_TX_EN which keeps the TX output buffer off, and U.FL2 (input-only) is disabled by ICE_SMA2_UFL2_RX_DIS. They can be activated by changing the corresponding SMA pin direction via dpll netlink. Fixes: 2dd5d03 ("ice: redesign dpll sma/u.fl pins control") Signed-off-by: Petr Oros <poros@redhat.com> Reviewed-by: Ivan Vecera <ivecera@redhat.com> Reviewed-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com> Tested-by: Alexander Nowlin <alexander.nowlin@intel.com> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Link: https://patch.msgid.link/20260427-jk-iwl-net-petr-oros-fixes-v1-7-cdcb48303fd8@intel.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 70ad216 commit 56a643a

1 file changed

Lines changed: 17 additions & 0 deletions

File tree

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4014,6 +4014,7 @@ static int ice_dpll_init_info_sw_pins(struct ice_pf *pf)
40144014
struct ice_dpll_pin *pin;
40154015
u32 phase_adj_max, caps;
40164016
int i, ret;
4017+
u8 data;
40174018

40184019
if (pf->hw.device_id == ICE_DEV_ID_E810C_QSFP)
40194020
input_idx_offset = ICE_E810_RCLK_PINS_NUM;
@@ -4073,6 +4074,22 @@ static int ice_dpll_init_info_sw_pins(struct ice_pf *pf)
40734074
}
40744075
ice_dpll_phase_range_set(&pin->prop.phase_range, phase_adj_max);
40754076
}
4077+
4078+
/* Initialize the SMA control register to a known-good default state.
4079+
* Without this write the PCA9575 GPIO expander retains its power-on
4080+
* default (all outputs high) which makes all SW pins appear inactive.
4081+
* Set SMA1 and SMA2 as active inputs, disable U.FL1 output and
4082+
* U.FL2 input.
4083+
*/
4084+
ret = ice_read_sma_ctrl(&pf->hw, &data);
4085+
if (ret)
4086+
return ret;
4087+
data &= ~ICE_ALL_SMA_MASK;
4088+
data |= ICE_SMA1_TX_EN | ICE_SMA2_TX_EN | ICE_SMA2_UFL2_RX_DIS;
4089+
ret = ice_write_sma_ctrl(&pf->hw, data);
4090+
if (ret)
4091+
return ret;
4092+
40764093
ret = ice_dpll_pin_state_update(pf, pin, ICE_DPLL_PIN_TYPE_SOFTWARE,
40774094
NULL);
40784095
if (ret)

0 commit comments

Comments
 (0)