diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-02-05 19:50:53 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-02-05 19:50:53 -0800 |
| commit | 4e596fddc192809de7cf19b48e3e1dd2ca3d7aa1 (patch) | |
| tree | 984bfcd1fd3c262f758dbcddb5915a18c03e41f7 | |
| parent | 3f621f77a04fd6b886ac14349d4b66668027c75f (diff) | |
| parent | df75d4caffd0de5039939b8b4b524cdfe20e5292 (diff) | |
| download | cnss2-4e596fddc192809de7cf19b48e3e1dd2ca3d7aa1.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 478053055
Change-Id: Ide09ba2d822ba7c3eda6f02d4d95d06a3f2b7798
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | cnss2/pci.c | 2 | ||||
| -rw-r--r-- | mhi/core/boot.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cnss2/pci.c b/cnss2/pci.c index fdb3417..a80826b 100644 --- a/cnss2/pci.c +++ b/cnss2/pci.c @@ -4895,7 +4895,7 @@ void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv, bool in_panic) /* Inside panic handler, reduce timeout for RDDM to avoid * unnecessary hypervisor watchdog bite. */ - pci_priv->mhi_ctrl->timeout_ms /= 2; + pci_priv->mhi_ctrl->timeout_ms = 5000; } cnss_mhi_debug_reg_dump(pci_priv); diff --git a/mhi/core/boot.c b/mhi/core/boot.c index a2d3526..83d989e 100644 --- a/mhi/core/boot.c +++ b/mhi/core/boot.c @@ -71,6 +71,9 @@ int mhi_rddm_download_status(struct mhi_controller *mhi_cntrl) struct device *dev = &mhi_cntrl->mhi_dev->dev; int ret = 0; + MHI_LOG("mhi_cntrl->timeout_ms=%u, retry=%u\n" + , mhi_cntrl->timeout_ms, retry); + while (retry--) { ret = mhi_read_reg_field(mhi_cntrl, base, BHIE_RXVECSTATUS_OFFS, BHIE_RXVECSTATUS_STATUS_BMSK, |