Commit graph

591751 commits

Author SHA1 Message Date
Linux Build Service Account
e8b8b04e8e Merge "mm, page_owner: track and print last migrate reason" 2017-07-11 00:40:09 -07:00
Linux Build Service Account
4eaf0330f9 Merge "mm, page_owner: copy page owner info during migration" 2017-07-11 00:40:08 -07:00
Linux Build Service Account
5fd1a48477 Merge "mm, page_owner: convert page_owner_inited to static key" 2017-07-11 00:40:08 -07:00
Linux Build Service Account
b7d16a2978 Merge "mm, page_owner: print migratetype of page and pageblock, symbolic flags" 2017-07-11 00:40:07 -07:00
Linux Build Service Account
ccc6c3b3c8 Merge "ARM: dts: msm: configure GPIO19 on msm8998 for 11ad refclk3" 2017-07-11 00:40:06 -07:00
Linux Build Service Account
1f575ad700 Merge "power: reset: msm: Restore disabling SDI during reset" 2017-07-11 00:40:05 -07:00
Linux Build Service Account
15e4cb50b3 Merge "net: rps: reset backlog state when IPI fails." 2017-07-11 00:40:05 -07:00
Linux Build Service Account
0d2bf7e895 Merge "cnss2: Bypass SMMU stage-1 by default" 2017-07-10 14:09:14 -07:00
Linux Build Service Account
d6f171ce52 Merge "i2c-msm-v2: Avoid accessing unassigned memory" 2017-07-10 00:04:21 -07:00
Shrey Vijay
9f3114efc5 i2c-msm-v2: Avoid accessing unassigned memory
Memory translation fault occurs when incorrect memory
is accessed. To avoid translation fault, do not access
message memory which is not initialized.

Change-Id: Id5e89350a4bc51021964ee63286ea69040f1b32a
Signed-off-by: Shrey Vijay <shreyv@codeaurora.org>
2017-07-09 22:34:43 -07:00
Ashwanth Goli
68af09edd5 net: rps: reset backlog state when IPI fails.
Changes that reset remote cpu backlog state are removed with the
following commit. Adding them back.
I6e688bf0d09 ("net: rps: send out pending IPI's on CPU hotplug")

Change-Id: I436d1a1f185f0ddc375349e135bbb5d6eb8c5f26
Signed-off-by: Ashwanth Goli <ashwanth@codeaurora.org>
2017-07-10 09:57:47 +05:30
Neeraj Upadhyay
79a6aefd94 power: reset: msm: Restore disabling SDI during reset
This reverts commit b67bb93f56 ("power: reset: Do not
disable SDI during reset"), to restore the original
behavior of disabling SDI during reset.

Change-Id: I6ad0472dc5d766ffea2a942fc226fb742fe44242
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-07-10 08:23:52 +05:30
Abhinav Kumar
5b678cb82f drm/msm: add input validation before setting HDR infoframe
Move the input validation for the connector's HDR support
before calling the API to set the infoframe rather than within
the API itself.

This helps to avoid redundant checks and logging.

Change-Id: If21562920edb1613a73b5e18ab258a57e46c1d7b
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-07-09 10:59:31 -07:00
Maya Erez
fc3a244ccb ARM: dts: msm: configure GPIO19 on msm8998 for 11ad refclk3
PMIC GPIO19 is used by 11ad device to control the refclk3,
while switching to slow clock.
Configure GPIO as input, no pull and VIN 1 for 1.8V source.

Change-Id: I89c04d70f1d8eff550b85d4fcb16bf08bf128ca7
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-07-08 22:29:40 -07:00
Linux Build Service Account
3ec8bfc9bb Merge "icnss: Use fixed memory region for WLAN MSA0 memory" 2017-07-07 17:45:54 -07:00
Linux Build Service Account
719e5e1640 Merge "msm: mdss: information leak during buffer copy from userspace" 2017-07-07 17:45:53 -07:00
Linux Build Service Account
a142e886a7 Merge "msm: mdss: Increase fbmem buf ref count before use" 2017-07-07 17:45:52 -07:00
Linux Build Service Account
209c402fa5 Merge "mdss: dp: avoid notifying DP connect during AUX timeout cases" 2017-07-07 17:45:51 -07:00
Linux Build Service Account
799bcf26f3 Merge "msm: mdss: Put smmu interface errors under pr_err" 2017-07-07 17:45:50 -07:00
Linux Build Service Account
1a20f4d483 Merge "ARM: dts: msm: Support for adv7533 1024x600P panel resolution on msm8996" 2017-07-07 17:45:49 -07:00
Linux Build Service Account
4669039895 Merge "msm: mdss: Fix possible integer overflow" 2017-07-07 17:45:48 -07:00
Linux Build Service Account
4e9710b652 Merge "soc: qcom: ipc_router_mhi_xprt: Do not defer MHI open and close work" 2017-07-07 17:45:47 -07:00
Yue Ma
243575bddb cnss2: Bypass SMMU stage-1 by default
Bypass SMMU stage-1 till it is fully supported by WLAN driver and
device.

Change-Id: I186345c20f9b71171bba6acc8c5eaa689e39b51c
CRs-fixed: 2071634
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-07-07 09:44:28 -07:00
Yue Ma
abb697f2a1 cnss2: Fix issues when migrating to msm-4.4 kernel
Fix the issues during migrating CNSS2 platform driver to msm-4.4
kernel.

Change-Id: Ifcef708fa9394ad54c92a26a397ec60631e74ef2
CRs-fixed: 2071634
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-07-07 09:44:27 -07:00
Yue Ma
5fc7e6650d net: cnss2: Add snapshot of CNSS2 driver
This is a snapshot of the CNSS2 driver and associated files as
of msm-3.18 commit c1bbe6d5e136 ("cnss2: Fix kernel checkpatch
issues").

Change-Id: Ia77d3abe3f86e4dbeac8d55ea2e0120bed480126
CRs-fixed: 2071634
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-07-07 09:41:12 -07:00
Linux Build Service Account
77908d9c93 Merge "Revert "ARM: dts: msm: align removed_region with SDM630 memmap"" 2017-07-07 08:32:00 -07:00
Linux Build Service Account
539f7638fa Merge "icnss: Show rejuvenation info in ICNSS stats report" 2017-07-07 08:31:59 -07:00
Linux Build Service Account
fdc05fae43 Merge "pwm: pwm-qpnp: Ignore changing period setting if it's not requested" 2017-07-07 08:31:58 -07:00
Linux Build Service Account
dcfc6b7782 Merge "msm: sensor: Fix to validate the settings size in flash" 2017-07-07 08:31:57 -07:00
Linux Build Service Account
dec5742b2a Merge "msm: camera: Unlock rwlock before returning." 2017-07-07 08:31:56 -07:00
Linux Build Service Account
478a7073f5 Merge "diag: Add proper checks to fix possible out-of-bound issue" 2017-07-07 08:31:55 -07:00
Hardik Kantilal Patel
cc193eec69 icnss: Use fixed memory region for WLAN MSA0 memory
During first time boot up WLAN Platform driver allocate
1 MB MSA0 Memory region. This region may be adjacent to
other regions that also requires access control, due to
that TZ will merge the two sections into one single resource
group. During this Q6 will lose access to memory region causing
a NOC Error. To avoid use fixed memory region for WLAN MSA0
memory.

CRs-Fixed: 2066025
Change-Id: Ie878e010954524bbe48a29d6ad6f2f53848ab25e
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
2017-07-07 16:55:07 +05:30
Samyukta Mogily
47bfda4635 msm: sensor: Fix to validate the settings size in flash
The size of the settings copied from userspace, is directly checked
in msm_cci_data_queue with CCI_I2C_MAX_WRITE. This might cause
out of bound access in function msm_cci_data_queue as the max size is
MAX_I2C_REG_SET. Hence adding check on the size in flash driver itself.

Change-Id: Ifac358be9f4b4ff60d14c20e02886c2d044e7f52
Signed-off-by: Samyukta Mogily <smogily@codeaurora.org>
2017-07-07 15:39:15 +05:30
Vlastimil Babka
f788d97308 mm, page_owner: track and print last migrate reason
During migration, page_owner info is now copied with the rest of the
page, so the stacktrace leading to free page allocation during migration
is overwritten.  For debugging purposes, it might be however useful to
know that the page has been migrated since its initial allocation.  This
might happen many times during the lifetime for different reasons and
fully tracking this, especially with stacktraces would incur extra
memory costs.  As a compromise, store and print the migrate_reason of
the last migration that occurred to the page.  This is enough to
distinguish compaction, numa balancing etc.

Example page_owner entry after the patch:

  Page allocated via order 0, mask 0x24200ca(GFP_HIGHUSER_MOVABLE)
  PFN 628753 type Movable Block 1228 type Movable Flags 0x1fffff80040030(dirty|lru|swapbacked)
   [<ffffffff811682c4>] __alloc_pages_nodemask+0x134/0x230
   [<ffffffff811b6325>] alloc_pages_vma+0xb5/0x250
   [<ffffffff81177491>] shmem_alloc_page+0x61/0x90
   [<ffffffff8117a438>] shmem_getpage_gfp+0x678/0x960
   [<ffffffff8117c2b9>] shmem_fallocate+0x329/0x440
   [<ffffffff811de600>] vfs_fallocate+0x140/0x230
   [<ffffffff811df434>] SyS_fallocate+0x44/0x70
   [<ffffffff8158cc2e>] entry_SYSCALL_64_fastpath+0x12/0x71
  Page has been migrated, last migrate reason: compaction

Change-Id: I9c93f9f91fa71feaea1505d80ee56caf8daf5562
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: 7cd12b4abfd2f8f42414c520bbd051a5b7dc7a8c
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[guptap@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-07-07 15:12:10 +05:30
Vlastimil Babka
e91e9112cb mm, page_owner: copy page owner info during migration
The page_owner mechanism stores gfp_flags of an allocation and stack
trace that lead to it.  During page migration, the original information
is practically replaced by the allocation of free page as the migration
target.  Arguably this is less useful and might lead to all the
page_owner info for migratable pages gradually converge towards
compaction or numa balancing migrations.  It has also lead to
inaccuracies such as one fixed by commit e2cfc91120 ("mm/page_owner:
set correct gfp_mask on page_owner").

This patch thus introduces copying the page_owner info during migration.
However, since the fact that the page has been migrated from its
original place might be useful for debugging, the next patch will
introduce a way to track that information as well.

Change-Id: I4eb94be5fb2c93bbf165edb9f2a80091b5c8d7b1
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: d435edca928805074dae005ab9a42d9fa60fc702
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[guptap@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-07-07 15:12:09 +05:30
Vlastimil Babka
2e58c8c7ee mm, page_owner: convert page_owner_inited to static key
CONFIG_PAGE_OWNER attempts to impose negligible runtime overhead when
enabled during compilation, but not actually enabled during runtime by
boot param page_owner=on.  This overhead can be further reduced using
the static key mechanism, which this patch does.

Change-Id: I76e44d92ed973647d4fd6489f97db5ffeb893354
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: 7dd80b8af0bcd705a9ef2fa272c082882616a499
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[guptap@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-07-07 15:12:09 +05:30
Vlastimil Babka
188f10f240 mm, page_owner: print migratetype of page and pageblock, symbolic flags
The information in /sys/kernel/debug/page_owner includes the migratetype
of the pageblock the page belongs to.  This is also checked against the
page's migratetype (as declared by gfp_flags during its allocation), and
the page is reported as Fallback if its migratetype differs from the
pageblock's one.  t This is somewhat misleading because in fact fallback
allocation is not the only reason why these two can differ.  It also
doesn't direcly provide the page's migratetype, although it's possible
to derive that from the gfp_flags.

It's arguably better to print both page and pageblock's migratetype and
leave the interpretation to the consumer than to suggest fallback
allocation as the only possible reason.  While at it, we can print the
migratetypes as string the same way as /proc/pagetypeinfo does, as some
of the numeric values depend on kernel configuration.  For that, this
patch moves the migratetype_names array from #ifdef CONFIG_PROC_FS part
of mm/vmstat.c to mm/page_alloc.c and exports it.

With the new format strings for flags, we can now also provide symbolic
page and gfp flags in the /sys/kernel/debug/page_owner file.  This
replaces the positional printing of page flags as single letters, which
might have looked nicer, but was limited to a subset of flags, and
required the user to remember the letters.

Example page_owner entry after the patch:

  Page allocated via order 0, mask 0x24213ca(GFP_HIGHUSER_MOVABLE|__GFP_COLD|__GFP_NOWARN|__GFP_NORETRY)
  PFN 520 type Movable Block 1 type Movable Flags 0xfffff8001006c(referenced|uptodate|lru|active|mappedtodisk)
   [<ffffffff811682c4>] __alloc_pages_nodemask+0x134/0x230
   [<ffffffff811b4058>] alloc_pages_current+0x88/0x120
   [<ffffffff8115e386>] __page_cache_alloc+0xe6/0x120
   [<ffffffff8116ba6c>] __do_page_cache_readahead+0xdc/0x240
   [<ffffffff8116bd05>] ondemand_readahead+0x135/0x260
   [<ffffffff8116bfb1>] page_cache_sync_readahead+0x31/0x50
   [<ffffffff81160523>] generic_file_read_iter+0x453/0x760
   [<ffffffff811e0d57>] __vfs_read+0xa7/0xd0

Change-Id: I08f3412dbda9075d5534eee81444843a7679e54e
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: 60f30350fd69a3e4d5f0f45937d3274c22565134
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[guptap@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-07-07 15:12:09 +05:30
Trishansh Bhardwaj
5dc576051f msm: camera: Unlock rwlock before returning.
put_buf and buf_done are not unlocking rwlock in error case.

Change-Id: Ie10afa15f332cf7bd38be69ea8b99b163b125e66
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2017-07-07 02:17:04 -07:00
Fenglin Wu
c8d3578f8b pwm: pwm-qpnp: Ignore changing period setting if it's not requested
It's not necessary to reprogram PWM period setting if only
changing PWM duty cycle.

Change-Id: I366e17a5e2f18c09ab0850d00ec08a35e0f1cb9f
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2017-07-07 15:59:38 +08:00
Linux Build Service Account
97aeb32ee2 Merge "regulator: core: fix a possible race in disable_work handling" 2017-07-06 23:41:23 -07:00
Linux Build Service Account
e46fafb501 Merge "genirq: Don't allow user space to set IRQ affinity to isolated CPUs" 2017-07-06 23:41:22 -07:00
Linux Build Service Account
4e361bef1f Merge "cnss_utils: Zero out cnss_utils priv structure during initalization" 2017-07-06 23:41:21 -07:00
Linux Build Service Account
52a7c929b0 Merge "spcom: avoid race condition when handling commands" 2017-07-06 23:41:20 -07:00
Linux Build Service Account
807ef98e3f Merge "ARM: dts: msm: Set FDE key size to 256bit for sdm660_64" 2017-07-06 23:41:19 -07:00
Linux Build Service Account
a46fa7102c Merge "msm: ADSPRPC: Avoid multiple hypervisor assign calls for a buffer" 2017-07-06 23:41:18 -07:00
Linux Build Service Account
c3897748c0 Merge "iio: rradc: Update thermistor scaling" 2017-07-06 23:41:18 -07:00
Linux Build Service Account
81b79b39c7 Merge "mmc: core: Use PF_MEMALLOC flag for clock scaling context" 2017-07-06 23:41:17 -07:00
Linux Build Service Account
6b67ad013a Merge "msm: kgsl: Fix a dead loop issue while changing gpu frequency" 2017-07-06 23:41:16 -07:00
Linux Build Service Account
abfdf9aa5a Merge "msm: kgsl: Make sure regulators are ON before GPU clocks are forced on" 2017-07-06 23:41:15 -07:00
Charan Teja Reddy
8d519acd35 Revert "ARM: dts: msm: align removed_region with SDM630 memmap"
Update the carveout regions properly.
This reverts commit 0e6e2ace8c.

Change-Id: Ie93a718c4804d57975d1a2b531328e2fbe889b1f
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-07-06 23:13:44 -07:00