pds_core: Fix FW recovery detection
Subsystems (3)
Brett Creeley
maintainerPATCH 1/1 pds_core: Fix FW recovery detection
Commit 523847df1b37 ("pds_core: add devcmd device interfaces") included initial support for FW recovery detection. Unfortunately, the ordering in pdsc_is_fw_good() was incorrect, which was causing FW recovery to be undetected by the driver. Fix this by making sure to update the cached fw_status by calling pdsc_is_fw_running() before setting the local FW gen.
--- drivers/net/ethernet/amd/pds_core/dev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/amd/pds_core/dev.c +8 -2
@@ -68,9 +68,15 @@ bool pdsc_is_fw_running(struct pdsc *pdsc)bool pdsc_is_fw_good (struct pdsc *pdsc) { -u8 gen = pdsc->fw_status &PDS_CORE_FW_STS_F_GENERATION ; +bool fw_running =pdsc_is_fw_running (pdsc); +u8 gen; -return pdsc_is_fw_running (pdsc) && gen == pdsc->fw_generation; +/* Make sure to update the cached fw_status by calling +* pdsc_is_fw_running() before getting the generation +*/ + gen = pdsc->fw_status &PDS_CORE_FW_STS_F_GENERATION ; + +return fw_running && gen == pdsc->fw_generation; }static u8 pdsc_devcmd_status (struct pdsc *pdsc)
Signature · 1 line
2.17.1
Quoted 10 lines · Brett Creeley
Commit
523847df1b37("pds_core: add devcmd device interfaces") included initial support for FW recovery detection. Unfortunately, the ordering inpdsc_is_fw_good()was incorrect, which was causing FW recovery to be undetected by the driver. Fix this by making sure to update the cachedfw_statusby callingpdsc_is_fw_running()before setting the local FW gen.Fixes 523847df1b37 ("pds_core: add devcmd device interfaces")Signed-off-by Shannon Nelson <[email protected]>Signed-off-by Brett Creeley <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Mon, 5 Jun 2023 12:51:16 -0700 you wrote:
Commit
523847df1b37("pds_core: add devcmd device interfaces") included initial support for FW recovery detection. Unfortunately, the ordering inpdsc_is_fw_good()was incorrect, which was causing FW recovery to be undetected by the driver. Fix this by making sure to update the cachedfw_statusby callingpdsc_is_fw_running()before setting the local FW gen.[...]
Here is the summary with links:
- [net] pds_core: Fix FW recovery detection
https://git.kernel.org/netdev/net/c/4f48c30312b7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html