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

Commit 594b6adb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "boot_kpi: Add boot marker for logging boot_kpi in sys node"

parents 973570b7 e7b2e796

drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c

+6 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -25,6 +25,8 @@ 


#include "ipa_qmi_service.h"



#include <soc/qcom/boot_stats.h>



#define IPA_Q6_SVC_VERS 1

#define IPA_A5_SVC_VERS 1

#define Q6_QMI_COMPLETION_TIMEOUT (60*HZ)
@@ -606,6 +608,9 @@ static int ipa3_qmi_init_modem_send_sync_msg(void) 
			&resp_desc, &resp, sizeof(resp),

			QMI_SEND_REQ_TIMEOUT_MS);

	pr_info("QMI_IPA_INIT_MODEM_DRIVER_REQ_V01 response received\n");



	place_marker("M - QMI ready for commands");



	return ipa3_check_qmi_response(rc,

		QMI_IPA_INIT_MODEM_DRIVER_REQ_V01, resp.resp.result,

		resp.resp.error, "ipa_init_modem_driver_resp_msg_v01");

drivers/soc/qcom/peripheral-loader.c

+4 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -44,6 +44,7 @@ 
#include <trace/events/trace_msm_pil_event.h>



#include "peripheral-loader.h"

#include <soc/qcom/boot_stats.h>



#define pil_err(desc, fmt, ...)						\

	dev_err(desc->dev, "%s: " fmt, desc->name, ##__VA_ARGS__)
@@ -724,7 +725,7 @@ static int pil_init_mmap(struct pil_desc *desc, const struct pil_mdt *mdt, 
	if (ret)

		return ret;





	place_marker("M - Modem Image Start Loading");

	pil_info(desc, "loading from %pa to %pa\n", &priv->region_start,

							&priv->region_end);
@@ -1193,6 +1194,7 @@ int pil_boot(struct pil_desc *desc) 
	}

	trace_pil_event("reset_done", desc);

	pil_info(desc, "Brought out of reset\n");

	place_marker("M - Modem out of reset");

	desc->modem_ssr = false;

err_auth_and_reset:

	if (ret && desc->subsys_vmid > 0) {

drivers/usb/gadget/configfs.c

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <function/u_ncm.h>

#endif



#include <soc/qcom/boot_stats.h>



#ifdef CONFIG_USB_CONFIGFS_F_ACC

extern int acc_ctrlrequest(struct usb_composite_dev *cdev,

				const struct usb_ctrlrequest *ctrl);
@@ -1458,6 +1460,7 @@ static void android_work(struct work_struct *data) 
		kobject_uevent_env(&gi->dev->kobj,

					KOBJ_CHANGE, configured);

		pr_info("%s: sent uevent %s\n", __func__, configured[0]);

		place_marker("M - USB enumeration complete");

		uevent_sent = true;

	}