review.tizen.org Git - kernel/kernel-mfld-blackbay.git/log

[PORT FROM R2] pci.c: dont call msleep(0) in suspend flow

BZ: 2700

Gerrit patch #9116 was introduced to decrease the delay after changing
the device state. Unfortunately, msleep(0) will actually delay until the
next tick which is about 10ms on Medfield.

Solution: do not call msleep() if the requested delay is 0.
Added the same check before udelay(PCI_PM_D2_DELAY).

Change-Id: Ic07477be6c5f293f5007a1420a34d749571d04cd
Orig-Change-Id: Ifea81bdc31836dbbc26c4a7a6e6c5419dfb38f4e
Signed-off-by: Jean-Pierre Stierlin <jean-pierrex.stierlin@intel.com>
Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Signed-off-by: Loic Martin <loicx.martin@intel.com>
Reviewed-on: http://android.intel.com:8080/32685
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Kuppuswamy, Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] alarm: Migrate legacy suspend/resume to dev_pm_ops

BZ: 2881

alarm driver uses legacy suspend/resume callbacks. Migrate them to
dev_pm_ops

Orig-Change-Id: I698c5d2112658dac6836963758c0b7fcd8e4d57e
Signed-off-by: MingmingX Zhang <mingmingx.zhang@intel.com>
Conflicts:

drivers/rtc/alarm.c

Change-Id: I2c5f453d1b36493390e24bef1ce87f4d3d7fe11a
Signed-off-by: Loic Martin <loicx.martin@intel.com>
Reviewed-on: http://android.intel.com:8080/32684
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] rtc-mrst: Migrate legacy suspend/resume callbacks of rtc driver to dev_pm_ops.

BZ: 2607

rtc driver uses legacy suspend/resume callbacks.
Migrate them to dev_pm_ops.do not use legacy for D3 suspend/resume callbacks

Change-Id: I8003640c25b35f3d8a721597762967ac77920283
Orig-Change-Id: If0397defee1966b6a153e4849f212ecd8f5c6d05
Signed-off-by: he bo <bo.he@intel.com>
Signed-off-by: Loic Martin <loicx.martin@intel.com>
Reviewed-on: http://android.intel.com:8080/32683
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] pci_rtpm: remove the pm delay for intel_mid platforms

BZ: 2700

pci framework force a wait of 10ms for every pci devices
upon resume. This is not needed on mid_pmu platform and strongly impacts
performance

remove those default timers if we are on intel_mid platforms

Change-Id: I73ed8ea6560791fb5c44eb9bdaf9ddb6c315ffd5
Orig-Change-Id: If5824c5b7a1c8cd7698c979ab7d609aea60d2ea0
Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Signed-off-by: Loic Martin <loicx.martin@intel.com>
Reviewed-on: http://android.intel.com:8080/32682
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] cpufreq: assign function to get freq correctly

BZ: 20997

The function to get the current cpu frquency was being assigned
wrongly.

Change-Id: I31468fe1ac4184abe2083429dc040262281a7f60
Signed-off-by: john mathew <john.mathew@intel.com>
Reviewed-on: http://android.intel.com:8080/32730
Reviewed-by: Hogander, Jouni <jouni.hogander@intel.com>
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2]dma: wrong debug message and wrong masking of error interrupts

BZ: 20940

oldBZ-20433
This patch fixes 2 issues :
- In DMA tasklet, debug messages when handling error interrupts are the same as when handling
TX complete interrupts.
- In DMA ISR, if errors are detected at the same time on multiple channels, the ISR masks error
interrupts for wrong channel.
Signed-off-by: Catalin Popescu <catalinx.popescu@intel.com>
Change-Id: Idbad4352d3d6a38fe68bec7dbd03363f59983c6e
Old-Change-Id: Id4755d5e85b9bb916569196d5c51a5c3830781d2
Reviewed-on: http://android.intel.com:8080/32590
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: Popescu, CatalinX <catalinx.popescu@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[REBASED on r2-stable branch] audio:enable msic pll only if it is disabled

BZ: 20940

old-BZ: 12022
MSIC PLL state needs to be checked before re-enabling it.
Disabling and re-enabling while stream is active would
cause undesirable effects/glitches.

This patch fixes the regression caused the patch:
6e50b8ed59528963db50e63e9dcf65f8a3d9adb3

old-Change-Id: Iaee8d3ea69e7bec0823123d7b919f0c7209f1812

Change-Id: I0256be9e1d3fdba946c458ab97c5581a8bf57310
Signed-off-by: Ramesh Babu K V <ramesh.babu@intel.com>
Reviewed-on: http://android.intel.com:8080/32715
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Audio: sst: Prevents concurrent access to firmware download code

BZ: 20940

OldBZ:9443

The code to download firmware can be accessed by more than one thread at a time
leading to panic. Proper locking along with a new sst state (firmware starting
to download) prevents this. (Ported to gb-stable)

Change-Id: Ic56e3bfd68cf89c2b8937a572a70f01b80e3b27e
Old-Change-Id: I16ef33e6ed26407ffe2e7c7693976ce1ec8e09cb
Signed-off-by: Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
Reviewed-on: http://android.intel.com:8080/32721
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Graphics: add GL3 Cache support for OSPM

BZ: 16808

This reverts commit 8dadfb803535c6d77eba52216c595f984706e19d.
and add GL3 enbling in mdfld kernel config

Change-Id: I5c784a831043c6bff4c2058f371a1a3a96516106
Signed-off-by: Randy Xu <randy.xu@intel.com>
Reviewed-on: http://android.intel.com:8080/32576
Reviewed-by: Pandit, Seema <seema.pandit@intel.com>
Reviewed-by: Stimson, DaleX B <dalex.b.stimson@intel.com>
Reviewed-by: Hu, Austin <austin.hu@intel.com>
Reviewed-by: Seibel, Eric <eric.seibel@intel.com>
Tested-by: Seibel, Eric <eric.seibel@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] hsi_ffl_tty.c: adding some /sys/module interface to manage modem reset

BZ: 19623

This patch is adding two sysFS interfaces aimed at managing modem reset and TTY
interface hang-up:
- /sys/module/hsi_ffl_tty/parameters/reset_modem for resetting the modem and
  querying its reset status;
- /sys/module/hsi_ffl_tty/parameters/hangup_reasons for accessing and clearing
  hang-up reasons.

The /sys/module/hsi_ffl_tty/parameters/reset_modem interface is exporting some
decimal data consisting of a bitfield of 1 bit per TTY interface (bit 0 for
ttyIFX0, bit 1 for ttyIFX1...) where:
- when written to 1 is resetting the corresponding modem (the one attached to
  the TTY interface);
- when read to 1 is signalling that the corresponding modem is still resetting,
  as it did not successfully managed any TX or RX transaction.

The /sys/module/hsi_ffl_tty/parameters/hangup_reasons interface is exporting
some decimal data consisting of a bitfield of 1 nibble (4-bits) per TTY
interface (bit0 to 3 for ttyIFX0, bit 4 to 7 for ttyIFX1...) where:
- when read is getting the last hangup reasons of the considered TTY interface
  (bit 0 for TX timeout, bit 1 for modem reset and bit 2 for modem core dump);
- when written is clearing the given hangup reasons of the considered TTY
  interface (bit 0 to clear TX timeout, bit 1 for modem reset and bit 2 for
  modem core dump).

This last interface is different from the related IOCTL, which is working in a
read-to-clear mode. This is no longer the case with this sysFS interface where
the read data shall be written back to clear the hangup reasons. A correct
management would be:
1. read /sys/module/hsi_ffl_tty/parameters/hangup_reasons,
2. write back the read value to acknowledge those hangup reasons and then,
3. perform whatever is necessary to manage the hangup reasons.

See the functions header descriptions for more information regarding those new
interfaces.

Change-Id: I82647742ce6292950cb5216593611146c151c533
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/31415
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: Lucas, GuillaumeX <guillaumex.lucas@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] hsi_ffl_tty.c: streamlining the TX timeout and stop TX timer management

BZ: 15222

This patch is cleaning and factorising the TX timeout and stop TX timer
management to limit the number of code sections where those timers are updated
In more details, this patch is:
- also directly killing the stop TX timer in the _ffl_from_wait_to_ctrl()
   function upon successful insertion of HSI message in the controller at the
   very same location where the TX timeout timer is updated;
- adding a _ffl_update_state_tx() function aimed at factorising those timers
   management, mainly killing the hangup timer when there is no left HSI
   message in the controller and starting the stop TX timer when the full write
   pipeline is empty. This helper function is the sibling of the
   _ffl_update_state_rx() function;
- this _ffl_update_state_tx() is now called wherever the wait FIFO and the
   controller FIFO are updated: in the _ffl_pop_wait_push_ctrl() function,
   which is transferring as much TX messages as possible from the wait FIFO and
   the controller as well as in the ffl_destruct_frame() callback;
- the _ffl_tx_ctx_is_empty() helper function has been removed as it was only
   used once in this new code version, and its internal code has been directly
   carbon copied in the ffl_tx_full_pipe_is_clean() function;
- the TX timeout and stop TX timer management has been removed from the
   ffl_complete_tx() function for it is now included in the
   _ffl_pop_wait_push_ctrl() call;
- the ffl_throw_tty_hangup() function has been dropped as it was mistakenly
   used with a spinlock_irq_save in the ISR (which is bad) and was only used
   once elsewhere. The content of this initial function has been copied to the
   ISR without the _irqsave modifier, and was updated in the
   ffl_tty_tx_timeout() timer handler callback to only throw a TTY hangup if
   the HSI controller FIFO is not empty - which is safer than the current
   implementation.

This latter modification is further ensuring that no unexpected TX timeout
hangup can happen when the HSI controller FIFO is empty - maybe due to a race
condition between the del_timer() and mod_timer() functions.

This new hangup management is simpler than the previous one as it does not
update the TX timeout timer upon reception on a frame, but only when adding a
new frame in the controller.

Finally, this new version is also adding better traces for RESET_OUT and
CORE_DUMP, adding the cause information.

In a nutshell, the purpose of this patch is to bind the TX timeout and stop TX
timer management to ensure a full coherency in this respect, to simplify the
TX timeout management and to filter out potential spurious TX timeout hangups.

Change-Id: I0cc4e5ca720a1fee4060681780c59aeada476193
Orig-change-Id: Id53abc766cd9687321f3f21195fe7f898e24948f
Orig-Change-Id: I6e1ce86acbde63f96b744d972a31fcb53afb1205
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/31445
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] hsi_ffl_tty.c: kill 30-second tty_wait_until_sent timeout and refactorise code

BZ: 15526

When closing the IFX 0 TTY interface, the TTY layer is relying on the
tty_chars_in_buffer() callback function to wait for the TTY port emptiness. It
is only later that it is calling the wait_until_sent() callback function.
The current implementation is potentially stalling on the first wait loop as
no event is waking the TTY interface up should this happen. The current patch
is addressing this issue by calling a tty_wakeup whenever the last TX message
is returned back from the controller.

Still on this TX path emptiness, a new _ffl_tx_ctx_is_empty() helper function
has been introduced not to consider the TX path as empty as long as there is
write pending - e.g. writes which are no longer in the wait FIFO, but not yet
in the controller.

Finally this patch is also refactoring the _ffl_pop_wait_push_ctrl() to kill a
tail recursion call - which is forbidden in the kernel - and to merge two very
similar function.

Change-Id: Ie3dbe03e285fff60ef172924e2e631f069ffb9c8
Orig-change-Id: I40da402cdbbcc953912adfcaae4265ec48e8af54
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/31431
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Revert "[Rebase from r2]]audio: sn95031: added GPIO support for jack detection"

BZ: 20873

Bug id which merged the patch 19775

This reverts commit 932aa03c1092173047d0eec75b3496582e82ba02.

Change-Id: If2ae534c63131e83e0de9667cefe899b0bab46a9
Reviewed-on: http://android.intel.com:8080/32635
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Enable VEC D0i3.

BZ: 19416

Video encoding HW island should be powered down when it is idle.
This patch enables VEC D0i3 by default.
Signed-off-by: Elaine Wang <elaine.wang@intel.com>
Change-Id: I40fa00ea2519c8acdb1a1bc19f94b89ae91c89f2
Reviewed-on: http://android.intel.com:8080/31174
Reviewed-by: Yuan, Shengquan <shengquan.yuan@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] lm3554: update step size for flash and torch

BZ: 20773

ORIG_BZ: 19823

to protect the LED and LM3554 the current through the LED should
not surpass 800mA. This means 100% should be mapped to 800mA
instead of the 1000mA it is now. To accomodate this the flash step
should be increased from 625 to 909 and for torch from 1250 to
1818.

Change-Id: I15ed7e1bda2b345132fbbd614a0710268484f65e
Orig-Change-Id: Iff17edc6575284b6b8a0f74dc179a4678b831bcc
Reviewed-on: http://android.intel.com:8080/31668
Reviewed-by: Jong-a-lock, Robert <robert.jong-a-lock@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Suzuki, Kunimitsu <kunimitsu.suzuki@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Tested-by: Haapakorpi, Juha <juha.haapakorpi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32603
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] mt9e013: Add runtime check for old vs new VCM

BZ: 20773

ORIG_BZ: 11145

This patch adds a check that uses the IFWI (firmware) version to determine
whether the VCM maintains focus position when the sensor module is put into
standby mode or not. This is a temporary feature that is needed as long as
prototype phones (earlier than PR3.3) are still being used. After those have
been phased out completely, this check can be removed.

Change-Id: I21b130e9a029d33f468a30f8f3f53b34c2cfc5b7
Orig-Change-Id: I5f2dd8545574f8e5d20c489fc3cfd357dc9611c1
Signed-off-by: Jozef Kruger <jozef.kruger@intel.com>
Reviewed-on: http://android.intel.com:8080/31764
Reviewed-by: Jong-a-lock, Robert <robert.jong-a-lock@intel.com>
Reviewed-by: Samurov, Vitali <vitali.samurov@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32602
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] mt9e013: mt9m114: fix i2c burst transfer error

BZ: 20773

ORIG_BZ: 16310

The i2c adapter can transfer 32 bytes maximum
at a time, while driver implemets maximum 128
bytes burst transfer length, so i2c driver would
split buffer transfer if buffer length is more than
32 byte. This will cause some problem sometime, since
during two consequtive transfers, if the second transfer
starts at the time when the first transfer completely finishes,
(i2c transfer buffer empty),the i2c controler would start
a new i2c transfer, which include a start/stop signal according to
i2c protocal, but it will break the i2c burst transfer rules
expected by driver.

Change driver's maximum burst length from 128 t0 32 bytes for both
sensors.

Change-Id: I27df255211161b20d441825397e43a88eb4774cf
Orig-Change-Id: I9035825c326c85700bcb0e66d9954588e5459cc4
Signed-off-by: Tao Jing <jing.tao@intel.com>
Reviewed-on: http://android.intel.com:8080/31997
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Jong-a-lock, Robert <robert.jong-a-lock@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32601
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>

Enable "quota, tag, owner" match and stats support in netfilter
requested by NetworkStats.

BZ: 20622

Change-Id: I7cb2a4d682741593b8dab4c93891813d18d57fa9
Signed-off-by: Philippe Skowronski <philippe.skowronski@intel.com>
Reviewed-on: http://android.intel.com:8080/32511
Reviewed-by: Chotard, Celine <celine.chotard@intel.com>
Tested-by: Chotard, Celine <celine.chotard@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2]Battery: Difference R2_stable and R3 in case DEAD condition patches

BZ: 18662

This patch is difference between R2_stable and R3 patches submitted for check for battery health state against DEAD
before setting it to GOOD.
Signed-off-by: santosh <santoshx.gugwad@intel.com>
Change-Id: I6908b74a954fad097762b3e8171ce0ed72d664e8
Reviewed-on: http://android.intel.com:8080/31836
Reviewed-by: Gugwad, SantoshX <santoshx.gugwad@intel.com>
Tested-by: Gugwad, SantoshX <santoshx.gugwad@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2]mid_pmu: increase delay while looping for c6 write access bit check

BZ: 17718

Based on Continente, Christophe <christophe.continente@intel.com> initial
patch #31029, that puts infinite delay while checking c6 write access bit, the
black screen issue while charging is not seen even after 200+ hours of
running, while without the patch #31029 it is observed within 15+ hours

On this observation I'm putting this delay of upto 500usecs in
1usec granularity, while looping for c6 write access bit set,
also we wait for pm_msic bit to be set indicating that the PM_CMD processing
has started in SCU.

Based on Onkalo Samu's suggestion added c6offload bit clear in
pmu_sc_irq for s0ix command completion interrupts.

The reason for clearing c6 offload bit in pm_sc_irq is for the following:

There could be a previous s0i3 command submitted and c6offload bit might
have been set and also c6 offload write access bit is also set by SCU
but because of need_reschd() set we may skip mwait(C6), the next time
a normal C6 happens *after* pm_scu_irq P-unit may errorneously do c6
offload.

Change-Id: I0ebab3fdb97763aacee62007eb95f0f31b6fb9e2
Signed-off-by: Illyas Mansoor <illyas.mansoor@intel.com>
Reviewed-on: http://android.intel.com:8080/32177
Reviewed-by: Hogander, Jouni <jouni.hogander@intel.com>
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

intel_mid_umip: Sysfs Interface for the USB Host Enable UMIP value

BZ:13299

Added functionality to expose the USB Host Enable UMIP value in
sysfs. We can read the current value and modify the existing value
by writing to the sysfs interface.

Usage:

cd /sys/devices/platform/intel_mid_umip

To list the available timeouts
===========
cat available_timeouts

To list the current programmed timeout
===================
cat current_timeout

To change the current programmed timeout
===================
echo <timeout> > current_timeout

Change-Id: Ia8a43f85388beeb2b644bffd16d0374457af36e3
Signed-off-by: Surya P Sahukar <surya.p.sahukar@intel.com>
Signed-off-by: Hari K Kanigeri <harik.k.kanigeri@intel.com>
Reviewed-on: http://android.intel.com:8080/31586
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Kuppuswamy, Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Reviewed-by: Dong, Chuanxiao <chuanxiao.dong@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] atomisp: Disable selction of advanced binary when MACC is used

BZ: 20531

MACC was not available in the primary binary, and hence when MACC
was selected by the user, advanced binary was chosen by default. With
this patch, primary binary will be selected when MACC is set by the user.

Change-Id: I45a64a5ebc1f61f2bb2555fef79c5bdedb86bb44
Orig-Change-Id: I11a030aba0d750390990a4dcdf93ccdc82e6ecc6
Signed-off-by: Lokesh Gupta <lokesh.gupta@intel.com>
Reviewed-on: http://android.intel.com:8080/31406
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32450
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] atomisp: enable bayer resampler for binning modes

BZ: 20531

Enable bayer resampler in sensor for binning modes. This should
take care of aliasing artifacts.

Change-Id: I88a90cd5ced922d1cd66fd8ea1f402d8489b78ad
Orig-Change-Id: I9c4c72d2ff8db0814f9df46f97ae5fa32ab558fd
Reviewed-on: http://android.intel.com:8080/30920
Reviewed-by: Jong-a-lock, Robert <robert.jong-a-lock@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Tested-by: Ilvonen, Ville <ville.ilvonen@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32449
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] atomisp: Acceleration API cache control

BZ: 20531

The application can select the cache strategy for each individual
buffer shared between atom and ISP.

Change-Id: I16b27d08ff7bb3faeff93542af2887953cdfef9e
Orig-Change-Id: I9e939c3cc34c9aeb50b56d0b146f265eb715cea7
Signed-off-by: Mark Wezelenburg <mark.wezelenburg@intel.com>
Signed-off-by: Lokesh Gupta <lokesh.gupta@intel.com>
Reviewed-on: http://android.intel.com:8080/30363
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32448
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] atomisp: CSS release from Synergy BL 03Jan2012

BZ: 20531

This release solves the following issues:
- Critical races test in ANR
- Enable MACC in primary
- Don't reallocate DDR buffer for ISP FW

Change-Id: I518f1a370967fa22aa820bb6895d0e11ab141d5d
Orig-Change-Id: Icfbe4641c8b07496ac75dced755aeb17f5254c30
Signed-off-by: Lokesh Gupta <lokesh.gupta@intel.com>
Reviewed-on: http://android.intel.com:8080/30568
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32447
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] atomisp: fix file_input issue in atomisp_isr

BZ: 20531

This patch will bypass buffer monitor for file injection to avoid
isp timeout

Change-Id: I8d7dadbc2dcb8ad79bc5bd61a67b977c7166c967
Orig-Change-Id: Ieeeb98ab68d07f3ea36074650cee82fc2300978b
Signed-off-by: Gong Shuguang <shuguang.gong@intel.com>
Reviewed-on: http://android.intel.com:8080/29267
Reviewed-by: Von Oerthel, Jurgen <jurgen.von.oerthel@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Tao, Jing <jing.tao@intel.com>
Reviewed-by: Hu, Gang A <gang.a.hu@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32446
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] atomisp: ensure vf res not larger than main res

BZ: 20531

There is no protection when Vf resolution is configured larger
then the Main resolution

Add the restration rule here:
1: if config vf res after main res, and res larger than main res
- restrain vf res to be equal with main res
2: if config vf res before main res, and main res small than vf res
- enlarge main res to be equal with vf res

Change-Id: I71cc1dd0eac916bc713e9d56f57f1e3b26f09b1d
Orig-Change-Id: I71e54c3be4308bbcf578a854b4d00c8e7e10de3a
Signed-off-by: Tao Jing <jing.tao@intel.com>
Reviewed-on: http://android.intel.com:8080/30257
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Koskinen, Ilkka <ilkka.koskinen@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32445
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] atomisp: Corrupt preview on changing zoom ratio in video mode

BZ: 20531

When the ISP is started from within the ISR context, the condition
of first invalid frame was not being handled properly. Therefore, a
corrupt frame was displayed when switching the video binaries. This
patch fixes this issue.

Change-Id: Ia73ae4d871db91fe6c37305d0164777d1f2a07a9
Orig-Change-Id: Idfccb6437ae181fedea1ab61412c59248b29054b
Signed-off-by: Lokesh Gupta <lokesh.gupta@intel.com>
Reviewed-on: http://android.intel.com:8080/30316
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32444
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

[PORT FROM R2] atomisp: do not restart ISP from ISR when next stage is accel fw

BZ: 20531

Accel fw always do memory (de)allocation when starting. For such reason,
accel stages cannot be started from atomic context.

Change-Id: Ifefb7fe6a076bb9f62430a50f8bbd80dadf2f308
Orig-Change-Id: Ibd982ea9e90363f0f9b816c57157d9b5e1ec525a
Signed-off-by: David Cohen <david.a.cohen@intel.com>
Reviewed-on: http://android.intel.com:8080/30237
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: Von Oerthel, Jurgen <jurgen.von.oerthel@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32443
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

HSU: Use spin_lock/unlock variant in ISR.

BZ: 19018

Kernel is expecting to execute ISRs with interrupt disabled,
using spin_lock/unlock_irq variant in ISR would cause interrupt to
be enabled, thus causing a kernel warning.

Change-Id: I7efe94dc704cdcb3042a3c2524520a8b1d4550d8
Signed-off-by: Fei Yang <fei.yang@intel.com>
Reviewed-on: http://android.intel.com:8080/31925
Reviewed-by: Kuppuswamy, Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: Du, Alek <alek.du@intel.com>
Tested-by: Wang, Zhifeng <zhifeng.wang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] hsi_ffl_tty.c: manage system time changes

BZ: 15919

Should a system time change happen between a stop_tx and start_tx then a delay
of the same duration as the time change can be observed in the write function.
As the write function cannot exit prior to the expiration of this delay, the
system is detecting an unresponsive write request and some mechanism is
rebooting the platform.

The patch presented below is simply casting the result of the time difference
to an unsigned integer (instead of a signed one) so that should the new time be
set prior to the current time, the time difference will be positive and no
delay will be taken.

One can argue that the delay will not be respected in such cases, but it is not
possible to guarantee such delays without adding a new real timer.

Change-Id: I46b2ecdf43e6070417cdb6b0f527d5c6639ec89e
Orig-change-Id: I51413a04a9aa9309d27f27268d642c1a79796dea
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/31428
Reviewed-by: Pillet, VincentX <vincentx.pillet@intel.com>
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] hsi_ffl_tty.c: add a TX timeout trace in the logs

BZ: 16049

This patch is adding a TX timeout trace in the FFL modem protocol driver. It is
also correcting a misleading comment.

Change-Id: I5729c586d67459426bc3a822c0b8d23b90fb6a79
Orig-change-Id: Ic9bdbdcd194eec9b56d57ad71586f81842366a4b
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/31424
Reviewed-by: Robert, Denis <denis.robert@intel.com>
Reviewed-by: Akue, LoicX <loicx.akue@intel.com>
Reviewed-by: Morel, YannickX <yannickx.morel@intel.com>
Reviewed-by: Pillet, VincentX <vincentx.pillet@intel.com>
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] intel_mid_hsi: Cleaned-up reset sequence for avoiding RX errors.

BZ: 15516

This patch is cleaning up the reset sequence of Intel HSI controller by:
- disabling the tasklet prior to resetting the hardware to prevent those
  tasklets to run after the transfer contexts have been freed thus protecting
  against a potential kernel panic;
- not disabling the IP clock generation and PLL, as this causes RX errors when
  the device is re-enabled without going into suspend mode. This error is not
  happening when the device is going through a suspend / resume cycle as it is
  un-powered and restarts in a safe state.

Change-Id: I404feb0c96840e9eeec4e78336b42a1254c4acff
Orig-Change-Id: I092434a4dfeb5dd2c6a31bc887e9115eff23fba4
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/31423
Reviewed-by: Robert, Denis <denis.robert@intel.com>
Reviewed-by: Akue, LoicX <loicx.akue@intel.com>
Reviewed-by: Pillet, VincentX <vincentx.pillet@intel.com>
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Graphics: add GL3 Cache support for OSPM

BZ: 16808

Enable the GL3 support in kernel

Change-Id: I0b15eee3427acde7f92ec69025ab0fb693ed8963
Signed-off-by: yifei.xue <yifeix.xue@intel.com>
Signed-off-by: Tong, Bo <box.tong@intel.com>
Reviewed-on: http://android.intel.com:8080/31141
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

usb: port 7 patches from R2 to R3

BZ: 19817

Patches are from the following BZs:
BZ: 16919
usb/penwell_otg: change all sysfs interface authority to 664
BZ: 11069
usb:langwell_udc:remove the invalid dqh->dqh_current write
BZ: 15754
usb/penwell_otg: retry after charger detection failure
BZ: 14339
usb:langwell_udc: remove controller reset in handle_usb_reset
BZ: 17449 17363 16799
usb: free pending requests before dma_pool_destroy
BZ: 18191
langwell_udc: Turn off the charger when device enters SE0, J, K test mode.
BZ: 18687
usb:gadget: clear string id of rndis and acm when unbinding

Change-Id: I124dfe21f78360a8bb5c00dd4a71ef7e4ac9cbb9
Signed-off-by: Li Wenji <wenji.li@intel.com>
Reviewed-on: http://android.intel.com:8080/31623
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Zhuang, Jin Can <jin.can.zhuang@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

i386_ctp_defconfig: change to add usb host mode support for Cloverview

BZ: 19683

This patch changes the default kernel configuration file i386_ctp_defconfig
to enable usb host mode for Cloverview(support USB input devices only so far).

Change-Id: I3016f40063ca17d527168a533347453f5576f333
Signed-off-by: Bin Gao <bin.gao@intel.com>
Reviewed-on: http://android.intel.com:8080/31479
Reviewed-by: Kuppuswamy, Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Wu, Hao <hao.wu@intel.com>
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

usb: add usb host mode support for Cloverview

BZ: 19640

This patch enables usb host mode for Cloverview. Note that SRAM usage is disabled
for host mode because enabling SRAM from the driver will make usb transfer
unstable. For details, see Cloverview sighting #4375244 and #4375558.

Change-Id: Icc9995c4730b2fc0f3ccbb25a94bdc660cd67548
Signed-off-by: Bin Gao <bin.gao@intel.com>
Reviewed-on: http://android.intel.com:8080/31443
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Wu, Hao <hao.wu@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp : Add support from sensor driver to skip frames.

BZ:8545

This patch will support number of frames to skip at stream start
from sensor driver.

Change-Id: Ied0b9b13ec9d63e28b420669af164c4f39bf5dee
Signed-off-by: Bian,Guowei <guowei.bian@intel.com>
Reviewed-on: http://android.intel.com:8080/30252
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp : Add support from mt9m114 sensor driver to skip frames.

BZ:8545

This patch will support number of frames to skip at stream start
from mt9m114 sensor driver.

Change-Id: I7e724f19f51f9cb482a048d2af0da24df94d31ee
Signed-off-by: Bian,Guowei <guowei.bian@intel.com>
Reviewed-on: http://android.intel.com:8080/30245
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp : Add support from mt9e013 sensor driver to skip frames.

BZ:8545

This patch will support number of frames to skip at stream start
from mt9e013 sensor driver.

Change-Id: Ib2f324fe67ed081b84705e8269f1df7ac4d35670
Signed-off-by: Bian,Guowei <guowei.bian@intel.com>
Reviewed-on: http://android.intel.com:8080/30251
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] mid_pmu: check if pci_set_power_state called after shutdown

BZ: 17351

There might be some buggy drivers that call pci_set_power_state
even after device_shutdown() is called, this could interfere
with shutdown and cause fabric error because while shtudown
is in progress we dont issue d0ix command.

Added a BUG() to catch this kind of behaviour.

Change-Id: Id718515f288872272aaf76ca04c6c44a5083a309
Signed-off-by: Illyas Mansoor <illyas.mansoor@intel.com>
Reviewed-on: http://android.intel.com:8080/31749
Reviewed-by: Hogander, Jouni <jouni.hogander@intel.com>
Reviewed-by: Rudramuni, Vishwesh M <vishwesh.m.rudramuni@intel.com>
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

usb/android gadget: notify uplevel when function disabled via sysfs interface

BZ: 18273

Lack notification to uplevel, which cause incorrect ui in status bar.
so add this notification from driver to uplevel.

Change-Id: I766612f3f4de5124c7a8d46d668db7be24879788
Signed-off-by: Wu, Hao <hao.wu@intel.com>
Reviewed-on: http://android.intel.com:8080/31734
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Kuppuswamy, Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

hwmon: fix barometer coefficiency report missing problem

BZ: 19837

Barometer coefficiency reporting uses ABS_ input events. Linux kernel
will filter out ABS_ input events of same data. This will cause some of
coefficiency data wouldn't reach userspace. This commit removes ABS_
event reporting of coefficiency data, forcing userspace to use sysfs
interface for reliability.

Change-Id: I48c5466b03c96b845f5f1e2d3d06b41a7c96d364
Signed-off-by: Zhifeng Wang <zhifeng.wang@intel.com>
Reviewed-on: http://android.intel.com:8080/31770
Reviewed-by: Cai, Stanley W <stanley.w.cai@intel.com>
Reviewed-by: Du, Alek <alek.du@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp: hmm: Release the spin lock before unref'ing a block object

BZ: 19462

hmm_bo_device_destroy_free_bo_list held a spin lock when
unreferencing a block object. Moreover, hmm_bo_release
tries to acquire the same spin lock.

In addition, reduce the time interrupts are disabled by
changing list handling.

Change-Id: I7bbb5559f8caa8d6c696040e8ec04205e30b7c90
Signed-off-by: Ilkka Koskinen <ilkka.koskinen@intel.com>
Reviewed-on: http://android.intel.com:8080/30889
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp: hmm: Remove the buffer object from the list before cleaning it

BZ: 19462

Change-Id: I58b94cb7d824dfa154ae073e35ecbeeff1d78de9
Signed-off-by: Ilkka Koskinen <ilkka.koskinen@intel.com>
Reviewed-on: http://android.intel.com:8080/30888
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp: hmm: Replace list specific spin locks with a single one.

BZ: 19462

Change-Id: I09f0849d0188c70575ead2c7aacac3bb0361f788
Signed-off-by: Ilkka Koskinen <ilkka.koskinen@intel.com>
Reviewed-on: http://android.intel.com:8080/30887
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Tested-by: Chotard, Celine <celine.chotard@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] hsi_ffl_tty.c: using a dedicated work queue for line discipline flush work

BZ: 17676

This patch is introducing a dedicated work to prevent too big a latency on the
modem protocol driver TTY interface when used with a line discipline, such as
the n_gsm. The TTY driver implementation is relying on the system work queue
to flush what is ready to be transferred to the line discipline. But, should
this shared work queue be busy for much too long with other works, the latency
at the user land TTY interface is getting too big making the system either
less responsive or even rebooting the modem !

This patch is forcing the TTY interface to skip its internal flush work to
minimise those latencies (this is the purpose of the TTY low_latency flag).
Still, as the flush mecanism can sleep, some dedicated work queue is put in
place and the full forward TTY mechanism is managed in a work running on this
dedicated work queue (the ffl_forwarding_wq).

This patch is compatible with Linux 2.6 and Linux 3.0 and does not require the
streamlined TTY code to be changed.

Change-Id: Ibef9cd4811d2ec85dd7b05ff927fbe71730163d4
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/31030
Reviewed-by: Lucas, GuillaumeX <guillaumex.lucas@intel.com>
Reviewed-by: Pillet, VincentX <vincentx.pillet@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

usb:composite: reset next_string_id after remove configuration

BZ: 19826

next_string_id can be increase to 255 if configuration is added/removed continuously, and allocation of next_string_id will fail
if the value is 255 which means no more available string id. So reset next_string_id to 0 when configuration is removed.

Change-Id: I0c5b1a292abe33ecb320a5e1540f56c245d77ae4
Signed-off-by: jzhuan5 <jin.can.zhuang@intel.com>
Reviewed-on: http://android.intel.com:8080/31674
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Kuppuswamy, Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

bluetooth: HID profile activation

BZ: 19284

Bluetooth HIDP module is not activated in kernel configuration,
this patch enables it as a built-in module.

Change-Id: I4053f304ae66f98f3e2eddf02136bc2ec785a627
Signed-off-by: Fabien Peix <fabienx.peix@intel.com>
Reviewed-on: http://android.intel.com:8080/31048
Reviewed-by: Beldie, OvidiuX <ovidiux.beldie@intel.com>
Reviewed-by: Gros, JulienX <julienx.gros@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2]WLAN: Back ported netfilter support into the kernel

BZ: 17679 18653 17927 17650

This is a port of netfiltering support from the r2-gingerbread kernel sha1: d47dfdc1307cc6a68c1ba6d51b14f0dd3f1098dd
Wifi tethering was failing because the kernel was not supporting the netfiltering.
With this patch, the netfilering support is put it back.

Change-Id: Ia208b5dd36cee9607c8983ad2e2f11f95501f6f2
Orig-Change-Id: Ia208b5dd36cee9607c8983ad2e2f11f95501f6f2
Signed-off-by: Marco Sinigaglia <marcox.sinigaglia@intel.com>
Reviewed-on: http://android.intel.com:8080/31171
Reviewed-by: Regairaz, JulieX <juliex.regairaz@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Reviewed-by: Marotte, Fabien <fabien.marotte@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[Rebase from r2]]audio: sn95031: added GPIO support for jack detection

BZ: 19775

OLD_BZ:14181
PR3.x devices have a GPIO pin which can be used to detect high impedance
headsets.

Added GPIO support in the codec driver so that whenever an insert interrupt is
received and the micbias value is out of range, it checks the GPIO pin and
reports the jack as a HEADSET if the GPIO pin says that there is a headset.

Since PR2 devices don't have this GPIO pin, they are no longer supported.

Old-Change-Id: I493a8e2a12d6c1144a80d0845bbf73e2482a7fab

Change-Id: I94bc7a73502ce558966ad22423ca6f0f7ed00f2a
Signed-off-by: Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
Reviewed-on: http://android.intel.com:8080/31706
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[Rebase from R2]audio: mfld_machine: Added correct ignore suspend call for headphones

BZ: 19775

** Correcting the bugzilla id for R3 Merge
old-bugid :16450
A button press on the HS in S3 state lead to the headphone downlink path
being shutdown. This was due to the ignore_suspend flag not being set for the
proper widget.

Added an ignore suspend flag for the proper widget (Headphones, not HPOUTL/R).

Also, DMIC3 is not used, so disabled that pin. An unused variable
(mfld_jack_pins) is removed.

Change-Id: I3d5fa711f236e2479ec9af2908454498bee2d9fc
Signed-off-by: Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
Reviewed-on: http://android.intel.com:8080/27328
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[Rebase from R2]audio: sst: sn95031: Enable PLL and VAUDA before changing volume registers

BZ: 19775

old_BZ:18716

Due to a problem with the codec, any writes made to the *VOLCTRL registers are
not reflected until the VAUDA and clocks are turned on.

Implemented a volume control function which turns on the PLLs and the VAUDA
before changing the VOLCTRL registers. It then restores the previous state back.

While VOLCTRL registers were getting updated eventually when some actual
playback started, the values read back before playback were wrong. This fixes
that issue. Volume can now be set and read using amixer for tuning purposes.

Change-Id: I88ef9db97ce04fb52a45f70053c71a45e1f1a2a6
Old-Change-Id: I935491ad146b230e8da4c26c1fb95c32c055c569
Signed-off-by: Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
Reviewed-on: http://android.intel.com:8080/31707
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[Rebase from R2]audio: sn95031: Modified Mic1 capture volume range

BZ: 19775

Old_BZ: 17529
Mic1 Capture Volume control was set to a wrong range due to mismatch in
documentation. Setting it to the correct set of values {0, 9, 21, 30} db as per
the sn95031_v0.95c spec.

Change-Id: Iddcb0c370d1e5cb69c6092a4fe826de09e401d8f
Signed-off-by: Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
Reviewed-on: http://android.intel.com:8080/29205
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

usb:langwell_udc: fix NULL pointer in langwell_ep_dequeue

BZ: 19244

langwell_ep_dequeue calls is_in(ep) which dereferences ep->desc. But ep->desc may be set to NULL due to race condition.
Therefore, need to check ep->desc after seizing the lock again.

Change-Id: I0472fea0de1261c94877d7158ee876760c2686ce
Signed-off-by: jzhuan5 <jin.can.zhuang@intel.com>
Reviewed-on: http://android.intel.com:8080/31511
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Kuppuswamy, Sathyanarayanan <sathyanarayanan.kuppuswamy@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

config: enable FUSE

BZ: 18935

Enable FUSE fs config to support FUSE using

Change-Id: I4757ee93fe55f0b5dc2f36c3b9ac207a75712a56
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
Reviewed-on: http://android.intel.com:8080/30377
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Huang, Bo B <bo.b.huang@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

rmi4: new driver for synaptics touch controller s3202

BZ: 19819

Added RMI4 framework and driver from Synaptics that supports s3202
touch controller on CloverTrail Phone platform.

Changes made to the original driver:
1. Fixed all checkpatch & compiling errors and warnings
2. add F1a function support for key reporting, s3202 doesn't have
F19 for key reporting.

Change-Id: I1fb608a7d7d9668f1779af5f27332b42a5ecc3f9
Signed-off-by: Andriy Naborskyy <andriy.naborskyy@intel.com>
Signed-off-by: Leo Yan <leo.yan@intel.com>
Signed-off-by: Hong Liu <hong.liu@intel.com>
Reviewed-on: http://android.intel.com:8080/31120
Reviewed-by: Mai, Leonard <leonard.mai@intel.com>
Reviewed-by: Du, Alek <alek.du@intel.com>
Tested-by: Wang, Zhifeng <zhifeng.wang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] i2c: update I2C_3 clock to match settings recommended by SV

BZ: 15120

Update I2C_3 clock to match setttings recommended by SV team. This patch
is ported from R2 specifically for Cloverview support.

Change-Id: I7316caa970488a7a5661840db05ecc95c2bae2d6
Signed-of-by: Seema Pandit <seema.pandit@intel.com>
Reviewed-on: http://android.intel.com:8080/30662
Reviewed-by: Mai, Leonard <leonard.mai@intel.com>
Reviewed-by: Li, Ning <ning.li@intel.com>
Reviewed-by: Zhang, Shijie <shijie.zhang@intel.com>
Reviewed-by: Yang, Bin <bin.yang@intel.com>
Reviewed-by: Du, Alek <alek.du@intel.com>
Tested-by: Wang, Zhifeng <zhifeng.wang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

intel_mid_i2s: add cloverview probing support

BZ: 17484

Cloverview SOC use different PCI Device ID for I2S hence existing Medfield
HSI driver won't be loaded on Cloverview SOC.

This patch adds I2S probing support for Cloverview SOC.

Change-Id: Iae85eebe146059af40b9d15a94fc166a110915ca
Signed-off-by: Leonard D Mai <leonard.mai@intel.com>
Tested-by: Ojas Chauhan <ojas.chauhan@intel.com>
Reviewed-on: http://android.intel.com:8080/27472
Reviewed-by: Chauhan, Ojas <ojas.chauhan@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: Wagner, DavidX <davidx.wagner@intel.com>
Reviewed-by: De Chivre, RenaudX <renaudx.de.chivre@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Drivers: Staging: Sep: Enable driver

BZ: 16415

Change-Id: I27fec20a7bdb72f2000b5f90c0e50bad303e5f05
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Reviewed-on: http://android.intel.com:8080/26840
Reviewed-by: Mathane, Sudhir <sudhir.mathane@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Tested-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

drivers: intel_scu_watchdog: forklift from 2.6.35 in GB R2

BZ: 16539

This forklift patch is from the 2.6.35.3 kernel located in R2.
The last patch (tip) for that kernel is the following:

commit ffca23fceff1ff78ce957cd543459991f12edbfa
Author: ziyux.jiang <ziyux.jiang@intel.com>
Date: Wed Nov 30 22:30:53 2011 +0800

Change-Id: I9bfafa8f0de5d0e1961223133c6821d9df27b6e7
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Reviewed-on: http://android.intel.com:8080/26829
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Tested-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

drivers: staging: sep: add detection of cloverview

BZ: 17588

Change-Id: I9ec5758b3ff3030dbba580a65fa8dd468dd1fe90
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Reviewed-on: http://android.intel.com:8080/27847
Reviewed-by: Mai, Leonard <leonard.mai@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Tested-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

drivers: staging: sep: fix dma area size

BZ: 17708

Change-Id: I16e12e0c7663cc11974b456badefe59edec329ed
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Reviewed-on: http://android.intel.com:8080/27846
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Tested-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

drivers: staging: sep: forklift from 2.6.35 tree in GB r2

BZ: 16407

This forklift patch is from the 2.6.35.3 kernel located in R2.
The last patch (tip) for that kernel is the following:

commit ffca23fceff1ff78ce957cd543459991f12edbfa
Author: ziyux.jiang <ziyux.jiang@intel.com>
Date: Wed Nov 30 22:30:53 2011 +0800

Change-Id: I3719a91b0c47daf7eb0f7ed988052a72d2cd8745
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Reviewed-on: http://android.intel.com:8080/26825
Reviewed-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Tested-by: Mangalampalli, Jayant <jayant.mangalampalli@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] mid_pmu: remove sysfs interface (and create kernel interface) used to stop PM for IFWI update.

BZ: 19383

This patch create a kernel interface pmu_set_devices_in_d0i0() to
set all the south complex devices in D0i0 state and any further request
to set any south complex device in some other low power state will
be ignored. And this patch removes sysfs interface to do the same functionality.

Change-Id: I04429659ef6932eb91f3c6f80f7c25b69b885fd5
Signed-off-by: Dyut Kumar Sil <dyut.k.sil@intel.com>
Signed-off-by: Illyas Mansoor <illyas.mansoor@intel.com>
Reviewed-on: http://android.intel.com:8080/31149
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

USB: gadget: Add association descriptor for windows

BZ: 19004

This patch adds USB association descriptor supporting Android
ACM in windows. The descriptor presents itself as "CDC Serial"
device to PC in order to match the proper driver in windows.

Change-Id: I05a4cee6023fe10375b367e1beafd78214c5e9f3
Signed-off-by: Liu, DongxingX <dongxingx.liu@intel.com>
Reviewed-on: http://android.intel.com:8080/31150
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Alagnou, GregoryX <gregoryx.alagnou@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[Rebase from R2-R3]audio: Added addtional error handling in SST driver

BZ: 19267

Old R2 BZ 18108
This patch has the following error handling added
In case of open failure, the system will go to suspend immediately instead
of 2s delay.
Added error handling to check if firmware is in running state before
sending any request to FW.

Change-Id: Ia7990472b83596dcc7ab9d7fc9c3f8cf280912f8
Old-Change-Id: I292d2086a6564f47733de485f1ada8116e8f10bf
Signed-off-by: Jeeja Kp <jeeja.kp@intel.com>
Reviewed-on: http://android.intel.com:8080/31052
Reviewed-by: M, Arulselvan <arulselvan.m@intel.com>
Tested-by: M, Arulselvan <arulselvan.m@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] [AUDIO] worker thread not canceled on close function call

BZ: 18531

ALSA SSP driver: when open is called, it initiates a worker thread
to perform the DMA configuration. (It cannot be done atomically).

If a write is called, followed by a closed before the worker thread
had time to run, once the worker thread will run, SSP will complain
that no handle is present...

The purpose of this patch is to cancel synchronously the work
during a close of the driver.

Change-Id: I1053225d4a5aff4a11c683c6250da6e70b229eba
Old-Change-Id: I8f3569a1809919a3d70b5e838f9a9bb869d87868
Signed-off-by: Francois Gaffie <francoisx.gaffie@intel.com>
Reviewed-on: http://android.intel.com:8080/31024
Reviewed-by: Barthes, FabienX <fabienx.barthes@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

ltr502als.c: Increase the sample integration circle of proximity sensor

BZ: 18196

During voice call display may go off by an accidental swipe. To avoid
that, we increase the sample intergration circle of proximity sensor.
After this change, it will take more time to trigger proximity interrupt
than before.

Change-Id: Id6fe644a9daf610de31398b2485914c43b7600d9
Signed-off-by: Leo Yan <leo.yan@intel.com>
Reviewed-on: http://android.intel.com:8080/29996
Reviewed-by: Liu, Hong <hong.liu@intel.com>
Reviewed-by: Du, Alek <alek.du@intel.com>
Tested-by: Wang, Zhifeng <zhifeng.wang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

ltr502als.c: Modify the way of ALS first data reporting

BZ: 17876 18551

1. Previously, when ALS is enabled, it will report zero before the first
interrupt occurs, this may cause incorrect behavior of LED light. Now
ALS doesn't report any data until the first interrupt occurs.
2. In order to speed up the interrupt triggering, ADC sample integration
circle of ALS is changed to 1.

Signed-off-by: Leo Yan <leo.yan@intel.com>
Change-Id: I25a2d16e9db09cc44a299b127feff8a3f53d4430
Reviewed-on: http://android.intel.com:8080/29959
Reviewed-by: Yan, Leo <leo.yan@intel.com>
Reviewed-by: Liu, Hong <hong.liu@intel.com>
Reviewed-by: Du, Alek <alek.du@intel.com>
Tested-by: Wang, Zhifeng <zhifeng.wang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2]mid_pmu: provide api to set lss01 to d0i0 in atomic context

BZ: 9458

During panic we disable pre-emption but we require eMMC0
ie., LSS01 to be in D0i0 in order to store panic logs,
but pmu_pci_set_power_state might_sleep hence we cannot use
it for this purpose.

Hence we provide a exclusive api for LSS01 to be put in D0i0.

Change-Id: Ib55a9f8b61da735e76524e84d9ecd9b2a6a6493b
Signed-off-by: Illyas Mansoor <illyas.mansoor@intel.com>
Reviewed-on: http://android.intel.com:8080/30285
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] mid_pmu: fix klockwork issues

BZ: 18375

This patch fixes following klockwork issues:

function 'strncpy' may incorrectly check buffer
boundaries and may overflow buffer 'valcp' of fixed size (5)
linux-2.6/arch/x86/platform/mfld/pmu.c:491 | set_extended_cstate_mode()

function 'strncpy' may incorrectly check buffer
boundaries and may overflow buffer 'valcp' of fixed size (4)
linux-2.6/arch/x86/platform/mfld/pmu.c:578 | set_pmu_driver_status()

Change-Id: Icead563c02b57b122a676c490e8cf134928595a3
Orig-Change-Id: I41a62d195a5155fafde5320fe014bd0bf123514c
Signed-off-by: Sudarshan Ramachandra <sudarshan.n.ramachandra@intel.com>
Reviewed-on: http://android.intel.com:8080/30277
Reviewed-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

mfd: limit dma rx timeout timer to Penwell A0

BZ: 18274

Cloverview SOC has the fix for DMA RX (seen on Penwell A0) hence DMA RX
timeout timer is not needed. On Penwell B0/C0/D0/D1 stepping, x86_mask
value is greater than 0 hence DMA RX timeout timer is never activated during
runtime. However, on Cloverview A0, x86_mask is again reset to 0 hence DMA RX
timeout timer is activated although it's not needed.

This patch added to ensure DMA RX timeout timer is only enabled for Penwell A0.

Change-Id: I512dcba46db86c27d62c1492080088571ffa8211
Signed-off-by: Leonard Mai <leonard.mai@intel.com>
Reviewed-on: http://android.intel.com:8080/29773
Reviewed-by: Du, Alek <alek.du@intel.com>
Reviewed-by: Renganathan, Prabu <prabu.renganathan@intel.com>
Reviewed-by: Wang, Dong D <dong.d.wang@intel.com>
Tested-by: Wang, Zhifeng <zhifeng.wang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] atomisp: Sh3a: optimize DVS run time by copying statistics at once.

BZ: 18955

Change of DVS-Library according to layout change of the DVS statistics.
By the layout change, the number of times of a call of hmm_load() reduces.(12calls -> 2call per frame)

There are the following corrections on the whole.

libmfldadvci:
  3A/src/Sh3a/Custom/Wrap_3AIF.c
  3A/src/Sh3a/Dis/AlDisP.c

atomisp:
  drivers/media/video/atomisp/css/sh_css_binary.c

Change-Id: I9315e53ef7bc18172671ba28b117ec51fb13a52b
Orig-Change-Id: Ibedfb72486dc379469ee366d2651514953ad2d84
Signed-off-by: kunimitsu suzuki <kunimitsu.suzuki@intel.com>
Reviewed-on: http://android.intel.com:8080/29933
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/30512
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>

[PORT FROM R2] Camera: The phone is very slow to wake up if press PWR key during camera postview

BZ: 18955

The phone is very slow to wake up if press PWR key during camera postview

sys_sync option has a race condition with the late_resume_work.

Using wakeup_flusher_threads(0) to replace sys_sync.
since wakeup_flusher_threads(0) won't block the resume option.
Signed-off-by: Xiaobing Tu <xiaobing.tu@intel.com>
Change-Id: I4bbe017a65f56afbc058b28c8cce8db4512e4907
Orig-Change-Id: Id33abbf7eda4167b17ace16309fca530d3815f70
Reviewed-on: http://android.intel.com:8080/29663
Reviewed-by: Zhang, Yanmin <yanmin.zhang@intel.com>
Reviewed-by: Tu, Xiaobing <xiaobing.tu@intel.com>
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: Hogander, Jouni <jouni.hogander@intel.com>
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/30511
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>

Graphics-PVR: PVR DDK 1.8 RC drop (ED 1.8.789263)

BZ: 18614

Change-Id: Icd4dfbb759fcb0c0ebf2945b3a34de133972e91c
Signed-off-by: John Ye <john.ye@intel.com>
Signed-off-by: Tong, Bo <box.tong@intel.com>
Reviewed-on: http://android.intel.com:8080/30137
Reviewed-by: Hu, Austin <austin.hu@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

battery : Avoid changing Battery health if its already DEAD.

BZ: 15259

With this patch the battery health is changed to GOOD only after checking
If presently it is not DEAD.

Change-Id: I1f36573f571bbdcefff35fdadc6ae3da0a0be0c9
[Rebased to R3]Change---Id: I5d6d762d4ef28b07f06585ae98f36f639e21f6e8
Signed-off-by: yashodhan kurtadkar <yashodhan.kurtadkar@intel.com>
Signed-off-by: santosh <santoshx.gugwad@intel.com>
Reviewed-on: http://android.intel.com:8080/30384
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Battery: report charger fault as false for IPC errors

BZ: 14480

For IPC errors we report charger fault as false. handle_ipc_rw_status
function will handle the IPC errors

Change-Id: Id782bb10e99487651f15fb3c5d06f66da117cca0
[Rebased to R3]Change---Id: I7dec2255b8bf86e048bb65922600e1f6a58c7945
Signed-off-by: Jenny TC <jenny.tc@intel.com>
Signed-off-by: santosh <santoshx.gugwad@intel.com>
Reviewed-on: http://android.intel.com:8080/30382
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Revert "mid_pmu: fixing mismatch between ITP and OS PM_SSC configuration"

BZ: 10727

This reverts commit bc7b53aa1dcf178e7f2f5909a2f9e99746b8410a
This reverts patch 27756

Change-Id: Ie4198ab92f820db03e291e09d25fb6f00ac0f1c5
Reviewed-on: http://android.intel.com:8080/30576
Reviewed-by: Chotard, Celine <celine.chotard@intel.com>
Tested-by: Chotard, Celine <celine.chotard@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] EM/BCU: Fix Sysburst behaviour in driver's suspend/resume path

BZ: 18257

The intel_mid_ocd driver disables only the SYSACTEN bit during suspend.
But the SYSOUTEN signal can still be triggered by GSMPULSE (due to
hardware logic design). This patch corrects this behaviour by disabling
both the SYSACTEN and SYSOUTEN bits during suspend and programs these
bits according to battery_level during resume.

Change-Id: I6706fad725bddb299b36b61168c86cb82ce20deb
Signed-off-by: Durgadoss R <durgadoss.r@intel.com>
Reviewed-on: http://android.intel.com:8080/30339
Reviewed-by: Lebouc, Christophe <christophe.lebouc@intel.com>
Reviewed-by: Chotard, Celine <celine.chotard@intel.com>
Tested-by: Chotard, Celine <celine.chotard@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

i386_mfld_defconfig: add CONFIG_LOCALVERSION_AUTO

BZ: 18603

Add scm_version to the local version (information from git):
Automatically append version information to the version string

Change-Id: I0da48ce46a61c7ff330201409f4515e69332c573
Signed-off-by: Loic Martin <loicx.martin@intel.com>
Reviewed-on: http://android.intel.com:8080/30113
Reviewed-by: Hogander, Jouni <jouni.hogander@intel.com>
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp: hmm_vm: add gap between vm areas

BZ: 18074

During buffer overflow, gaps between vm areas may help to trigger
visible bug instead of having hidden data corruption.

Change-Id: I8ac51d99efe68338c73c79b78bc5d48b96126399
Signed-off-by: David Cohen <david.a.cohen@intel.com>
Reviewed-on: http://android.intel.com:8080/30295
Reviewed-by: Koskinen, Ilkka <ilkka.koskinen@intel.com>
Reviewed-by: Tuominen, TeemuX <teemux.tuominen@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp: hmm_vm: use slab to allocate hmm vm nodes

BZ: 18074

Slab is more efficient than kmalloc() to allocate same struct many
times.

Change-Id: I590375ae7f5235f4b4e4fac379064d3e95f047c7
Signed-off-by: David Cohen <david.a.cohen@intel.com>
Reviewed-on: http://android.intel.com:8080/29504
Reviewed-by: Koskinen, Ilkka <ilkka.koskinen@intel.com>
Reviewed-by: Tuominen, TeemuX <teemux.tuominen@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp: hmm_vm: misc cleanups

BZ: 18074

This patch applies misc cleanups on hmm vm layer.

Change-Id: Ic9c6784b1a2069381866b7faa8ce51f6319d4e5c
Signed-off-by: David Cohen <david.a.cohen@intel.com>
Reviewed-on: http://android.intel.com:8080/29503
Reviewed-by: Koskinen, Ilkka <ilkka.koskinen@intel.com>
Reviewed-by: Tuominen, TeemuX <teemux.tuominen@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

atomisp: eliminate spin_bugs

BZ: 18737

This patch eliminates spin_bug issue with the watchdog/timer by moving the
setup_timer to line before atomisp_msi_irq_init. While this spin_bug was
passed, the driver revealed few another through atomisp_buf_done.

This patch also adds the missing spinlock initializations to pipe's
irq_locks within atomisp_sub_device structure.

Change-Id: Iba9e24aa1e755d40b956166220c392bafebfea9b
Signed-off-by: Teemu Tuominen <teemux.tuominen@intel.com>
Reviewed-on: http://android.intel.com:8080/30229
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Video: port R2 kernel driver to R3/ICS

BZ: 18528

Change include a page counter fix for gallery exit slow issue.

Change-Id: Ia654ab3ba09eef52e10e5fa40499a122bc2775bb
Reviewed-on: http://android.intel.com:8080/30192
Reviewed-by: Jiang, Fei <fei.jiang@intel.com>
Reviewed-by: Ding, Haitao <haitao.ding@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

Video: port R2 kernel driver to R3/ICS

BZ: 18528

The porting changes some files in drv/ directory

Change-Id: I709e50c9d8f3d52d1f65ce8b00ad78a21d7afe17
Signed-off-by: Li, Ruigang <ruigangx.li@intel.com>
Reviewed-on: http://android.intel.com:8080/30017
Reviewed-by: Ding, Haitao <haitao.ding@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

usb:mtp: let mtp handle control request

BZ: 18203

Revert patch Change Ia68a3c08: usb:f_mtp: set interface class subclass protocol of mtp as STILL IMAGE

Delegate non-standard request to composite driver and add mtp_handle_setup function to mtp gadget to
handle control request.

Change-Id: I82c9d64363e15473cb06d14448744d6583f6081d
Signed-off-by: jzhuan5 <jin.can.zhuang@intel.com>
Reviewed-on: http://android.intel.com:8080/30147
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Wu, Hao <hao.wu@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] pn544: Adding suspend to ram support.

BZ: 11182

To be able to suspend the pn544, the driver shall guarantee that the
suspend process doesn't occurs within a read cycle. For this purpose,
a read wake lock is held when reading the first byte and released
when reading the requested data.

PN544 interrupt shall wake up the platform from suspend to ram. For
this, the interrupt shall be IRQ wake capable and shall be disabled
on PM_SUSPEND_PREPARE. This is mondatory to avoid loosing interrupts
during the suspend to ram.

Note that suspend process starts by freezing the user space tasks, so
the reader thread will be signaled and wait_event_interruptible will
return -ERESTARTSYS. The upper layer shall handle such situation by
triggering the read process again.

Change-Id: I56b60ce6e7ad5f1c45c2986972219477671245bd
Signed-off-by: Aymen Zayet <aymenx.zayet@intel.com>
Reviewed-on: http://android.intel.com:8080/29255
Reviewed-by: Wahid, KenX <kenx.wahid@intel.com>
Reviewed-by: Rebraca, DejanX <dejanx.rebraca@intel.com>
Reviewed-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Tested-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] ti-st: Implements shared transport inactivity timeout to prevent going
into S3 when incoming data is to be handled.

BZ: 13356 17106

Refreshes a wake lock every time a complete frame is :
- received from HSU and will be passed to upper proto layers (BT, FM, GPS)
- being sent to HSU

Change-Id: Ie2e777f7046ef7657606253ce9b6df3411380068
Orig-Change-Id: Ifca587550365511c29540cd220d404a0f0789851
Signed-off-by: Julien Gros <julienx.gros@intel.com>
Reviewed-on: http://android.intel.com:8080/29332
Reviewed-by: Beldie, OvidiuX <ovidiux.beldie@intel.com>
Reviewed-by: Peix, FabienX <fabienx.peix@intel.com>
Reviewed-by: Tardy, Pierre <pierre.tardy@intel.com>
Tested-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] io_apic: set_wake callback implemented

BZ: 5075

Ported from R2 branch with the original description below :
In drivers/rtc/rtc-mrst.c:
mrst_suspend()->enable_irq_wake()->set_irq_wake()->set_irq_wake_real()->checks
desc->chip->set_wake callback
desc->chip->set_wake callback is not defined hence desc->wake_depth is set to
.0. and hence the WARN in set_irq_wake()

set_wake call needs to be implemented for X86_MRST so that we dont get the
WARN.

Change-Id: I61c85935c076e1daf07331e9ed0526cabf084264
Signed-off-by: Aymen Zayet <aymenx.zayet@intel.com>
Reviewed-on: http://android.intel.com:8080/27815
Reviewed-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Tested-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] io_apic: mask the irq when disabling irq

BZ: 3216

Ported from R2 branch with the following description:
  disable_irq() and enable_irq() require disable() and enable()
  callbacks to be registered at the interrupt controller level.
  Since the interrupt should be kept in pending on disable_irq(),
  mask_IO_APIC_irq() and unmask_IO_APIC_irq() should be used.

  Change-Id: I862a4e4e17ab15f585bbf1126c0e56d8fa9b2869
Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Change-Id: I5f7e8728efefd0557fa72b5d2d89cba5ee9574ae
Signed-off-by: Aymen Zayet <aymenx.zayet@intel.com>
Reviewed-on: http://android.intel.com:8080/27813
Reviewed-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Tested-by: Champciaux, NicolasX <nicolasx.champciaux@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[PORT FROM R2] atomisp: CSS/FW release from Synergy BL of 19Dec2011

BZ: 18656

This release does not fix any bugs as per the Bugzilla
database, but provides some enhancements to the Acceleration
API.

Change-Id: Ie4d4abb4fdab83b64b6da559fc54ecad189ffe93
Orig-Change-Id: I988b6882040d9ddce7e34b23c9786b3b6a429427
Signed-off-by: Lokesh Gupta <lokesh.gupta@intel.com>
Reviewed-on: http://android.intel.com:8080/29651
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/30162
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>

intel_mid_osip: Add intel_mid_osip module, to implement the feature of switch between android and recovery OS.

BZ: 18283

Change-Id: I1ab9de767e5f252daa7e4a4427284d05d624c160
Signed-off-by: lwan89x <liangx.wang@intel.com>
Reviewed-on: http://android.intel.com:8080/29778
Reviewed-by: Gugwad, SantoshX <santoshx.gugwad@intel.com>
Tested-by: Gugwad, SantoshX <santoshx.gugwad@intel.com>
Reviewed-by: Jena, TapanX <tapanx.jena@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

mid_pmu: fixing mismatch between ITP and OS PM_SSC configuration

BZ: 10727

There is a mismatch between PM_SSC configuration of OS and ITP,
the details of which is provided in the above BZ. This patch fixes
the mismatch issue.

Change-Id: I203cda68d6dc5d0de9903ef9df5d1a9a967cb710
Signed-off-by: Sudarshan Ramachandra <sudarshan.n.ramachandra@intel.com>
Reviewed-on: http://android.intel.com:8080/27756
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[port R2 to R3]: merge fabric error from R2 to R3

BZ: 18204

Change-Id: I1326e89887a1e02d32e96d2a6fe7bef8ecf4fef5
Signed-off-by: jzha144 <jun.zhang@intel.com>
Reviewed-on: http://android.intel.com:8080/29707
Reviewed-by: Zhang, Dongxing <dongxing.zhang@intel.com>
Tested-by: Zhang, Dongxing <dongxing.zhang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

mmc: core: implemented RPMB partition support

BZ: 18193

eMMC card has RPMB partition, which is used for user to store some security
data. Right now Chabbi will use this partition and need MMC driver to support
this.

This patch implements the RPMB support from driver level

Change-Id: I04c0a3aed3adb99205eb3ec61ce6e24a78d4d908
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
Reviewed-on: http://android.intel.com:8080/29703
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

[INTEL MID I2S] Add 'No DMA use' mode to I2S driver

BZ: 17567

Implement I2S processing using CPU data transfer instead of DMA data transfer.
This mode will be useful for testing I2S functionality on new platforms where DMA functionnality is not ready or available.
Same patch as 46b80ccdcdadbcfb49f0ce9771e9c8f229e697d2 (BZ 12811) for R3-IceCreamSandwich.

Change-Id: Ib3eacf736570dcd9ea551817f32936406857a431
Signed-off-by: Renaud de Chivre <renaudx.de.chivre@intel.com>
Reviewed-on: http://android.intel.com:8080/27631
Reviewed-by: Wagner, DavidX <davidx.wagner@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>