Add power management support to DRA7xx DSP (part 3)

Some additional changes that were inadvertently left out of the previous PM
patch are added back here:

- Change tests to turn off PM on DSPs by default for build to proceed without
requiring the workaround
- Minor cleanup (copyright, spacing, file name changes)

This is towards addressing CQ SDOCM00117446.

Signed-off-by: VW <vwan@ti.com>

diff --git a/packages/ti/ipc/tests/gatempapp.cfg b/packages/ti/ipc/tests/gatempapp.cfg
index b0a1a988a9ab534b822eca767d89aefa3b18b741..8a02b4ed64d3ed4b0fd34b4ce65a50df972c1922 100644 (file)
--- a/packages/ti/ipc/tests/gatempapp.cfg
+++ b/packages/ti/ipc/tests/gatempapp.cfg
@@ -135,11 +135,11 @@ Timer.intFreq.lo = 19200000;
  *  ======== Power Management Configuration ========
  */
 /* Modules used in Power Management */
-xdc.loadPackage('ti.pm');
+/*xdc.loadPackage('ti.pm');
 
 var Power = xdc.useModule('ti.sysbios.family.c66.vayu.Power');
 Power.loadSegment = "PM_DATA";
-
+*/
 
 /* Idle function that periodically flushes the unicache */
 var Idle = xdc.useModule('ti.sysbios.knl.Idle');

diff --git a/packages/ti/pm/IpcPowerDsp_idle_dra7xx.s66 b/packages/ti/pm/IpcPowerDsp_idle_dra7xx.s66
index 2663216aac49bc3819734e5afafdb40c118fe7f1..d53b8922d614ad614e1d2786d2ae7878d0e40e78 100644 (file)
--- a/packages/ti/pm/IpcPowerDsp_idle_dra7xx.s66
+++ b/packages/ti/pm/IpcPowerDsp_idle_dra7xx.s66
@@ -57,7 +57,8 @@ _IpcPower_callIdle:
         .nocmp
 
         ; must enter this function with interrupts disabled
-        ; workaround: invalidate prefetch buffer in the xmc
+
+        ; Workaround: invalidate prefetch buffer in the xmc
         mfence
         mvk        0x0300,b5
         mvkh       0x8000000,b5

diff --git a/packages/ti/pm/IpcPowerDsp.c b/packages/ti/pm/IpcPowerDsp_omap54xx.c
similarity index 99%
rename from packages/ti/pm/IpcPowerDsp.c
rename to packages/ti/pm/IpcPowerDsp_omap54xx.c
index 905ab8e7b446f90bb207da9463b72e1187371cf4..9e107f2acd16b158511aa9866ca9531d282e53a4 100644 (file)
--- a/packages/ti/pm/IpcPowerDsp.c
+++ b/packages/ti/pm/IpcPowerDsp_omap54xx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013, Texas Instruments Incorporated
+ * Copyright (c) 2012-2015, Texas Instruments Incorporated
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** ============================================================================
- *  @file       IpcPowerDsp.c
+ *  @file       IpcPowerDsp_omap54xx.c
  *
  *  @brief      A simple Power Managment which responses to the host commands.
  *

diff --git a/packages/ti/pm/IpcPower_null.c b/packages/ti/pm/IpcPower_null.c
index aebb056d2b4ce826b36a59452233811f73f12b87..8c45090d0a9d600523a9b02c4316c2a263b573ee 100644 (file)
--- a/packages/ti/pm/IpcPower_null.c
+++ b/packages/ti/pm/IpcPower_null.c
@@ -138,17 +138,3 @@ Int IpcPower_unregisterCallback(Int event, IpcPower_CallbackFuncPtr cbck)
 {
     return (IpcPower_E_FAIL);
 }
-
-/*
- *  ======== IpcPower_preSuspend ========
- */
-Void IpcPower_preSuspend(Void)
-{
-}
-
-/*
- *  ======== IpcPower_postResume ========
- */
-Void IpcPower_postResume(Void)
-{
-}

diff --git a/packages/ti/pm/package.bld b/packages/ti/pm/package.bld
index dec9d2f1a488bbba8335cf228f69f71d1324bc91..d4383d2191e480c6e485b1973b6d6d623665054c 100644 (file)
--- a/packages/ti/pm/package.bld
+++ b/packages/ti/pm/package.bld
@@ -80,9 +80,9 @@ libArray.push(
 /* pm library for Tesla DSP target */
 libArray.push(
     {
-        name: "ti.pm",
+        name: "ti.pm_omap5",
         sources: [
-            "IpcPowerDsp",
+            "IpcPowerDsp_omap54xx",
         ],
         isas: [ "64T" ],
     }
@@ -91,7 +91,7 @@ libArray.push(
 /* pm library for DRA7XX DSP target */
 libArray.push(
     {
-        name: "ti.pm_dra7xx_dsp",
+        name: "ti.pm",
         sources: [
             "IpcPowerDsp_dra7xx",
             "IpcPowerDsp_idle_dra7xx",

diff --git a/packages/ti/pm/package.xs b/packages/ti/pm/package.xs
index 2d998d7d97c33c4eee2c2082f9340b5556ff2da5..d465daa7dad29b87f6a9307289c9ced825989e15 100644 (file)
--- a/packages/ti/pm/package.xs
+++ b/packages/ti/pm/package.xs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2013, Texas Instruments Incorporated
+ * Copyright (c) 2011-2015, Texas Instruments Incorporated
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without