Commit Graph

174049 Commits

Author SHA1 Message Date
黄涛
9261177cde pack-kernel.sh: exclude newton board, add phone sdk 2011-06-28 17:00:04 +08:00
黄涛
e587a1ca48 Staging: dream: Kconfig fix for non-HTC hardware 2011-06-28 16:33:31 +08:00
zyw
c2779c627f fix cursor reload bug 2011-06-28 15:43:14 +08:00
邱建斌
6bc26c18a2 rk29_phone: headset hook key update 2011-06-28 14:50:19 +08:00
chenli
2abd490402 rk29 IPP:IPP driver provides synchronous and asynchronous call interfaces.
1.In the case of synchronous call please use ipp_blit_sync function.
  In the case of asynchronous call please use ipp_blit_async function.
  The old interface ipp_do_blit is obsolete!
2.Use ipp_blit_sync instead of ipp_do_blit in rk29_fb.c and rk29_camera_oneframe.c.
3.Translate the Chinese commets into English.
2011-06-28 14:44:15 +08:00
xsf@rock-chips.com
fa1654666c A22:switch to 32k when sleep 2011-06-28 11:50:02 +08:00
邱建斌
7451a831e6 rk29_phone: fix hook key irq. if headset have not hook key then not reported keydown 2011-06-28 10:32:21 +08:00
chenli
d9dced963e rk29 IPP:IPP driver provides synchronous and asynchronous call interfaces.
1.In case of synchronous call please use ipp_blit_sync function.
  In case of asynchronous call please use ipp_blit_async function.
  The old interface ipp_do_blit is not recommended from now on.
2.Use ipp_blit_sync instead of ipp_do_blit in rk29_fb.c
2011-06-28 10:14:00 +08:00
黄涛
2caa51d22a Merge remote-tracking branch 'linux-2.6.32.y/master' into develop
Merge Linux 2.6.32.42
Conflicts:
	Makefile
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/p54/p54usb.c
2011-06-28 09:47:32 +08:00
phc
cc88c1f62a RK29SmartPhone:open 32K crystalloid default 2011-06-27 20:38:56 +08:00
xsf@rock-chips.com
107807acd1 RK29SmartPhone:switch to 32k when sleep 2011-06-27 20:18:27 +08:00
黄涛
b0b16ffd1d rk29: ddr3sdk: cpufreq support 1G Hz 2011-06-27 19:00:30 +08:00
黄涛
2a9850e70a Revert "rk29:UART->add new uart driver rk_serial.c which can be configurated in menuconfig,but the old driver is default used"
This reverts commit ee1cd71135.
2011-06-27 17:59:38 +08:00
hhb
ee1cd71135 rk29:UART->add new uart driver rk_serial.c which can be configurated in menuconfig,but the old driver is default used 2011-06-27 17:40:18 +08:00
hhb
0b3b1d8c29 rk29:touch screen -> modify tp suspend and resume function which would really work 2011-06-27 17:05:54 +08:00
root
6dcf219f49 phonesdk: modify ARM freq and core voltage in running 2011-06-27 16:47:30 +08:00
黄涛
c17e447d90 rk29: vivante: alloc_pages add GFP_DMA flag to support 1G memory 2011-06-27 14:16:12 +08:00
黄涛
d11238ad51 rk29: Kconfig: support 1G memory 2011-06-27 13:59:24 +08:00
黄涛
dca2183262 rk29: phonepadsdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
e9e1390fc2 rk29: phonesdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
ac60859ccb rk29: rk29-ddr3sdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
e217ff283f rk29: rk29sdk: support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
8a39b8c8ad rk29: vivante: fix computation of resource size for 1G memory 2011-06-27 13:59:23 +08:00
黄涛
69b558b528 rk29: mmu.c: enlarge vmalloc_reserve to support 1G memory 2011-06-27 13:59:23 +08:00
黄涛
cf1bb28a1f rk29: memory.h: fix for highmem 2011-06-27 13:59:22 +08:00
黄涛
fad833ff01 rk29: rk29_iomap.h: set RK29_SDRAM_PHYS to 0x60000000U, fix gcc warning: integer overflow in expression 2011-06-27 13:59:22 +08:00
蔡枫
4d66cbb27b add 5 point touch, close cs42l52 log for newton 2011-06-27 11:48:04 +08:00
蔡枫
7dc7582171 Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-06-25 22:42:44 +08:00
蔡枫
184fcf6615 fix tp and codec bug in newton board 2011-06-25 22:42:23 +08:00
phc
753db746ee RK29SmartPhone:23d IMEI read support 2011-06-25 16:43:26 +08:00
蔡枫
90b7169811 Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop 2011-06-24 22:40:11 +08:00
蔡枫
7902882ebb add support for newton board 2011-06-24 22:39:48 +08:00
yangkai
f8b83dd6e0 fix kernel panic when not standard usb keyboard connect 2011-06-24 18:09:34 +08:00
yangkai
d25fee09fa revert ddr v2.02 and dpll use high band 2011-06-24 16:13:40 +08:00
xsf@rock-chips.com
dd54a73ceb A22: make wm8310 exit suspend 2011-06-24 15:43:10 +08:00
yangkai
a4bd9a7cb3 adjust usb controller init sequence and remove some log 2011-06-24 14:57:35 +08:00
phc
a8b0f28785 RK29SmartPhone:TP change from GT801 to GT818 2011-06-24 14:39:39 +08:00
黄涛
328ac983a4 rk29: cru.h: fix SOFT_RST_HSADC define bug 2011-06-24 12:14:43 +08:00
hhb
cd6b90ed7f rk29:add rk29_dma_config(dws->rx_dmach, 1, 1) one more argument 2011-06-24 10:27:56 +08:00
Greg Kroah-Hartman
c49ed7e7d1 Linux 2.6.32.42 v2.6.32.42 2011-06-23 15:24:26 -07:00
Greg Kroah-Hartman
2a96ae7075 Revert "iwlagn: Support new 5000 microcode."
This reverts commit 6f63415fc1.

It turns out this is not what we want to have happen for the .32 and
.33-longterm kernels as it does not work properly at all.

This was reported by Gentoo, Arch, and Canonical developers as causing
problems for their users:
	https://bugs.archlinux.org/task/24302
	http://bugs.gentoo.org/show_bug.cgi?id=359445
	https://bugs.launchpad.net/ubuntu/+source/linux/+bug/796336

Cc: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Cc: Gordon Malm <gengor@gentoo.org>
Cc: Don Fry <donald.h.fry@intel.com>
Cc: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Kasper Pedersen
a6d553ac64 time: Compensate for rounding on odd-frequency clocksources
commit a386b5af8e upstream.

When the clocksource is not a multiple of HZ, the clock will be off.  For
acpi_pm, HZ=1000 the error is 127.111 ppm:

The rounding of cycle_interval ends up generating a false error term in
ntp_error accumulation since xtime_interval is not exactly 1/HZ.  So, we
subtract out the error caused by the rounding.

This has been visible since 2.6.32-rc2
	commit a092ff0f90
	time: Implement logarithmic time accumulation
That commit raised NTP_INTERVAL_FREQ and exposed the rounding error.

testing tool: http://n1.taur.dk/permanent/testpmt.c
Also tested with ntpd and a frequency counter.

Signed-off-by: Kasper Pedersen <kkp2010@kasperkp.dk>
Acked-by: john stultz <johnstul@us.ibm.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Will Tisdale <willtisdale@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Thomas Gleixner
652c98bac3 xen: Use IRQF_FORCE_RESUME
commit 676dc3cf5b upstream.

Mark the IRQF_NO_SUSPEND interrupts IRQF_FORCE_RESUME and remove the extra
walk through the interrupt descriptors.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Thomas Gleixner
8ff753b4ac genirq: Add IRQF_FORCE_RESUME
commit dc5f219e88 upstream.

Xen needs to reenable interrupts which are marked IRQF_NO_SUSPEND in the
resume path. Add a flag to force the reenabling in the resume code.

Tested-and-acked-by: Ian Campbell <Ian.Campbell@eu.citrix.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Ian Campbell
f9f0932940 xen: events: do not unmask event channels on resume
commit 6903591f31 upstream.

The IRQ core code will take care of disabling and reenabling
interrupts over suspend resume automatically, therefore we do not need
to do this in the Xen event channel code.

The only exception is those event channels marked IRQF_NO_SUSPEND
which the IRQ core ignores. We must unmask these ourselves, taking
care to obey the current IRQ_DISABLED status. Failure check for
IRQ_DISABLED leads to enabling polled only event channels, such as
that associated with the pv spinlocks, which must never be enabled:

[   21.970432] ------------[ cut here ]------------
[   21.970432] kernel BUG at arch/x86/xen/spinlock.c:343!
[   21.970432] invalid opcode: 0000 [#1] SMP
[   21.970432] last sysfs file: /sys/devices/virtual/net/lo/operstate
[   21.970432] Modules linked in:
[   21.970432]
[   21.970432] Pid: 0, comm: swapper Not tainted (2.6.32.24-x86_32p-xen-01034-g787c727 #34)
[   21.970432] EIP: 0061:[<c102e209>] EFLAGS: 00010046 CPU: 3
[   21.970432] EIP is at dummy_handler+0x3/0x7
[   21.970432] EAX: 0000021c EBX: dfc16880 ECX: 0000001a EDX: 00000000
[   21.970432] ESI: dfc02c00 EDI: 00000001 EBP: dfc47e10 ESP: dfc47e10
[   21.970432]  DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0069
[   21.970432] Process swapper (pid: 0, ti=dfc46000 task=dfc39440 task.ti=dfc46000)
[   21.970432] Stack:
[   21.970432]  dfc47e30 c10a39f0 0000021c 00000000 00000000 dfc16880 0000021c 00000001
[   21.970432] <0> dfc47e40 c10a4f08 0000021c 00000000 dfc47e78 c12240a7 c1839284 c1839284
[   21.970432] <0> 00000200 00000000 00000000 f5720000 c1f3d028 c1f3d02c 00000180 dfc47e90
[   21.970432] Call Trace:
[   21.970432]  [<c10a39f0>] ? handle_IRQ_event+0x5f/0x122
[   21.970432]  [<c10a4f08>] ? handle_percpu_irq+0x2f/0x55
[   21.970432]  [<c12240a7>] ? __xen_evtchn_do_upcall+0xdb/0x15f
[   21.970432]  [<c122481e>] ? xen_evtchn_do_upcall+0x20/0x30
[   21.970432]  [<c1030d47>] ? xen_do_upcall+0x7/0xc
[   21.970432]  [<c102007b>] ? apic_reg_read+0xd3/0x22d
[   21.970432]  [<c1002227>] ? hypercall_page+0x227/0x1005
[   21.970432]  [<c102d30b>] ? xen_force_evtchn_callback+0xf/0x14
[   21.970432]  [<c102da7c>] ? check_events+0x8/0xc
[   21.970432]  [<c102da3b>] ? xen_irq_enable_direct_end+0x0/0x1
[   21.970432]  [<c105e485>] ? finish_task_switch+0x62/0xba
[   21.970432]  [<c14e3f84>] ? schedule+0x808/0x89d
[   21.970432]  [<c1084dc5>] ? hrtimer_start_expires+0x1a/0x22
[   21.970432]  [<c1085154>] ? tick_nohz_restart_sched_tick+0x15a/0x162
[   21.970432]  [<c102f43a>] ? cpu_idle+0x6d/0x6f
[   21.970432]  [<c14db29e>] ? cpu_bringup_and_idle+0xd/0xf
[   21.970432] Code: 5d 0f 95 c0 0f b6 c0 c3 55 66 83 78 02 00 89 e5 5d 0f 95 \
c0 0f b6 c0 c3 55 b2 01 86 10 31 c0 84 d2 89 e5 0f 94 c0 5d c3 55 89 e5 <0f> 0b \
eb fe 55 80 3d 4c ce 84 c1 00 89 e5 57 56 89 c6 53 74 15
[   21.970432] EIP: [<c102e209>] dummy_handler+0x3/0x7 SS:ESP 0069:dfc47e10
[   21.970432] ---[ end trace c0b71f7e12cf3011 ]---

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Fernando Luis Vazquez Cao
b69807562a netfilter: IPv6: fix DSCP mangle code
commit 1ed2f73d90 upstream.

The mask indicates the bits one wants to zero out, so it needs to be
inverted before applying to the original TOS field.

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Fernando Luis Vazquez Cao
e49b7caaf3 netfilter: IPv6: initialize TOS field in REJECT target module
commit 4319cc0cf5 upstream.

The IPv6 header is not zeroed out in alloc_skb so we must initialize
it properly unless we want to see IPv6 packets with random TOS fields
floating around. The current implementation resets the flow label
but this could be changed if deemed necessary.

We stumbled upon this issue when trying to apply a mangle rule to
the RST packet generated by the REJECT target module.

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Mathias Krause
651f1d21ca exec: delay address limit change until point of no return
commit dac853ae89 upstream.

Unconditionally changing the address limit to USER_DS and not restoring
it to its old value in the error path is wrong because it prevents us
using kernel memory on repeated calls to this function.  This, in fact,
breaks the fallback of hard coded paths to the init program from being
ever successful if the first candidate fails to load.

With this patch applied switching to USER_DS is delayed until the point
of no return is reached which makes it possible to have a multi-arch
rootfs with one arch specific init binary for each of the (hard coded)
probed paths.

Since the address limit is already set to USER_DS when start_thread()
will be invoked, this redundancy can be safely removed.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Johannes Weiner
7eae68f6dd xfs: properly account for reclaimed inodes
commit 081003fff4 upstream.

When marking an inode reclaimable, a per-AG counter is increased, the
inode is tagged reclaimable in its per-AG tree, and, when this is the
first reclaimable inode in the AG, the AG entry in the per-mount tree
is also tagged.

When an inode is finally reclaimed, however, it is only deleted from
the per-AG tree.  Neither the counter is decreased, nor is the parent
tree's AG entry untagged properly.

Since the tags in the per-mount tree are not cleared, the inode
shrinker iterates over all AGs that have had reclaimable inodes at one
point in time.

The counters on the other hand signal an increasing amount of slab
objects to reclaim.  Since "70e60ce xfs: convert inode shrinker to
per-filesystem context" this is not a real issue anymore because the
shrinker bails out after one iteration.

But the problem was observable on a machine running v2.6.34, where the
reclaimable work increased and each process going into direct reclaim
eventually got stuck on the xfs inode shrinking path, trying to scan
several million objects.

Fix this by properly unwinding the reclaimable-state tracking of an
inode when it is reclaimed.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Backported-by: Stefan Priebe <s.priebe@profihost.ag>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:09 -07:00
Bjorn Helgaas
bfbf76dca7 ACPI: use _HID when supplied by root-level devices
commit b7b30de53a upstream.

Previously, we assumed the only Device object immediately below the root
was the \_SB Scope (which the ACPI CA treats as a Device), so we forced
the HID of all such objects to ACPI_BUS_HID ("LNXSYBUS").

However, there are DSDTs that supply root-level Device objects with _HIDs.
This patch makes us pay attention to those _HIDs and only add the synthetic
ACPI_BUS_HID for root-level objects that do not supply their own _HID.

For example, this DSDT: https://bugzilla.kernel.org/show_bug.cgi?id=15605
contains:

    Scope (_SB) {
	...
    }
    Device (AMW0) {
	Name (_HID, EisaId ("PNP0C14"))
	...
    }

and we should use "PNP0C14" for the AMW0 device, not "LNXSYBUS".

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Thomas Renninger <trenn@suse.de>
Tested-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-06-23 15:24:08 -07:00