LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the arm-soc tree with the arm-current tree
@ 2015-01-29 22:58 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2015-01-29 22:58 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel, Russell King
  Cc: linux-next, linux-kernel, Will Deacon, Laurent Pinchart

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mm/dma-mapping.c between commit c2273a185354 ("ARM: 8288/1:
dma-mapping: don't detach devices without an IOMMU during teardown")
from the arm-current tree and commit eab8d6530cc0 ("arm: dma-mapping:
Set DMA IOMMU ops in arm_iommu_attach_device()") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mm/dma-mapping.c
index f142ddd6c40a,a673c7f7e208..000000000000
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -2025,10 -2048,7 +2048,10 @@@ static void arm_teardown_iommu_dma_ops(
  {
  	struct dma_iommu_mapping *mapping = dev->archdata.mapping;
  
 +	if (!mapping)
 +		return;
 +
- 	arm_iommu_detach_device(dev);
+ 	__arm_iommu_detach_device(dev);
  	arm_iommu_release_mapping(mapping);
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the arm-soc tree with the arm-current tree
@ 2013-04-11  6:21 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2013-04-11  6:21 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Russell King

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/configs/h7201_defconfig and arch/arm/configs/h7202_defconfig
between commit e42c3074c8f7 ("ARM: remove NWFPE and VFP emulation code
from the kernel") from the arm-current tree and commit 293eb135a924
("ARM: kill Hynix h720x platform") from the arm-soc tree.

The latter deleted the files, so I did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
  2012-09-04 13:11       ` Arnd Bergmann
@ 2012-09-04 13:19         ` Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2012-09-04 13:19 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Rob Herring, Russell King - ARM Linux, Olof Johansson,
	linux-arm-kernel, linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

On Tue, 4 Sep 2012 13:11:02 +0000 Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Tuesday 04 September 2012, Rob Herring wrote:
> > Right. The PCI i/o reserved area has a dummy physical address of 0 and 
> > needs to be skipped by ioremap searches. So we don't set 
> > VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct settings
> > don't really matter when we do the real mapping of the i/o space.
> > 
> > Here's my merge:
> 
> Ok, thanks for the clarification. I've merged Russell's fixes branch
> into the cleanup/io-pci branch now to resolve the conflict.

Even better than me handling it.  Thanks guys.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
  2012-09-04 12:44     ` Rob Herring
  2012-09-04 13:03       ` Stephen Rothwell
@ 2012-09-04 13:11       ` Arnd Bergmann
  2012-09-04 13:19         ` Stephen Rothwell
  1 sibling, 1 reply; 9+ messages in thread
From: Arnd Bergmann @ 2012-09-04 13:11 UTC (permalink / raw)
  To: Rob Herring
  Cc: Russell King - ARM Linux, Stephen Rothwell, Olof Johansson,
	linux-arm-kernel, linux-next, linux-kernel

On Tuesday 04 September 2012, Rob Herring wrote:
> Right. The PCI i/o reserved area has a dummy physical address of 0 and 
> needs to be skipped by ioremap searches. So we don't set 
> VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct settings
> don't really matter when we do the real mapping of the i/o space.
> 
> Here's my merge:

Ok, thanks for the clarification. I've merged Russell's fixes branch
into the cleanup/io-pci branch now to resolve the conflict.

	Arnd

>From 863e99a8c1ea2b0391491904297f57a0f6a1fdd6 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 4 Sep 2012 15:01:37 +0200
Subject: [PATCH] Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci

As Stephen Rothwell reports, a849088aa155 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit c2794437091a ("ARM:
Add fixed PCI i/o mapping") from the arm-soc tree conflict in
a nontrivial way in arch/arm/mm/mmu.c.

Rob Herring explains:
The PCI i/o reserved area has a dummy physical address of 0 and
needs to be skipped by ioremap searches. So we don't set
VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct
settings don't really matter when we do the real mapping of the
i/o space.

Since commit a849088aa155 is at the start of the fixes branch
in the arm tree, we can merge it into the branch that contains
the other ioremap changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>

diff --cc arch/arm/Kconfig
index 58bb75e,6d6e18f..01790958
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig

diff --cc arch/arm/mm/mmu.c
index 714a7fd,eab94bc..a7a9e41
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -792,19 -785,6 +786,19 @@@ void __init iotable_init(struct map_des
  	}
  }
  
 +void __init vm_reserve_area_early(unsigned long addr, unsigned long size,
 +				  void *caller)
 +{
 +	struct vm_struct *vm;
 +
 +	vm = early_alloc_aligned(sizeof(*vm), __alignof__(*vm));
 +	vm->addr = (void *)addr;
 +	vm->size = size;
- 	vm->flags = VM_IOREMAP | VM_ARM_STATIC_MAPPING;
++	vm->flags = VM_IOREMAP | VM_ARM_EMPTY_MAPPING;
 +	vm->caller = caller;
 +	vm_area_add_early(vm);
 +}
 +
  #ifndef CONFIG_ARM_LPAE
  
  /*

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
  2012-09-04 12:44     ` Rob Herring
@ 2012-09-04 13:03       ` Stephen Rothwell
  2012-09-04 13:11       ` Arnd Bergmann
  1 sibling, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2012-09-04 13:03 UTC (permalink / raw)
  To: Rob Herring
  Cc: Russell King - ARM Linux, Arnd Bergmann, Olof Johansson,
	linux-arm-kernel, linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1272 bytes --]

Hi Rob,

On Tue, 04 Sep 2012 07:44:16 -0500 Rob Herring <robherring2@gmail.com> wrote:
>
> Right. The PCI i/o reserved area has a dummy physical address of 0 and 
> needs to be skipped by ioremap searches. So we don't set 
> VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct settings
> don't really matter when we do the real mapping of the i/o space.
> 
> Here's my merge:

Thanks, I shall use this in tomorrow's tree.

> diff --cc arch/arm/mm/mmu.c
> index 4c2d045,c2fa21d,512b2c0..18144e6
> --- a/arch/arm/mm/mmu.c
> +++ b/arch/arm/mm/mmu.c
> @@@@ -785,6 -785,6 -786,19 +786,19 @@@@ void __init iotable_init(struct map_des
>         }
>    }
>    
> ++ void __init vm_reserve_area_early(unsigned long addr, unsigned long size,
> ++                                void *caller)
> ++ {
> ++      struct vm_struct *vm;
> ++ 
> ++      vm = early_alloc_aligned(sizeof(*vm), __alignof__(*vm));
> ++      vm->addr = (void *)addr;
> ++      vm->size = size;
>   -     vm->flags = VM_IOREMAP | VM_ARM_STATIC_MAPPING;
> +++     vm->flags = VM_IOREMAP | VM_ARM_EMPTY_MAPPING;
> ++      vm->caller = caller;
> ++      vm_area_add_early(vm);
> ++ }
> ++ 

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
  2012-09-04  9:01   ` Russell King - ARM Linux
@ 2012-09-04 12:44     ` Rob Herring
  2012-09-04 13:03       ` Stephen Rothwell
  2012-09-04 13:11       ` Arnd Bergmann
  0 siblings, 2 replies; 9+ messages in thread
From: Rob Herring @ 2012-09-04 12:44 UTC (permalink / raw)
  To: Russell King - ARM Linux
  Cc: Arnd Bergmann, Stephen Rothwell, Olof Johansson,
	linux-arm-kernel, linux-next, linux-kernel

On 09/04/2012 04:01 AM, Russell King - ARM Linux wrote:
> On Tue, Sep 04, 2012 at 08:08:24AM +0000, Arnd Bergmann wrote:
>> On Tuesday 04 September 2012, Stephen Rothwell wrote:
>>> Today's linux-next merge of the arm-soc tree got a conflict in
>>> arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
>>> address zero") from the arm-current tree and commit c2794437091a ("ARM:
>>> Add fixed PCI i/o mapping") from the arm-soc tree.
>>>
>>> I am not sure how to fix this, so I have used the arm-current version of
>>> the change to pmd_empty_section_gap() since that changed the vm->flags.
>>> It may be that just changing the vm->flags value in vm_reserve_area_early()
>>> would be ok?
>>
>> If I read this correctly, we want pci_reserve_io to use VM_ARM_STATIC_MAPPING
>> while pmd_empty_section_gap should use VM_ARM_EMPTY_MAPPING, so we probably
>> want to add a flag argument to the vm_reserve_area_early() function.
> 
> Whereas Rob said to me that both can use VM_ARM_EMPTY_MAPPING when I
> queried this conflict last week.

Right. The PCI i/o reserved area has a dummy physical address of 0 and 
needs to be skipped by ioremap searches. So we don't set 
VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct settings
don't really matter when we do the real mapping of the i/o space.

Here's my merge:

diff --cc arch/arm/mm/mmu.c
index 4c2d045,c2fa21d,512b2c0..18144e6
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@@ -785,6 -785,6 -786,19 +786,19 @@@@ void __init iotable_init(struct map_des
        }
   }
   
++ void __init vm_reserve_area_early(unsigned long addr, unsigned long size,
++                                void *caller)
++ {
++      struct vm_struct *vm;
++ 
++      vm = early_alloc_aligned(sizeof(*vm), __alignof__(*vm));
++      vm->addr = (void *)addr;
++      vm->size = size;
  -     vm->flags = VM_IOREMAP | VM_ARM_STATIC_MAPPING;
+++     vm->flags = VM_IOREMAP | VM_ARM_EMPTY_MAPPING;
++      vm->caller = caller;
++      vm_area_add_early(vm);
++ }
++ 
   #ifndef CONFIG_ARM_LPAE
   
   /*

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
  2012-09-04  8:08 ` Arnd Bergmann
@ 2012-09-04  9:01   ` Russell King - ARM Linux
  2012-09-04 12:44     ` Rob Herring
  0 siblings, 1 reply; 9+ messages in thread
From: Russell King - ARM Linux @ 2012-09-04  9:01 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Stephen Rothwell, Olof Johansson, linux-arm-kernel, linux-next,
	linux-kernel, Rob Herring

On Tue, Sep 04, 2012 at 08:08:24AM +0000, Arnd Bergmann wrote:
> On Tuesday 04 September 2012, Stephen Rothwell wrote:
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
> > address zero") from the arm-current tree and commit c2794437091a ("ARM:
> > Add fixed PCI i/o mapping") from the arm-soc tree.
> > 
> > I am not sure how to fix this, so I have used the arm-current version of
> > the change to pmd_empty_section_gap() since that changed the vm->flags.
> > It may be that just changing the vm->flags value in vm_reserve_area_early()
> > would be ok?
> 
> If I read this correctly, we want pci_reserve_io to use VM_ARM_STATIC_MAPPING
> while pmd_empty_section_gap should use VM_ARM_EMPTY_MAPPING, so we probably
> want to add a flag argument to the vm_reserve_area_early() function.

Whereas Rob said to me that both can use VM_ARM_EMPTY_MAPPING when I
queried this conflict last week.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the arm-soc tree with the arm-current tree
  2012-09-04  6:06 Stephen Rothwell
@ 2012-09-04  8:08 ` Arnd Bergmann
  2012-09-04  9:01   ` Russell King - ARM Linux
  0 siblings, 1 reply; 9+ messages in thread
From: Arnd Bergmann @ 2012-09-04  8:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Olof Johansson, linux-arm-kernel, linux-next, linux-kernel,
	Rob Herring, Russell King

On Tuesday 04 September 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
> address zero") from the arm-current tree and commit c2794437091a ("ARM:
> Add fixed PCI i/o mapping") from the arm-soc tree.
> 
> I am not sure how to fix this, so I have used the arm-current version of
> the change to pmd_empty_section_gap() since that changed the vm->flags.
> It may be that just changing the vm->flags value in vm_reserve_area_early()
> would be ok?

If I read this correctly, we want pci_reserve_io to use VM_ARM_STATIC_MAPPING
while pmd_empty_section_gap should use VM_ARM_EMPTY_MAPPING, so we probably
want to add a flag argument to the vm_reserve_area_early() function.

	Arnd

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the arm-soc tree with the arm-current tree
@ 2012-09-04  6:06 Stephen Rothwell
  2012-09-04  8:08 ` Arnd Bergmann
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2012-09-04  6:06 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Rob Herring, Russell King

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mm/mmu.c between commit a849088aa155 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit c2794437091a ("ARM:
Add fixed PCI i/o mapping") from the arm-soc tree.

I am not sure how to fix this, so I have used the arm-current version of
the change to pmd_empty_section_gap() since that changed the vm->flags.
It may be that just changing the vm->flags value in vm_reserve_area_early()
would be ok?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-01-29 22:58 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-29 22:58 linux-next: manual merge of the arm-soc tree with the arm-current tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2013-04-11  6:21 Stephen Rothwell
2012-09-04  6:06 Stephen Rothwell
2012-09-04  8:08 ` Arnd Bergmann
2012-09-04  9:01   ` Russell King - ARM Linux
2012-09-04 12:44     ` Rob Herring
2012-09-04 13:03       ` Stephen Rothwell
2012-09-04 13:11       ` Arnd Bergmann
2012-09-04 13:19         ` 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).