From c44b4a34d24208d430d10366119aa61ea2041ffe Mon Sep 17 00:00:00 2001 From: Mathew Joseph Karimpanal Date: Wed, 2 Mar 2016 16:21:06 -0800 Subject: socinfo: Add support for MSM8996proAU SoC Add CPU IDs to the socinfo table needed to support MSM8996pro Automotive SoC. CRs-Fixed: 991575 Change-Id: I6efaf4574a5f563b0ee3edd8545e0acd027ad59b Signed-off-by: Mathew Joseph Karimpanal --- include/soc/qcom/socinfo.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h index ac36df5769ee..a1f4223e53a0 100644 --- a/include/soc/qcom/socinfo.h +++ b/include/soc/qcom/socinfo.h @@ -84,8 +84,6 @@ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtellurium") #define early_machine_is_msm8996() \ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996") -#define early_machine_is_msm8996_auto() \ - of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp") #define early_machine_is_msm8929() \ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929") #define early_machine_is_msm8998() \ -- cgit v1.2.3 From e7ec709374ba7593e5d0379dd1b3160f6c0f233f Mon Sep 17 00:00:00 2001 From: Sarangdhar Joshi Date: Thu, 11 Feb 2016 16:39:46 -0800 Subject: arm64: Add support for app specific settings Add support to provide an interface that can be used from userspace to decide whether app specific settings need to be applied / cleared when particular processes are running. CRs-Fixed: 981519 997757 Change-Id: Id81f8b70de64f291a8586150f4d2c7c8f8b4420f Signed-off-by: Sarangdhar Joshi [satyap@codeaurora.org: trivial merge conflict resolution and pull fixes for CR: 997757] Signed-off-by: Satya Durga Srinivasu Prabhala [ztu@codeaurora.org: Resolved conflicts] Signed-off-by: Zhiqiang Tu --- include/linux/mm_types.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index ea0009064bbc..9f9e60736eba 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -522,6 +522,10 @@ struct mm_struct { #ifdef CONFIG_HUGETLB_PAGE atomic_long_t hugetlb_usage; #endif +#ifdef CONFIG_MSM_APP_SETTINGS + int app_setting; +#endif + }; static inline void mm_init_cpumask(struct mm_struct *mm) -- cgit v1.2.3 From d64bd3ead74add975329c9bf8f211ca899e788b7 Mon Sep 17 00:00:00 2001 From: Subash Abhinov Kasiviswanathan Date: Thu, 23 Feb 2017 18:24:42 -0700 Subject: net: rmnet_data: Add support to configure custom device name rmnet_data assigns device name by the order they are created. This causes problems which multiple processes are trying to create devices and leads to random device names. Assign device name as specified by user. CRs-Fixed: 2018785 Change-Id: Iab8e053c6ccacbeedaa7763e760d0c12e756b5d0 Signed-off-by: Subash Abhinov Kasiviswanathan --- include/uapi/linux/rmnet_data.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/uapi/linux/rmnet_data.h b/include/uapi/linux/rmnet_data.h index 8cfe0270ef4f..7ddfa20cec32 100644 --- a/include/uapi/linux/rmnet_data.h +++ b/include/uapi/linux/rmnet_data.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2015, 2017 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -223,8 +223,19 @@ enum rmnet_netlink_message_types_e { * uint32_t MAP Flow Handle * Returns: status code */ - RMNET_NETLINK_DEL_VND_TC_FLOW + RMNET_NETLINK_DEL_VND_TC_FLOW, + + /* + * RMNET_NETLINK_NEW_VND_WITH_NAME - Creates a new virtual network + * device node with the specified + * device name + * Args: int32_t node number + * char[] vnd_name - Use as name + * Returns: status code + */ + RMNET_NETLINK_NEW_VND_WITH_NAME }; +#define RMNET_NETLINK_NEW_VND_WITH_NAME RMNET_NETLINK_NEW_VND_WITH_NAME enum rmnet_config_endpoint_modes_e { /* Pass the frame up the stack with no modifications to skb->dev */ -- cgit v1.2.3 From d5fdefbeb5985d669e591a58be40847f53d9f8ce Mon Sep 17 00:00:00 2001 From: Vikram Mulukutla Date: Mon, 11 Jan 2016 11:54:04 -0800 Subject: clk: msm: clock-alpha-pll: Allow interrupts to be enabled during set_rate Some PLL implementations depend on the CPU being able to handle certain interrupts in order for the set_rate operation to complete. Allow interrupts to be handled in the set_rate op. CRs-Fixed: 960701 Change-Id: I6fda5ed9eb7d6f2e2cd91c58ebabfd7bc1c8a2fc Signed-off-by: Vikram Mulukutla --- include/soc/qcom/clock-alpha-pll.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/soc/qcom/clock-alpha-pll.h b/include/soc/qcom/clock-alpha-pll.h index 0b5329ba817c..acffe33dc4f3 100644 --- a/include/soc/qcom/clock-alpha-pll.h +++ b/include/soc/qcom/clock-alpha-pll.h @@ -79,6 +79,7 @@ struct alpha_pll_clk { * that the workaround is required. */ bool offline_bit_workaround; + bool no_irq_dis; bool is_fabia; unsigned long min_supported_freq; struct clk c; -- cgit v1.2.3 From 1a5632ab554ff49dfab9f1f77872f1c6894f776d Mon Sep 17 00:00:00 2001 From: Devesh Jhunjhunwala Date: Tue, 30 Aug 2016 17:26:30 -0700 Subject: clk: msm: gcc-8996: Add pinctrl clk for ln_bb_clk Add the pinctrl clock for ln_bb_clk to the GCC driver for MSM8996. CRs-Fixed: 1063062 Change-Id: If85a0dbb26e350588cbd6614c032bf208a205be2 Signed-off-by: Devesh Jhunjhunwala --- include/dt-bindings/clock/msm-clocks-8996.h | 2 ++ include/dt-bindings/clock/msm-clocks-hwio-8996.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/dt-bindings/clock/msm-clocks-8996.h b/include/dt-bindings/clock/msm-clocks-8996.h index 22109a6766db..da794841d1eb 100644 --- a/include/dt-bindings/clock/msm-clocks-8996.h +++ b/include/dt-bindings/clock/msm-clocks-8996.h @@ -54,6 +54,8 @@ #define clk_ipa_clk 0xfa685cda #define clk_ln_bb_clk 0x3ab0b36d #define clk_ln_bb_a_clk 0xc7257ea8 +#define clk_ln_bb_clk_pin 0x1b1c476a +#define clk_ln_bb_a_clk_pin 0x9cbb5411 #define clk_mcd_ce1_clk 0xbb615d26 #define clk_pnoc_keepalive_a_clk 0xf8f91f0b #define clk_pnoc_msmbus_clk 0x38b95c77 diff --git a/include/dt-bindings/clock/msm-clocks-hwio-8996.h b/include/dt-bindings/clock/msm-clocks-hwio-8996.h index 10e25be91752..21dc1e6c55e3 100644 --- a/include/dt-bindings/clock/msm-clocks-hwio-8996.h +++ b/include/dt-bindings/clock/msm-clocks-hwio-8996.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -42,6 +42,7 @@ #define RF_CLK1_ID 0x4 #define RF_CLK2_ID 0x5 #define LN_BB_CLK_ID 0x8 +#define LN_BB_CLK_PIN_ID 0x8 #define DIV_CLK1_ID 0xb #define DIV_CLK2_ID 0xc #define DIV_CLK3_ID 0xd -- cgit v1.2.3 From 393be0cabc5a2a224640279ea21ac9402919505b Mon Sep 17 00:00:00 2001 From: Atul Raut Date: Tue, 12 Apr 2016 13:31:16 -0700 Subject: soc: qcom: boot_stats: Add boot KPI markers Add instrumentation for boot time measurement Change-Id: I08fe4f23a7f95f765f28f57790e7102f4751b442 CRs-Fixed: 1000799 Signed-off-by: Atul Raut --- include/soc/qcom/boot_stats.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/soc/qcom/boot_stats.h b/include/soc/qcom/boot_stats.h index c81fc24ca8ca..af56da3167f0 100644 --- a/include/soc/qcom/boot_stats.h +++ b/include/soc/qcom/boot_stats.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2014,2016 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -11,7 +11,30 @@ */ #ifdef CONFIG_MSM_BOOT_STATS + +#define TIMER_KHZ 32768 +extern struct boot_stats __iomem *boot_stats; + +struct boot_stats { + uint32_t bootloader_start; + uint32_t bootloader_end; + uint32_t bootloader_display; + uint32_t bootloader_load_kernel; +}; + int boot_stats_init(void); +int boot_stats_exit(void); +unsigned long long int msm_timer_get_sclk_ticks(void); #else static inline int boot_stats_init(void) { return 0; } +unsigned long long int msm_timer_get_sclk_ticks(void) { return 0; } +#endif + +#ifdef CONFIG_MSM_BOOT_TIME_MARKER + +static inline int boot_marker_enabled(void) { return 1; } +void place_marker(const char *name); +#else +inline void place_marker(char *name); +static inline int boot_marker_enabled(void) { return 0; } #endif -- cgit v1.2.3 From acc13aeebcaa443587e1b635d7734dc5a71af0fe Mon Sep 17 00:00:00 2001 From: Meghana Ashok Date: Tue, 6 Dec 2016 15:31:30 +0530 Subject: soc: qcom: boot_stats: Adding new KPI markers and renaming the existing. Adding early_domain and SHA/RSA compute time KPI markers. Renaming few other markers to be more indicative. Change-Id: I55c99ae0c65f0162ef56b2e59e10d1d92ec76a58 Signed-off-by: Meghana Ashok --- include/soc/qcom/boot_stats.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/soc/qcom/boot_stats.h b/include/soc/qcom/boot_stats.h index af56da3167f0..b76d5676b555 100644 --- a/include/soc/qcom/boot_stats.h +++ b/include/soc/qcom/boot_stats.h @@ -20,6 +20,12 @@ struct boot_stats { uint32_t bootloader_end; uint32_t bootloader_display; uint32_t bootloader_load_kernel; + uint32_t load_kernel_start; + uint32_t load_kernel_end; +#ifdef CONFIG_MSM_BOOT_TIME_MARKER + uint32_t bootloader_early_domain_start; + uint32_t bootloader_checksum; +#endif }; int boot_stats_init(void); -- cgit v1.2.3