Commit graph

59 commits

Author SHA1 Message Date
Srinivasarao P
79de04d806 Merge android-4.4.148 (f057ff9) into msm-4.4
* refs/heads/tmp-f057ff9
  Linux 4.4.148
  x86/speculation/l1tf: Unbreak !__HAVE_ARCH_PFN_MODIFY_ALLOWED architectures
  x86/init: fix build with CONFIG_SWAP=n
  x86/speculation/l1tf: Fix up CPU feature flags
  x86/mm/kmmio: Make the tracer robust against L1TF
  x86/mm/pat: Make set_memory_np() L1TF safe
  x86/speculation/l1tf: Make pmd/pud_mknotpresent() invert
  x86/speculation/l1tf: Invert all not present mappings
  x86/speculation/l1tf: Fix up pte->pfn conversion for PAE
  x86/speculation/l1tf: Protect PAE swap entries against L1TF
  x86/cpufeatures: Add detection of L1D cache flush support.
  x86/speculation/l1tf: Extend 64bit swap file size limit
  x86/bugs: Move the l1tf function and define pr_fmt properly
  x86/speculation/l1tf: Limit swap file size to MAX_PA/2
  x86/speculation/l1tf: Disallow non privileged high MMIO PROT_NONE mappings
  mm: fix cache mode tracking in vm_insert_mixed()
  mm: Add vm_insert_pfn_prot()
  x86/speculation/l1tf: Add sysfs reporting for l1tf
  x86/speculation/l1tf: Make sure the first page is always reserved
  x86/speculation/l1tf: Protect PROT_NONE PTEs against speculation
  x86/speculation/l1tf: Protect swap entries against L1TF
  x86/speculation/l1tf: Change order of offset/type in swap entry
  mm: x86: move _PAGE_SWP_SOFT_DIRTY from bit 7 to bit 1
  x86/mm: Fix swap entry comment and macro
  x86/mm: Move swap offset/type up in PTE to work around erratum
  x86/speculation/l1tf: Increase 32bit PAE __PHYSICAL_PAGE_SHIFT
  x86/irqflags: Provide a declaration for native_save_fl
  kprobes/x86: Fix %p uses in error messages
  x86/speculation: Protect against userspace-userspace spectreRSB
  x86/paravirt: Fix spectre-v2 mitigations for paravirt guests
  ARM: dts: imx6sx: fix irq for pcie bridge
  IB/ocrdma: fix out of bounds access to local buffer
  IB/mlx4: Mark user MR as writable if actual virtual memory is writable
  IB/core: Make testing MR flags for writability a static inline function
  fix __legitimize_mnt()/mntput() race
  fix mntput/mntput race
  root dentries need RCU-delayed freeing
  scsi: sr: Avoid that opening a CD-ROM hangs with runtime power management enabled
  ACPI / LPSS: Add missing prv_offset setting for byt/cht PWM devices
  xen/netfront: don't cache skb_shinfo()
  parisc: Define mb() and add memory barriers to assembler unlock sequences
  parisc: Enable CONFIG_MLONGCALLS by default
  fork: unconditionally clear stack on fork
  ipv4+ipv6: Make INET*_ESP select CRYPTO_ECHAINIV
  tpm: fix race condition in tpm_common_write()
  ext4: fix check to prevent initializing reserved inodes
  Linux 4.4.147
  jfs: Fix inconsistency between memory allocation and ea_buf->max_size
  i2c: imx: Fix reinit_completion() use
  ring_buffer: tracing: Inherit the tracing setting to next ring buffer
  ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
  ext4: fix false negatives *and* false positives in ext4_check_descriptors()
  netlink: Don't shift on 64 for ngroups
  netlink: Don't shift with UB on nlk->ngroups
  netlink: Do not subscribe to non-existent groups
  nohz: Fix local_timer_softirq_pending()
  genirq: Make force irq threading setup more robust
  scsi: qla2xxx: Return error when TMF returns
  scsi: qla2xxx: Fix ISP recovery on unload

Conflicts:
	include/linux/swapfile.h

Removed CONFIG_CRYPTO_ECHAINIV from defconfig files since this upmerge is
adding this config to Kconfig file.

Change-Id: Ide96c29f919d76590c2bdccf356d1d464a892fd7
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-08-24 00:07:01 +05:30
Ankit Jain
6e6e586a5f defconfig: msm: Disable config EXT2_FS and EXT3_FS for sdm660
This change disables the unspported fs configs.

Change-Id: Ie15080148425d193e5e252529e0100b6d5b29bc3
Signed-off-by: Ankit Jain <jankit@codeaurora.org>
2018-05-25 10:31:25 +05:30
Vinayak Menon
199d236e97 defconfig: msm: sdm660: disable memory cgroups
Memory cgroups is an unused feature on sdm660. But
enabling it in kernel means that user space can
configure it. Avoid such user configurations until
the feature is decided to be deployed.

Change-Id: Ie77a4de51a59179ff3cb543e3cc955ce48412a59
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2018-01-17 15:17:50 +05:30
Ritesh Harjani
4f633c283f defconfig: sdm660: Enable sdcardfs
This enables sdcardfs for sdm660.

Change-Id: I5621743809caf9a3bbe1deda38681b9c9bcccb99
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2017-11-05 19:24:46 -08:00
Linux Build Service Account
120dd65a36 Merge "defconfig: msm: enable Linux Kernel Dump Test Tool" 2017-09-06 12:55:53 -07:00
Mohammed Khajapasha
13657230ea defconfig: Enable few configs for SDM660
This change enables below list of configs to
address the VTS KernelConfig and KernelProcFileApiTest
test case failures for SDM660.

Enable configs:
CONFIG_QUOTA
CONFIG_QUOTA_NETLINK_INTERFACE
CONFIG_QFMT_V2
CONFIG_SECURITY_PERF_EVENTS_RESTRICT
CONFIG_TASKSTATS
CONFIG_TASK_XACCT
CONFIG_TASK_IO_ACCOUNTING
CONFIG_UID_SYS_STATS

Change-Id: I5aa724988c21fa02cdc88c89d9663d2939198943
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
2017-08-30 16:58:34 +05:30
Ramakrishna Gottimukkula
69e0b61cd7 defconfig: msm: enable Linux Kernel Dump Test Tool
This feature enables to test Privilege Access Never (PAN) feature from
user space through ACCESS_USERSPACE interface supported by LKDTM.
Enable it only in debug defconfig.

Change-Id: I2723e5d8b27d1c0abcab42e9c907c3cbf6501673
Signed-off-by: Ramakrishna Gottimukkula <rgottimu@codeaurora.org>
2017-08-14 16:56:46 +05:30
Ramakrishna Gottimukkula
2e7b372155 defconfig: msm: Enable hardened user copy
Hardened user copy provides an extra layer of security checks when
copy_to_user/copy_from_user APIs are used to ensure data accesses are
valid. When invalid accesses are detected the kernel will forcibly
crash.

Change-Id: Ie13ef8a6ee1a3431d43c57a4b7d6e14985e5c33a
Signed-off-by: Ramakrishna Gottimukkula <rgottimu@codeaurora.org>
2017-08-03 13:34:22 +05:30
Olav Haugan
4d5aee4dae defconfig: msm: Remove CONFIG_TIMER_STATS
CONFIG_TIMER_STATS is no longer needed and the kconfig option
will be removed in subsequent commits.

Change-Id: I380f9f925332c594c9d500312a06713170e48505
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2017-05-16 14:16:43 -07:00
Stephen Boyd
e18d923a3b defconfigs: Sync up defconfigs
We recently renamed CONFIG_UID_CPUTIME, but didn't update all the
defconfigs.

Change-Id: Ic52f904d6ada3d0e32a8278ec95f7b34b29f96b9
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2017-05-03 08:42:43 -07:00
Vinayak Menon
c00be33263 defconfig: disable slub debug on sdm660
Disable default enablement of slub debug on sdm660
debug defconfig to prevent skb allocation failure
due to increase in order of allocation.

Change-Id: If63822a5abf3b297a34b95e5e5f973556631bd68
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-05-01 17:00:43 +05:30
Vinayak Menon
b41072b6f9 defconfig: enable uid stats on sdm660
'commit 6a61b529b4 ("ANDROID: uid_sys_stats: rename
uid_cputime.c to uid_sys_stats.c")' renamed CONFIG_UID_CPUTIME
to CONFIG_UID_SYS_STATS and enabled the new config on relevant
defconfigs except sdm660. Enable it and sync the config to
remove the reference to CONFIG_UID_CPUTIME. Task IO accounting
is enabled as CONFIG_UID_SYS_STATS depends on it.

Change-Id: Ib7163cf090c4fe86030469a257c49be1f6558984
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-05-01 16:59:44 +05:30
Vinayak Menon
8769a23ac3 defconfig: msm: enable page poisoning by default
Enable page poisoning by default on MSM8998
and SDM660.

Change-Id: If0b873888f21fd7e7057df43cf223e3c50372bed
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-04-14 23:43:05 +05:30
Linux Build Service Account
838e1d8348 Merge "f_qc_rndis: Compile rndis.c if CONFIG_USB_F_QCRNDIS is enabled" 2017-03-23 09:44:40 -07:00
Vijayavardhan Vennapusa
7c9990241e f_qc_rndis: Compile rndis.c if CONFIG_USB_F_QCRNDIS is enabled
When CONFIG_USB_F_QCRNDIS is enabled to support RNDIS over BAM2BAM
to IPA, it needs to compile rndis.c driver as well. Otherwise
will see compilation error. Hence compile rndis.c along with f_qc_rndis.c
when CONFIG_USB_F_QCRNDIS is enabled. Disable CONFIG_USB_F_GSI as both
configs can't be enabled at a time as that would cause compilation errors
and warnings seen due to same misc device name registration.

Change-Id: Ie11fba25be53e158811b05c7054bbdf126689c36
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-03-22 13:29:06 +05:30
Linux Build Service Account
7ea0306f70 Merge "defconfig: msm: Enable camera for SDM660 32bit variant" 2017-03-11 10:08:12 -08:00
Linux Build Service Account
a08be13ed5 Merge "misc: qpnp-misc: add support for clients to read register from misc device" 2017-03-10 02:07:07 -08:00
Subbaraman Narayanamurthy
b8b4bc2271 defconfig: sdm660: Enable QPNP_MISC driver
QPNP_MISC driver provides support to read the registers or
support functions required on certain PMICs. Enable it.

Change-Id: Ib496506e60dc94dec1b2292bf0e6fd01583e2f75
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-03-08 17:25:00 -08:00
Linux Build Service Account
b8db96118b Merge "defconfig: msm: Enable Cx ipeak driver for SDM660" 2017-03-08 15:47:18 -08:00
Manish Poddar
3a76e4df0b defconfig: msm: Enable camera for SDM660 32bit variant
Enable camera in the kernel by enabling camera
specific CONFIG_* macros in the kernel defconfig.

Change-Id: I875846e948363283fcde2ebeeee913059771325a
Signed-off-by: Manish Poddar <mpoddar@codeaurora.org>
2017-03-07 03:11:48 -08:00
Rajesh Kemisetti
c350700002 defconfig: msm: Enable Cx ipeak driver for SDM660
Enable common Cx ipeak driver for various multimedia
clients like GPU, MDP, Venus and Camera modules.

This is needed to handle Cx ipeak limit on SDM660.

Change-Id: I95a46964fdf9df48cc0aeb2891426f88c1ff72f9
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
2017-03-06 19:21:13 +05:30
Linux Build Service Account
064ad70ba3 Merge "defconfig: Enable REGMAP_ALLOW_WRITE_DEBUGFS for sdm660" 2017-03-03 17:39:14 -08:00
Linux Build Service Account
2779284ac4 Merge "defconfig: sdm630: Disable CONFIG_ICNSS_DEBUG" 2017-03-01 02:22:53 -08:00
Linux Build Service Account
3dc6d76fb4 Merge "defconfig: enable ARMV8-CE on sdm660" 2017-03-01 02:22:52 -08:00
Hardik Kantilal Patel
311352e71f defconfig: sdm630: Disable CONFIG_ICNSS_DEBUG
Disable CONFIG_ICNSS_DEBUG now that solution is stable.

CRs-fixed: 2012235
Change-Id: I42dca2b723c7b3614a6d9c1c5e73ecbd6ae84a4c
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
2017-02-28 18:52:55 +05:30
Linux Build Service Account
ce81588865 Merge "defconfig: msm: Enable PBS driver support for sdm660" 2017-02-27 23:37:13 -08:00
Kiran Gunda
9147c318e6 defconfig: msm: Enable PBS driver support for sdm660
PBS driver triggers the PBS event specified by the client
driver to execute the PBS RAM configuration. Enable it for
sdm660 targets.

Change-Id: I95c70295805d31506c864546b763bef8a5e7b4bf
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-02-27 04:55:46 -08:00
Laxminath Kasam
c983a9e5aa defconfig: Enable REGMAP_ALLOW_WRITE_DEBUGFS for sdm660
Enable it in the debug defconfig only, to allow REGMAP write
through debugfs.

CRs-Fixed: 2012079
Change-Id: I72e709a6e48698ff339dcf0e53cfac29b6d798ba
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-02-27 15:35:01 +05:30
Srinivasa Rao Kuppala
0d2080d720 defconfig: enable ARMV8-CE on sdm660
Enhancing boot performance

Change-Id:I963be04d2c67a7dbd6710b60e8cc06ae3ee7f50f
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
2017-02-26 23:10:59 -08:00
Linux Build Service Account
d72462d943 Merge "defconfig: msm: Enable the config SYSTEM_TRUSTED_KEYS" 2017-02-21 15:48:56 -08:00
Shiraz Hashim
a69e2f14db defconfig: msm: Enable BALANCE_ANON_FILE_RECLAIM for sdm660
BALANCE_ANON_FILE_RECLAIM treats anonymous and file backed
pages equally while performing memory reclaim.

It is already enabled for sdm660 arm64 perf defconfig.
Enable it for rest of sdm660 related defconfigs.

Change-Id: I3914bbdbc162cce020d6265f8297ac728621c84d
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2017-02-17 08:58:48 +05:30
Venkatesh Yadav Abbarapu
baa152a3c8 defconfig: msm: Enable the config SYSTEM_TRUSTED_KEYS
Enable SYSTEM_TRUSTED_KEYS and add certification for x509 signing
for system.

CRs-Fixed: 1116507
Change-Id: I073c1cf8bb1e9bcdee11975e5d072db9c462ee13
Signed-off-by: Venkatesh Yadav Abbarapu <vabbar@codeaurora.org>
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
2017-02-16 18:08:26 -08:00
Linux Build Service Account
c5a29451a3 Merge "defconfig: sdm660: enable video for 32bit" 2017-02-15 17:01:18 -08:00
Linux Build Service Account
b9fe2c19b4 Merge "defconfig: msm: add fastmap config on sdm660" 2017-02-15 06:11:13 -08:00
Charan Teja Reddy
c8f8f45959 defconfig: msm: add fastmap config on sdm660
Fastmap feature is used in the cases where it required reduced time for
dma_map/unmap().

Change-Id: Ic1c1fd0bbd95d849eaf6ee13569e345117a988b6
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-02-13 19:30:08 -08:00
Linux Build Service Account
ac25dfbde4 Merge "defconfig: Enable FG GEN3 and QNOVO configs for sdm660 32-bit" 2017-02-11 01:25:09 -08:00
Tirupathi Reddy
b2a1e066fc defconfig: Enable FG GEN3 and QNOVO configs for sdm660 32-bit
Enable the GEN3 Fuel Gauge driver and Qnovo pulse charging engine
for sdm660 32-bit platform.

CRs-Fixed: 2005232
Change-Id: Ib6a158e7e6ee55fb348dc2ef7e4eb7d40f3051a5
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-02-10 18:20:56 +05:30
Deepak Kushwah
e4299771b5 defconfig: sdm660: enable video for 32bit
Enable configs for video module

Change-Id: Ibc474d084ced83d4b0bf7fca88e9a613355da3c5
CRs-Fixed: 2004620
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2017-02-10 16:51:43 +05:30
Sayali Lokhande
61f272f633 defconfig: msm: Enable CONFIG_MMC_RING_BUFFER for sdm660
Enable CONFIG_MMC_RING_BUFFER to support ring buffer
logging of legacy and CQ events for sdm660.

Change-Id: I91e7dc68b929c0bf03d76510a084ee89ca4cd030
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-02-10 09:37:36 +05:30
Linux Build Service Account
2eb98d3889 Merge "defconfig: enable CONFIG_FREE_PAGES_RDONLY for sdm660" 2017-02-08 17:48:08 -08:00
Linux Build Service Account
ba12d174c8 Merge "defconfig: Align sdm660 arm32 defconfig with arm64" 2017-02-08 17:48:07 -08:00
Shiraz Hashim
aad00ec265 defconfig: enable CONFIG_FREE_PAGES_RDONLY for sdm660
Enable CONFIG_FREE_PAGES_RDONLY for 32bit sdm660, that
marks freed kernel pages as read-only.

Change-Id: I532dc10fc6aee5200275550eb1df7d1e6cf195e9
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2017-02-08 16:12:17 +05:30
Shiraz Hashim
154827ce27 defconfig: Align sdm660 arm32 defconfig with arm64
Align arm32 and arm64 sdm660 defconfig with respect to
iommu configs and remove cma size selection as it is to be
moved to device tree.

Change-Id: I5c5f88c05dce9f58d29d56d9cfea2b0d785d665a
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2017-02-08 16:11:04 +05:30
Shiraz Hashim
01ede3637b defconfig: msm: update mmap randomness for sdm660
CTS malloc tests on Android 'N' expects higher entropy in
mmap returned address. Present value of mmap random bits
is not providing enough variations for 32 bit tasks.

Increase mmap_rnd_bits for 32bit and mmap_rnd_compat_bits
for 64bit targets to value of 16.

Change-Id: I1cb88cb1f1fc2a8dc7e27eb54b8c0b2a3eb37843
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
2017-02-08 16:11:04 +05:30
Pavankumar Kondeti
3b315a544a defconfig: msm: enable SCHED_AUTOGROUP for sdm660
This config is already enabled in all other variants but missed
in the 32 bit debug defconfig.

Change-Id: I7b1cb538eaf63305eba171c7453c1459c802eb41
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-02-08 11:19:11 +05:30
Veerabhadrarao Badiganti
2801a3b8c5 ARM: config: Enable CONFIG_MMC_SDHCI_MSM_ICE flag
Enable CONFIG_MMC_SDHCI_MSM_ICE flag for encrypting/decrypting
the eMMC data transfers.

Change-Id: Iab391bf51233aff69f5217cf2f1b19cbeed69446
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-02-02 07:04:42 +05:30
Adinarayana Gupta Grandhi
7c57d5dd20 defconfig: Enable android-verity and FEC in sdm660
Enable the android verity device and support for
forward error correction.

Change-Id: I37c74d748f45bd5b5a0ac6b55c6709f662498433
Signed-off-by: Adinarayana Gupta Grandhi <agrandhi@codeaurora.org>
2017-01-31 04:37:34 -08:00
Udaya Bhaskara Reddy Mallavarapu
2b37a860d5 defconfig: msm: enable dvb demux modules compilation for sdm660
Enable dvb_core, mpq demux sw plugin modules compilation.

CRs-Fixed: 1108990
Change-Id: I5ed1bc5f6696c8ef05a51205e83d5dc2b23dd18e
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
2017-01-20 14:58:04 +05:30
Linux Build Service Account
7fdc634254 Merge "ARM: config: Enable DEFERRED RESUME flag on SDM660" 2017-01-18 23:48:54 -08:00
Linux Build Service Account
1515754ed3 Merge "defconfig: sdm660: Enable G-Link SPI Transport driver in 32 bit" 2017-01-18 23:48:44 -08:00