Tero.Kristo@xxxxxxxxx said the following on 12/07/2009 11:02 AM: > One additional comment to this patch, compilation of board-rx51.c fails unless #include "pm.h" is added to it. This might be true for other boards also seeing it has been added to zoom2 at least. > Huh.. Weird, I did build and test with omap3_pm_defconfig -> rx51 should have been part of the build.. will check also next time.. > >> -----Original Message----- >> From: linux-omap-owner@xxxxxxxxxxxxxxx >> [mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of ext Kevin Hilman >> Sent: 25 November, 2009 19:22 >> To: Nishanth Menon >> Cc: linux-omap >> Subject: Re: [PATCH 03/10 V3] omap3: pm: use opp accessor >> functions for omap34xx >> >> Nishanth Menon <nm@xxxxxx> writes: >> >> >>> Move the definitions from omap3-opp.h to pm34xx.c. The definitions >>> are now based on omap_opp_def instead of omap_opp itself. >>> Since the opp.h has the omap_opp definition, omap-pm.h conflicts and >>> has been removed in favor of opp.h. >>> >> ok >> >> >>> omap3_pm_init_opp_table is used to initialize the OPP table and >>> relevant board files which have omap2_init_common_hw called with opp >>> arrays have been updated with omap3_pm_init_opp_table. >>> >>> This change now allows us to dynamically register OPPs to the system >>> based on silicon type we detect. >>> >> Nice. >> >> With this patch, I would suggest a couple more cleanups in how >> we are handling >> the master OPP lists for MPU, DSP and L3. >> >> Namely, It's time we could remove the rate_table passing from the OMAP >> PM layer all together and just keep them as pointers in opp.h. >> >> The longer term goal is to remove OPP handling from OMAP PM >> all together, >> so this will be a step in that direction. >> >> I've attached a patch that applies on top of your series that drops >> the OPPs from OMAP PM layer. After doing this, we now have some >> duplicate global pointers to the various rate tables that could be >> cleaned up. In addition, all the rate tables could be dropped from >> init_common_hw. >> >> If you follow my proposal for using opp_add() instead of opp_init() >> the board files that want to just use default OPPs do not have to do >> anyting with the rate tables. Only board files wanting to add OPPs >> would have to include opp.h and use opp_add(). >> >> Also, dropping the rate tables from init_common_hw would mean you >> shouldn't have init sequence issues anymore and you can do the OPP >> init inside existing PM init. >> >> Kevin >> >> >>> NOTE: This introduces the following warnings highlighting areas we >>> need to cleanup: >>> arch/arm/mach-omap2/smartreflex.c: In function 'get_opp': >>> arch/arm/mach-omap2/smartreflex.c:161: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/smartreflex.c:164: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/smartreflex.c:166: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/smartreflex.c:168: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/resource34xx.c: In function 'get_opp': >>> arch/arm/mach-omap2/resource34xx.c:165: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/resource34xx.c:168: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/resource34xx.c:170: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/resource34xx.c:172: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/resource34xx.c: In function 'program_opp': >>> arch/arm/mach-omap2/resource34xx.c:284: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> arch/arm/mach-omap2/resource34xx.c:285: warning: 'opp_id' is >>> >> deprecated (declared at arch/arm/plat-omap/include/plat/opp.h:33) >> >>> Signed-off-by: Nishanth Menon <nm@xxxxxx> >>> --- >>> arch/arm/mach-omap2/board-3430sdp.c | 1 + >>> arch/arm/mach-omap2/board-omap3beagle.c | 1 + >>> arch/arm/mach-omap2/board-omap3evm.c | 1 + >>> arch/arm/mach-omap2/board-rx51.c | 1 + >>> arch/arm/mach-omap2/board-zoom2.c | 2 + >>> arch/arm/mach-omap2/omap3-opp.h | 58 >>> >> +----------------------- >> >>> arch/arm/mach-omap2/pm.h | 6 +++ >>> arch/arm/mach-omap2/pm34xx.c | 68 >>> >> +++++++++++++++++++++++++++++ >> >>> arch/arm/plat-omap/include/plat/omap-pm.h | 17 +------- >>> 9 files changed, 84 insertions(+), 71 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/board-3430sdp.c >>> >> b/arch/arm/mach-omap2/board-3430sdp.c >> >>> index eac529f..0ec8327 100644 >>> --- a/arch/arm/mach-omap2/board-3430sdp.c >>> +++ b/arch/arm/mach-omap2/board-3430sdp.c >>> @@ -220,6 +220,7 @@ static void __init omap_3430sdp_init_irq(void) >>> { >>> omap_board_config = sdp3430_config; >>> omap_board_config_size = ARRAY_SIZE(sdp3430_config); >>> + omap3_pm_init_opp_table(); >>> omap3_pm_init_vc(&omap3_setuptime_table); >>> omap3_pm_init_cpuidle(omap3_cpuidle_params_table); >>> omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL, >>> >> omap3_mpu_rate_table, >> >>> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c >>> >> b/arch/arm/mach-omap2/board-omap3beagle.c >> >>> index 2ec3520..a937238 100644 >>> --- a/arch/arm/mach-omap2/board-omap3beagle.c >>> +++ b/arch/arm/mach-omap2/board-omap3beagle.c >>> @@ -361,6 +361,7 @@ static void __init omap3_beagle_init_irq(void) >>> { >>> omap_board_config = omap3_beagle_config; >>> omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); >>> + omap3_pm_init_opp_table(); >>> omap2_init_common_hw(mt46h32m32lf6_sdrc_params, >>> mt46h32m32lf6_sdrc_params, >>> >> omap3_mpu_rate_table, >> >>> omap3_dsp_rate_table, omap3_l3_rate_table); >>> diff --git a/arch/arm/mach-omap2/board-omap3evm.c >>> >> b/arch/arm/mach-omap2/board-omap3evm.c >> >>> index 8130eca..44a5861 100644 >>> --- a/arch/arm/mach-omap2/board-omap3evm.c >>> +++ b/arch/arm/mach-omap2/board-omap3evm.c >>> @@ -404,6 +404,7 @@ static void __init omap3_evm_init_irq(void) >>> { >>> omap_board_config = omap3_evm_config; >>> omap_board_config_size = ARRAY_SIZE(omap3_evm_config); >>> + omap3_pm_init_opp_table(); >>> omap2_init_common_hw(mt46h32m32lf6_sdrc_params, NULL, >>> >> omap3_mpu_rate_table, >> >>> omap3_dsp_rate_table, omap3_l3_rate_table); >>> omap_init_irq(); >>> diff --git a/arch/arm/mach-omap2/board-rx51.c >>> >> b/arch/arm/mach-omap2/board-rx51.c >> >>> index 2f1c2be..997fd1c 100644 >>> --- a/arch/arm/mach-omap2/board-rx51.c >>> +++ b/arch/arm/mach-omap2/board-rx51.c >>> @@ -103,6 +103,7 @@ static void __init rx51_init_irq(void) >>> >>> omap_board_config = rx51_config; >>> omap_board_config_size = ARRAY_SIZE(rx51_config); >>> + omap3_pm_init_opp_table(); >>> omap3_pm_init_cpuidle(rx51_cpuidle_params); >>> sdrc_params = rx51_get_sdram_timings(); >>> omap2_init_common_hw(sdrc_params, sdrc_params, >>> diff --git a/arch/arm/mach-omap2/board-zoom2.c >>> >> b/arch/arm/mach-omap2/board-zoom2.c >> >>> index dcc5fb8..9d5b078 100644 >>> --- a/arch/arm/mach-omap2/board-zoom2.c >>> +++ b/arch/arm/mach-omap2/board-zoom2.c >>> @@ -24,10 +24,12 @@ >>> #include <mach/board-zoom.h> >>> >>> #include "sdram-micron-mt46h32m32lf-6.h" >>> +#include "pm.h" >>> #include "omap3-opp.h" >>> >>> static void __init omap_zoom2_init_irq(void) >>> { >>> + omap3_pm_init_opp_table(); >>> omap2_init_common_hw(mt46h32m32lf6_sdrc_params, >>> mt46h32m32lf6_sdrc_params, >>> >> omap3_mpu_rate_table, >> >>> omap3_dsp_rate_table, >>> >> omap3_l3_rate_table); >> >>> diff --git a/arch/arm/mach-omap2/omap3-opp.h >>> >> b/arch/arm/mach-omap2/omap3-opp.h >> >>> index 42557e1..994d8d4 100644 >>> --- a/arch/arm/mach-omap2/omap3-opp.h >>> +++ b/arch/arm/mach-omap2/omap3-opp.h >>> @@ -3,60 +3,8 @@ >>> >>> #include <plat/omap-pm.h> >>> >>> -/* MPU speeds */ >>> -#define S600M 600000000 >>> -#define S550M 550000000 >>> -#define S500M 500000000 >>> -#define S250M 250000000 >>> -#define S125M 125000000 >>> - >>> -/* DSP speeds */ >>> -#define S430M 430000000 >>> -#define S400M 400000000 >>> -#define S360M 360000000 >>> -#define S180M 180000000 >>> -#define S90M 90000000 >>> - >>> -/* L3 speeds */ >>> -#define S83M 83000000 >>> -#define S166M 166000000 >>> - >>> -static struct omap_opp omap3_mpu_rate_table[] = { >>> - {0, 0, 0, 0}, >>> - /*OPP1*/ >>> - {true, S125M, VDD1_OPP1, 0x1E}, >>> - /*OPP2*/ >>> - {true, S250M, VDD1_OPP2, 0x26}, >>> - /*OPP3*/ >>> - {true, S500M, VDD1_OPP3, 0x30}, >>> - /*OPP4*/ >>> - {true, S550M, VDD1_OPP4, 0x36}, >>> - /*OPP5*/ >>> - {true, S600M, VDD1_OPP5, 0x3C}, >>> -}; >>> - >>> -static struct omap_opp omap3_l3_rate_table[] = { >>> - {0, 0, 0, 0}, >>> - /*OPP1*/ >>> - {false, 0, VDD2_OPP1, 0x1E}, >>> - /*OPP2*/ >>> - {true, S83M, VDD2_OPP2, 0x24}, >>> - /*OPP3*/ >>> - {true, S166M, VDD2_OPP3, 0x2C}, >>> -}; >>> - >>> -static struct omap_opp omap3_dsp_rate_table[] = { >>> - {0, 0, 0, 0}, >>> - /*OPP1*/ >>> - {true, S90M, VDD1_OPP1, 0x1E}, >>> - /*OPP2*/ >>> - {true, S180M, VDD1_OPP2, 0x26}, >>> - /*OPP3*/ >>> - {true, S360M, VDD1_OPP3, 0x30}, >>> - /*OPP4*/ >>> - {true, S400M, VDD1_OPP4, 0x36}, >>> - /*OPP5*/ >>> - {true, S430M, VDD1_OPP5, 0x3C}, >>> -}; >>> +extern struct omap_opp *omap3_mpu_rate_table; >>> +extern struct omap_opp *omap3_dsp_rate_table; >>> +extern struct omap_opp *omap3_l3_rate_table; >>> >>> #endif >>> diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h >>> index 7bc86b6..80a1c1d 100644 >>> --- a/arch/arm/mach-omap2/pm.h >>> +++ b/arch/arm/mach-omap2/pm.h >>> @@ -58,6 +58,12 @@ static inline void omap3_pm_init_cpuidle( >>> { >>> } >>> #endif >>> +/** >>> + * omap3_pm_init_opp_table - OMAP opp table lookup called >>> >> after cpu is detected. >> >>> + * Initialize the basic opp table here, board files could >>> >> choose to modify opp >> >>> + * table after the basic initialization >>> + */ >>> +extern void omap3_pm_init_opp_table(void); >>> >>> extern int resource_set_opp_level(int res, u32 >>> >> target_level, int flags); >> >>> extern int resource_access_opp_lock(int res, int delta); >>> diff --git a/arch/arm/mach-omap2/pm34xx.c >>> >> b/arch/arm/mach-omap2/pm34xx.c >> >>> index 627a509..ad21f5f 100644 >>> --- a/arch/arm/mach-omap2/pm34xx.c >>> +++ b/arch/arm/mach-omap2/pm34xx.c >>> @@ -40,6 +40,7 @@ >>> #include <plat/dmtimer.h> >>> #include <plat/usb.h> >>> >>> +#include <plat/opp.h> >>> #include <plat/resource.h> >>> >>> #include <asm/tlbflush.h> >>> @@ -52,6 +53,7 @@ >>> #include "prm.h" >>> #include "pm.h" >>> #include "sdrc.h" >>> +#include "omap3-opp.h" >>> >>> static int regset_save_on_suspend; >>> >>> @@ -100,6 +102,52 @@ static struct prm_setup_vc prm_setup = { >>> .vdd1_off = 0x00, /* 0.6v */ >>> }; >>> >>> +static struct omap_opp_def __initdata omap34xx_mpu_rate_table[] = { >>> + /*OPP1 975mV */ >>> + {.enabled = true, .freq = 125000000, .u_volt = 975000}, >>> + /*OPP2 1.075V */ >>> + {.enabled = true, .freq = 250000000, .u_volt = 1075000}, >>> + /*OPP3 1.2V */ >>> + {.enabled = true, .freq = 500000000, .u_volt = 1200000}, >>> + /*OPP4 1.270V */ >>> + {.enabled = true, .freq = 550000000, .u_volt = 1270000}, >>> + /*OPP5 1.35V */ >>> + {.enabled = true, .freq = 600000000, .u_volt = 1350000}, >>> + /* Terminator */ >>> + {.enabled = 0, .freq = 0, .u_volt = 0} >>> +}; >>> + >>> +static struct omap_opp_def __initdata omap34xx_l3_rate_table[] = { >>> + /*OPP1 - 975mV */ >>> + {.enabled = false, .freq = 0, .u_volt = 975000}, >>> + /*OPP2 1.05V */ >>> + {.enabled = true, .freq = 83000000, .u_volt = 1050000}, >>> + /*OPP3 1.15V*/ >>> + {.enabled = true, .freq = 166000000, .u_volt = 1150000}, >>> + /* Terminator */ >>> + {.enabled = 0, .freq = 0, .u_volt = 0} >>> +}; >>> + >>> +static struct omap_opp_def __initdata omap34xx_dsp_rate_table[] = { >>> + /*OPP1*/ >>> + {.enabled = true, .freq = 90000000, .u_volt = 975000}, >>> + /*OPP2*/ >>> + {.enabled = true, .freq = 180000000, .u_volt = 1075000}, >>> + /*OPP3*/ >>> + {.enabled = true, .freq = 360000000, .u_volt = 1200000}, >>> + /*OPP4*/ >>> + {.enabled = true, .freq = 400000000, .u_volt = 1270000}, >>> + /*OPP5*/ >>> + {.enabled = true, .freq = 430000000, .u_volt = 1350000}, >>> + /* Terminator */ >>> + {.enabled = 0, .freq = 0, .u_volt = 0} >>> +}; >>> + >>> +struct omap_opp *omap3_mpu_rate_table; >>> +struct omap_opp *omap3_dsp_rate_table; >>> +struct omap_opp *omap3_l3_rate_table; >>> + >>> + >>> static inline void omap3_per_save_context(void) >>> { >>> omap_gpio_save_context(); >>> @@ -1248,6 +1296,26 @@ static void __init configure_vc(void) >>> pm_dbg_regset_init(2); >>> } >>> >>> +void __init omap3_pm_init_opp_table(void) >>> +{ >>> + int ret, i; >>> + struct omap_opp_def *omap34xx_opp_def_list[] = { >>> + omap34xx_mpu_rate_table, >>> + omap34xx_l3_rate_table, >>> + omap34xx_dsp_rate_table >>> + }; >>> + struct omap_opp **omap3_rate_tables[] = { >>> + &omap3_mpu_rate_table, >>> + &omap3_l3_rate_table, >>> + &omap3_dsp_rate_table >>> + }; >>> + for (i = 0; i < ARRAY_SIZE(omap34xx_opp_def_list); i++) { >>> + ret = opp_init(omap3_rate_tables[i], >>> >> omap34xx_opp_def_list[i]); >> >>> + /* We dont want half configured system at the moment */ >>> + BUG_ON(ret); >>> + } >>> +} >>> + >>> static int __init omap3_pm_early_init(void) >>> { >>> prm_clear_mod_reg_bits(OMAP3430_OFFMODE_POL, OMAP3430_GR_MOD, >>> diff --git a/arch/arm/plat-omap/include/plat/omap-pm.h >>> >> b/arch/arm/plat-omap/include/plat/omap-pm.h >> >>> index 5dc2048..aa36339 100644 >>> --- a/arch/arm/plat-omap/include/plat/omap-pm.h >>> +++ b/arch/arm/plat-omap/include/plat/omap-pm.h >>> @@ -18,22 +18,7 @@ >>> #include <linux/cpufreq.h> >>> >>> #include "powerdomain.h" >>> - >>> -/** >>> - * struct omap_opp - clock frequency-to-OPP ID table for DSP, MPU >>> - * @enabled: enabled if true, disabled if false >>> - * @rate: target clock rate >>> - * @opp_id: OPP ID >>> - * @min_vdd: minimum VDD1 voltage (in millivolts) for this OPP >>> - * >>> - * Operating performance point data. Can vary by OMAP chip >>> >> and board. >> >>> - */ >>> -struct omap_opp { >>> - bool enabled; >>> - unsigned long rate; >>> - u8 opp_id; >>> - u16 vsel; >>> -}; >>> +#include <plat/opp.h> >>> >>> extern struct omap_opp *mpu_opps; >>> extern struct omap_opp *dsp_opps; >>> -- >>> 1.6.3.3 >>> >>> -- >>> To unsubscribe from this list: send the line "unsubscribe >>> >> linux-omap" in >> >>> the body of a message to majordomo@xxxxxxxxxxxxxxx >>> More majordomo info at http://vger.kernel.org/majordomo-info.html >>> >> -- >> To unsubscribe from this list: send the line "unsubscribe >> linux-omap" in >> the body of a message to majordomo@xxxxxxxxxxxxxxx >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
