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

Commit 84efebeb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm8996: Enable MHI driver"

parents 8212f1d3 3b198069

arch/arm64/configs/msm-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_MSM_RMNET_MHI=y

CONFIG_RNDIS_IPA=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -488,6 +489,8 @@ CONFIG_USB_BAM=y 
CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA=y

CONFIG_RMNET_IPA=y

CONFIG_MSM_MHI=y

CONFIG_MSM_MHI_UCI=y

CONFIG_SEEMP_CORE=y

CONFIG_QPNP_HAPTIC=y

CONFIG_GPIO_USB_DETECT=y

arch/arm64/configs/msm_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_MSM_RMNET_MHI=y

CONFIG_RNDIS_IPA=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -495,6 +496,9 @@ CONFIG_USB_BAM=y 
CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA=y

CONFIG_RMNET_IPA=y

CONFIG_MSM_MHI=y

CONFIG_MSM_MHI_UCI=y

CONFIG_MSM_MHI_DEBUG=y

CONFIG_SEEMP_CORE=y

CONFIG_QPNP_HAPTIC=y

CONFIG_GPIO_USB_DETECT=y

drivers/platform/msm/mhi/mhi_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,7 @@ int mhi_poll_inbound(struct mhi_client_handle *client_handle, 
	bb_ctxt = &mhi_dev_ctxt->chan_bb_list[chan];



	mutex_lock(chan_mutex);

	if (local_chan_ctxt->rp != local_chan_ctxt->ack_rp) {

	if (bb_ctxt->rp != bb_ctxt->ack_rp) {

		pending_trb = (struct mhi_tx_pkt *)(local_chan_ctxt->ack_rp);

		result->flags = pending_trb->info;

		bb = bb_ctxt->ack_rp;

drivers/platform/msm/mhi/mhi_states.c

+9 −0
Original line number Diff line number Diff line
@@ -555,14 +555,23 @@ static int process_sbl_transition( 
				struct mhi_device_ctxt *mhi_dev_ctxt,

				enum STATE_TRANSITION cur_work_item)

{

	int r = 0;

	pm_runtime_set_autosuspend_delay(

				 &mhi_dev_ctxt->dev_info->pcie_device->dev,

				 MHI_RPM_AUTOSUSPEND_TMR_VAL_MS);

	pm_runtime_use_autosuspend(&mhi_dev_ctxt->dev_info->pcie_device->dev);

	r = pm_runtime_set_active(&mhi_dev_ctxt->dev_info->pcie_device->dev);

	if (r) {

		mhi_log(MHI_MSG_ERROR,

		"Failed to activate runtime pm ret %d\n", r);

	}

	pm_runtime_enable(&mhi_dev_ctxt->dev_info->pcie_device->dev);

	mhi_log(MHI_MSG_INFO, "Enabled runtime pm autosuspend\n");

	mhi_dev_ctxt->dev_exec_env = MHI_EXEC_ENV_SBL;

	enable_clients(mhi_dev_ctxt, mhi_dev_ctxt->dev_exec_env);

	pm_runtime_put_noidle(&mhi_dev_ctxt->dev_info->pcie_device->dev);

	return 0;



}



static int process_amss_transition(