summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Lemon <jonathan.lemon@gmail.com>2021-08-05 12:52:48 -0700
committerDavid S. Miller <davem@davemloft.net>2021-08-06 10:41:27 +0100
commit8ef8ccbc69677e663925f3e758b077d1ad3cd836 (patch)
treefedc93fb542448d0d19b74306a343da52c04ab8c
parent1a052da92924413d8fab15ccf293f886148e8fc9 (diff)
ptp: ocp: Remove pending_image indicator from devlink
After writing an image blob to the flash memory, a reboot is required to reload the FPGA. There is no versioning prsent in the FPGA image file, so only a running version is available. The 'stored version' was set to 'pending' in order to indicate a reboot was needed. This isn't reliable, as the module could be unloaded/loaded, losing the "reboot needed" indicator. Also, the devlink 'stored version' information is designed to refer to the actual image version. Unfortunately, there is no method to determine the flash image version other than booting it, so remove the devlink stored version setting. Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/ptp/ptp_ocp.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 1412015fd261..6b9c14586987 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -171,7 +171,6 @@ struct ptp_ocp {
u8 serial[6];
int flash_start;
bool has_serial;
- bool pending_image;
};
struct ocp_resource {
@@ -836,8 +835,6 @@ ptp_ocp_devlink_flash_update(struct devlink *devlink,
msg = err ? "Flash error" : "Flash complete";
devlink_flash_update_status_notify(devlink, msg, NULL, 0, 0);
- bp->pending_image = true;
-
put_device(dev);
return err;
}
@@ -854,13 +851,6 @@ ptp_ocp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
if (err)
return err;
- if (bp->pending_image) {
- err = devlink_info_version_stored_put(req,
- "timecard", "pending");
- if (err)
- return err;
- }
-
if (bp->image) {
u32 ver = ioread32(&bp->image->version);