aboutsummaryrefslogtreecommitdiff
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-14.1_dev' of ↵Rygebin2017-06-131-1/+0
|\ | | | | | | https://github.com/OneDeveloperOrganization/android_kernel_google_shamrock into cm-14.1
| * Merge branch 'android-msm-shamrock-3.10-nougat-mr1-release' of ↵Rygebin2017-06-041-1/+0
| |\ | | | | | | | | | https://github.com/android/kernel_msm into cm-14.1
| | * FROMLIST: defconfig: msm: Disable CONFIG_CP_ACCESS64Richard Chang2017-03-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the cpaccess64 driver. This driver allows user space access to cpu registers. With this driver enabled, a CTS test causes the system to crash. CRs-Fixed: 968777 Bug: 32068683 Change-Id: I3ebe7220c7ca68a25b781c2e836a735d11dcaf08
* | | shamrock: use a lower power level for GPUDreamStar0012017-06-111-1/+1
|/ / | | | | | | Should reduce battery usage on idle.
* | shamrock: Enable RPFILTERRygebin2017-05-061-0/+2
| | | | | | | | * Correct fix hotspot
* | Revert "Enable IP/6_NF_NATCH_RPFILTER"Rygebin2017-05-031-1/+0
| | | | | | | | This reverts commit b67efa9a53bc147b54b8a8b1c2f60acfdccb3997.
* | shamrock: Update defconfigRygebin2017-04-291-5/+2
| |
* | Revert "shamrock: defconfig: Disable unused chargers"Rygebin2017-04-281-4/+4
| | | | | | | | This reverts commit 056ba399e487dd4e2588e57a669ddcbb56f34517.
* | Revert "shamrock: defconfig: Disable unused touchscreen drivers"Rygebin2017-04-281-3/+3
| | | | | | | | This reverts commit 64c8b31d1c1c6f4a39bf4a7f29eb643173b5f16f.
* | shamrock: Enable F2FS SupportRygebin2017-04-281-0/+5
| |
* | Enable IP/6_NF_NATCH_RPFILTERRygebin2017-04-231-0/+1
| | | | | | | | Fixes Wifi hotspot
* | defconfig: 8916 : Hotspot Tethering option keep resetting .lumy12017-04-232-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable TCPMSS rule for NAT. Change-Id: I46ba0530e05be06c8d50cbbd5af31ed3a6814739 Signed-off-by: lumy1 <lumy1@motorola.com> Reviewed-on: http://gerrit.mot.com/809035 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver <sltawvr@motorola.com> Tested-by: Jira Key <jirakey@motorola.com> Reviewed-by: Xu Gao <njh348@motorola.com> Reviewed-by: Igor Kovalenko <igork@motorola.com> Submit-Approved: Jira Key <jirakey@motorola.com>
* | shamrock: defconfig: Turn on performance patchRygebin2017-04-231-1/+2
| |
* | shamrock: defconfig: Disable unused chargersThePunisherOT2017-04-231-4/+4
| |
* | shamrock: defconfig: Disable unused touchscreen driversThePunisherOT2017-04-231-3/+3
| |
* | shamrock: [PATCH] CONFIG_MSM_CORE_CTL=nRygebin2017-04-221-1/+1
| |
* | Merge branch 'android-msm-shamrock-3.10-nougat-release' of ↵Kaan Külahlı2017-03-034-6/+10
|\| | | | | | | | | | | https://github.com/android/kernel_msm into kaan Change-Id: I1b0ce189b3422d9f29fa4696e29084429c7068dd
| * Merge "9300: kernel : make some changes for ESD" into mnc-dr-dev-qcom-legoTreeHugger Robot2017-01-041-2/+2
| |\
| | * 9300: kernel : make some changes for ESDpangkun2016-12-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of RST signal in GOA Timing is each Frame will initialize the panel GOA circuit, to avoid during normal use or ESD test have charge accumulation, cause the panel abnormal GOA output. This solution also has confirmed by panel maker, so it is no other potential risk for end-user. Signed-off-by: pangkun <pangkun@longcheer.net> Change-Id: Ie9c9136c3aec67926d71c738f2496ea099fa2c3d
| * | defconfig: Enable config IP_NF_MATCH_RPFILTERBulbul Dabi2016-12-292-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Enable config IP_NF_MATCH_RPFILTER. This option allows you to match packets whose replies would go out via the interface the packet came in. Change-Id: I1a1922f7d9c2e59a4676981ed51bf0c6157c0198 Signed-off-by: Ashwanth Goli <ashwanth@codeaurora.org>
| * | Merge changes Idbbe6499,I8cadef68 into mnc-dr-dev-qcom-legoTreeHugger Robot2016-11-211-3/+3
| |\| | | | | | | | | | | | | | | | * changes: driver:touchscreen: update firmware dts: lcd: modified for lcd issue
| | * dts: lcd: modified for lcd issuepangkun2016-11-181-3/+3
| | | | | | | | | | | | | | | | | | | | | Fix touchpanel screen jump point. Change-Id: I8cadef68a81767a653e5582a5542ab8601c8484d Signed-off-by: pangkun <pangkun@longcheer.net>
| * | arm64: make sys_call_table constSivacharan Paka2016-11-091-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | As with x86, mark the sys_call_table const such that it will be placed in the .rodata section. This will cause attempts to modify the table (accidental or deliberate) to fail when strict page permissions are in place. In the absence of strict page permissions, there should be no functional change. Change-Id: I6c249c0910ec7919e1c93b618caeb247395012da Signed-off-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| * DTS: battery: add battery parameters for new batterypangkun2016-10-172-0/+63
| | | | | | | | | | | | | | | | New battery is ATL. The battery ID is 10k. The battery ID of SCUD is 47k. Change-Id: If363d03caf17bc1d2860e782691da83a4400f6e5 Signed-off-by: pangkun <pangkun@longcheer.net>
* | shamrock: Build core_ctl module into kernelRygebin2017-02-011-1/+1
| | | | | | | | Change-Id: I6d987d97da3f585d9ba0e83c2bf9032d13acf445
* | shamrock: Disable MODULES supportRygebin2017-01-121-3/+1
| |
* | shamrock: Rebrand to LineageOSRygebin2017-01-071-1/+1
| | | | | | | | Change-Id: I0708592525282598a58abf675edb44a974fe3a37
* | DTS: battery: add battery parameters for new batterypangkun2016-12-022-0/+63
| | | | | | | | | | | | | | | | New battery is ATL. The battery ID is 10k. The battery ID of SCUD is 47k. Change-Id: If363d03caf17bc1d2860e782691da83a4400f6e5 Signed-off-by: pangkun <pangkun@longcheer.net>
* | Add defconfig file for shamrockCaner Aydın2016-11-071-0/+664
|/
* perf_defconfig: msm8952: disable RMI4 dev moduleBulbul Dabi2016-09-271-1/+0
| | | | | | | | | Synaptics driver supports an RMI4 dev module to interact with userspace. Disable the module due to security concerns. Change-Id: Ia8afa5e9cb60c074f13331533630f2583e466d89 Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
* arm64: perf: reject groups spanning multiple HW PMUsSivacharan Paka2016-09-081-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The perf core implicitly rejects events spanning multiple HW PMUs, as in these cases the event->ctx will differ. However this validation is performed after pmu::event_init() is called in perf_init_event(), and thus pmu::event_init() may be called with a group leader from a different HW PMU. The ARM64 PMU driver does not take this fact into account, and when validating groups assumes that it can call to_arm_pmu(event->pmu) for any HW event. When the event in question is from another HW PMU this is wrong, and results in dereferencing garbage. This patch updates the ARM64 PMU driver to first test for and reject events from other PMUs, moving the to_arm_pmu and related logic after this test. Fixes a crash triggered by perf_fuzzer on Linux-4.0-rc2, with a CCI PMU present: Bad mode in Synchronous Abort handler detected, code 0x86000006 -- IABT (current EL) CPU: 0 PID: 1371 Comm: perf_fuzzer Not tainted 3.19.0+ #249 Hardware name: V2F-1XV7 Cortex-A53x2 SMM (DT) task: ffffffc07c73a280 ti: ffffffc07b0a0000 task.ti: ffffffc07b0a0000 PC is at 0x0 LR is at validate_event+0x90/0xa8 pc : [<0000000000000000>] lr : [<ffffffc000090228>] pstate: 00000145 sp : ffffffc07b0a3ba0 [< (null)>] (null) [<ffffffc0000907d8>] armpmu_event_init+0x174/0x3cc [<ffffffc00015d870>] perf_try_init_event+0x34/0x70 [<ffffffc000164094>] perf_init_event+0xe0/0x10c [<ffffffc000164348>] perf_event_alloc+0x288/0x358 [<ffffffc000164c5c>] SyS_perf_event_open+0x464/0x98c Code: bad PC value Also cleans up the code to use the arm_pmu only when we know that we are dealing with an arm pmu event. Change-Id: I120c9f131601569e3161d09f8a4bc9306a16000d Cc: Will Deacon <will.deacon@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Peter Ziljstra (Intel) <peterz@infradead.org> Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
* Merge "dts: charger: config the icl of hvdcp to 2500mA" into ↵TreeHugger Robot2016-09-051-0/+1
|\ | | | | | | mnc-dr-dev-qcom-lego
| * dts: charger: config the icl of hvdcp to 2500mApangkun2016-08-181-0/+1
| | | | | | | | | | | | | | | | Ife we used the default value(1800mA). The current to battery is two small(2100mA) when we used 5.5V hvdcp. Change-Id: Ie33c4e890ca630cbe3654a3f5897a1df09333cd9 Signed-off-by: pangkun <pangkun@longcheer.net>
* | Merge changes I8c55d6fe,I554c45ef,Ice39d7a1,Ic30cc9b0,I2d935200 into ↵Richard Chang2016-08-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev-qcom-lego * changes: msm : dma_test: Initialize newly allocated memory msm: camera: Fix memory read by adding bounds check qcom: ssr: Fix possible overflow when copying firmware name ppp: take reference on channels netns ASN.1: Fix non-match detection failure on data overrun
| * | msm : dma_test: Initialize newly allocated memorySivacharan Paka2016-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The MSM_DMA_IOALLOC ioctl command allocates kernel memory and this memory can be read back using the MSM_DMA_IORBUF ioctl command. This memory is not zero-initialized and may contain sensitive data. Change-Id: I8c55d6fe500e7607690b89806715893783eecf9c Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
* | | msm8952: Enable CONFIG_INET_DIAG_DESTROYVinay Kalia2016-08-182-0/+2
| |/ |/| | | | | | | BUG: 30785619 Change-Id: I88e1df18797411d921f93dc98ef51166729ff4c0
* | LCM: Enhance esd check ability for truly R63350 LCD panelyanghong12016-08-111-9/+12
|/ | | | | | | | | | | Lcd panel enter LP11 when hsync ,then to improve the esd check for truly r63350 panel. Add physical width / height to display panel. BUG: 30727985 Change-Id: I97e70bb8e591523ba3f35419e1e3093cb7d3b8fa Signed-off-by: yanghong1 <yanghong1@longcheer.net>
* Add pmu driver entryBulbul Dabi2016-08-081-0/+6
| | | | | | | Add device tree entry for perf pmu driver perf hw events Change-Id: I4f917d40f395d8e3af24ce29bcfbd19a1c0b9245
* ARM: dts: Change the charge parameters for SHARPShigeru Murai2016-07-271-1/+1
| | | | | | | Change the charge parameters "qcom,charging-timeout-mins" for SHARP. Change-Id: Ib23b4ebc768d58767e394ec9dcbecdbb1fb17f27
* Revert "arm64: Introduce execute-only page access permissions"Bulbul Dabi2016-06-211-5/+3
| | | | | | | | | | | | This reverts commit bc07c2c6e9ed125d362af0214b6313dca180cb08. While the aim is increased security for --x memory maps, it does not protect against kernel level reads. Until SECCOMP is implemented for arm64, revert this patch to avoid giving a false idea of execute-only mappings. Change-Id: Ib3c04db8e437f523e671e4fb8805e275fdca8e31 Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
* msm: perf: Do not allocate new hw_event if event is duplicate.Bulbul Dabi2016-06-212-0/+2
| | | | | | | | | | | | | | | | | | | | | During a perf_event_enable, kernel/events/core.c calls pmu->add() which is platform implementation(arch/arm/kernel/perf_event.c). Due to the duplicate constraints, arch/arm/mach-msm/perf_event_msm_krait_l2.c drivers marks the event as OFF but returns TRUE to perf_event.c which goes ahead and allocates the hw_event and enables it. Since event is marked OFF, kernel events core will try to enable this event again during next perf_event_enable. Which results in same event enabled on multiple hw_events. But during the perf_release, event struct is freed and only one hw_event is released. This results in dereferencing the invalid pointer and hence the crash. Fix this by returning error in case of constraint event duplicate. Hence avoiding the same event programmed on multiple hw event counters. Change-Id: Ia3360be027dfe87ac753191ffe7e0bc947e72455 Signed-off-by: Arun KS <arunks@codeaurora.org> Signed-off-by: Chetan Ravindranath <cravin@codeaurora.org>
* ARM: dts: Remove the display_mem region in sharp eve dtsiShigeru Murai2016-06-171-12/+0
| | | | | | | | Do not require display_mem region, so that frame buffer memory is allocated in mmap call dynamically. Change-Id: Ie5a933560e6230293762d541fa69f725d243a7d7
* usb: Fix D+/- Open AC charger can not be chargedShigeru Murai2016-06-171-0/+1
| | | | | | This modification is from Qualcomm, and the case number is 02497859. Change-Id: Id1c7c179ad56886c50a8352896fe0014695c2c2f
* usb: tusb: modified for dual role supportpangkun2016-06-161-0/+1
| | | | | | | | | | It's used for bug#28606723. 1. It can show "Power supply" menu in "Use USB for". 2. It can switch usb role for DUT. 3. Default to select DRP by code. Change-Id: Ia073cc37f5e8448032f7cb94d32690719c2fe2b6 Signed-off-by: pangkun <pangkun@longcheer.net>
* Merge "(1/2)ARM: dts: mmc: disable ICE and HW encryption for eve" into ↵Gediminas Ramanauskas2016-06-141-0/+4
|\ | | | | | | mnc-dr-dev-qcom-lego
| * (1/2)ARM: dts: mmc: disable ICE and HW encryption for eveShigeru Murai2016-05-231-0/+4
| | | | | | | | | | | | | | | | | | msm8952 get reset when ADMA+ICE is used and when host get a data CRC error from eMMC. The probability is very low that CRC error will occur. However Sharp decided to implement the workaround because there is a possibility of reset in no small measure. Other model should be decided for each whether it should be implemented or not. The workaround is to disable ICE. Needs matching changes in platform/system/vold.
* | Merge "ARM: dts: Change max-voltage for SHARP" into mnc-dr-dev-qcom-legoGediminas Ramanauskas2016-06-141-1/+1
|\ \
| * | ARM: dts: Change max-voltage for SHARPShigeru Murai2016-06-101-1/+1
| | | | | | | | | | | | | | | | | | We modify qcom,max-voltage-uv for SHARP perform. Change-Id: I90973231d8746445cf20e8d42d9a5d1e33afc68d
* | | Merge "ARM: dts: Change current limit in high temp" into mnc-dr-dev-qcom-legoGediminas Ramanauskas2016-06-141-0/+1
|\| |
| * | ARM: dts: Change current limit in high tempShigeru Murai2016-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | We change current limit in high temperature for our customize.We amend to sharp dts. Change-Id: I1d1923f390576040518d383f75407a5e2ee30252