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

Unverified Commit 282bf6f2 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-22400-LAHAINA.QSSI13.0' of... 

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

"LA.UM.9.14.r1-22400-LAHAINA.QSSI13.0"

* tag 'LA.UM.9.14.r1-22400-LAHAINA.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  virt: haven: Correct max_buf_size for a connection
  mtd: msm_qpic_nand: Add runtime status check in notifiers
  defconfig: sdxlemur: Enable binder configs
  BACKPORT: FROMLIST: mm: protect free_pgtables with mmap_lock write lock in exit_mmap
  PCI: Configure RC MPS to 128 for Realtek 8168 attach
  bus: mhi: misc: Add check for dev_rp if it is iommu range or not
  drivers: qcom: pil: Use update_marker for modem book kpi
  soc: qcom: add buffer overflow check on AON rx_buffer
  msm: kgsl: Defer drawobj_sync_timeline_fence_work() to a workqueue
  memshare: Avoid accessing uninitialized nodes
  ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
  soc: qcom: socinfo: Add soc information for Blair APQ
  soc: qcom: minidump: check the size parameter passed to qcom_smem_get()
  drivers: qcom: pil: Add KPI boot markers for modem
  usb: gadget: cdev: Fix spinlock recursion
  defconfig: sdxlemur: Realtek r8168 IOSS glue driver config

 Conflicts:
	arch/arm64/boot/dts/vendor/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
	drivers/clk/qcom/gcc-qcs404.c

Change-Id: Ied2b86eda79d66e747ce5f4b7a3c83c3328edd2b
parents 06c447ba dd14ff27

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.233_4716ccc31d55
 
LTS_5.4.242_e699d543bbc9

android/abi_gki_aarch64_d72fdcc7094f.xml→android/abi_gki_aarch64_e699d543bbc9.xml

+5841 −4197

File changed and moved.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+1 −0
Original line number Diff line number Diff line
@@ -2561,6 +2561,7 @@ 
  ufshcd_remove

  ufshcd_uic_hibern8_enter

  ufshcd_uic_hibern8_exit

  uhid_hid_driver

  __uio_register_device

  uhid_hid_driver

  uio_unregister_device

arch/arm/configs/vendor/sdxlemur.config

+5 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ CONFIG_AQFWD_IOSS=m 
CONFIG_R8125=y

CONFIG_R8125_IOSS=m

CONFIG_R8168=y

CONFIG_R8168_IOSS=m

CONFIG_QCOM_SHOW_RESUME_IRQ=y

CONFIG_HARDENED_USERCOPY=y

# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
@@ -505,3 +506,7 @@ CONFIG_DM_VERITY=y 
# CONFIG_DEVMEM is not set

CONFIG_DAX=y

CONFIG_LSM_MMAP_MIN_ADDR=32768

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"

# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set

drivers/bus/mhi/core/mhi_internal.h

+6 −0
Original line number Diff line number Diff line
@@ -809,6 +809,12 @@ static inline void mhi_trigger_resume(struct mhi_controller *mhi_cntrl) 
	pm_wakeup_hard_event(&mhi_cntrl->mhi_dev->dev);

}



static inline bool is_valid_ring_ptr(struct mhi_ring *ring, dma_addr_t addr)

{

	return ((addr >= ring->iommu_base &&

		addr < ring->iommu_base + ring->len) && (addr % 16 == 0));

}



/* queue transfer buffer */

int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,

		void *buf, void *cb, size_t buf_len, enum MHI_FLAGS flags);