* linux-next: manual merge of the pci tree with the asm-generic tree
@ 2014-09-26 3:29 Stephen Rothwell
2014-09-26 7:00 ` Thierry Reding
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2014-09-26 3:29 UTC (permalink / raw)
To: Bjorn Helgaas, Arnd Bergmann
Cc: linux-next, linux-kernel, Thierry Reding, Liviu Dudau
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in
include/asm-generic/io.h between commit 4005bfe0aa45
("asm-generic/io.h: Implement generic {read,write}s*()") from the
asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix
ioport_map() for !CONFIG_GENERIC_IOMAP") from the pci tree.
I fixed it up (the only difference is that the latter castes the result
to void __iomem * - see below) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/asm-generic/io.h
index 3e976be3bdd4,2e2161b0c795..000000000000
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
#ifdef CONFIG_HAS_IOPORT_MAP
#ifndef CONFIG_GENERIC_IOMAP
+#ifndef ioport_map
+#define ioport_map ioport_map
static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
{
- return PCI_IOBASE + (port & IO_SPACE_LIMIT);
+ return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT));
}
+#endif
+#ifndef ioport_unmap
+#define ioport_unmap ioport_unmap
static inline void ioport_unmap(void __iomem *p)
{
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pci tree with the asm-generic tree
2014-09-26 3:29 linux-next: manual merge of the pci tree with the asm-generic tree Stephen Rothwell
@ 2014-09-26 7:00 ` Thierry Reding
2014-09-26 9:13 ` Liviu Dudau
0 siblings, 1 reply; 6+ messages in thread
From: Thierry Reding @ 2014-09-26 7:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Bjorn Helgaas, Arnd Bergmann, linux-next, linux-kernel,
Thierry Reding, Liviu Dudau
[-- Attachment #1: Type: text/plain, Size: 1813 bytes --]
On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in
> include/asm-generic/io.h between commit 4005bfe0aa45
> ("asm-generic/io.h: Implement generic {read,write}s*()") from the
> asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix
> ioport_map() for !CONFIG_GENERIC_IOMAP") from the pci tree.
>
> I fixed it up (the only difference is that the latter castes the result
> to void __iomem * - see below) and can carry the fix as necessary (no
> action is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc include/asm-generic/io.h
> index 3e976be3bdd4,2e2161b0c795..000000000000
> --- a/include/asm-generic/io.h
> +++ b/include/asm-generic/io.h
> @@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
>
> #ifdef CONFIG_HAS_IOPORT_MAP
> #ifndef CONFIG_GENERIC_IOMAP
> +#ifndef ioport_map
> +#define ioport_map ioport_map
> static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
> {
> - return PCI_IOBASE + (port & IO_SPACE_LIMIT);
> + return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT));
I don't think that cast is necessary. All instances of PCI_IOBASE are
already defined to be void __iomem *.
Or at least they were until a few days ago. Commit f3dfddf7bd85 (ARM:
Define PCI_IOBASE as the base of virtual PCI IO space) introduces one
variant for ARM which isn't actually void __iomem *. I think what we
should do is standardize the type of PCI_IOBASE.
So how about we remove commit 3aad9c969c09 (asm-generic/io.h: Fix
ioport_map() for !CONFIG_GENERIC_IOMAP) and move the cast to void
__iomem * to Liviu's definition of PCI_IOBASE for ARM?
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pci tree with the asm-generic tree
2014-09-26 7:00 ` Thierry Reding
@ 2014-09-26 9:13 ` Liviu Dudau
2014-09-26 9:26 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Liviu Dudau @ 2014-09-26 9:13 UTC (permalink / raw)
To: Thierry Reding
Cc: Stephen Rothwell, Bjorn Helgaas, Arnd Bergmann,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thierry Reding
On Fri, Sep 26, 2014 at 08:00:23AM +0100, Thierry Reding wrote:
> On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote:
> > Hi Bjorn,
> >
> > Today's linux-next merge of the pci tree got a conflict in
> > include/asm-generic/io.h between commit 4005bfe0aa45
> > ("asm-generic/io.h: Implement generic {read,write}s*()") from the
> > asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix
> > ioport_map() for !CONFIG_GENERIC_IOMAP") from the pci tree.
> >
> > I fixed it up (the only difference is that the latter castes the result
> > to void __iomem * - see below) and can carry the fix as necessary (no
> > action is required).
> >
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> >
> > diff --cc include/asm-generic/io.h
> > index 3e976be3bdd4,2e2161b0c795..000000000000
> > --- a/include/asm-generic/io.h
> > +++ b/include/asm-generic/io.h
> > @@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
> >
> > #ifdef CONFIG_HAS_IOPORT_MAP
> > #ifndef CONFIG_GENERIC_IOMAP
> > +#ifndef ioport_map
> > +#define ioport_map ioport_map
> > static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
> > {
> > - return PCI_IOBASE + (port & IO_SPACE_LIMIT);
> > + return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT));
>
> I don't think that cast is necessary. All instances of PCI_IOBASE are
> already defined to be void __iomem *.
>
> Or at least they were until a few days ago. Commit f3dfddf7bd85 (ARM:
> Define PCI_IOBASE as the base of virtual PCI IO space) introduces one
> variant for ARM which isn't actually void __iomem *. I think what we
> should do is standardize the type of PCI_IOBASE.
>
> So how about we remove commit 3aad9c969c09 (asm-generic/io.h: Fix
> ioport_map() for !CONFIG_GENERIC_IOMAP) and move the cast to void
> __iomem * to Liviu's definition of PCI_IOBASE for ARM?
>
> Thierry
Hi Stephen,
I agree with Thierry's solution.
I don't know how these cases are handled. Should I send Bjorn a patch for his tree?
Best regards,
Liviu
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pci tree with the asm-generic tree
2014-09-26 9:13 ` Liviu Dudau
@ 2014-09-26 9:26 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2014-09-26 9:26 UTC (permalink / raw)
To: Liviu Dudau
Cc: Thierry Reding, Bjorn Helgaas, Arnd Bergmann,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thierry Reding
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
Hi Liviu,
On Fri, 26 Sep 2014 10:13:57 +0100 Liviu Dudau <Liviu.Dudau@arm.com> wrote:
>
> I agree with Thierry's solution.
>
> I don't know how these cases are handled. Should I send Bjorn a patch for his tree?
They need to be fixed in one or other of the trees, so yes.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the pci tree with the asm-generic tree
@ 2018-04-03 2:14 Stephen Rothwell
2018-04-04 18:38 ` Bjorn Helgaas
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-04-03 2:14 UTC (permalink / raw)
To: Bjorn Helgaas, Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Jesper Nilsson, David Howells
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
arch/cris/arch-v32/drivers/pci/bios.c
between commits:
c690eddc2f3b ("CRIS: Drop support for the CRIS port")
fd8773f9f544 ("arch: remove frv port")
739d875dd698 ("mn10300: Remove the architecture")
from the asm-generic tree and commit:
31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")
from the pci tree.
I fixed it up (I just removed the files) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pci tree with the asm-generic tree
2018-04-03 2:14 Stephen Rothwell
@ 2018-04-04 18:38 ` Bjorn Helgaas
0 siblings, 0 replies; 6+ messages in thread
From: Bjorn Helgaas @ 2018-04-04 18:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, linux-next list, Linux Kernel Mailing List, jesper,
David Howells
On Mon, Apr 2, 2018 at 9:15 PM Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi all,
> Today's linux-next merge of the pci tree got a conflict in:
> arch/cris/arch-v32/drivers/pci/bios.c
> between commits:
> c690eddc2f3b ("CRIS: Drop support for the CRIS port")
> fd8773f9f544 ("arch: remove frv port")
> 739d875dd698 ("mn10300: Remove the architecture")
> from the asm-generic tree and commit:
> 31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")
> from the pci tree.
FWIW, I dropped the cris, frv, and mn10300 parts from my patch
(31cbca85df15).
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-04-04 18:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-26 3:29 linux-next: manual merge of the pci tree with the asm-generic tree Stephen Rothwell
2014-09-26 7:00 ` Thierry Reding
2014-09-26 9:13 ` Liviu Dudau
2014-09-26 9:26 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2018-04-03 2:14 Stephen Rothwell
2018-04-04 18:38 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox