1. 05 10月, 2006 14 次提交
    • A
      [POWERPC] cell: fix bugs found by sparse · 43b4f406
      Arnd Bergmann 提交于
      - Some long constants should be marked 'ul'.
      - When using desc->handler_data to pass an __iomem
        register area, we need to add casts to and from
        __iomem.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      43b4f406
    • A
      [POWERPC] spiderpic: enable new style devtree support · f7e2ce78
      Arnd Bergmann 提交于
      This enables support for new firmware test releases.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      f7e2ce78
    • A
      [POWERPC] Update cell_defconfig · 68272047
      Arnd Bergmann 提交于
      This adds defaults for new configuration options added since
      2.6.18 and it enables the option for 64kb pages by default.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      68272047
    • A
      [POWERPC] spufs: add infrastructure for finding elf objects · 86767277
      Arnd Bergmann 提交于
      This adds an 'object-id' file that the spe library can
      use to store a pointer to its ELF object. This was
      originally meant for use by oprofile, but is now
      also used by the GNU debugger, if available.
      
      In order for oprofile to find the location in an spu-elf
      binary where an event counter triggered, we need a way
      to identify the binary in the first place.
      
      Unfortunately, that binary itself can be embedded in a
      powerpc ELF binary. Since we can assume it is mapped into
      the effective address space of the running process,
      have that one write the pointer value into a new spufs
      file.
      
      When a context switch occurs, pass the user value to
      the profiler so that can look at the mapped file (with
      some care).
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      86767277
    • A
      [POWERPC] spufs: support new OF device tree format · 7650f2f2
      Arnd Bergmann 提交于
      The properties we used traditionally in the device tree are somewhat
      nonstandard.  This adds support for a more conventional format using
      'interrupts' and 'reg' properties.
      
      The interrupts are specified in three cells (class 0, 1 and 2) and
      registered at the interrupt-parent.
      
      The reg property contains either three or four register areas in the
      order 'local-store', 'problem', 'priv2', and 'priv1', so the priv1 one
      can be left out in case of hypervisor driven systems that access these
      through hcalls.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      7650f2f2
    • A
      [POWERPC] spufs: add support for read/write on cntl · e1dbff2b
      Arnd Bergmann 提交于
      Writing to cntl can be used to stop execution on the
      spu and to restart it, reading from cntl gives the
      contents of the current status register.
      
      The access is always in ascii, as for most other files.
      
      This was always meant to be there, but we had a little
      problem with writing to runctl so it was left out so
      far.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      e1dbff2b
    • A
      [POWERPC] spufs: remove support for ancient firmware · 772920e5
      Arnd Bergmann 提交于
      Any firmware that still uses the 'spc' nodes already
      stopped running for other reasons, so let's get rid of this.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      772920e5
    • A
      [POWERPC] spufs: make mailbox functions handle multiple elements · cdcc89bb
      Arnd Bergmann 提交于
      Since libspe2 will provide a function that can read/write
      multiple mailbox elements at once, the kernel should handle
      that efficiently.
      
      read/write on the three mailbox files can now access the
      spe context multiple times to operate on any number of
      mailbox data elements.
      
      If the spu application keeps writing to its outbound
      mailbox, the read call will pick up all the data in a
      single system call.
      
      Unfortunately, if the user passes an invalid pointer,
      we may lose a mailbox element on read, since we can't
      put it back. This probably impossible to solve, if the
      user also accesses the mailbox through direct register
      access.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      cdcc89bb
    • A
      [POWERPC] spufs: use correct pg_prot for mapping SPU local store · ac91cb8d
      Arnd Bergmann 提交于
      This hopefully fixes a long-standing bug in the spu file system.
      An spu context comes with local memory that can be either saved
      in kernel pages or point directly to a physical SPE.
      
      When mapping the physical SPE, that mapping needs to be cache-inhibited.
      For simplicity, we used to map the kernel backing memory that way
      too, but unfortunately that was not only inefficient, but also incorrect
      because the same page could then be accessed simultaneously through
      a cacheable and a cache-inhibited mapping, which is not allowed
      by the powerpc specification and in our case caused data inconsistency
      for which we did a really ugly workaround in user space.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      ac91cb8d
    • A
      [POWERPC] spufs: Add infrastructure needed for gang scheduling · 6263203e
      Arnd Bergmann 提交于
      Add the concept of a gang to spufs as a new type of object.
      So far, this has no impact whatsover on scheduling, but makes
      it possible to add that later.
      
      A new type of object in spufs is now a spu_gang. It is created
      with the spu_create system call with the flags argument set
      to SPU_CREATE_GANG (0x2). Inside of a spu_gang, it
      is then possible to create spu_context objects, which until
      now was only possible at the root of spufs.
      
      There is a new member in struct spu_context pointing to
      the spu_gang it belongs to, if any. The spu_gang maintains
      a list of spu_context structures that are its children.
      This information can then be used in the scheduler in the
      future.
      
      There is still a bug that needs to be resolved in this
      basic infrastructure regarding the order in which objects
      are removed. When the spu_gang file descriptor is closed
      before the spu_context descriptors, we leak the dentry
      and inode for the gang. Any ideas how to cleanly solve
      this are appreciated.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6263203e
    • A
      [POWERPC] spufs: implement error event delivery to user space · 9add11da
      Arnd Bergmann 提交于
      This tries to fix spufs so we have an interface closer to what is
      specified in the man page for events returned in the third argument of
      spu_run.
      
      Fortunately, libspe has never been using the returned contents of that
      register, as they were the same as the return code of spu_run (duh!).
      
      Unlike the specification that we never implemented correctly, we now
      require a SPU_CREATE_EVENTS_ENABLED flag passed to spu_create, in
      order to get the new behavior. When this flag is not passed, spu_run
      will simply ignore the third argument now.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      9add11da
    • H
      [POWERPC] spufs: fix context switch during page fault · 28347bce
      HyeonSeung Jang 提交于
      For better explanation, I break down the page fault handling into steps:
      
      1) There is a page fault caused by DMA operation initiated by SPU and
      DMA is suspended.
      
      2) The interrupt handler 'spu_irq_class_1()/__spu_trap_data_map()' is
      called and it just wakes up the sleeping spe-manager thread.
      
      3) by PPE scheduler, the corresponding bottom half,
      spu_irq_class_1_bottom() is called in process context and DMA is
      restarted.
      
      There can be a quite large time gap between 2) and 3) and I found
      the following problem:
      
      Between 2) and 3) If the context becomes unbound, 3) is not executed
      because when the spe-manager thread is awaken, the context is already
      saved. (This situation can happen, for example, when a high priority spe
      thread newly started in that time gap)
      
      But the actual problem is that the corresponding SPU context does not
      work even if it is bound again to a SPU.
      
      Besides I can see the following warning in mambo simulator when the
      context becomes
      unbound(in save_mfc_cmd()), i.e. when unbind() is called for the
      context after step 2) before 3) :
      
      'WARNING: 61392752237: SPE2: MFC_CMD_QUEUE channel count of 15 is
      inconsistent with number of available DMA queue entries of 16'
      
      After I go through available documents, I found that the problem is
      because the suspended DMA is not restarted when it is bound again.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      28347bce
    • M
      [POWERPC] spufs: scheduler support for NUMA. · a68cf983
      Mark Nutter 提交于
      This patch adds NUMA support to the the spufs scheduler.
      
      The new arch/powerpc/platforms/cell/spufs/sched.c is greatly
      simplified, in an attempt to reduce complexity while adding
      support for NUMA scheduler domains.  SPUs are allocated starting
      from the calling thread's node, moving to others as supported by
      current->cpus_allowed.  Preemption is gone as it was buggy, but
      should be re-enabled in another patch when stable.
      
      The new arch/powerpc/platforms/cell/spu_base.c maintains idle
      lists on a per-node basis, and allows caller to specify which
      node(s) an SPU should be allocated from, while passing -1 tells
      spu_alloc() that any node is allowed.
      
      Since the patch removes the currently implemented preemptive
      scheduling, it is technically a regression, but practically
      all users have since migrated to this version, as it is
      part of the IBM SDK and the yellowdog distribution, so there
      is not much point holding it back while the new preemptive
      scheduling patch gets delayed further.
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      a68cf983
    • B
      [POWERPC] spufs: cell spu problem state mapping updates · 27d5bf2a
      Benjamin Herrenschmidt 提交于
      This patch adds a new "psmap" file to spufs that allows mmap of all of
      the problem state mapping of SPEs. It is compatible with 64k pages. In
      addition, it removes mmap ability of individual files when using 64k
      pages, with the exception of signal1 and signal2 which will both map the
      entire 64k page holding both registers. It also removes
      CONFIG_SPUFS_MMAP as there is no point in not building mmap support in
      spufs.
      
      It goes along a separate patch to libspe implementing usage of that new
      file to access problem state registers.
      
      Another patch will follow up to fix races opened up by accessing
      the 'runcntl' register directly, which is made possible with this
      patch.
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NArnd Bergmann <arnd.bergmann@de.ibm.com>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      27d5bf2a
  2. 04 10月, 2006 19 次提交
  3. 03 10月, 2006 6 次提交
    • O
      [PATCH] restore parport_pc probing on powermac · 873ef76b
      Olaf Hering 提交于
      The last change for partport_pc did fix the common case for all PowerMacs,
      but it broke the case for PCI multiport IO cards.  In fact, the config
      option CONFIG_PARPORT_PC_SUPERIO=y lead to a hard crash when cups probed
      the parport driver.  It enables the winbond and smsc probing.
      
      Remove the PARPORT_BASE check again, parport_pc_find_nonpci_ports() will
      take care of it.  All powerpc configs should have
      CONFIG_PARPORT_PC_SUPERIO=n, the code did not find anything on the chrp
      boards we tested it on.
      
      Tested on a G4/466 with a PCI card:
      
      0001:10:13.0 Serial controller: Timedia Technology Co Ltd PCI2S550 (Dual 16550 UART) (rev 01) (prog-if 02 [16550])
              Subsystem: Timedia Technology Co Ltd Unknown device 5079
              Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping+ SERR- FastB2B-
              Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR-
              Interrupt: pin A routed to IRQ 53
              Region 0: I/O ports at f2000800 [size=32]
              Region 2: I/O ports at f2000870 [size=8]
              Region 3: I/O ports at f2000860 [size=8]
      Signed-off-by: NOlaf Hering <olaf@aepfle.de>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Adam Belay <ambx1@neo.rr.com>
      Cc: Dmitry Torokhov <dtor@mail.ru>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      873ef76b
    • D
      [PATCH] VFS: Make filldir_t and struct kstat deal in 64-bit inode numbers · afefdbb2
      David Howells 提交于
      These patches make the kernel pass 64-bit inode numbers internally when
      communicating to userspace, even on a 32-bit system.  They are required
      because some filesystems have intrinsic 64-bit inode numbers: NFS3+ and XFS
      for example.  The 64-bit inode numbers are then propagated to userspace
      automatically where the arch supports it.
      
      Problems have been seen with userspace (eg: ld.so) using the 64-bit inode
      number returned by stat64() or getdents64() to differentiate files, and
      failing because the 64-bit inode number space was compressed to 32-bits, and
      so overlaps occur.
      
      This patch:
      
      Make filldir_t take a 64-bit inode number and struct kstat carry a 64-bit
      inode number so that 64-bit inode numbers can be passed back to userspace.
      
      The stat functions then returns the full 64-bit inode number where
      available and where possible.  If it is not possible to represent the inode
      number supplied by the filesystem in the field provided by userspace, then
      error EOVERFLOW will be issued.
      
      Similarly, the getdents/readdir functions now pass the full 64-bit inode
      number to userspace where possible, returning EOVERFLOW instead when a
      directory entry is encountered that can't be properly represented.
      
      Note that this means that some inodes will not be stat'able on a 32-bit
      system with old libraries where they were before - but it does mean that
      there will be no ambiguity over what a 32-bit inode number refers to.
      
      Note similarly that directory scans may be cut short with an error on a
      32-bit system with old libraries where the scan would work before for the
      same reasons.
      
      It is judged unlikely that this situation will occur because modern glibc
      uses 64-bit capable versions of stat and getdents class functions
      exclusively, and that older systems are unlikely to encounter
      unrepresentable inode numbers anyway.
      
      [akpm: alpha build fix]
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      afefdbb2
    • S
      [POWERPC] iSeries has no legacy I/O · 80a544ce
      Stephen Rothwell 提交于
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      80a544ce
    • S
      [POWERPC] implement BEGIN/END_FW_FTR_SECTION · 3f639ee8
      Stephen Rothwell 提交于
      and use it an all the obvious places in assembler code.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      3f639ee8
    • S
    • S
      [POWERPC] Allow combined iSeries and MULTIPLATFORM build · a542dbd3
      Stephen Rothwell 提交于
      This will build with ISERIES, PSERIES and PMAC64 selected, but will only
      boot on iSeries so far.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      a542dbd3
  4. 02 10月, 2006 1 次提交
    • C
      [PATCH] replace cad_pid by a struct pid · 9ec52099
      Cedric Le Goater 提交于
      There are a few places in the kernel where the init task is signaled.  The
      ctrl+alt+del sequence is one them.  It kills a task, usually init, using a
      cached pid (cad_pid).
      
      This patch replaces the pid_t by a struct pid to avoid pid wrap around
      problem.  The struct pid is initialized at boot time in init() and can be
      modified through systctl with
      
      	/proc/sys/kernel/cad_pid
      
      [ I haven't found any distro using it ? ]
      
      It also introduces a small helper routine kill_cad_pid() which is used
      where it seemed ok to use cad_pid instead of pid 1.
      
      [akpm@osdl.org: cleanups, build fix]
      Signed-off-by: NCedric Le Goater <clg@fr.ibm.com>
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      9ec52099