Commit b86455a1 authored by Arkadiusz Kubalewski's avatar Arkadiusz Kubalewski Committed by Paolo Abeni
Browse files

ice: add CGU info to devlink info callback 



If Clock Generation Unit is present on NIC board user shall know its
details.
Provide the devlink info callback with a new:
- fixed type object (cgu.id) indicating hardware variant of onboard CGU,
- running type object (fw.cgu) consisting of CGU id, config and firmware
versions.
These information shall be known for debugging purposes.

Test (on NIC board with CGU)
$ devlink dev info <bus_name>/<dev_name> | grep cgu
        cgu.id 36
        fw.cgu 8032.16973825.6021

Test (on NIC board without CGU)
$ devlink dev info <bus_name>/<dev_name> | grep cgu -c
0

Reviewed-by: default avatarLarysa Zaremba <larysa.zaremba@intel.com>
Signed-off-by: default avatarArkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 4da71a77

Documentation/networking/devlink/ice.rst

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

============

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

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

};



/**