summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-01imx4.1: enable 32bit screen for imx7dandroid-o-iot-preview-5o-iot-preview-5Jaesung Chung
Bug: 64241459 Change-Id: I6921314d0f66a8e3576ca15dfa4493a4028430bb
2017-07-13release-request-aecd98ff-81ad-42d1-bb20-b9decd639cbb-for-git_oc-iot-release- ↵android-build-team Robot
4177102 snap-temp-L45200000081929329 Change-Id: I2be6abfdb208845d32235b11a71674b81bb0ee26
2017-07-12Revert HWC2 related changesTerry Heo
This CL reverts following two changes. 6ce8c140 "MA-9666-3 add RGBA32 format support when bus-width is 18." bf997be6 "Make pico imx7d display as rgba32 by default" Bug: 63517065 Test: run cts CtsOpenGLTestCases Change-Id: I933f09cf512ea7515b7c56e97112d5ee9379496d
2017-07-07release-request-75b163aa-23f6-4e4a-a6e9-ba579c4661c8-for-git_oc-iot-release- ↵android-build-team Robot
4161447 snap-temp-L79100000080356153 Change-Id: Ida32109bd13bf3cff568edde26d9ec6a95c60913
2017-07-07Merge changes from topic 'nxp-hwc2' into oc-iot-devTreeHugger Robot
* changes: MA-9666-3 add RGBA32 format support when bus-width is 18. Make pico imx7d display as rgba32 by default
2017-06-29release-request-9d8ea786-ae50-40a0-8fe9-ed1b72118bcb-for-git_oc-iot-release- ↵android-build-team Robot
4145127 snap-temp-L37600000078703490 Change-Id: Ia3ba5c770f4d8eb696eae6da1a88671269e437dd
2017-06-26ANDROID: sched/tune: add initial support for CGroups based boostingPatrick Bellasi
To support task performance boosting, the usage of a single knob has the advantage to be a simple solution, both from the implementation and the usability standpoint. However, on a real system it can be difficult to identify a single value for the knob which fits the needs of multiple different tasks. For example, some kernel threads and/or user-space background services should be better managed the "standard" way while we still want to be able to boost the performance of specific workloads. In order to improve the flexibility of the task boosting mechanism this patch is the first of a small series which extends the previous implementation to introduce a "per task group" support. This first patch introduces just the basic CGroups support, a new "schedtune" CGroups controller is added which allows to configure different boost value for different groups of tasks. To keep the implementation simple but still effective for a boosting strategy, the new controller: 1. allows only a two layer hierarchy 2. supports only a limited number of boost groups A two layer hierarchy allows to place each task either: a) in the root control group thus being subject to a system-wide boosting value b) in a child of the root group thus being subject to the specific boost value defined by that "boost group" The limited number of "boost groups" supported is mainly motivated by the observation that in a real system it could be useful to have only few classes of tasks which deserve different treatment. For example, background vs foreground or interactive vs low-priority. As an additional benefit, a limited number of boost groups allows also to have a simpler implementation especially for the code required to compute the boost value for CPUs which have runnable tasks belonging to different boost groups. cc: Tejun Heo <tj@kernel.org> cc: Li Zefan <lizefan@huawei.com> cc: Johannes Weiner <hannes@cmpxchg.org> cc: Ingo Molnar <mingo@redhat.com> cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com> Signed-off-by: Andres Oportus <andresoportus@google.com> Bug: 62598057 Change-Id: Ie906ec38eb80f4b77d62da4e8056ec428a0197a7 (cherry picked from commit ae71030fd5563e029cf6d11926055cb55d64512a)
2017-06-26ANDROID: sched/tune: add sysctl interface to define a boost valuePatrick Bellasi
The current (CFS) scheduler implementation does not allow "to boost" tasks performance by running them at a higher OPP compared to the minimum required to meet their workload demands. To support tasks performance boosting the scheduler should provide a "knob" which allows to tune how much the system is going to be optimised for energy efficiency vs performance. This patch is the first of a series which provides a simple interface to define a tuning knob. One system-wide "boost" tunable is exposed via: /proc/sys/kernel/sched_cfs_boost which can be configured in the range [0..100], to define a percentage where: - 0% boost requires to operate in "standard" mode by scheduling tasks at the minimum capacities required by the workload demand - 100% boost requires to push at maximum the task performances, "regardless" of the incurred energy consumption A boost value in between these two boundaries is used to bias the power/performance trade-off, the higher the boost value the more the scheduler is biased toward performance boosting instead of energy efficiency. cc: Ingo Molnar <mingo@redhat.com> cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com> Signed-off-by: Andres Oportus <andresoportus@google.com> Bug: 62598057 Change-Id: I33c5e5a3406dddee2005786f4d97c56334c4662b (cherry picked from commit 69fa4c768a73c25b9b3f26d074295c53f839a57c)
2017-06-26ANDROID: sched/tune: add detailed documentationPatrick Bellasi
The topic of a single simple power-performance tunable, that is wholly scheduler centric, and has well defined and predictable properties has come up on several occasions in the past. With techniques such as a scheduler driven DVFS, we now have a good framework for implementing such a tunable. This patch provides a detailed description of the motivations and design decisions behind the implementation of the SchedTune. cc: Jonathan Corbet <corbet@lwn.net> cc: linux-doc@vger.kernel.org Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com> Signed-off-by: Andres Oportus <andresoportus@google.com> Bug: 62598057 Change-Id: Ia93ab3d3b5b88e7ca246f73b2fe5365610aea693 (cherry picked from commit afe22aa30ab0d936d8916de9dc97b583090157aa)
2017-06-22MA-9666-3 add RGBA32 format support when bus-width is 18.Jessie Hao
Cannot open Develop options->show surface updates on 6sx and 6sx_auto. Although imx6sx-sabreauto.dts settings is: display1: display { bits-per-pixel = <32>; bus-width = <18>; + fbpix = "ABGR32"; But the framebuffer format is RGB24 not ABGR32. This is because lack logic when bus-width is 18. Bug: 38400091, Bug: 38511042 Change-Id: I2ea7ada3e8e124f361979383404a3602a7f0fa0a Signed-off-by: Jaesung Chung <jaesung@google.com>
2017-06-22Make pico imx7d display as rgba32 by defaultChen Guoyin
Bug: 38400091, Bug: 38511042 Change-Id: Idcbe53097b473bc8f74dc88d5df1f8307a6b0b75 Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com> Signed-off-by: Jaesung Chung <jaesung@google.com>
2017-06-16release-request-108ee5cb-c44f-4686-8c00-d0aae000d1cd-for-git_oc-iot-release- ↵android-build-team Robot
4106415 snap-temp-L98800000074775600 Change-Id: Ic49602728fd5480337f9339f1b2bdfe5589a46cf
2017-06-16Merge changes I3c7f6a4b,Icd87368a into oc-iot-devJaesung Chung
* changes: BACKPORT: proc: add /proc/<pid>/timerslack_ns interface BACKPORT: timer: convert timer_slack_ns from unsigned long to u64
2017-06-15release-request-ccde7a51-36ef-42ed-a1e4-eabdc377ca97-for-git_oc-iot-release- ↵android-build-team Robot
4102639 snap-temp-L11400000074378468 Change-Id: I0540ed71ce39c08a6abb05006fc9ed5a94136a45
2017-06-15BACKPORT: proc: add /proc/<pid>/timerslack_ns interfaceJohn Stultz
This backports 5de23d435e88996b1efe0e2cebe242074ce67c9e This patch provides a proc/PID/timerslack_ns interface which exposes a task's timerslack value in nanoseconds and allows it to be changed. This allows power/performance management software to set timer slack for other threads according to its policy for the thread (such as when the thread is designated foreground vs. background activity) If the value written is non-zero, slack is set to that value. Otherwise sets it to the default for the thread. This interface checks that the calling task has permissions to to use PTRACE_MODE_ATTACH_FSCREDS on the target task, so that we can ensure arbitrary apps do not change the timer slack for other apps. Signed-off-by: John Stultz <john.stultz@linaro.org> Acked-by: Kees Cook <keescook@chromium.org> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Oren Laadan <orenl@cellrox.com> Cc: Ruchi Kandoi <kandoiruchi@google.com> Cc: Rom Lemarchand <romlem@android.com> Cc: Android Kernel Team <kernel-team@android.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Bug: None Patchset: pr-set-timerslack-pid (backported from 5de23d435e88996b1efe0e2cebe242074ce67c9e) Signed-off-by: Mattias Nissler <mnissler@google.com> Change-Id: I3c7f6a4be4dae15f4a8d679a96af314e5680057b
2017-06-15BACKPORT: timer: convert timer_slack_ns from unsigned long to u64John Stultz
This backports da8b44d5a9f8bf26da637b7336508ca534d6b319 from upstream. This patchset introduces a /proc/<pid>/timerslack_ns interface which would allow controlling processes to be able to set the timerslack value on other processes in order to save power by avoiding wakeups (Something Android currently does via out-of-tree patches). The first patch tries to fix the internal timer_slack_ns usage which was defined as a long, which limits the slack range to ~4 seconds on 32bit systems. It converts it to a u64, which provides the same basically unlimited slack (500 years) on both 32bit and 64bit machines. The second patch introduces the /proc/<pid>/timerslack_ns interface which allows the full 64bit slack range for a task to be read or set on both 32bit and 64bit machines. With these two patches, on a 32bit machine, after setting the slack on bash to 10 seconds: $ time sleep 1 real 0m10.747s user 0m0.001s sys 0m0.005s The first patch is a little ugly, since I had to chase the slack delta arguments through a number of functions converting them to u64s. Let me know if it makes sense to break that up more or not. Other than that things are fairly straightforward. This patch (of 2): The timer_slack_ns value in the task struct is currently a unsigned long. This means that on 32bit applications, the maximum slack is just over 4 seconds. However, on 64bit machines, its much much larger (~500 years). This disparity could make application development a little (as well as the default_slack) to a u64. This means both 32bit and 64bit systems have the same effective internal slack range. Now the existing ABI via PR_GET_TIMERSLACK and PR_SET_TIMERSLACK specify the interface as a unsigned long, so we preserve that limitation on 32bit systems, where SET_TIMERSLACK can only set the slack to a unsigned long value, and GET_TIMERSLACK will return ULONG_MAX if the slack is actually larger then what can be stored by an unsigned long. This patch also modifies hrtimer functions which specified the slack delta as a unsigned long. Signed-off-by: John Stultz <john.stultz@linaro.org> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Oren Laadan <orenl@cellrox.com> Cc: Ruchi Kandoi <kandoiruchi@google.com> Cc: Rom Lemarchand <romlem@android.com> Cc: Kees Cook <keescook@chromium.org> Cc: Android Kernel Team <kernel-team@android.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Bug: None Patchset: pr-set-timerslack-pid (backported from da8b44d5a9f8bf26da637b7336508ca534d6b319) Signed-off-by: Mattias Nissler <mnissler@google.com> Change-Id: Icd87368aea21ee87da5e24ea4431e459bb7445ce
2017-06-14Aquila: fix audio not work issuefang hui
am: 670ba96951 Change-Id: Ia97621e6fcb4859bef1ec064964207a50d550222
2017-06-14Aquila: fix audio not work issuefang hui
Enable SAI2 mclk output Change-Id: Ie8de19b05f1dd11d233858e042f7afeecbc7d8f3 Signed-off-by: fang hui <hui.fang@nxp.com>
2017-06-14release-request-0697e36b-038b-4487-8b57-e74bdb64da21-for-git_oc-iot-release- ↵android-build-team Robot
4099383 snap-temp-L40700000074049713 Change-Id: I6aca2f92b8b1ce9334c491f28136d58f90db6be4
2017-06-13ARM:dts:imx7d-pico: Remove conflict padHaoran.Wang
am: 7dc1325fda Change-Id: I98263a8de760d3e3b6adaeba8c0b9695b12ac0ba
2017-06-13Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y_android' into ↵Haoran.Wang
n-iot-fs-dev-iot_imx6ul_pico am: 32f594ca45 Change-Id: If497b8f1ea10378cb34d4fdf22f88c3dd10d0c81
2017-06-09release-request-b35a82fb-a7d3-449c-ae4b-d5fed1e8931f-for-git_oc-iot-release- ↵android-build-team Robot
4085548 snap-temp-L83500000072619048 Change-Id: Id8122af600db4fc1e09ea3aed2877206d6d1903c
2017-06-09ARM:dts:imx7d-pico: Remove conflict padHaoran.Wang
Removing conflict pad definition to fix bluetooth not work on imx7d-pico. Change-Id: Ib362c9c12e6dc32dec2796d0714947355b619b2e Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
2017-06-09Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y_android' into ↵Haoran.Wang
n-iot-fs-dev-iot_imx6ul_pico Signed-off-by: Haoran.Wang <elven.wang@nxp.com> Conflicts: arch/arm/boot/dts/Makefile arch/arm/boot/dts/imx7d.dtsi arch/arm/configs/imx_v7_android_defconfig arch/arm/mach-imx/clk-imx7d.c drivers/net/wireless/bcmdhd/Makefile drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c drivers/net/wireless/bcmdhd/dhd_linux_platdev.c drivers/usb/gadget/configfs.c include/dt-bindings/clock/imx7d-clock.h sound/soc/fsl/Makefile sound/soc/fsl/imx-wm8962.c Change-Id: I5c346de03563adf6c5968e0ba8f95d40d4d45382
2017-06-08Merge changes If14fbc4c,I46c5e1a7 into nyc-iot-devAmit Uttamchandani
am: 0f361fd84d Change-Id: I5723e985797dc6cf8e9df97d7a785efe257ec5f7
2017-06-08Merge changes If14fbc4c,I46c5e1a7 into nyc-iot-devAmit Uttamchandani
* changes: Support mfgtool kernel build with imx_v7_mfg_defconfig ARM: defconfig: Support fuse program in mfgtool's zImage
2017-06-07release-request-501eef98-0cea-4081-82fb-ae6e15af7be8-for-git_oc-iot-release- ↵android-build-team Robot
4075327 snap-temp-L70100000071406846 Change-Id: I94525bbc3095a5f740635ed9aa8726b1df2acf8a
2017-06-06Enable CONFIG_BCM4339 to boost wifi performance with OOByang.tian
am: 3f09acaf02 Change-Id: I29b4efd6b75f44927fe61f0352320c9ea57c5f5f
2017-06-06bcmdhd: add OOB support for all IMX6 and IMX7 platformsyang.tian
am: cbd7f5c78b Change-Id: I98deb401b9c6ad5517a4ac685826790db9c4b360
2017-06-06Edit pinctrl for wifiyang.tian
am: 28d576977e Change-Id: Iccaa88094099bf5efe7ee1d229f9968be69d1cf6
2017-06-06bcmdhd: upgrade the driver to 1.141.100.6 on 4.1 kernelyang.tian
am: 5d1b836a2a Change-Id: Ia42cd4943d14ad672639bc2f5873b8c4ede9b204
2017-06-05Enable CONFIG_BCM4339 to boost wifi performance with OOByang.tian
Enable CONFIG_BCM4339 to boost wifi performance on 7d-pico, 6ul-pico and 6ul-iopb boards. With this config enabled, in iperf test,as a client role, 7d-pico average wifi performance increased to 46.36Mbits/sec from 37.01Mbits/sec under 10 times test.Got a 25% increase rate. Change-Id: Ief557bfe6ec4d6da397000fdbdca3f05fcddabce Signed-off-by: Tian Ynag <yang.tian@nxp.com>> (cherry picked from commit 401df9cb81bd978ffea639c413832727a4e63265)
2017-06-05bcmdhd: add OOB support for all IMX6 and IMX7 platformsyang.tian
Enable OOB feature for 7d-pico,6ul-pico,6ul-argon boards. NOTE: The performance optimization option CONFIG_BCM4339 is disabled by default. If user want to test performance on the above platforms, CONFIG_BCM4339 has to be enabled manually. Change-Id: I6089cce77e43f1f54769edc17e4304ffdf644783 Signed-off-by:Tian Yang <yang.tain@nxp.com> (cherry picked from commit d1df89396f7a97fab079e96d03bbfde451d76ae1)
2017-06-05Edit pinctrl for wifiyang.tian
Remove bt pinctrl from wifi pinctrl-0,as it should not be assigned under bcmdhd_wlan0's pinctrl-0. Change-Id: Id2ed1507056498159234588c6dcdb50493a83527 Signed-off-by:Tian Yang<yang.tian@nxp.com> (cherry picked from commit 950f52bb2e2538110226cb0b3af8b5687440b462)
2017-06-05bcmdhd: upgrade the driver to 1.141.100.6 on 4.1 kernelyang.tian
Broadcom bcmdhd release 1.141.100.6 Features: - support for CYW43455 (Murata 1HK) - support for simultaneous STA-AP operation - Hostapd ACS support - 4339 OOB enable based on DTS GPIO configuration - 43340 packet filter timeout event Bug Fixes: - 4339 high current after wake up - Vendor IE does not show up in SoftAP beacons - mfgtest driver crash when wpa_supplicant is running - Fix for PMF testcase 5.3.3.2 failing due to deauth packets not being sent Known Issues: Kernel panic upon rmmod after insmod failure Change-Id: Ic91b934f1c15239081501c20993b0911c40f0f27 Signed-off-by:Tian Yang <yang.tian@nxp.com> (cherry picked from commit 23dc94e781c31db9edcff4ad22c485b16182a9d8)
2017-06-02MA-9666-2 add fbpix property for lcdif platform.ivan.liu
add RGBA32 format to 6sx_sdb and 7ulp_evk. Change-Id: Id410aac9d637054ca05bb20b2f916bb86853b8f5 Signed-off-by: ivan.liu <xiaowen.liu@nxp.com>
2017-06-01MA-9560 Fix PXP acceleration for YUV formats issue.ivan.liu
replace width with pitch to calculate UV offset. android yuv format is ycbcr kind. swap YUV->RGB coeffcients to adapt to android format. Change-Id: I3d219c9c927cc177a6fa8b2eb5dd0b795909295b Signed-off-by: ivan.liu <xiaowen.liu@nxp.com>
2017-05-25Support mfgtool kernel build with imx_v7_mfg_defconfigChen Guoyin
Driver should pass the build without andorid related config Change-Id: If14fbc4cc0dd944b3b6fcfc25bb3967dae3b0dbe Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
2017-05-25ARM: defconfig: Support fuse program in mfgtool's zImageChen Guoyin
Add CONFIG_FSL_OTP into mfgtool kernel config imx_v7_mfg_defconfig is updated through "make savedefconfig" Change-Id: I46c5e1a7adc744c1b481c814e37f9e8d8d20e42d Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
2017-05-25release-request-c569c56e-bf0f-485c-8976-a5c46477dd23-for-git_oc-iot-release- ↵android-build-team Robot
4042795 snap-temp-L28100000067760544 Change-Id: I1428cd1c640c5b7269b51f12ed8dcba5b774beca
2017-05-25MA-9666 add fbpix property for lcdif platform.ivan.liu
add RGBA32 format to 6sl_evk, 6sx_sdb and 6sx_auto. Change-Id: Idc689f9d9f552d2be274008a46529172871ae13a Signed-off-by: ivan.liu <xiaowen.liu@nxp.com>
2017-05-25MLK-14963 PXP: enable pxp interrupt after soft resetGuoniu.Zhou
After soft reset, the irq register value will be zero, so we need set it to enable all pxp interrupts. Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
2017-05-24Merge "imx6: support pico-pi baseboard" into nyc-iot-devAmit Uttamchandani
am: 9f04b7d0c5 Change-Id: I65a466fe856bbf51abc0cb34459554680e720f2b
2017-05-24Merge "imx6: support pico-pi baseboard" into nyc-iot-devAmit Uttamchandani
2017-05-24MA-9658 fix screen mess when enable show surface updateivan.liu
add flip_complete to make sure frame update correctly. It references to pan display code. Change-Id: I1a24e5dbe2c3942c6c0411fb0a80c5a08c937cb4 Signed-off-by: ivan.liu <xiaowen.liu@nxp.com>
2017-05-24MA-9657 imx7d-sdb: add fbpix property for framebufferRobby Cai
note 'bits-per-pixel' has priority over 'fbpix', so please set them in pair. Change-Id: I3b063e9cf289b602acfc074e33c03dddf3794092 Signed-off-by: ivan.liu <xiaowen.liu@nxp.com>
2017-05-24MLK-14941: mxsfb: add ARGB32 and ABGR32 format supportRobby Cai
add a property in dts called 'fbpix' to assign the pixel format for framebuffer. note 'bits-per-pixel' has priority over 'fbpix', so please set them in pair. if 'bits-per-pixel' is set to 16 and no 'fbpix' is set, defaults to RGB565. example for 32bit setting (tested on i.mx7d): display0: display { - bits-per-pixel = <16>; + bits-per-pixel = <32>; bus-width = <24>; + fbpix = "ABGR32"; Signed-off-by: Robby Cai <robby.cai@nxp.com>
2017-05-17release-request-9691d4ad-cc1b-479b-a3a6-64f72cbf9302-for-git_oc-iot-release- ↵android-build-team Robot
4016784 snap-temp-L92400000064925575 Change-Id: I4151be0aeb76e6006087af8b5ec5daef202feea3
2017-05-16imx6: support pico-pi baseboardDavid Pursell
Patch by NXP to create a device tree configuration for Pico Pi RevB baseboards with the iMX6UL. We can't match the RPi/iMX7D pinouts exactly due to differing pin functionality and wiring, but this gets us as close as possible. Bug: http://b/38342901 Test: PIO test app controls I/O properly. Change-Id: I43593f2c88c43d6c1c17c25dfed181ebea8a6294
2017-05-17MA-9597 [Android] change the pxp_dma.h in kernel to resolve the compile fail ↵Zhang Bo
issue replace the "bool" with "unsigned char" in this pxp_dma.h. So the updated file in device/fsl/common/kernel-headers/linux/pxp_dma.h will not cause compile error in sabresd-7d board. Change-Id: Iba210eb3d034ca54c35ee092ea20609ad568a7eb Signed-off-by: Zhang Bo <bo.zhang@nxp.com>