TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge 2b20b0c37d on remote branch" into kernel.lnx.4.19.r32-rel

Browse Source
This commit is contained in:
Linux Build Service Account
2025-01-04 07:02:07 -08:00
committed by Gerrit - the friendly Code Review server
parent b9426ee620 c79744e158
commit e2b3780739
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/slimbus/slim-msm-ngd.c
View File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <asm/dma-iommu.h> #include <asm/dma-iommu.h>
@@ -477,7 +478,6 @@ static int ngd_check_hw_status(struct msm_slim_ctrl *dev)
static int ngd_xfer_msg(struct slim_controller *ctrl, struct slim_msg_txn *txn) static int ngd_xfer_msg(struct slim_controller *ctrl, struct slim_msg_txn *txn)
{ {
DECLARE_COMPLETION_ONSTACK(done);
DECLARE_COMPLETION_ONSTACK(tx_sent); DECLARE_COMPLETION_ONSTACK(tx_sent);
struct msm_slim_ctrl *dev = slim_get_ctrldata(ctrl); struct msm_slim_ctrl *dev = slim_get_ctrldata(ctrl);
@@ -491,6 +491,8 @@ static int ngd_xfer_msg(struct slim_controller *ctrl, struct slim_msg_txn *txn)
bool report_sat = false; bool report_sat = false;
bool sync_wr = true; bool sync_wr = true;
reinit_completion(&dev->xfer_done);
if (txn->mc & SLIM_MSG_CLK_PAUSE_SEQ_FLG) if (txn->mc & SLIM_MSG_CLK_PAUSE_SEQ_FLG)
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
@@ -649,7 +651,9 @@ static int ngd_xfer_msg(struct slim_controller *ctrl, struct slim_msg_txn *txn)
wbuf[i++] = txn->wbuf[0]; wbuf[i++] = txn->wbuf[0];
if (txn->mc != SLIM_USR_MC_DISCONNECT_PORT) if (txn->mc != SLIM_USR_MC_DISCONNECT_PORT)
wbuf[i++] = txn->wbuf[1]; wbuf[i++] = txn->wbuf[1];
ret = ngd_get_tid(ctrl, txn, &wbuf[i++], &done);
txn->comp = &dev->xfer_done;
ret = ngd_get_tid(ctrl, txn, &wbuf[i++], &dev->xfer_done);
if (ret) { if (ret) {
SLIM_ERR(dev, "TID for connect/disconnect fail:%d\n", SLIM_ERR(dev, "TID for connect/disconnect fail:%d\n",
ret); ret);
@@ -2015,6 +2019,7 @@ static int ngd_slim_probe(struct platform_device *pdev)
init_completion(&dev->reconf); init_completion(&dev->reconf);
init_completion(&dev->ctrl_up); init_completion(&dev->ctrl_up);
init_completion(&dev->qmi_up); init_completion(&dev->qmi_up);
init_completion(&dev->xfer_done);
mutex_init(&dev->tx_lock); mutex_init(&dev->tx_lock);
mutex_init(&dev->ssr_lock); mutex_init(&dev->ssr_lock);
spin_lock_init(&dev->tx_buf_lock); spin_lock_init(&dev->tx_buf_lock);

2
drivers/slimbus/slim-msm.h
View File

@@ -308,6 +308,8 @@ struct msm_slim_ctrl {
bool chan_active; bool chan_active;
enum msm_ctrl_state state; enum msm_ctrl_state state;
struct completion ctrl_up; struct completion ctrl_up;
struct completion xfer_done;
struct completion sync_done;
int nsats; int nsats;
u32 ver; u32 ver;
struct msm_slim_qmi qmi; struct msm_slim_qmi qmi;