Patchwork [GIT,PULL] Integrator/AP PCI DT support

login
register
mail settings
Submitter Linus Walleij
Date June 3, 2013, 11:09 a.m.
Message ID <CACRpkdb8J4+QH36SYavgGWbFWaBZDg5JSYyyJELzL=mSZfMnBw@mail.gmail.com>
Download mbox
Permalink /patch/248237/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git

Comments

Linus Walleij - June 3, 2013, 11:09 a.m.
Hi ARM SoC folks,

here is a pull request for the Integrator/AP PCI DT support.

This is the final stepping stone making way for this development TODO:

- Preparing removal of the board files for the Integrators
- Multiplatform support
- Moving the PCIv3 driver to drivers/pci

The patches have been around on the lists for a long time now, only
waiting for the infrastructure recently added to the ARM SoC tree.

As you can see it is based on the of/pci-helpers branch in the ARM SoC
tree. I pulled this branch into my tree and rebased the patch set onto
this.

All is ACKed by Arnd except for the patch adding the function
pci_common_init_dev() to arch/arm/include/asm/mach/pci.h.
So this will be a good time for anyone who doesn't like that idea
to protest in the last minute.

Anyway: please pull it in.

Yours,
Linus Walleij


The following changes since commit 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090:

  of/pci: Add of_pci_parse_bus_range() function (2013-05-19 20:30:10 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
tags/integrator-pci-for-arm-soc

for you to fetch changes up to 81719809c6fa914e48c4d4e739eb643a40e87034:

  ARM: integrator: get PCI device IRQs from device tree (2013-06-03
10:00:40 +0200)

----------------------------------------------------------------
This is a patch series that:
- Pulls the Integrator/AP PCI bridge driver into one file
- Adds full device tree support for it

----------------------------------------------------------------
Linus Walleij (12):
      Documentation/devicetree: add a small note on PCI
      ARM: pci: create pci_common_init_dev()
      ARM: integrator: merge PCIv3 driver into one file
      ARM: integrator: convert PCIv3 bridge to platform device
      ARM: integrator: grab PCI error IRQ in probe()
      ARM: integrator: move PCI base address grab to probe
      ARM: integrator: move V3 register definitions into driver
      ARM: integrator: remap PCIv3 base dynamically
      ARM: integrator: move VGA base assignment
      ARM: integrator: move static ioremapping into PCIv3 driver
      ARM: integrator: basic PCIv3 device tree support
      ARM: integrator: get PCI device IRQs from device tree

 Documentation/devicetree/bindings/pci/pci.txt      |   9 +
 .../devicetree/bindings/pci/v3-v360epc-pci.txt     |  15 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/integratorap.dts                 |  41 ++
 arch/arm/include/asm/hardware/pci_v3.h             | 186 --------
 arch/arm/include/asm/mach/pci.h                    |  17 +-
 arch/arm/kernel/bios32.c                           |   9 +-
 arch/arm/mach-integrator/Makefile                  |   2 +-
 arch/arm/mach-integrator/include/mach/platform.h   |  23 -
 arch/arm/mach-integrator/integrator_ap.c           |  31 +-
 arch/arm/mach-integrator/pci.c                     | 113 -----
 arch/arm/mach-integrator/pci_v3.c                  | 520 +++++++++++++++++++--
 arch/arm/mach-integrator/pci_v3.h                  |   2 +
 13 files changed, 563 insertions(+), 406 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pci/pci.txt
 create mode 100644 Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
 delete mode 100644 arch/arm/include/asm/hardware/pci_v3.h
 delete mode 100644 arch/arm/mach-integrator/pci.c
 create mode 100644 arch/arm/mach-integrator/pci_v3.h
Russell King - ARM Linux - June 3, 2013, 1:06 p.m.
On Mon, Jun 03, 2013 at 01:09:17PM +0200, Linus Walleij wrote:
> - Moving the PCIv3 driver to drivers/pci

It doesn't do this, or your diffstat is wrong.
Linus Walleij - June 3, 2013, 11:18 p.m.
On Mon, Jun 3, 2013 at 3:06 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Mon, Jun 03, 2013 at 01:09:17PM +0200, Linus Walleij wrote:
>> - Moving the PCIv3 driver to drivers/pci
>
> It doesn't do this, or your diffstat is wrong.

Oh no it doesn't for sure, I wouldn't try it now anyway.
That was on the list of "future plans" sorry if it was unclear.

Yours,
Linus Walleij
Linus Walleij - June 12, 2013, 8:53 a.m.
On Mon, Jun 3, 2013 at 1:09 PM, Linus Walleij <linus.walleij@linaro.org> wrote:

> Hi ARM SoC folks,
>
> here is a pull request for the Integrator/AP PCI DT support.

Ping on this. Should be no different from the MVEBU stuff already
pulled in...

Yours,
Linus Walleij
Olof Johansson - June 14, 2013, 11:08 p.m.
On Mon, Jun 03, 2013 at 01:09:17PM +0200, Linus Walleij wrote:
> Hi ARM SoC folks,
> 
> here is a pull request for the Integrator/AP PCI DT support.
> 
> This is the final stepping stone making way for this development TODO:
> 
> - Preparing removal of the board files for the Integrators
> - Multiplatform support
> - Moving the PCIv3 driver to drivers/pci
> 
> The patches have been around on the lists for a long time now, only
> waiting for the infrastructure recently added to the ARM SoC tree.
> 
> As you can see it is based on the of/pci-helpers branch in the ARM SoC
> tree. I pulled this branch into my tree and rebased the patch set onto
> this.
> 
> All is ACKed by Arnd except for the patch adding the function
> pci_common_init_dev() to arch/arm/include/asm/mach/pci.h.
> So this will be a good time for anyone who doesn't like that idea
> to protest in the last minute.
> 
> Anyway: please pull it in.
> 
> Yours,
> Linus Walleij
> 
> 
> The following changes since commit 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090:
> 
>   of/pci: Add of_pci_parse_bus_range() function (2013-05-19 20:30:10 +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
> tags/integrator-pci-for-arm-soc

Pulled, apologies for the delay on this one, fell of my list of
branches-to-pull somehow.


-Olof
Olof Johansson - June 15, 2013, 12:09 a.m.
On Fri, Jun 14, 2013 at 04:08:38PM -0700, Olof Johansson wrote:
> On Mon, Jun 03, 2013 at 01:09:17PM +0200, Linus Walleij wrote:
> > Hi ARM SoC folks,
> > 
> > here is a pull request for the Integrator/AP PCI DT support.
> > 
> > This is the final stepping stone making way for this development TODO:
> > 
> > - Preparing removal of the board files for the Integrators
> > - Multiplatform support
> > - Moving the PCIv3 driver to drivers/pci
> > 
> > The patches have been around on the lists for a long time now, only
> > waiting for the infrastructure recently added to the ARM SoC tree.
> > 
> > As you can see it is based on the of/pci-helpers branch in the ARM SoC
> > tree. I pulled this branch into my tree and rebased the patch set onto
> > this.
> > 
> > All is ACKed by Arnd except for the patch adding the function
> > pci_common_init_dev() to arch/arm/include/asm/mach/pci.h.
> > So this will be a good time for anyone who doesn't like that idea
> > to protest in the last minute.
> > 
> > Anyway: please pull it in.
> > 
> > Yours,
> > Linus Walleij
> > 
> > 
> > The following changes since commit 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090:
> > 
> >   of/pci: Add of_pci_parse_bus_range() function (2013-05-19 20:30:10 +0000)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
> > tags/integrator-pci-for-arm-soc
> 
> Pulled, apologies for the delay on this one, fell of my list of
> branches-to-pull somehow.

Hmm. integrator_defconfig no longer builds:

arch/arm/mach-integrator/pci_v3.c: In function 'pci_v3_map_irq_dt':
arch/arm/mach-integrator/pci_v3.c:835:16: error: storage size of 'oirq' isn't known
arch/arm/mach-integrator/pci_v3.c:845:2: error: implicit declaration of function 'irq_create_of_mapping'

linux/of_irq.h is already included, but it seems that CONFIG_USE_OF is off in
integrator defconfig.

What's the plan here? Making DT mandatory? Or making PCI depend on DT for this
platform?

I've dropped the branch again until resolved.


-Olof