Merge 1fd6a699e2f21b79316d693df713046727771ec0 on remote branch

Change-Id: I53a9a4c760000fcb1b6eca5b1f230fff9fa4832b

Android.mk

@@ -20,6 +20,8 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
 DLKM_DIR   := device/qcom/common/dlkm
 
 LOCAL_PATH := $(call my-dir)
+LOCAL_MODULE_DDK_BUILD    := true
+LOCAL_MODULE_KO_DIRS      := driver/msm-mmrm.ko test/mmrm_test_module.ko
 
 include $(CLEAR_VARS)
 # For incremental compilation
@@ -28,7 +30,6 @@ LOCAL_MODULE              := mmrm-module-symvers
 LOCAL_MODULE_STEM         := Module.symvers
 LOCAL_MODULE_KBUILD_NAME  := Module.symvers
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-ENABLE_DDK_BUILD          := false
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
@@ -41,7 +42,6 @@ LOCAL_MODULE_KBUILD_NAME  := driver/msm-mmrm.ko
 LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-ENABLE_DDK_BUILD          := false
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
@@ -54,7 +54,6 @@ LOCAL_MODULE_KBUILD_NAME  := test/mmrm_test_module.ko
 LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-ENABLE_DDK_BUILD          := false
 # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk

driver/src/mmrm_clk_rsrc_mgr_sw.c

@@ -124,6 +124,9 @@ static void mmrm_sw_print_crm_table(struct mmrm_sw_clk_client_tbl_entry *tbl_ent
 		d_mpr_h("%s: csid(0x%x) client tbl idx %d val %llu\n",
 			__func__, tbl_entry->clk_src_id,
 			i, tbl_entry->crm_client_tbl[i]);
+	d_mpr_h("%s: csid(0x%x) client tbl max rate (idx %d) : %llu\n",
+			__func__, tbl_entry->clk_src_id, tbl_entry->max_rate_idx,
+			tbl_entry->clk_rate);
 }
 
 static u64 mmrm_sw_get_max_crm_rate(
@@ -166,7 +169,7 @@ static u64 mmrm_sw_get_max_crm_rate(
 
 			if (new_clk_val >= crm_max_rate) {
 				/* New value at old max index is still the maximum value */
-				crm_max_rate = tbl_entry->crm_client_tbl[tbl_entry->max_rate_idx];
+				crm_max_rate = new_clk_val;
 				*new_max_rate_idx = tbl_entry->max_rate_idx;
 			}
 		}
@@ -552,7 +555,7 @@ static int mmrm_sw_check_req_level(
 				break;
 			}
 			if  ((tbl_entry->vdd_level < peak_data->aggreg_level)
-					&& (tbl_entry->vdd_level > req_level ))
+					&& (tbl_entry->vdd_level > req_level))
 				next_max_entry = tbl_entry;
 
 		}
@@ -750,7 +753,8 @@ static void mmrm_sw_dump_enabled_client_info(struct mmrm_sw_clk_mgr_info *sinfo)
 	}
 }
 
-static int mmrm_reinstate_throttled_client(struct mmrm_sw_clk_mgr_info *sinfo) {
+static int mmrm_reinstate_throttled_client(struct mmrm_sw_clk_mgr_info *sinfo)
+{
 	struct mmrm_sw_peak_current_data *peak_data = &sinfo->peak_cur_data;
 	struct mmrm_sw_throttled_clients_data *iter, *safe_iter = NULL;
 	struct mmrm_client_notifier_data notifier_data;

driver/src/msm_mmrm.c

@@ -406,7 +406,7 @@ static ssize_t dump_clk_res_info_show(struct device *dev,
 	left_spaces -= len;
 	buf += len;
 
-	for (i=0, pclk=clk_set->clk_src_tbl; i < clk_set->count && left_spaces > 1; i++, pclk++) {
+	for (i = 0, pclk = clk_set->clk_src_tbl; i < clk_set->count && left_spaces > 1; i++, pclk++) {
 		len = scnprintf(buf, left_spaces, "%d\t%d\t% 8d\t%d\t%d\n",
 			pclk->domain,
 			pclk->clk_src_id,

mmrm_modules.bzl

@@ -9,7 +9,7 @@ module_entry = mmrm_driver_modules.register
 #--------------- MM-DRIVERS MODULES ------------------
 
 module_entry(
-    name = "msm_mmrm",
+    name = "msm-mmrm",
     path = MMRM_DRV_PATH + "/src",
     config_option = "CONFIG_MSM_MMRM",
     srcs = [
@@ -19,15 +19,15 @@ module_entry(
         "mmrm_internal.c",
         "mmrm_res_parse.c",
         "msm_mmrm.c"
-        ],
+    ],
 )
 
 module_entry(
-    name = "msm_test",
+    name = "mmrm_test_module",
     path =  MMRM_TEST_PATH,
     config_option = "CONFIG_MSM_MMRM",
     srcs = [
         "mmrm_test_internal.c",
         "mmrm_test.c"
-        ],
+    ],
 )

target.bzl

@@ -6,7 +6,7 @@ def define_pineapple():
         target = "pineapple",
         registry = mmrm_driver_modules,
         modules = [
-            "msm_mmrm",
-            "msm_test",
+            "msm-mmrm",
+            "mmrm_test_module",
         ],
 )

vm/fe/vm_test/mmrm_vm_fe_test_internal.c

@@ -261,8 +261,7 @@ void mmrm_vm_fe_client_register_tests(struct platform_device *pdev)
 		client = test_mmrm_vm_fe_client_register(&desc);
 		if (client == NULL) {
 			d_mpr_e("%s: client register fails\n", __func__);
-		}
-		else
+		} else
 			d_mpr_w("%s: client register successful\n", __func__);
 	}
 }
@@ -671,7 +670,7 @@ test_case_info_t  *kalama_testcases[] = {
 
 int kalama_testcases_count = sizeof(kalama_testcases)/sizeof(kalama_testcases[0]);
 
-static test_case_info_t cornercases_1 [] = {
+static test_case_info_t cornercases_1[] = {
 	{"cam_cc_csid_clk_src", MMRM_TEST_VDD_LEVEL_NOM, 1, 3},
 	{"cam_cc_csid_clk_src", MMRM_TEST_VDD_LEVEL_NOM, 1, 2},
 	{"cam_cc_csid_clk_src", MMRM_TEST_VDD_LEVEL_NOM, 1, 1},
@@ -681,7 +680,7 @@ static test_case_info_t cornercases_1 [] = {
 	{"", MMRM_TEST_VDD_LEVEL_MAX}
 };
 
-static test_case_info_t cornercases_2 [] = {
+static test_case_info_t cornercases_2[] = {
 	{"cam_cc_csid_clk_src", MMRM_TEST_VDD_LEVEL_LOW_SVS, 1, 3},
 	{"cam_cc_csid_clk_src", MMRM_TEST_VDD_LEVEL_LOW_SVS, 1, 2},
 	{"cam_cc_csid_clk_src", MMRM_TEST_VDD_LEVEL_SVS_L1, 1, 1},
@@ -691,7 +690,7 @@ static test_case_info_t cornercases_2 [] = {
 	{"", MMRM_TEST_VDD_LEVEL_MAX}
 };
 
-test_case_info_t *kalama_cornercase_testcases [] = {
+test_case_info_t *kalama_cornercase_testcases[] = {
 	cornercases_1,
 	cornercases_2,
 };
@@ -784,7 +783,7 @@ int test_mmrm_populate_testcase(struct platform_device *pdev,
 	if (pcase[0]->client_id != 0)
 		return 0;
 
-	for (i=0; i < count; i++, p++) 	{
+	for (i = 0; i < count; i++, p++) {
 		ptr = *p;
 		while (ptr->vdd_level != MMRM_TEST_VDD_LEVEL_MAX) {
 			p_clk_rate = find_clk_by_name(ptr->name);

vm/fe/vm_test/mmrm_vm_fe_test_internal.h

@@ -19,7 +19,7 @@ struct mmrm_test_desc {
 #define MMRM_SYSFS_ENTRY_MAX_LEN     PAGE_SIZE
 
 enum mmrm_vdd_level {
-	MMRM_TEST_VDD_LEVEL_LOW_SVS=0,
+	MMRM_TEST_VDD_LEVEL_LOW_SVS = 0,
 	MMRM_TEST_VDD_LEVEL_SVS,
 	MMRM_TEST_VDD_LEVEL_SVS_L1,
 	MMRM_TEST_VDD_LEVEL_NOM,
@@ -48,7 +48,7 @@ typedef struct test_case_info_s {
 extern test_case_info_t  *kalama_testcases[];
 extern int kalama_testcases_count;
 
-extern test_case_info_t *kalama_cornercase_testcases [];
+extern test_case_info_t *kalama_cornercase_testcases[];
 extern int kalama_cornercase_testcases_count;
 
 void mmrm_vm_fe_client_tests(struct platform_device *pdev);

vm/fe/vm_test/mmrm_vm_fe_test_main.c

@@ -144,8 +144,7 @@ struct clock_rate *find_clk_by_name(const char *name)
 	struct mmrm_test_platform_resources  *res = &test_drv_data->clk_res;
 	struct clock_rate *p = res->clk_rate_tbl;
 
-	for (i=0; i < res->count; i++, p++)
-	{
+	for (i = 0; i < res->count; i++, p++) {
 		if (strcmp(name, p->name) == 0)
 			return p;
 	}