aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-07-25musb: Avoid musb_gadget_pullup "Unhandled fault" oops on omap4linux-linaro-3.0-2011.07-1-android-1John Stultz
I've recently run across an "Unhandled fault: imprecise external abort" oops that is caused when a driver called usb_gadget_connect() when there was no cable plugged into the musb gadget port. You can see the oops message here: https://launchpadlibrarian.net/75635123/minicom.txt Doing some digging, it seemed the problem was triggered when reading from the musb registers in musb_pullup() when the device controller is powered down. Looking at other examples of where the registers were accessed, I noticed they were always enclosed by pm_runtime_get/put calls. So I added such calls to the musb_gadget_pullup() function and it seemed to resolve the problem. Now, full disclosure: this was triggered with the out-of-tree Android adb gadget driver. However, I suspect the same behavior could be triggered using the composite gadget driver as well, so I think this is a generic issue. However, if I'm wrong, let me know and I'll try to make sure the fix is done in the right place. If this is the right fix, it probably should be queued for 3.1 and 3.0-stable. Comments and feedback would be greatly appreciated! Reported-by: Zach Pfeffer <zach.pfeffer@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
2011-07-25Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.07-1-android-0John Stultz
2011-07-25Merge branch 'upstream/android-3.0' into linaro-android-3.0John Stultz
2011-07-22netfilter: qtaguid: disable #define DEBUGJP Abgrall
This would cause log spam to the point of slowing down the system. Change-Id: I5655f0207935004b0198f43ad0d3c9ea25466e4e Signed-off-by: JP Abgrall <jpa@google.com>
2011-07-22Merge remote-tracking branch 'rmk/fixes' into linaro-3.0linux-linaro-3.0-2011.07-1Nicolas Pitre
2011-07-22Merge remote-tracking branch 'rmk/devel-stable' into linaro-3.0Nicolas Pitre
2011-07-22Merge commit 'v3.0' into linaro-3.0Nicolas Pitre
2011-07-21Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux ↵linux-linaro-3.0-2011.07-0Nicolas Pitre
into linaro-3.0
2011-07-21Merge branch 'devicetree/linaro-3.0' of git://git.secretlab.ca/git/linux-2.6 ↵Nicolas Pitre
into linaro-3.0
2011-07-21Merge remote-tracking branch 'linus' into linaro-3.0Nicolas Pitre
2011-07-21Linux 3.0v3.0Linus Torvalds
2011-07-21Revert "Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0"Nicolas Pitre
This reverts commit c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef, reversing changes made to dfee09c8acf18e84fe197bb5d821d1e4e02d020f. John Stultz reports that Panda doesn't boot anymore and 'git bisect' indicated the merge commit itself as the culprit. The resulting kernel log is: [ 1.734802] OMAP DSS rev 4.0 [ 1.740417] omap_hwmod: dss_core: _wait_target_disable failed [ 1.746429] omap_device: omapdss_dss.-1: new worst case deactivate latency 01 [ 1.755035] omapdss DISPC error: can't get dss_clk [ 1.760101] omapdss_dispc: probe of omapdss_dispc failed with error -2 [ 1.767333] omapdss HDMI error: can't get hdmi_clk [ 1.772399] omapdss_hdmi: probe of omapdss_hdmi failed with error -2 [ 1.780273] ------------[ cut here ]------------ [ 1.785125] WARNING: at drivers/video/omap2/dss/dispc.c:553dispc_runtime_ge) [ 1.793640] Modules linked in: [ 1.796905] ---[ end trace 6fcb132ac310d004 ]--- [ 1.801757] Unable to handle kernel NULL pointer dereference at virtualaddr0 [...] Revert it so a later version of the arm-soc merge result can be used instead.
2011-07-21Merge branch 'upstream/android-3.0' into linaro-android-3.0John Stultz
2011-07-21netfilter: xt_qtaguid: add uid permission checks during ctrl/stats accessJP Abgrall
* uid handling - Limit UID impersonation to processes with a gid in AID_NET_BW_ACCT. This affects socket tagging, and data removal. - Limit stats lookup to own uid or the process gid is in AID_NET_BW_STATS. This affects stats lookup. * allow pacifying the module Setting passive to Y/y will make the module return immediately on external stimulus. No more stats and silent success on ctrl writes. Mainly used when one suspects this module of misbehaving. Change-Id: I83990862d52a9b0922aca103a0f61375cddeb7c4 Signed-off-by: JP Abgrall <jpa@google.com>
2011-07-21netfilter: qtaguid: add tag delete command, expand stats output.JP Abgrall
* Add a new ctrl command to delete stored data. d <acct_tag> [<uid>] The uid will default to the running process's. The accounting tag can be 0, in which case all counters and socket tags associated with the uid will be cleared. * Simplify the ctrl command handling at the expense of duplicate code. This should make it easier to maintain. * /proc/net/xt_qtaguid/stats now returns more stats idx iface acct_tag_hex uid_tag_int {rx,tx}_{bytes,packets} {rx,tx}_{tcp,udp,other}_{bytes,packets} the {rx,tx}_{bytes,packets} are the totals. * re-tagging will now allow changing the uid. Change-Id: I9594621543cefeab557caa3d68a22a3eb320466d Signed-off-by: JP Abgrall <jpa@google.com>
2011-07-21netfilter: quota2: add support to log quota limit reached.JP Abgrall
This uses the NETLINK NETLINK_NFLOG family to log a single message when the quota limit is reached. It uses the same packet type as ipt_ULOG, but - never copies skb data, - uses 112 as the event number (ULOG's +1) It doesn't log if the module param "event_num" is 0. Change-Id: I6f31736b568bb31a4ff0b9ac2ee58380e6b675ca Signed-off-by: JP Abgrall <jpa@google.com>
2011-07-21Merge branch 'for_linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: sparc,kgdbts: fix compile regression with kgdb test suite
2011-07-21net: wireless: bcmdhd: Fix compilation for WEXTDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-21net: wireless: bcmdhd: Allow firmware_path parameter changeDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-21Release 5.90.125.48 Add regulatory domain check in cfg80211 driver and fix ↵Lin Ma
PNO issues Change-Id: I394f4eb017ca61861f16632e8998a8fb07e6fca7 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-21net: wireless: bcmdhd: Allow empty scan resultsDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-21net: wireless: bcmdhd: Fix compilation for kernel 3.0Dmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-21Update to 5.90.125.40Lin Ma
Add monitor interface support and fix cfg80211 management frame isses Add support for hostapd Use private command to get p2p device address Change-Id: Ie490e38f1af9f259ff4a96b2f7d367119c65c377 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-21net: wireless: bcm4329: fix array subscript is below array boundsChoi, Jong-Hwan
Change-Id: I5d521895070d255f7ac0c9eaf262ec9f4cdd2f8a Signed-off-by: Choi, Jong-Hwan <jhbird.choi@samsung.com>
2011-07-21sparc,kgdbts: fix compile regression with kgdb test suiteJason Wessel
Commit 63ab25ebbc (kgdbts: unify/generalize gdb breakpoint adjustment) introduced a compile regression on sparc. kgdbts.c: In function 'check_and_rewind_pc': kgdbts.c:307: error: implicit declaration of function 'instruction_pointer_set' Simply add the correct macro definition for instruction pointer on the Sparc architecture. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: David S. Miller <davem@davemloft.net>
2011-07-21USB: gadget: f_accessory: Add ioctl to detect USB accessory attached at bootMike Lockwood
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-21dt: Linux dt usage model documentationGrant Likely
v2: 2nd draft - Editorial cleanups from Randy Dunlap Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21mmc/tegra: add sdhci device tree handlingGrant Likely
This patch adds support for configuring the NVIDIA tegra250 sdhci device from the device tree. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21i2c: Tegra: Add device tree supportGrant Likely
This patch modifies the tegra i2c driver so that it can be initialized using the device tree along with the devices connected to the i2c bus. Signed-off-by: John Bonesio <bones@secretlab.ca> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21spi/tegra: add devicetree supportGrant Likely
Allow the tegra spi driver to obtain populate the spi bus with devices from the device tree. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21gpio/tegra: add devicetree supportGrant Likely
Add support for decoding gpios from the device tree Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21of/gpio: Add new method for getting gpios under different property namesJohn Bonesio
This patch adds a new routine, of_get_named_gpio_flags(), which takes the property name as a parameter rather than assuming "gpios". of_get_gpio_flags() is modified to call of_get_named_gpio_flags() with "gpios" as the property parameter. Signed-off-by: John Bonesio <bones@secretlab.ca> [grant.likely: Tidied up whitespace and tweaked kerneldoc comments.] Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21gpio/dt: Refine GPIO device tree bindingGrant Likely
Allow for multiple named gpio properties Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21i2c: Allow i2c_add_numbered_adapter() to assign a bus id.Grant Likely
Currently, if an i2c bus driver supports both static and dynamic bus ids, it needs to choose between calling i2c_add_numbered_adapter() and i2c_add_adapter(). This patch makes i2c_add_numbered_adapter() redirect to i2c_add_adapter() if the requested bus id is -1. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: vexpress: add basic DT platform matching supportGrant Likely
This patch adds a DT match table to the Versatile Express machine description in order to enable basic device tree support. Tested on a Versatile Express board where the device tree blob is passed to the kernel by u-boot. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> [converted .dts file to use skeleton.dtsi, and added 'dtbs' targets] Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add basic devicetree support to IGEPv2 and v3Grant Likely
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add a make rule to build dtb for enabled boardsShawn Guo
With 'make ARCH=arm dtbs', it builds Device Tree Blobs for those boards enabled by build CONFIG. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add basic device tree support for BeagleboardGrant Likely
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add basic device tree support for mx51 and mx53 boardsGrant Likely
This patch add support for the Genesi Efika MX Smarttop and Smartbook, the Freescale mx51 babbage board, and the Freescale mx53 loco board Signed-off-by: Jason Liu <jason.hui@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add basic device tree support for overoAndy Doan
Enable basic device tree support for Gumstix Overo. tested with Overo Tide COM and Tobi expansion board Signed-off-by: Andy Doan <andy.doan@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add basic device tree support for smdkv310 boardThomas Abraham
Enable basic device tree support for Exynos4 smdkv310 board. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add Pandaboard devicetree supportGrant Likely
Enable basic device tree support on Pandaboard Signed-off-by: Grant Likely <grant.likely@linaro.org>
2011-07-21Merge branch 'upstream/android-3.0' into linaro-android-3.0John Stultz
2011-07-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: CIFS: Fix wrong length in cifs_iovec_read
2011-07-21earlysuspend: add verbose debug flagErik Gilling
when enabled, prints out the function of each handler as they are called Change-Id: I5ed251867e0e3aa3cd05f030ff3579808cedd0c2 Signed-off-by: Erik Gilling <konkers@android.com>
2011-07-21Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Make Dell Latitude E6420 use reboot=pci x86: Make Dell Latitude E5420 use reboot=pci
2011-07-21x86: Make Dell Latitude E6420 use reboot=pciH. Peter Anvin
Yet another variant of the Dell Latitude series which requires reboot=pci. From the E5420 bug report by Daniel J Blueman: > The E6420 is affected also (same platform, different casing and > features), which provides an external confirmation of the issue; I can > submit a patch for that later or include it if you prefer: > http://linux.koolsolutions.com/2009/08/04/howto-fix-linux-hangfreeze-during-reboots-and-restarts/ Reported-by: Daniel J Blueman <daniel.blueman@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: <stable@kernel.org>
2011-07-21x86: Make Dell Latitude E5420 use reboot=pciDaniel J Blueman
Rebooting on the Dell E5420 often hangs with the keyboard or ACPI methods, but is reliable via the PCI method. [ hpa: this was deferred because we believed for a long time that the recent reshuffling of the boot priorities in commit 660e34cebf0a11d54f2d5dd8838607452355f321 fixed this platform. Unfortunately that turned out to be incorrect. ] Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com> Link: http://lkml.kernel.org/r/1305248699-2347-1-git-send-email-daniel.blueman@gmail.com Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: <stable@kernel.org>
2011-07-21Merge branch 'drm-intel-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: drm/i915: Fix unfenced alignment on pre-G33 hardware drm/i915: Add quirk to disable SSC on Lenovo U160 LVDS
2011-07-21vfs: drop conditional inode prefetch in __do_lookup_rcuLinus Torvalds
It seems to hurt performance in real life. Yes, the inode will be used later, but the conditional doesn't seem to predict all that well (negative dentries are not uncommon) and it looks like the cost of prefetching is simply higher than depending on the cache doing the right thing. As usual. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 16:21:31 +0000