Re: [PATCH -next] soc/qbman: fix implicit header dependency now causing build fails
Hi Stephen, On Wed, May 03, 2017 at 07:15:24PM +1000, Stephen Rothwell wrote: > It looks like there is at least one more: > > drivers/soc/fsl/qbman/qman.c: In function 'qman_init_fq': > drivers/soc/fsl/qbman/qman.c:1787:4: error: implicit declaration of function > 'dma_map_single' [-Werror=implicit-function-declaration] > drivers/soc/fsl/qbman/qman.c:1788:21: error: 'DMA_TO_DEVICE' undeclared > (first use in this function) > drivers/soc/fsl/qbman/qman.c:1789:4: error: implicit declaration of function > 'dma_mapping_error' [-Werror=implicit-function-declaration] > > This is from a powerpc orenet64_smp_defconfig build of today's > linux-next. Thanks, I'll fix that up too later today. Please let me know if you find more of that in your compile-testing. Joerg
Re: [PATCH -next] soc/qbman: fix implicit header dependency now causing build fails
Hi Paul, On Tue, May 02, 2017 at 06:21:12PM -0400, Paul Gortmaker wrote: > In commit 461a6946b1f9 ("iommu: Remove pci.h include from > trace/events/iommu.h") that header shuffle uncovered an implicit > include in this driver, manifesting as: > > CC drivers/soc/fsl/qbman/qman_portal.o > drivers/soc/fsl/qbman/qman_portal.c: In function 'qman_portal_probe': > drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of > function 'dma_set_mask' > drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of > function 'DMA_BIT_MASK' > if (dma_set_mask(dev, DMA_BIT_MASK(40))) { > ^ > > on the corenet32_smp_defconfig (and 64 bit respectively.) The above > commit was singled out via git bisect. > > The header it was implictly relying on getting was dma-mapping.h - so > we explicitly add it here. > > Fixes: 461a6946b1f9 ("iommu: Remove pci.h include from trace/events/iommu.h") > Cc: Joerg Roedel > Cc: Scott Wood > Cc: linuxppc-dev@lists.ozlabs.org > Signed-off-by: Paul Gortmaker Thanks for catching that, I though I found all breakages caused by removing this include. Obviously this wasn't true :) I applied the fix to the iommu/core branch. Joerg
Re: [PATCH -next] soc/qbman: fix implicit header dependency now causing build fails
Hi Joerg, On Wed, 3 May 2017 10:42:40 +0200 Joerg Roedel wrote: > > On Tue, May 02, 2017 at 06:21:12PM -0400, Paul Gortmaker wrote: > > In commit 461a6946b1f9 ("iommu: Remove pci.h include from > > trace/events/iommu.h") that header shuffle uncovered an implicit > > include in this driver, manifesting as: > > > > CC drivers/soc/fsl/qbman/qman_portal.o > > drivers/soc/fsl/qbman/qman_portal.c: In function 'qman_portal_probe': > > drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration > > of function 'dma_set_mask' > > drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration > > of function 'DMA_BIT_MASK' > > if (dma_set_mask(dev, DMA_BIT_MASK(40))) { > > ^ > > > > on the corenet32_smp_defconfig (and 64 bit respectively.) The above > > commit was singled out via git bisect. > > > > The header it was implictly relying on getting was dma-mapping.h - so > > we explicitly add it here. > > > > Fixes: 461a6946b1f9 ("iommu: Remove pci.h include from > > trace/events/iommu.h") > > Cc: Joerg Roedel > > Cc: Scott Wood > > Cc: linuxppc-dev@lists.ozlabs.org > > Signed-off-by: Paul Gortmaker > > Thanks for catching that, I though I found all breakages caused by > removing this include. Obviously this wasn't true :) > > I applied the fix to the iommu/core branch. Thanks. It looks like there is at least one more: drivers/soc/fsl/qbman/qman.c: In function 'qman_init_fq': drivers/soc/fsl/qbman/qman.c:1787:4: error: implicit declaration of function 'dma_map_single' [-Werror=implicit-function-declaration] drivers/soc/fsl/qbman/qman.c:1788:21: error: 'DMA_TO_DEVICE' undeclared (first use in this function) drivers/soc/fsl/qbman/qman.c:1789:4: error: implicit declaration of function 'dma_mapping_error' [-Werror=implicit-function-declaration] This is from a powerpc orenet64_smp_defconfig build of today's linux-next. -- Cheers, Stephen Rothwell
Re: [PATCH -next] soc/qbman: fix implicit header dependency now causing build fails
Hi all, On Tue, 2 May 2017 18:21:12 -0400 Paul Gortmaker wrote: > > In commit 461a6946b1f9 ("iommu: Remove pci.h include from > trace/events/iommu.h") that header shuffle uncovered an implicit > include in this driver, manifesting as: > > CC drivers/soc/fsl/qbman/qman_portal.o > drivers/soc/fsl/qbman/qman_portal.c: In function 'qman_portal_probe': > drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of > function 'dma_set_mask' > drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of > function 'DMA_BIT_MASK' > if (dma_set_mask(dev, DMA_BIT_MASK(40))) { > ^ > > on the corenet32_smp_defconfig (and 64 bit respectively.) The above > commit was singled out via git bisect. > > The header it was implictly relying on getting was dma-mapping.h - so > we explicitly add it here. > > Fixes: 461a6946b1f9 ("iommu: Remove pci.h include from trace/events/iommu.h") > Cc: Joerg Roedel > Cc: Scott Wood > Cc: linuxppc-dev@lists.ozlabs.org > Signed-off-by: Paul Gortmaker > --- > drivers/soc/fsl/qbman/qman_portal.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/soc/fsl/qbman/qman_portal.c > b/drivers/soc/fsl/qbman/qman_portal.c > index adbaa30d3c5a..4a6a8ae5e0aa 100644 > --- a/drivers/soc/fsl/qbman/qman_portal.c > +++ b/drivers/soc/fsl/qbman/qman_portal.c > @@ -30,6 +30,8 @@ > > #include "qman_priv.h" > > +#include > + > struct qman_portal *qman_dma_portal; > EXPORT_SYMBOL(qman_dma_portal); > > -- > 2.11.0 Thanks, Paul, I was just getting around to looking into that build failure. I will add this to linux-next as a merge fix patch for the merge of the iommu tree until Joerg gets around to including it in his tree. -- Cheers, Stephen Rothwell
[PATCH -next] soc/qbman: fix implicit header dependency now causing build fails
In commit 461a6946b1f9 ("iommu: Remove pci.h include from trace/events/iommu.h") that header shuffle uncovered an implicit include in this driver, manifesting as: CC drivers/soc/fsl/qbman/qman_portal.o drivers/soc/fsl/qbman/qman_portal.c: In function 'qman_portal_probe': drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of function 'dma_set_mask' drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of function 'DMA_BIT_MASK' if (dma_set_mask(dev, DMA_BIT_MASK(40))) { ^ on the corenet32_smp_defconfig (and 64 bit respectively.) The above commit was singled out via git bisect. The header it was implictly relying on getting was dma-mapping.h - so we explicitly add it here. Fixes: 461a6946b1f9 ("iommu: Remove pci.h include from trace/events/iommu.h") Cc: Joerg Roedel Cc: Scott Wood Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Paul Gortmaker --- drivers/soc/fsl/qbman/qman_portal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c index adbaa30d3c5a..4a6a8ae5e0aa 100644 --- a/drivers/soc/fsl/qbman/qman_portal.c +++ b/drivers/soc/fsl/qbman/qman_portal.c @@ -30,6 +30,8 @@ #include "qman_priv.h" +#include + struct qman_portal *qman_dma_portal; EXPORT_SYMBOL(qman_dma_portal); -- 2.11.0