* linux-next: manual merge of the xen-tip tree with the arm-soc tree
@ 2014-12-08 7:49 Stephen Rothwell
2014-12-08 10:33 ` Will Deacon
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2014-12-08 7:49 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, David Vrabel, Catalin Marinas,
Will Deacon, Russell King
[-- Attachment #1: Type: text/plain, Size: 2472 bytes --]
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in
arch/arm/include/asm/dma-mapping.h between commits a3a60f81ee6f
("dma-mapping: replace set_arch_dma_coherent_ops with
arch_setup_dma_ops") and 4bb25789ed28 ("arm: dma-mapping: plumb our
iommu mapping ops into arch_setup_dma_ops") from the arm-soc tree and
commit 3d5391ac6f5e ("arm: introduce is_device_dma_coherent") from the
xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
I also neede this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Dec 2014 18:46:59 +1100
Subject: [PATCH] arm: introduce is_device_dma_coherent merge fix
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/mm/dma-mapping.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 09645f00bd17..43064cbe58f9 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2058,6 +2058,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
else
dma_ops = arm_get_dma_map_ops(coherent);
+ dev->archdata.dma_coherent = coherent;
set_dma_ops(dev, dma_ops);
}
--
2.1.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/include/asm/dma-mapping.h
index 9410b7e548fc,e6e3446abdf6..000000000000
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@@ -121,13 -121,20 +121,19 @@@ static inline unsigned long dma_max_pfn
}
#define dma_max_pfn(dev) dma_max_pfn(dev)
-static inline int set_arch_dma_coherent_ops(struct device *dev)
-{
- dev->archdata.dma_coherent = true;
- set_dma_ops(dev, &arm_coherent_dma_ops);
- return 0;
-}
-#define set_arch_dma_coherent_ops(dev) set_arch_dma_coherent_ops(dev)
+#define arch_setup_dma_ops arch_setup_dma_ops
+extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
+ struct iommu_ops *iommu, bool coherent);
+
+#define arch_teardown_dma_ops arch_teardown_dma_ops
+extern void arch_teardown_dma_ops(struct device *dev);
+ /* do not use this function in a driver */
+ static inline bool is_device_dma_coherent(struct device *dev)
+ {
+ return dev->archdata.dma_coherent;
+ }
+
static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
{
unsigned int offset = paddr & ~PAGE_MASK;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the xen-tip tree with the arm-soc tree
2014-12-08 7:49 linux-next: manual merge of the xen-tip tree with the arm-soc tree Stephen Rothwell
@ 2014-12-08 10:33 ` Will Deacon
2014-12-23 2:26 ` linux-next: missing merge fix patch for the " Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Will Deacon @ 2014-12-08 10:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Olof Johansson, Arnd Bergmann, linux-arm-kernel,
linux-next, linux-kernel, David Vrabel, Catalin Marinas,
Russell King
On Mon, Dec 08, 2014 at 07:49:08AM +0000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in
> arch/arm/include/asm/dma-mapping.h between commits a3a60f81ee6f
> ("dma-mapping: replace set_arch_dma_coherent_ops with
> arch_setup_dma_ops") and 4bb25789ed28 ("arm: dma-mapping: plumb our
> iommu mapping ops into arch_setup_dma_ops") from the arm-soc tree and
> commit 3d5391ac6f5e ("arm: introduce is_device_dma_coherent") from the
> xen-tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> I also neede this merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Dec 2014 18:46:59 +1100
> Subject: [PATCH] arm: introduce is_device_dma_coherent merge fix
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/arm/mm/dma-mapping.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 09645f00bd17..43064cbe58f9 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -2058,6 +2058,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
> else
> dma_ops = arm_get_dma_map_ops(coherent);
>
> + dev->archdata.dma_coherent = coherent;
> set_dma_ops(dev, dma_ops);
> }
Looks good to me.
Cheers,
Will
> --
> 2.1.3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/include/asm/dma-mapping.h
> index 9410b7e548fc,e6e3446abdf6..000000000000
> --- a/arch/arm/include/asm/dma-mapping.h
> +++ b/arch/arm/include/asm/dma-mapping.h
> @@@ -121,13 -121,20 +121,19 @@@ static inline unsigned long dma_max_pfn
> }
> #define dma_max_pfn(dev) dma_max_pfn(dev)
>
> -static inline int set_arch_dma_coherent_ops(struct device *dev)
> -{
> - dev->archdata.dma_coherent = true;
> - set_dma_ops(dev, &arm_coherent_dma_ops);
> - return 0;
> -}
> -#define set_arch_dma_coherent_ops(dev) set_arch_dma_coherent_ops(dev)
> +#define arch_setup_dma_ops arch_setup_dma_ops
> +extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
> + struct iommu_ops *iommu, bool coherent);
> +
> +#define arch_teardown_dma_ops arch_teardown_dma_ops
> +extern void arch_teardown_dma_ops(struct device *dev);
>
> + /* do not use this function in a driver */
> + static inline bool is_device_dma_coherent(struct device *dev)
> + {
> + return dev->archdata.dma_coherent;
> + }
> +
> static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
> {
> unsigned int offset = paddr & ~PAGE_MASK;
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree
2014-12-08 10:33 ` Will Deacon
@ 2014-12-23 2:26 ` Stephen Rothwell
2014-12-23 4:09 ` Linus Torvalds
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2014-12-23 2:26 UTC (permalink / raw)
To: Linus
Cc: Will Deacon, Jeremy Fitzhardinge, Konrad Rzeszutek Wilk,
Stefano Stabellini, Xen Devel, Olof Johansson, Arnd Bergmann,
linux-arm-kernel, linux-next, linux-kernel, David Vrabel,
Catalin Marinas, Russell King
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
Hi Linus,
I have been carrying this merge fix patch for some time that is now
needed in your tree:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Dec 2014 18:46:59 +1100
Subject: [PATCH] arm: introduce is_device_dma_coherent merge fix
The merge of the (linux-next) xen-tip tree got a conflict in
arch/arm/include/asm/dma-mapping.h between commits a3a60f81ee6f
("dma-mapping: replace set_arch_dma_coherent_ops with
arch_setup_dma_ops") and 4bb25789ed28 ("arm: dma-mapping: plumb our
iommu mapping ops into arch_setup_dma_ops") from the arm-soc tree and
commit 3d5391ac6f5e ("arm: introduce is_device_dma_coherent") from the
xen-tip tree. It was fixed up, but also required this additional fix.
"Looks good to me"-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/mm/dma-mapping.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 09645f00bd17..43064cbe58f9 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2058,6 +2058,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
else
dma_ops = arm_get_dma_map_ops(coherent);
+ dev->archdata.dma_coherent = coherent;
set_dma_ops(dev, dma_ops);
}
--
2.1.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree
2014-12-23 2:26 ` linux-next: missing merge fix patch for the " Stephen Rothwell
@ 2014-12-23 4:09 ` Linus Torvalds
2014-12-23 6:32 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Linus Torvalds @ 2014-12-23 4:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Will Deacon, Jeremy Fitzhardinge, Konrad Rzeszutek Wilk,
Stefano Stabellini, Xen Devel, Olof Johansson, Arnd Bergmann,
linux-arm-kernel, linux-next, linux-kernel, David Vrabel,
Catalin Marinas, Russell King
On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus,
>
> I have been carrying this merge fix patch for some time that is now
> needed in your tree:
No, it's not. Look more closely.
My merge put the
dev->archdata.dma_coherent = coherent;
line at the top of the function, like the way it was in the original commit.
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree
2014-12-23 4:09 ` Linus Torvalds
@ 2014-12-23 6:32 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2014-12-23 6:32 UTC (permalink / raw)
To: Linus Torvalds
Cc: Will Deacon, Jeremy Fitzhardinge, Konrad Rzeszutek Wilk,
Stefano Stabellini, Xen Devel, Olof Johansson, Arnd Bergmann,
linux-arm-kernel, linux-next, linux-kernel, David Vrabel,
Catalin Marinas, Russell King
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
Hi Linus,
On Mon, 22 Dec 2014 20:09:50 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Linus,
> >
> > I have been carrying this merge fix patch for some time that is now
> > needed in your tree:
>
> No, it's not. Look more closely.
>
> My merge put the
>
> dev->archdata.dma_coherent = coherent;
>
> line at the top of the function, like the way it was in the original commit.
Oops, sorry about that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-12-23 6:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-08 7:49 linux-next: manual merge of the xen-tip tree with the arm-soc tree Stephen Rothwell
2014-12-08 10:33 ` Will Deacon
2014-12-23 2:26 ` linux-next: missing merge fix patch for the " Stephen Rothwell
2014-12-23 4:09 ` Linus Torvalds
2014-12-23 6:32 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).