Merge "esoc: Check for modem status LOW prior to error handling" (533df46e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/esoc/esoc-mdm-4x.c

+24 −25

Original line number	Diff line number	Diff line
		@@ -389,11 +389,32 @@ static void mdm_get_restart_reason(struct work_struct *work)
		mdm->get_restart_reason = false;
		}

		static void mdm_notify(enum esoc_notify notify, struct esoc_clink *esoc)
		void mdm_wait_for_status_low(struct mdm_ctrl *mdm)
		{
		bool status_down;
		uint64_t timeout;
		uint64_t now;

		esoc_mdm_log("Waiting for MDM2AP_STATUS to go LOW\n");
		timeout = local_clock();
		do_div(timeout, NSEC_PER_MSEC);
		timeout += MDM_MODEM_TIMEOUT;
		do {
		if (gpio_get_value(MDM_GPIO(mdm, MDM2AP_STATUS)) == 0) {
		esoc_mdm_log("MDM2AP_STATUS went LOW\n");
		return;
		}
		now = local_clock();
		do_div(now, NSEC_PER_MSEC);
		} while (!time_after64(now, timeout));

		esoc_mdm_log("MDM2AP_STATUS didn't go LOW. Warm-resetting modem\n");
		dev_err(mdm->dev, "MDM2AP status did not go low\n");

		mdm_toggle_soft_reset(mdm, true);
		}

		static void mdm_notify(enum esoc_notify notify, struct esoc_clink *esoc)
		{
		struct mdm_ctrl *mdm = get_esoc_clink_data(esoc);
		struct device *dev = mdm->dev;

		@@ -449,35 +470,13 @@ static void mdm_notify(enum esoc_notify notify, struct esoc_clink *esoc)
		break;
		case ESOC_PRIMARY_CRASH:
		mdm_disable_irqs(mdm);
		status_down = false;
		dev_dbg(dev, "signal apq err fatal for graceful restart\n");
		esoc_mdm_log(
		"ESOC_PRIMARY_CRASH: Setting AP2MDM_ERRFATAL = 1\n");
		gpio_set_value(MDM_GPIO(mdm, AP2MDM_ERRFATAL), 1);
		if (esoc->primary)
		break;
		esoc_mdm_log(
		"ESOC_PRIMARY_CRASH: Waiting for MDM2AP_STATUS to go LOW\n");
		timeout = local_clock();
		do_div(timeout, NSEC_PER_MSEC);
		timeout += MDM_MODEM_TIMEOUT;
		do {
		if (gpio_get_value(MDM_GPIO(mdm,
		MDM2AP_STATUS)) == 0) {
		status_down = true;
		break;
		}
		now = local_clock();
		do_div(now, NSEC_PER_MSEC);
		} while (!time_after64(now, timeout));

		if (!status_down) {
		esoc_mdm_log(
		"ESOC_PRIMARY_CRASH: MDM2AP_STATUS didn't go LOW. Resetting modem\n");
		dev_err(mdm->dev, "%s MDM2AP status did not go low\n",
		__func__);
		mdm_toggle_soft_reset(mdm, true);
		}
		mdm_wait_for_status_low(mdm);
		break;
		case ESOC_PRIMARY_REBOOT:
		mdm_disable_irqs(mdm);

drivers/esoc/esoc-mdm-drv.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ static void mdm_handle_clink_evt(enum esoc_evt evt,
		struct esoc_eng *eng)
		{
		struct mdm_drv *mdm_drv = to_mdm_drv(eng);
		struct mdm_ctrl *mdm;
		bool unexpected_state = false;

		switch (evt) {
		@@ -130,6 +131,8 @@ static void mdm_handle_clink_evt(enum esoc_evt evt,
		if (mdm_drv->mode == CRASH \|\| mdm_drv->mode != RUN)
		return;
		mdm_drv->mode = CRASH;
		mdm = get_esoc_clink_data(mdm_drv->esoc_clink);
		mdm_wait_for_status_low(mdm);
		esoc_mdm_log("Starting SSR work\n");
		queue_work(mdm_drv->mdm_queue, &mdm_drv->ssr_work);
		break;

drivers/esoc/esoc-mdm.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ struct mdm_ops {
		};

		void mdm_disable_irqs(struct mdm_ctrl *mdm);
		void mdm_wait_for_status_low(struct mdm_ctrl *mdm);

		static inline int mdm_toggle_soft_reset(struct mdm_ctrl *mdm, bool atomic)
		{