7 years agogpu: ion: Several fixes
Rebecca Schultz Zavin [Thu, 30 Jun 2011 19:19:55 +0000]
gpu: ion: Several fixes

Fix some cases where locks were not released on error paths
Change heap->prio to heap->id to make meaning clearer
Fix kernel doc to match sources

7 years agogpu: ion: Add ION Memory Manager
Rebecca Schultz Zavin [Thu, 30 Jun 2011 02:44:29 +0000]
gpu: ion: Add ION Memory Manager

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

7 years agoRevert "PM: Prevent waiting forever on asynchronous resume after abort"
Colin Cross [Wed, 29 Jun 2011 20:43:12 +0000]
Revert "PM: Prevent waiting forever on asynchronous resume after abort"

This reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741.

7 years agoRevert "PM: Wait for completion of the parent resume before resuming"
Colin Cross [Wed, 29 Jun 2011 20:42:56 +0000]
Revert "PM: Wait for completion of the parent resume before resuming"

This reverts commit a0f07aae54e87a9fad6d19c0e57398f54d858f06.

7 years agonf: qtaguid: make procfs entry for ctrl return correct data.
JP Abgrall [Tue, 28 Jun 2011 06:31:46 +0000]
nf: qtaguid: make procfs entry for ctrl return correct data.

(This is a direct cherry-pick from 2.6.39: I3b925802)

Fixed procreader for /proc/net/xt_qtaguid/ctrl: it would just
fill the output with the same entry.
Simplify the **start handling.

Signed-off-by: JP Abgrall <jpa@google.com>
Change-Id: I3b92580228f2b57795bb2d0d6197fc95ab6be552

7 years agonf: qtaguid: workaround xt_socket_get_sk() returning bad SKs.
JP Abgrall [Tue, 28 Jun 2011 04:03:04 +0000]
nf: qtaguid: workaround xt_socket_get_sk() returning bad SKs.

(This is a direct cherry pick from 2.6.39: Id2a9912b)

* xt_socket_get_sk() returns invalid sockets when the sk_state is TCP_TIME_WAIT.
Added detection of time-wait.
* Added more constrained usage: qtaguid insures that xt_socket_get*_sk() is
not invoked for unexpected hooks or protocols (but I have not seen those
active at the point where the returned sk is bad).

Signed-off-by: JP Abgrall <jpa@google.com>
Change-Id: Id2a9912bb451a3e59d012fc55bbbd40fbb90693f

7 years agonet: wireless: bcmdhd: Fix memory poisoning in wl_free_wdev()
Dmitry Shmidt [Fri, 24 Jun 2011 17:16:22 +0000]
net: wireless: bcmdhd: Fix memory poisoning in wl_free_wdev()

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Set proper debug messages for private IOCTL
Dmitry Shmidt [Thu, 23 Jun 2011 17:41:27 +0000]
net: wireless: bcmdhd: Set proper debug messages for private IOCTL

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agomm: ashmem: Fix arguments to ashmem_shrink
Colin Cross [Wed, 22 Jun 2011 23:05:47 +0000]
mm: ashmem: Fix arguments to ashmem_shrink

The arguments to shrink functions have changed, update
ashmem_shrink to match.

Change-Id: Id279d22d761a2a7c4965c957960eef804d06cc07
Signed-off-by: Colin Cross <ccross@android.com>

7 years agoandroid: lowmemorykiller: Fix arguments to lowmem_shrink
Colin Cross [Wed, 22 Jun 2011 23:05:47 +0000]
android: lowmemorykiller: Fix arguments to lowmem_shrink

The arguments to shrink functions have changed, update
lowmem_shrink to match.

Change-Id: I48f436e0509c416dc0b18db500234f7b1d6d42e1
Signed-off-by: Colin Cross <ccross@android.com>

7 years agonet: wireless: bcmdhd: Add RSSI and SETSUSPENDOPT private commands
Dmitry Shmidt [Wed, 22 Jun 2011 18:06:16 +0000]
net: wireless: bcmdhd: Add RSSI and SETSUSPENDOPT private commands

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: ipv4: tcp: Fix crash in tcp_nuke_addr
Colin Cross [Wed, 22 Jun 2011 21:27:37 +0000]
net: ipv4: tcp: Fix crash in tcp_nuke_addr

ip_route_output_key can return an ERR_PTR, don't dereference it.

Change-Id: I6b86a451b2bdb33873d79b3cf90c11dbe72bc081
Signed-off-by: Colin Cross <ccross@android.com>

7 years agonet: wireless: bcmdhd: Fix failure in register_sysctl_table() call
Dmitry Shmidt [Tue, 21 Jun 2011 23:19:35 +0000]
net: wireless: bcmdhd: Fix failure in register_sysctl_table() call

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix 3.0 compilation for CFG80211
Dmitry Shmidt [Mon, 20 Jun 2011 20:54:48 +0000]
net: wireless: bcmdhd: Fix 3.0 compilation for CFG80211

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonetfilter: have ip*t REJECT set the sock err when an icmp is to be sent
JP Abgrall [Thu, 16 Jun 2011 21:37:03 +0000]
netfilter: have ip*t REJECT set the sock err when an icmp is to be sent

Allow the REJECT --reject-with icmp*blabla to also set the matching error
locally on the socket affected by the reject.
This allows the process to see an error almost as if it received it
via ICMP.
It avoids the local process who's ingress packet is rejected to have to
wait for a pseudo-eternity until some timeout kicks in.

Ideally, this should be enabled with a new iptables flag similar to
   --reject-with-sock-err
For now it is enabled with CONFIG_IP*_NF_TARGET_REJECT_SKERR option.

Change-Id: I649a4fd5940029ec0b3233e5abb205da6984891e
Signed-off-by: JP Abgrall <jpa@google.com>

7 years agonetfilter: add xt_qtaguid matching module
JP Abgrall [Mon, 20 Jun 2011 19:41:46 +0000]
netfilter: add xt_qtaguid matching module

This module allows tracking stats at the socket level for given UIDs.
It replaces xt_owner.
If the --uid-owner is not specified, it will just count stats based on
who the skb belongs to. This will even happen on incoming skbs as it
looks into the skb via xt_socket magic to see who owns it.
If an skb is lost, it will be assigned to uid=0.

To control what sockets of what UIDs are tagged by what, one uses:
  echo t $sock_fd $accounting_tag $the_billed_uid \
     > /proc/net/xt_qtaguid/ctrl
 So whenever an skb belongs to a sock_fd, it will be accounted against
   $the_billed_uid
  and matching stats will show up under the uid with the given
   $accounting_tag.

Because the number of allocations for the stats structs is not that big:
  ~500 apps * 32 per app
we'll just do it atomic. This avoids walking lists many times, and
the fancy worker thread handling. Slabs will grow when needed later.

It use netdevice and inetaddr notifications instead of hooks in the core dev
code to track when a device comes and goes. This removes the need for
exposed iface_stat.h.

Put procfs dirs in /proc/net/xt_qtaguid/
  ctrl
  stats
  iface_stat/<iface>/...
The uid stats are obtainable in ./stats.

Change-Id: I01af4fd91c8de651668d3decb76d9bdc1e343919
Signed-off-by: JP Abgrall <jpa@google.com>

7 years agonf: xt_socket: export the fancy sock finder code
JP Abgrall [Wed, 15 Jun 2011 23:52:40 +0000]
nf: xt_socket: export the fancy sock finder code

The socket matching function has some nifty logic to get the struct sock
from the skb or from the connection tracker.
We export this so other xt_* can use it, similarly to ho how
xt_socket uses nf_tproxy_get_sock.

Change-Id: I11c58f59087e7f7ae09e4abd4b937cd3370fa2fd
Signed-off-by: JP Abgrall <jpa@google.com>

7 years agoUSB: gadget: f_mtp: Add PTP variant of MTP USB function
Mike Lockwood [Thu, 2 Jun 2011 02:17:36 +0000]
USB: gadget: f_mtp: Add PTP variant of MTP USB function

This is the same as MTP but with PTP interface descriptor.
Also removed obsolete ioctl for switching between MTP and PTP mode

Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agoUSB: gadget: f_mtp: Add support for queueing multiple interrupt requests
Mike Lockwood [Mon, 2 May 2011 00:36:19 +0000]
USB: gadget: f_mtp: Add support for queueing multiple interrupt requests

Fixes problem sending "store added" events when there are multiple stores

Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agousb: gadget: android: Update android gadget driver
Benoit Goby [Wed, 20 Apr 2011 03:37:33 +0000]
usb: gadget: android: Update android gadget driver

* Functions and the device descriptor are configured from user space:
echo 0       > /sys/class/android_usb/android0/enable
echo adb,acm > /sys/class/android_usb/android0/functions
echo 2       > /sys/class/android_usb/android0/f_acm/instances
echo 1       > /sys/class/android_usb/android0/enable

* Driver does not require platform data anymore

* Moved function initialization to android.c instead of each
function file

* Replaced switches by uevents

Signed-off-by: Benoit Goby <benoit@android.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Change-Id: If5ad9267c111ad0a442f0d87a0d31082dc5381b6

7 years agousb: gadget: composite: Add usb_remove_config
Benoit Goby [Thu, 26 May 2011 06:59:43 +0000]
usb: gadget: composite: Add usb_remove_config

This allows composite drivers to dynamically change their configuration.
For example, a driver might remove a configuration and register a new
one with a different set of functions.
User should prevent the host from enumerating the device while changing
the configuration:

usb_gadget_disconnect(cdev->gadget);
usb_remove_config(cdev, old_config);
usb_add_config(cdev, new_config, new_conf_bind);
usb_gadget_connect(cdev->gadget);

Change-Id: Icbfb4ce41685fde9bf63d5d58fca1ad242aa69f9
Signed-off-by: Benoit Goby <benoit@android.com>

7 years agousb: gadget: f_rndis: fix unbind
Benoit Goby [Wed, 1 Jun 2011 01:25:06 +0000]
usb: gadget: f_rndis: fix unbind

Change-Id: Idfde1aee6cfd7c648d4100060e111798c405e32c
Signed-off-by: Benoit Goby <benoit@android.com>

7 years agoUSB: gadget: f_accessory: New gadget driver for android USB accesories
Mike Lockwood [Wed, 2 Feb 2011 16:52:56 +0000]
USB: gadget: f_accessory: New gadget driver for android USB accesories

Signed-off-by: Mike Lockwood <lockwood@android.com>

USB: gadget: f_accessory: Misc improvements and cleanup:

- Add URI string

- Replace type string with a description string

- Add a control call to retrieve accessory protocol version (currently 1)

- Driver read() and write() calls now fail after USB disconnect until
  driver file is closed and reopened.

- Misc cleanup work

Signed-off-by: Mike Lockwood <lockwood@android.com>

USB: gadget: f_accessory: Clear accessory strings when USB is disconnected

Signed-off-by: Mike Lockwood <lockwood@android.com>

USB: gadget: f_accessory: Clear previous strings on ACCESSORY_GET_PROTOCOL

Clearing strings on disconnect does not work since we may receive
a disconnect on some devices when transitioning into accessory mode.
We require an accessory to send ACCESSORY_GET_PROTOCOL before
sending any strings, so any strings from a previous session will be cleared.

Signed-off-by: Mike Lockwood <lockwood@android.com>

USB: gadget: f_accessory: Clear disconnected flag when driver file is opened

Fixes a race condition that can occur when entering accessory mode.

Signed-off-by: Mike Lockwood <lockwood@android.com>

USB: gadget: f_accessory: Add string for accessory's unique serial number

Signed-off-by: Mike Lockwood <lockwood@android.com>

USB: gadget: f_accessory: Set bNumEndpoints to correct value of 2

Change-Id: I24f4e36f196d45436e0573301500c3b93215953d
Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agonet: wireless: bcmdhd: Combined patch from 4.218.248-31
Howard M. Harte [Thu, 16 Jun 2011 01:52:15 +0000]
net: wireless: bcmdhd: Combined patch from 4.218.248-31

bcmdhd: Allocate skb with GFP_KERNEL flag if possible: fix for older kernels.
bcmdhd: Fix race conditions for sysioc_thread
    * Fix up formatting and #ifdefs.
net: wireless: bcmdhd: Fix get_customized_country_code() for older kernels.
net: wireless: bcmdhd: Move PNO function prototypes to dhd.h.
Add private command support.
net: wireless: bcmdhd: Set proper read barrier
net: wireless: bcmdhd: Fix memory leak in case of dhd_bus_init() failure
net: wireless: bcmdhd: Fix wake_lock symmetry
net: wireless: bcmdhd: Ignore error if scan results are empty
net: wireless: bcmdhd: Add sdlock to firmware loading
net: wireless: bcmdhd: Fix watchdog syncronization during start/stop
net: wireless: bcmdhd: Fix Makefile to allow WEXT compilation

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agocpufreq interactive: support shared CPU scaling
Todd Poynor [Tue, 7 Jun 2011 01:30:23 +0000]
cpufreq interactive: support shared CPU scaling

Change-Id: Id5267f04067bf023f6b140b4de2e88ef7287e941
Signed-off-by: Todd Poynor <toddpoynor@google.com>

7 years agonet: wireless: bcmdhd: Fix getting Mac address from platform data
Dmitry Shmidt [Wed, 15 Jun 2011 22:20:55 +0000]
net: wireless: bcmdhd: Fix getting Mac address from platform data

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix race conditions for sysioc_thread
Dmitry Shmidt [Tue, 14 Jun 2011 00:33:26 +0000]
net: wireless: bcmdhd: Fix race conditions for sysioc_thread

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Reduce listen interval to 10 (from 20)
Dmitry Shmidt [Mon, 13 Jun 2011 23:49:08 +0000]
net: wireless: bcmdhd: Reduce listen interval to 10 (from 20)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Prevent working thread to run during suspend path
Dmitry Shmidt [Mon, 13 Jun 2011 23:47:58 +0000]
net: wireless: bcmdhd: Prevent working thread to run during suspend path

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Allocate skb with GFP_KERNEL flag if possible
Dmitry Shmidt [Mon, 13 Jun 2011 23:42:13 +0000]
net: wireless: bcmdhd: Allocate skb with GFP_KERNEL flag if possible

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix memleak in dev->p
Dmitry Shmidt [Mon, 13 Jun 2011 23:28:59 +0000]
net: wireless: bcmdhd: Fix memleak in dev->p

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix scan timeout for abg case
Dmitry Shmidt [Mon, 13 Jun 2011 23:03:21 +0000]
net: wireless: bcmdhd: Fix scan timeout for abg case

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agoHACK: time: Disable alarmtimer
Colin Cross [Tue, 14 Jun 2011 18:36:39 +0000]
HACK: time: Disable alarmtimer

kernel/time/alarmtimer.c conflicts with drivers/rtc/alarm.c,
disable it for now.

Change-Id: I6cdb3b885828d45836a54971adf16143039b0a0e
Signed-off-by: Colin Cross <ccross@android.com>

7 years agoinput: gpio_input: send input_sync after reporting keys
Jeff Brown [Fri, 18 Mar 2011 23:02:26 +0000]
input: gpio_input: send input_sync after reporting keys

Signed-off-by: jeffbrown@android.com
Change-Id: Ie170960df3c8ab4833ed686135dc8575cb9f2d48

7 years agoinput: gpio_matrix: send input_sync after reporting keys
Jeff Brown [Fri, 18 Mar 2011 21:10:23 +0000]
input: gpio_matrix: send input_sync after reporting keys

Signed-off-by: jeffbrown@android.com
Change-Id: I9bd2437503b48bf37f4d93505ccd2806e4aab977

7 years agonet: wireless: bcmdhd: Prevent using WEXT in case of CFG80211
Dmitry Shmidt [Mon, 13 Jun 2011 22:16:59 +0000]
net: wireless: bcmdhd: Prevent using WEXT in case of CFG80211

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Add missing dhd_get_dtim_skip() declaration
Dmitry Shmidt [Mon, 13 Jun 2011 22:14:15 +0000]
net: wireless: bcmdhd: Add missing dhd_get_dtim_skip() declaration

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Get rid of ANDROID define
Dmitry Shmidt [Mon, 13 Jun 2011 20:37:52 +0000]
net: wireless: bcmdhd: Get rid of ANDROID define

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Add setting country code from platform data
Dmitry Shmidt [Mon, 13 Jun 2011 18:11:43 +0000]
net: wireless: bcmdhd: Add setting country code from platform data

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix SOFTAP compilation
Dmitry Shmidt [Mon, 13 Jun 2011 17:15:12 +0000]
net: wireless: bcmdhd: Fix SOFTAP compilation

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Get MAC from platform data
Dmitry Shmidt [Mon, 13 Jun 2011 17:07:57 +0000]
net: wireless: bcmdhd: Get MAC from platform data

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix ANDROID define, clean obsolete code
Dmitry Shmidt [Mon, 13 Jun 2011 16:59:51 +0000]
net: wireless: bcmdhd: Fix ANDROID define, clean obsolete code

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agoUpdate to 5.90.125.27 release.
Howard M. Harte [Sat, 11 Jun 2011 00:20:12 +0000]
Update to 5.90.125.27 release.

Change-Id: I593f4a90671468b486e5f39b9eeff8ae65ac9431
Signed-off-by: Howard M. Harte <hharte@broadcom.com>

7 years agoprintk: do not handle non-sleepable notification in console_cpu_notify
mhban [Wed, 8 Jun 2011 09:13:15 +0000]
printk: do not handle non-sleepable notification in console_cpu_notify

- CPU_DYING should not be handled in sleepable context

Signed-off-by: Minho Ban <mhban@samsung.com>

7 years agonet: wireless: Add CONFIG_WIFI_CONTROL_FUNC option
Dmitry Shmidt [Wed, 8 Jun 2011 22:16:52 +0000]
net: wireless: Add CONFIG_WIFI_CONTROL_FUNC option

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Switch to CUSTOMER_HW2
Dmitry Shmidt [Wed, 8 Jun 2011 22:15:31 +0000]
net: wireless: bcmdhd: Switch to CUSTOMER_HW2

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Remove obsolete debug messages
Dmitry Shmidt [Wed, 8 Jun 2011 22:14:25 +0000]
net: wireless: bcmdhd: Remove obsolete debug messages

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Allow error debug prints from the beginning
Dmitry Shmidt [Wed, 8 Jun 2011 22:13:38 +0000]
net: wireless: bcmdhd: Allow error debug prints from the beginning

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Update example locale table
Dmitry ORNATSKYY [Wed, 18 May 2011 20:58:44 +0000]
net: wireless: bcm4329: Update example locale table

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Reduce listen interval to 10 (from 20)
Dmitry ORNATSKYY [Wed, 11 May 2011 16:44:21 +0000]
net: wireless: bcm4329: Reduce listen interval to 10 (from 20)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Add new and default wifi locale support
Dmitry Shmidt [Tue, 10 May 2011 23:29:51 +0000]
net: wireless: bcm4329: Add new and default wifi locale support

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix watchdog firing in softirq on removal
Dmitry Shmidt [Thu, 2 Jun 2011 23:08:37 +0000]
net: wireless: bcmdhd: Fix watchdog firing in softirq on removal

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Allow WEXT support
Dmitry Shmidt [Wed, 1 Jun 2011 23:22:21 +0000]
net: wireless: bcmdhd: Allow WEXT support

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix params in wl_cfg80211_event call
Dmitry Shmidt [Wed, 1 Jun 2011 23:20:54 +0000]
net: wireless: bcmdhd: Fix params in wl_cfg80211_event call

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Add spinlock initialization
Dmitry Shmidt [Wed, 1 Jun 2011 22:22:10 +0000]
net: wireless: bcmdhd: Add spinlock initialization

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcmdhd: Fix config FW and NVRAM path
Dmitry Shmidt [Wed, 1 Jun 2011 22:17:48 +0000]
net: wireless: bcmdhd: Fix config FW and NVRAM path

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agoUpdate to 5.90.125.22:
Howard M. Harte [Fri, 27 May 2011 23:07:36 +0000]
Update to 5.90.125.22:

    * Add support for SoftAP, keepalive, ARP offload.
    * Clean up cfg80211 and p2p code.
    * Update Makefile to support new features.
Change-Id: I1e7a16acd400d7baf5625ca8ba6552a6f1c80661
Signed-off-by: Howard M. Harte <hharte@broadcom.com>

7 years agonet: wireless: bcmdhd: Initial version based on 5.90.125.14
Dmitry Shmidt [Tue, 24 May 2011 18:14:33 +0000]
net: wireless: bcmdhd: Initial version based on 5.90.125.14

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agoARM: etm: Power down etm(s) when tracing is not enabled
Arve Hjønnevåg [Thu, 24 Feb 2011 00:51:58 +0000]
ARM: etm: Power down etm(s) when tracing is not enabled

Without this change a saw an 18% increase in idle power consumption
on one deivce when trace support is compiled into the kernel. Now
I see the same increase only when tracing.

Change-Id: I21bb5ecf1b7d29ce3790ceeb5323409cc22d5a3b
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Support multiple ETMs/PTMs.
Arve Hjønnevåg [Sat, 5 Feb 2011 06:38:14 +0000]
ARM: etm: Support multiple ETMs/PTMs.

If more than one ETM or PTM are present, configure all of them
and enable the formatter in the ETB. This allows tracing on dual
core systems (e.g. omap4).

Change-Id: I028657d5cf2bee1b23f193d4387b607953b35888
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Return the entire trace buffer if it is empty after reset
Arve Hjønnevåg [Sat, 5 Feb 2011 06:38:14 +0000]
ARM: etm: Return the entire trace buffer if it is empty after reset

On some SOCs the read and write pointer are reset when the chip
resets, but the trace buffer content is preserved. If the status
bits indicates that the buffer is empty and we have never started
tracing, assume the buffer is full instead. This can be useful
if the system rebooted from a watchdog reset.

Change-Id: Iaf21c2c329c6059004ee1d38e3dfff66d7d28029
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Add some missing locks and error checks
Arve Hjønnevåg [Tue, 15 Feb 2011 05:09:51 +0000]
ARM: etm: Add some missing locks and error checks

It is not safe to call etm_lock or etb_lock without holding the
mutex since another thread may also have unlocked the registers.

Also add some missing checks for valid etb_regs in the etm sysfs
entries.

Change-Id: I939f76a6ea7546a8fc0d4ddafa2fd2b6f38103bb
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Configure data tracing
Arve Hjønnevåg [Tue, 1 Feb 2011 02:33:55 +0000]
ARM: etm: Configure data tracing

The old code enabled data tracing, but did not configure the
range. We now configure it to trace all data addresses by default,
and add a trace_data_range attribute to change the range or disable
data tracing.

Change-Id: I9d04e3e1ea0d0b4d4d5bcb93b1b042938ad738b2
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Allow range selection
Arve Hjønnevåg [Sat, 29 Jan 2011 07:44:43 +0000]
ARM: etm: Allow range selection

Trace kernel text segment by default as before, allow tracing of other
ranges by writing a range to /sys/devices/etm/trace_range, or to trace
everything by writing 0 0.

Change-Id: Ibb734ca820fedf79560b20536247f1e1700cdc71
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Don't try to clear the buffer full status after reading the buffer
Arve Hjønnevåg [Tue, 1 Feb 2011 05:34:47 +0000]
ARM: etm: Don't try to clear the buffer full status after reading the buffer

If the write address was at the end of the buffer, toggling the trace
capture bit would set the RAM-full status instead of clearing it, and
if any of the stop bits in the formatter is set toggling the trace
capture bit may not do anything.

Instead use the read position to find out if the data has already
been returned.

This also fixes the read function so it works when the trace buffer is
larger than the buffer passed in from user space. The old version
would reset the trace buffer pointers after every read, so the second
call to read would always return 0.

Change-Id: I75256abe2556adfd66fd5963e46f9e84ae4645e1
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Don't limit tracing to only non-secure code.
Arve Hjønnevåg [Sat, 29 Jan 2011 07:33:11 +0000]
ARM: etm: Don't limit tracing to only non-secure code.

On some systems kernel code is considered secure, and this code
already limits tracing to the kernel text segment which results
in no trace data.

Change-Id: I098a0753e874859446d098e1ee209f67fc13cd5d
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoARM: etm: Don't require clock control
Arve Hjønnevåg [Sat, 29 Jan 2011 07:12:32 +0000]
ARM: etm: Don't require clock control

If clk_get fail, assume the etb does not need a separate clock.

Change-Id: Ia0bf3f5391e94a60ea45876aa7afc8a88a7ec3bf
Signed-off-by: Arve Hjønnevåg <arve@android.com>

7 years agoBluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections.
Nick Pelly [Thu, 11 Feb 2010 19:54:28 +0000]
Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections.

__u16 sco_pkt_type is introduced to struct sockaddr_sco. It allows bitwise
selection of SCO/eSCO packet types. Currently those bits are:

0x0001 HV1 may be used.
0x0002 HV2 may be used.
0x0004 HV3 may be used.
0x0008 EV3 may be used.
0x0010 EV4 may be used.
0x0020 EV5 may be used.
0x0040 2-EV3 may be used.
0x0080 3-EV3 may be used.
0x0100 2-EV5 may be used.
0x0200 3-EV5 may be used.

This is similar to the Packet Type parameter in the HCI Setup Synchronous
Connection Command, except that we are not reversing the logic on the EDR bits.
This makes the use of sco_pkt_tpye forward portable for the use case of
white-listing packet types, which we expect will be the primary use case.

If sco_pkt_type is zero, or userspace uses the old struct sockaddr_sco,
then the default behavior is to allow all packet types.

Packet type selection is just a request made to the Bluetooth chipset, and
it is up to the link manager on the chipset to negiotiate and decide on the
actual packet types used. Furthermore, when a SCO/eSCO connection is eventually
made there is no way for the host stack to determine which packet type was used
(however it is possible to get the link type of SCO or eSCO).

sco_pkt_type is ignored for incoming SCO connections. It is possible
to add this in the future as a parameter to the Accept Synchronous Connection
Command, however its a little trickier because the kernel does not
currently preserve sockaddr_sco data between userspace calls to accept().

The most common use for sco_pkt_type will be to white-list only SCO packets,
which can be done with the hci.h constant SCO_ESCO_MASK.

This patch is motivated by broken Bluetooth carkits such as the Motorolo
HF850 (it claims to support eSCO, but will actually reject eSCO connections
after 5 seconds) and the 2007/2008 Infiniti G35/37 (fails to route audio
if a 2-EV5 packet type is negiotiated). With this patch userspace can maintain
a list of compatible packet types to workaround remote devices such as these.

Based on a patch by Marcel Holtmann.

Rebased to 2.6.39.

Change-Id: Ide1c89574fa4f6f1b9218282e1af17051eb86315
Signed-off-by: Nick Pelly <npelly@google.com>

7 years agoARM: Add 'card_present' state to mmc_platfrom_data
Dmitry Shmidt [Tue, 3 May 2011 18:05:04 +0000]
ARM: Add 'card_present' state to mmc_platfrom_data

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Fix one more 2.6.39 compilation error
Colin Cross [Tue, 3 May 2011 01:06:41 +0000]
net: wireless: bcm4329: Fix one more 2.6.39 compilation error

Change-Id: Ia290e056a177d0e6f84a3cf9e806307b43de5e1b
Signed-off-by: Colin Cross <ccross@android.com>

7 years agonet: Fix "Support nuking IPv6 sockets as well as IPv4" for 2.6.39
Colin Cross [Tue, 3 May 2011 00:23:45 +0000]
net: Fix "Support nuking IPv6 sockets as well as IPv4" for 2.6.39

Change-Id: I247b8dc2e32bb83e731209928600e92892dd042c
Signed-off-by: Colin Cross <ccross@android.com>

7 years agoRecreate asm/mach/mmc.h include file
Colin Cross [Sat, 9 Apr 2011 05:20:53 +0000]
Recreate asm/mach/mmc.h include file

Change-Id: I9f10244b0603f7842b8504a16124d40dc4a71ed2
Signed-off-by: Colin Cross <ccross@android.com>

7 years agoinput: misc: gpio_matrix: Fix irq call for 2.6.39
Colin Cross [Sat, 9 Apr 2011 02:18:42 +0000]
input: misc: gpio_matrix: Fix irq call for 2.6.39

Change-Id: Ib8dd0ab6554e6b0e3798bf75d41f77ea0b20b8de
Signed-off-by: Colin Cross <ccross@android.com>

7 years agoARM: common: fiq_debugger: Fix build for 2.6.39 irq changes
Colin Cross [Sat, 9 Apr 2011 00:26:06 +0000]
ARM: common: fiq_debugger: Fix build for 2.6.39 irq changes

Signed-off-by: Colin Cross <ccross@android.com>
Change-Id: I68147c0a17f9cd1b7693826754edc55b1bb09592

7 years agonet: wireless: bcm4329: Fix 2.6.39 compilation
Dmitry Shmidt [Mon, 2 May 2011 21:52:15 +0000]
net: wireless: bcm4329: Fix 2.6.39 compilation

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Prevent working thread to run during suspend path
Dmitry Shmidt [Tue, 26 Apr 2011 18:36:07 +0000]
net: wireless: bcm4329: Prevent working thread to run during suspend path

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Clean ARP offload table on IP update
Greg Goldman [Wed, 20 Apr 2011 18:23:06 +0000]
net: wireless: bcm4329: Clean ARP offload table on IP update

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: Reorder incoming packets in PPPoLAC and PPPoPNS.
Chia-chi Yeh [Fri, 15 Apr 2011 22:22:09 +0000]
net: Reorder incoming packets in PPPoLAC and PPPoPNS.

PPP handles packet loss but does not work with out of order packets.
This change performs reordering of incoming data packets within a
sliding window of one second. Since sequence number is optional,
receiving a packet without it will drop all queued packets.

Currently the logic is triggered by incoming packets, so queued
packets have to wait till another packet is arrived. It is done for
simplicity since no additional locks or threads are required. For
reliable protocols, a retransmission will kick it. For unreliable
protocols, queued packets just seem like packet loss. Time-critical
protocols might be broken, but they never work with queueing anyway.

Signed-off-by: Chia-chi Yeh <chiachi@android.com>

7 years agonet: Support nuking IPv6 sockets as well as IPv4.
Lorenzo Colitti [Fri, 11 Mar 2011 04:24:12 +0000]
net: Support nuking IPv6 sockets as well as IPv4.

On Linux, when an interface goes down all its IPv6
addresses are deleted, so relying on knowing the previous
IPv6 addresses on the interface is brittle. Instead,
support nuking all sockets that are bound to IP addresses
that are not configured and up on the system. This
behaviour is triggered by specifying the unspecified
address (:: or 0.0.0.0). If an IP address is specified, the
behaviour is unchanged, except the ioctl now supports IPv6
as well as IPv4.

Signed-off-by: Lorenzo Colitti <lorenzo@google.com>

7 years agonet: wireless: bcm4329: Allocate skb with GFP_KERNEL flag if possible
Dmitry Shmidt [Thu, 10 Mar 2011 18:18:39 +0000]
net: wireless: bcm4329: Allocate skb with GFP_KERNEL flag if possible

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Disable wake irq at driver stop
Dmitry Shmidt [Thu, 10 Mar 2011 00:52:08 +0000]
net: wireless: bcm4329: Disable wake irq at driver stop

Previously at driver stop interrupts were not disabled and
might cause never-ending waking up

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agoUSB: gadget: f_mtp: dequeue request on error in mtp_read
Mike Lockwood [Sat, 19 Feb 2011 20:33:17 +0000]
USB: gadget: f_mtp: dequeue request on error in mtp_read

In mtp_read(), if wait_event_interruptible() returns an error, we need to
remove the request from the EP queue.  Else, on the next call to mtp_read(), we
will attempt to enqueue the request again, potentially corrupting the
queue.  This is what happens with musb_gadget_queue(), which does not check for
duplicate requests.

Based on a similar change to f_adb.c

Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agoUSB: gadget: android: Fix problem switching vendor IDs
Mike Lockwood [Mon, 14 Feb 2011 18:32:05 +0000]
USB: gadget: android: Fix problem switching vendor IDs

We need to update the vendor ID in the composite driver as well

Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agonet: wireless: bcm4329: Fix disable pno call
Greg Goldman [Sat, 19 Feb 2011 01:12:19 +0000]
net: wireless: bcm4329: Fix disable pno call

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Get country translation from platform data
Dmitry Shmidt [Tue, 15 Feb 2011 01:48:56 +0000]
net: wireless: bcm4329: Get country translation from platform data

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: Add get_country_code functionality to platform
Dmitry Shmidt [Tue, 15 Feb 2011 00:58:48 +0000]
net: wireless: Add get_country_code functionality to platform

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Update to version 4.218.248-23
Greg Goldman [Mon, 14 Feb 2011 23:54:42 +0000]
net: wireless: bcm4329: Update to version 4.218.248-23

- Add support to PNO with adaptive scan time
- Remove logic to generate Link Down based on Roaming Event
- Improve sco/esco detection method for BT COEX
- Add new function TXPOWER to reduce power if needed

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Fix mem leak in wl_iw_handle_scanresults_ies
Mike Corrigan [Sat, 12 Feb 2011 01:05:54 +0000]
net: wireless: bcm4329: Fix mem leak in wl_iw_handle_scanresults_ies

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Fix memleak in dev->p
Andrei Warkentin [Sat, 12 Feb 2011 01:01:28 +0000]
net: wireless: bcm4329: Fix memleak in dev->p

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agonet: wireless: bcm4329: Add sdlock to firmware loading
Dmitry Shmidt [Sat, 12 Feb 2011 00:54:39 +0000]
net: wireless: bcm4329: Add sdlock to firmware loading

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

7 years agoPM: Increase dpm suspend timeout
Benoit Goby [Mon, 7 Feb 2011 21:55:26 +0000]
PM: Increase dpm suspend timeout

usbhid devices have a 10s timeout waiting for the out queue to clear.
Increased the watchdog to 12s.

Change-Id: I96368fca6dff98e4eba8aedb09c23be964c8f4b4
Signed-off-by: Benoit Goby <benoit@android.com>

7 years agoUSB: gadget: f_mtp: Don't block in mtp_send_event
Mike Lockwood [Thu, 10 Feb 2011 16:54:53 +0000]
USB: gadget: f_mtp: Don't block in mtp_send_event

We used to wait for the previous interrupt packet to complete before sending
the next packet.  But unfortunately the previous packet will not complete
until USB is disconnected if the host is not listening on the interrupt
endpoint (which is the case with libmtp on Linux and Mac).
To avoid hanging indefinitely in this case, we now simply return -EBUSY
if the previous interrupt packet has not completed yet.

Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agoUSB: gadget: android: Support switching vendor ID when configuration changes
Mike Lockwood [Wed, 9 Feb 2011 14:38:26 +0000]
USB: gadget: android: Support switching vendor ID when configuration changes

Based on the list of enabled USB functions, we can now switch the vendor ID
as well as the product ID.

Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agoRevert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
Colin Cross [Sat, 12 Feb 2011 21:21:32 +0000]
Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"

This reverts commit f0b0e4bec1e89014f3dcef4da8bcf95428cc771c.

The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.

This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.

Signed-off-by: Colin Cross <ccross@android.com>

7 years agopower: wakelock: use get_xtime_and_monotonic_and_sleep_offset in get_expired_time
Colin Cross [Wed, 30 Mar 2011 19:37:49 +0000]
power: wakelock: use get_xtime_and_monotonic_and_sleep_offset in get_expired_time

Change-Id: I6ebe6b954b2ff328d46898d683650dafb9c4fe74
Signed-off-by: Erik Gilling <konkers@android.com>

7 years agousb: gadget: composite: USB_GET_CONFIGURATION must return 0 in unconfigured state.
Oleg Matcovschi [Fri, 11 Mar 2011 18:24:30 +0000]
usb: gadget: composite: USB_GET_CONFIGURATION must return 0 in unconfigured state.

Change-Id: I5212ca9990308d0c4ae6a55c60cba42d6b0e4fee
Signed-off-by: Oleg Matcovschi <olegmatcovsky@gmail.com>

7 years agoUSB: gadget: f_adb: dequeue request on error in adb_read
Iliyan Malchev [Fri, 18 Feb 2011 19:28:32 +0000]
USB: gadget: f_adb: dequeue request on error in adb_read

In adb_read(), if wait_event_interruptible() returns an error, we need to
remove the request from the EP queue.  Else, on the next call to adb_read(), we
will attempt to enqueue the request again, potentially corrupting the
queue.  This is what happens with musb_gadget_queue(), which does not check for
duplicate requests.

Signed-off-by: Iliyan Malchev <malchev@google.com>

7 years agoUSB: gadget: f_mtp: Fix problems transferring files from device to host
Mike Lockwood [Mon, 7 Feb 2011 16:51:07 +0000]
USB: gadget: f_mtp: Fix problems transferring files from device to host

Exit from send_file_work immediately when a cancel request is received.

Only busy status if there is a cancel pending that has not been repoorted to userspace.
This avoids a race condition that can occur when mtp_read resets the state
to STATE_BUSY before we report status OK back to the host.

Signed-off-by: Mike Lockwood <lockwood@android.com>

7 years agoUSB: gadget: composite: fix compile issues
Vikram Pandita [Tue, 8 Feb 2011 05:20:50 +0000]
USB: gadget: composite: fix compile issues

In file included from drivers/usb/gadget/ether.c:114:
drivers/usb/gadget/composite.c: In function 'usb_composite_force_reset':
drivers/usb/gadget/composite.c:121: error: implicit declaration of function 'msleep'
drivers/usb/gadget/composite.c: In function 'usb_add_function':
drivers/usb/gadget/composite.c:158: error: implicit declaration of function 'MKDEV'

Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>

7 years agoblock: genhd: Add partition name to the partition info uevent callback
Brian Swetland [Fri, 4 Feb 2011 21:19:10 +0000]
block: genhd: Add partition name to the partition info uevent callback

For disk and partition devices, add new uevent parameter:
PARTNAME specifices the partition name of a partition device

Signed-off-by: Dima Zavin <dima@android.com>