From 0c8a010b06f4fa46aca25ac453ca2fff3ca450d9 Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Fri, 16 Oct 2020 12:39:22 -0700 Subject: [PATCH] qcacld-3.0: Add if check before calling cds_force_assert_target() If CNSS function pld_force_collect_target_dump() returns 0, this means that FW is already asserted and should not call cds_force_assert_target(). Add an if check for pld_force_collect_target_dump() to only call cds_force_assert_target() when it is not 0. Change-Id: Ib784c1a406b93327942164a975994065149aed90 CRs-Fixed: 2799461 --- core/cds/src/cds_api.c | 3 ++- core/pld/src/pld_pcie.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 6e0c58b889b5..2b237aa10c2b 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1947,7 +1947,8 @@ static void cds_trigger_recovery_handler(const char *func, const uint32_t line) cds_set_recovery_in_progress(true); cds_set_assert_target_in_progress(true); - cds_force_assert_target(qdf); + if (pld_collect_rddm(qdf->dev)) + cds_force_assert_target(qdf); cds_set_assert_target_in_progress(false); /* diff --git a/core/pld/src/pld_pcie.h b/core/pld/src/pld_pcie.h index 0b20a683ea59..f03703f10a72 100644 --- a/core/pld/src/pld_pcie.h +++ b/core/pld/src/pld_pcie.h @@ -625,7 +625,7 @@ static inline int pld_pcie_idle_shutdown(struct device *dev) static inline int pld_pcie_force_assert_target(struct device *dev) { - return cnss_force_collect_rddm(dev); + return cnss_force_fw_assert(dev); } static inline int pld_pcie_get_user_msi_assignment(struct device *dev,