]> git.karo-electronics.de Git - linux-beck.git/log
linux-beck.git
17 years ago[POWERPC] Add mpc866ads board-specific bits to arch/powerpc
Vitaly Bordug [Wed, 24 Jan 2007 19:42:10 +0000 (22:42 +0300)]
[POWERPC] Add mpc866ads board-specific bits to arch/powerpc

This add support of the Freescale mpc86xads reference board to
arch/powerpc. Supported SMC1 and SMC2 (UART and serial console), FEC
100Mbps Ethernet, SCC1 Ethernet (10Mbps hdx)

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] 8xx: Add mpc885ads support and common mpc8xx files
Vitaly Bordug [Wed, 24 Jan 2007 19:41:42 +0000 (22:41 +0300)]
[POWERPC] 8xx: Add mpc885ads support and common mpc8xx files

This adds the core 8xx stuff and specifically mpc885ads board-specific
bits to arch/powerpc. Respective Kconfig has been cleaned up from the stuff
not yet ported over to avoid confusion. Updated and cleaned version.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] 8xx: powerpc port of core CPM PIC
Vitaly Bordug [Wed, 24 Jan 2007 19:41:24 +0000 (22:41 +0300)]
[POWERPC] 8xx: powerpc port of core CPM PIC

This covers common CPM access functions, CPM interrupt controller code,
micropatch and a few compatibility things to kee the same driver base
working with arch/ppc. This version is refined with all the comments
(mostly PIC-related) addressed.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] 8xx: platform related changes to the fsl_soc
Vitaly Bordug [Wed, 24 Jan 2007 19:41:15 +0000 (22:41 +0300)]
[POWERPC] 8xx: platform related changes to the fsl_soc

Added 8xx SoC peripherials: fec for Ethernet and smc for UARTs.
Ordinary routines to extract values from the device tree and insert
respective platform devices

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] 8xx: generic 8xx code arch/powerpc port
Vitaly Bordug [Wed, 24 Jan 2007 19:41:06 +0000 (22:41 +0300)]
[POWERPC] 8xx: generic 8xx code arch/powerpc port

Including support for non-coherent cache, some mm-related things +
relevant field in Kconfig and Makefiles. Also included rheap.o compilation
if 8xx is defined.

Non-coherent mapping were refined and renamed according to Cristoph
Hellwig. Orphaned functions were cleaned up.

[Also removed arch/ppc/kernel/dma-mapping.c, because otherwise
compiling with ARCH=ppc for a non DMA-cache-coherent platform ends up
with two copies of __dma_alloc_coherent etc.
 -- paulus.]

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] 8xx: platform specific mmu updates
Vitaly Bordug [Wed, 24 Jan 2007 19:40:57 +0000 (22:40 +0300)]
[POWERPC] 8xx: platform specific mmu updates

This is just a straight port of the same done in arch/ppc
by Marcelo Tosatti. One used to be
[PATCH] ppc32 8xx: update_mmu_cache() needs unconditional tlbie,
commit eb07d964b4491d1bb5864cd3d7e7633ccdda9a53

In a nutshell, the board is nearly stuck without this, yet without any
visible failure - being just very slow.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] cpm_uart: OF-related fix for CPM1
Vitaly Bordug [Wed, 24 Jan 2007 19:40:49 +0000 (22:40 +0300)]
[POWERPC] cpm_uart: OF-related fix for CPM1

This makes cpm uart able to work using OF-passed parameters
in case of CPM stuff (found on most mpc8xx reference and custom
boards). The idea is to keep ppc stuff working yet making it able to be
used for powerpc.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] remove unused CPU_FTRS_POWER6X
Michael Neuling [Tue, 23 Jan 2007 04:59:26 +0000 (15:59 +1100)]
[POWERPC] remove unused CPU_FTRS_POWER6X

CPU_FTRS_POWER6X is unused, hence remove it.

Signed-off-by Michael Neuling <mikey@neuling.org>

Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] 83xx: Add the mpc8323emds.dts
Kim Phillips [Tue, 30 Jan 2007 22:09:13 +0000 (16:09 -0600)]
[POWERPC] 83xx: Add the mpc8323emds.dts

Add the mpc8323emds device tree source (dts)

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] 83xx: Add the mpc832xemds defconfig
Kim Phillips [Tue, 30 Jan 2007 22:09:20 +0000 (16:09 -0600)]
[POWERPC] 83xx: Add the mpc832xemds defconfig

The defconfig for the 8323EMDS is identical to the 8360E MDS defconfig,
except CONFIG_MATH_EMULATION is set, since the 8323 doesn't have a FPU.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] Enable stack debug features on ppc32
Kumar Gala [Tue, 30 Jan 2007 06:45:56 +0000 (00:45 -0600)]
[POWERPC] Enable stack debug features on ppc32

Enable stack overflow checking (DEBUG_STACKOVERFLOW) and stack usage
(DEBUG_STACK_USAGE) on ppc32.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years agoMerge branch '83xx' into for_paulus
Kumar Gala [Tue, 30 Jan 2007 06:38:11 +0000 (00:38 -0600)]
Merge branch '83xx' into for_paulus

17 years ago[POWERPC] 83xx: Fix compiler warnings on 836x and 832x
Li Yang [Tue, 30 Jan 2007 05:33:01 +0000 (13:33 +0800)]
[POWERPC] 83xx: Fix compiler warnings on 836x and 832x

Some prototypes are separated from of_device.h into of_platform.h.  Add
the new include to fix warning.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] Remove fastcall function attribute
Kumar Gala [Fri, 26 Jan 2007 07:52:27 +0000 (01:52 -0600)]
[POWERPC] Remove fastcall function attribute

fastcall is an x86 specific function attribute and has no business in ppc code

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] 83xx: Return a point to the struct ipic from ipic_init()
Kumar Gala [Fri, 26 Jan 2007 07:45:32 +0000 (01:45 -0600)]
[POWERPC] 83xx: Return a point to the struct ipic from ipic_init()

It's useful to have access to struct ipic handle that just got created
in ipic_init().

For example, if we want to setup an external IRQ with out
a device node we need access ipic->irqhost to create the virtual to HW
IRQ mapping and to set the IRQ sense.  With this we can mimic the old
sense array concept that existed in arch/ppc.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] 83xx: Make platform *_init_IRQ() static
Kumar Gala [Fri, 26 Jan 2007 06:41:57 +0000 (00:41 -0600)]
[POWERPC] 83xx:  Make platform *_init_IRQ() static

Make the various 83xx *_init_IRQ() functions static

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] 83xx: Don't call ioremap in the reset function
Kumar Gala [Fri, 26 Jan 2007 06:37:11 +0000 (00:37 -0600)]
[POWERPC] 83xx: Don't call ioremap in the reset function

It's possibly that we get an reset requestion when interrupts are disabled.
(For example an oops in an interrupt handler).  Therefor, we can't call
ioremap in the reset function.  Moving the ioremap of the registers we
need access to an arch_initcall helps the problem.

However we still have a window between boot and the arch_initcall in
which the register pointer will not be setup and thus we spin if the reset
function is called.  If one needs to ensure even this case is covered, look
at use of the watchdog provided on 83xx to reset the processor.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] 83xx: Fix Kconfig to only enable FP math emulation for the MPC832x
Kumar Gala [Fri, 26 Jan 2007 06:23:34 +0000 (00:23 -0600)]
[POWERPC] 83xx: Fix Kconfig to only enable FP math emulation for the MPC832x

Updated MATH_EMULATION depends to be on PPC_MPC832x instead of PPC_83xx.  Only
the the MPC832x has no floating point unit in the core.  Updated the other
83xx defconfigs that got math emulation turned on incorrectly.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
17 years ago[POWERPC] Celleb: setup sio in SCC
Ishizaki Kou [Fri, 12 Jan 2007 01:12:06 +0000 (10:12 +0900)]
[POWERPC] Celleb: setup sio in SCC

This patch setup serial interfaces in SCC to work with serial_txx9
driver.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Celleb: Support PCI bus and base of I/O
Ishizaki Kou [Fri, 12 Jan 2007 01:03:28 +0000 (10:03 +0900)]
[POWERPC] Celleb: Support PCI bus and base of I/O

This patch includes support for pci buses, base of Celleb specific
devices, and etc. It works on of_platform bus.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Celleb: Cell SCC definitions
Ishizaki Kou [Fri, 12 Jan 2007 01:02:36 +0000 (10:02 +0900)]
[POWERPC] Celleb: Cell SCC definitions

Adds Cell SCC(Super Companion Chip) definitions.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Celleb: hypervisor call numbers
Ishizaki Kou [Fri, 12 Jan 2007 00:59:41 +0000 (09:59 +0900)]
[POWERPC] Celleb: hypervisor call numbers

This patch creates Celleb platform dependent file to define Beat
hypervisor call numbers.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Add IRQ remapping hook
Ishizaki Kou [Fri, 12 Jan 2007 00:58:39 +0000 (09:58 +0900)]
[POWERPC] Add IRQ remapping hook

This patch adds irq remapping hook. On interrupt mechanism on Beat,
when an irq outlet which has an id which is formerly used is created,
remapping the irq is required.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Add a field for each specific bus to struct pci_controller
Ishizaki Kou [Fri, 12 Jan 2007 00:57:37 +0000 (09:57 +0900)]
[POWERPC] Add a field for each specific bus to struct pci_controller

Struct pci_controller doesn't prepare for the dependent data of each
specific bus. This patch adds private member to struct pci_controller.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Fix oprofile support on Cell LPAR
Ishizaki Kou [Fri, 12 Jan 2007 00:56:44 +0000 (09:56 +0900)]
[POWERPC] Fix oprofile support on Cell LPAR

Op_model_cell supports native Cell. By returning -EINVAL, oprofile
uses timer interrupt on Cell LPAR.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] TLB insertion cleanup
Ishizaki Kou [Fri, 12 Jan 2007 00:54:39 +0000 (09:54 +0900)]
[POWERPC] TLB insertion cleanup

This patch changes handling return value of ppc_md.hpte_insert() into
the same way as __hash_page_*().

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] spufs: Add SPU register lock
Ishizaki Kou [Fri, 12 Jan 2007 00:52:41 +0000 (09:52 +0900)]
[POWERPC] spufs: Add SPU register lock

spu->register_lock should be held before accessing registers.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Remove the broken Gemini support
Adrian Bunk [Sun, 14 Jan 2007 09:15:00 +0000 (10:15 +0100)]
[POWERPC] Remove the broken Gemini support

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Mask 32-bit system call arguments to 32 bits on PPC64 in audit code
David Woodhouse [Sun, 14 Jan 2007 01:38:18 +0000 (09:38 +0800)]
[POWERPC] Mask 32-bit system call arguments to 32 bits on PPC64 in audit code

The system call entry code will clear the high bits of argument
registers before invoking the system call; don't report whatever noise
happens to be in the high bits of the register before that happens.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Select DEFAULT_UIMAGE for HPC-NET/8641
Paul Gortmaker [Tue, 9 Jan 2007 21:50:10 +0000 (16:50 -0500)]
[POWERPC] Select DEFAULT_UIMAGE for HPC-NET/8641

I suspect this was meant to be added like it was to a whole slew of
other u-boot based boards, but probably just fell through the cracks.

Add "select DEFAULT_UIMAGE" for the 8641/HPC-NET.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Update fixup_winbond_82c105 comment
Olaf Hering [Thu, 4 Jan 2007 17:31:55 +0000 (18:31 +0100)]
[POWERPC] Update fixup_winbond_82c105 comment

Note all POWER3/POWER4 systems where fixup_winbond_82c105 will run.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] maple: improve CPC9x5 host bridge detection
Nathan Lynch [Wed, 3 Jan 2007 18:56:28 +0000 (12:56 -0600)]
[POWERPC] maple: improve CPC9x5 host bridge detection

Identify CPC9x5 PCI Express, AGP, and HT host bridges using
device_type and compatible properties, which is a more flexible method
than using the name property (which can differ between firmwares and
models).

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Add support for R_PPC_ADDR16_HI relocations
Simon Vallet [Wed, 3 Jan 2007 06:49:56 +0000 (07:49 +0100)]
[POWERPC] Add support for R_PPC_ADDR16_HI relocations

apply_relocate_add() does not support R_PPC_ADDR16_HI relocations, which
prevents some non gcc-built modules to be loaded.

Signed-off-by: Simon Vallet <svallet@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] arch/powerpc/sysdev/cpm2_pic.c of_node_get cleanup
Mariusz Kozlowski [Tue, 2 Jan 2007 11:36:20 +0000 (12:36 +0100)]
[POWERPC] arch/powerpc/sysdev/cpm2_pic.c of_node_get cleanup

Remove redundant argument check for of_node_get().
It's ok to remove 'node' check because in real life cpm2_pic_init()
never gets called with node == NULL.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] arch/powerpc/sysdev/qe_lib of_node_get cleanup
Mariusz Kozlowski [Tue, 2 Jan 2007 12:07:16 +0000 (13:07 +0100)]
[POWERPC] arch/powerpc/sysdev/qe_lib of_node_get cleanup

No need for ?: as of_node_get() can handle NULL argument.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
 arch/powerpc/sysdev/qe_lib/qe_ic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] arch/powerpc/sysdev/mpic.c of_node_get cleanup
Mariusz Kozlowski [Tue, 2 Jan 2007 11:52:47 +0000 (12:52 +0100)]
[POWERPC] arch/powerpc/sysdev/mpic.c of_node_get cleanup

No need for ?: because of_node_get() can handle NULL argument.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] arch/powerpc/sysdev/ipic.c of_node_get cleanup
Mariusz Kozlowski [Tue, 2 Jan 2007 11:50:20 +0000 (12:50 +0100)]
[POWERPC] arch/powerpc/sysdev/ipic.c of_node_get cleanup

No need for ?: because of_node_get() can handle NULL argument.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] arch/powerpc/kernel/vio.c of_node_put cleanup
Mariusz Kozlowski [Tue, 2 Jan 2007 11:38:36 +0000 (12:38 +0100)]
[POWERPC] arch/powerpc/kernel/vio.c of_node_put cleanup

Remove redundant argument check for of_node_put().

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] arch/ppc/kernel/prom.c of_node_(get|put) cleanup
Mariusz Kozlowski [Tue, 2 Jan 2007 11:31:47 +0000 (12:31 +0100)]
[POWERPC] arch/ppc/kernel/prom.c of_node_(get|put) cleanup

Remove redundant argument checks for of_node_get() and of_node_put().

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Do not write virq back to PCI config space
Michal Ostrowski [Thu, 28 Dec 2006 04:14:43 +0000 (22:14 -0600)]
[POWERPC] Do not write virq back to PCI config space

- Drivers will not rely on the PCI config space value, as they've
  already been conditioned to rely on the irq field in "struct pci_dev".

- The virq value may not be < 256 as it has been remapped.

- The PCI config space should reflect the hardware configuration, which
  is not being changed.  We are only creating a virtual irq mapping that
  exists in the kernel only. One would never expect the PCI hardware to
  generate the "virq" interrupt.

Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Move ELF_ET_DYN_BASE up to 512MB point
Anton Blanchard [Wed, 20 Dec 2006 04:58:52 +0000 (15:58 +1100)]
[POWERPC] Move ELF_ET_DYN_BASE up to 512MB point

I often test new versions of glibc by doing:

LD_LIBRARY_PATH=/XXX/lib /XXX/lib/ld.so.1 <binary>

One test case ended up SEGV'ing. Upon closer inspection ld.so was loaded
at 0x8000000 (128MB) with the heap right after it. Since we normally
link binaries at 0x10000000 (256MB) we only had about 128MB of space for
the heap:

00100000-00103000 r-xp 00100000 00:00 0           [vdso]
08000000-0801e000 r-xp 00000000 00:01 33079       /lib/ld-2.5.so
0802d000-0802f000 rwxp 0001d000 00:01 33079       /lib/ld-2.5.so
0802f000-08050000 rwxp 0802f000 00:00 0           [heap]
0fe91000-0ffd9000 r-xp 00000000 00:01 33082       /lib/libc-2.5.so
0ffd9000-0ffe8000 ---p 00148000 00:01 33082       /lib/libc-2.5.so
0ffe8000-0ffea000 r--p 00147000 00:01 33082       /lib/libc-2.5.so
0ffea000-0ffed000 rwxp 00149000 00:01 33082       /lib/libc-2.5.so
10000000-10004000 r-xp 00000000 00:01 76          /bin/sleep
10013000-10014000 rwxp 00003000 00:01 76          /bin/sleep
ffb41000-ffb56000 rw-p ffb41000 00:00 0           [stack]

One way to fix this is move ELF_ET_DYN_BASE from 0x08000000 to 0x20000000.
This allows 128MB for the binary (hopefully enough for even the most
crazy c++ apps), and with our current layout we will grow the heap up
and the stack down, allowing potentially gigabytes of heap:

00100000-00103000 r-xp 00100000 00:00 0           [vdso]
0fe8a000-0ffd3000 r-xp 00000000 00:01 3350        /lib/tls/libc-2.3.6.so
0ffd3000-0ffe3000 ---p 00149000 00:01 3350        /lib/tls/libc-2.3.6.so
0ffe3000-0ffea000 r--p 00149000 00:01 3350        /lib/tls/libc-2.3.6.so
0ffea000-0ffee000 rwxp 00150000 00:01 3350        /lib/tls/libc-2.3.6.so
10000000-10004000 r-xp 00000000 00:01 76          /bin/sleep
10013000-10014000 rwxp 00003000 00:01 76          /bin/sleep
20000000-20018000 r-xp 00000000 00:01 3478        /lib/ld-2.3.6.so
20028000-20029000 r--p 00018000 00:01 3478        /lib/ld-2.3.6.so
20029000-2002a000 rwxp 00019000 00:01 3478        /lib/ld-2.3.6.so
2002a000-2004b000 rwxp 2002a000 00:00 0           [heap]
ffd67000-ffd7c000 rw-p ffd67000 00:00 0           [stack]

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Clarify EEH error message
Linas Vepstas [Tue, 19 Dec 2006 19:06:17 +0000 (13:06 -0600)]
[POWERPC] Clarify EEH error message

Clarify error message re EEH permanent failure.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Use is_init() instead of pid==1
Akinobu Mita [Tue, 19 Dec 2006 08:35:49 +0000 (17:35 +0900)]
[POWERPC] Use is_init() instead of pid==1

Use is_init() rather than hard coded pid comparison.

Cc: Anton Blanchard <anton@samba.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] ps3_free_io_irq: Fix inverted error check
Geert Uytterhoeven [Thu, 21 Dec 2006 12:57:16 +0000 (13:57 +0100)]
[POWERPC] ps3_free_io_irq: Fix inverted error check

ps3_free_io_irq: Fix inverted error check after calling
lv1_destruct_io_irq_outlet().

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] PS3: Fix uniprocessor kernel build
Geert Uytterhoeven [Wed, 20 Dec 2006 15:11:57 +0000 (16:11 +0100)]
[POWERPC] PS3: Fix uniprocessor kernel build

Allow to build a uniprocessor kernel for PS3.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[PATCH] x86: fix PDA variables to work during boot
James Bottomley [Mon, 22 Jan 2007 15:18:31 +0000 (09:18 -0600)]
[PATCH] x86: fix PDA variables to work during boot

The current PDA code, which went in in post 2.6.19 has a flaw in that it
doesn't correctly cycle the GDT and %GS segment through the boot PDA,
the CPU PDA and finally the per-cpu PDA.

The bug generally doesn't show up if the boot CPU id is zero, but
everything falls apart for a non zero boot CPU id.  The basically kills
voyager which is perfectly capable of doing non zero CPU id boots, so
voyager currently won't boot without this.

The fix is to be careful and actually do the GDT setups correctly.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoMerge git://git.infradead.org/mtd-2.6
Linus Torvalds [Tue, 23 Jan 2007 03:32:13 +0000 (19:32 -0800)]
Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (84 commits)
  [JFFS2] debug.h: include <linux/sched.h> for current->pid
  [MTD] OneNAND: Handle DDP chip boundary during read-while-load
  [MTD] OneNAND: return ecc error code only when 2-bit ecc occurs
  [MTD] OneNAND: Implement read-while-load
  [MTD] OneNAND: fix onenand_wait bug in read ecc error
  [MTD] OneNAND: release CPU in cycles
  [MTD] OneNAND: add subpage write support
  [MTD] OneNAND: fix onenand_wait bug
  [JFFS2] use the ref_offset macro
  [JFFS2] Reschedule in loops
  [JFFS2] Fix error-path leak in summary scan
  [JFFS2] add cond_resched() when garbage collecting deletion dirent
  [MTD] Nuke IVR leftovers
  [MTD] OneNAND: fix oob handling in recent oob patch
  [MTD] Fix ssfdc blksize typo
  [JFFS2] replace kmalloc+memset with kzalloc
  [MTD] Fix SSFDC build for variable blocksize.
  [MTD] ESB2ROM uses PCI
  [MTD] of_device-based physmap driver
  [MTD] Support combined RedBoot FIS directory and configuration area
  ...

17 years ago[PATCH] vmx: Fix register constraint in launch code
Herbert Xu [Tue, 23 Jan 2007 03:10:00 +0000 (14:10 +1100)]
[PATCH] vmx: Fix register constraint in launch code

Both "=r" and "=g" breaks my build on i386:

  $ make
    CC [M]  drivers/kvm/vmx.o
  {standard input}: Assembler messages:
  {standard input}:3318: Error: bad register name `%sil'
  make[1]: *** [drivers/kvm/vmx.o] Error 1
  make: *** [_module_drivers/kvm] Error 2

The reason is that setbe requires an 8-bit register but "=r" does not
constrain the target register to be one that has an 8-bit version on
i386.

According to

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153

the correct constraint is "=q".

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Linus Torvalds [Mon, 22 Jan 2007 21:14:37 +0000 (13:14 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: fix pci-driver kernel-doc
  PCI: rework Documentation/pci.txt
  PCI: Unhide the SMBus on the Asus P4P800-X

17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Linus Torvalds [Mon, 22 Jan 2007 21:14:16 +0000 (13:14 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: unusual_devs.h entry for nokia 6233
  USB: Fix for typo in ohci-ep93xx.c
  USB: disable USB_MULTITHREAD_PROBE
  USB: add vendor/device id for Option GT Max 3.6 cards
  USB: unusual_devs.h for 0x046b:ff40
  USB: make usbhid ignore Imation Disc Stakka
  USB: rndis_host: fix crash while probing a Nokia S60 mobile
  USB: asix: Detect internal PHY and enable/use accordingly
  usbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched

17 years agoPCI: fix pci-driver kernel-doc
Randy Dunlap [Wed, 10 Jan 2007 05:41:01 +0000 (21:41 -0800)]
PCI: fix pci-driver kernel-doc

Function short description should be on only one line.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoPCI: rework Documentation/pci.txt
Grant Grundler [Mon, 25 Dec 2006 08:06:35 +0000 (01:06 -0700)]
PCI: rework Documentation/pci.txt

Rewrite Documentation/pci.txt:
o restructure document to match how API is used when writing init code.
o update to reflect changes in struct pci_driver function pointers.
o removed language on "new style vs old style" device discovery.
  "Old style" is now deprecated. Don't use it. Left description in
  to document existing driver behaviors.
o add section "Legacy I/O Port free driver" by Kenji Kaneshige
  http://lkml.org/lkml/2006/11/22/25
  (renamed to "pci_enable_device_bars() and Legacy I/O Port space")
o add "MMIO space and write posting" section to help avoid common pitfall
  when converting drivers from IO Port space to MMIO space.
  Orignally posted http://lkml.org/lkml/2006/2/27/24
o many typo/grammer/spelling corrections from Randy Dunlap
o two more spelling corrections from Stephan Richter
o fix CodingStyle as per Randy Dunlap

Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoPCI: Unhide the SMBus on the Asus P4P800-X
Jean Delvare [Fri, 5 Jan 2007 08:17:56 +0000 (09:17 +0100)]
PCI: Unhide the SMBus on the Asus P4P800-X

Unhide the SMBus on the Asus P4P800-X (and probably some other
models of the family.) This gives access to the memory module SPD
EEPROMs.

Thanks to Winbond for supporting the lm-sensors project with the
donation of this motherboard.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: unusual_devs.h entry for nokia 6233
Manuel Osdoba [Thu, 18 Jan 2007 20:28:45 +0000 (21:28 +0100)]
USB: unusual_devs.h entry for nokia 6233

In appendix a patch for the nokia 6233 mobile phone is included.
The patch is against 2.6.20-rc5. It is my first patch. Hopefully it has
the right format. The code makes my nokia 6233 on my computer work.

From: Manuel Osdoba <manuel.osdoba@tu-ilmenau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: Fix for typo in ohci-ep93xx.c
Petr Stetiar [Wed, 17 Jan 2007 14:30:39 +0000 (06:30 -0800)]
USB: Fix for typo in ohci-ep93xx.c

Attached patch fixes typo in USB driver reported by Chase Douglas on linux-cirrus mailing
list. http://www.freelists.org/archives/linux-cirrus/12-2006/msg00003.html

Signed-off-by: Petr Stetiar <ynezz@true.cz>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: disable USB_MULTITHREAD_PROBE
Greg Kroah-Hartman [Tue, 16 Jan 2007 23:41:03 +0000 (15:41 -0800)]
USB: disable USB_MULTITHREAD_PROBE

Disable the USB_MULTITHREAD_PROBE option because it causes crashes on
people's machines and they never remember to actually read the config
help files.

No one likes this, everyone hates it, I'm going to go eat worms...

The full logic will be ripped out later.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: add vendor/device id for Option GT Max 3.6 cards
garrett_damore@tadpole.com [Sat, 13 Jan 2007 01:10:28 +0000 (17:10 -0800)]
USB: add vendor/device id for Option GT Max 3.6 cards

This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7814

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: unusual_devs.h for 0x046b:ff40
Pete Zaitcev [Sat, 13 Jan 2007 23:17:46 +0000 (15:17 -0800)]
USB: unusual_devs.h for 0x046b:ff40

American Megatrends did something wrong in their floppy emulator. It breaks
with both kinds of MODE SENSE which our stack sends. Alan and I tried a few
tweaks, and got LUNs sensed right, but US_FL_NO_WP_DETECT is still needed.

I set the firmware bracket to 1.00 exactly, in case AMI or Sun fix it with a
firmware update. Hey, you never know.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: make usbhid ignore Imation Disc Stakka
Oliver Neukum [Thu, 11 Jan 2007 09:14:33 +0000 (10:14 +0100)]
USB: make usbhid ignore Imation Disc Stakka

on request of the sourceforge project for this device, a kind of
robotized CD storage, it should be ignored by the generic driver.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: rndis_host: fix crash while probing a Nokia S60 mobile
Daniel Gollub [Tue, 16 Jan 2007 10:03:01 +0000 (11:03 +0100)]
USB: rndis_host: fix crash while probing a Nokia S60 mobile

Bug fix for driver rndis_host which fixes rndis_host probing certain
Nokia S60 (Series 60) mobiles. While the rndis_host get probed by usbnet
and tries to bind the Nokia mobile the bind is going to fail. The
rndis_host module tries to release the device, in a wrong way, which
cause the oops.

Fixes Bugzilla #7201

Signed-off-by: Daniel Gollub <dgollub@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoUSB: asix: Detect internal PHY and enable/use accordingly
Andres Salomon [Thu, 11 Jan 2007 23:39:16 +0000 (18:39 -0500)]
USB: asix: Detect internal PHY and enable/use accordingly

Different AX88772 dongles use different PHYs; the chip is capable of using
both a primary and secondary PHY, and supports an internal and external PHY.

It appears that some DUB-E100 devices use the internal PHY, so trying to use
an external one will not work (note that this is different across revisions,
as well; the "A" and "B" revs of the DUB-E100 use different PHYs!).  The data
sheet for the AX88772 chip specifies that the internal PHY id will be 0x10,
so if that's read from the EEPROM, we should use that rather than attempting
to use an external PHY.

Thanks to Mitch Bradley for pointing this out!

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: David Hollis <dhollis@davehollis.com>
Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agousbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched
Daniel Ritz [Mon, 11 Dec 2006 17:17:45 +0000 (18:17 +0100)]
usbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched

ITM screens send invalid x/y data when not touched. this was fixes a while ago
but the problem is if the screen is not touched anymore the driver never does
not report BTN_TOUCH as zero. fix it by sending the report with the last valid
coordinates when pressure is released.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: J.P. Delport <jpdelport@csir.co.za>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17 years agoMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
Linus Torvalds [Mon, 22 Jan 2007 19:33:40 +0000 (11:33 -0800)]
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Add backup superblock info to ocfs2_fs.h
  ocfs2: cleanup ocfs2_iget() errors
  ocfs2: Directory c/mtime update fixes
  ocfs2: Don't print errors when following symlinks

17 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Mon, 22 Jan 2007 19:31:11 +0000 (11:31 -0800)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  sis190: failure to set the MAC address from EEPROM
  Fix phy_read/write redefinition errors in ucc_geth_phy.c
  Update ucc_geth.c for new workqueue structure
  myri10ge: update driver version to 1.2.0
  myri10ge: check that we can get an irq
  myri10ge: make wc_fifo usage load-time tunable
  8139cp: Don't blindly enable interrupts
  [PATCH] bcm43xx: Fix failure to deliver PCI-E interrupts

17 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Mon, 22 Jan 2007 19:30:47 +0000 (11:30 -0800)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv HighPoint 2310 support (88SX7042)
  libata: fix handling of port actions in per-dev action mask
  libata: initialize qc->dma_dir to DMA_NONE
  sata_via: add PCI ID 0x5337
  libata doc: "error : unterminated entity reference exceptions"

17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Linus Torvalds [Mon, 22 Jan 2007 18:35:34 +0000 (10:35 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (30 commits)
  [SCSI] qla1280: set residual correctly
  [SCSI] fusion: bump version
  [SCSI] fusion: MODULE_VERSION support
  [SCSI] fusion: power pc and miscellaneous bug fixs
  [SCSI] fusion: fibre channel: return DID_ERROR for MPI_IOCSTATUS_SCSI_IOC_TERMINATED
  [SCSI] megaraid_sas: Update module author
  [SCSI] 3ware 8000 serialize reset code
  [SCSI] sr: fix error code check in sr_block_ioctl()
  [SCSI] scsi: lpfc error path fix
  [SCSI] aacraid: Product List Update
  [SCSI] libiscsi: fix senselen calculation
  [SCSI] iscsi: simplify IPv6 and IPv4 address printing
  [SCSI] iscsi: newline in printk
  [SCSI] iscsi: fix crypto_alloc_hash() error check
  [SCSI] iscsi: fix 2.6.19 data digest calculation bug
  [SCSI] scsi_scan: fix report lun problems with CDROM or RBC devices
  [SCSI] qla2xxx: Update version number to 8.01.07-k4.
  [SCSI] qla2xxx: Use generic isp_ops.fw_dump() function.
  [SCSI] qla2xxx: Perform a fw-dump when an ISP23xx RISC-paused state is detected.
  [SCSI] qla2xxx: Correct reset handling logic.
  ...

17 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Linus Torvalds [Mon, 22 Jan 2007 17:23:23 +0000 (09:23 -0800)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  hid-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist
  HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage
  HID: add missing RX, RZ and RY enum values to hid-debug output
  HID: hid/hid-input.c doesn't need to include linux/usb/input.h
  HID: compilation fix when DEBUG_DATA is defined
  HID: proper LED-mapping for SpaceNavigator
  HID: update MAINTAINERS entry for USB-HID
  HID: GEYSER4_ISO needs quirk
  HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT

17 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Linus Torvalds [Mon, 22 Jan 2007 17:21:02 +0000 (09:21 -0800)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Update defconfigs
  [POWERPC] atomic_dec_if_positive sign extension fix
  [POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code
  [POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable
  [POWERPC] Fix broken DMA on non-LPAR pSeries
  [POWERPC] Fix cell's mmio nvram to properly parse device tree
  [POWERPC] Remove bogus sanity check in pci -> OF node code

17 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Mon, 22 Jan 2007 17:07:00 +0000 (09:07 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Delete duplicate call to load_irq_save.
  [MIPS] SMTC: Fix cp0 hazard.

17 years agoMerge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
Linus Torvalds [Mon, 22 Jan 2007 16:57:03 +0000 (08:57 -0800)]
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon/w83793: Hide invalid VID readings
  hwmon/w83793: Fix the fan input detection
  hwmon/w83793: Ignore disabled temperature channels
  hwmon: Fix the VRD 11 decoding
  hwmon/w83793: Remove the description of AMDSI and update the voltage formula

17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Linus Torvalds [Mon, 22 Jan 2007 16:55:56 +0000 (08:55 -0800)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6:
  NTFS: Forgot to bump version number in makefile to 2.1.28...
  NTFS: 2.1.28 - Fix deadlock reported by Sergey Vlasov due to ntfs_put_inode().

17 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Linus Torvalds [Mon, 22 Jan 2007 16:55:28 +0000 (08:55 -0800)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5023): Fix compilation on ppc32 architecture
  V4L/DVB (5071): Tveeprom: autodetect LG TAPC G701D as tuner type 37
  V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory
  V4L/DVB (5033): MSI TV@nywhere Plus fixes
  V4L/DVB (5029): Ks0127 status flags
  V4L/DVB (5024): Fix quickcam communicator driver for big endian architectures
  V4L/DVB (5021): Cx88xx: Fix lockup on suspend
  V4L/DVB (5020): Fix: disable interrupts while at KM_BOUNCE_READ
  V4L/DVB (5019): Fix the frame->grabstate update in read() entry point.

17 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
Linus Torvalds [Mon, 22 Jan 2007 16:54:48 +0000 (08:54 -0800)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  mmc: Correct definition of R6
  omap: Update MMC response types

17 years agoRevert "[PATCH] Fix up mmap_kmem"
Linus Torvalds [Mon, 22 Jan 2007 16:53:24 +0000 (08:53 -0800)]
Revert "[PATCH] Fix up mmap_kmem"

This reverts commit 99a10a60ba9bedcf5d70ef81414d3e03816afa3f.

As per Hugh Dickins:

  "Nadia Derbey has reported that mmap of /dev/kmem no longer works with
   the kernel virtual address as offset, and Franck has confirmed that
   his patch came from a misunderstanding of what an offset means to
   /dev/kmem - whereas his patch description seems to say that he was
   correcting the offset on a few plaforms, there was no such problem to
   correct, and his patch was in fact changing its API on all platforms."

Suggested-by: Hugh Dickins <hugh@veritas.com>
Cc: Franck Bui-Huu <fbuihuu@gmail.com>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Cc: Andi Kleen <ak@suse.de>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years ago[POWERPC] Update defconfigs
Paul Mackerras [Mon, 22 Jan 2007 11:39:24 +0000 (22:39 +1100)]
[POWERPC] Update defconfigs

Mostly took the defaults, except tried to get the netfilter options
more or less as they were before.

Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] atomic_dec_if_positive sign extension fix
Robert Jennings [Wed, 17 Jan 2007 16:50:20 +0000 (10:50 -0600)]
[POWERPC] atomic_dec_if_positive sign extension fix

On 64-bit machines, if an atomic counter is explicitly set to a
negative value, the atomic_dec_if_positive function will decrement and
store the next smallest value in the atomic counter, contrary to its
intended operation.

The comparison to determine if the decrement will make the result
negative was done by the "addic." instruction, which operates on a
64-bit value, namely the zero-extended word loaded from the atomic
variable.  This patch uses an explicit word compare (cmpwi) and
changes the addic. to an addi (also changing "=&r" to "=&b" so that r0
isn't used, and addi doesn't become li).

This also fixes a bug for both 32-bit and 64-bit in that previously
0x80000000 was considered positive, since the result after
decrementing is positive.  Now it is considered negative.

Also, I clarify the return value in the comments just to make it clear
that the value returned is always the decremented value, even if that
value is not stored back to the atomic counter.

Signed-off-by: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code
Li Yang [Wed, 17 Jan 2007 06:42:22 +0000 (14:42 +0800)]
[POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code

Incorrect use of of_find_node_by_name() causes of_node_put()
on a node which has already been put.  It causes the refcount of
the node to underflow, which triggers the WARN_ON in kref_get
for 836x and 832x.  This fixes it.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable
Grant Likely [Fri, 19 Jan 2007 07:00:14 +0000 (00:00 -0700)]
[POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable

Documentation-only change.  The 5200 device tree layout has not yet
stablized, so nobody should depend on the layout of the tree.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Fix broken DMA on non-LPAR pSeries
Linas Vepstas [Thu, 11 Jan 2007 01:16:29 +0000 (19:16 -0600)]
[POWERPC] Fix broken DMA on non-LPAR pSeries

It appears that the iommu table address is never stored, and thus
never found, on non-lpar systems. Thus, for example, during boot:

<7>[   93.067916] PCI: Scanning bus 0001:41
<7>[   93.068542] PCI: Found 0001:41:01.0 [8086/100f] 000200 00
<7>[   93.068550] PCI: Calling quirk c0000000007822e0 for 0001:41:01.0
<7>[   93.069815] PCI: Fixups for bus 0001:41
<4>[   93.070167] iommu: Device 0001:41:01.0 has no iommu table
<7>[   93.070251] PCI: Bus scan for 0001:41 returning with max=41

No iommu table? How can that be? Well, circa line 471 of
arch/powerpc/platforms/pseries/iommu.c we see the code:

   while (dn && PCI_DN(dn) && PCI_DN(dn)->iommu_table == NULL)
      dn = dn->parent;

and a few lines later is the surprising print statement about
the missing table.  Seems that this loop ran unto the end, never
once finding a non-null PCI_DN(dn)->iommu_table.

The problem can be found a few lines earlier: it sems that the
value of PCI_DN(dn)->iommu_table is never ever set. Thus, the
patch sets it.

The patch was tested on a Power4 system running in full system
partition mode, which is where I saw the problem. It works; I've
not done any wider testing. Had a brief discussion on this on irc.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Fix cell's mmio nvram to properly parse device tree
Benjamin Herrenschmidt [Thu, 11 Jan 2007 05:08:41 +0000 (16:08 +1100)]
[POWERPC] Fix cell's mmio nvram to properly parse device tree

The mmio nvram driver (used by cell only atm) isn't properly parsing
the device-tree, meaning that nvram isn't found correctly on the new
Cell blades.  It works ok for old blades where the nvram is at the
root of the device tree but fails on Malta and CAB when it's hanging
off axon.  This fixes it by using the proper OF parsing functions.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Remove bogus sanity check in pci -> OF node code
Benjamin Herrenschmidt [Thu, 11 Jan 2007 05:38:22 +0000 (16:38 +1100)]
[POWERPC] Remove bogus sanity check in pci -> OF node code

The new implementation of pci_device_to_OF_node() on ppc32 has a bogus
sanity check in it that can cause oopses at boot when no device node is
present, and might hit correct cases with older/weird apple device-trees
where they have the type "vci" for the chaos bridge.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years agoocfs2: Add backup superblock info to ocfs2_fs.h
Mark Fasheh [Sun, 21 Jan 2007 22:44:59 +0000 (14:44 -0800)]
ocfs2: Add backup superblock info to ocfs2_fs.h

This synchronizes us with recent ocfs2-tools changes.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years agoocfs2: cleanup ocfs2_iget() errors
Mark Fasheh [Thu, 4 Jan 2007 01:06:59 +0000 (17:06 -0800)]
ocfs2: cleanup ocfs2_iget() errors

Get rid of some error prints in the ocfs2_iget() path from
ocfs2_get_dentry(). NFSD can easily cause us to read stale inodes.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years agoocfs2: Directory c/mtime update fixes
Mark Fasheh [Wed, 3 Jan 2007 01:59:40 +0000 (17:59 -0800)]
ocfs2: Directory c/mtime update fixes

ocfs2 wasn't updating c/mtime on directories during dirent
creation/deletion. Fix ocfs2_unlink(), ocfs2_rename() and
__ocfs2_add_entry() by adding the proper code to update the struct inode and
push the change out to disk.

This helps rename/unlink on nfs exported file systems in particular as those
clients compare directory time values to avoid a full re-reading a directory
which hasn't changed.

ocfs2_rename() loses some superfluous error handling as a result of this
patch.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years agoocfs2: Don't print errors when following symlinks
Mark Fasheh [Thu, 4 Jan 2007 01:25:40 +0000 (17:25 -0800)]
ocfs2: Don't print errors when following symlinks

We shouldn't print errors returned from vfs_follow_link(). This was causing
spurious errors to show up in the logs.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years agohid-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist
Jeremy Roberson [Fri, 19 Jan 2007 22:44:18 +0000 (15:44 -0700)]
hid-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist

Adds GTCO CalComp Interwrite IPanels to the hid-core.c blacklist.

Signed-off-by: Jeremy A. Roberson <jroberson@gtcocalcomp.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage
Anssi Hannula [Fri, 19 Jan 2007 17:28:17 +0000 (19:28 +0200)]
HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage

The commit 4916b3a57fc94664677d439b911b8aaf86c7ec23 introduced a
hid regression between 2.6.19 and 2.6.20-rc1. The device put in
input_dev->cdev is now of type usb_device instead of usb_interface.

Before:
> # readlink -f /sys/class/input/input6/event4/device
> /sys/devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.1
After:
> # readlink -f /sys/class/input/input3/event3/device
> /sys/devices/pci0000:00/0000:00:10.0/usb1/1-1

This causes breakage:
> # udevinfo -q all -n /dev/input/event3
> P: /class/input/input3/event3
> N: input/event3
> S: input/by-path/pci-1-1--event-
> E: ID_SERIAL=noserial
> E: ID_PATH=pci-1-1-

No ID_MODEL, ID_VENDOR, ID_REVISION, ID_TYPE etc etc.

Fix this by assigning the intf->dev into hid->dev, and fixing
all the users.

Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: add missing RX, RZ and RY enum values to hid-debug output
Simon Budig [Mon, 15 Jan 2007 17:34:32 +0000 (18:34 +0100)]
HID: add missing RX, RZ and RY enum values to hid-debug output

This trivial change adds some missing enum values to the hid-debug output.

Signed-off-by: Simon Budig <simon@budig.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: hid/hid-input.c doesn't need to include linux/usb/input.h
Jiri Kosina [Mon, 15 Jan 2007 23:30:42 +0000 (00:30 +0100)]
HID: hid/hid-input.c doesn't need to include linux/usb/input.h

There is no reason for generic hid-input.c to include usb-specific
input.h.

As a sideeffect, this also fixes warning of redefinition of dbg()
macro, when hid-input.c is compiled with DEBUG (as there is a clash
between dbg() from hid.h and usb/input.h).

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: compilation fix when DEBUG_DATA is defined
Jiri Kosina [Mon, 15 Jan 2007 22:53:05 +0000 (23:53 +0100)]
HID: compilation fix when DEBUG_DATA is defined

hid/hid-core.c references 'len' variable when DEBUG_DATA is defined,
but the actual name of the variable is 'size'. Fix it.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: proper LED-mapping for SpaceNavigator
Simon Budig [Mon, 15 Jan 2007 16:28:47 +0000 (17:28 +0100)]
HID: proper LED-mapping for SpaceNavigator

This change introduces a mapping for LED indicators between the HID
specification and the Linux input subsystem. The previous code properly
mapped the LEDs relevant for Keyboards, but garbeled the remaining ones.
With this change all LED enums from the input system get mapped to more
or less equivalent LED numbers from the HID specification.

This patch also ensures that the unused bits in a HID report to the
device are zeroed out. This makes the 3Dconnexion SpaceNavigator fully
usable with the linux input system.

Signed-off-by: Simon Budig <simon@budig.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: update MAINTAINERS entry for USB-HID
Jiri Kosina [Mon, 15 Jan 2007 08:56:21 +0000 (09:56 +0100)]
HID: update MAINTAINERS entry for USB-HID

Change USB-HID maintainer from Vojtech Pavlik to Jiri Kosina.

Acked-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: GEYSER4_ISO needs quirk
Adrian Friedli [Sun, 14 Jan 2007 21:12:43 +0000 (22:12 +0100)]
HID: GEYSER4_ISO needs quirk

I've got a newer MacBook with core2duo. Two keys on the keyboard are
swapped, "unswaping" works with the same trick as GEYSER3_ISO.

Signed-off-by: Adrian Friedli <masteradi@gmx.ch>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agoHID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT
Russell King [Fri, 12 Jan 2007 21:53:51 +0000 (21:53 +0000)]
HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT

We have USB_HID _newly_ selected in configurations which didn't
have it before, which overrides CONFIG_HID and builds HID without
input support.

Nevertheless, here's a patch to solve more of the same that my original
patch attempted to solve.  The original patch is still required.  Seems
to solve the final instance of this problem here.

Signed-off-by: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
17 years agosata_mv HighPoint 2310 support (88SX7042)
Olof Johansson [Fri, 19 Jan 2007 00:39:59 +0000 (18:39 -0600)]
sata_mv HighPoint 2310 support (88SX7042)

With the following patch, my HighPoint 2310 with a Marvell 88SX7042 on
it seems to work OK.

The controller only has 4 ports, with MV_FLAG_DUAL_HC it seems to init 8
ports and fails miserably at probe time. There are no other devices mapped
to that chip, maybe it was just incorrectly specified in the first place?

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agolibata: fix handling of port actions in per-dev action mask
Tejun Heo [Thu, 18 Jan 2007 08:22:18 +0000 (17:22 +0900)]
libata: fix handling of port actions in per-dev action mask

libata EH ignores port-wide actions in per-dev action mask.  However,
device resume requests EH_SOFTRESET using per-dev action mask.  Under
certain circumstances, this results in not resetting frozen port after
resuming which causes failure of all commands.

This patch allows port-wide actions to be requested in per-dev action
mask.  Before EH recovery starts, port-wide actions will be collected.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agolibata: initialize qc->dma_dir to DMA_NONE
Tejun Heo [Wed, 17 Jan 2007 02:34:02 +0000 (11:34 +0900)]
libata: initialize qc->dma_dir to DMA_NONE

libata didn't used to init qc->dma_dir to any specific value on qc
initialization and command translation path didn't set qc->dma_dir if
the command doesn't need data transfer.  This made non-data commands
to have random qc->dma_dir.

This usually doesn't cause problem because LLDs usually check
qc->protocol first and look at qc->dma_dir iff the command needs data
transfer but this doesn't hold for all LLDs.

It might be worthwhile to rename qc->dma_dir to qc->data_dir as we use
the field to tag data direction for both PIO and DMA protocols.

This problem has been spotted by James Bottomley.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agosata_via: add PCI ID 0x5337
Luca Pedrielli [Tue, 16 Jan 2007 03:55:04 +0000 (12:55 +0900)]
sata_via: add PCI ID 0x5337

Add PCI ID 0x5337 to supported PCI ID.  This is VT8237 in IDE mode.

Signed-off-by: Luca Pedrielli <luca.pedrielli@barradev.it>
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agolibata doc: "error : unterminated entity reference exceptions"
Robert P. J. Day [Mon, 8 Jan 2007 07:22:03 +0000 (02:22 -0500)]
libata doc: "error : unterminated entity reference exceptions"

  Fix libata.tmpl to not generate "error : unterminated entity
reference  exceptions" errors anymore when running "make htmldocs".

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agosis190: failure to set the MAC address from EEPROM
Francois Romieu [Thu, 18 Jan 2007 22:22:23 +0000 (23:22 +0100)]
sis190: failure to set the MAC address from EEPROM

Fix from http://bugzilla.kernel.org/show_bug.cgi?id=7747

Signed-off-by: Andrew Morton <akpm@osdl.org>
Cc: <sleepy@mike-neko.net>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>