Merge tag 'LA.UM.9.14.r1-23800-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina

"LA.UM.9.14.r1-23800-LAHAINA.QSSI14.0"

* tag 'LA.UM.9.14.r1-23800-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  qcom-dload-mode: Convert reboot notifier to restart notifier
  defconfig: sdxlemur: Enable minidump for sdxlemur
  soc: qcom: Don't print thread info for arm arch
  soc: qcom: dcc_v2: Fix slab-out-of-bounds issue in dcc driver
  rpmsg: slatecom: Discard unaligned packet to read
  soc: qcom: peripheral-loader: Add KPI marker
  input: misc: Validate input pattern count in pattern_s_dbgfs_write
  BACKPORT: media: venus: hfi: fix the check in session buffer requirement
  BACKPORT: media: venus: hfi: add checks to perform sanity on queue pointers
  net: qrtr: smd: kfree svc_arr after use

 Conflicts:
	drivers/devfreq/devfreq.c
	drivers/rpmsg/qcom_glink_slatecom.c
	include/net/tcp.h

Change-Id: If26696f886bf78d4d77e36a7266fabc0ceba7a85
This commit is contained in:
Michael Bestas 2024-02-09 00:36:24 +02:00
commit ca99e36dea
No known key found for this signature in database
GPG key ID: CC95044519BE6669
15 changed files with 4351 additions and 5363 deletions

View file

@ -612,7 +612,7 @@ static bool is_dcc_enabled(struct dcc_drvdata *drvdata)
bool dcc_enable = false;
int list;
for (list = 0; list < DCC_MAX_LINK_LIST; list++) {
for (list = 0; list < drvdata->nr_link_list; list++) {
if (drvdata->enable[list]) {
dcc_enable = true;
break;

View file

@ -656,10 +656,16 @@ static void md_dump_task_info(struct task_struct *task, char *status,
se = &task->se;
if (task == curr) {
#ifdef CONFIG_ARM64
seq_buf_printf(md_runq_seq_buf,
"[status: curr] pid: %d comm: %s preempt: %#x\n",
task_pid_nr(task), task->comm,
task->thread_info.preempt_count);
#else
seq_buf_printf(md_runq_seq_buf,
"[status: curr] pid: %d comm: %s\n",
task_pid_nr(task), task->comm);
#endif
return;
}

View file

@ -383,6 +383,10 @@ static int pil_do_minidump(struct pil_desc *desc, void *ramdump_dev)
pil_err(desc, "%s: Minidump collection failed for subsys %s rc:%d\n",
__func__, desc->name, ret);
#ifdef CONFIG_QGKI_MSM_BOOT_TIME_MARKER
if (!strcmp(desc->name, "modem"))
update_marker("M - Modem Dump completed");
#endif
if (desc->subsys_vmid > 0)
ret = pil_assign_mem_to_subsys(desc, priv->region_start,
(priv->region_end - priv->region_start));