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

Unverified Commit 0013ddf5 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0' of... 

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

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

* tag 'LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  coresight: Fix duplicate and abnormal stop issues of PCIE sw path
  nl80211: fix beacon tx rate mask validation
  msm_ipa: Add flag to enable ipv6 option header
  soc:qcom: trivial fix
  soc: qcom: socinfo: Add sku sysfs support
  soc: qcom: socinfo: Add revision 16 support in socinfo structure
  mtd: msm_qpic_nand: Add mutex lock in system suspend/resume functions

 Conflicts:
	drivers/firmware/qcom_scm.c
	drivers/md/dm-verity-target.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/debugfs.c
	drivers/usb/gadget/function/f_fs.c

Change-Id: If237dbcd440d72c0a56ed7ca57f1d55a777973a5
parents ffe9ce5b bde5bed6

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.242_e699d543bbc9
 
LTS_5.4.254_91f702572a80

drivers/firmware/qcom_scm.c

+1 −0
Original line number Diff line number Diff line
@@ -1229,6 +1229,7 @@ static void qcom_scm_shutdown(struct platform_device *pdev) 
{

	qcom_scm_disable_sdi();

	qcom_scm_halt_spmi_pmic_arbiter();

	qcom_scm_set_download_mode(QCOM_DOWNLOAD_NODUMP, 0);

}



static const struct of_device_id qcom_scm_dt_match[] = {

drivers/hwtracing/coresight/coresight-byte-cntr.c

+2 −2
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ static void etr_pcie_write_work_fn(struct work_struct *work) 
		req->snd_cmpl = 1;



		bytes_to_write = mhi_dev_write_channel(req);

		if (bytes_to_write != PCIE_BLK_SIZE) {

		if (bytes_to_write != actual) {

			dev_err(&tmcdrvdata->csdev->dev, "Write error %d\n",

							bytes_to_write);
@@ -795,7 +795,7 @@ static void etr_pcie_write_work_fn(struct work_struct *work) 
		}



		mutex_lock(&byte_cntr_data->byte_cntr_lock);

		if (byte_cntr_data->offset + actual >= tmcdrvdata->size)

		if (byte_cntr_data->offset + actual >= tmcdrvdata->sysfs_buf->size)

			byte_cntr_data->offset = 0;

		else

			byte_cntr_data->offset += actual;

drivers/hwtracing/coresight/coresight-tmc-etr.c

+2 −1
Original line number Diff line number Diff line
@@ -1172,6 +1172,7 @@ static void __tmc_etr_disable_hw(struct tmc_drvdata *drvdata) 
{

	CS_UNLOCK(drvdata->base);



	if (drvdata->out_mode != TMC_ETR_OUT_MODE_PCIE)

		tmc_flush_and_stop(drvdata);

	/*

	 * When operating in sysFS mode the content of the buffer needs to be