Commit 5a148af6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc update from Benjamin Herrenschmidt:
 "The main highlights this time around are:

   - A pile of addition POWER8 bits and nits, such as updated
     performance counter support (Michael Ellerman), new branch history
     buffer support (Anshuman Khandual), base support for the new PCI
     host bridge when not using the hypervisor (Gavin Shan) and other
     random related bits and fixes from various contributors.

   - Some rework of our page table format by Aneesh Kumar which fixes a
     thing or two and paves the way for THP support.  THP itself will
     not make it this time around however.

   - More Freescale updates, including Altivec support on the new e6500
     cores, new PCI controller support, and a pile of new boards support
     and updates.

   - The usual batch of trivial cleanups & fixes"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
  powerpc: Fix build error for book3e
  powerpc: Context switch the new EBB SPRs
  powerpc: Turn on the EBB H/FSCR bits
  powerpc: Replace CPU_FTR_BCTAR with CPU_FTR_ARCH_207S
  powerpc: Setup BHRB instructions facility in HFSCR for POWER8
  powerpc: Fix interrupt range check on debug exception
  powerpc: Update tlbie/tlbiel as per ISA doc
  powerpc: Print page size info during boot
  powerpc: print both base and actual page size on hash failure
  powerpc: Fix hpte_decode to use the correct decoding for page sizes
  powerpc: Decode the pte-lp-encoding bits correctly.
  powerpc: Use encode avpn where we need only avpn values
  powerpc: Reduce PTE table memory wastage
  powerpc: Move the pte free routines from common header
  powerpc: Reduce the PTE_INDEX_SIZE
  powerpc: Switch 16GB and 16MB explicit hugepages to a different page table format
  powerpc: New hugepage directory format
  powerpc: Don't truncate pgd_index wrongly
  powerpc: Don't hard code the size of pte page
  powerpc: Save DAR and DSISR in pt_regs on MCE
  ...
parents 99c6bcf4 54d5999d

Documentation/devicetree/bindings/powerpc/fsl/cpus.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
===================================================================

Power Architecture CPU Binding

Copyright 2013 Freescale Semiconductor Inc.



Power Architecture CPUs in Freescale SOCs are represented in device trees as

per the definition in ePAPR.



In addition to the ePAPR definitions, the properties defined below may be

present on CPU nodes.



PROPERTIES



   - fsl,eref-*

        Usage: optional

        Value type: <empty>

        Definition: The EREF (EREF: A Programmer.s Reference Manual for

	Freescale Power Architecture) defines the architecture for Freescale

	Power CPUs.  The EREF defines some architecture categories not defined

	by the Power ISA.  For these EREF-specific categories, the existence of

	a property named fsl,eref-[CAT], where [CAT] is the abbreviated category

	name with all uppercase letters converted to lowercase, indicates that

	the category is supported by the implementation.

Documentation/powerpc/00-INDEX

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ hvcs.txt 
	- IBM "Hypervisor Virtual Console Server" Installation Guide

mpc52xx.txt

	- Linux 2.6.x on MPC52xx family

sound.txt

	- info on sound support under Linux/PPC

zImage_layout.txt

	- info on the kernel images for Linux/PPC

qe_firmware.txt

	- describes the layout of firmware binaries for the Freescale QUICC

	  Engine and the code that parses and uploads the microcode therein.

Documentation/powerpc/ptrace.txt

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ features will have bits indicating whether there is support for: 
#define PPC_DEBUG_FEATURE_INSN_BP_MASK		0x2

#define PPC_DEBUG_FEATURE_DATA_BP_RANGE		0x4

#define PPC_DEBUG_FEATURE_DATA_BP_MASK		0x8

#define PPC_DEBUG_FEATURE_DATA_BP_DAWR		0x10



2. PTRACE_SETHWDEBUG

Documentation/powerpc/sound.txt

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
            Information about PowerPC Sound support

=====================================================================



Please mail me (Cort Dougan, cort@fsmlabs.com) if you have questions,

comments or corrections.



Last Change: 6.16.99



This just covers sound on the PReP and CHRP systems for now and later

will contain information on the PowerMac's.



Sound on PReP has been tested and is working with the PowerStack and IBM

Power Series onboard sound systems which are based on the cs4231(2) chip.

The sound options when doing the make config are a bit different from

the default, though.



The I/O base, irq and dma lines that you enter during the make config

are ignored and are set when booting according to the machine type.

This is so that one binary can be used for Motorola and IBM machines

which use different values and isn't allowed by the driver, so things

are hacked together in such a way as to allow this information to be

set automatically on boot.



1. Motorola PowerStack PReP machines



  Enable support for "Crystal CS4232 based (PnP) cards" and for the

  Microsoft Sound System.  The MSS isn't used, but some of the routines

  that the CS4232 driver uses are in it.



  Although the options you set are ignored and determined automatically

  on boot these are included for information only:



  (830) CS4232 audio I/O base 530, 604, E80 or F40

  (10) CS4232 audio IRQ 5, 7, 9, 11, 12 or 15

  (6) CS4232 audio DMA 0, 1 or 3

  (7) CS4232 second (duplex) DMA 0, 1 or 3



  This will allow simultaneous record and playback, as 2 different dma

  channels are used.



  The sound will be all left channel and very low volume since the

  auxiliary input isn't muted by default.  I had the changes necessary

  for this in the kernel but the sound driver maintainer didn't want

  to include them since it wasn't common in other machines.  To fix this

  you need to mute it using a mixer utility of some sort (if you find one

  please let me know) or by patching the driver yourself and recompiling.



  There is a problem on the PowerStack 2's (PowerStack Pro's) using a

  different irq/drq than the kernel expects.  Unfortunately, I don't know

  which irq/drq it is so if anyone knows please email me.



  Midi is not supported since the cs4232 driver doesn't support midi yet.



2. IBM PowerPersonal PReP machines



  I've only tested sound on the Power Personal Series of IBM workstations

  so if you try it on others please let me know the result.  I'm especially

  interested in the 43p's sound system, which I know nothing about.



  Enable support for "Crystal CS4232 based (PnP) cards" and for the

  Microsoft Sound System.  The MSS isn't used, but some of the routines

  that the CS4232 driver uses are in it.



  Although the options you set are ignored and determined automatically

  on boot these are included for information only:



  (530) CS4232 audio I/O base 530, 604, E80 or F40

  (5) CS4232 audio IRQ 5, 7, 9, 11, 12 or 15

  (1) CS4232 audio DMA 0, 1 or 3

  (7) CS4232 second (duplex) DMA 0, 1 or 3

  (330) CS4232 MIDI I/O base 330, 370, 3B0 or 3F0

  (9) CS4232 MIDI IRQ 5, 7, 9, 11, 12 or 15



  This setup does _NOT_ allow for recording yet.



  Midi is not supported since the cs4232 driver doesn't support midi yet.



2. IBM CHRP



  I have only tested this on the 43P-150.  Build the kernel with the cs4232

  set as a module and load the module with irq=9 dma=1 dma2=2 io=0x550

Documentation/powerpc/zImage_layout.txt

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
          Information about the Linux/PPC kernel images

=====================================================================



Please mail me (Cort Dougan, cort@fsmlabs.com) if you have questions,

comments or corrections.



This document is meant to answer several questions I've had about how

the PReP system boots and how Linux/PPC interacts with that mechanism.

It would be nice if we could have information on how other architectures

boot here as well.  If you have anything to contribute, please

let me know.





1. PReP boot file



  This is the file necessary to boot PReP systems from floppy or

  hard drive.  The firmware reads the PReP partition table entry

  and will load the image accordingly.



  To boot the zImage, copy it onto a floppy with dd if=zImage of=/dev/fd0h1440

  or onto a PReP hard drive partition with dd if=zImage of=/dev/sda4

  assuming you've created a PReP partition (type 0x41) with fdisk on

  /dev/sda4.



  The layout of the image format is:



  0x0     +------------+

          |            | PReP partition table entry

          |            |

  0x400   +------------+

          |            | Bootstrap program code + data

          |            |

          |            |

          +------------+

          |            | compressed kernel, elf header removed

          +------------+

          |            | initrd (if loaded)

          +------------+

          |            | Elf section table for bootstrap program

          +------------+





2. MBX boot file



  The MBX boards can load an elf image, and relocate it to the

  proper location in memory - it copies the image to the location it was

  linked at.

CRA Git | Maintained and supported by SUSTech CRA and CCSE