linux-next: manual merge of the generic-ioremap tree with the risc-v tree

linux-next: manual merge of the generic-ioremap tree with the risc-v tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the generic-ioremap tree got a conflict in:

  arch/riscv/include/asm/io.h

between commit:

  0c3ac28931d5 ("riscv: separate MMIO functions into their own header file")

from the risc-v tree and commits:

  d092a8707326 ("arch: rely on asm-generic/io.h for default ioremap_* definitions")
  38af57825313 ("riscv: use the generic ioremap code")

from the generic-ioremap tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Nov 2019 17:42:04 +1100
Subject: [PATCH] fixup for moved code in riscv

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/riscv/include/asm/mmio.h | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/arch/riscv/include/asm/mmio.h b/arch/riscv/include/asm/mmio.h
index a297a835e402..a2c809df2733 100644
--- a/arch/riscv/include/asm/mmio.h
+++ b/arch/riscv/include/asm/mmio.h
@@ -14,20 +14,7 @@
 #include <linux/types.h>
 #include <asm/mmiowb.h>
 
-#ifdef CONFIG_MMU
-void __iomem *ioremap(phys_addr_t offset, unsigned long size);
-
-/*
- * The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't
- * change the properties of memory regions.  This should be fixed by the
- * upcoming platform spec.
- */
-#define ioremap_nocache(addr, size) ioremap((addr), (size))
-#define ioremap_wc(addr, size) ioremap((addr), (size))
-#define ioremap_wt(addr, size) ioremap((addr), (size))
-
-void iounmap(volatile void __iomem *addr);
-#else
+#ifndef CONFIG_MMU
 #define pgprot_noncached(x)	(x)
 #endif /* CONFIG_MMU */
 
-- 
2.23.0

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: manual merge of the generic-ioremap tree with the risc-v tree

[Christoph Hellwig]

On Mon, Nov 18, 2019 at 05:45:01PM +1100, Stephen Rothwell wrote:
>   0c3ac28931d5 ("riscv: separate MMIO functions into their own header file")

As already mentioned in reply to this patch when it was posted I think
this kinda of split is a very bad idea.  

Re: linux-next: manual merge of the generic-ioremap tree with the risc-v tree

[Paul Walmsley]

Christoph,

On Mon, 18 Nov 2019, Christoph Hellwig wrote:

> On Mon, Nov 18, 2019 at 05:45:01PM +1100, Stephen Rothwell wrote:
> >   0c3ac28931d5 ("riscv: separate MMIO functions into their own header file")
> 
> As already mentioned in reply to this patch when it was posted I think
> this kinda of split is a very bad idea.  

Unless I missed a followup from you, you mentioned that you thought there 
might be a better way to implement it, but you didn't highlight any 
problems with it:

   https://lore.kernel.org/linux-riscv/20191031155608.GB7270@lst.de/

If you think there's something critically wrong with the patch that can be 
fixed in time for the merge window, I'm happy to take a look at a 
proposal.  Otherwise I think we'll need to drop the nommu set from the 
v5.5 queue.


- Paul

linux-next: manual merge of the generic-ioremap tree with the risc-v tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the generic-ioremap tree got a conflict in:

  arch/riscv/mm/Makefile

between commit:

  e9987a5b2ad3 ("riscv: add nommu support")

from the risc-v tree and commit:

  38af57825313 ("riscv: use the generic ioremap code")

from the generic-ioremap tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/mm/Makefile
index 44ab8f28c3fa,b3a356c80c1f..000000000000
--- a/arch/riscv/mm/Makefile
+++ b/arch/riscv/mm/Makefile
@@@ -6,8 -6,8 +6,8 @@@ CFLAGS_REMOVE_init.o = -p
  endif
  
  obj-y += init.o
 -obj-y += fault.o
  obj-y += extable.o
- obj-$(CONFIG_MMU) += fault.o ioremap.o
++obj-$(CONFIG_MMU) += fault.o
  obj-y += cacheflush.o
  obj-y += context.o
  obj-y += sifive_l2_cache.o

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