diff mbox series

[V2,2/6] soc: amlogic: add driver to support power parent node

Message ID 20230824055930.2576849-3-xianwei.zhao@amlogic.com (mailing list archive)
State New, archived
Headers show
Series Power: T7: add power domain driver | expand

Commit Message

Xianwei Zhao Aug. 24, 2023, 5:59 a.m. UTC 
From: "xianwei.zhao" <xianwei.zhao@amlogic.com>

Some power domains depends on other domains, Such as Amlogic T7 SoC.
Add parent node to support this case.

Signed-off-by: xianwei.zhao <xianwei.zhao@amlogic.com>
---
V1 -> V2: None
---
 drivers/genpd/amlogic/meson-secure-pwrc.c | 26 ++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

Comments

Neil Armstrong Aug. 24, 2023, 8:27 a.m. UTC | #1 
Hi,

On 24/08/2023 07:59, Xianwei Zhao wrote:
> From: "xianwei.zhao" <xianwei.zhao@amlogic.com>
> 
> Some power domains depends on other domains, Such as Amlogic T7 SoC.
> Add parent node to support this case.
> 
> Signed-off-by: xianwei.zhao <xianwei.zhao@amlogic.com>
> ---
> V1 -> V2: None
> ---
>   drivers/genpd/amlogic/meson-secure-pwrc.c | 26 ++++++++++++++++++++++-
>   1 file changed, 25 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/genpd/amlogic/meson-secure-pwrc.c b/drivers/genpd/amlogic/meson-secure-pwrc.c
> index 5ac2437ab8ad..76527f4946b4 100644
> --- a/drivers/genpd/amlogic/meson-secure-pwrc.c
> +++ b/drivers/genpd/amlogic/meson-secure-pwrc.c
> @@ -19,10 +19,12 @@
>   
>   #define PWRC_ON		1
>   #define PWRC_OFF	0
> +#define PWRC_NO_PARENT  ((1UL << (sizeof(unsigned int) * 8)) - 1)

This is fishy, just use UINT_MAX

>   
>   struct meson_secure_pwrc_domain {
>   	struct generic_pm_domain base;
>   	unsigned int index;
> +	unsigned int parent;
>   	struct meson_secure_pwrc *pwrc;
>   };
>   
> @@ -34,6 +36,7 @@ struct meson_secure_pwrc {
>   
>   struct meson_secure_pwrc_domain_desc {
>   	unsigned int index;
> +	unsigned int parent;
>   	unsigned int flags;
>   	char *name;
>   	bool (*is_off)(struct meson_secure_pwrc_domain *pwrc_domain);
> @@ -90,8 +93,19 @@ static int meson_secure_pwrc_on(struct generic_pm_domain *domain)
>   {						\
>   	.name = #__name,			\
>   	.index = PWRC_##__name##_ID,		\
> -	.is_off = pwrc_secure_is_off,	\
> +	.is_off = pwrc_secure_is_off,		\
>   	.flags = __flag,			\
> +	.parent = PWRC_NO_PARENT,		\
> +}
> +
> +#define TOP_PD(__name, __flag, __parent)	\
> +[PWRC_##__name##_ID] =				\
> +{						\
> +	.name = #__name,			\
> +	.index = PWRC_##__name##_ID,		\
> +	.is_off = pwrc_secure_is_off,		\
> +	.flags = __flag,			\
> +	.parent = __parent,			\
>   }
>   
>   static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {
> @@ -202,6 +216,7 @@ static int meson_secure_pwrc_probe(struct platform_device *pdev)
>   
>   		dom->pwrc = pwrc;
>   		dom->index = match->domains[i].index;
> +		dom->parent = match->domains[i].parent;
>   		dom->base.name = match->domains[i].name;
>   		dom->base.flags = match->domains[i].flags;
>   		dom->base.power_on = meson_secure_pwrc_on;
> @@ -212,6 +227,15 @@ static int meson_secure_pwrc_probe(struct platform_device *pdev)
>   		pwrc->xlate.domains[i] = &dom->base;
>   	}
>   
> +	for (i = 0; i < match->count; i++) {
> +		struct meson_secure_pwrc_domain *dom = pwrc->domains;
> +
> +		if (!match->domains[i].name || match->domains[i].parent == PWRC_NO_PARENT)
> +			continue;
> +
> +		pm_genpd_add_subdomain(&dom[dom[i].parent].base, &dom[i].base);
> +	}
> +
>   	return of_genpd_add_provider_onecell(pdev->dev.of_node, &pwrc->xlate);
>   }
>
Xianwei Zhao Aug. 24, 2023, 8:42 a.m. UTC | #2 
Hi Neil,
    Thanks for your reply.

On 2023/8/24 16:27, Neil Armstrong wrote:
> [ EXTERNAL EMAIL ]
> 
> Hi,
> 
> On 24/08/2023 07:59, Xianwei Zhao wrote:
>> From: "xianwei.zhao" <xianwei.zhao@amlogic.com>
>>
>> Some power domains depends on other domains, Such as Amlogic T7 SoC.
>> Add parent node to support this case.
>>
>> Signed-off-by: xianwei.zhao <xianwei.zhao@amlogic.com>
>> ---
>> V1 -> V2: None
>> ---
>>   drivers/genpd/amlogic/meson-secure-pwrc.c | 26 ++++++++++++++++++++++-
>>   1 file changed, 25 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/genpd/amlogic/meson-secure-pwrc.c 
>> b/drivers/genpd/amlogic/meson-secure-pwrc.c
>> index 5ac2437ab8ad..76527f4946b4 100644
>> --- a/drivers/genpd/amlogic/meson-secure-pwrc.c
>> +++ b/drivers/genpd/amlogic/meson-secure-pwrc.c
>> @@ -19,10 +19,12 @@
>>
>>   #define PWRC_ON             1
>>   #define PWRC_OFF    0
>> +#define PWRC_NO_PARENT  ((1UL << (sizeof(unsigned int) * 8)) - 1)
> 
> This is fishy, just use UINT_MAX
Will do, use UINT_MAX define (~0U).
> 
>>
>>   struct meson_secure_pwrc_domain {
>>       struct generic_pm_domain base;
>>       unsigned int index;
>> +     unsigned int parent;
>>       struct meson_secure_pwrc *pwrc;
>>   };
>>
>> @@ -34,6 +36,7 @@ struct meson_secure_pwrc {
>>
>>   struct meson_secure_pwrc_domain_desc {
>>       unsigned int index;
>> +     unsigned int parent;
>>       unsigned int flags;
>>       char *name;
>>       bool (*is_off)(struct meson_secure_pwrc_domain *pwrc_domain);
>> @@ -90,8 +93,19 @@ static int meson_secure_pwrc_on(struct 
>> generic_pm_domain *domain)
>>   {                                           \
>>       .name = #__name,                        \
>>       .index = PWRC_##__name##_ID,            \
>> -     .is_off = pwrc_secure_is_off,   \
>> +     .is_off = pwrc_secure_is_off,           \
>>       .flags = __flag,                        \
>> +     .parent = PWRC_NO_PARENT,               \
>> +}
>> +
>> +#define TOP_PD(__name, __flag, __parent)     \
>> +[PWRC_##__name##_ID] =                               \
>> +{                                            \
>> +     .name = #__name,                        \
>> +     .index = PWRC_##__name##_ID,            \
>> +     .is_off = pwrc_secure_is_off,           \
>> +     .flags = __flag,                        \
>> +     .parent = __parent,                     \
>>   }
>>
>>   static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {
>> @@ -202,6 +216,7 @@ static int meson_secure_pwrc_probe(struct 
>> platform_device *pdev)
>>
>>               dom->pwrc = pwrc;
>>               dom->index = match->domains[i].index;
>> +             dom->parent = match->domains[i].parent;
>>               dom->base.name = match->domains[i].name;
>>               dom->base.flags = match->domains[i].flags;
>>               dom->base.power_on = meson_secure_pwrc_on;
>> @@ -212,6 +227,15 @@ static int meson_secure_pwrc_probe(struct 
>> platform_device *pdev)
>>               pwrc->xlate.domains[i] = &dom->base;
>>       }
>>
>> +     for (i = 0; i < match->count; i++) {
>> +             struct meson_secure_pwrc_domain *dom = pwrc->domains;
>> +
>> +             if (!match->domains[i].name || match->domains[i].parent 
>> == PWRC_NO_PARENT)
>> +                     continue;
>> +
>> +             pm_genpd_add_subdomain(&dom[dom[i].parent].base, 
>> &dom[i].base);
>> +     }
>> +
>>       return of_genpd_add_provider_onecell(pdev->dev.of_node, 
>> &pwrc->xlate);
>>   }
>>
>
diff mbox series

Patch

diff --git a/drivers/genpd/amlogic/meson-secure-pwrc.c b/drivers/genpd/amlogic/meson-secure-pwrc.c
index 5ac2437ab8ad..76527f4946b4 100644
--- a/drivers/genpd/amlogic/meson-secure-pwrc.c
+++ b/drivers/genpd/amlogic/meson-secure-pwrc.c
@@ -19,10 +19,12 @@ 
 
 #define PWRC_ON		1
 #define PWRC_OFF	0
+#define PWRC_NO_PARENT  ((1UL << (sizeof(unsigned int) * 8)) - 1)
 
 struct meson_secure_pwrc_domain {
 	struct generic_pm_domain base;
 	unsigned int index;
+	unsigned int parent;
 	struct meson_secure_pwrc *pwrc;
 };
 
@@ -34,6 +36,7 @@  struct meson_secure_pwrc {
 
 struct meson_secure_pwrc_domain_desc {
 	unsigned int index;
+	unsigned int parent;
 	unsigned int flags;
 	char *name;
 	bool (*is_off)(struct meson_secure_pwrc_domain *pwrc_domain);
@@ -90,8 +93,19 @@  static int meson_secure_pwrc_on(struct generic_pm_domain *domain)
 {						\
 	.name = #__name,			\
 	.index = PWRC_##__name##_ID,		\
-	.is_off = pwrc_secure_is_off,	\
+	.is_off = pwrc_secure_is_off,		\
 	.flags = __flag,			\
+	.parent = PWRC_NO_PARENT,		\
+}
+
+#define TOP_PD(__name, __flag, __parent)	\
+[PWRC_##__name##_ID] =				\
+{						\
+	.name = #__name,			\
+	.index = PWRC_##__name##_ID,		\
+	.is_off = pwrc_secure_is_off,		\
+	.flags = __flag,			\
+	.parent = __parent,			\
 }
 
 static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {
@@ -202,6 +216,7 @@  static int meson_secure_pwrc_probe(struct platform_device *pdev)
 
 		dom->pwrc = pwrc;
 		dom->index = match->domains[i].index;
+		dom->parent = match->domains[i].parent;
 		dom->base.name = match->domains[i].name;
 		dom->base.flags = match->domains[i].flags;
 		dom->base.power_on = meson_secure_pwrc_on;
@@ -212,6 +227,15 @@  static int meson_secure_pwrc_probe(struct platform_device *pdev)
 		pwrc->xlate.domains[i] = &dom->base;
 	}
 
+	for (i = 0; i < match->count; i++) {
+		struct meson_secure_pwrc_domain *dom = pwrc->domains;
+
+		if (!match->domains[i].name || match->domains[i].parent == PWRC_NO_PARENT)
+			continue;
+
+		pm_genpd_add_subdomain(&dom[dom[i].parent].base, &dom[i].base);
+	}
+
 	return of_genpd_add_provider_onecell(pdev->dev.of_node, &pwrc->xlate);
 }