From c54d9f7b069be138d1afed0ac6d79b920f3faf0e Mon Sep 17 00:00:00 2001 From: Odelu Kukatla Date: Tue, 11 Aug 2020 13:30:07 +0530 Subject: [PATCH 1/2] interconnect: qcom: Build qnoc-qos as module Build qnoc-qos.c as a module to make the symbols available and avoid build warnings. Change-Id: I62ab7a04225d71c036cd78f38259a98f099632ed Signed-off-by: Odelu Kukatla --- drivers/interconnect/qcom/Kconfig | 5 +++++ drivers/interconnect/qcom/Makefile | 6 ++++-- drivers/interconnect/qcom/qnoc-qos.c | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/interconnect/qcom/Kconfig b/drivers/interconnect/qcom/Kconfig index 15583136d01b..e9540c1aaa2d 100644 --- a/drivers/interconnect/qcom/Kconfig +++ b/drivers/interconnect/qcom/Kconfig @@ -39,6 +39,7 @@ config INTERCONNECT_QCOM_LAHAINA depends on QCOM_RPMH && QCOM_COMMAND_DB && OF select INTERCONNECT_QCOM_BCM_VOTER select INTERCONNECT_QCOM_RPMH + select INTERCONNECT_QCOM_QOS help This is a driver for the Qualcomm Technologies, Inc. Network-on-Chip on lahaina-based platforms. @@ -88,9 +89,13 @@ config INTERCONNECT_QCOM_SDXLEMUR depends on QCOM_RPMH && QCOM_COMMAND_DB && OF select INTERCONNECT_QCOM_BCM_VOTER select INTERCONNECT_QCOM_RPMH + select INTERCONNECT_QCOM_QOS help This is a driver for the Qualcomm Technologies, Inc. Network-on-Chip on sdxlemur-based platforms. config INTERCONNECT_QCOM_RPM tristate + +config INTERCONNECT_QCOM_QOS + tristate diff --git a/drivers/interconnect/qcom/Makefile b/drivers/interconnect/qcom/Makefile index bfb7b16ccc8c..5d2e8c8edd3b 100644 --- a/drivers/interconnect/qcom/Makefile +++ b/drivers/interconnect/qcom/Makefile @@ -3,13 +3,14 @@ qnoc-holi-objs := holi.o qnoc-qcs404-objs := qcs404.o qnoc-sdm845-objs := sdm845.o -qnoc-lahaina-objs := lahaina.o qnoc-qos.o -qnoc-sdxlemur-objs := sdxlemur.o qnoc-qos.o +qnoc-lahaina-objs := lahaina.o +qnoc-sdxlemur-objs := sdxlemur.o qnoc-shima-objs := shima.o icc-smd-rpm-objs := smd-rpm.o icc-bcm-voter-objs := bcm-voter.o icc-rpmh-obj := icc-rpmh.o icc-rpm-obj := icc-rpm.o +qnoc-qos-obj := qnoc-qos.o obj-$(CONFIG_INTERCONNECT_QCOM_HOLI) += qnoc-holi.o obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o @@ -21,5 +22,6 @@ obj-$(CONFIG_INTERCONNECT_QCOM_RPM) += icc-rpm.o obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.o obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o +obj-$(CONFIG_INTERCONNECT_QCOM_QOS) += qnoc-qos.o obj-$(CONFIG_INTERCONNECT_QCOM_EPSS_L3) += epss-l3.o obj-$(CONFIG_INTERCONNECT_QCOM_CPUCP_L3) += cpucp-l3.o diff --git a/drivers/interconnect/qcom/qnoc-qos.c b/drivers/interconnect/qcom/qnoc-qos.c index a1ae94887a7c..cf78e497e743 100644 --- a/drivers/interconnect/qcom/qnoc-qos.c +++ b/drivers/interconnect/qcom/qnoc-qos.c @@ -6,6 +6,7 @@ #include #include +#include #include "icc-rpmh.h" #include "qnoc-qos.h" @@ -26,6 +27,7 @@ const u8 icc_qnoc_qos_regs[][QOSGEN_OFF_MAX_REGS] = { [QOSGEN_OFF_REGUL0BW_LO] = 0x48, }, }; +EXPORT_SYMBOL(icc_qnoc_qos_regs); /** * qcom_icc_set_qos - initialize static QoS configurations @@ -59,3 +61,5 @@ const struct qcom_icc_noc_ops qcom_qnoc4_ops = { .set_qos = qcom_icc_set_qos, }; EXPORT_SYMBOL(qcom_qnoc4_ops); + +MODULE_LICENSE("GPL v2"); From 823b12bb9bcf9f7514b652e90354fef7b0423bbf Mon Sep 17 00:00:00 2001 From: Odelu Kukatla Date: Tue, 25 Aug 2020 19:05:31 +0530 Subject: [PATCH 2/2] build.config: Add qnoc-qos.ko module for Lahaina qnoc-qos.c needs to be built as module, so add qnoc-qos.ko to build infra. Change-Id: I86ace45e2259fc382ed478c6456d55701bf974d4 Signed-off-by: Odelu Kukatla --- modules.list.msm.lahaina | 1 + 1 file changed, 1 insertion(+) diff --git a/modules.list.msm.lahaina b/modules.list.msm.lahaina index 7e71560390f4..087046dd9536 100644 --- a/modules.list.msm.lahaina +++ b/modules.list.msm.lahaina @@ -9,6 +9,7 @@ clk-qcom.ko clk-aop-qmp.ko clk-rpmh.ko gcc-lahaina.ko +qnoc-qos.ko qnoc-lahaina.ko icc-bcm-voter.ko pinctrl-msm.ko