4 years agoalsa: hda: Read pwrgate partition-id from DT
Sumit Singh [Tue, 7 Apr 2015 04:09:00 +0000]
alsa: hda: Read pwrgate partition-id from DT

Make modifications in sound/pci/hda/hda_intel.c,
so that it reads powergate partition-id from device tree.

Bug 200105664

Change-Id: I8ea01905773c43ac1c10a2a9829cab8271fc4afa
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/728294
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agousb: gadget: xudc: Read pwrgate partition-id from DT
Sumit Singh [Mon, 6 Apr 2015 16:24:13 +0000]
usb: gadget: xudc: Read pwrgate partition-id from DT

Make modifications in drivers/platform/tegra/common.c,
so that it reads powergate partition-id from device tree.

Bug 200105664

Change-Id: I397a3ddbf78009563f35344789d98624f474f20e
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/728060
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoplatform: tegra: Read pwrgate partition-id from DT
Sumit Singh [Mon, 6 Apr 2015 15:42:05 +0000]
platform: tegra: Read pwrgate partition-id from DT

Make modifications in drivers/platform/tegra/common.c,
so that it reads powergate partition-id from device tree.

Bug 200105664

Change-Id: I9046060c752745a767a0a1cada24f797d8f8835a
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/728051
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agousb: xhci: Read powergate partition-id from DT
Sumit Singh [Wed, 13 May 2015 06:10:23 +0000]
usb: xhci: Read powergate partition-id from DT

Modify code in xhci-tegra.c, so that it reads
powergate partition-id from device tree.

Bug 200105664

Change-Id: Ia6fb29fda972fcfc6ab298665cd8852bdc366af4
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/727965
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoplatform: tegra: Add powergate supporting function
Sumit Singh [Fri, 3 Apr 2015 05:41:32 +0000]
platform: tegra: Add powergate supporting function

Add a function which provides powergate-id for a
powergate partition reading from device tree.

Bug 200105664

Change-Id: I4567b74bdf705561ee3e7991893e940ad7e59798
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/727339
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agodrivers: gpu: nvgpu: make functions as static
Alankrita G [Mon, 25 May 2015 04:40:42 +0000]
drivers: gpu: nvgpu: make functions as static

- Fixed the following sparse warnings by making the local function as static:
   warning: symbol 'balloc_alloc_buddy' was not declared. Should it be static?

Bug 200067946

Change-Id: I6eeb71f6c0d5fbfb99f6c43bbc4504fea1bc8d46
Signed-off-by: Alankrita G <alankritag@nvidia.com>
Reviewed-on: http://git-master/r/746583
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agoarm64: fix incorrect mask in pte_modify
Krishna Reddy [Fri, 12 Sep 2014 18:26:05 +0000]
arm64: fix incorrect mask in pte_modify

Bug 1552646
Bug 1641975

Change-Id: I2160d9ce2821036135f244b438045081e3767cf1
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/746228
GVS: Gerrit_Virtual_Submit
(cherry picked from commit 370202cf65694e0a1cde81301de4550ad69cf47a)
Reviewed-on: http://git-master/r/748329

4 years agovideo: tegra: disable NVMAP_CONVERT_IOVMM_TO_CARVEOUT
Krishna Reddy [Wed, 27 May 2015 21:10:54 +0000]
video: tegra: disable NVMAP_CONVERT_IOVMM_TO_CARVEOUT

Disable config option NVMAP_CONVERT_IOVMM_TO_CARVEOUT.

Bug 1628472

Change-Id: I7fcc7d4d703d084742fdf087d450b522f537b119
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/747950
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>

4 years agoARM64: dts: odin: modified common dt for dp
Alvin Park [Tue, 19 May 2015 05:39:36 +0000]
ARM64: dts: odin: modified common dt for dp

added status of dpaux1 and sor1 to odin common dt

Bug 200096512
Bug 200106509

Change-Id: I406dd282a752e94282d5e7d0a6d6faf721af9794
Signed-off-by: Alvin Park <apark@nvidia.com>
Reviewed-on: http://git-master/r/744154
(cherry picked from commit b93b217ebda2e25e5daba53e9d7c49f2ca8b5c91)
Reviewed-on: http://git-master/r/746092
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>

4 years agoarm64: dts: odin: set dp_hpd to DP SFIO
Alvin Park [Fri, 22 May 2015 08:13:07 +0000]
arm64: dts: odin: set dp_hpd to DP SFIO

Set dp_hpd to DP SFIO

- remove gpio setting to use as dp SFIO
- set tristate to ENABLE

Bug 200106509

Change-Id: Ia579c382249bb991ca535830d550bb2908e55994
Signed-off-by: Alvin Park <apark@nvidia.com>
Reviewed-on: http://git-master/r/746081
Reviewed-by: Mitch Luban <mluban@nvidia.com>

4 years agoiommu: arm-smmu: fix incorrect pte contiguous bit set
Krishna Reddy [Wed, 27 May 2015 21:06:09 +0000]
iommu: arm-smmu: fix incorrect pte contiguous bit set

Fix incorrect pte contiguous bit set in page tables.
Both IOVA and Phys address need to be aligned as necessary
when contiguous bit is set.

Bug 1628472
Bug 1638890

Change-Id: I4c187538f46968d5a3010f8b719c6cace1a43e46
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/747949
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 years agogpu: nvgpu: Support >32bit addresses in simulation
Terje Bergstrom [Wed, 27 May 2015 17:29:13 +0000]
gpu: nvgpu: Support >32bit addresses in simulation

Change-Id: I96282b4e047ba8b5369dac039f0f51856c69235b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/747935
Reviewed-by: Andy Sobczyk <asobczyk@nvidia.com>
Tested-by: Andy Sobczyk <asobczyk@nvidia.com>
GVS: Gerrit_Virtual_Submit

4 years agoRevert "arm64: configs: enable connector"
Hoang Pham [Thu, 28 May 2015 00:08:09 +0000]
Revert "arm64: configs: enable connector"

This reverts commit a32aa4ad88a0a56df84ed1e88dc031d3b9c7bb56.

Bug 200108302

Change-Id: I936acde3f396947780aaff9bdd234cfb60fb8820
Signed-off-by: Hoang Pham <hopham@nvidia.com>
Reviewed-on: http://git-master/r/748049
Reviewed-by: Sivaram Nair <sivaramn@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Tested-by: Juha Tukkinen <jtukkinen@nvidia.com>

4 years agogpu: nvgpu: restore 50ms unmap wait for fixed bufs
Konsta Holtta [Thu, 28 May 2015 10:06:42 +0000]
gpu: nvgpu: restore 50ms unmap wait for fixed bufs

Increase sync-unmap wait time from 5 ms to 50 ms.
6ccac11b4dd1a4eaf9c914fd567cdf7922184e28 decreased the wait tenfold, so
this puts it back.

Bug 1650025
Bug 200078514

Change-Id: I53a4ea115536ca2ff5d6aa701547c7477ac6e4ea
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/748224
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
GVS: Gerrit_Virtual_Submit

4 years agobcmdhd: fix bcmdhd_irq_number issue for pcie
Vidya Sagar [Tue, 19 May 2015 05:08:27 +0000]
bcmdhd: fix bcmdhd_irq_number issue for pcie

Fixes bcmdhd_irq_number issue for wifi over PCIe.
All initialization  of sysfs/nvcap variables should
present in sysfs files.

Bug 200105983

Change-Id: I9e6f8fd31194cea43288064126ea46c54e96274b
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
Reviewed-on: http://git-master/r/744728
Reviewed-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
Reviewed-by: Rakesh Goyal <rgoyal@nvidia.com>
Tested-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agoarm64: dts: t18x: add support for linsim CL 34563539
Chetan Kumar [Mon, 20 Apr 2015 22:08:15 +0000]
arm64: dts: t18x: add support for linsim CL 34563539

Change-Id: I2bfb248b45895d4fab38a462e1ebb20ef5c22dfe
Signed-off-by: Chetan Kumar <chetankumarn@nvidia.com>
Signed-off-by: Krishna Sitaraman <ksitaraman@nvidia.com>
Reviewed-on: http://git-master/r/733310
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>

4 years agoarm64: boot: dts: fix xusb prod settings for RX_DFE
Ajay Gupta [Wed, 20 May 2015 18:02:24 +0000]
arm64: boot: dts: fix xusb prod settings for RX_DFE

Recommended value of RX_DFE is 0xC0077F1F as per bug 1547690
Also added code to print prod settings.

Bug 1567693
Bug 1647326
Bug 1644248

Change-Id: I1d6602b35b03b27f01ed981dc9fe1808724763eb
Signed-off-by: Ajay Gupta <ajayg@nvidia.com>
Reviewed-on: http://git-master/r/745104
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>

4 years agogpu: nvgpu: Fix overflow of alloc length
Alex Waterman [Tue, 26 May 2015 22:15:56 +0000]
gpu: nvgpu: Fix overflow of alloc length

Fix an issue where large ( > 4GB) allocations were not being computed
correctly. The two fields, pages and page_size, were both 32 bits so
when multiplied they easily overflowed. Simple fix is to cast them to
64 bits before multiplying them.

Change-Id: I63fa54679e485de5c3a99684cbeb72c6cdc65504
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/747429
Reviewed-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 years agovideo: tegra: nvmap: clean L1 on all cores
Krishna Reddy [Mon, 6 Apr 2015 18:32:33 +0000]
video: tegra: nvmap: clean L1 on all cores

Clean L2 by set/ways doesn't ensure that L1 is
cleaned on A15 and A57.
Clean L1 on all cores before cleaning L2.

Bug 200077334
Bug 1639610

Change-Id: I8a389317571060ba4716663c03ab75896aa13612
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/744719
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoRevert "video: tegra: dp: add hotplug support"
Bharat Nihalani [Tue, 26 May 2015 05:19:22 +0000]
Revert "video: tegra: dp: add hotplug support"

This reverts commit 9102164802d145814716e036c7d38c8c7f7c9f5d
since it is suspected to have caused a regression in
graphics_submit.

Bug 1648877

Change-Id: I549b7b6e45baf07ce8d9936e3e1de267400faf86
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/747051
GVS: Gerrit_Virtual_Submit

4 years agoRevert "video: tegra: dc: ext: skip frames"
Parag Mehendale [Fri, 17 Apr 2015 17:36:30 +0000]
Revert "video: tegra: dc: ext: skip frames"

Bug 200082454
Bug 200094864
Bug 1624443
Bug 1628941

This reverts commit 3439bcf259cfefe8bc1d4ddd9eaeded914ebf80d.

Change-Id: I664f3499014ea3f4c1a91f0dde4c02f63077d13f
Signed-off-by: Parag Mehendale <pmehendale@nvidia.com>
Reviewed-on: http://git-master/r/732779
(cherry picked from commit ebedd431134b12e0d7b2bcf329d0b4c7b00b2406)
Reviewed-on: http://git-master/r/746683
Reviewed-by: Tuomas Kulve <tkulve@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoplatform: tegra: Fix sparse warning
Alankrita G [Wed, 20 May 2015 10:39:41 +0000]
platform: tegra: Fix sparse warning

-Fixed the following sparse warnings by making the local function as static:
     warning: symbol 'tegra_emc_timer_training_start' was not declared.
     warning: symbol 'tegra_emc_timer_training_stop' was not declared.

- Removed unused function tegra_check_disp_latency_allowance
     warning: symbol 'tegra_check_disp_latency_allowance' was not declared.

Bug 200067946

Change-Id: I506b091c8b4ed41b70dd9ac5ebc9dbd214fb7e84
Signed-off-by: Alankrita G <alankritag@nvidia.com>
Reviewed-on: http://git-master/r/744909
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agomedia: platform: tegra: auto: switch i2c rw method
Charlie Huang [Tue, 14 Apr 2015 00:15:45 +0000]
media: platform: tegra: auto: switch i2c rw method

change the i2c r/w from regmap to i2c_master_send/i2c_master_rcv,
this can improve the i2c performance on i2c write, because regmap
split one write operation into two packets:
address packet + data packet
there will be a delay between two packets and reduce the performance.

bug 1609280

Change-Id: Ic3e38c260373cb009ad6cac6ceb142cb82691325
Signed-off-by: Charlie Huang <chahuang@nvidia.com>
Reviewed-on: http://git-master/r/731424
(cherry picked from commit a3b52b8a0a3d502765fa9535d715b133a2b14c1e)
Reviewed-on: http://git-master/r/744093
Reviewed-by: Arun Shamanna Lakshmi <aruns@nvidia.com>
Tested-by: Arun Shamanna Lakshmi <aruns@nvidia.com>

4 years agomedia: platform: tegra: auto: set device mode
Songhee Baek [Tue, 19 May 2015 16:42:16 +0000]
media: platform: tegra: auto: set device mode

Setting the device mode as (S_IRUGO | S_IWUGO) is
not only for root but also for user to access the
isc-dev devices.

Bug 200082090
Bug 1641226

Change-Id: I1a8962759498e1ab9f38bdcb0ae88017e20130ed
Signed-off-by: Songhee Baek <sbaek@nvidia.com>
Reviewed-on: http://git-master/r/744427
(cherry picked from commit eb06ba83e14896af98e67a7ba6178454b5f3f97c)
Reviewed-on: http://git-master/r/745950
Reviewed-by: Charlie Huang <chahuang@nvidia.com>
Reviewed-by: Arun Shamanna Lakshmi <aruns@nvidia.com>
Tested-by: Arun Shamanna Lakshmi <aruns@nvidia.com>

4 years agogpu: nvgpu: Infinite wait for fixed alloc unmap
Terje Bergstrom [Mon, 18 May 2015 23:12:05 +0000]
gpu: nvgpu: Infinite wait for fixed alloc unmap

In non-silicon wait infinitely for all jobs to complete before
unmapping a fixed allocation.

Bug 200078514

Change-Id: I9196afb1d3c5f0c999113a4a17ada2989ac55707
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/744067

4 years agogpu: nvgpu: sysfs queries
Anders Kugler [Sat, 16 May 2015 02:02:40 +0000]
gpu: nvgpu: sysfs queries

Export the gpu's safe fmax_at_vmin frequency so it can be
queried from userspace (e.g. PHS).

Bug 1566108

Change-Id: I47326588ebd443f189a6051edbf95b35b35636d1
Signed-off-by: Anders Kugler <akugler@nvidia.com>
Reviewed-on: http://git-master/r/743501
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 years agogpu: nvgpu: use 64K hole for PMU VM
Vijayakumar [Fri, 8 May 2015 12:23:36 +0000]
gpu: nvgpu: use 64K hole for PMU VM

With 4K hole T186 PMU does not boot in NS
T186 has 64 bit DMA Base. We subtract IMEM
offset from GPUVA for PMU boot DMABASE setup
It becomes above 4GB because of that
So we will use a hole which is bigger than
IMEM size.

Change-Id: Ib87c39881299a4f5b14e28415195e00800250c46
Signed-off-by: Vijayakumar <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/740656
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 years agogpu: nvgpu: Fix compbits mapping
Sami Kiminki [Wed, 20 May 2015 15:38:10 +0000]
gpu: nvgpu: Fix compbits mapping

Commit e99aa2485f8992eabe3556f3ebcb57bdc8ad91ff broke compbits
mapping. So, let's fix it.

Bug 200077571

Change-Id: I02dc150fbcb4cd59660f510adde9f029290efdfb
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: http://git-master/r/745001
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 years agousb: xhci: tegra: reduce parse error msg to debug
Krishna Yarlagadda [Wed, 20 May 2015 12:39:53 +0000]
usb: xhci: tegra: reduce parse error msg to debug

utmi_pad subnode in dt is only required only when over current detection
is enabled. In other cases we default no oc and fixed regulators.

utmi_pad not found should be a debug info and not error

Bug 200094228

Change-Id: Ieec53fad997be5cf2b688caca46be5a4f3b07cc1
Signed-off-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Reviewed-on: http://git-master/r/744959
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Tested-by: Venkat Moganty <vmoganty@nvidia.com>

4 years agousb: xhci: Add quirk to enable U1/U2
Krishna Yarlagadda [Thu, 8 Jan 2015 10:29:42 +0000]
usb: xhci: Add quirk to enable U1/U2

Add a quirk to enable U1/U2 to a known list
of bad devices.

Bug 200036929

Change-Id: I73982e37e995ab93e40bf344cf5adac2b5cb79fc
Signed-off-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Reviewed-on: http://git-master/r/670632
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

4 years agoarm64: dts: t132: Add DT support for powergating
Sumit Singh [Wed, 20 May 2015 08:29:24 +0000]
arm64: dts: t132: Add DT support for powergating

Add nodes in the device-tree to add DT support
for T132 power-gating.

Bug 200105664

Change-Id: I697af0c420848a7ac30805358f38d652b90744b0
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744803
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoudc/otg: Add DT support for T132 power-domains
Sumit Singh [Wed, 20 May 2015 06:17:08 +0000]
udc/otg: Add DT support for T132 power-domains

Make modifications so as to add otg device to
its powerdomain using device tree for T132 chip.

Bug 200070810

Change-Id: Ic9b7cdeb8a1748f9089c0bcef3212127e54c361f
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744736
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agousb: ehci: tegra: Add DT support for T132 power-domains
Sumit Singh [Wed, 20 May 2015 06:14:02 +0000]
usb: ehci: tegra: Add DT support for T132 power-domains

Make modifications so as to add ehci devices to their
power-domains using using device tree for T132 chip.

Bug 200070810

Change-Id: I200b0141e884eb6da57ef533e0d3f6acd1ca2fdb
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744733
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agogpu: nvgpu: Add DT support for gpu power-domain
Sumit Singh [Wed, 20 May 2015 06:09:49 +0000]
gpu: nvgpu: Add DT support for gpu power-domain

Make modification to add DT support for gpu
power-domain for T132 chip.

Bug 200070810

Change-Id: I51866d618fcf4aa7e4b821db4304d9a68809b92d
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744731
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agovideo: tegra: host: DT support for host1x domains
Sumit Singh [Wed, 20 May 2015 06:02:18 +0000]
video: tegra: host: DT support for host1x domains

Add DT support for power domains for host1x clients
for T132 chip.

Bug 200070810

Change-Id: I493c471f74408a1c3ef736412de0807cecc3145a
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744730
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoplatform: tegra: Add DT support for T132 power-domains
Sumit Singh [Wed, 20 May 2015 05:51:23 +0000]
platform: tegra: Add DT support for T132 power-domains

Add DT support for the following tegra power-domains:
-mc_clk
-nvavp
-sdhci

Bug 200070810

Change-Id: Ic213d8fed3ac4c9fbfab5ca725c864a39ae98e69
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744724
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoarm64: t132: dt: Add DT nodes for power-domains
Sumit Singh [Wed, 20 May 2015 04:21:05 +0000]
arm64: t132: dt: Add DT nodes for power-domains

To add DT support for tegra power-domains for t132,
adding nodes for tegra power-domains, filling the relevant
properties, and adding a phandle to devices pointing
to power-domain to which they belong.

Bug 200070810

Change-Id: I069ef1c990741cd267fd512c6803d763d5d52bec
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744720
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agodt-bindings: t132: Add powergate-ids
Sumit Singh [Wed, 20 May 2015 06:51:48 +0000]
dt-bindings: t132: Add powergate-ids

Create a header file that contains the powergate-ids
of different powergate partitions.

Bug 200105664

Change-Id: Ie46701c017c999068a814ee2f49e7224cf5d82a5
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744751
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoarm: dts: tegra: Add DT support for powergating for T124
Sumit Singh [Tue, 19 May 2015 10:26:41 +0000]
arm: dts: tegra: Add DT support for powergating for T124

Add nodes in the device-tree to add DT support
for T124 power-gating.

Bug 200105664

Change-Id: I54715c30f0146b2569e3d417f855670a733ded6d
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/744305
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agodt-bindings: t124: Add powergate-ids
Sumit Singh [Mon, 18 May 2015 05:45:49 +0000]
dt-bindings: t124: Add powergate-ids

Create a header file that contains the powergate-ids
of different powergate partitions.

Bug 200105664

Change-Id: I944eed7fa24b69ad88716176974bb3f71e8bfeeb
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/743619
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>

4 years agoarm64: tegra21: DT support for powergating
Sumit Singh [Thu, 2 Apr 2015 12:29:05 +0000]
arm64: tegra21: DT support for powergating

Add nodes in the device-tree to support DT support
for power-gating.

Bug 200105664

Change-Id: Ib2f44297f3d7979a394b2547686b7e4c4b1f077a
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/727337
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agodt-bindings: t210: Add powergate-ids
Sumit Singh [Fri, 3 Apr 2015 05:38:44 +0000]
dt-bindings: t210: Add powergate-ids

Create a header file that contains the powergate-ids
of different powergate partitions.

Bug 200105664

Change-Id: I658fba51f0aee640311572d4d2683356c06065db
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Reviewed-on: http://git-master/r/727338
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agostaging: iio: adc: increase delay before reading config REG
Venkat Reddy Talla [Fri, 8 May 2015 03:56:14 +0000]
staging: iio: adc: increase delay before reading config REG

Increase delay before reading ads1015 config register to know
single-shot conversion is completed or not.

Bug 1643119

Change-Id: Ie7e1a1acbc7b4911f8a1eed7811732c7229013d0
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Reviewed-on: http://git-master/r/740449
(cherry picked from commit 0894c73a224d30b0ac01f18aab471634922ff15f)
Reviewed-on: http://git-master/r/745013
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agoplatform: tegra: nvadsp: Add __init to probe func
Ajay Nandakumar [Wed, 8 Apr 2015 11:08:15 +0000]
platform: tegra: nvadsp: Add __init to probe func

Adding __init to functions called from nvadsp_func. This will make
sure that all the functions just called in probe are under one
section.

Change-Id: If063747255ca51f7d68a46e83a8fe3f71d64b287
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/728981
(cherry picked from commit f173bd158bff40c36c87302a02d0c89d94377a29)
Reviewed-on: http://git-master/r/744246
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agoplatform: nvadsp: use lock after initialize check
Ajay Nandakumar [Wed, 15 Apr 2015 15:24:38 +0000]
platform: nvadsp: use lock after initialize check

In nvadsp_os_load, mutex lock must be acquired after driver
initialization check is made. If tried to acquire before the check, it
would lead to a NULL pointer exception.

Bug 1543792

Change-Id: I4af97a9bc7991726aaa8e321efb6c623030cd112
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/731834
(cherry picked from commit 6c3bff4ef42e055d5c3c3d993053e59b4addb639)
Reviewed-on: http://git-master/r/744247
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agoplatform: tegra: nvadsp: debug nodes for apps
Ajay Nandakumar [Thu, 11 Dec 2014 08:54:31 +0000]
platform: tegra: nvadsp: debug nodes for apps

Create debug nodes for each app through which various attributes for
the app can be exposed.

Bug 200064076

Change-Id: Ie594168084f14b79b673b13f33a24a3e19869b3f
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/721438
(cherry picked from commit 0d734a50644d5b113639e112cd5c409955bffb55)
Reviewed-on: http://git-master/r/662569
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>

4 years agoplatform: tegra: nvadsp: Check handle in app init
Ajay Nandakumar [Tue, 28 Apr 2015 11:55:49 +0000]
platform: tegra: nvadsp: Check handle in app init

The NULL pointer check in nvadsp_app_init was removed as a result of
using the single app framework integration. Adding this check back
without which an exception would occur.

Bug 200069519

Change-Id: I8198d1ca5aa3a2f79a3194ac48df0ce70e0753db
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/736727
(cherry picked from commit c7789beded788acfcc4772b3eff0d823baee8b7a)
Reviewed-on: http://git-master/r/744251
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agousb: xhci: tegra: init cpu boost early
Krishna Yarlagadda [Mon, 18 May 2015 18:28:09 +0000]
usb: xhci: tegra: init cpu boost early

Initialize pm qos request before interrupts
are enabled.

Bug 200091191

Change-Id: Ie5f08e56215ad30cef3c8b200b7c5eaf1b0e9888
Signed-off-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Reviewed-on: http://git-master/r/743925
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Petlozu Pravareshwar <petlozup@nvidia.com>
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

4 years agousb: allow lpm (en/dis)able only if device is atleast in default state
Pratyush Anand [Fri, 4 Jul 2014 14:01:27 +0000]
usb: allow lpm (en/dis)able only if device is atleast in default state

When a USB device is disconnected, usb_unbind_interface is called, which
tries to enable and disable LPM. usb_enable_lpm also try to send a
control command SET SEL to the device.
Since device is already disconnected, therefore it does not make sense
to execute usb_(en/dis)able_lpm.
This patch returns from usb_(en/dis)able_lpm, if device was not in
default state atleast.

Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
Tested-by: Aymen Bouattay <aymen.bouattay@st.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 51df62ff74b371866c1006dee887a8e42838c1f2)
Change-Id: I3df7bb473f18eafcbacb85214a3d00b857767c4a
Reviewed-on: http://git-master/r/739962
Reviewed-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Tested-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Reviewed-by: Petlozu Pravareshwar <petlozup@nvidia.com>
Reviewed-by: Jui Chang Kuo <jckuo@nvidia.com>
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

4 years agovideo: tegra: vhost: add fake debug functions
Richard Zhao [Thu, 23 Apr 2015 17:27:42 +0000]
video: tegra: vhost: add fake debug functions

VM doesn't have right to dump priviledged registers.

Bug 200081130

Change-Id: If39e37de71aa1c9f4a2956fc706e612d3626f6b3
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/735003
(cherry picked from commit 2cb5295193790f8b062365624c31fef966bfffca)
Reviewed-on: http://git-master/r/738712
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Tested-by: Arto Merilainen <amerilainen@nvidia.com>

4 years agoarm: tegra: display: remove panel files from gcov
Sam Payne [Wed, 20 May 2015 16:49:45 +0000]
arm: tegra: display: remove panel files from gcov

panel files cannot be tested in automated testing
removing from coverage statistics

Change-Id: I5dbc0092d77ecc4e1b0d180be330b88b283f00e0
Signed-off-by: Sam Payne <spayne@nvidia.com>
Reviewed-on: http://git-master/r/745020
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>

4 years agokernel: remove HDCP from display module
Sam Payne [Fri, 15 May 2015 18:21:17 +0000]
kernel: remove HDCP from display module

HDCP file reviewers are sw-mobile-security and
are listed under "HDCP"

Change-Id: I31300da3043d9b327482f81bf93c06561b03235b
Signed-off-by: Sam Payne <spayne@nvidia.com>
Reviewed-on: http://git-master/r/743365
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>

4 years agoARM64: dts: Hawkeye: disable backlight in KCL
Venkat Reddy Talla [Fri, 15 May 2015 04:14:06 +0000]
ARM64: dts: Hawkeye: disable backlight in KCL

disable backlight in kernel charging loop to avoid
power consumption.

Bug 200104576

Change-Id: Ia8aef72770787beb7838a9c4b9cd14edc20a0248
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Reviewed-on: http://git-master/r/743064
(cherry picked from commit 369d5ea009a2d5ea8e2de8940be81021797405e5)
Reviewed-on: http://git-master/r/744712
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agopcie: host: tegra: fix PME power_down test
Vidya Sagar [Thu, 21 May 2015 16:22:09 +0000]
pcie: host: tegra: fix PME power_down test

fixes power_down test

Bug 200019588

Change-Id: I7ab5ae22d3e7c63b1c30010974d1ef9cfe217d34
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
Reviewed-on: http://git-master/r/745659
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agoARM64: dts: add thermal zone name to charger node
Venkat Reddy Talla [Fri, 8 May 2015 09:04:23 +0000]
ARM64: dts: add thermal zone name to charger node

Adding thermal zone name to battery charger node
to read battery temperature to configure input voltage,
input current based on battery temperature and also
to disable battery charging beyond 50C,
providing battery temp read polling time.

Bug 1633184

Change-Id: I3a5e0c54593f5fff2fe6e5dd6c3bc6133d6b3088
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Reviewed-on: http://git-master/r/740568
(cherry picked from commit c7967ef3e9fa408d2a1f32d6e7f9c0bf810c65ab)
Reviewed-on: http://git-master/r/744711
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agopower: bq2419x: start thermal monitoring while charging
Venkat Reddy Talla [Mon, 4 May 2015 07:40:20 +0000]
power: bq2419x: start thermal monitoring while charging

start battery thermal mornitoring to change input current,
voltage limit and disable charging after 50C while charging
and stop battery thermal monitoring once charger cable
is removed or battery charging completed.
Replace HZ with 1000 while scheduling thermal work queue
to avoid any tick rate issue for different soc(T124, T210).

Bug 1633184

Change-Id: I0a52ea7a889c25d60f893e7bfb95305d48b6064f
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Reviewed-on: http://git-master/r/738441
(cherry picked from commit b32f5a09515f01faee8b2cab1d6b68a8aa7cc0d9)
Reviewed-on: http://git-master/r/740051
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agoiio: adc: report error on conversion fail properly
Venkat Reddy Talla [Fri, 15 May 2015 06:23:45 +0000]
iio: adc: report error on conversion fail properly

report error value from ads1015 driver on start conversion
fail properly.
Modify debug messages string to know reason on failure case.

Bug 200103698

Change-Id: I0116e69d1490d478012696e25bc42752e53256d0
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Reviewed-on: http://git-master/r/743116
(cherry picked from commit 9c140d8bba3b0f78e36573b4877c8ee601700946)
Reviewed-on: http://git-master/r/744710
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agostaging: iio: program ads1015 in continuous mode on conversion fail
Venkat Reddy Talla [Mon, 4 May 2015 11:56:25 +0000]
staging: iio: program ads1015 in continuous mode on conversion fail

To detect input cable type need to program ads1015 in continuous
conversion mode after start conversion fail while reading battery
thermister channel value.

Bug 200102214

Change-Id: Ia3a7ddecdc6e1b6140c2afc66798e9350f097b3a
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Reviewed-on: http://git-master/r/738502
(cherry picked from commit 0758cf1df28b5997029f4f71fb17d99d8891b3c3)
Reviewed-on: http://git-master/r/740050
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agovideo: tegra: sor: fix PD_TXD vals
Shu Zhong [Tue, 19 May 2015 23:29:10 +0000]
video: tegra: sor: fix PD_TXD vals

Modified tegra_sor_power_lanes and tegra_sor_precharge_lanes
to correctly set the PD_TXD vals for T210 boards.

Bug 200038062

Change-Id: I3bf64796086d786e7e52d1834de08957750ce281
Signed-off-by: Shu Zhong <shuz@nvidia.com>
Reviewed-on: http://git-master/r/744616
Reviewed-by: Mitch Luban <mluban@nvidia.com>

4 years agotegra: adsp: actmon: fix freq locked at max
Puneet Saxena [Thu, 23 Apr 2015 10:12:12 +0000]
tegra: adsp: actmon: fix freq locked at max

If actmon is suspended and boost component of
target freq is non zero, on resume target freq
considers non zero boost freq. This results in adsp
freq remains high from very beginning.

Initialize boost freq with zero in each reset.

Actmon clock is initialized with max adsp freq.
This will result in very high avg and boost count.
Top of that  count weight makes these counter incremented
exponentially.

Initialize actmon clock with ape clock.

Bug 200098842
Bug 200082064

Change-Id: I1fb2cf8d37b33864481c81eea67d539ff5ee031b
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: http://git-master/r/734888
(cherry picked from commit ca0db68b0af77e9a19ef8c54f5516706942b2f03)
Reviewed-on: http://git-master/r/738431
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>

4 years agotegra: adsp: actmon: disable monitor while exiting
Puneet Saxena [Tue, 21 Apr 2015 10:48:47 +0000]
tegra: adsp: actmon: disable monitor while exiting

Disable Actmon monitoring while exiting out from
actmon.

Bug 200098842

Change-Id: I77f5fb61a2e957a36b82a3a24dcfbf5bd2579ef3
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: http://git-master/r/733581
(cherry picked from commit ab71594f7832b18b11b79d6f5ea0d4365ab51bc7)
Reviewed-on: http://git-master/r/738430
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>

4 years agotegra: adsp: dfs: align policy min max with dfs table
Puneet Saxena [Tue, 21 Apr 2015 18:28:18 +0000]
tegra: adsp: dfs: align policy min max with dfs table

Presently, policy min/max is assigned with adsp cpu min/max
frequency. ADSP cpu min/max freq defined in clock framework
is multiple of 12.8 MHz. However, for calculating ADSP timer
scaler value, it needs to be multiple of 51.2MHz.

It aligns policy min/max with adsp dfs table.

Bug 200098842

Change-Id: Ic5e3da10ce7949f27338a64aa2749a173192aadc
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: http://git-master/r/733687
(cherry picked from commit 6b81ee3002e7f0253e1e7e809a523274de38884e)
Reviewed-on: http://git-master/r/738429
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>

4 years agotegra: nvadsp: change suspend flow of adsp actmon and dfs
Puneet Saxena [Thu, 26 Mar 2015 04:51:30 +0000]
tegra: nvadsp: change suspend flow of adsp actmon and dfs

While adsp os init/resume/restore adsp dfs is initialised first
than adsp actmon. Therefore while exit/suspend adsp actmon should
exit first than adsp dfs

bug 200091124

Change-Id: I962d57996ec8663507989231f5b9d24fd5db0c47
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: http://git-master/r/723170
(cherry picked from commit 8274d92c0ca6d1b0a74f5edf54dd9c03e908e788)
Reviewed-on: http://git-master/r/729572
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>

4 years agoarm: dt: p1761: disable qc2.0 charging
Rakesh Babu Bodla [Tue, 5 May 2015 09:00:31 +0000]
arm: dt: p1761: disable qc2.0 charging

Disabling QC2.0 charging to avoid battery swelling
issues.

Change-Id: Ib76b897dcea58b346b1c5463cebbedde5bc3cbe2
Signed-off-by: Rakesh Babu Bodla <rbodla@nvidia.com>
Reviewed-on: http://git-master/r/738978
(cherry picked from commit 1d4f619763d3366e803a99927dbb80e751147641)
Reviewed-on: http://git-master/r/741166
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

4 years agoasoc: tegra-alt: Use NULL instead of integer
Amit Sharma (SW-TEGRA) [Tue, 19 May 2015 04:02:27 +0000]
asoc: tegra-alt: Use NULL instead of integer

Fixed the following sparse warning by using the proper 'NULL' instead of '0':
- warning: Using plain integer as NULL pointer

Bug 200067946

Change-Id: I97f695d75c61c8770168e6c25d276f7cbc13f306
Signed-off-by: Amit Sharma (SW-TEGRA) <amisharma@nvidia.com>
Reviewed-on: http://git-master/r/744121
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Viraj Karandikar <vkarandikar@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agovideo: tegra: nvmap: support searching platform data for carveouts
Sri Krishna chowdary [Tue, 19 May 2015 16:29:11 +0000]
video: tegra: nvmap: support searching platform data for carveouts

Add logic to find out any carveout's platform data using its name.

This is in preparation to reserved-memory support.

Bug 200027296

Change-Id: I94270161f87abf6dd11e6e7520cd05b4cc6115c2
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/740683
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agovideo: tegra: nvmap: always initilize carveout's dma_dev
Sri Krishna chowdary [Tue, 19 May 2015 16:12:37 +0000]
video: tegra: nvmap: always initilize carveout's dma_dev

If carveout's dma_dev is not initialized at compile time,
initialize it at runtime with the device present within.

This is needed to simplify the logic for reserved-memory handling.

Remove the redundant device from nvmap_heap.

Bug 200027296

Change-Id: Ib44fbc10f12370c012295f3954c29ee8ef627d3f
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/744431
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agovideo: tegra: nvmap: modify ivm carveout population
Sri Krishna chowdary [Tue, 19 May 2015 15:51:54 +0000]
video: tegra: nvmap: modify ivm carveout population

modify ivm carveout init to initialize from phandle.
Also, add a helper function that will fetch a free slot in
nvmap_carveouts array.

This is in preparation to reserved-memory support.

Bug 200027296

Change-Id: Ie3dccbd9dc260ff390ee3c9370e00a82d23be1ce
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/744430
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agoARM: tegra: ERS: set CPU regulator interrupt to Shared for E2174-1101
Laxman Dewangan [Thu, 21 May 2015 17:58:05 +0000]
ARM: tegra: ERS: set CPU regulator interrupt to Shared for E2174-1101

Set CPU regulator MAX77621 interrupt flag to SHARED as it
is shard between GPU regulator and PMIC.

bug 1636415

Change-Id: Ib662268086821926cfd66042bfc9970fddc80090
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/745775

4 years agovideo: tegra: dc: Fix sparse warning
Vinod G [Wed, 15 Apr 2015 00:44:41 +0000]
video: tegra: dc: Fix sparse warning

bug 200067946

Change-Id: Id92b513d052fddfe9bf5f132fbfbffb78c3e30bf
Signed-off-by: Vinod G <vinodg@nvidia.com>
Reviewed-on: http://git-master/r/731557
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Aron Wong <awong@nvidia.com>
Reviewed-by: Jon Mayo <jmayo@nvidia.com>

4 years agovideo: tegra: nvmap: use static nvmap_carveout
Sri Krishna chowdary [Tue, 19 May 2015 15:20:08 +0000]
video: tegra: nvmap: use static nvmap_carveout

Having the array for carveout platform data created at runtime
complicates reserved-memory logic. So, clean it up.

Bug 200027296

Change-Id: If59cbed43699301f6f11870e872aaba9c90e10ed
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/744429
Reviewed-by: Raghavendra V K <rvk@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>

4 years agogpu: nvgpu: Fix build problem by including slab.h
Terje Bergstrom [Thu, 21 May 2015 22:53:33 +0000]
gpu: nvgpu: Fix build problem by including slab.h

Change-Id: I2346ed48bf82c032194264bab999097bf86404e2
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/745885
Tested-by: Matt Craighead <mcraighead@nvidia.com>

4 years agogpu: nvgpu: Use vmalloc only when size >4K
Terje Bergstrom [Mon, 18 May 2015 20:37:54 +0000]
gpu: nvgpu: Use vmalloc only when size >4K

When allocation size is 4k or below, we should use kmalloc. vmalloc
should be used only for larged allocations.

Introduce nvgpu_alloc, which checks the size, and decides the API
to use.

Change-Id: I593110467cd319851b27e57d1bfe8d228d3f2909
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/743974

4 years agogpu: nvgpu: Fix OOM case for buddy allocator
Alex Waterman [Wed, 20 May 2015 19:23:01 +0000]
gpu: nvgpu: Fix OOM case for buddy allocator

The allocator could attempt to use a buddy list for an order larger than
the max order when all the valid buddy lists were empty. This patch
ensures that when looking for a particular order buddy that the passed
order is valid.

Also handle the prints in the no-mem case a litle differently. Only print
and update alloc info when there was a successful allocation.

Lastly print hex numbers for the allocator stats printing function.

Change-Id: If289f3e8925e236e3b7d84206a75bd45a14082a1
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/745071
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 years agoarch: arm64: tegra21: Hawkeye EVT matrix
Erik Lilliebjerg [Wed, 20 May 2015 21:17:39 +0000]
arch: arm64: tegra21: Hawkeye EVT matrix

- Correct matrix: 0, -1, 0, 1, 0, 0, 0, 0, -1

Bug 1645717

Change-Id: Ia6e20495f2b8e7fb6bfc4ea9da0d99152f02ab89
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-on: http://git-master/r/745670
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Tested-by: Robert Collins <rcollins@nvidia.com>

4 years agoarch: arm64: tegra21: enable LTR659
Erik Lilliebjerg [Tue, 19 May 2015 06:07:45 +0000]
arch: arm64: tegra21: enable LTR659

- Enable LTR659 proximity sensor.

Change-Id: I5d38a246b456c470badb15b933d077580a62c541
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-on: http://git-master/r/744159
(cherry picked from commit d547cbe7bd6a1feca7697a93cba5f1a2ccf9602c)
Reviewed-on: http://git-master/r/745668
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Tested-by: Robert Collins <rcollins@nvidia.com>

4 years agodts: tegra: disable tsec in VM dtses
Richard Zhao [Wed, 22 Apr 2015 18:35:51 +0000]
dts: tegra: disable tsec in VM dtses

vhost does not support tsec yet.

Bug 200081130

Change-Id: I68dedc31b56dabc1c29440334b2e70e12db667d9
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/734457
(cherry picked from commit 84452a9cfafdb52e0c09f46bde8ac04e8e667772)
Reviewed-on: http://git-master/r/738698
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Vladislav Buzov <vbuzov@nvidia.com>

4 years agovideo: tegra: dp: add hotplug support
Shu Zhong [Sat, 18 Apr 2015 00:57:09 +0000]
video: tegra: dp: add hotplug support

Added hotplug support to dp driver for external
dp monitors.

Bug 200041308

Change-Id: Idded2469111bbab5c710c4b8781c3710d3467a1b
Signed-off-by: Shu Zhong <shuz@nvidia.com>
Reviewed-on: http://git-master/r/732917
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alvin Park <apark@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Santosh Galma <galmar@nvidia.com>
Reviewed-by: Mitch Luban <mluban@nvidia.com>

4 years agonet: usb: r8152: disable autosuspend
Aly Hirani [Thu, 5 Feb 2015 20:37:11 +0000]
net: usb: r8152: disable autosuspend

We've seen some issues with the Tegra XUSB controller resuming from
autosuspend. This change disables autosuspend until the XUSB team can
understand the issue

Bug 1604791
Bug 200091204

Change-Id: I9e7b4b85fe31a1a88e1f9e19d856c52f69dbb1b0
Signed-off-by: Aly Hirani <ahirani@nvidia.com>
Reviewed-on: http://git-master/r/681672
(cherry picked from commit fb40b49a54b23e3d592f69170172000d3a08e6b7)
Reviewed-on: http://git-master/r/744734
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agoarm64: jetson: dts: Pre-identify panel in device tree
Pankaj Dabade [Tue, 7 Apr 2015 10:45:15 +0000]
arm64: jetson: dts: Pre-identify panel in device tree

shim layer identifies the panel attached and updates the respective
node in the device tree. Bootloader uses this updated status bit to
identify the panel connected, therby taking the responsibility to
initialize it. In absence of DSI panel [status bit not updated]
bootloader programs DC0 for HDMI.
L4T does not use SHIM layer. Thus, If DSI panel is not pre-identifed
bootloader will initialize DC0 with HDMI.

Bug 200090075
Bug 200093426
Bug 200089633

Change-Id: I6102c951f3b61824e2aa09aa579c250c8032b185
Signed-off-by: Pankaj Dabade <pdabade@nvidia.com>
Reviewed-on: http://git-master/r/728493
(cherry picked from commit 0b7c3b77128ed02bb1d9c7aadbbcced4c19ee975)
Reviewed-on: http://git-master/r/745362
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

4 years agodrivers: media: platform: tegra: auto: power delay
Anurag Dosapati [Mon, 13 Apr 2015 22:42:28 +0000]
drivers: media: platform: tegra: auto: power delay

Remove delay after power on, as this will be done in user space

Bug 200093627

Change-Id: I1b81a8c7b1696005ee548ab47ec6c0c6e391077b
Signed-off-by: Anurag Dosapati <adosapati@nvidia.com>
Reviewed-on: http://git-master/r/731039
(cherry picked from commit ccdc256c590ef20677253240fa19641126038181)
Reviewed-on: http://git-master/r/743904
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Songhee Baek <sbaek@nvidia.com>
Reviewed-by: Arun Shamanna Lakshmi <aruns@nvidia.com>

4 years agoARM: tegra: ERS: set GPU regulator properties for E2174-1101
Laxman Dewangan [Tue, 19 May 2015 12:57:42 +0000]
ARM: tegra: ERS: set GPU regulator properties for E2174-1101

Set GPU regulator properties for E2174-1101 which has
CPU/GPU regulator as MAX77621.
Properties are:
- Set proper interrupt flags.
- provide ramp delay.
- boot off.
- disable external control.
- provide init voltage.

bug 1636415

Change-Id: Ib77d0739711a25c061c02db062b90a0f2c3c33a2
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/744894

4 years agoregulator: max8973: add support for interrupt flags from DT
Laxman Dewangan [Tue, 19 May 2015 12:47:54 +0000]
regulator: max8973: add support for interrupt flags from DT

Add support to read interrupt flags from DT for the given
platform. For ARM GIC interrupt controller, it is not possible
to send all irq flags through interrupt cells.

bug 1636415

Change-Id: Ic1b060b4a32d5d06414dfbca873909b2499f5fcb
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/744893

4 years agoreset: max77620: add support to configure GPIO before power reset
Laxman Dewangan [Mon, 18 May 2015 15:56:08 +0000]
reset: max77620: add support to configure GPIO before power reset

Add support on MAX77620 power off driver to configure
device's GPIOs to desired state just before system power
OFF or reset. The GPIOs and desired state will be provided
through DT. If desired property is not available then it
will not configure the GPIOs.

bug 1643199

Change-Id: Ibe5d7417e3f98a47f8e56c1ecb8805fc2e371e4d
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/744404
Reviewed-on: http://git-master/r/744892

4 years agovideo: tegra: dp: add documentation
Shu Zhong [Fri, 15 May 2015 20:46:58 +0000]
video: tegra: dp: add documentation

Add documentation for DP devicetree bindings.

Bug 200041308

Change-Id: Ief131b1e023a30d88a496f144ecc4b68519be1d9
Signed-off-by: Shu Zhong <shuz@nvidia.com>
Reviewed-on: http://git-master/r/743400
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>

4 years agot186: dts: add FPGA dts for CL 34324618
Rohit Khanna [Mon, 23 Mar 2015 23:58:58 +0000]
t186: dts: add FPGA dts for CL 34324618

Change-Id: I2ea111879b2c20bf2f0c2bda6a25d0597bd471e3
Signed-off-by: Rohit Khanna <rokhanna@nvidia.com>
Reviewed-on: http://git-master/r/721189
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
Tested-by: Alexander Van Brunt <avanbrunt@nvidia.com>

4 years agogpu: nvgpu: Alignment of data for 64 bit read
sujeet baranwal [Tue, 19 May 2015 17:50:09 +0000]
gpu: nvgpu: Alignment of data for 64 bit read

The packaging of register's value in 64 bit variable
needs the reversal of 32-bit-word.

Bug 200083334

Change-Id: Id938f2a2fcffc90ef135ae963ae288c9a655069a
Signed-off-by: sujeet baranwal <sbaranwal@nvidia.com>
Reviewed-on: http://git-master/r/744455
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

4 years agoarm64: dts: Adds dts file for trimmed configs
Mark Young [Fri, 3 Oct 2014 17:45:41 +0000]
arm64: dts: Adds dts file for trimmed configs

Adds a new dts file that adds extra kernel command line
options, and trims aways a subset of the devices not needed
in this config.

Change-Id: I39bc67955f50ed60909b445adf64f068052d0b43
Signed-off-by: Mark Young <myoung@nvidia.com>
Reviewed-on: http://git-master/r/562649
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Matt Craighead <mcraighead@nvidia.com>
Tested-by: Matt Craighead <mcraighead@nvidia.com>
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>

4 years agomm/hugetlb.c: call MMU notifiers when copying a hugetlb page range
Andreas Sandberg [Tue, 21 Jan 2014 23:49:09 +0000]
mm/hugetlb.c: call MMU notifiers when copying a hugetlb page range

When copy_hugetlb_page_range() is called to copy a range of hugetlb
mappings, the secondary MMUs are not notified if there is a protection
downgrade, which breaks COW semantics in KVM.

This patch adds the necessary MMU notifier calls.

Bug 200074285

Signed-off-by: Andreas Sandberg <andreas@sandberg.pp.se>
Acked-by: Steve Capper <steve.capper@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit e8569dd299dbc7bac878325c0bdc7aa449eae479)
Change-Id: I3a0c61b03fe6216579ed7234c15c20629e68714b
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/678259
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>

4 years agomm: numa: call MMU notifiers on THP migration
Mel Gorman [Thu, 19 Dec 2013 01:08:33 +0000]
mm: numa: call MMU notifiers on THP migration

MMU notifiers must be called on THP page migration or secondary MMUs
will get very confused.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit f714f4f20e59ea6eea264a86b9a51fd51b88fc54)

Conflicts:
mm/migrate.c

Bug 200074285

Change-Id: I39fcc86ed5e38b1cee986165737c93c5a2bc076e
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/678258
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>

4 years agoregulator: max15569: Change compatible of max16989 to max16989x
Laxman Dewangan [Mon, 4 May 2015 12:16:00 +0000]
regulator: max15569: Change compatible of max16989 to max16989x

Device MAX15569 is compatible with MAX16989 and driver of MAX15569
is used for MAX16989. There is many feature need to be added for
completion of MAX16989 and also it is require to have cleanups on
driver.

To reduce the number of changes and avoid the risk of break, create
new file for MAX16989 driver and change this driver file to support
max16989x as old driver.

bug 1627041

Change-Id: I1b90924592c43e4df724e6fe799f8ca90c742b77
signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/739012

4 years agopinctrl: tegra: uphy: fix Coverity issues
Deepak Nibade [Tue, 19 May 2015 09:24:59 +0000]
pinctrl: tegra: uphy: fix Coverity issues

remove logically dead code by using proper error check
on pointer
Coverity defect id : 30101

fix unsigned comparison against zero by declaring variable
"value" as int
Coverity defect id : 30105

Bug 1416640

Change-Id: I7acf0fa2f8726a9e5148a4cd07300ad2575b4760
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/744276
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Rakesh Babu Bodla <rbodla@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

4 years agomisc:cryptodev: Fix USE_AFTER_FREE coverity errors
Shravani Dingari [Mon, 18 May 2015 04:54:59 +0000]
misc:cryptodev: Fix USE_AFTER_FREE coverity errors

Fix coverity errors due to dereferencing freed
pointer ctx
Coverity id : 30088

Bug 1416640

Change-Id: I20ebb3d05ced4b7b5d1ce31315a4570e619e80fa
Signed-off-by: Shravani Dingari <shravanid@nvidia.com>
Reviewed-on: http://git-master/r/743598
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>

4 years agoarm64: tegra21: config: enable DNOTIFY
Bibek Basu [Wed, 6 May 2015 10:02:30 +0000]
arm64: tegra21: config: enable DNOTIFY

Enable CONFIG_DNOTIFY for L4T kernel config.
This is needed for idmapd

Bug 1627091

Change-Id: I4f35325d4abca83f416385436b5fc3afbe78d1ab
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/739554
(cherry picked from commit dba8689deedfd22c0246a7ee7005812606e51771)
Reviewed-on: http://git-master/r/743708
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Tested-by: Venkat Moganty <vmoganty@nvidia.com>

4 years agonet: wireless: bcmdhd: capture driver suspend/resume call
Rakesh Goyal [Tue, 5 May 2015 13:21:07 +0000]
net: wireless: bcmdhd: capture driver suspend/resume call

Bug 200042859

Change-Id: I5624fe017ff2508a11c06455549d968c5375b8bf
Signed-off-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-on: http://git-master/r/742612
(cherry picked from commit 1f536ca518c8e2765f2e2d864cef530c198882ca)
Reviewed-on: http://git-master/r/743779
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

4 years agommc: core: Enable Secure Feature support.
Naveen Kumar Arepalli [Wed, 6 May 2015 07:06:37 +0000]
mmc: core: Enable Secure Feature support.

-Currently this feature is not enabled for ext_csd version 7.
-This patch enables Secure Feature support.

Bug 1642823

Change-Id: Iaff6dff23f35718a8d72f735f925df97ad135f86
Signed-off-by: Naveen Kumar Arepalli <naveenk@nvidia.com>
Reviewed-on: http://git-master/r/739473
(cherry picked from commit 59590e7c599ab2776e3dec6af7894b3831de3ba0)
Reviewed-on: http://git-master/r/742021
(cherry picked from commit a301b399176790a241feb40bbf862b1dea885bf0)
Reviewed-on: http://git-master/r/741475
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: David Dastous St Hilaire <ddastoussthi@nvidia.com>
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>

4 years agoarm64: mm: Add __clean_dcache_louis
Krishna Reddy [Mon, 6 Apr 2015 18:30:13 +0000]
arm64: mm: Add __clean_dcache_louis

This allows perform L1 cache clean alone.

Bug 200077334

Change-Id: I776de6e6726862e330b626fd19f8ae8f70055538
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/744582

4 years agovideo: tegra: host: rename scale3d to scale_emc
Sam Payne [Mon, 18 May 2015 18:55:14 +0000]
video: tegra: host: rename scale3d to scale_emc

3d scaling has not been done in nvhost for over
a year

bug 1645757

Change-Id: Id455031a6935204d258e89b9fbebf9fa63455e62
Signed-off-by: Sam Payne <spayne@nvidia.com>
Reviewed-on: http://git-master/r/743940
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>

4 years agoiio: proximity: Fix auto-detect unload
Erik Lilliebjerg [Fri, 8 May 2015 15:52:26 +0000]
iio: proximity: Fix auto-detect unload

- In the previous version, if the device wasn't found, the early exit
  encountered a NULL pointer during driver unload.
- Added DT documentation for the configuration options of this driver.

Bug 1633231

Change-Id: I9ba8a5efd5e2fc8d874d72d8fff35a8a4526c929
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-on: http://git-master/r/740681
(cherry picked from commit 182edccee8122fdee48379f1f6639a3e24b24844)
Reviewed-on: http://git-master/r/743878
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Tested-by: Robert Collins <rcollins@nvidia.com>

4 years agoiio: proximity: IRQ driven SAR
Erik Lilliebjerg [Mon, 20 Apr 2015 18:06:07 +0000]
iio: proximity: IRQ driven SAR

- Add interrupt driven support.
- Fix I2C timeout.
- Add reseed.
- Add watchdog timer.
- Add streaming throttling.

By putting the IQS263 device in event mode and reseeding when necessary,
the device can be interrupt driven on proximity events without any polling.
When a proximity event occurs, the device is put in streaming mode.  Only
a single I2C read transaction is done (writes are still stacked) on each
streamed interrupt thereby reducing forced I2C transactions that cause I2C
timeouts.  Once all the reads are done, the device is put back in event
mode.  A watchdog thread forces an interrupt at a device tree programmable
rate.
Just streaming mode is supported as well.  Intead of normally going into
event mode, the interrupt is disabled for a device tree programmable
period, which upon expiration, reenables the interrupt.  This allows
throttling of the streaming interrupt.

Bug 1633231

Change-Id: If4262d7687eb06a603f6fad2980c3133aad1818f
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-on: http://git-master/r/739131
(cherry picked from commit 3c05f99061eb76d8461480009513e9d21a3c3296)
Reviewed-on: http://git-master/r/743877
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Robert Collins <rcollins@nvidia.com>
Tested-by: Robert Collins <rcollins@nvidia.com>