Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f7d351 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss: Add fatal error string in icnss"

parents 33c2abd5 75761038

drivers/soc/qcom/icnss.c

+4 −4
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static int icnss_pd_restart_complete(struct icnss_priv *priv) 


	ret = priv->ops->reinit(&priv->pdev->dev);

	if (ret < 0) {

		icnss_pr_err("Driver reinit failed: %d, state: 0x%lx\n",

		icnss_fatal_err("Driver reinit failed: %d, state: 0x%lx\n",

				ret, priv->state);

		if (!priv->allow_recursive_recovery)

			ICNSS_ASSERT(false);
@@ -1100,7 +1100,7 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv, 
	}



	if (test_bit(ICNSS_PD_RESTART, &priv->state) && event_data->crashed) {

		icnss_pr_err("PD Down while recovery inprogress, crashed: %d, state: 0x%lx\n",

		icnss_fatal_err("PD Down while recovery inprogress, crashed: %d, state: 0x%lx\n",

				event_data->crashed, priv->state);

		if (!priv->allow_recursive_recovery)

			ICNSS_ASSERT(0);

drivers/soc/qcom/icnss_private.h

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ 
#define ICNSS_ASSERT(_condition) do { } while (0)

#endif



#define icnss_fatal_err(_fmt, ...)					\

	icnss_pr_err("fatal: "_fmt, ##__VA_ARGS__)



enum icnss_debug_quirks {

	HW_ALWAYS_ON,

	HW_DEBUG_ENABLE,