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

Commit f53fbd12 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable MHI device for sa8155"

parents 34230b90 cee53014

arch/arm64/configs/vendor/sa8155-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y 
CONFIG_EP_PCIE=y

CONFIG_EP_PCIE_HW=y

CONFIG_USB_BAM=y

CONFIG_MSM_MHI_DEV=y

CONFIG_IPA3=y

CONFIG_IPA_WDI_UNIFIED_API=y

CONFIG_RMNET_IPA3=y

arch/arm64/configs/vendor/sa8155_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y 
CONFIG_EP_PCIE=y

CONFIG_EP_PCIE_HW=y

CONFIG_USB_BAM=y

CONFIG_MSM_MHI_DEV=y

CONFIG_IPA3=y

CONFIG_IPA_WDI_UNIFIED_API=y

CONFIG_RMNET_IPA3=y

drivers/platform/msm/mhi_dev/mhi.c

+0 −3
Original line number Diff line number Diff line
@@ -656,14 +656,12 @@ static int mhi_dev_send_multiple_tr_events(struct mhi_dev *mhi, int evnt_ring, 
	struct mhi_dev_ring *ring = &mhi->ring[evnt_ring_idx];

	union mhi_dev_ring_ctx *ctx;

	struct mhi_addr transfer_addr;

	static int count;



	rc = ep_pcie_get_msi_config(mhi->phandle, &mhi->msi_cfg);

	if (rc) {

		pr_err("Error retrieving pcie msi logic\n");

		return rc;

	}

	count++;



	if (evnt_ring_idx > mhi->cfg.event_rings) {

		pr_err("Invalid event ring idx: %lld\n", evnt_ring_idx);
@@ -805,7 +803,6 @@ static int mhi_dev_send_cmd_comp_event(struct mhi_dev *mhi, 
static int mhi_dev_process_stop_cmd(struct mhi_dev_ring *ring, uint32_t ch_id,

							struct mhi_dev *mhi)

{

	int rc = 0;

	struct mhi_addr data_transfer;



	if (ring->rd_offset != ring->wr_offset &&