cpufreq: interactive: allow arbitrary speed / delay mappings

Accept a string of delays and speeds at which to apply the delay before
raising each step above hispeed. For example, "80000 1300000:200000
1500000:40000" means that the delay at or above 1GHz, until 1.3GHz is 80 msecs,
the delay until 1.5GHz is 200 msecs and the delay at or above 1.5GHz is 40
msecs when hispeed_freq is 1GHz.

[toddpoynor@google.com: add documentation]
Change-Id: Ifeebede8b1acbdd0a53e5c6916bccbf764dc854f
Signed-off-by: Minsung Kim <ms925.kim@samsung.com>

Conflicts:
	Documentation/cpu-freq/governors.txt
cpufreq: interactive: fix crash on error paths in get_tokenized_data

Use separate variable for error code, free proper pointer.

Change-Id: Ia83cccb195997789ac6afbf5b8761f7b278196d6
Reported-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
net: wireless: bcmdhd: Update to version 1.88.4

- Improve P2P concurrency
- Re-arch proptxstatus code
- Fix WMM (QoS) traffic differentiation test

Change-Id: Id204048255a5ab41913da260adf9154a350f7a77
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
cpufreq: interactive: base above_hispeed_delay on target freq, not current

Time to wait should be based on the intended target speed, not the
actual speed (which may be held high by another CPU).

Change-Id: Ifc5bb55d06adddb9a02af90af05398a78f282272
Reported-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: add io_is_busy interface

Previously the idle time returned from get_cpu_idle_time_us included the
iowait time. So the iowait time was always calculated as idle time.

But now the idle time returned from get_cpu_idle_time_us does not include
the iowait time anymore because of below commit which cause the iowait time
always calculated as busy time:
    6beea0c nohz: Fix update_ts_time_stat idle accounting

Add the io_is_busy interface, as does the ondemand governor, and let the user
configure the iowait time as busy or idle through the io_is_busy sysfs
interface.

By default, io_is_busy is disabled.

[toddpoynor@google.com: minor updates]
Change-Id: If7d70ff864c43bc9c8d7fd7cfc66f930d339f9b4
Signed-off-by: Lianwei Wang <lian-wei.wang@motorola.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
cpufreq: interactive: Rework cputime for 3.0.x Kernel
nohz: Fix update_ts_time_stat idle accounting

update_ts_time_stat currently updates idle time even if we are in
iowait loop at the moment. The only real users of the idle counter
(via get_cpu_idle_time_us) are CPU governors and they expect to get
cumulative time for both idle and iowait times.
The value (idle_sleeptime) is also printed to userspace by print_cpu
but it prints both idle and iowait times so the idle part is misleading.

Let's clean this up and fix update_ts_time_stat to account both counters
properly and update consumers of idle to consider iowait time as well.
If we do this we might use get_cpu_{idle,iowait}_time_us from other
contexts as well and we will get expected values.

Signed-off-by: Michal Hocko <mhocko@suse.cz>
Cc: Dave Jones <davej@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Link: http://lkml.kernel.org/r/e9c909c221a8da402c4da07e4cd968c3218f8eb1.1314172057.git.mhocko@suse.cz
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
net: wireless: bcmdhd: Update to version 1.88.6

- Fix improper printing of negative value from dhd dump command
- Fix too long scan dwell time when connect command is coming
  with no channel info
- Remove unused WLBTAMP code

Change-Id: I4acdb3aa54ab79200299ac42d0d537c2beccc377
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
interactiveX: the following four interactive patches ported

325d5c2: base above_hispeed_delay on target freq, not current
bfb979b: fix crash on error paths in get_tokenized_data
1105ad0: add io_is_busy interface
d344c09: allow arbitrary speed / delay mappings
interactiveX: same cpustat fix
cpufreq: added ktoonservative governor
cpufreq: ktoonservative governor, conform to Nexus standard vars
cpufreq: ktoonservative, change cpu_up and cpu_down call to use work_struct.
cpufreq: ktoonservative add CPU_DOWN_BLOCK_CYCLES variable
cpufreq: ktoonservative, added boostpulse to make it behave like interactive when screen touch occurs.  Acts just like a Touch Booster from my SGS3

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
FIX cpufreq: ktoonservative, added boostpulse mismerge
FIX some prototype errors
cpufreq: ktoonservative fix lock at max
cpufreq: ktoonservative fix lock at max AGAIN
cpufreq: ktoonservative fix lock at max AGAIN AGAIN