Commit 0b4eeee2 authored by Georgi Djakov's avatar Georgi Djakov Committed by Will Deacon
Browse files

iommu/arm-smmu-qcom: Register the TBU driver in qcom_smmu_impl_init 



Currently the TBU driver will only probe when CONFIG_ARM_SMMU_QCOM_DEBUG
is enabled. The driver not probing would prevent the platform to reach
sync_state and the system will remain in sub-optimal power consumption
mode while waiting for all consumer drivers to probe. To address this,
let's register the TBU driver in qcom_smmu_impl_init(), so that it can
probe, but still enable its functionality only when the debug option in
Kconfig is enabled.

Reported-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Closes: https://lore.kernel.org/r/CAA8EJppcXVu72OSo+OiYEiC1HQjP3qCwKMumOsUhcn6Czj0URg@mail.gmail.com


Fixes: 414ecb03 ("iommu/arm-smmu-qcom-debug: Add support for TBUs")
Signed-off-by: default avatarGeorgi Djakov <quic_c_gdjako@quicinc.com>
Link: https://lore.kernel.org/r/20240704010759.507798-1-quic_c_gdjako@quicinc.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 25c776dd

drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c

+1 −16
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ irqreturn_t qcom_smmu_context_fault(int irq, void *dev) 
	return ret;

}



static int qcom_tbu_probe(struct platform_device *pdev)

int qcom_tbu_probe(struct platform_device *pdev)

{

	struct of_phandle_args args = { .args_count = 2 };

	struct device_node *np = pdev->dev.of_node;
@@ -506,18 +506,3 @@ static int qcom_tbu_probe(struct platform_device *pdev) 


	return 0;

}
 


static const struct of_device_id qcom_tbu_of_match[] = {

	{ .compatible = "qcom,sc7280-tbu" },

	{ .compatible = "qcom,sdm845-tbu" },

	{ }

};



static struct platform_driver qcom_tbu_driver = {

	.driver = {

		.name           = "qcom_tbu",

		.of_match_table = qcom_tbu_of_match,

	},

	.probe = qcom_tbu_probe,

};

builtin_platform_driver(qcom_tbu_driver);

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c

+39 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include <linux/delay.h>

#include <linux/of_device.h>

#include <linux/firmware/qcom/qcom_scm.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>



#include "arm-smmu.h"

#include "arm-smmu-qcom.h"
@@ -562,10 +564,47 @@ static struct acpi_platform_list qcom_acpi_platlist[] = { 
};

#endif



static int qcom_smmu_tbu_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	int ret;



	if (IS_ENABLED(CONFIG_ARM_SMMU_QCOM_DEBUG)) {

		ret = qcom_tbu_probe(pdev);

		if (ret)

			return ret;

	}



	if (dev->pm_domain) {

		pm_runtime_set_active(dev);

		pm_runtime_enable(dev);

	}



	return 0;

}



static const struct of_device_id qcom_smmu_tbu_of_match[] = {

	{ .compatible = "qcom,sc7280-tbu" },

	{ .compatible = "qcom,sdm845-tbu" },

	{ }

};



static struct platform_driver qcom_smmu_tbu_driver = {

	.driver = {

		.name           = "qcom_tbu",

		.of_match_table = qcom_smmu_tbu_of_match,

	},

	.probe = qcom_smmu_tbu_probe,

};



struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)

{

	const struct device_node *np = smmu->dev->of_node;

	const struct of_device_id *match;

	static u8 tbu_registered;



	if (!tbu_registered++)

		platform_driver_register(&qcom_smmu_tbu_driver);



#ifdef CONFIG_ACPI

	if (np == NULL) {

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h

+2 −0
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ irqreturn_t qcom_smmu_context_fault(int irq, void *dev); 


#ifdef CONFIG_ARM_SMMU_QCOM_DEBUG

void qcom_smmu_tlb_sync_debug(struct arm_smmu_device *smmu);

int qcom_tbu_probe(struct platform_device *pdev);

#else

static inline void qcom_smmu_tlb_sync_debug(struct arm_smmu_device *smmu) { }

static inline int qcom_tbu_probe(struct platform_device *pdev) { return -EINVAL; }

#endif



#endif /* _ARM_SMMU_QCOM_H */