From: Jean Pihet <j-pi...@ti.com>

Figures are added to the power domains structs.

Note: the figures are preliminary figures. More accurate measurements
are needed. Also the conditions of measurements shall be investigated
and described.

Tested on OMAP3 Beagleboard in RET/OFF using wake-up latency constraints
on MPU, CORE and PER.

Signed-off-by: Jean Pihet <j-pi...@ti.com>
---
 arch/arm/mach-omap2/powerdomains3xxx_data.c |   84 ++++++++++++++++++++++++++-
 1 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c 
b/arch/arm/mach-omap2/powerdomains3xxx_data.c
index 9c9c113..11dc57e 100644
--- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
@@ -31,6 +31,13 @@
 
 /*
  * Powerdomains
+ *
+ * The wakeup_lat values are derived from measurements on
+ * the actual target.
+ *
+ * Note: the latency figures are preliminary and only used
+ * for the constraints framework validation.
+ * Actual figures and measurements conditions shall be added.
  */
 
 static struct powerdomain iva2_pwrdm = {
@@ -52,6 +59,13 @@ static struct powerdomain iva2_pwrdm = {
                [2] = PWRSTS_OFF_ON,
                [3] = PWRSTS_ON,
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 1100,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 350,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain mpu_3xxx_pwrdm = {
@@ -60,7 +74,8 @@ static struct powerdomain mpu_3xxx_pwrdm = {
        .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
        .pwrsts           = PWRSTS_OFF_RET_ON,
        .pwrsts_logic_ret = PWRSTS_OFF_RET,
-       .flags            = PWRDM_HAS_MPU_QUIRK,
+       .flags            = PWRDM_HAS_MPU_QUIRK |
+                           PWRDM_USES_PM_QOS_CONSTRAINTS,
        .banks            = 1,
        .pwrsts_mem_ret   = {
                [0] = PWRSTS_OFF_RET,
@@ -68,6 +83,13 @@ static struct powerdomain mpu_3xxx_pwrdm = {
        .pwrsts_mem_on    = {
                [0] = PWRSTS_OFF_ON,
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 95,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 45,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 /*
@@ -90,6 +112,7 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = {
        .pwrsts           = PWRSTS_OFF_RET_ON,
        .pwrsts_logic_ret = PWRSTS_OFF_RET,
        .banks            = 2,
+       .flags            = PWRDM_USES_PM_QOS_CONSTRAINTS,
        .pwrsts_mem_ret   = {
                [0] = PWRSTS_OFF_RET,    /* MEM1RETSTATE */
                [1] = PWRSTS_OFF_RET,    /* MEM2RETSTATE */
@@ -98,6 +121,13 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = {
                [0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
                [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 100,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 60,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain core_3xxx_es3_1_pwrdm = {
@@ -111,7 +141,8 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
         * Setting the SAR flag for errata ID i478 which applies
         *  to 3430 <= ES3.1
         */
-       .flags            = PWRDM_HAS_HDWR_SAR, /* for USBTLL only */
+       .flags            = PWRDM_HAS_HDWR_SAR /* for USBTLL only */ |
+                           PWRDM_USES_PM_QOS_CONSTRAINTS,
        .banks            = 2,
        .pwrsts_mem_ret   = {
                [0] = PWRSTS_OFF_RET,    /* MEM1RETSTATE */
@@ -121,6 +152,13 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
                [0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
                [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 100,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 60,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain dss_pwrdm = {
@@ -136,6 +174,13 @@ static struct powerdomain dss_pwrdm = {
        .pwrsts_mem_on    = {
                [0] = PWRSTS_ON,  /* MEMONSTATE */
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 70,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 20,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 /*
@@ -157,6 +202,13 @@ static struct powerdomain sgx_pwrdm = {
        .pwrsts_mem_on    = {
                [0] = PWRSTS_ON,  /* MEMONSTATE */
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 1000,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain cam_pwrdm = {
@@ -172,6 +224,13 @@ static struct powerdomain cam_pwrdm = {
        .pwrsts_mem_on    = {
                [0] = PWRSTS_ON,  /* MEMONSTATE */
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 850,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 35,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain per_pwrdm = {
@@ -187,6 +246,13 @@ static struct powerdomain per_pwrdm = {
        .pwrsts_mem_on    = {
                [0] = PWRSTS_ON,  /* MEMONSTATE */
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 200,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 110,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain emu_pwrdm = {
@@ -201,6 +267,13 @@ static struct powerdomain neon_pwrdm = {
        .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
        .pwrsts           = PWRSTS_OFF_RET_ON,
        .pwrsts_logic_ret = PWRSTS_RET,
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 200,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 35,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain usbhost_pwrdm = {
@@ -223,6 +296,13 @@ static struct powerdomain usbhost_pwrdm = {
        .pwrsts_mem_on    = {
                [0] = PWRSTS_ON,  /* MEMONSTATE */
        },
+       .wakeup_lat = {
+               [PWRDM_FUNC_PWRST_OFF] = 800,
+               [PWRDM_FUNC_PWRST_OSWR] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_CSWR] = 150,
+               [PWRDM_FUNC_PWRST_INACTIVE] = UNSUP_STATE,
+               [PWRDM_FUNC_PWRST_ON] = 0,
+       },
 };
 
 static struct powerdomain dpll1_pwrdm = {
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to