| Message ID | 20180612113907.15043-2-niklas.cassel@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f1908735f141f662fbf04436e6efc1560418b5a0 |
| Delegated to: | Kalle Valo |
| Headers | show |
On 2018-06-12 17:45, Govind Singh wrote: > -----Original Message----- > From: ath10k <ath10k-bounces@lists.infradead.org> On Behalf Of Niklas > Cassel > Sent: Tuesday, June 12, 2018 5:09 PM > To: Kalle Valo <kvalo@codeaurora.org>; David S. Miller > <davem@davemloft.net> > Cc: Niklas Cassel <niklas.cassel@linaro.org>; netdev@vger.kernel.org; > linux-wireless@vger.kernel.org; linux-kernel@vger.kernel.org; > ath10k@lists.infradead.org > Subject: [PATCH 2/2] ath10k: allow ATH10K_SNOC with COMPILE_TEST > > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> > --- > drivers/net/wireless/ath/ath10k/Kconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/Kconfig > b/drivers/net/wireless/ath/ath10k/Kconfig > index 54ff5930126c..6572a43590a8 100644 > --- a/drivers/net/wireless/ath/ath10k/Kconfig > +++ b/drivers/net/wireless/ath/ath10k/Kconfig > @@ -42,7 +42,8 @@ config ATH10K_USB > > config ATH10K_SNOC > tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)" > - depends on ATH10K && ARCH_QCOM > + depends on ATH10K > + depends on ARCH_QCOM || COMPILE_TEST > ---help--- > This module adds support for integrated WCN3990 chip connected > to system NOC(SNOC). Currently work in progress and will not Thanks Niklas for enabling COMPILE_TEST. With QMI set of changes(https://patchwork.kernel.org/patch/10448183/), we need to enable COMPILE_TEST for QCOM_SCM/QMI_HELPERS which seems broken today. Are you planning to fix the same. config QCOM_SCM bool - depends on ARM || ARM64 + depends on ARM || ARM64 || COMPILE_TEST select RESET_CONTROLLER config QCOM_SCM_64 def_bool y - depends on QCOM_SCM && ARM64 + depends on QCOM_SCM && ARM64 || COMPILE_TEST config QCOM_QMI_HELPERS tristate - depends on ARCH_QCOM && NET + depends on (ARCH_QCOM || COMPILE_TEST) && NET -obj-$(CONFIG_ARCH_QCOM) += qcom/ +obj-y += qcom/ __qcom_scm_init/qcom_scm_call wrapper to support COMPILE_TEST. BR, Govind
On Tue, Jun 12, 2018 at 06:02:48PM +0530, Govind Singh wrote: > On 2018-06-12 17:45, Govind Singh wrote: > > -----Original Message----- > > From: ath10k <ath10k-bounces@lists.infradead.org> On Behalf Of Niklas > > Cassel > > Sent: Tuesday, June 12, 2018 5:09 PM > > To: Kalle Valo <kvalo@codeaurora.org>; David S. Miller > > <davem@davemloft.net> > > Cc: Niklas Cassel <niklas.cassel@linaro.org>; netdev@vger.kernel.org; > > linux-wireless@vger.kernel.org; linux-kernel@vger.kernel.org; > > ath10k@lists.infradead.org > > Subject: [PATCH 2/2] ath10k: allow ATH10K_SNOC with COMPILE_TEST > > > > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. > > > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> > > --- > > drivers/net/wireless/ath/ath10k/Kconfig | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/wireless/ath/ath10k/Kconfig > > b/drivers/net/wireless/ath/ath10k/Kconfig > > index 54ff5930126c..6572a43590a8 100644 > > --- a/drivers/net/wireless/ath/ath10k/Kconfig > > +++ b/drivers/net/wireless/ath/ath10k/Kconfig > > @@ -42,7 +42,8 @@ config ATH10K_USB > > > > config ATH10K_SNOC > > tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)" > > - depends on ATH10K && ARCH_QCOM > > + depends on ATH10K > > + depends on ARCH_QCOM || COMPILE_TEST > > ---help--- > > This module adds support for integrated WCN3990 chip connected > > to system NOC(SNOC). Currently work in progress and will not > > Thanks Niklas for enabling COMPILE_TEST. With QMI set of > changes(https://patchwork.kernel.org/patch/10448183/), we need to enable > COMPILE_TEST for > QCOM_SCM/QMI_HELPERS which seems broken today. Are you planning to fix the > same. Argh.. qcom_scm seems fine, it is just missing a single definition in the #else clause of include/linux/qcom_scm.h. +++ b/include/linux/qcom_scm.h @@ -89,6 +89,10 @@ static inline int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, static inline int qcom_scm_pas_auth_and_reset(u32 peripheral) { return -ENODEV; } static inline int qcom_scm_pas_shutdown(u32 peripheral) { return -ENODEV; } +static inline int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, + unsigned int *src, + struct qcom_scm_vmperm *newvm, + int dest_cnt) { return -ENODEV; } static inline void qcom_scm_cpu_power_down(u32 flags) {} static inline u32 qcom_scm_get_version(void) { return 0; } include/linux/soc/qcom/qmi.h on the other hand doesn't have any dummy defintions at all. I think that it makes sense to be able to compile test the QMI helpers also on other archs.. Bjorn, any opinion? > > config QCOM_SCM > bool > - depends on ARM || ARM64 > + depends on ARM || ARM64 || COMPILE_TEST > select RESET_CONTROLLER > > > config QCOM_SCM_64 > def_bool y > - depends on QCOM_SCM && ARM64 > + depends on QCOM_SCM && ARM64 || COMPILE_TEST > > config QCOM_QMI_HELPERS > tristate > - depends on ARCH_QCOM && NET > + depends on (ARCH_QCOM || COMPILE_TEST) && NET > > -obj-$(CONFIG_ARCH_QCOM) += qcom/ > +obj-y += qcom/ > > __qcom_scm_init/qcom_scm_call wrapper to support COMPILE_TEST. > > > > BR, > Govind
Hi Niklas,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on ath6kl/ath-next]
[also build test WARNING on next-20180612]
[cannot apply to v4.17]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Niklas-Cassel/ath10k-do-not-mix-spaces-and-tabs-in-Kconfig/20180612-194241
base: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git ath-next
reproduce:
# apt-get install sparse
make ARCH=x86_64 allmodconfig
make C=1 CF=-D__CHECK_ENDIAN__
sparse warnings: (new ones prefixed by >>)
>> drivers/net/wireless/ath/ath10k/snoc.c:823:5: sparse: symbol 'ath10k_snoc_get_ce_id_from_irq' was not declared. Should it be static?
>> drivers/net/wireless/ath/ath10k/snoc.c:871:6: sparse: symbol 'ath10k_snoc_init_napi' was not declared. Should it be static?
Please review and possibly fold the followup patch.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Niklas Cassel <niklas.cassel@linaro.org> writes: > On Tue, Jun 12, 2018 at 06:02:48PM +0530, Govind Singh wrote: >> On 2018-06-12 17:45, Govind Singh wrote: >> > -----Original Message----- >> > From: ath10k <ath10k-bounces@lists.infradead.org> On Behalf Of Niklas >> > Cassel >> > Sent: Tuesday, June 12, 2018 5:09 PM >> > To: Kalle Valo <kvalo@codeaurora.org>; David S. Miller >> > <davem@davemloft.net> >> > Cc: Niklas Cassel <niklas.cassel@linaro.org>; netdev@vger.kernel.org; >> > linux-wireless@vger.kernel.org; linux-kernel@vger.kernel.org; >> > ath10k@lists.infradead.org >> > Subject: [PATCH 2/2] ath10k: allow ATH10K_SNOC with COMPILE_TEST >> > >> > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. >> > >> > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> >> > --- >> > drivers/net/wireless/ath/ath10k/Kconfig | 3 ++- >> > 1 file changed, 2 insertions(+), 1 deletion(-) >> > >> > diff --git a/drivers/net/wireless/ath/ath10k/Kconfig >> > b/drivers/net/wireless/ath/ath10k/Kconfig >> > index 54ff5930126c..6572a43590a8 100644 >> > --- a/drivers/net/wireless/ath/ath10k/Kconfig >> > +++ b/drivers/net/wireless/ath/ath10k/Kconfig >> > @@ -42,7 +42,8 @@ config ATH10K_USB >> > >> > config ATH10K_SNOC >> > tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)" >> > - depends on ATH10K && ARCH_QCOM >> > + depends on ATH10K >> > + depends on ARCH_QCOM || COMPILE_TEST >> > ---help--- >> > This module adds support for integrated WCN3990 chip connected >> > to system NOC(SNOC). Currently work in progress and will not >> >> Thanks Niklas for enabling COMPILE_TEST. With QMI set of >> changes(https://patchwork.kernel.org/patch/10448183/), we need to enable >> COMPILE_TEST for >> QCOM_SCM/QMI_HELPERS which seems broken today. Are you planning to fix the >> same. > > > Argh.. > > qcom_scm seems fine, it is just missing a single definition in the > #else clause of include/linux/qcom_scm.h. > > +++ b/include/linux/qcom_scm.h > @@ -89,6 +89,10 @@ static inline int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, > static inline int > qcom_scm_pas_auth_and_reset(u32 peripheral) { return -ENODEV; } > static inline int qcom_scm_pas_shutdown(u32 peripheral) { return -ENODEV; } > +static inline int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, > + unsigned int *src, > + struct qcom_scm_vmperm *newvm, > + int dest_cnt) { return -ENODEV; } > static inline void qcom_scm_cpu_power_down(u32 flags) {} > static inline u32 qcom_scm_get_version(void) { return 0; } > > > > include/linux/soc/qcom/qmi.h on the other hand doesn't have any > dummy defintions at all. > I think that it makes sense to be able to compile test > the QMI helpers also on other archs.. > > Bjorn, any opinion? Please don't drop ath10k list, adding it back.
kbuild test robot <lkp@intel.com> writes: > Thank you for the patch! Perhaps something to improve: > > [auto build test WARNING on ath6kl/ath-next] > [also build test WARNING on next-20180612] > [cannot apply to v4.17] > [if your patch is applied to the wrong git tree, please drop us a note > to help improve the system] > > url: > https://github.com/0day-ci/linux/commits/Niklas-Cassel/ath10k-do-not-mix-spaces-and-tabs-in-Kconfig/20180612-194241 > base: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git ath-next > reproduce: > # apt-get install sparse > make ARCH=x86_64 allmodconfig > make C=1 CF=-D__CHECK_ENDIAN__ > > > sparse warnings: (new ones prefixed by >>) > >>> drivers/net/wireless/ath/ath10k/snoc.c:823:5: sparse: symbol >>> 'ath10k_snoc_get_ce_id_from_irq' was not declared. Should it be >>> static? >>> drivers/net/wireless/ath/ath10k/snoc.c:871:6: sparse: symbol >>> 'ath10k_snoc_init_napi' was not declared. Should it be static? > > Please review and possibly fold the followup patch. There's already a patch pending to fix these: ath10k: make some functions static https://patchwork.kernel.org/patch/10440159/
On Tue, Jun 12, 2018 at 02:44:03PM +0200, Niklas Cassel wrote: > On Tue, Jun 12, 2018 at 06:02:48PM +0530, Govind Singh wrote: > > On 2018-06-12 17:45, Govind Singh wrote: > > > -----Original Message----- > > > From: ath10k <ath10k-bounces@lists.infradead.org> On Behalf Of Niklas > > > Cassel > > > Sent: Tuesday, June 12, 2018 5:09 PM > > > To: Kalle Valo <kvalo@codeaurora.org>; David S. Miller > > > <davem@davemloft.net> > > > Cc: Niklas Cassel <niklas.cassel@linaro.org>; netdev@vger.kernel.org; > > > linux-wireless@vger.kernel.org; linux-kernel@vger.kernel.org; > > > ath10k@lists.infradead.org > > > Subject: [PATCH 2/2] ath10k: allow ATH10K_SNOC with COMPILE_TEST > > > > > > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. > > > > > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> > > > --- > > > drivers/net/wireless/ath/ath10k/Kconfig | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/net/wireless/ath/ath10k/Kconfig > > > b/drivers/net/wireless/ath/ath10k/Kconfig > > > index 54ff5930126c..6572a43590a8 100644 > > > --- a/drivers/net/wireless/ath/ath10k/Kconfig > > > +++ b/drivers/net/wireless/ath/ath10k/Kconfig > > > @@ -42,7 +42,8 @@ config ATH10K_USB > > > > > > config ATH10K_SNOC > > > tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)" > > > - depends on ATH10K && ARCH_QCOM > > > + depends on ATH10K > > > + depends on ARCH_QCOM || COMPILE_TEST > > > ---help--- > > > This module adds support for integrated WCN3990 chip connected > > > to system NOC(SNOC). Currently work in progress and will not > > > > Thanks Niklas for enabling COMPILE_TEST. With QMI set of > > changes(https://patchwork.kernel.org/patch/10448183/), we need to enable > > COMPILE_TEST for > > QCOM_SCM/QMI_HELPERS which seems broken today. Are you planning to fix the > > same. > > This patch is good as is. However, Govind's QMI patch set together with this patch resulted in build errors. FTR, these are fixed by: https://marc.info/?l=linux-kernel&m=152880985402356 https://marc.info/?l=linux-kernel&m=152889452326350 Regards, Niklas
Niklas Cassel <niklas.cassel@linaro.org> writes: > On Tue, Jun 12, 2018 at 02:44:03PM +0200, Niklas Cassel wrote: >> On Tue, Jun 12, 2018 at 06:02:48PM +0530, Govind Singh wrote: >> > On 2018-06-12 17:45, Govind Singh wrote: >> > > >> > > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. >> > > >> > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> >> > > --- >> > > drivers/net/wireless/ath/ath10k/Kconfig | 3 ++- >> > > 1 file changed, 2 insertions(+), 1 deletion(-) >> > > >> > > diff --git a/drivers/net/wireless/ath/ath10k/Kconfig >> > > b/drivers/net/wireless/ath/ath10k/Kconfig >> > > index 54ff5930126c..6572a43590a8 100644 >> > > --- a/drivers/net/wireless/ath/ath10k/Kconfig >> > > +++ b/drivers/net/wireless/ath/ath10k/Kconfig >> > > @@ -42,7 +42,8 @@ config ATH10K_USB >> > > >> > > config ATH10K_SNOC >> > > tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)" >> > > - depends on ATH10K && ARCH_QCOM >> > > + depends on ATH10K >> > > + depends on ARCH_QCOM || COMPILE_TEST >> > > ---help--- >> > > This module adds support for integrated WCN3990 chip connected >> > > to system NOC(SNOC). Currently work in progress and will not >> > >> > Thanks Niklas for enabling COMPILE_TEST. With QMI set of >> > changes(https://patchwork.kernel.org/patch/10448183/), we need to enable >> > COMPILE_TEST for >> > QCOM_SCM/QMI_HELPERS which seems broken today. Are you planning to fix the >> > same. > > This patch is good as is. > > However, Govind's QMI patch set together with this patch > resulted in build errors. > > FTR, these are fixed by: > https://marc.info/?l=linux-kernel&m=152880985402356 > https://marc.info/?l=linux-kernel&m=152889452326350 So the problem is that if I apply this patch I can't apply Govind's QMI patchset (due to the build problems) until Niklas' fixes to qcom and rpmsg subsystems propogate back to my tree and that might take weeks, or even months. But I really would like to apply the QMI patchset ASAP so that we can complete the wcn3990 support and not unnecessarily delay it. So what I propose is that I put this patch 2 as 'Awaiting Upstream' in patchwork and apply it once Niklas' patches get to my tree. Does that sound good?
On Thu, Jun 14, 2018 at 05:09:04PM +0300, Kalle Valo wrote: > Niklas Cassel <niklas.cassel@linaro.org> writes: > > > On Tue, Jun 12, 2018 at 02:44:03PM +0200, Niklas Cassel wrote: > >> On Tue, Jun 12, 2018 at 06:02:48PM +0530, Govind Singh wrote: > >> > On 2018-06-12 17:45, Govind Singh wrote: > >> > > > >> > > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. > >> > > > >> > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> > >> > > --- > >> > > drivers/net/wireless/ath/ath10k/Kconfig | 3 ++- > >> > > 1 file changed, 2 insertions(+), 1 deletion(-) > >> > > > >> > > diff --git a/drivers/net/wireless/ath/ath10k/Kconfig > >> > > b/drivers/net/wireless/ath/ath10k/Kconfig > >> > > index 54ff5930126c..6572a43590a8 100644 > >> > > --- a/drivers/net/wireless/ath/ath10k/Kconfig > >> > > +++ b/drivers/net/wireless/ath/ath10k/Kconfig > >> > > @@ -42,7 +42,8 @@ config ATH10K_USB > >> > > > >> > > config ATH10K_SNOC > >> > > tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)" > >> > > - depends on ATH10K && ARCH_QCOM > >> > > + depends on ATH10K > >> > > + depends on ARCH_QCOM || COMPILE_TEST > >> > > ---help--- > >> > > This module adds support for integrated WCN3990 chip connected > >> > > to system NOC(SNOC). Currently work in progress and will not > >> > > >> > Thanks Niklas for enabling COMPILE_TEST. With QMI set of > >> > changes(https://patchwork.kernel.org/patch/10448183/), we need to enable > >> > COMPILE_TEST for > >> > QCOM_SCM/QMI_HELPERS which seems broken today. Are you planning to fix the > >> > same. > > > > This patch is good as is. > > > > However, Govind's QMI patch set together with this patch > > resulted in build errors. > > > > FTR, these are fixed by: > > https://marc.info/?l=linux-kernel&m=152880985402356 > > https://marc.info/?l=linux-kernel&m=152889452326350 > > So the problem is that if I apply this patch I can't apply Govind's QMI > patchset (due to the build problems) until Niklas' fixes to qcom and > rpmsg subsystems propogate back to my tree and that might take weeks, or > even months. But I really would like to apply the QMI patchset ASAP so > that we can complete the wcn3990 support and not unnecessarily delay it. > > So what I propose is that I put this patch 2 as 'Awaiting Upstream' in > patchwork and apply it once Niklas' patches get to my tree. Does that > sound good? Absolutely. I didn't realize this until after sending the patch. Kind regards, Niklas
Niklas Cassel <niklas.cassel@linaro.org> wrote: > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> Note to myself, I see these dependencies in linux-next (but not in Linus' tree yet): 67cd0eec5b62 rpmsg: smd: Add missing include of sizes.h 376e1f304fc7 firmware: qcom: scm: add a dummy qcom_scm_assign_mem() These I don't see in linux-next yet: soc: qcom: smem: Add missing include of sizes.h soc: qcom: smp2p: Add select IRQ_DOMAIN soc: qcom: smsm: Add select IRQ_DOMAIN soc: qcom: Remove depends on ARCH_QCOM
On Wed, Jul 04, 2018 at 09:59:13AM +0000, Kalle Valo wrote: > Niklas Cassel <niklas.cassel@linaro.org> wrote: > > > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. > > > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> > > Note to myself, I see these dependencies in linux-next (but not in Linus' tree yet): > > 67cd0eec5b62 rpmsg: smd: Add missing include of sizes.h > 376e1f304fc7 firmware: qcom: scm: add a dummy qcom_scm_assign_mem() > > These I don't see in linux-next yet: > > soc: qcom: smem: Add missing include of sizes.h > soc: qcom: smp2p: Add select IRQ_DOMAIN > soc: qcom: smsm: Add select IRQ_DOMAIN > soc: qcom: Remove depends on ARCH_QCOM Hello Kalle, You are correct. I submitted a v3 of this just yesterday: https://marc.info/?l=linux-kernel&m=153060245727472&w=2 So hopefully it will be in linux-next within 2 weeks. Regards, Niklas > > -- > https://patchwork.kernel.org/patch/10460103/ > > https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches > > > _______________________________________________ > ath10k mailing list > ath10k@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/ath10k
Niklas Cassel <niklas.cassel@linaro.org> wrote: > ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. > > Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Patch applied to ath-next branch of ath.git, thanks. f1908735f141 ath10k: allow ATH10K_SNOC with COMPILE_TEST
diff --git a/drivers/net/wireless/ath/ath10k/Kconfig b/drivers/net/wireless/ath/ath10k/Kconfig index 54ff5930126c..6572a43590a8 100644 --- a/drivers/net/wireless/ath/ath10k/Kconfig +++ b/drivers/net/wireless/ath/ath10k/Kconfig @@ -42,7 +42,8 @@ config ATH10K_USB config ATH10K_SNOC tristate "Qualcomm ath10k SNOC support (EXPERIMENTAL)" - depends on ATH10K && ARCH_QCOM + depends on ATH10K + depends on ARCH_QCOM || COMPILE_TEST ---help--- This module adds support for integrated WCN3990 chip connected to system NOC(SNOC). Currently work in progress and will not
ATH10K_SNOC builds just fine with COMPILE_TEST, so make that possible. Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org> --- drivers/net/wireless/ath/ath10k/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)