DSPBRIDGE: cleanup OPP handling
Subsystems (3)
v2 cover DSPBRIDGE: cleanup OPP handling
Revision 2 of the series for DSPBridge OPP handling cleanup
Nishanth Menon (2):
DSPBRIDGE: remove dependency of mpu freq
DSPBRIDGE: pm: use old implementation for opps
Note: I have dropped the following patch from this rev of series as pm-wip-opp is little unknown at the moment.
DSPBRIDGE: pm: use pm-wip-opp APIs for opp list [RFC]
arch/arm/mach-omap2/dspbridge.c | 125 ++++++++++++++++++++++++ arch/arm/plat-omap/include/dspbridge/host_os.h | 13 +++- drivers/dsp/bridge/rmgr/drv_interface.c | 38 ------- drivers/dsp/bridge/rmgr/node.c | 4 +- drivers/dsp/bridge/rmgr/proc.c | 4 +- drivers/dsp/bridge/wmd/io_sm.c | 20 ++--- 6 files changed, 148 insertions(+), 56 deletions(-)
Regards,
Nishanth Menon
PATCH v2 1/2 DSPBRIDGE: remove dependency of mpu freq
Current DSPBridge uses hardcoded logic which is not scalable across OMAP3 silicons. introduce a structure based implementation this allows for dsp frequency table indices to be generated runtime instead of being compile time.
---
Ref:
v1: http://marc.info/?t=126402609100008&r=1&w=2
v2: comment fixes from v1
arch/arm/mach-omap2/dspbridge.c | 30 +++++++++++++++++++ arch/arm/plat-omap/include/dspbridge/host_os.h | 13 +++++++- drivers/dsp/bridge/rmgr/drv_interface.c | 38 ------------------------ drivers/dsp/bridge/rmgr/node.c | 4 +- drivers/dsp/bridge/rmgr/proc.c | 4 +- drivers/dsp/bridge/wmd/io_sm.c | 20 ++++-------- 6 files changed, 53 insertions(+), 56 deletions(-)
arch/arm/mach-omap2/dspbridge.c +30 -0
@@ -30,6 +30,23 @@ static struct dspbridge_platform_data dspbridge_pdata __initdata = {#endif }; +/** +* get_opp_table() - populate the pdata with opp info +* @pdata: pointer to pdata +* +* OPP table implementation is a variant b/w platforms. +* the platform file now incorporates this into the build +* itself and uses the interface to talk to platform specific +* functions +*/ +static int get_opp_table (struct dspbridge_platform_data *pdata) +{ +#ifdef CONFIG_BRIDGE_DVFS +/* Do nothing now - fill based on PM implementation */ +#endif +return 0 ; +} +static int __init dspbridge_init (void ) {struct platform_device *pdev;
@@ -48,6 +65,10 @@ static int __init dspbridge_init(void)if (!pdev) goto err_out; + err =get_opp_table (pdata); +if (err) + goto err_out; + err =platform_device_add_data (pdev, pdata,sizeof (*pdata));if (err) goto err_out;
@@ -60,6 +81,10 @@ static int __init dspbridge_init(void)return 0 ; err_out: +kfree (pdata->mpu_speeds); +kfree (pdata->dsp_freq_table); + pdata->mpu_speeds =NULL ; + pdata->dsp_freq_table =NULL ;platform_device_put (pdev);return err; }
@@ -67,6 +92,11 @@ module_init(dspbridge_init); static void __exit dspbridge_exit(void) { +struct dspbridge_platform_data *pdata = &dspbridge_pdata; +kfree (pdata->mpu_speeds); +kfree (pdata->dsp_freq_table); + pdata->mpu_speeds =NULL ; + pdata->dsp_freq_table =NULL ;platform_device_unregister (dspbridge_pdev); }module_exit (dspbridge_exit);
arch/arm/plat-omap/include/dspbridge/host_os.h +12 -1
@@ -54,12 +54,23 @@#define INT_MAIL_MPU_IRQ 26#define INT_DSP_MMU_IRQ 28 +struct dsp_shm_freq_table { +unsigned long u_volts; +unsigned long dsp_freq; +unsigned long thresh_min_freq; +unsigned long thresh_max_freq; +};struct dspbridge_platform_data {void (*dsp_set_min_opp)(u8 opp_id);u8 (*dsp_get_opp)(void );void (*cpu_set_freq)(unsigned long f);unsigned long (*cpu_get_freq)(void ); -unsigned long mpu_speed[6 ]; +unsigned long *mpu_speeds; +u8 mpu_num_speeds; +unsigned long mpu_min_speed; +unsigned long mpu_max_speed; +struct dsp_shm_freq_table *dsp_freq_table; +u8 dsp_num_speeds;u32 phys_mempool_base;u32 phys_mempool_size;
drivers/dsp/bridge/rmgr/drv_interface.c +0 -38
@@ -169,44 +169,12 @@ static struct file_operations bridge_fops = {static u32 timeOut =1000 ;#ifdef CONFIG_BRIDGE_DVFS static struct clk *clk_handle; -s32 dsp_max_opps =VDD1_OPP5 ;#endif -/* Maximum Opps that can be requested by IVA*/ -/*vdd1 rate table*/ -#ifdef CONFIG_BRIDGE_DVFS -const struct omap_opp vdd1_rate_table_bridge[] = { - {0 ,0 ,0 }, -/*OPP1*/ - {S125M ,VDD1_OPP1 ,0 }, -/*OPP2*/ - {S250M ,VDD1_OPP2 ,0 }, -/*OPP3*/ - {S500M ,VDD1_OPP3 ,0 }, -/*OPP4*/ - {S550M ,VDD1_OPP4 ,0 }, -/*OPP5*/ - {S600M ,VDD1_OPP5 ,0 }, -}; -#endif #endif struct dspbridge_platform_data *omap_dspbridge_pdata; -u32 vdd1_dsp_freq[6 ][4 ] = { - {0 ,0 ,0 ,0 }, -/*OPP1*/ - {0 ,90000 ,0 ,86000 }, -/*OPP2*/ - {0 ,180000 ,80000 ,170000 }, -/*OPP3*/ - {0 ,360000 ,160000 ,340000 }, -/*OPP4*/ - {0 ,396000 ,325000 ,376000 }, -/*OPP5*/ - {0 ,430000 ,355000 ,430000 }, -}; -#ifdef CONFIG_BRIDGE_DVFS static int dspbridge_post_scale (struct notifier_block *op,unsigned long level,void *ptr)
@@ -228,9 +196,6 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev)u32 temp;dev_t dev =0 ;int result; -#ifdef CONFIG_BRIDGE_DVFS -int i =0 ; -#endif struct dspbridge_platform_data *pdata = pdev->dev.platform_data; omap_dspbridge_dev = pdev;
@@ -341,9 +306,6 @@ static int __devinit omap34xx_bridge_probe(struct platform_device *pdev) } if (DSP_SUCCEEDED(initStatus)) { #ifdef CONFIG_BRIDGE_DVFS - for (i = 0; i < 6; i++) - pdata->mpu_speed[i] = vdd1_rate_table_bridge[i].rate; - clk_handle = clk_get(NULL, "iva2_ck"); if (!clk_handle) { GT_0trace(driverTrace, GT_7CLASS,
drivers/dsp/bridge/rmgr/node.c +2 -2
@@ -1257,7 +1257,7 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode)/* Boost the OPP level to max level that DSP can be requested */ #if defined(CONFIG_BRIDGE_DVFS ) && !defined(CONFIG_CPU_FREQ )if (pdata->cpu_set_freq) { - (*pdata->cpu_set_freq)(pdata->mpu_speed[VDD1_OPP3 ]); + (*pdata->cpu_set_freq)(pdata->mpu_max_speed);if (pdata->dsp_get_opp) { GT_1trace(NODE_debugMask, GT_4CLASS, "opp level"
@@ -1283,7 +1283,7 @@ DSP_STATUS NODE_Create(struct NODE_OBJECT *hNode)/* Request the lowest OPP level*/ #if defined(CONFIG_BRIDGE_DVFS ) && !defined(CONFIG_CPU_FREQ )if (pdata->cpu_set_freq) { - (*pdata->cpu_set_freq)(pdata->mpu_speed[VDD1_OPP1 ]); + (*pdata->cpu_set_freq)(pdata->mpu_min_speed);if (pdata->dsp_get_opp) { GT_1trace(NODE_debugMask, GT_4CLASS, "opp level"
drivers/dsp/bridge/rmgr/proc.c +2 -2
@@ -1128,7 +1128,7 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,/* Boost the OPP level to Maximum level supported by baseport*/ #if defined(CONFIG_BRIDGE_DVFS ) && !defined(CONFIG_CPU_FREQ )if (pdata->cpu_set_freq) - (*pdata->cpu_set_freq)(pdata->mpu_speed[VDD1_OPP5 ]); + (*pdata->cpu_set_freq)(pdata->mpu_max_speed);#endif status = COD_LoadBase(hCodMgr, iArgc, (char **)aArgv, DEV_BrdWriteFxn,
@@ -1150,7 +1150,7 @@ DSP_STATUS PROC_Load(DSP_HPROCESSOR hProcessor, IN CONST s32 iArgc,/* Requesting the lowest opp supported*/ #if defined(CONFIG_BRIDGE_DVFS ) && !defined(CONFIG_CPU_FREQ )if (pdata->cpu_set_freq) - (*pdata->cpu_set_freq)(pdata->mpu_speed[VDD1_OPP1 ]); + (*pdata->cpu_set_freq)(pdata->mpu_min_speed);#endif }
drivers/dsp/bridge/wmd/io_sm.c +7 -13
@@ -159,13 +159,6 @@ static DSP_STATUS registerSHMSegs(struct IO_MGR *hIOMgr,struct COD_MANAGER *hCodMan, u32 dwGPPBasePA); -#ifdef CONFIG_BRIDGE_DVFS -/* The maximum number of OPPs that are supported */ -extern s32 dsp_max_opps; -/* The Vdd1 opp table information */ -extern u32 vdd1_dsp_freq[6 ][4 ] ; -#endif -#if GT_TRACE static struct GT_Mask dsp_trace_mask = {NULL ,NULL };/* GT trace variable */ #endif
@@ -1812,29 +1805,30 @@ DSP_STATUS IO_SHMsetting(struct IO_MGR *hIOMgr, u8 desc, void *pArgs)* Update the shared memory with the voltage, frequency, * min and max frequency values for an OPP. */ -for (i =0 ; i <= dsp_max_opps; i++) { +for (i =0 ; i <= pdata->dsp_num_speeds; i++) { hIOMgr->pSharedMem->oppTableStruct.oppPoint[i].voltage = - vdd1_dsp_freq[i][0 ]; + pdata->dsp_freq_table[i].u_volts;DBG_Trace (DBG_LEVEL5 ,"OPP shared memory -voltage: " "%d\n" , hIOMgr->pSharedMem->oppTableStruct. oppPoint[i].voltage); hIOMgr->pSharedMem->oppTableStruct.oppPoint[i]. - frequency = vdd1_dsp_freq[i][1 ]; + frequency = pdata->dsp_freq_table[i].dsp_freq;DBG_Trace (DBG_LEVEL5 ,"OPP shared memory -frequency: " "%d\n" , hIOMgr->pSharedMem->oppTableStruct. oppPoint[i].frequency); hIOMgr->pSharedMem->oppTableStruct.oppPoint[i].minFreq = - vdd1_dsp_freq[i][2 ]; + pdata->dsp_freq_table[i].thresh_min_freq;DBG_Trace (DBG_LEVEL5 ,"OPP shared memory -min value: " "%d\n" , hIOMgr->pSharedMem->oppTableStruct. oppPoint[i].minFreq); hIOMgr->pSharedMem->oppTableStruct.oppPoint[i].maxFreq = - vdd1_dsp_freq[i][3 ]; + pdata->dsp_freq_table[i].thresh_max_freq;DBG_Trace (DBG_LEVEL5 ,"OPP shared memory -max value: " "%d\n" , hIOMgr->pSharedMem->oppTableStruct. oppPoint[i].maxFreq); } - hIOMgr->pSharedMem->oppTableStruct.numOppPts = dsp_max_opps; + hIOMgr->pSharedMem->oppTableStruct.numOppPts = + pdata->dsp_num_speeds;DBG_Trace (DBG_LEVEL5 ,"OPP shared memory - max OPP number: " "%d\n" , hIOMgr->pSharedMem->oppTableStruct.numOppPts);/* Update the current OPP number */
Signature · 1 line
1.6.3.3
PATCH v2 2/2 DSPBRIDGE: pm: use old implementation for opps
Use the old implementation for OPP list generation and update. this is a 1-1 implementation of what we had previously without support for 3630.
---
Ref:
v1: http://marc.info/?t=126402609100007&r=1&w=2
v2: comment fixes from v1
arch/arm/mach-omap2/dspbridge.c | 65 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/dspbridge.c +64 -1
@@ -42,7 +42,70 @@ static struct dspbridge_platform_data dspbridge_pdata __initdata = {static int get_opp_table (struct dspbridge_platform_data *pdata) {#ifdef CONFIG_BRIDGE_DVFS -/* Do nothing now - fill based on PM implementation */ +/* +* TODO: The following code is a direct replacement +* improvements are possible. +*/ +/* legacy values for 3430 */ +u32 vdd1_dsp_freq[6 ][4 ] = { + {0 ,0 ,0 ,0 }, +/*OPP1*/ + {0 ,90000 ,0 ,86000 }, +/*OPP2*/ + {0 ,180000 ,80000 ,170000 }, +/*OPP3*/ + {0 ,360000 ,160000 ,340000 }, +/*OPP4*/ + {0 ,396000 ,325000 ,376000 }, +/*OPP5*/ + {0 ,430000 ,355000 ,430000 }, + }; +struct omap_opp vdd1_rate_table_bridge[] = { + {0 ,0 ,0 }, +/*OPP1*/ + {S125M ,VDD1_OPP1 ,0 }, +/*OPP2*/ + {S250M ,VDD1_OPP2 ,0 }, +/*OPP3*/ + {S500M ,VDD1_OPP3 ,0 }, +/*OPP4*/ + {S550M ,VDD1_OPP4 ,0 }, +/*OPP5*/ + {S600M ,VDD1_OPP5 ,0 }, + }; + pdata->mpu_num_speeds =VDD1_OPP5 ; + pdata->mpu_speeds =kzalloc (sizeof (u32) * (pdata->mpu_num_speeds +1 ), +GFP_KERNEL ); +if (!pdata->mpu_speeds) { +pr_err ("%s: unable to allocate memory for the mpu" +"frequencies\n" , __func__); +return -ENOMEM ; + } + pdata->dsp_num_speeds =VDD1_OPP5 ; + pdata->dsp_freq_table =kzalloc ( +sizeof (struct dsp_shm_freq_table ) * + (pdata->dsp_num_speeds +1 ),GFP_KERNEL ); +if (!pdata->dsp_freq_table) { +pr_err ("%s: unable to allocate memory for the dsp" +"frequencies\n" , __func__); +kfree (pdata->mpu_speeds); + pdata->mpu_speeds =NULL ; +return -ENOMEM ; + } +for (i =0 ; i <= pdata->mpu_num_speeds; i++) + pdata->mpu_speed[i] = vdd1_rate_table_bridge[i].rate; + pdata->mpu_max_speed = pdata->mpu_speed[VDD1_OPP5 ]; + pdata->mpu_min_speed = pdata->mpu_speed[VDD1_OPP1 ]; + +for (i =0 ; i <= pdata->dsp_num_speeds; i++) { + pdata->dsp_freq_table[i].u_volts = + vdd1_dsp_freq[i][0 ]; + pdata->dsp_freq_table[i].dsp_freq = vdd1_dsp_freq[i][1 ]; + pdata->dsp_freq_table[i].thresh_min_freq = + vdd1_dsp_freq[i][2 ]; + pdata->dsp_freq_table[i].thresh_max_freq = + vdd1_dsp_freq[i][3 ]; + }#endif return 0 ; }
Signature · 1 line
1.6.3.3
Re: [PATCH 1/2 v2] DSPBRIDGE: remove dependency of mpu freq
In reply to Nishanth MenonQuoted 4 lines · Nishanth Menon
Current DSPBridge uses hardcoded logic which is not scalable across OMAP3 silicons. introduce a structure based implementation this allows for dsp frequency table indices to be generated runtime instead of being compile time.
You forgot to mention the impact of this patch: DVFS is effectively disabled until the next patch is applied. Right?
Quoted 7 lines
arch/arm/mach-omap2/dspbridge.c +7
-0+static int get_opp_table (struct dspbridge_platform_data *pdata) +{ +#ifdef CONFIG_BRIDGE_DVFS +/* Do nothing now - fill based on PM implementation */ +#endif +return 0 ; +}
Signature · 1 line
Felipe Contreras
RE: [PATCH 1/2 v2] DSPBRIDGE: remove dependency of mpu freq
Quoted 6 lines
From: Felipe Contreras [mailto:[email protected]]
Sent: Tuesday, February 02, 2010 3:01 PM
Quoted 8 lines
Quoted 4 lines · Nishanth Menon
Current DSPBridge uses hardcoded logic which is not scalable across OMAP3 silicons. introduce a structure based implementation this allows for dsp frequency table indices to be generated runtime instead of being compile time.
You forgot to mention the impact of this patch: DVFS is effectively disabled until the next patch is applied. Right?
That is the reason why it is a patch series 2/2 is the last of the series ;) I don't mind merging it as part of this patch though..
Quoted 11 lines
arch/arm/mach-omap2/dspbridge.c static struct dspbridge_platform_data dspbridge_pdata __initdata = { · line 48
Quoted 8 lines
arch/arm/mach-omap2/dspbridge.c +7
-0+static int get_opp_table (struct dspbridge_platform_data *pdata) +{ +#ifdef CONFIG_BRIDGE_DVFS +/* Do nothing now - fill based on PM implementation */ +#endif +return 0 ; +}--
Felipe Contreras
Regards,
Nishanth Menon
Re: [PATCH 1/2 v2] DSPBRIDGE: remove dependency of mpu freq
Quoted 6 lines · Nishanth Menon
Quoted 3 lines
From: Felipe Contreras [mailto:[email protected]] You forgot to mention the impact of this patch: DVFS is effectively disabled until the next patch is applied. Right?
That is the reason why it is a patch series 2/2 is the last of the series ;) I don't mind merging it as part of this patch though..
Yeah, but that's not mentioned in the commit msg of *this* patch; each patch must make sense on its own.
Signature · 1 line
Felipe Contreras