| Message ID | 20210901122301.400339475@linuxfoundation.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
Hi! > >>> The devlink dev info command reports version information about the > >>> device and firmware running on the board. This includes the "board.id" > >>> field which is supposed to represent an identifier of the board design. > >>> The ice driver uses the Product Board Assembly identifier for this. > >>> > >>> In some cases, the PBA is not present in the NVM. If this happens, > >>> devlink dev info will fail with an error. Instead, modify the > >>> ice_info_pba function to just exit without filling in the context > >>> buffer. This will cause the board.id field to be skipped. Log a dev_dbg > >>> message in case someone wants to confirm why board.id is not showing up > >>> for them. > >> > >> Will it cause field to be skipped? I believe buffer will not be > >> initialized which will result in some confusion... > > > > IOW I believe this is good idea. > > It's not necessary, but I agree its not obvious without the full > context. The caller of ice_info_pba memsets the buffer before calling > each info reporter. Its already a known semantics that leaving the > buffer alone will skip the entry. > > See the code below for what we do. > > > memset(ctx->buf, 0, sizeof(ctx->buf)); > > > > err = ice_devlink_versions[i].getter(pf, ctx); > > if (err) { > > NL_SET_ERR_MSG_MOD(extack, "Unable to obtain version info"); > > goto out_free_ctx; > > } That memset is not present in 5.10 I was reviewing. I agree that backporting the memset to 5.10 is better then my patch. > We memset the buffer, call the getter, and if that doesn't modify the > buffer, we call the fallack, and then check again if its still empty. > > Because we memset each time, we don't need to assign *buf = 0. > > I guess its more clear that we're doing the correct thing here, but > these functions are build-for-purpose to use as pointers in this API and > aren't public, so I think it is fine to leave it as is. Yes, code is okay in mainline, but the memset is not present in 5.10-stable. Best regards, Pavel -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c index 511da59bd6f2..f18ce43b7e74 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.c +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c @@ -23,7 +23,9 @@ static int ice_info_pba(struct ice_pf *pf, char *buf, size_t len) status = ice_read_pba_string(hw, (u8 *)buf, len); if (status) - return -EIO; + /* We failed to locate the PBA, so just skip this entry */ + dev_dbg(ice_pf_to_dev(pf), "Failed to read Product Board Assembly string, status %s\n", + ice_stat_str(status)); return 0; }