Please pull 'for-2.6.26' branch of 4xx tree

Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull from:

 master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git for-2.6.26

to get one commit from Grant that fixes simpleImage targets.  It seems
both of us missed this when Grant sent it out a while ago.

The tree is based off of Linus' current tree as of this morning.

josh

Grant Likely (1):
      [POWERPC] bootwrapper: add simpleImage* to list of boot targets

 arch/powerpc/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull from:

 master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git for-2.6.26

to pick up one bugfix for 4xx.  This patch works around an errata for
440{EP,GR,EPx,GRx} chips that can cause hangs on the PLB4 bus.

The tree is based off of Linus' 2.6.26-rc3.  If you've no objections
or other patches queued up, Linus can pull directly if he'd like.

josh

Josh Boyer (1):
      [POWERPC] 4xx: Workaround for CHIP_11 Errata

 arch/powerpc/boot/4xx.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull from:

 master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git for-2.6.26

to pick up a small number of fixes for 4xx.  One corrects the PCI
addresses for Sequoia boards, another fixes TLB issues with newer 440x6
cores.  Stefan's pci-e endpoint driver is also included here as it is
a fairly contained change with Ben's Ack.  It should have been included
in my last pull request, but I missed it and have been out.

thx,
josh

Christian Ehrhardt (1):
      [POWERPC] 4xx: Fix PCI mem in sequoia DTS

Stefan Roese (2):
      [POWERPC] 4xx: Fix problem with new TLB storage attibute fields on 440x6 c
      [POWERPC] 4xx: Add endpoint support to 4xx PCIe driver

 arch/powerpc/boot/dts/sequoia.dts   |    9 ++-
 arch/powerpc/kernel/head_44x.S      |    9 ++-
 arch/powerpc/sysdev/ppc4xx_pci.c    |  180 +++++++++++++++++++++++++----------
 include/asm-powerpc/pgtable-ppc32.h |    7 ++
 4 files changed, 153 insertions(+), 52 deletions(-)

Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

Hi Paul

Please pull from:

 master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git for-2.6.26

to pick up some additional patches for 4xx.  This contains the
defconfig reorg, some EMAC patches from Valentine that have been
outstanding for a while, and a new idle loop patch.

josh

Jerone Young (1):
      [POWERPC] 4xx: Add idle wait support for 44x platforms

Josh Boyer (2):
      [POWERPC] 4xx: Reorganize 4xx defconfigs
      [POWERPC] 4xx: Add ppc40x_defconfig

Valentine Barshak (2):
      [POWERPC] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
      [POWERPC] ibm_newemac: PowerPC 440EP/440GR EMAC PHY clock workaround

 arch/powerpc/configs/{ => 40x}/ep405_defconfig     |    0 
 arch/powerpc/configs/{ => 40x}/kilauea_defconfig   |    0 
 arch/powerpc/configs/{ => 40x}/makalu_defconfig    |    0 
 arch/powerpc/configs/{ => 40x}/walnut_defconfig    |    0 
 arch/powerpc/configs/{ => 44x}/bamboo_defconfig    |    0 
 .../configs/{ => 44x}/canyonlands_defconfig        |    0 
 arch/powerpc/configs/{ => 44x}/ebony_defconfig     |    0 
 arch/powerpc/configs/{ => 44x}/katmai_defconfig    |    0 
 arch/powerpc/configs/{ => 44x}/rainier_defconfig   |    0 
 arch/powerpc/configs/{ => 44x}/sequoia_defconfig   |    0 
 arch/powerpc/configs/{ => 44x}/taishan_defconfig   |    0 
 arch/powerpc/configs/{ => 44x}/warp_defconfig      |    0 
 .../configs/{walnut_defconfig => ppc40x_defconfig} |   31 ++++++---
 arch/powerpc/platforms/44x/Makefile                |    2 +-
 arch/powerpc/platforms/44x/idle.c                  |   67 ++++++++++++++++++++
 drivers/net/ibm_newemac/core.c                     |   48 +++++++++++++-
 drivers/net/ibm_newemac/core.h                     |   14 +++-
 17 files changed, 145 insertions(+), 17 deletions(-)
 rename arch/powerpc/configs/{ => 40x}/ep405_defconfig (100%)
 rename arch/powerpc/configs/{ => 40x}/kilauea_defconfig (100%)
 rename arch/powerpc/configs/{ => 40x}/makalu_defconfig (100%)
 copy arch/powerpc/configs/{ => 40x}/walnut_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/bamboo_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/canyonlands_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/ebony_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/katmai_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/rainier_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/sequoia_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/taishan_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/warp_defconfig (100%)
 rename arch/powerpc/configs/{walnut_defconfig => ppc40x_defconfig} (97%)
 create mode 100644 arch/powerpc/platforms/44x/idle.c

Re: Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

On Tue, 15 Apr 2008 10:27:04 -0500
Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:

> Valentine Barshak (2):
>       [POWERPC] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
>       [POWERPC] ibm_newemac: PowerPC 440EP/440GR EMAC PHY clock workaround

These two commits have been dropped from the branch.  They cause the
allyesconfig build for powerpc to fail because CONFIG_PPC_DCR_MMIO
doesn't understand the dcri_clrset macro.

josh

Re: Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

On Wed, 16 Apr 2008 07:27:58 -0500
Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:

> On Tue, 15 Apr 2008 10:27:04 -0500
> Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:
> 
> > Valentine Barshak (2):
> >       [POWERPC] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
> >       [POWERPC] ibm_newemac: PowerPC 440EP/440GR EMAC PHY clock workaround
> 
> These two commits have been dropped from the branch.  They cause the
> allyesconfig build for powerpc to fail because CONFIG_PPC_DCR_MMIO
> doesn't understand the dcri_clrset macro.

Crap.  Looks like you already pulled the tree.  We need to either
revert those two commits, or essentially define dcri_clrset to a do {}
while(0) in include/asm-powerpc/dcr-mmio.h so things build.

josh

Re: Please pull 'for-2.6.26' branch of 4xx tree

[Benjamin Herrenschmidt]

On Wed, 2008-04-16 at 07:31 -0500, Josh Boyer wrote:
> On Wed, 16 Apr 2008 07:27:58 -0500
> Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:
> 
> > On Tue, 15 Apr 2008 10:27:04 -0500
> > Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:
> > 
> > > Valentine Barshak (2):
> > >       [POWERPC] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
> > >       [POWERPC] ibm_newemac: PowerPC 440EP/440GR EMAC PHY clock workaround
> > 
> > These two commits have been dropped from the branch.  They cause the
> > allyesconfig build for powerpc to fail because CONFIG_PPC_DCR_MMIO
> > doesn't understand the dcri_clrset macro.
> 
> Crap.  Looks like you already pulled the tree.  We need to either
> revert those two commits, or essentially define dcri_clrset to a do {}
> while(0) in include/asm-powerpc/dcr-mmio.h so things build.

Why ? It should do the right thing, not nop ...

Ben.

Re: Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

On Wed, 16 Apr 2008 22:50:47 +1000
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:

> 
> On Wed, 2008-04-16 at 07:31 -0500, Josh Boyer wrote:
> > On Wed, 16 Apr 2008 07:27:58 -0500
> > Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:
> > 
> > > On Tue, 15 Apr 2008 10:27:04 -0500
> > > Josh Boyer <jwboyer@linux.vnet.ibm.com> wrote:
> > > 
> > > > Valentine Barshak (2):
> > > >       [POWERPC] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
> > > >       [POWERPC] ibm_newemac: PowerPC 440EP/440GR EMAC PHY clock workaround
> > > 
> > > These two commits have been dropped from the branch.  They cause the
> > > allyesconfig build for powerpc to fail because CONFIG_PPC_DCR_MMIO
> > > doesn't understand the dcri_clrset macro.
> > 
> > Crap.  Looks like you already pulled the tree.  We need to either
> > revert those two commits, or essentially define dcri_clrset to a do {}
> > while(0) in include/asm-powerpc/dcr-mmio.h so things build.
> 
> Why ? It should do the right thing, not nop ...

"... so things build."  Relax Ben.  That isn't a final solution.

I'd rather just do an outright revert of the commits for now.

For a final solution, we're going to have to come up with a more clever
way of doing the clocking stuff in ibm_newemac.  The SDRs are board
specific and completely outside of EMAC/MAL itself.  So doing a dcr_map
on it becomes a bit more difficult, since there really isn't an SDR
node in the device tree at the moment.

josh

Re: Please pull 'for-2.6.26' branch of 4xx tree

[Benjamin Herrenschmidt]

On Wed, 2008-04-16 at 08:43 -0500, Josh Boyer wrote:
> 
> For a final solution, we're going to have to come up with a more
> clever
> way of doing the clocking stuff in ibm_newemac.  The SDRs are board
> specific and completely outside of EMAC/MAL itself.  So doing a
> dcr_map

Not board specific... chip specific.

> on it becomes a bit more difficult, since there really isn't an SDR
> node in the device tree at the moment.

That is why I tried hard to avoid the bloody workarounds...
unfortunatly, the HW is crap enough that we have no real choice here.

Ben.
 

Re: Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

On Thu, 17 Apr 2008 00:02:47 +1000
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:

> 
> On Wed, 2008-04-16 at 08:43 -0500, Josh Boyer wrote:
> > 
> > For a final solution, we're going to have to come up with a more
> > clever
> > way of doing the clocking stuff in ibm_newemac.  The SDRs are board
> > specific and completely outside of EMAC/MAL itself.  So doing a
> > dcr_map
> 
> Not board specific... chip specific.

Yes, right.  Sorry.

> > on it becomes a bit more difficult, since there really isn't an SDR
> > node in the device tree at the moment.
> 
> That is why I tried hard to avoid the bloody workarounds...
> unfortunatly, the HW is crap enough that we have no real choice here.

Right.

josh

Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull from:

 master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git for-2.6.26

to pick up a handful of additional commits for 2.6.26.  Most of these
are bug fixes.  Grant adds a helpful make target for building dtb files,
which is quite useful for some newer 4xx boards as well as other
platforms in general.

josh

Grant Likely (2):
      [POWERPC] add target for building .dtb files
      [POWERPC] bootwrapper: Add a firmware-independent simpleboot target.

Josh Boyer (1):
      [POWERPC] 4xx: Add Canyonlands and Yosemite to multi-board defconfig

Stefan Roese (5):
      [POWERPC] 4xx: Only reset PCIe PHY on 405EX systems when no link is detect
      [POWERPC] 4xx: Fix PESDRn_UTLSET1 register setup on 460EX/GT
      [POWERPC] 4xx: Create common ppc4xx_reset_system() in ppc4xx_soc.c
      [POWERPC] 4xx: Some EMAC related changes in Canyonlands & Glacier dts file
      [POWERPC] 4xx: Change dts files to support jumbo frames

Stephen Neuendorffer (1):
      [POWERPC] of_serial: Fix possible null dereference.

Valentine Barshak (1):
      [POWERPC] 4xx: Use machine_device_initcall() for warp_nand

 arch/powerpc/Makefile                    |    2 +-
 arch/powerpc/boot/Makefile               |   36 +++++++++----
 arch/powerpc/boot/dts/canyonlands.dts    |   19 +++++--
 arch/powerpc/boot/dts/glacier.dts        |    5 ++-
 arch/powerpc/boot/dts/haleakala.dts      |    2 +-
 arch/powerpc/boot/dts/katmai.dts         |    2 +-
 arch/powerpc/boot/dts/kilauea.dts        |    4 +-
 arch/powerpc/boot/dts/makalu.dts         |    4 +-
 arch/powerpc/boot/dts/rainier.dts        |    4 +-
 arch/powerpc/boot/dts/sequoia.dts        |    4 +-
 arch/powerpc/boot/dts/taishan.dts        |    4 +-
 arch/powerpc/boot/simpleboot.c           |   84 ++++++++++++++++++++++++++++++
 arch/powerpc/boot/virtex405-head.S       |   30 +++++++++++
 arch/powerpc/boot/wrapper                |    4 ++
 arch/powerpc/configs/ppc44x_defconfig    |   14 ++++--
 arch/powerpc/platforms/40x/ep405.c       |    2 +
 arch/powerpc/platforms/40x/kilauea.c     |    4 +-
 arch/powerpc/platforms/40x/makalu.c      |    2 +
 arch/powerpc/platforms/40x/virtex.c      |    2 +
 arch/powerpc/platforms/40x/walnut.c      |    4 +-
 arch/powerpc/platforms/44x/44x.h         |    1 -
 arch/powerpc/platforms/44x/Kconfig       |    1 -
 arch/powerpc/platforms/44x/bamboo.c      |   15 +++---
 arch/powerpc/platforms/44x/canyonlands.c |    5 +-
 arch/powerpc/platforms/44x/ebony.c       |    5 +-
 arch/powerpc/platforms/44x/katmai.c      |    5 +-
 arch/powerpc/platforms/44x/misc_44x.S    |   11 ----
 arch/powerpc/platforms/44x/rainier.c     |    4 +-
 arch/powerpc/platforms/44x/sequoia.c     |    4 +-
 arch/powerpc/platforms/44x/taishan.c     |    5 +-
 arch/powerpc/platforms/44x/warp-nand.c   |    3 +-
 arch/powerpc/platforms/44x/warp.c        |    6 +--
 arch/powerpc/platforms/Kconfig.cputype   |    2 +
 arch/powerpc/sysdev/ppc4xx_pci.c         |   18 ++-----
 arch/powerpc/sysdev/ppc4xx_soc.c         |   11 ++++
 drivers/serial/of_serial.c               |    4 +-
 include/asm-powerpc/ppc4xx.h             |   18 ++++++
 37 files changed, 257 insertions(+), 93 deletions(-)

Please pull 'for-2.6.26' branch of 4xx tree

[Josh Boyer]

Hi Paul,

Please pull from:

 master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git for-2.6.26

to pick up the first round of 4xx patches for 2.6.26.  There are a few
new board ports, some Xilinx driver updates, and some DCR helper
macros.

Grant has two bootwrapper patches that I would like to see go in as
well, but I need to test them a bit more first.

josh

David Gibson (1):
      [POWERPC] Start removing linux,network-index in favour of aliases

Josh Boyer (3):
      [POWERPC] 4xx: Add AMCC 440EP Yosemite DTS
      [POWERPC] 4xx: Add platform support for the AMCC Yosemite board
      [POWERPC] 4xx: Add bootwrapper for AMCC Yosemite board

Stefan Roese (10):
      [POWERPC] 4xx: Add AMCC 460EX/460GT support to cputable.c & cpu_setup_44x.S
      [POWERPC] 4xx: Add AMCC Canyonlands 460EX eval board support to platforms/44x
      [POWERPC] 4xx: Add Canyonlands DTS
      [POWERPC] 4xx: Add 460EX PCIe support to 4xx pci driver
      [POWERPC] 4xx: Add Canyonlands defconfig file
      [POWERPC] 4xx: Add TAH support to taishan dts
      [POWERPC] 4xx: Add AMCC Glacier 460GT eval board dts
      [POWERPC] 4xx: Add "amcc, haleakala" to the toplevel compatible property
      [POWERPC] 4xx: Add PPC4xx L2-cache support (440GX)
      [POWERPC] 4xx: Add L2 cache node to AMCC Taishan dts file

Stephen Neuendorffer (3):
      [POWERPC] Xilinx: hwicap: Refactor status handling code.
      [POWERPC] Xilinx: hwicap: Verify sync before reading idcode.
      [POWERPC] Xilinx: hwicap: Use fixed device major.

Valentine Barshak (2):
      [POWERPC] 4xx: Add dcri_clrset() for locked read/modify/write functionality
      [POWERPC] 4xx: Use dcri_clrset() for PCIe indirect dcr read/modify/write access

 Documentation/powerpc/booting-without-of.txt |   16 -
 arch/powerpc/Kconfig                         |    3 +
 arch/powerpc/boot/Makefile                   |    3 +-
 arch/powerpc/boot/bamboo.c                   |    3 +-
 arch/powerpc/boot/cuboot-rainier.c           |    3 +-
 arch/powerpc/boot/cuboot-sequoia.c           |    3 +-
 arch/powerpc/boot/cuboot-taishan.c           |    3 +-
 arch/powerpc/boot/cuboot-warp.c              |    2 +-
 arch/powerpc/boot/cuboot-yosemite.c          |   44 ++
 arch/powerpc/boot/dts/bamboo.dts             |    2 -
 arch/powerpc/boot/dts/canyonlands.dts        |  391 ++++++++++++++
 arch/powerpc/boot/dts/ebony.dts              |    2 -
 arch/powerpc/boot/dts/glacier.dts            |  464 +++++++++++++++++
 arch/powerpc/boot/dts/haleakala.dts          |    2 +-
 arch/powerpc/boot/dts/rainier.dts            |    2 -
 arch/powerpc/boot/dts/sequoia.dts            |    2 -
 arch/powerpc/boot/dts/taishan.dts            |   27 +-
 arch/powerpc/boot/dts/walnut.dts             |    1 -
 arch/powerpc/boot/dts/warp.dts               |    1 -
 arch/powerpc/boot/dts/yosemite.dts           |  304 +++++++++++
 arch/powerpc/boot/ebony.c                    |    3 +-
 arch/powerpc/boot/treeboot-walnut.c          |    2 +-
 arch/powerpc/configs/canyonlands_defconfig   |  721 ++++++++++++++++++++++++++
 arch/powerpc/kernel/cpu_setup_44x.S          |    5 +-
 arch/powerpc/kernel/cputable.c               |   28 +-
 arch/powerpc/platforms/44x/Kconfig           |   28 +
 arch/powerpc/platforms/44x/Makefile          |    2 +
 arch/powerpc/platforms/44x/canyonlands.c     |   64 +++
 arch/powerpc/sysdev/Makefile                 |    1 +
 arch/powerpc/sysdev/ppc4xx_pci.c             |  127 +++++-
 arch/powerpc/sysdev/ppc4xx_pci.h             |   59 +++
 arch/powerpc/sysdev/ppc4xx_soc.c             |  189 +++++++
 drivers/char/xilinx_hwicap/buffer_icap.c     |   22 +-
 drivers/char/xilinx_hwicap/buffer_icap.h     |    5 +-
 drivers/char/xilinx_hwicap/fifo_icap.c       |   31 +-
 drivers/char/xilinx_hwicap/fifo_icap.h       |    1 +
 drivers/char/xilinx_hwicap/xilinx_hwicap.c   |   63 ++-
 drivers/char/xilinx_hwicap/xilinx_hwicap.h   |   24 +
 include/asm-powerpc/dcr-native.h             |   17 +
 include/asm-powerpc/dcr-regs.h               |   78 +++
 40 files changed, 2643 insertions(+), 105 deletions(-)