mbox

[GIT,PULL,V2,1/4] mvebu driver changes for v3.10

Message ID 20130416150416.GB28693@titan.lakedaemon.net
State New
Headers show

Pull-request

git://git.infradead.org/users/jcooper/linux.git tags/drivers-3.10-2

Message

Jason Cooper April 16, 2013, 3:04 p.m. UTC
The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:

  Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/drivers-3.10-2

for you to fetch changes up to ac7b07ec369324063e52c37b3fb0ad1a1814d879:

  clk: mvebu: add more PCIe clocks for Armada XP (2013-04-16 14:47:01 +0000)

----------------------------------------------------------------
mvebu drivers for v3.10 round 2

 - mvebu
    - device bus driver (Acked by gregkh to go through arm-soc)
    - PCIe prep work Acked by appropriate maintainers (of,pci,clk) for arm-soc

----------------------------------------------------------------

Changes for v2:
 - updated to Andrew Murray's v7 patchset.

Andrew Murray (3):
      of/pci: Unify pci_process_bridge_OF_ranges from Microblaze and PowerPC
      of/pci: Provide support for parsing PCI DT ranges property
      of/pci: mips: convert to common of_pci_range_parser

Ezequiel Garcia (1):
      drivers: memory: Introduce Marvell EBU Device Bus driver

Neil Greatorex (1):
      bus: mvebu-mbus: Restore checking for coherency fabric hardware

Thierry Reding (2):
      of/pci: Add of_pci_get_devfn() function
      of/pci: Add of_pci_parse_bus_range() function

Thomas Petazzoni (5):
      bus: introduce an Marvell EBU MBus driver
      bus: mvebu: fix mistake in PCIe window target attribute for Kirkwood
      pci: infrastructure to add drivers in drivers/pci/host
      clk: mvebu: create parent-child relation for PCIe clocks on Armada 370
      clk: mvebu: add more PCIe clocks for Armada XP

 .../bindings/memory-controllers/mvebu-devbus.txt   | 156 ++++
 arch/microblaze/include/asm/pci-bridge.h           |   5 +-
 arch/microblaze/pci/pci-common.c                   | 192 -----
 arch/mips/pci/pci.c                                |  50 +-
 arch/powerpc/include/asm/pci-bridge.h              |   5 +-
 arch/powerpc/kernel/pci-common.c                   | 192 -----
 drivers/bus/Kconfig                                |   7 +
 drivers/bus/Makefile                               |   1 +
 drivers/bus/mvebu-mbus.c                           | 870 +++++++++++++++++++++
 drivers/clk/mvebu/clk-gating-ctrl.c                |  18 +-
 drivers/memory/Kconfig                             |  10 +
 drivers/memory/Makefile                            |   1 +
 drivers/memory/mvebu-devbus.c                      | 340 ++++++++
 drivers/of/address.c                               |  67 ++
 drivers/of/of_pci.c                                | 228 +++++-
 drivers/pci/Kconfig                                |   2 +
 drivers/pci/Makefile                               |   3 +
 drivers/pci/host/Kconfig                           |   4 +
 drivers/pci/host/Makefile                          |   1 +
 include/linux/mbus.h                               |  24 +-
 include/linux/of_address.h                         |  46 ++
 include/linux/of_pci.h                             |   6 +
 22 files changed, 1790 insertions(+), 438 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt
 create mode 100644 drivers/bus/mvebu-mbus.c
 create mode 100644 drivers/memory/mvebu-devbus.c
 create mode 100644 drivers/pci/host/Kconfig
 create mode 100644 drivers/pci/host/Makefile

Comments

Olof Johansson April 18, 2013, 5:30 a.m. UTC | #1
On Tue, Apr 16, 2013 at 11:04:16AM -0400, Jason Cooper wrote:
> 
> The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
> 
>   Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/users/jcooper/linux.git tags/drivers-3.10-2
> 
> for you to fetch changes up to ac7b07ec369324063e52c37b3fb0ad1a1814d879:
> 
>   clk: mvebu: add more PCIe clocks for Armada XP (2013-04-16 14:47:01 +0000)

Pulled, thanks.


-Olof
Olof Johansson April 19, 2013, 2:09 p.m. UTC | #2
On Wed, Apr 17, 2013 at 10:30 PM, Olof Johansson <olof@lixom.net> wrote:
> On Tue, Apr 16, 2013 at 11:04:16AM -0400, Jason Cooper wrote:
>>
>> The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
>>
>>   Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
>>
>> are available in the git repository at:
>>
>>   git://git.infradead.org/users/jcooper/linux.git tags/drivers-3.10-2
>>
>> for you to fetch changes up to ac7b07ec369324063e52c37b3fb0ad1a1814d879:
>>
>>   clk: mvebu: add more PCIe clocks for Armada XP (2013-04-16 14:47:01 +0000)
>
> Pulled, thanks.

Dropped due to build errors on powerpc64. 3.11 material now.


-Olof
Gregory CLEMENT April 19, 2013, 2:34 p.m. UTC | #3
On 04/19/2013 04:09 PM, Olof Johansson wrote:
> On Wed, Apr 17, 2013 at 10:30 PM, Olof Johansson <olof@lixom.net> wrote:
>> On Tue, Apr 16, 2013 at 11:04:16AM -0400, Jason Cooper wrote:
>>>
>>> The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
>>>
>>>   Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
>>>
>>> are available in the git repository at:
>>>
>>>   git://git.infradead.org/users/jcooper/linux.git tags/drivers-3.10-2
>>>
>>> for you to fetch changes up to ac7b07ec369324063e52c37b3fb0ad1a1814d879:
>>>
>>>   clk: mvebu: add more PCIe clocks for Armada XP (2013-04-16 14:47:01 +0000)
>>
>> Pulled, thanks.
> 
> Dropped due to build errors on powerpc64. 3.11 material now.
> 

Wait! That means dropping _all_ the change done in mvebu for 3.10 just
for one patch in the of/pci part?

Jason, did you take the accurate patch? Because according to Grant
Likely, the build didn't fail on ppc, see:

http://www.spinics.net/lists/arm-kernel/msg238517.html


> 
> -Olof
>
Gregory CLEMENT April 19, 2013, 4:12 p.m. UTC | #4
On 04/19/2013 04:34 PM, Gregory CLEMENT wrote:
> On 04/19/2013 04:09 PM, Olof Johansson wrote:
>> On Wed, Apr 17, 2013 at 10:30 PM, Olof Johansson <olof@lixom.net> wrote:
>>> On Tue, Apr 16, 2013 at 11:04:16AM -0400, Jason Cooper wrote:
>>>>
>>>> The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
>>>>
>>>>   Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>   git://git.infradead.org/users/jcooper/linux.git tags/drivers-3.10-2
>>>>
>>>> for you to fetch changes up to ac7b07ec369324063e52c37b3fb0ad1a1814d879:
>>>>
>>>>   clk: mvebu: add more PCIe clocks for Armada XP (2013-04-16 14:47:01 +0000)
>>>
>>> Pulled, thanks.
>>
>> Dropped due to build errors on powerpc64. 3.11 material now.
>>
> 
> Wait! That means dropping _all_ the change done in mvebu for 3.10 just
> for one patch in the of/pci part?
> 
> Jason, did you take the accurate patch? Because according to Grant
> Likely, the build didn't fail on ppc, see:
> 
> http://www.spinics.net/lists/arm-kernel/msg238517.html

I investigated it a little more and my first assumption was wrong,
the faulty commit was not the one I think. I didn't work directly
on the PCIe part, and Thomas who did it is currently in the plane.

So instead of throwing everything, could you just remove the
offending commit, AFAIK we don't need it yet, (the patch
depending of this one are located in the mvebu-late/pcie branch):

9ecbe03 pci: infrastructure to add drivers in drivers/pci/host

Thanks!

> 
> 
>>
>> -Olof
>>
> 
>
Andrew Murray April 19, 2013, 5:15 p.m. UTC | #5
On 19 April 2013 17:12, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> On 04/19/2013 04:34 PM, Gregory CLEMENT wrote:
>> On 04/19/2013 04:09 PM, Olof Johansson wrote:
>>> On Wed, Apr 17, 2013 at 10:30 PM, Olof Johansson <olof@lixom.net> wrote:
>>>> On Tue, Apr 16, 2013 at 11:04:16AM -0400, Jason Cooper wrote:
>>>>>
>>>>> The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
>>>>>
>>>>>   Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
>>>>>
>>>>> are available in the git repository at:
>>>>>
>>>>>   git://git.infradead.org/users/jcooper/linux.git tags/drivers-3.10-2
>>>>>
>>>>> for you to fetch changes up to ac7b07ec369324063e52c37b3fb0ad1a1814d879:
>>>>>
>>>>>   clk: mvebu: add more PCIe clocks for Armada XP (2013-04-16 14:47:01 +0000)
>>>>
>>>> Pulled, thanks.
>>>
>>> Dropped due to build errors on powerpc64. 3.11 material now.
>>>
>>
>> Wait! That means dropping _all_ the change done in mvebu for 3.10 just
>> for one patch in the of/pci part?
>>
>> Jason, did you take the accurate patch? Because according to Grant
>> Likely, the build didn't fail on ppc, see:
>>
>> http://www.spinics.net/lists/arm-kernel/msg238517.html
>
> I investigated it a little more and my first assumption was wrong,
> the faulty commit was not the one I think. I didn't work directly
> on the PCIe part, and Thomas who did it is currently in the plane.

I thought the faulty commit with in the MIPS patch (last patch in the
set). And a patch to fix this was prepared by Gabor Juhos [2].

Or is there another faulty commit in my v7 set [1]? If you let me know
I can fix it

Andrew Murray

[1] http://www.spinics.net/lists/linux-pci/msg21708.html
[2] http://permalink.gmane.org/gmane.linux.ports.mips.general/37399

>
> So instead of throwing everything, could you just remove the
> offending commit, AFAIK we don't need it yet, (the patch
> depending of this one are located in the mvebu-late/pcie branch):
>
> 9ecbe03 pci: infrastructure to add drivers in drivers/pci/host
>
> Thanks!
>
>>
>>
>>>
>>> -Olof
>>>
>>
>>
>
>
> --
> Gregory Clement, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel