Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Thu, 2009-08-27 at 09:22 +0200, Ingo Molnar wrote: ah, yes, they are stable/fine. I've put it into a separate branch for you. Ben, please pull the latest iommu-for-powerpc git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git iommu-for-powerpc And i could pull back the new bits from you once you have the new patches added and are happy with them. [I suspect you dont want the diffstat below in the powerpc tree] That was the plan, right? Sure, no problem. I'll stick that in powerpc-next tomorrow hopefully. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Thu, 2009-08-13 at 10:55 +0200, Ingo Molnar wrote: Ok! We could also stage it a bit (one or two weeks) in a separate branch and allow a rebase, should you find any bugs during testing? Allright so after various delays and sidetracking on my side, the patches have been in my -test branch for long enough, I'm happy for them to go in either way now. I'm going to take them out of powerpc test for now and not put them in my -next right away until I'm sure I have the right source to pull, at which point I can just put from tip iommu. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Thu, 2009-08-27 at 13:12 +1000, Benjamin Herrenschmidt wrote: On Thu, 2009-08-13 at 10:55 +0200, Ingo Molnar wrote: Ok! We could also stage it a bit (one or two weeks) in a separate branch and allow a rebase, should you find any bugs during testing? Allright so after various delays and sidetracking on my side, the patches have been in my -test branch for long enough, I'm happy for them to go in either way now. I'm going to take them out of powerpc test for now and not put them in my -next right away until I'm sure I have the right source to pull, at which point I can just put from tip iommu. IE. I think I was not clear :-) I mean, I plan to pull tip/iommu into powerpc-next and then apply the patches, but I want just your final word that this is a stable (non-rebase) branch and from Fujita that the patches are still good and haven't changed from those currently on patchwork. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Wed, 2009-08-05 at 14:08 +0900, FUJITA Tomonori wrote: The above swiotlb patchset was merged in -tip so I think that merging this patchset via -tip too is the easiest way to handle this patchset. The patchset also is available via a git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git powerpc Hi ! While I generally agree here with the patches, I'm not sure it should be merged via -tip since it mostly touches arch/powerpc files (and I need to review it a bit more carefully, hopefully you'll have Ack's hitting your mailbox later today). Ben. = arch/powerpc/Kconfig |7 +- arch/powerpc/include/asm/device.h |7 +- arch/powerpc/include/asm/dma-mapping.h | 318 +++- arch/powerpc/include/asm/pci.h |4 +- arch/powerpc/include/asm/swiotlb.h |8 +- arch/powerpc/kernel/dma-iommu.c|2 +- arch/powerpc/kernel/dma-swiotlb.c | 53 ++--- arch/powerpc/kernel/dma.c | 13 +- arch/powerpc/kernel/ibmebus.c |2 +- arch/powerpc/kernel/pci-common.c |6 +- arch/powerpc/kernel/vio.c |2 +- arch/powerpc/platforms/85xx/mpc8536_ds.c |3 +- arch/powerpc/platforms/85xx/mpc85xx_ds.c |3 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c |3 +- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c |3 +- arch/powerpc/platforms/cell/iommu.c|2 +- arch/powerpc/platforms/ps3/system-bus.c|4 +- include/linux/dma-mapping.h|1 + 18 files changed, 89 insertions(+), 352 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Thu, 2009-08-13 at 16:44 +1000, Benjamin Herrenschmidt wrote: On Wed, 2009-08-05 at 14:08 +0900, FUJITA Tomonori wrote: The above swiotlb patchset was merged in -tip so I think that merging this patchset via -tip too is the easiest way to handle this patchset. The patchset also is available via a git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git powerpc Hi ! While I generally agree here with the patches, I'm not sure it should be merged via -tip since it mostly touches arch/powerpc files (and I need to review it a bit more carefully, hopefully you'll have Ack's hitting your mailbox later today). Maybe best is that I pull your series too. Note that your patch clashes with Takashi's addition of dma_mmap_coherent() : http://patchwork.ozlabs.org/patch/29595/ Can you sort that out with Takashi as I'd like his patch in -next soon too. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Thu, 13 Aug 2009 15:48:42 +1000 Benjamin Herrenschmidt b...@kernel.crashing.org wrote: On Wed, 2009-08-05 at 14:08 +0900, FUJITA Tomonori wrote: The above swiotlb patchset was merged in -tip so I think that merging this patchset via -tip too is the easiest way to handle this patchset. The patchset also is available via a git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git powerpc Hi ! While I generally agree here with the patches, I'm not sure it should be merged via -tip since it mostly touches arch/powerpc files (and I need to review it a bit more carefully, hopefully you'll have Ack's hitting your mailbox later today). Thanks! This patchset depends on my swiotlb cleanup patchset: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git swiotlb http://marc.info/?l=linux-ia64m=124718816520156w=2 My swiotlb cleanup patchset has been in -tip. It might be easier to merge both the swiotlb patchset and this patchset in powerpc tree? ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
At Thu, 13 Aug 2009 16:51:53 +1000, Benjamin Herrenschmidt wrote: On Thu, 2009-08-13 at 16:44 +1000, Benjamin Herrenschmidt wrote: On Wed, 2009-08-05 at 14:08 +0900, FUJITA Tomonori wrote: The above swiotlb patchset was merged in -tip so I think that merging this patchset via -tip too is the easiest way to handle this patchset. The patchset also is available via a git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git powerpc Hi ! While I generally agree here with the patches, I'm not sure it should be merged via -tip since it mostly touches arch/powerpc files (and I need to review it a bit more carefully, hopefully you'll have Ack's hitting your mailbox later today). Maybe best is that I pull your series too. Note that your patch clashes with Takashi's addition of dma_mmap_coherent() : http://patchwork.ozlabs.org/patch/29595/ Can you sort that out with Takashi as I'd like his patch in -next soon too. I'm willing to rebase my patches to the generic dma_ops, so feel free to pull it first. It might need to add mmap_coherent op to all platforms when generic dma ops is used. This would be more volume but less hackish than the previous version, OTOH :) thanks, Takashi ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Thu, 2009-08-13 at 09:11 +0200, Takashi Iwai wrote: I'm willing to rebase my patches to the generic dma_ops, so feel free to pull it first. I think I'll end up pulling Ingo's iommu branch into powerpc-next to get Fujita stuff, so if you rebase on top of his stuff, it will come along just fine. It might need to add mmap_coherent op to all platforms when generic dma ops is used. This would be more volume but less hackish than the previous version, OTOH :) Right :-) Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
Ben, what's your preference? I waited for your reaction with these bits, i.e. they are not in tip:core/iommu yet. Oh I though they were... discard my previous private mail about missing Ack's then :-) I'll review them more in depth hopefully tomorrow but they look good. One variant would be what Fujita suggested: you could pull core/iommu as a basis (it's a well-tested, problem-free tree at the moment, with no big risky items), and then pull/apply the powerpc specific bits from Fujita. Or we can have the patches in core/iommu and I pull the whole thing in powerpc-next. My main concern isn't which tree they go through but that they are in powerpc-next for better testing. Cheers, Ben. A second variant would be that we could pull these bits into core/iommu ... albeit you are right that the PowerPC tree is much better at testing PowerPC patches. A third variant would be to wait with these bits until the swiotlb bits in core/iommu hit upstream. This would increase patch latency. Any of these variants is good to me. What Fujita suggests seems to be the best to me: #1 gets us the most testing and the lowest latency - at the cost of tree dependency. We wont rebase core/iommu. [ We've got three good tree properties: tree independence, good testing, low patch latency, but we cannot have all three at once, we must pick two of them ;-) ] Ingo ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
At Thu, 13 Aug 2009 18:07:57 +1000, Benjamin Herrenschmidt wrote: On Thu, 2009-08-13 at 09:11 +0200, Takashi Iwai wrote: I'm willing to rebase my patches to the generic dma_ops, so feel free to pull it first. I think I'll end up pulling Ingo's iommu branch into powerpc-next to get Fujita stuff, so if you rebase on top of his stuff, it will come along just fine. OK, I'll work on it later. thanks, Takashi ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
* FUJITA Tomonori fujita.tomon...@lab.ntt.co.jp wrote: On Thu, 13 Aug 2009 15:48:42 +1000 Benjamin Herrenschmidt b...@kernel.crashing.org wrote: On Wed, 2009-08-05 at 14:08 +0900, FUJITA Tomonori wrote: The above swiotlb patchset was merged in -tip so I think that merging this patchset via -tip too is the easiest way to handle this patchset. The patchset also is available via a git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git powerpc Hi ! While I generally agree here with the patches, I'm not sure it should be merged via -tip since it mostly touches arch/powerpc files (and I need to review it a bit more carefully, hopefully you'll have Ack's hitting your mailbox later today). Thanks! This patchset depends on my swiotlb cleanup patchset: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git swiotlb http://marc.info/?l=linux-ia64m=124718816520156w=2 My swiotlb cleanup patchset has been in -tip. It might be easier to merge both the swiotlb patchset and this patchset in powerpc tree? Ben, what's your preference? I waited for your reaction with these bits, i.e. they are not in tip:core/iommu yet. One variant would be what Fujita suggested: you could pull core/iommu as a basis (it's a well-tested, problem-free tree at the moment, with no big risky items), and then pull/apply the powerpc specific bits from Fujita. A second variant would be that we could pull these bits into core/iommu ... albeit you are right that the PowerPC tree is much better at testing PowerPC patches. A third variant would be to wait with these bits until the swiotlb bits in core/iommu hit upstream. This would increase patch latency. Any of these variants is good to me. What Fujita suggests seems to be the best to me: #1 gets us the most testing and the lowest latency - at the cost of tree dependency. We wont rebase core/iommu. [ We've got three good tree properties: tree independence, good testing, low patch latency, but we cannot have all three at once, we must pick two of them ;-) ] Ingo ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
* Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Ben, what's your preference? I waited for your reaction with these bits, i.e. they are not in tip:core/iommu yet. Oh I though they were... discard my previous private mail about missing Ack's then :-) I'll review them more in depth hopefully tomorrow but they look good. Sure - take your time. One variant would be what Fujita suggested: you could pull core/iommu as a basis (it's a well-tested, problem-free tree at the moment, with no big risky items), and then pull/apply the powerpc specific bits from Fujita. Or we can have the patches in core/iommu and I pull the whole thing in powerpc-next. [...] Ok! We could also stage it a bit (one or two weeks) in a separate branch and allow a rebase, should you find any bugs during testing? Ingo ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Thu, 2009-08-13 at 10:55 +0200, Ingo Molnar wrote: Or we can have the patches in core/iommu and I pull the whole thing in powerpc-next. [...] Ok! We could also stage it a bit (one or two weeks) in a separate branch and allow a rebase, should you find any bugs during testing? Sounds like a plan. I'll try to sort that out tomorrow, I can stick them in my -test branch (which is rebase friendly) for a while too. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
On Aug 13, 2009, at 5:38 AM, Benjamin Herrenschmidt wrote: On Thu, 2009-08-13 at 10:55 +0200, Ingo Molnar wrote: Or we can have the patches in core/iommu and I pull the whole thing in powerpc-next. [...] Ok! We could also stage it a bit (one or two weeks) in a separate branch and allow a rebase, should you find any bugs during testing? Sounds like a plan. I'll try to sort that out tomorrow, I can stick them in my -test branch (which is rebase friendly) for a while too. Getting them all in your -test branch gives Becky and I an opportunity to test them w/all the other PPC changes on the platforms we have that enable SWIOTLB today. - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH -v2 0/7] powerpc: use asm-generic/dma-mapping-common.h
This is the second version of the patchset to convert POWERPC to use asm-generic/dma-mapping-common.h: http://marc.info/?l=linux-kernelm=124840628128189w=2 There are some minor changes since the first version are: - removed unused CONFIG_PPC_NEED_DMA_SYNC_OPS [5/7] (Becky pointed out). - added Becky's Acked-by - added two new patches ([6/7] and [7/7]). [6/7] fixes SWIOTLB's dma_mapping_error(). [7/7] addes CONFIG_DMA_API_DEBUG support. This is on the top of my swiotlb cleanup patchset: http://marc.info/?l=linuxppc-embeddedm=124718920320951w=2 The above swiotlb patchset was merged in -tip so I think that merging this patchset via -tip too is the easiest way to handle this patchset. The patchset also is available via a git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tomo/linux-2.6-misc.git powerpc = arch/powerpc/Kconfig |7 +- arch/powerpc/include/asm/device.h |7 +- arch/powerpc/include/asm/dma-mapping.h | 318 +++- arch/powerpc/include/asm/pci.h |4 +- arch/powerpc/include/asm/swiotlb.h |8 +- arch/powerpc/kernel/dma-iommu.c|2 +- arch/powerpc/kernel/dma-swiotlb.c | 53 ++--- arch/powerpc/kernel/dma.c | 13 +- arch/powerpc/kernel/ibmebus.c |2 +- arch/powerpc/kernel/pci-common.c |6 +- arch/powerpc/kernel/vio.c |2 +- arch/powerpc/platforms/85xx/mpc8536_ds.c |3 +- arch/powerpc/platforms/85xx/mpc85xx_ds.c |3 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c |3 +- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c |3 +- arch/powerpc/platforms/cell/iommu.c|2 +- arch/powerpc/platforms/ps3/system-bus.c|4 +- include/linux/dma-mapping.h|1 + 18 files changed, 89 insertions(+), 352 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
