CNSA 2.0 PQC adapters carry an external Root of Trust (eRoT) controller that enforces full-image authentication during NVM updates. Detect its presence at init time so later patches can gate firmware update flows.
Primary detection uses the LIBIE_AQC_CAPS_EXTERNAL_PQC_ROT_PRESENT device capability (0x004E) reported by firmware. When running on older firmware that does not advertise the capability at all, fall back to reading the eRoT presence fuse (SR 0x1016 bits[1:0]). The capability ID is reserved in the shared libie adminq.h rather than defined locally in ice, alongside the other LIBIE_AQC_CAPS_* values that ice_parse_common_caps() already switches on. AQ capability IDs are a single firmware-defined numbering space; reserving 0x004E centrally prevents libie from later assigning it to an unrelated capability out from under ice. The result is stored in hw->erot_present and exposed through the ICE_F_EROT feature bit. ice_parse_erot_presence() is called from ice_init_hw() after ice_get_caps() so the device capability field is already populated at detection time. Signed-off-by: Aleksandr Loktionov <[email protected]> Reviewed-by: Przemek Kitszel <[email protected]> --- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_common.c | 7 ++++ drivers/net/ethernet/intel/ice/ice_lib.c | 3 ++ drivers/net/ethernet/intel/ice/ice_nvm.c | 39 +++++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_nvm.h | 5 +++ drivers/net/ethernet/intel/ice/ice_type.h | 5 +++ include/linux/net/intel/libie/adminq.h | 1 + 7 files changed, 61 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h index db3c701..a78fa17 100644 --- a/drivers/net/ethernet/intel/ice/ice.h +++ b/drivers/net/ethernet/intel/ice/ice.h @@ -210,6 +210,7 @@ enum ice_feature { ICE_F_SRIOV_LAG, ICE_F_SRIOV_AA_LAG, ICE_F_MBX_LIMIT, + ICE_F_EROT, ICE_F_MAX }; diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index ef1ce10..1e0936d 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -1031,6 +1031,7 @@ int ice_init_hw(struct ice_hw *hw) if (status) goto err_unroll_cqinit; + ice_parse_erot_presence(hw); if (!hw->port_info) hw->port_info = devm_kzalloc(ice_hw_to_dev(hw), sizeof(*hw->port_info), @@ -2479,6 +2480,12 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, case LIBIE_AQC_CAPS_TX_SCHED_TOPO_COMP_MODE: caps->tx_sched_topo_comp_mode_en = (number == 1); break; + case LIBIE_AQC_CAPS_EXTERNAL_PQC_ROT_PRESENT: + caps->external_pqc_rot_present = (number == 1); + caps->external_pqc_rot_present_cap_advertised = true; + ice_debug(hw, ICE_DBG_INIT, "%s: external_pqc_rot_present = %d\n", + prefix, caps->external_pqc_rot_present); + break; default: /* Not one of the recognized common capabilities */ found = false; diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 9e08db3..ad2b6fb 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -4003,6 +4003,9 @@ void ice_init_feature_support(struct ice_pf *pf) ice_set_feature_support(pf, ICE_F_GCS); ice_set_feature_support(pf, ICE_F_TXTIME); } + + if (pf->hw.erot_present) + ice_set_feature_support(pf, ICE_F_EROT); } /** diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c index 21f3b61..9ae7de2 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -1105,6 +1105,45 @@ static int ice_determine_css_hdr_len(struct ice_hw *hw) return 0; } +/** + * ice_parse_erot_presence - detect eRoT and populate hw->erot_present + * @hw: pointer to the HW struct + * + * Uses the device capability LIBIE_AQC_CAPS_EXTERNAL_PQC_ROT_PRESENT when + * advertised by firmware, falling back to the eRoT Presence fuse only when + * the capability is not advertised at all (older firmware). + * + * Priority: + * 1. Device capability external_pqc_rot_present (advertised && == 1) + * => eRoT present + * 2. Fuse BIT(0) set (only when capability not advertised) + * => eRoT present + * 3. Otherwise => eRoT not present + */ +void ice_parse_erot_presence(struct ice_hw *hw) +{ + u16 fuse = 0; + int err; + + hw->erot_present = false; + + if (hw->dev_caps.common_cap.external_pqc_rot_present) { + hw->erot_present = true; + } else if (!hw->dev_caps.common_cap.external_pqc_rot_present_cap_advertised) { + err = ice_read_sr_word(hw, ICE_SR_EROT_PRESENCE_FUSE, &fuse); + if (err) + dev_warn(ice_hw_to_dev(hw), + "Unable to read eRoT presence fuse (SR 0x%04x), err %d; assuming eRoT not present\n", + ICE_SR_EROT_PRESENCE_FUSE, err); + else if (fuse & ICE_EROT_PRESENCE_FUSE_PRESENT) + hw->erot_present = true; + } + + if (hw->erot_present) + dev_info(ice_hw_to_dev(hw), + "eRoT (external Root of Trust) present\n"); +} + /** * ice_init_nvm - initializes NVM setting * @hw: pointer to the HW struct diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.h b/drivers/net/ethernet/intel/ice/ice_nvm.h index e1d1a11..4b31dfc 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.h +++ b/drivers/net/ethernet/intel/ice/ice_nvm.h @@ -28,7 +28,12 @@ int ice_get_inactive_nvm_ver(struct ice_hw *hw, struct ice_nvm_info *nvm); int ice_get_inactive_netlist_ver(struct ice_hw *hw, struct ice_netlist_info *netlist); int ice_read_pba_string(struct ice_hw *hw, u8 *pba_num, u32 pba_num_size); +/* eRoT Presence fuse SR offset; BIT(0) set means eRoT present */ +#define ICE_SR_EROT_PRESENCE_FUSE 0x1016 +#define ICE_EROT_PRESENCE_FUSE_PRESENT BIT(0) + int ice_init_nvm(struct ice_hw *hw); +void ice_parse_erot_presence(struct ice_hw *hw); int ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data); int ice_aq_update_nvm(struct ice_hw *hw, u16 module_typeid, u32 offset, diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h index d9a5c1a..1375106 100644 --- a/drivers/net/ethernet/intel/ice/ice_type.h +++ b/drivers/net/ethernet/intel/ice/ice_type.h @@ -311,6 +311,9 @@ struct ice_hw_common_caps { /* Post update reset restriction */ bool reset_restrict_support; bool tx_sched_topo_comp_mode_en; + /* eRoT (external Root of Trust) controller present */ + bool external_pqc_rot_present; + bool external_pqc_rot_present_cap_advertised; }; /* IEEE 1588 TIME_SYNC specific info */ @@ -1040,6 +1043,8 @@ struct ice_hw { u8 dvm_ena; u16 io_expander_handle; u8 cgu_part_number; + /* true when eRoT (external Root of Trust) controller is present */ + bool erot_present; }; /* Statistics collected by each port, VSI, VEB, and S-channel */ diff --git a/include/linux/net/intel/libie/adminq.h b/include/linux/net/intel/libie/adminq.h index 839114d..df42f5b 100644 --- a/include/linux/net/intel/libie/adminq.h +++ b/include/linux/net/intel/libie/adminq.h @@ -175,6 +175,7 @@ LIBIE_CHECK_STRUCT_LEN(16, libie_aqc_list_caps); #define LIBIE_AQC_CAPS_PENDING_OROM_VER 0x004B #define LIBIE_AQC_CAPS_NET_VER 0x004C #define LIBIE_AQC_CAPS_PENDING_NET_VER 0x004D +#define LIBIE_AQC_CAPS_EXTERNAL_PQC_ROT_PRESENT 0x004E #define LIBIE_AQC_CAPS_RDMA 0x0051 #define LIBIE_AQC_CAPS_LED 0x0061 #define LIBIE_AQC_CAPS_SDP 0x0062 -- 2.52.0
