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

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

Merge "defconfig: kona: enable MHI host stack for kona chipset"

parents 568c58cf e64bef33

arch/arm64/configs/vendor/kona-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ CONFIG_RFKILL=y 
CONFIG_FW_LOADER_USER_HELPER=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_DMA_CMA=y

CONFIG_MHI_BUS=y

CONFIG_MHI_QCOM=y

CONFIG_MHI_NETDEV=y

CONFIG_MHI_UCI=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

arch/arm64/configs/vendor/kona_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ CONFIG_RFKILL=y 
CONFIG_FW_LOADER_USER_HELPER=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_DMA_CMA=y

CONFIG_MHI_BUS=y

CONFIG_MHI_DEBUG=y

CONFIG_MHI_QCOM=y

CONFIG_MHI_NETDEV=y

CONFIG_MHI_UCI=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

drivers/bus/mhi/controllers/mhi_arch_qcom.c

+7 −7
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static struct dma_iommu_mapping *mhi_arch_create_iommu_mapping( 


	MHI_LOG("Create iommu mapping of base:%pad size:%zu\n",

		&base, size);

	return arm_iommu_create_mapping(&pci_bus_type, base, size);

	return __depr_arm_iommu_create_mapping(&pci_bus_type, base, size);

}



static int mhi_arch_dma_mask(struct mhi_controller *mhi_cntrl)
@@ -438,8 +438,8 @@ int mhi_arch_iommu_init(struct mhi_controller *mhi_cntrl) 
	}



	if (smmu_config) {

		ret = arm_iommu_attach_device(&mhi_dev->pci_dev->dev, mapping);



		ret = __depr_arm_iommu_attach_device(&mhi_dev->pci_dev->dev,

						     mapping);

		if (ret) {

			MHI_ERR("Error attach device, ret:%d\n", ret);

			goto release_mapping;
@@ -458,10 +458,10 @@ int mhi_arch_iommu_init(struct mhi_controller *mhi_cntrl) 
	return 0;



release_device:

	arm_iommu_detach_device(mhi_cntrl->dev);

	__depr_arm_iommu_detach_device(mhi_cntrl->dev);



release_mapping:

	arm_iommu_release_mapping(mapping);

	__depr_arm_iommu_release_mapping(mapping);



	return ret;

}
@@ -473,8 +473,8 @@ void mhi_arch_iommu_deinit(struct mhi_controller *mhi_cntrl) 
	struct dma_iommu_mapping *mapping = arch_info->mapping;



	if (mapping) {

		arm_iommu_detach_device(mhi_cntrl->dev);

		arm_iommu_release_mapping(mapping);

		__depr_arm_iommu_detach_device(mhi_cntrl->dev);

		__depr_arm_iommu_release_mapping(mapping);

	}

	arch_info->mapping = NULL;

	mhi_cntrl->dev = NULL;

drivers/bus/mhi/core/mhi_init.c

+8 −0
Original line number Diff line number Diff line
@@ -773,6 +773,10 @@ static int of_parse_ev_cfg(struct mhi_controller *mhi_cntrl, 
	struct mhi_event *mhi_event;

	struct device_node *child;



	of_node = of_find_node_by_name(of_node, "mhi_events");

	if (!of_node)

		return -EINVAL;



	for_each_available_child_of_node(of_node, child) {

		if (!strcmp(child->name, "mhi_event"))

			num++;
@@ -888,6 +892,10 @@ static int of_parse_ch_cfg(struct mhi_controller *mhi_cntrl, 
	if (ret)

		return ret;



	of_node = of_find_node_by_name(of_node, "mhi_channels");

	if (!of_node)

		return -EINVAL;



	mhi_cntrl->mhi_chan = kcalloc(mhi_cntrl->max_chan,

				      sizeof(*mhi_cntrl->mhi_chan), GFP_KERNEL);

	if (!mhi_cntrl->mhi_chan)

drivers/bus/mhi/core/mhi_main.c

+4 −1
Original line number Diff line number Diff line
@@ -583,7 +583,10 @@ static void mhi_assign_of_node(struct mhi_controller *mhi_cntrl, 
	const char *dt_name;

	int ret;



	controller = mhi_cntrl->of_node;

	controller = of_find_node_by_name(mhi_cntrl->of_node, "mhi_devices");

	if (!controller)

		return;



	for_each_available_child_of_node(controller, node) {

		ret = of_property_read_string(node, "mhi,chan", &dt_name);

		if (ret)