Commit Graph

638721 Commits

Author SHA1 Message Date
Victor Wan
fee5e90ff7 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-05-18 14:52:37 +08:00
Nan Li
75a88ba14c sdio: add sdio driver support on m8b
PD#141217: add sdio dirver support on m8b
ultra high speed SDR104 85M

test on m8b_m200.

Change-Id: I1aea3a8d77039be92e1759cb06eac96ed2915524
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-05-16 00:43:56 -07:00
Tao Zeng
940abdab8c mm: change secmon reserved memory to CMA
PD#143278: change secmon reserved memory to CMA

Change-Id: Ia09a9a1b578f1a10e81d9431f829c723c68811d9
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-14 19:26:17 -07:00
Nanxin Qin
98454da295 video_sink: codec_mm: update video keeper from amlogic-3.14-dev
PD#142538: merge code form 49c80e32 in the amlogic-3.14-dev
fixed the issue of blurred screen when playback 4k H264 after seek end.

Change-Id: Ic276dac8472fef086628aa28ded8748a7378d26a
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-05-12 03:45:09 -07:00
liang.zhao
03f5728e7a dts: enable i2c_ao for expand gpio
PD#138714: enable i2c_ao for expand gpio

1.change dts open i2c_ao
2.change meson64_defconfig

Change-Id: Ifc5d035aefc02af132c1423f1182069c14d791dc
Signed-off-by: Liang Zhao <liang.zhao@amlogic.com>
2017-05-12 01:59:32 -07:00
Tao Zeng
496e4a5714 mm: avoid PFN busy when cma allocate
PD#144028: mm: avoid PFN busy when cma allocate

1. add cma_suitable function to check if GFP flags are
   suitable for fallback of CMA.
2. cma page free should be relink to migrate type of CMA
   freelist, not to MOVABLE freelist.
3. for block dev page cache, add GPF_BDEV flag to avoid
   it using CMA.
4. use CONFIG_AMLOGIC_MODIFY to wrap AMLOGIC modified kernel
   code.

Change-Id: I09daf9d7e3e62086e7b13654667e2db692f7ca08
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-12 16:51:58 +08:00
Jian Hu
064c428a2b pwm: fix pwm channel id definition for txlx
PD#143838: fix pwm channel id definition for txlx

For txlx previously, it may cause double channel pwm request failed.

Change-Id: I9787c4d79898edff88f4b27bc5fb5ff922f4faee
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
2017-05-11 23:40:54 -07:00
Xing Wang
a33fcadc70 audio: add tas5707 codec driver
PD#144051: audio: add codec driver

Change-Id: I2290cf5684e0a22e7dd8aede9aa4f67570d39860
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-05-11 22:20:46 -07:00
Pengcheng Chen
262832b709 osd: add hw cursor support in osd
PD#138714: osd: add hw cursor support in osd

Change-Id: I88ba3530cdc605ae5a0f0f31b21578b588c04ff1
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-11 19:26:05 -07:00
Pengcheng Chen
0d8442c0b1 osd: risk of sleep in atomic
PD#143300: risk of sleep in atomic

spinlock_irq_save call block_notifier_call_chain caused sleep

Change-Id: I2f11d06681ab0b2322f7c38572dadfb732be343b
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-11 03:31:40 -07:00
Yun Cai
e6e44aa7d7 clk: m8b cpu_clk support more rates
PD#141217: m8b cpu_clk support more rates

Change-Id: I6ac361cd5e30fa3b51e2e58633952971d6e78206
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-11 17:34:00 +08:00
Xing Wang
4994780b8f audio: fix pcm clock fmt for master mode
PD#141217: fix pcm clock format

Change-Id: I14a0a6cafddffe515dce44e79c6506c288cdb156
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-05-11 01:28:30 -07:00
Pengcheng Chen
57e8e34df1 media: update some config info
PD#138714 media: update some config info

Change-Id: I1aca777f405de64163db14394ab36140d39da6f7
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-10 23:05:22 -07:00
Evoke Zhang
a456d2e663 vpu: optimize vpu_clkb gate control
PD#138714: vpu: optimize vpu_clkb gate control

Change-Id: Icf468db8218893de6c6ec0079d65d19279032281
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-05-10 22:50:18 -07:00
Lorenzo Colitti
f117eaf0a3 ANDROID: make PF_KEY SHA256 use RFC-compliant truncation.
When using the PF_KEY interface, SHA-256 hashes are hardcoded to
use 96-bit truncation. This is a violation of RFC4868, which
specifies 128-bit truncation, but will not be fixed upstream due
to backwards compatibility concerns and because the PF_KEY
interface is deprecated in favour of netlink XFRM (which allows
the app to specify an arbitrary truncation length).

Change the hardcoded truncation length from 96 to 128 so that
PF_KEY apps such as racoon will work with standards-compliant VPN
servers.

Bug: 34114242
Change-Id: Ie46bff4b6358f18117d0be241171d677d31d33f7
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
2017-05-11 03:10:45 +00:00
Gao Xiang
13fb093578 ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach
According to the following commits,
fs: icache RCU free inodes
vfs: fix the stupidity with i_dentry in inode destructors

sdcardfs_destroy_inode should be fixed for the fast path safety.

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Change-Id: I84f43c599209d23737c7e28b499dd121cb43636d
2017-05-11 00:07:16 +00:00
Tao Zeng
2e9d45599c mm: clear reserved memory for ION
PD#143278: clear reserved memory for ION

Change-Id: Ie1acf50f5fdd49b0b8ad7ca493d986b161d959cc
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-05-10 02:15:21 -07:00
Yun Cai
64f2468de3 clk: fix m8b cpu_clk issue
PD#141217: cpu hang on while changing rate from 96M to 960M

Change-Id: Ib648cc22fdcbd490103ba3afab8d861a4c33a7e0
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-10 13:22:38 +08:00
Jiamin Ma
02e109ace9 dts: remove pstore node temporarily
PD#138714: remove pstore node temporarily.


Change-Id: I7d46d3eba758d1b7137876cc0a8b9d8c245b1f7a
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-05-09 20:10:26 -07:00
Yun Cai
4e2e3d7c40 dts: add meson8b_skt.dts
PD#141217: add meson8b_skt.dts

Change-Id: Ib523fee8e76d8f386f7c74552441d241f5a19d64
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
2017-05-09 19:59:45 -07:00
Zan Peng
b436da0fec remote: optimizing remote driver for android
PD#138714: optimizing remote driver for android

1. remove unnecessary key that set into keybit

Change-Id: Id553d3f243ed30da923c0431fd220acc16528660
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
2017-05-09 19:55:12 -07:00
Yizhou Jiang
93a069a4d0 eth: fix ethernet function failure
PD#143005: eth failed when suspend/resume

Change-Id: I119469b295f2f588a5f5952fbae3d6ececb082cc
Signed-off-by: Yizhou Jiang <yizhou.jiang@amlogic.com>
2017-05-09 19:43:30 -07:00
Nanxin Qin
882c510212 dts: gxl/gxm: give up the reserved memory in the media drivers
PD#143278: the memory allocation through the CMA

Change-Id: Ife7c9ebb02ae71aea19c2d0fb8180e2df9f96e0d
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-05-09 19:11:00 -07:00
Qi Duan
8fae043a76 usb: usb gadget setting [1/1]
PD#138714: usb gadget setting
1.add rndis gadget for meson32 config
2.adjust dwc_otg_driver fifo for gadget
3.fix dwc_dma_free warning
4.dts: set otg switch for board q200,p400,p401
Change-Id: I29bba52bac85cecacf1e13c7cddbe5e280157fa2
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-05-09 18:49:26 -07:00
Qiufang Dai
cf38651638 defconfig: meson64: enable update meson64_defconfig
PD#143930: PM / sleep: update meson64_defconfig for pm/sleep

Change-Id: Ia53f8327e61cc460e47754eb0de3541901408653
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2017-05-09 18:37:44 -07:00
Steve Muckle
3e5807cff7 ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG
There are currently a couple different implementations for this
functionality. Until things are unified, remove the requirement
for this kernel config.

Bug: 37749708
Change-Id: I51cf883fd737412b0b9d3a1e570f92d9aa887f86
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-05-09 18:29:26 -07:00
Daniel Roseberg
0df2f98282 ANDROID: sdcardfs: Don't iput if we didn't igrab
If we fail to get top, top is either NULL, or igrab found
that we're in the process of freeing that inode, and did
not grab it. Either way, we didn't grab it, and have no
business putting it.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 38117720
Change-Id: Ie2f587483b9abb5144263156a443e89bc69b767b
2017-05-09 16:02:03 -07:00
Daniel Rosenberg
6bf837d910 ANDROID: sdcardfs: Call lower fs's revalidate
We should be calling the lower filesystem's revalidate
inside of sdcardfs's revalidate, as wrapfs does.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 35766959
Change-Id: I939d1c4192fafc1e21678aeab43fe3d588b8e2f4
2017-05-09 15:59:07 -07:00
Daniel Rosenberg
f9209e981a ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges
When setting up the ownership of files on the lower filesystem,
ensure that these values are in reasonable ranges for apps. If
they aren't, default to AID_MEDIA_RW

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 37516160
Change-Id: I0bec76a61ac72aff0b993ab1ad04be8382178a00
2017-05-09 15:59:07 -07:00
Daniel Rosenberg
4131f8ccf7 ANDROID: sdcardfs: Copy meta-data from lower inode
From wrapfs commit 3ee9b365e38c ("Wrapfs: properly copy meta-data after
AIO operations from lower inode")

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 35766959
Change-Id: I9a789222e27a17b8d85ce61c45397d1839f9a675
2017-05-09 15:59:07 -07:00
Daniel Rosenberg
579687073d Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs""
This reverts commit ffa75fdb9c408f49b9622b6d55752ed99ff61488.

Turns out we just needed the right hash.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 37231161
Change-Id: I6a6de7f7df99ad42b20fa062913b219f64020c31
2017-05-09 15:59:07 -07:00
Daniel Rosenberg
cac7ba9118 ANDROID: sdcardfs: Use filesystem specific hash
We weren't accounting for FS specific hash functions,
causing us to miss negative dentries for any FS that
had one.

Similar to a patch from esdfs
commit 75bd25a9476d ("esdfs: support lower's own hash")

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Change-Id: I32d1ba304d728e0ca2648cacfb4c2e441ae63608
2017-05-09 15:59:07 -07:00
Chenbo Feng
875e52672d ANDROID: Add untag hacks to inet_release function
To prevent protential risk of memory leak caused by closing socket with
out untag it from qtaguid module, the qtaguid module now do not hold any
socket file reference count. Instead, it will increase the sk_refcnt of
the sk struct to prevent a reuse of the socket pointer.  And when a socket
is released. It will delete the tag if the socket is previously tagged so
no more resources is held by xt_qtaguid moudle. A flag is added to the untag
process to prevent possible kernel crash caused by fail to delete
corresponding socket_tag_entry list.
Bug: 36374484
Test: compile and run test under system/extra/test/iptables,
      run cts -m CtsNetTestCases -t android.net.cts.SocketRefCntTest

Signed-off-by: Chenbo Feng <fengc@google.com>
Change-Id: Iea7c3bf0c59b9774a5114af905b2405f6bc9ee52
2017-05-09 03:03:11 +00:00
Greg Kroah-Hartman
95c782ac1d Merge 4.9.27 into android-4.9
Changes in 4.9.27:
	timerfd: Protect the might cancel mechanism proper
	Handle mismatched open calls
	tpm_tis: use default timeout value if chip reports it as zero
	scsi: storvsc: Workaround for virtual DVD SCSI version
	hwmon: (it87) Avoid registering the same chip on both SIO addresses
	8250_pci: Fix potential use-after-free in error path
	ceph: try getting buffer capability for readahead/fadvise
	cpu/hotplug: Serialize callback invocations proper
	dm ioctl: prevent stack leak in dm ioctl call
	Linux 4.9.27

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-05-08 09:56:55 +02:00
Pengcheng Chen
2053b82865 PD#143509: osd_rdma: used pre-alloc memory instead kzalloc in osd_rdma_irq
Change-Id: I96516094aefe3bb78d6e5f891657d1e7ac55e632
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-05-08 15:14:49 +08:00
Greg Kroah-Hartman
89f3b8d5f2 Linux 4.9.27 2017-05-08 07:48:32 +02:00
Adrian Salido
a0d50c80a2 dm ioctl: prevent stack leak in dm ioctl call
commit 4617f564c0 upstream.

When calling a dm ioctl that doesn't process any data
(IOCTL_FLAGS_NO_PARAMS), the contents of the data field in struct
dm_ioctl are left initialized.  Current code is incorrectly extending
the size of data copied back to user, causing the contents of kernel
stack to be leaked to user.  Fix by only copying contents before data
and allow the functions processing the ioctl to override.

Signed-off-by: Adrian Salido <salidoa@google.com>
Reviewed-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Sebastian Andrzej Siewior
7ad6de43de cpu/hotplug: Serialize callback invocations proper
commit dc434e056f upstream.

The setup/remove_state/instance() functions in the hotplug core code are
serialized against concurrent CPU hotplug, but unfortunately not serialized
against themself.

As a consequence a concurrent invocation of these function results in
corruption of the callback machinery because two instances try to invoke
callbacks on remote cpus at the same time. This results in missing callback
invocations and initiator threads waiting forever on the completion.

The obvious solution to replace get_cpu_online() with cpu_hotplug_begin()
is not possible because at least one callsite calls into these functions
from a get_online_cpu() locked region.

Extend the protection scope of the cpuhp_state_mutex from solely protecting
the state arrays to cover the callback invocation machinery as well.

Fixes: 5b7aa87e04 ("cpu/hotplug: Implement setup/removal interface")
Reported-and-tested-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: hpa@zytor.com
Cc: mingo@kernel.org
Cc: akpm@linux-foundation.org
Cc: torvalds@linux-foundation.org
Link: http://lkml.kernel.org/r/20170314150645.g4tdyoszlcbajmna@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Yan, Zheng
e99b0ea393 ceph: try getting buffer capability for readahead/fadvise
commit 2b1ac852eb upstream.

For readahead/fadvise cases, caller of ceph_readpages does not
hold buffer capability. Pages can be added to page cache while
there is no buffer capability. This can cause data integrity
issue.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Gabriel Krisman Bertazi
1bf9bc4813 8250_pci: Fix potential use-after-free in error path
commit c130b666a9 upstream.

Commit f209fa03fc ("serial: 8250_pci: Detach low-level driver during
PCI error recovery") introduces a potential use-after-free in case the
pciserial_init_ports call in serial8250_io_resume fails, which may
happen if a memory allocation fails or if the .init quirk failed for
whatever reason).  If this happen, further pci_get_drvdata will return a
pointer to freed memory.

This patch reworks the PCI recovery resume hook to restore the old priv
structure in this case, which should be ok, since the ports were already
detached. Such error during recovery causes us to give up on the
recovery.

Fixes: f209fa03fc ("serial: 8250_pci: Detach low-level driver during PCI error recovery")
Reported-by: Michal Suchanek <msuchanek@suse.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Guenter Roeck
3fbd2ba1da hwmon: (it87) Avoid registering the same chip on both SIO addresses
commit 8358378b22 upstream.

IT8705F is known to respond on both SIO addresses. Registering it twice
may result in system lockups.

Reported-by: Russell King <linux@armlinux.org.uk>
Fixes: e84bd9535e ("hwmon: (it87) Add support for second Super-IO chip")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Stephen Hemminger
d24261e567 scsi: storvsc: Workaround for virtual DVD SCSI version
commit f1c635b439 upstream.

Hyper-V host emulation of SCSI for virtual DVD device reports SCSI
version 0 (UNKNOWN) but is still capable of supporting REPORTLUN.

Without this patch, a GEN2 Linux guest on Hyper-V will not boot 4.11
successfully with virtual DVD ROM device. What happens is that the SCSI
scan process falls back to doing sequential probing by INQUIRY.  But the
storvsc driver has a previous workaround that masks/blocks all errors
reports from INQUIRY (or MODE_SENSE) commands.  This workaround causes
the scan to then populate a full set of bogus LUN's on the target and
then sends kernel spinning off into a death spiral doing block reads on
the non-existent LUNs.

By setting the correct blacklist flags, the target with the DVD device
is scanned with REPORTLUN and that works correctly.

Patch needs to go in current 4.11, it is safe but not necessary in older
kernels.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Maciej S. Szmigiero
1b7f385e04 tpm_tis: use default timeout value if chip reports it as zero
commit 1d70fe9d9c upstream.

Since commit 1107d065fd ("tpm_tis: Introduce intermediate layer for
TPM access") Atmel 3203 TPM on ThinkPad X61S (TPM firmware version 13.9)
no longer works.  The initialization proceeds fine until we get and
start using chip-reported timeouts - and the chip reports C and D
timeouts of zero.

It turns out that until commit 8e54caf407 ("tpm: Provide a generic
means to override the chip returned timeouts") we had actually let
default timeout values remain in this case, so let's bring back this
behavior to make chips like Atmel 3203 work again.

Use a common code that was introduced by that commit so a warning is
printed in this case and /sys/class/tpm/tpm*/timeouts correctly says the
timeouts aren't chip-original.


This is a backport for 4.9 kernel version of the original commit, with
renaming of "TPM_TIS_ITPM_POSSIBLE" flag removed since it was only a
cosmetic change and not a part of the real bug fix.

Fixes: 1107d065fd ("tpm_tis: Introduce intermediate layer for TPM access")
Cc: stable@vger.kernel.org
Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Sachin Prabhu
d8fd99d472 Handle mismatched open calls
commit 38bd49064a upstream.

A signal can interrupt a SendReceive call which result in incoming
responses to the call being ignored. This is a problem for calls such as
open which results in the successful response being ignored. This
results in an open file resource on the server.

The patch looks into responses which were cancelled after being sent and
in case of successful open closes the open fids.

For this patch, the check is only done in SendReceive2()

RH-bz: 1403319

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:55 +02:00
Thomas Gleixner
00cca9768e timerfd: Protect the might cancel mechanism proper
commit 1e38da300e upstream.

The handling of the might_cancel queueing is not properly protected, so
parallel operations on the file descriptor can race with each other and
lead to list corruptions or use after free.

Protect the context for these operations with a seperate lock.

The wait queue lock cannot be reused for this because that would create a
lock inversion scenario vs. the cancel lock. Replacing might_cancel with an
atomic (atomic_t or atomic bit) does not help either because it still can
race vs. the actual list operation.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: "linux-fsdevel@vger.kernel.org"
Cc: syzkaller <syzkaller@googlegroups.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1701311521430.3457@nanos
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-05-08 07:47:54 +02:00
Steve Muckle
2632fef611 ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK
CONFIG_USB_OTG_WAKELOCK is currently somewhat outdated
and as such is not applicable to all Android devices. Until
it is brought up to date, remove it from the base Android
kernel configuration.

Bug: 37750863
Change-Id: I93d1d7204b46c5fe9f98455be9276a5bb38f6382
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-05-07 14:17:38 -07:00
Steve Muckle
cd36d9f49f ANDROID: android-base.cfg: remove defunct options
INET6_DIAG_DESTROY and NETFILTER_TPROXY are not used anymore
so they should not be part of the base Android kernel configuration.

Bug: 37749708
Change-Id: I59d0bf7d33a3b46e1f67f93f0b8e49eebbfce89c
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-05-05 20:26:13 -07:00
Victor Wan
d0edbbb9f4 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-05-05 20:40:45 +08:00
Qiufang Dai
76320c046b PM / sleep: core suspend for m8b
PD#141217: core pm suspend driver for m8b.

Change-Id: I105eb6fb7765e5879feefc0beed07b852825c572
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2017-05-05 04:11:51 -07:00
Jianxin Pan
9df8dbd761 timer: local timer not correct when cpu hotplug for m8b
PD#141217: local timer not correct when cpu off and on

Change-Id: I0c9006fb5ca91ea7767b0f2b9a8a2fb9d37c9eee
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
2017-05-05 04:03:57 -07:00