]> pilppa.org Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
17 years agoCONFIG_PM_SLEEP fix: xen: fix compilation when CONFIG_PM_SLEEP is disabled
Jeremy Fitzhardinge [Thu, 29 May 2008 08:02:19 +0000 (09:02 +0100)]
CONFIG_PM_SLEEP fix: xen: fix compilation when CONFIG_PM_SLEEP is disabled

Xen save/restore depends on CONFIG_PM_SLEEP being set for device_power_up/down.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoi8259: fix final ugliness
Pavel Machek [Wed, 28 May 2008 10:42:57 +0000 (12:42 +0200)]
i8259: fix final ugliness

Introduce IRQx_VECTOR on 32-bit, so that #ifdef noise is kept
down. There should be no object code change.

[ mingo@elte.hu: merged to x86/irq not x86/i8259 due to x86/irq having
  restructured the vector code into asm-x86/irq_vectors.h, which this
  patch touches. ]

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agofix build bug in "x86: add PCI extended config space access for AMD Barcelona"
Ingo Molnar [Mon, 2 Jun 2008 08:54:16 +0000 (10:54 +0200)]
fix build bug in "x86: add PCI extended config space access for AMD Barcelona"

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: add PCI extended config space access for AMD Barcelona
Robert Richter [Mon, 3 Sep 2007 08:17:39 +0000 (10:17 +0200)]
x86: add PCI extended config space access for AMD Barcelona

This patch implements PCI extended configuration space access for
AMD's Barcelona CPUs. It extends the method using CF8/CFC IO
addresses. An x86 capability bit has been introduced that is set for
CPUs supporting PCI extended config space accesses.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years ago[ALSA] emu10k1 - Fix inverted Analog/Digital mixer switch on Audigy2
Takashi Iwai [Mon, 2 Jun 2008 09:45:53 +0000 (11:45 +0200)]
[ALSA] emu10k1 - Fix inverted Analog/Digital mixer switch on Audigy2

On Audigy2 Platinum, the Analog/Digital mixer switch is inverted.
https://bugzilla.novell.com/show_bug.cgi?id=396204

The patch adds a simple workaround.

There might be another device requiring a similar fix, too (or fix for
audigy2 generically), but right now I fix only the known broken one.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
17 years agox86: get irq for hpet timer
Kevin Hao [Thu, 29 May 2008 10:41:04 +0000 (18:41 +0800)]
x86: get irq for hpet timer

HPET timer's IRQ is 0 by default. So we have to select which irq
will be used by these timers. We wait to set the timer's irq until
we really open it in order to reduce the chance of conflicting with
other device.

Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoftrace: core support for ARM
Abhishek Sagar [Sat, 31 May 2008 08:53:50 +0000 (14:23 +0530)]
ftrace: core support for ARM

Core ftrace support for the ARM architecture, which includes support
for dynamic function tracing.

Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agopci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
Bertram Felgenhauer [Fri, 30 May 2008 01:20:05 +0000 (03:20 +0200)]
pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)

This BIOS claims the VIA 8237 south bridge to be compatible with VIA 586,
which it is not.

Without this patch, I get the following warning while booting,
among others,

| PCI: Using IRQ router VIA [1106/3227] at 0000:00:11.0
| ------------[ cut here ]------------
| WARNING: at arch/x86/pci/irq.c:265 pirq_via586_get+0x4a/0x60()
| Modules linked in:
| Pid: 1, comm: swapper Not tainted 2.6.26-rc4-00015-g1ec7d99 #1
|  [<c0119fd4>] warn_on_slowpath+0x54/0x70
|  [<c02246e0>] ? vt_console_print+0x210/0x2b0
|  [<c02244d0>] ? vt_console_print+0x0/0x2b0
|  [<c011a413>] ? __call_console_drivers+0x43/0x60
|  [<c011a482>] ? _call_console_drivers+0x52/0x80
|  [<c011aa89>] ? release_console_sem+0x1c9/0x200
|  [<c0291d21>] ? raw_pci_read+0x41/0x70
|  [<c0291e8f>] ? pci_read+0x2f/0x40
|  [<c029151a>] pirq_via586_get+0x4a/0x60
|  [<c02914d0>] ? pirq_via586_get+0x0/0x60
|  [<c029178d>] pcibios_lookup_irq+0x15d/0x430
|  [<c03b895a>] pcibios_irq_init+0x17a/0x3e0
|  [<c03a66f0>] ? kernel_init+0x0/0x250
|  [<c03a6763>] kernel_init+0x73/0x250
|  [<c03b87e0>] ? pcibios_irq_init+0x0/0x3e0
|  [<c0114d00>] ? schedule_tail+0x10/0x40
|  [<c0102dee>] ? ret_from_fork+0x6/0x1c
|  [<c03a66f0>] ? kernel_init+0x0/0x250
|  [<c03a66f0>] ? kernel_init+0x0/0x250
|  [<c010324b>] kernel_thread_helper+0x7/0x1c
|  =======================
| ---[ end trace 4eaa2a86a8e2da22 ]---

and IRQ trouble later,

| irq 10: nobody cared (try booting with the "irqpoll" option)

Now that's an VIA 8237 chip, so pirq_via586_get shouldn't be called
at all; adding this workaround to via_router_probe() fixes the
problem for me.

Amazingly I have a 2.6.23.8 kernel that somehow works fine ... I'll
never understand why.

Signed-off-by: Bertram Felgenhauer <int-e@gmx.de>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years ago[CRYPTO] cts: Init SG tables
Alexey Dobriyan [Mon, 2 Jun 2008 05:46:51 +0000 (15:46 +1000)]
[CRYPTO] cts: Init SG tables

Steps to reproduce:

modprobe tcrypt # with CONFIG_DEBUG_SG=y

testing cts(cbc(aes)) encryption
test 1 (128 bit key):
------------[ cut here ]------------
kernel BUG at include/linux/scatterlist.h:65!
invalid opcode: 0000 [1] PREEMPT SMP DEBUG_PAGEALLOC
CPU 0
Modules linked in: tea xts twofish twofish_common tcrypt(+) [maaaany]
Pid: 16151, comm: modprobe Not tainted 2.6.26-rc4-fat #7
RIP: 0010:[<ffffffffa0bf032e>]  [<ffffffffa0bf032e>] :cts:cts_cbc_encrypt+0x151/0x355
RSP: 0018:ffff81016f497a88  EFLAGS: 00010286
RAX: ffffe20009535d58 RBX: ffff81016f497af0 RCX: 0000000087654321
RDX: ffff8100010d4f28 RSI: ffff81016f497ee8 RDI: ffff81016f497ac0
RBP: ffff81016f497c38 R08: 0000000000000000 R09: 0000000000000011
R10: ffffffff00000008 R11: ffff8100010d4f28 R12: ffff81016f497ac0
R13: ffff81016f497b30 R14: 0000000000000010 R15: 0000000000000010
FS:  00007fac6fa276f0(0000) GS:ffffffff8060e000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 00007f12ca7cc000 CR3: 000000016f441000 CR4: 00000000000026e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff4ff0 DR7: 0000000000000400
Process modprobe (pid: 16151, threadinfo ffff81016f496000, task ffff8101755b4ae0)
Stack:  0000000000000001 ffff81016f496000 ffffffff80719f78 0000000000000001
 0000000000000001 ffffffff8020c87c ffff81016f99c918 20646c756f772049
 65687420656b696c 0000000000000020 0000000000000000 0000000033341102
Call Trace:
 [<ffffffff8020c87c>] ? restore_args+0x0/0x30
 [<ffffffffa04aa311>] ? :aes_generic:crypto_aes_expand_key+0x311/0x369
 [<ffffffff802ab453>] ? check_object+0x15a/0x213
 [<ffffffff802aad22>] ? init_object+0x6e/0x76
 [<ffffffff802ac3ae>] ? __slab_free+0xfc/0x371
 [<ffffffffa0bf05ed>] :cts:crypto_cts_encrypt+0xbb/0xca
 [<ffffffffa07108de>] ? :crypto_blkcipher:setkey+0xc7/0xec
 [<ffffffffa07110b8>] :crypto_blkcipher:async_encrypt+0x38/0x3a
 [<ffffffffa2ce9341>] :tcrypt:test_cipher+0x261/0x7c6
 [<ffffffffa2cfd9df>] :tcrypt:tcrypt_mod_init+0x9df/0x1b30
 [<ffffffff80261e35>] sys_init_module+0x9e/0x1b2
 [<ffffffff8020c15a>] system_call_after_swapgs+0x8a/0x8f
Code: 45 c0 e8 aa 24 63 df 48 c1 e8 0c 48 b9 00 00 00 00 00 e2 ff ff 48 8b 55 88 48 6b c0 68 48 01 c8 b9 21 43 65 87 48 39 4d 80 74 04 <0f> 0b eb fe f6 c2 01 74 04 0f 0b eb fe 83 e2 03 4c 89 ef 44 89
RIP  [<ffffffffa0bf032e>] :cts:cts_cbc_encrypt+0x151/0x355
 RSP <ffff81016f497a88>
---[ end trace e8bahiarjand37fd ]---

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
17 years agosh: Disable 4KSTACKS on nommu.
Paul Mundt [Mon, 2 Jun 2008 04:48:59 +0000 (13:48 +0900)]
sh: Disable 4KSTACKS on nommu.

4k stacks on nommu ends up blowing up with all sorts of interesting
slab corruption. Disable this by default unless BROKEN is also
enabled.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agoInput: serio - remove pending events when unregistering driver
Dmitry Torokhov [Mon, 2 Jun 2008 04:41:57 +0000 (00:41 -0400)]
Input: serio - remove pending events when unregistering driver

That fixes an opps when driver is repeatedly loaded and unloaded in
a tight loop.

Tested-by: Roland Kletzing <devzero@web.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: atkbd - use ushort instead of uchar keymap
Dmitry Torokhov [Mon, 2 Jun 2008 04:39:45 +0000 (00:39 -0400)]
Input: atkbd - use ushort instead of uchar keymap

Since some of the keycodes defined in input.h have values greater
than 255 we should use unsigned shorts in keymaps.

Tested-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: add HTC Shift Touchscreen Driver
Pau Oliva Fora [Mon, 2 Jun 2008 04:38:35 +0000 (00:38 -0400)]
Input: add HTC Shift Touchscreen Driver

Signed-off-by: Pau Oliva Fora <pau@eslack.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agosh: fix miscompilation of ip_fast_csum with gcc >= 4.3
Paul Mundt [Mon, 2 Jun 2008 03:40:14 +0000 (12:40 +0900)]
sh: fix miscompilation of ip_fast_csum with gcc >= 4.3

As noted by Matthew Wilcox:

    Kyle McMartin just tracked down a bug on parisc to a missing
    "memory" clobber in the inline assembly implementation of
    ip_fast_csum.  The FRV, SH and Xtensa ports are also missing a
    memory clobber, so I thought it would be polite to let you know.

    The bug manifests as dropped network packets (obviously they have
    the wrong checksum).  It started appearing for parisc with GCC 4.3.

    The GCC manual says:

     If your assembler instructions access memory in an unpredictable
     fashion, add `memory' to the list of clobbered registers.  This
     will cause GCC to not keep memory values cached in registers
     across the assembler instruction and not optimize stores or loads
     to that memory.

    I see that FRV has a 400 byte memory output which may prevent this
    problem from appearing, but SH and Xtensa have nothing to prevent
    this bug.  Hope this saves you a few days of debugging.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agosh: module.c use kernel unaligned helpers
Harvey Harrison [Wed, 28 May 2008 23:38:17 +0000 (16:38 -0700)]
sh: module.c use kernel unaligned helpers

Replace the COPY_UNALIGNED_WORD helper.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agosh/kernel/cpu/irq/intc-sh5.c build fix
Adrian Bunk [Thu, 29 May 2008 22:04:49 +0000 (01:04 +0300)]
sh/kernel/cpu/irq/intc-sh5.c build fix

This patch fixes the following build error caused by
commit a1dc4b59fa4af97ae68ee214d4d72bbd7c7ec1dc
(sh: intc_sh5 depends on cayman board for IRQ priority table.):

<--  snip  -->

...
  CC      arch/sh/kernel/cpu/irq/intc-sh5.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c: In function 'plat_irq_setup':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c:257: error: expected declaration or statement at end of input
make[4]: *** [arch/sh/kernel/cpu/irq/intc-sh5.o] Error 1

<--  snip  -->

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years ago[ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
eric miao [Mon, 26 May 2008 02:23:14 +0000 (03:23 +0100)]
[ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 5060/1: remove unnecessary include of asm/io.h
Greg Ungerer [Sun, 25 May 2008 11:35:38 +0000 (12:35 +0100)]
[ARM] 5060/1: remove unnecessary include of asm/io.h

Remove unnecessary include of asm/io.h.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] fix AT91 include loops
Russell King [Sun, 1 Jun 2008 10:19:33 +0000 (11:19 +0100)]
[ARM] fix AT91 include loops

AT91 has one include loop in its header files:

  include/asm-arm/io.h <- include/asm-arm/arch-at91/io.h <-
   include/asm-arm/io.h

Circular include dependencies are dangerous since they can result in
inconsistent definitions being provided to other code, especially if
'#ifndef' constructs are used.

Solve this by removing the offending includes.  Built tested using my
AT91 configuration.

Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years agocapabilities: remain source compatible with 32-bit raw legacy capability support.
Andrew G. Morgan [Wed, 28 May 2008 05:05:17 +0000 (22:05 -0700)]
capabilities: remain source compatible with 32-bit raw legacy capability support.

Source code out there hard-codes a notion of what the
_LINUX_CAPABILITY_VERSION #define means in terms of the semantics of the
raw capability system calls capget() and capset().  Its unfortunate, but
true.

Since the confusing header file has been in a released kernel, there is
software that is erroneously using 64-bit capabilities with the semantics
of 32-bit compatibilities.  These recently compiled programs may suffer
corruption of their memory when sys_getcap() overwrites more memory than
they are coded to expect, and the raising of added capabilities when using
sys_capset().

As such, this patch does a number of things to clean up the situation
for all. It

  1. forces the _LINUX_CAPABILITY_VERSION define to always retain its
     legacy value.

  2. adopts a new #define strategy for the kernel's internal
     implementation of the preferred magic.

  3. deprecates v2 capability magic in favor of a new (v3) magic
     number. The functionality of v3 is entirely equivalent to v2,
     the only difference being that the v2 magic causes the kernel
     to log a "deprecated" warning so the admin can find applications
     that may be using v2 inappropriately.

[User space code continues to be encouraged to use the libcap API which
protects the application from details like this.  libcap-2.10 is the first
to support v3 capabilities.]

Fixes issue reported in https://bugzilla.redhat.com/show_bug.cgi?id=447518.
Thanks to Bojan Smojver for the report.

[akpm@linux-foundation.org: s/depreciate/deprecate/g]
[akpm@linux-foundation.org: be robust about put_user size]
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
Cc: Serge E. Hallyn <serue@us.ibm.com>
Cc: Bojan Smojver <bojan@rexursive.com>
Cc: stable@kernel.org
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
17 years agokbuild: fix $(src) assignmnet with external modules
Sam Ravnborg [Sat, 31 May 2008 20:28:40 +0000 (22:28 +0200)]
kbuild: fix $(src) assignmnet with external modules

When we introduced support for KBUILD_EXTRA_SYMBOLS
we started to include the externam module's kbuild
file when doing the final modpost step.

As external modules often do:
ccflags-y := -I$(src)

We had problems because $(src) was unassinged and
gcc then used the next parameter for -I resulting in
strange build failures.

Fix is to assign $(src) and $(obj) when building
external modules.

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

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Tvrtko <tvrtko.ursulin@sophos.com>
Cc: Andrea Arcangeli <andrea@qumranet.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
17 years ago8250 Serial Driver: revert extra IRQ flag definition patch
Bryan Wu [Sat, 31 May 2008 08:10:04 +0000 (16:10 +0800)]
8250 Serial Driver: revert extra IRQ flag definition patch

As Russell pointed out, original patch will break some serial configurations
because of the dependency of the <asm/serial.h> header file.

Revert it first and try to find out other solution later

Cc: Javier Herrero <jherrero@hvsistemas.es>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
17 years agox86: 32bit numa srat fix early_ioremap leak
Yinghai Lu [Thu, 29 May 2008 23:25:56 +0000 (16:25 -0700)]
x86: 32bit numa srat fix early_ioremap leak

on two node system (16g RAM) with numa config I got this crash:

get_memcfg_from_srat: assigning address to rsdp
RSD PTR  v0 [ACPIAM]
ACPI: Too big length in RSDT: 92
failed to get NUMA memory information from SRAT table
NUMA - single node, flat memory mode
Node: 0, start_pfn: 0, end_pfn: 153
 Setting physnode_map array to node 0 for pfns:
 0
...
Pid: 0, comm: swapper Not tainted 2.6.26-rc4 #4
 [<80b41289>] hlt_loop+0x0/0x3
 [<8011efa0>] ? alloc_remap+0x50/0x70
 [<8079e32e>] alloc_node_mem_map+0x5e/0xa0
 [<8012e77b>] ? printk+0x1b/0x20
 [<80b590f6>] free_area_init_node+0xc6/0x470
 [<80b588fc>] ? __alloc_bootmem_node+0x2c/0x50
 [<80b58ad8>] ? find_min_pfn_for_node+0x38/0x70
 [<8012e77b>] ? printk+0x1b/0x20
 [<80b597c4>] free_area_init_nodes+0x254/0x2d0
 [<80b544d7>] zone_sizes_init+0x97/0xa0
 [<80b48a03>] setup_arch+0x383/0x530
 [<8012e77b>] ? printk+0x1b/0x20
 [<80b41aa4>] start_kernel+0x64/0x350
 [<80b412d8>] i386_start_kernel+0x8/0x10
 =======================

this patch increases the acpi table limit to 32.
Also match early_ioremap() with early_iounmap().

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: extend e820 early_res support 32bit -fix #5
Yinghai Lu [Thu, 29 May 2008 19:58:37 +0000 (12:58 -0700)]
x86: extend e820 early_res support 32bit -fix #5

reserve early numa kva, so it will not clash with new RAMDISK

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: extend e820 early_res support 32bit -fix #4
Yinghai Lu [Thu, 29 May 2008 19:57:22 +0000 (12:57 -0700)]
x86: extend e820 early_res support 32bit -fix #4

reserve_early pgdata for 32bit numa

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agox86: extend e820 early_res support 32bit -fix #3
Yinghai Lu [Thu, 29 May 2008 19:56:36 +0000 (12:56 -0700)]
x86: extend e820 early_res support 32bit -fix #3

introduce init_pg_table_start, so xen PV could specify the value.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoBlackfin arch: update anomaly headers from toolchain trunk
Mike Frysinger [Sat, 31 May 2008 07:47:17 +0000 (15:47 +0800)]
Blackfin arch: update anomaly headers from toolchain trunk

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
17 years agoBlackfin arch: Remove bad and usless code
Michael Hennerich [Sat, 31 May 2008 07:35:40 +0000 (15:35 +0800)]
Blackfin arch: Remove bad and usless code

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
17 years agoBlackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
Bryan Wu [Sat, 31 May 2008 07:17:25 +0000 (15:17 +0800)]
Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527

AD7877 use SSEL_2 (P9.9) and IRQ_PF8 (P9.14) on BF527

 - populating JP3 to enable STAMP
 - disable SW11.2 to disconnect SSEL_2/PF12 from Rotary NAND
 - disable SW18.1 to disconnect SSEL_2 from MAX1233 touchscreen chip

Signed-off-by: Bryan Wu <cooloney@kernel.org>
17 years ago[POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
Timur Tabi [Fri, 30 May 2008 22:12:05 +0000 (08:12 +1000)]
[POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree

The node for DMA2 in the MPC8610 HPCD device tree has the wrong compatible
properties.  This breaks the DMA driver and the sound driver.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Export empty_zero_page and copy_page in arch/ppc
Tony Breeds [Wed, 28 May 2008 00:52:19 +0000 (10:52 +1000)]
[POWERPC] Export empty_zero_page and copy_page in arch/ppc

Currently ext4 and fuse fail to link if modular:
ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!
ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
make[3]: *** [__modpost] Error 1
make[2]: *** [modules] Error 2
make[1]: *** [sub-make] Error 2

While arch ppc exists it may as well compile, so this exports those
symbols (which are already exported in arch/powerpc).

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Add "memory" clobber to MMIO accessors
Benjamin Herrenschmidt [Wed, 28 May 2008 00:18:17 +0000 (10:18 +1000)]
[POWERPC] Add "memory" clobber to MMIO accessors

Gcc might re-order MMIO accessors vs. surrounding consistent
memory accesses, which is a "bad thing", and could break drivers.
This fixes it by adding a "memory" clobber to the MMIO accessors,
which should prevent gcc from doing that reordering.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years agons8320: use netdev_alloc_skb
Stephen Hemminger [Wed, 16 Apr 2008 23:37:35 +0000 (16:37 -0700)]
ns8320: use netdev_alloc_skb

Use netdev_alloc_skb. This sets skb->dev and allows arch specific
allocation.

Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agots108: use netdev_alloc_skb
Stephen Hemminger [Wed, 16 Apr 2008 23:37:30 +0000 (16:37 -0700)]
ts108: use netdev_alloc_skb

Use netdev_alloc_skb for rx buffer allocation. This sets skb->dev
and can be overriden for NUMA machines.

This device is PowerPC only, so not tested or compiled.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agonet/s2io: set_rxd_buffer_pointer returns -ENOMEM, not ENOMEM
Marcin Slusarz [Wed, 14 May 2008 23:20:17 +0000 (16:20 -0700)]
net/s2io: set_rxd_buffer_pointer returns -ENOMEM, not ENOMEM

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Ramkrishna Vepa <ram.vepa@neterion.com>
Cc: Rastapur Santosh <santosh.rastapur@neterion.com>
Cc: Sivakumar Subramani <sivakumar.subramani@neterion.com>
Cc: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agosky2: pci power savings
Stephen Hemminger [Thu, 15 May 2008 00:04:17 +0000 (17:04 -0700)]
sky2: pci power savings

Turn on special bits to save more power when device is shutdown.
Tested on a limited range of hardware, some of the bits are for hardware
that probably isn't even in production (like Yukon Supreme) and was ported
from the vendor driver.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agosky2: put PHY in sleep when down
Stephen Hemminger [Thu, 15 May 2008 00:04:16 +0000 (17:04 -0700)]
sky2: put PHY in sleep when down

Put PHY int sleep mode (from vendor sk98lin 10.50 driver) when the
network device is brought down.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agosky2: split phy power into two functions
Stephen Hemminger [Thu, 15 May 2008 00:04:15 +0000 (17:04 -0700)]
sky2: split phy power into two functions

Later changes add more code to PHY power changes so refactor now.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years ago[netdrvr] forcedeth: reorder suspend/resume code
Tobias Diedrich [Sun, 18 May 2008 13:04:29 +0000 (15:04 +0200)]
[netdrvr] forcedeth: reorder suspend/resume code

Match the suspend/resume code ordering in e100/e1000e more closely.
For example the configuration space should be saved on suspend even for
devices that are not up.

Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years ago[netdrvr] forcedeth: save/restore device configuration space
Tobias Diedrich [Sun, 18 May 2008 13:03:44 +0000 (15:03 +0200)]
[netdrvr] forcedeth: save/restore device configuration space

The memory mapped device configuration space is lost during hibernate.
Save and restore it (fixes 'swapped mac' problem).

Signed-off-by: TTobias Diedrich <ranma+kernel@tdiedrich.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years ago[netdrvr] forcedeth: setup wake-on-lan before shutting down
Tobias Diedrich [Sun, 18 May 2008 13:02:37 +0000 (15:02 +0200)]
[netdrvr] forcedeth: setup wake-on-lan before shutting down

When hibernating in 'shutdown' mode, after saving the image the suspend hook
is not called again.
However, if the device is in promiscous mode, wake-on-lan will not work.
This adds a shutdown hook to setup wake-on-lan before the final shutdown.

Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agops3: gelic: updown_lock semaphore to mutex
Daniel Walker [Thu, 22 May 2008 07:00:03 +0000 (00:00 -0700)]
ps3: gelic: updown_lock semaphore to mutex

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agops3: gelic: assoc_stat_lock semaphore to mutex
Daniel Walker [Thu, 22 May 2008 07:00:02 +0000 (00:00 -0700)]
ps3: gelic: assoc_stat_lock semaphore to mutex

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agops3: gelic: scan_lock semaphore to mutex
Daniel Walker [Thu, 22 May 2008 07:00:01 +0000 (00:00 -0700)]
ps3: gelic: scan_lock semaphore to mutex

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agofs_enet: MDIO on GPIO support
Laurent Pinchart [Mon, 26 May 2008 09:53:45 +0000 (11:53 +0200)]
fs_enet: MDIO on GPIO support

Port the fs_enet driver to support the MDIO on GPIO driver for PHY access
in addition to the mii-bitbang driver.

Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agonet: OpenFirmware GPIO based MDIO bitbang driver
Laurent Pinchart [Mon, 26 May 2008 09:53:21 +0000 (11:53 +0200)]
net: OpenFirmware GPIO based MDIO bitbang driver

This patch adds an MDIO bitbang driver that uses the GPIO library and its
OF bindings to access the bus I/Os.

Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agosfc: Reduce I2C udelay to 5 resulting in a clock frequency of 100 kHz
Ben Hutchings [Fri, 30 May 2008 21:27:46 +0000 (22:27 +0100)]
sfc: Reduce I2C udelay to 5 resulting in a clock frequency of 100 kHz

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agosfc: Use kernel I2C system and i2c-algo-bit driver
Ben Hutchings [Fri, 30 May 2008 21:27:04 +0000 (22:27 +0100)]
sfc: Use kernel I2C system and i2c-algo-bit driver

Remove our own implementation of I2C bit-banging.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agocxgb3: fix build error when INET=n
Randy Dunlap [Fri, 30 May 2008 17:29:19 +0000 (10:29 -0700)]
cxgb3: fix build error when INET=n

cxgb3 uses lro_* functions and selects INET_LRO, but this doesn't help unless
INET is already enabled, so make the driver depend on INET also.

sge.c:(.text+0x9f09a): undefined reference to `lro_flush_all'
sge.c:(.text+0x9f62f): undefined reference to `lro_receive_skb'
sge.c:(.text+0x9f8a3): undefined reference to `lro_receive_frags'
sge.c:(.text+0x9fbe0): undefined reference to `lro_vlan_hwaccel_receive_skb'
sge.c:(.text+0x9ffcd): undefined reference to `lro_vlan_hwaccel_receive_frags'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agotlan: wrap source lines
Stephen Hemminger [Fri, 30 May 2008 16:49:58 +0000 (09:49 -0700)]
tlan: wrap source lines

Make driver more readable on standard 80 col windows.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agotlan: proper shared IRQ support
Stephen Hemminger [Fri, 30 May 2008 16:49:57 +0000 (09:49 -0700)]
tlan: proper shared IRQ support

Handle shared IRQ correctly. If IRQ is shared, it typically will show up
as an IRQ with an empty status field. So check in driver and handle it
without crapping out with invalid interrupt message.

Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agotlan: manage rx allocation failure better
Stephen Hemminger [Fri, 30 May 2008 16:49:56 +0000 (09:49 -0700)]
tlan: manage rx allocation failure better

Rx allocation failure at runtime is non-fatal. For normal Rx frame, it
just reuses the buffer, and during setup it just continues with a smaller
receive buffer pool.

Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agotlan: 64bit conversion
Stephen Hemminger [Fri, 30 May 2008 16:49:55 +0000 (09:49 -0700)]
tlan: 64bit conversion

Make this driver compile cleanly on 64 bit platforms.
Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agotlan: remove unused devName field
Stephen Hemminger [Fri, 30 May 2008 16:49:54 +0000 (09:49 -0700)]
tlan: remove unused devName field

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agotlan: use netdevice stats
Stephen Hemminger [Fri, 30 May 2008 16:49:53 +0000 (09:49 -0700)]
tlan: use netdevice stats

Use new netdevice common stats area.

Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agotlan: get rid of padding buffer
Stephen Hemminger [Fri, 30 May 2008 16:49:52 +0000 (09:49 -0700)]
tlan: get rid of padding buffer

Use skb_padto to pad frames, this avoid allocation of separate buffer just
for dma of the extra bytes.

Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agomyri10ge: add Direct Cache Access support
Brice Goglin [Fri, 9 May 2008 00:22:16 +0000 (02:22 +0200)]
myri10ge: add Direct Cache Access support

Add I/O AT DCA (Direct Cache Access) support.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew Gallatin <gallatin@myri.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agomyri10ge: add multislices support
Brice Goglin [Fri, 9 May 2008 00:21:49 +0000 (02:21 +0200)]
myri10ge: add multislices support

Add multi-slice/MSI-X support. By default, a single slice
(and the normal firmware) are used.  To enable msi-x, multi-slice
mode, one must load the driver with myri10ge_max_slices set to
either -1, or something larger than 1.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew Gallatin <gallatin@myri.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agomyri10ge: add routines for multislices
Brice Goglin [Fri, 9 May 2008 00:21:10 +0000 (02:21 +0200)]
myri10ge: add routines for multislices

Add several routines that multislices support will use.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew Gallatin <gallatin@myri.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years ago[netdrvr] tulip: oops in tulip_interrupt when hibernating with swsusp/suspend2
Grant Grundler [Mon, 12 May 2008 06:37:51 +0000 (00:37 -0600)]
[netdrvr] tulip: oops in tulip_interrupt when hibernating with swsusp/suspend2

The following patch is seems to fix the tulip suspend/resume panic:
http://bugzilla.kernel.org/show_bug.cgi?id=8952#c46

My attempts at a cleaner patch failed and Pavel thinks this is OK.

Original from:  kernelbugs@tap.homeip.net
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agoatl1: fix 4G memory corruption bug
Alexey Dobriyan [Thu, 22 May 2008 22:00:25 +0000 (02:00 +0400)]
atl1: fix 4G memory corruption bug

When using 4+ GB RAM and SWIOTLB is active, the driver corrupts
memory by writing an skb after the relevant DMA page has been
unmapped.  Although this doesn't happen when *not* using bounce
buffers, clearing the pointer to the DMA page after unmapping
it fixes the problem.

http://marc.info/?t=120861317000005&r=2&w=2

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agoucc_geth_ethtool: Add a missing HW stats counter
Li Yang [Fri, 23 May 2008 10:11:27 +0000 (18:11 +0800)]
ucc_geth_ethtool: Add a missing HW stats counter

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agoucc_geth_ethtool: Fix typo
Joakim Tjernlund [Fri, 23 May 2008 10:11:26 +0000 (18:11 +0800)]
ucc_geth_ethtool: Fix typo

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agovirtio: fix delayed xmit of packet and freeing of old packets.
Rusty Russell [Mon, 26 May 2008 07:48:13 +0000 (17:48 +1000)]
virtio: fix delayed xmit of packet and freeing of old packets.

Because we cache the last failed-to-xmit packet, if there are no
packets queued behind that one we may never send it (reproduced here
as TCP stalls, "cured" by an outgoing ping).

Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agovirtio: fix virtio_net xmit of freed skb bug
Rusty Russell [Mon, 26 May 2008 07:42:42 +0000 (17:42 +1000)]
virtio: fix virtio_net xmit of freed skb bug

If we fail to transmit a packet, we assume the queue is full and put
the skb into last_xmit_skb.  However, if more space frees up before we
xmit it, we loop, and the result can be transmitting the same skb twice.

Fix is simple: set skb to NULL if we've used it in some way, and check
before sending.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agomyri10ge: update driver version
Brice Goglin [Wed, 28 May 2008 07:10:01 +0000 (09:10 +0200)]
myri10ge: update driver version

Update myri10ge version to 1.3.99-1.347.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agosc92031: remove bogus unlikely()
Cesar Eduardo Barros [Fri, 30 May 2008 00:58:36 +0000 (21:58 -0300)]
sc92031: remove bogus unlikely()

Commit 5a0a92e67b5009a71e011658da04fb92dad8961f mentions len < ETH_ZLEN
is true for ARP packets. This obviously is not unlikely.

Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years ago[netdrvr] CS89X0: Add cleanup for dma after fail
Wang Chen [Fri, 30 May 2008 03:18:55 +0000 (11:18 +0800)]
[netdrvr] CS89X0: Add cleanup for dma after fail

After request_dma() succeeding, any error path should do free_dma().

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years ago[netdrvr] sfc: Report XAUI link down at default log level
Ben Hutchings [Fri, 30 May 2008 21:18:35 +0000 (22:18 +0100)]
[netdrvr] sfc: Report XAUI link down at default log level

This is normal when the external link is down so don't report it as an error.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
17 years agox86: move x86-specific documentation into Documentation/x86
H. Peter Anvin [Sat, 31 May 2008 00:19:03 +0000 (17:19 -0700)]
x86: move x86-specific documentation into Documentation/x86

The current organization of the x86 documentation makes it appear as
if the "i386" documentation doesn't apply to x86-64, which is does.
Thus, move that documentation into Documentation/x86, and move the
x86-64-specific stuff into Documentation/x86/x86_64 with the eventual
goal to move stuff that isn't actually 64-bit specific back into
Documentation/x86.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: update Documentation/i386/boot.txt
H. Peter Anvin [Sat, 31 May 2008 00:16:20 +0000 (17:16 -0700)]
x86: update Documentation/i386/boot.txt

Document QUIET_FLAG, correct the definition of several fields, make it
clear this applies to the entire x86 architecture, not just i386.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: Honor 'quiet' command line option in real mode boot decompressor.
Kristian Høgsberg [Thu, 29 May 2008 22:31:15 +0000 (18:31 -0400)]
x86: Honor 'quiet' command line option in real mode boot decompressor.

This patch lets the early real mode code look for the 'quiet' option
on the kernel command line and pass a loadflag to the decompressor.
When this flag is set, we suppress the "Decompressing Linux... Parsing
ELF... done." messages.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: Use structs instead of hardcoded offsets in x86 boot decompressor.
Kristian Høgsberg [Thu, 29 May 2008 22:31:14 +0000 (18:31 -0400)]
x86: Use structs instead of hardcoded offsets in x86 boot decompressor.

Replace hardcoded offsets embedded in macros in
arch/x86/boot/compressed with proper structure references.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: fix overlong line in arch/x86/kernel/cpu/amd_64.c
H. Peter Anvin [Fri, 30 May 2008 22:42:45 +0000 (15:42 -0700)]
x86: fix overlong line in arch/x86/kernel/cpu/amd_64.c

Clean up an overlong line in arch/x86/kernel/cpu/amd_64.c.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: Move the 64-bit Centaur specific parts out of setup_64.c
Dave Jones [Thu, 22 May 2008 22:57:25 +0000 (18:57 -0400)]
x86: Move the 64-bit Centaur specific parts out of setup_64.c

Create a separate centaur_64.c file in the cpu/ dir for
the useful parts to live in.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: Remove workaround for prescott (32bit P4) from 64-bit code.
Dave Jones [Thu, 22 May 2008 22:55:06 +0000 (18:55 -0400)]
x86: Remove workaround for prescott (32bit P4) from 64-bit code.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: Move the 64-bit Intel specific parts out of setup_64.c
Dave Jones [Thu, 22 May 2008 22:54:32 +0000 (18:54 -0400)]
x86: Move the 64-bit Intel specific parts out of setup_64.c

Create a separate intel_64.c file in the cpu/ dir for
the useful parts to live in.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: Move the AMD64 specific parts out of setup_64.c
Dave Jones [Thu, 22 May 2008 22:48:32 +0000 (18:48 -0400)]
x86: Move the AMD64 specific parts out of setup_64.c

Create a separate amd_64.c file in the cpu/ dir for
the useful parts to live in.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
17 years agox86: move mmconfig declarations to header
Thomas Gleixner [Fri, 2 May 2008 21:42:01 +0000 (23:42 +0200)]
x86: move mmconfig declarations to header

arch/x86/kernel/mmconf-fam10h_64.c is missing the prototypes, which
are decalred in arch/x86/kernel/setup_64.c. Move the prototypes and
the inline stubs to the appropriate header file.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years agoMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
Linus Torvalds [Fri, 30 May 2008 22:39:05 +0000 (15:39 -0700)]
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: change the Device IDs of nvidia MCP7B AHCI controller in ahci.c
  [libata] sata_fsl: Fix broken driver, add port multiplier (PMP) support
  libata: SRST can't be trusted on PMP sil3726
  libata: fix libata-scsi kernel-doc notation
  ata: Convert to static DEFINE_SPINLOCK(lock)
  ata_piix: fix macbook ich8m problems
  sata_mv: implement SoC guideline SATA_S11
  sata_mv: workaround for 60x1 errata sata13
  sata_mv: nuke unreleased GenIIe revisions
  sata_mv: PHY_MODEx errata fixes
  sata_mv: move SOC_FLAG to hpriv

17 years ago[PATCH 3/3] ocfs2/net: Silence build warnings
Sunil Mushran [Tue, 13 May 2008 01:31:37 +0000 (18:31 -0700)]
[PATCH 3/3] ocfs2/net: Silence build warnings

This patch silences the build warnings concerning o2net_init_nst()
and friends when building without CONFIG_DEBUG_FS enabled.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
17 years ago[PATCH 2/3] ocfs2/dlm: Silence build warnings
Sunil Mushran [Tue, 13 May 2008 01:31:36 +0000 (18:31 -0700)]
[PATCH 2/3] ocfs2/dlm: Silence build warnings

This patch silences the build warnings concerning dlm_debug_init()
and friends when building without CONFIG_DEBUG_FS enabled.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
17 years ago[PATCH 1/3] ocfs2/net: Silence build warnings
Sunil Mushran [Tue, 13 May 2008 01:31:35 +0000 (18:31 -0700)]
[PATCH 1/3] ocfs2/net: Silence build warnings

This patch silences the build warnings concerning o2net_debugfs_init()
and friends when building without CONFIG_DEBUG_FS enabled.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
17 years agoMACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2
Eduardo Valentin [Thu, 29 May 2008 16:50:50 +0000 (12:50 -0400)]
MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2

This patch adds support for mach-omap2 based on current
mcbsp platform driver.

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoFix mcbsp clock definition on clock34xx.h
Eduardo Valentin [Thu, 29 May 2008 16:50:49 +0000 (12:50 -0400)]
Fix mcbsp clock definition on clock34xx.h

This patch fix the clock definition for mcbsps on clock34xx.h.
Device identification must be done using .id field, not
only name field.

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
17 years agoARM: OMAP: Fix 24xx mcbsp clocks
Tony Lindgren [Thu, 29 May 2008 16:50:48 +0000 (12:50 -0400)]
ARM: OMAP: Fix 24xx mcbsp clocks

Fix 24xx mcbsp clocks

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoMACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1
Eduardo Valentin [Thu, 29 May 2008 16:50:47 +0000 (12:50 -0400)]
MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1

This patch adds support for mach-omap1 based on current
mcbsp platform driver.

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoPLAT-OMAP: MCBSP: Transform into platform driver
Eduardo Valentin [Thu, 29 May 2008 16:50:46 +0000 (12:50 -0400)]
PLAT-OMAP: MCBSP: Transform into platform driver

This patch transform mcbsp code into a very initial
implementation of a platform driver.

It also gets ride of ifdefs on mcbsp.c code.
To do it, a platform data structure was defined.

Platform devices are located in arch/arm/plat-omap/devices.c

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'
Joel Becker [Sat, 10 May 2008 01:49:29 +0000 (18:49 -0700)]
ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'

The static structure describing the userspace cluster plugin for ocfs2
was named 'user_stack', which is a real pain when people are grep(1)ing
the tree for the program stack object 'user_stack'.  Change the name to
something distinct and namespaced.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
17 years agoARM: OMAP: Use omap_globals for CPU detection for multi-omap
Tony Lindgren [Fri, 30 May 2008 21:12:57 +0000 (14:12 -0700)]
ARM: OMAP: Use omap_globals for CPU detection for multi-omap

This allows to get rid of the ifdefs and will allow simpler
CPU detection in the future.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Change to use CM offsets for clocks for multi-omap
Tony Lindgren [Fri, 16 May 2008 18:45:51 +0000 (11:45 -0700)]
ARM: OMAP: Change to use CM offsets for clocks for multi-omap

Change to use CM offsets for clocks for multi-omap

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Remove OMAP_CM_REGADDR for multi-boot
Tony Lindgren [Fri, 16 May 2008 18:45:52 +0000 (11:45 -0700)]
ARM: OMAP: Remove OMAP_CM_REGADDR for multi-boot

Please use OMAP2420_CM_REGADDR, OMAP2430_CM_REGADDR or
OMAP34XX_CM_REGADDR instead.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Remove OMAP_PRM_REGADDR
Tony Lindgren [Fri, 30 May 2008 21:12:57 +0000 (14:12 -0700)]
ARM: OMAP: Remove OMAP_PRM_REGADDR

Remove OMAP_PRM_REGADDR. Use prm_read/write_mod_reg() instead.
For assembly, use OMAPXXXX_PRM_REGADDR macros.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Introduce omap_globals and prcm access functions for multi-omap
Tony Lindgren [Fri, 30 May 2008 21:12:56 +0000 (14:12 -0700)]
ARM: OMAP: Introduce omap_globals and prcm access functions for multi-omap

New struct omap_globals contains the omap processor specific
module bases. Use omap_globals to set the various base addresses
before to make detecting omap chip type simpler.

Also introduce OMAP2_IO_ADDRESS for future multi-omap patches.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Remove __REG access for multi-omap
Tony Lindgren [Fri, 16 May 2008 18:45:44 +0000 (11:45 -0700)]
ARM: OMAP: Remove __REG access for multi-omap

This does not play nicely with multi-omap as it cannot be replaced
by a function in io.c for omaps with different IO bases.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agomusb_hdrc: Change __REG access to omap_read/write for multi-boot
Tony Lindgren [Fri, 16 May 2008 18:45:43 +0000 (11:45 -0700)]
musb_hdrc: Change __REG access to omap_read/write for multi-boot

Change __REG access to omap_read/write for multi-boot

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Change __REG access to omap/read write for traffic controller
Tony Lindgren [Fri, 16 May 2008 18:45:41 +0000 (11:45 -0700)]
ARM: OMAP: Change __REG access to omap/read write for traffic controller

Change __REG access to omap/read write for traffic controller

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoUSB: Change omap USB code to use omap_read/write instead of __REG for multi-omap
Tony Lindgren [Thu, 1 May 2008 22:43:44 +0000 (15:43 -0700)]
USB: Change omap USB code to use omap_read/write instead of __REG for multi-omap

Change omap USB code to use omap_read/write instead of __REG for multi-omap

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoCF: Change omap_cf.c to use omap_readw/writew instead of __REG for multi-omap
Tony Lindgren [Thu, 1 May 2008 22:39:05 +0000 (15:39 -0700)]
CF: Change omap_cf.c to use  omap_readw/writew instead of __REG for multi-omap

Change omap_cf.c to use  omap_readw/writew instead of __REG for multi-omap

Signed-off-by: Tony Lindren <tony@atomide.com>
17 years agoARM: OMAP: Remove omap_sram_patch_va
Tony Lindgren [Fri, 30 May 2008 21:12:55 +0000 (14:12 -0700)]
ARM: OMAP: Remove omap_sram_patch_va

This is no longer needed as the 24xx *.S files have been split
into 242x and 243x specific files.

Signed-off-by: Tony Lindgren <tony@atomide.com>