Patchwork [GIT,PULL,1/2] ARM: mvebu: MSI/PCI changes for v3.12

login
register
mail settings
Submitter Jason
Date Aug. 14, 2013, 7:10 p.m.
Message ID <20130814191011.GD13964@titan.lakedaemon.net>
Download mbox
Permalink /patch/267183/
State New
Headers show

Pull-request

git://git.infradead.org/linux-mvebu.git tags/msi-3.12

Comments

Jason - Aug. 14, 2013, 7:10 p.m.
Arnd, Olof,

This branch is a dependency for both the mvebu MSI series (2/2 in this
thread), and Thierry Reding's patch series coming to you from Stephen
Warren.

thx,

Jason.


The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:

  Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git tags/msi-3.12

for you to fetch changes up to 6a4324ebf5cf412d55fd1ea259d4dd29fb8f90e8:

  PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms (2013-08-13 15:16:30 +0000)

----------------------------------------------------------------
mvebu msi pci changes for v3.12

 - introduce support for MSI on PCI
 - fix s390 build breakage when !HAVE_GENERIC_HARDIRQS

NOTE: This branch is a dependency for changes going though arm-soc from both
Thomas Petazzoni and Thierry Reding.

----------------------------------------------------------------
Thierry Reding (1):
      PCI: Introduce new MSI chip infrastructure

Thomas Petazzoni (5):
      PCI: use weak functions for MSI arch-specific functions
      PCI: remove ARCH_SUPPORTS_MSI kconfig option
      of: pci: add registry of MSI chips
      ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci
      PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms

 arch/arm/Kconfig                |  1 -
 arch/arm/include/asm/mach/pci.h |  4 ++
 arch/arm/kernel/bios32.c        | 16 ++++++++
 arch/ia64/Kconfig               |  1 -
 arch/mips/Kconfig               |  2 -
 arch/mips/include/asm/pci.h     |  5 ---
 arch/powerpc/Kconfig            |  1 -
 arch/powerpc/include/asm/pci.h  |  5 ---
 arch/s390/Kconfig               |  1 -
 arch/s390/include/asm/pci.h     |  4 --
 arch/sparc/Kconfig              |  1 -
 arch/tile/Kconfig               |  1 -
 arch/x86/Kconfig                |  1 -
 arch/x86/include/asm/pci.h      | 30 ---------------
 arch/x86/kernel/x86_init.c      | 24 ++++++++++++
 drivers/of/of_pci.c             | 45 ++++++++++++++++++++++
 drivers/pci/Kconfig             |  4 --
 drivers/pci/msi.c               | 85 ++++++++++++++++++++++++++++++-----------
 drivers/pci/probe.c             |  1 +
 include/linux/msi.h             | 21 +++++++++-
 include/linux/of_pci.h          | 12 ++++++
 include/linux/pci.h             |  1 +
 22 files changed, 185 insertions(+), 81 deletions(-)
Olof Johansson - Aug. 16, 2013, 6:26 a.m.
Hi,

On Wed, Aug 14, 2013 at 03:10:11PM -0400, Jason Cooper wrote:

>       PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms

I can't find this patch posted anywhere, and it lacks acks. For trivial code in
your own subsystem that's sometimes ok, but this cuts across to PCI.


-Olof
Jason - Aug. 16, 2013, 12:55 p.m.
On Thu, Aug 15, 2013 at 11:26:09PM -0700, Olof Johansson wrote:
> Hi,
> 
> On Wed, Aug 14, 2013 at 03:10:11PM -0400, Jason Cooper wrote:
> 
> >       PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms
> 
> I can't find this patch posted anywhere, and it lacks acks. For trivial code in
> your own subsystem that's sometimes ok, but this cuts across to PCI.

oops, you're right.  I've forwarded the email where Bjorn said the
change looked ok.  I missed that the original build failure didn't Cc:
any MLs.

thx,

Jason.
Olof Johansson - Aug. 29, 2013, 5:07 p.m.
On Fri, Aug 16, 2013 at 08:55:02AM -0400, Jason Cooper wrote:
> On Thu, Aug 15, 2013 at 11:26:09PM -0700, Olof Johansson wrote:
> > Hi,
> > 
> > On Wed, Aug 14, 2013 at 03:10:11PM -0400, Jason Cooper wrote:
> > 
> > >       PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms
> > 
> > I can't find this patch posted anywhere, and it lacks acks. For trivial code in
> > your own subsystem that's sometimes ok, but this cuts across to PCI.
> 
> oops, you're right.  I've forwarded the email where Bjorn said the
> change looked ok.  I missed that the original build failure didn't Cc:
> any MLs.

Pulled in under next/drivers.


-Olof
Olof Johansson - Aug. 29, 2013, 5:15 p.m.
On Wed, Aug 14, 2013 at 03:23:17PM -0400, Jason Cooper wrote:
> Arnd, Olof,
> 
> This branch has a conflict with mvebu/drivers (the MBus dt binding work)
> that is rather extensive.  I've attached the resolution that has been
> in -next below the summary.

So this is a textbook example of when you should resolve the conflicts in your
own tree by building the branches on top of each other.

Your proposed resolutions don't match what I get in my tree, and don't match
what is in linux-next right now. Please resend this based on top of
mvebu/drivers and I'll pull it in as a late branch for 3.12.


-Olof