A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-05 19:31:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'sm8350/lineage-20' into lineage-23.0

Browse source 
* sm8350/lineage-20:
  UPSTREAM: soc: qcom: mdt_loader: Deal with zero e_shentsize
  msm: mhi_dev: Avoid BME check while sending ready
  FROMGIT: media: venus: hfi: add a check to handle OOB in sfr region
  FROMGIT: media: venus: hfi: add check to handle incorrect queue size
  FROMGIT: media: venus: hfi_parser: refactor hfi packet parsing logic
  FROMGIT: media: venus: hfi_parser: add check to avoid out of bound access
  defconfig: Enable RTL8152 ETH-USB driver
  msm: Add Kconfig for RTL8152 driver
  defconfig: Disable upstream RTL8152 ETH-USB driver
  qseecom: Remove virtual address print

Change-Id: Icb29cc481bb2405b2a803fc4ccc089e73b06ccc4
This commit is contained in:
Michael Bestas 2025-11-08 16:39:40 +02:00
commit e2d3707e62
No known key found for this signature in database
9 changed files with 44781 additions and 44778 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/GKI_VERSION
View file

@ -1 +1 @@
LTS_5.4.281_d62984adb112
LTS_5.4.289_4c8fb3275889

89524
android/abi_gki_aarch64_7453ecf4d1fe.xml → android/abi_gki_aarch64_4c8fb3275889.xml
View file

File diff suppressed because it is too large Load diff

2
arch/arm/configs/vendor/sdxlemur.config vendored
View file

@ -250,7 +250,7 @@ CONFIG_USB_CONFIGFS_F_UAC2=y
CONFIG_USB_CONFIGFS_F_CCID=y
CONFIG_USB_G_QTI=y
CONFIG_USB_BAM=y
CONFIG_USB_RTL8152=y
CONFIG_USB_R8152_RTL=m
CONFIG_USB_NET_SMSC75XX=y
CONFIG_USB_NET_SMSC95XX=y
CONFIG_ARM_PSCI=y

6
drivers/misc/qseecom.c
View file

@ -3,7 +3,7 @@
* QTI Secure Execution Environment Communicator (QSEECOM) driver
*
* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#define pr_fmt(fmt) "QSEECOM: %s: " fmt, __func__
@ -2066,8 +2066,8 @@ static int qseecom_set_client_mem_param(struct qseecom_dev_handle *data,
if ((req.ifd_data_fd <= 0) || (req.virt_sb_base == NULL) ||
(req.sb_len == 0)) {
pr_err("Invalid input(s)ion_fd(%d), sb_len(%d), vaddr(0x%pK)\n",
req.ifd_data_fd, req.sb_len, req.virt_sb_base);
pr_err("Invalid input(s)ion_fd(%d), sb_len(%d), paddr: 0x%llx\n",
req.ifd_data_fd, req.sb_len, virt_to_phys(req.virt_sb_base));
return -EFAULT;
}
if (!access_ok((void __user *)req.virt_sb_base,

9
drivers/platform/msm/Kconfig
View file

@ -217,4 +217,13 @@ config AQFWD_IOSS
aqc_ioss.
If unsure, say N.
config USB_R8152_RTL
tristate "Realtek R8152 driver"
help
This option adds support for Realtek RTL8152 based USB to
Ethernet adapter.
To compile this driver as a module, choose M here: the module
will be called r8152_rtl. If unsure, say N.
endmenu

3
drivers/platform/msm/mhi_dev/mhi.c
View file

@ -3936,6 +3936,9 @@ static void mhi_dev_enable(struct work_struct *work)
"Cleared reset before waiting for M0\n");
}
if (ep_pcie_get_linkstatus(mhi->phandle) != EP_PCIE_LINK_ENABLED)
mhi_log(MHI_MSG_ERROR, "warning: PCIe BME unset error");
while (state != MHI_DEV_M0_STATE &&
((max_cnt < MHI_SUSPEND_TIMEOUT) || mhi->no_m0_timeout)) {
/* Wait for Host to set the M0 state */

25
drivers/platform/msm/mhi_dev/mhi_sm.c
View file

@ -96,12 +96,6 @@ static inline const char *mhi_sm_mstate_str(enum mhi_dev_state state)
return str;
}
enum mhi_sm_ep_pcie_state {
MHI_SM_EP_PCIE_LINK_DISABLE,
MHI_SM_EP_PCIE_D0_STATE,
MHI_SM_EP_PCIE_D3_HOT_STATE,
MHI_SM_EP_PCIE_D3_COLD_STATE,
};
static inline const char *mhi_sm_dstate_str(enum mhi_sm_ep_pcie_state state)
{
@ -1106,8 +1100,6 @@ unlock_and_exit:
int mhi_dev_sm_init(struct mhi_dev *mhi_dev)
{
int res;
enum ep_pcie_link_status link_state;
MHI_SM_FUNC_ENTRY();
if (!mhi_dev) {
@ -1137,11 +1129,7 @@ int mhi_dev_sm_init(struct mhi_dev *mhi_dev)
atomic_set(&mhi_sm_ctx->pending_device_events, 0);
atomic_set(&mhi_sm_ctx->pending_pcie_events, 0);
link_state = ep_pcie_get_linkstatus(mhi_sm_ctx->mhi_dev->phandle);
if (link_state == EP_PCIE_LINK_ENABLED)
mhi_sm_ctx->d_state = MHI_SM_EP_PCIE_D0_STATE;
else
mhi_sm_ctx->d_state = MHI_SM_EP_PCIE_LINK_DISABLE;
mhi_sm_ctx->d_state = MHI_SM_EP_PCIE_D0_STATE;
MHI_SM_FUNC_EXIT();
return 0;
@ -1238,16 +1226,7 @@ int mhi_dev_sm_set_ready(void)
goto unlock_and_exit;
}
if (mhi_sm_ctx->d_state != MHI_SM_EP_PCIE_D0_STATE) {
if (ep_pcie_get_linkstatus(mhi_sm_ctx->mhi_dev->phandle) ==
EP_PCIE_LINK_ENABLED) {
mhi_sm_ctx->d_state = MHI_SM_EP_PCIE_D0_STATE;
} else {
MHI_SM_ERR("ERROR: ep-pcie link is not enabled\n");
res = -EPERM;
goto unlock_and_exit;
}
}
mhi_sm_ctx->d_state = MHI_SM_EP_PCIE_D0_STATE;
/* verify that MHISTATUS is configured to RESET*/
mhi_dev_mmio_masked_read(mhi_sm_ctx->mhi_dev,

9
drivers/platform/msm/mhi_dev/mhi_sm.h
View file

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* Copyright (c) 2015,2017-2018,2020 The Linux Foundation. All rights reserved.*/
/* Copyright (c) 2015,2017-2018,2020-2021 The Linux Foundation. All rights reserved.*/
#ifndef MHI_SM_H
#define MHI_SM_H
@ -31,6 +31,13 @@ enum mhi_dev_event {
MHI_DEV_EVENT_MAX
};
enum mhi_sm_ep_pcie_state {
MHI_SM_EP_PCIE_LINK_DISABLE,
MHI_SM_EP_PCIE_D0_STATE,
MHI_SM_EP_PCIE_D3_HOT_STATE,
MHI_SM_EP_PCIE_D3_COLD_STATE,
};
int mhi_dev_sm_init(struct mhi_dev *dev);
int mhi_dev_sm_exit(struct mhi_dev *dev);
int mhi_dev_sm_set_ready(void);

3
drivers/soc/qcom/socinfo.c
View file

@ -1393,6 +1393,9 @@ static int qcom_socinfo_probe(struct platform_device *pdev)
SOCINFO_MINOR(le32_to_cpu(info->ver)));
qs->attr.soc_id = kasprintf(GFP_KERNEL, "%d", socinfo_get_id());
if (!qs->attr.soc_id || !qs->attr.revision)
return -ENOMEM;
if (socinfo_format >= SOCINFO_VERSION(0, 16)) {
machine = socinfo_machine(le32_to_cpu(info->id));
esku = socinfo_get_esku_mapping();