Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the generic-ioremap tree with the risc-v tree
@ 2019-11-18  6:45 Stephen Rothwell
  2019-11-18  6:51 ` Christoph Hellwig
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2019-11-18  6:45 UTC (permalink / raw)
  To: Christoph Hellwig, Palmer Dabbelt, Paul Walmsley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- 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 --]

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

* Re: linux-next: manual merge of the generic-ioremap tree with the risc-v tree
  2019-11-18  6:45 linux-next: manual merge of the generic-ioremap tree with the risc-v tree Stephen Rothwell
@ 2019-11-18  6:51 ` Christoph Hellwig
  2019-11-19 18:33   ` Paul Walmsley
  0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2019-11-18  6:51 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Christoph Hellwig, Palmer Dabbelt, Paul Walmsley,
	Linux Next Mailing List, Linux Kernel Mailing List

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.  

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

* Re: linux-next: manual merge of the generic-ioremap tree with the risc-v tree
  2019-11-18  6:51 ` Christoph Hellwig
@ 2019-11-19 18:33   ` Paul Walmsley
  0 siblings, 0 replies; 4+ messages in thread
From: Paul Walmsley @ 2019-11-19 18:33 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Stephen Rothwell, Palmer Dabbelt, paul.walmsley, linux-riscv,
	Linux Next Mailing List, Linux Kernel Mailing List

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

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

* linux-next: manual merge of the generic-ioremap tree with the risc-v tree
@ 2019-11-18  6:30 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-11-18  6:30 UTC (permalink / raw)
  To: Christoph Hellwig, Palmer Dabbelt, Paul Walmsley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- 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 --]

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

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18  6:45 linux-next: manual merge of the generic-ioremap tree with the risc-v tree Stephen Rothwell
2019-11-18  6:51 ` Christoph Hellwig
2019-11-19 18:33   ` Paul Walmsley
  -- strict thread matches above, loose matches on Subject: below --
2019-11-18  6:30 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git