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

Commit bffcbfe5 authored by Mohammed Siddiq's avatar Mohammed Siddiq
Browse files

icnss2: Add hang event code to icnss2 driver 



Add hang event code to icnss2 driver.

Change-Id: Icc553536ae9ae1e7cb4b64374b1eebd9fd8ef005
Signed-off-by: default avatarMohammed Siddiq <msiddiq@codeaurora.org>
parent 39cb43ef

drivers/soc/qcom/icnss2/main.c

+52 −7
Original line number Diff line number Diff line
@@ -1140,6 +1140,46 @@ static int icnss_fw_crashed(struct icnss_priv *priv, 
	return 0;

}



int icnss_update_hang_event_data(struct icnss_priv *priv,

				 struct icnss_uevent_hang_data *hang_data)

{

	if (!priv->hang_event_data_va)

		return -EINVAL;



	priv->hang_event_data = kmemdup(priv->hang_event_data_va,

					priv->hang_event_data_len,

					GFP_ATOMIC);

	if (!priv->hang_event_data)

		return -ENOMEM;



	// Update the hang event params

	hang_data->hang_event_data = priv->hang_event_data;

	hang_data->hang_event_data_len = priv->hang_event_data_len;



	return 0;

}



int icnss_send_hang_event_data(struct icnss_priv *priv)

{

	struct icnss_uevent_hang_data hang_data = {0};

	int ret = 0xFF;



	if (priv->early_crash_ind) {

		ret = icnss_update_hang_event_data(priv, &hang_data);

		if (ret)

			icnss_pr_err("Unable to allocate memory for Hang event data\n");

	}

	icnss_call_driver_uevent(priv, ICNSS_UEVENT_HANG_DATA,

				 &hang_data);



	if (!ret) {

		kfree(priv->hang_event_data);

		priv->hang_event_data = NULL;

	}



	return 0;

}



static int icnss_driver_event_pd_service_down(struct icnss_priv *priv,

					      void *data)

{
@@ -1153,6 +1193,9 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv, 
	if (priv->force_err_fatal)

		ICNSS_ASSERT(0);



	if (priv->device_id == ADRASTEA_DEVICE_ID)

		icnss_send_hang_event_data(priv);



	if (priv->early_crash_ind) {

		icnss_pr_dbg("PD Down ignored as early indication is processed: %d, state: 0x%lx\n",

			     event_data->crashed, priv->state);
@@ -1458,7 +1501,7 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb, 
	struct notif_data *notif = data;

	struct icnss_priv *priv = container_of(nb, struct icnss_priv,

					       modem_ssr_nb);

	struct icnss_uevent_fw_down_data fw_down_data;

	struct icnss_uevent_fw_down_data fw_down_data = {0};



	icnss_pr_vdbg("Modem-Notify: event %lu\n", code);
@@ -1479,11 +1522,12 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb, 
		set_bit(ICNSS_FW_DOWN, &priv->state);

		icnss_ignore_fw_timeout(true);



		if (test_bit(ICNSS_FW_READY, &priv->state)) {

			fw_down_data.crashed = !!notif->crashed;

		if (test_bit(ICNSS_FW_READY, &priv->state))

			icnss_call_driver_uevent(priv,

						 ICNSS_UEVENT_FW_DOWN,

						 &fw_down_data);

		}

		return NOTIFY_OK;

	}
@@ -1507,11 +1551,12 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb, 
	event_data->crashed = notif->crashed;



	fw_down_data.crashed = !!notif->crashed;

	if (test_bit(ICNSS_FW_READY, &priv->state))

	if (test_bit(ICNSS_FW_READY, &priv->state)) {

		fw_down_data.crashed = !!notif->crashed;

		icnss_call_driver_uevent(priv,

					 ICNSS_UEVENT_FW_DOWN,

					 &fw_down_data);



	}

	icnss_driver_event_post(priv, ICNSS_DRIVER_EVENT_PD_SERVICE_DOWN,

				ICNSS_EVENT_SYNC, event_data);
@@ -1575,7 +1620,7 @@ static int icnss_service_notifier_notify(struct notifier_block *nb, 
					       service_notifier_nb);

	enum pd_subsys_state *state = data;

	struct icnss_event_pd_service_down_data *event_data;

	struct icnss_uevent_fw_down_data fw_down_data;

	struct icnss_uevent_fw_down_data fw_down_data = {0};

	enum icnss_pdr_cause_index cause = ICNSS_ROOT_PD_CRASH;



	icnss_pr_dbg("PD service notification: 0x%lx state: 0x%lx\n",
@@ -1628,8 +1673,8 @@ static int icnss_service_notifier_notify(struct notifier_block *nb, 
		set_bit(ICNSS_FW_DOWN, &priv->state);

		icnss_ignore_fw_timeout(true);



		fw_down_data.crashed = event_data->crashed;

		if (test_bit(ICNSS_FW_READY, &priv->state))

			fw_down_data.crashed = event_data->crashed;

			icnss_call_driver_uevent(priv,

						 ICNSS_UEVENT_FW_DOWN,

						 &fw_down_data);

drivers/soc/qcom/icnss2/main.h

+5 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ struct icnss_stats { 
#define WLFW_MAX_NUM_CE 12

#define WLFW_MAX_NUM_SVC 24

#define WLFW_MAX_NUM_SHADOW_REG 24

#define WLFW_MAX_HANG_EVENT_DATA_SIZE 400



struct service_notifier_context {

	void *handle;
@@ -374,6 +375,10 @@ struct icnss_priv { 
	struct thermal_cooling_device *tcdev;

	unsigned long curr_thermal_state;

	unsigned long max_thermal_state;

	phys_addr_t hang_event_data_pa;

	void __iomem *hang_event_data_va;

	uint16_t hang_event_data_len;

	void *hang_event_data;

};



struct icnss_reg_info {

drivers/soc/qcom/icnss2/qmi.c

+59 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/thread_info.h>

#include <linux/firmware.h>

#include <linux/soc/qcom/qmi.h>

#include <linux/platform_device.h>

#include <soc/qcom/icnss2.h>

#include <soc/qcom/service-locator.h>

#include <soc/qcom/service-notifier.h>
@@ -1460,7 +1461,7 @@ int wlfw_dynamic_feature_mask_send_sync_msg(struct icnss_priv *priv, 
void icnss_handle_rejuvenate(struct icnss_priv *priv)

{

	struct icnss_event_pd_service_down_data *event_data;

	struct icnss_uevent_fw_down_data fw_down_data;

	struct icnss_uevent_fw_down_data fw_down_data = {0};



	event_data = kzalloc(sizeof(*event_data), GFP_KERNEL);

	if (event_data == NULL)
@@ -1574,6 +1575,10 @@ static void msa_ready_ind_cb(struct qmi_handle *qmi, struct sockaddr_qrtr *sq, 
			     struct qmi_txn *txn, const void *data)

{

	struct icnss_priv *priv = container_of(qmi, struct icnss_priv, qmi);

	struct device *dev = &priv->pdev->dev;

	const struct wlfw_msa_ready_ind_msg_v01 *ind_msg = data;

	uint64_t msa_base_addr = priv->msa_pa;

	phys_addr_t hang_data_phy_addr;



	icnss_pr_dbg("Received MSA Ready Indication\n");
@@ -1583,6 +1588,59 @@ static void msa_ready_ind_cb(struct qmi_handle *qmi, struct sockaddr_qrtr *sq, 
	}



	priv->stats.msa_ready_ind++;



	/* Check if the length is valid &

	 * the length should not be 0 and

	 * should be <=  WLFW_MAX_HANG_EVENT_DATA_SIZE(400)

	 */



	if (ind_msg->hang_data_length_valid &&

	    ind_msg->hang_data_length &&

	    ind_msg->hang_data_length <= WLFW_MAX_HANG_EVENT_DATA_SIZE)

		priv->hang_event_data_len = ind_msg->hang_data_length;

	else

		goto out;



	/* Check if the offset is valid &

	 * the offset should be in range of 0 to msa_mem_size-hang_data_length

	 */



	if (ind_msg->hang_data_addr_offset_valid &&

	    (ind_msg->hang_data_addr_offset <= (priv->msa_mem_size -

						 ind_msg->hang_data_length)))

		hang_data_phy_addr = msa_base_addr +

						ind_msg->hang_data_addr_offset;

	else

		goto out;



	if (priv->hang_event_data_pa == hang_data_phy_addr)

		goto exit;



	priv->hang_event_data_pa = hang_data_phy_addr;

	priv->hang_event_data_va = devm_ioremap(dev, priv->hang_event_data_pa,

						ind_msg->hang_data_length);



	if (!priv->hang_event_data_va) {

		icnss_pr_err("Hang Data ioremap failed: phy addr: %pa\n",

			     &priv->hang_event_data_pa);

		goto fail;

	}

exit:

	icnss_pr_dbg("Hang Event Data details,Offset:0x%x, Length:0x%x,va_addr: 0x%pK\n",

		     ind_msg->hang_data_addr_offset,

		     ind_msg->hang_data_length,

		     priv->hang_event_data_va);



	return;



out:

	icnss_pr_err("Invalid Hang Data details, Offset:0x%x, Length:0x%x",

		     ind_msg->hang_data_addr_offset,

		     ind_msg->hang_data_length);

fail:

	priv->hang_event_data_va = NULL;

	priv->hang_event_data_pa = 0;

	priv->hang_event_data_len = 0;

}



static void pin_connect_result_ind_cb(struct qmi_handle *qmi,

include/soc/qcom/icnss2.h

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
enum icnss_uevent {

	ICNSS_UEVENT_FW_CRASHED,

	ICNSS_UEVENT_FW_DOWN,

	ICNSS_UEVENT_HANG_DATA,

};



struct icnss_uevent_hang_data {

	void *hang_event_data;

	uint16_t hang_event_data_len;

};



struct icnss_uevent_fw_down_data {