Skip to content

Commit c90977a

Browse files
jacob-kellerJeff Kirsher
authored andcommitted
devlink: promote "fw.bundle_id" to a generic info version
The nfp driver uses ``fw.bundle_id`` to represent a unique identifier of the entire firmware bundle. A future change is going to introduce a similar notion in the ice driver, so promote ``fw.bundle_id`` into a generic version now. Signed-off-by: Jacob Keller <[email protected]> Reviewed-by: Jakub Kicinski <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 1adf7ea commit c90977a

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Documentation/networking/devlink/devlink-info.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,8 @@ fw.roce
9898

9999
RoCE firmware version which is responsible for handling roce
100100
management.
101+
102+
fw.bundle_id
103+
------------
104+
105+
Unique identifier of the entire firmware bundle.

drivers/net/ethernet/netronome/nfp/nfp_devlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ static const struct nfp_devlink_versions {
211211
enum nfp_nsp_versions id;
212212
const char *key;
213213
} nfp_devlink_versions_nsp[] = {
214-
{ NFP_VERSIONS_BUNDLE, "fw.bundle_id", },
214+
{ NFP_VERSIONS_BUNDLE, DEVLINK_INFO_VERSION_GENERIC_FW_BUNDLE_ID, },
215215
{ NFP_VERSIONS_BSP, DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, },
216216
{ NFP_VERSIONS_CPLD, "fw.cpld", },
217217
{ NFP_VERSIONS_APP, DEVLINK_INFO_VERSION_GENERIC_FW_APP, },

include/net/devlink.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,8 @@ enum devlink_param_generic_id {
490490
#define DEVLINK_INFO_VERSION_GENERIC_FW_PSID "fw.psid"
491491
/* RoCE FW version */
492492
#define DEVLINK_INFO_VERSION_GENERIC_FW_ROCE "fw.roce"
493+
/* Firmware bundle identifier */
494+
#define DEVLINK_INFO_VERSION_GENERIC_FW_BUNDLE_ID "fw.bundle_id"
493495

494496
struct devlink_region;
495497
struct devlink_info_req;

0 commit comments

Comments
 (0)