2022-07-22 08:16:46

by Pandey, Radhey Shyam

Subject: [PATCH net-next 1/2] firmware: xilinx: add support for sd/gem config

From: Ronak Jain <[email protected]>

Add new APIs in firmware to configure SD/GEM registers. Internally
it calls PM IOCTL for below SD/GEM register configuration:
- SD/EMMC select
- SD slot type
- SD base clock
- SD 8 bit support
- SD fixed config
- GEM SGMII Mode
- GEM fixed config

Signed-off-by: Ronak Jain <[email protected]>
Signed-off-by: Radhey Shyam Pandey <[email protected]>
---
drivers/firmware/xilinx/zynqmp.c | 31 ++++++++++++++++++++++++++
include/linux/firmware/xlnx-zynqmp.h | 33 ++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 7977a494a651..32a35bafb65e 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -1297,6 +1297,37 @@ int zynqmp_pm_get_feature_config(enum pm_feature_config_id id,
id, 0, payload);
}

+/**
+ * zynqmp_pm_set_sd_config - PM call to set value of SD config registers
+ * @node: SD node ID
+ * @config: The config type of SD registers
+ * @value: Value to be set
+ *
+ * Return: Returns 0 on success or error value on failure.
+ */
+int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value)
+{
+ return zynqmp_pm_invoke_fn(PM_IOCTL, node, IOCTL_SET_SD_CONFIG,
+ config, value, NULL);
+}
+EXPORT_SYMBOL_GPL(zynqmp_pm_set_sd_config);
+
+/**
+ * zynqmp_pm_set_gem_config - PM call to set value of GEM config registers
+ * @node: GEM node ID
+ * @config: The config type of GEM registers
+ * @value: Value to be set
+ *
+ * Return: Returns 0 on success or error value on failure.
+ */
+int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config,
+ u32 value)
+{
+ return zynqmp_pm_invoke_fn(PM_IOCTL, node, IOCTL_SET_GEM_CONFIG,
+ config, value, NULL);
+}
+EXPORT_SYMBOL_GPL(zynqmp_pm_set_gem_config);
+
/**
* struct zynqmp_pm_shutdown_scope - Struct for shutdown scope
* @subtype: Shutdown subtype
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 1ec73d5352c3..063a93c133f1 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -152,6 +152,9 @@ enum pm_ioctl_id {
/* Runtime feature configuration */
IOCTL_SET_FEATURE_CONFIG = 26,
IOCTL_GET_FEATURE_CONFIG = 27,
+ /* Dynamic SD/GEM configuration */
+ IOCTL_SET_SD_CONFIG = 30,
+ IOCTL_SET_GEM_CONFIG = 31,
};

enum pm_query_id {
@@ -393,6 +396,18 @@ enum pm_feature_config_id {
PM_FEATURE_EXTWDT_VALUE = 4,
};

+enum pm_sd_config_type {
+ SD_CONFIG_EMMC_SEL = 1, /* To set SD_EMMC_SEL in CTRL_REG_SD and SD_SLOTTYPE */
+ SD_CONFIG_BASECLK = 2, /* To set SD_BASECLK in SD_CONFIG_REG1 */
+ SD_CONFIG_8BIT = 3, /* To set SD_8BIT in SD_CONFIG_REG2 */
+ SD_CONFIG_FIXED = 4, /* To set fixed config registers */
+};
+
+enum pm_gem_config_type {
+ GEM_CONFIG_SGMII_MODE = 1, /* To set GEM_SGMII_MODE in GEM_CLK_CTRL register */
+ GEM_CONFIG_FIXED = 2, /* To set fixed config registers */
+};
+
/**
* struct zynqmp_pm_query_data - PM query data
* @qid: query ID
@@ -468,6 +483,9 @@ int zynqmp_pm_feature(const u32 api_id);
int zynqmp_pm_is_function_supported(const u32 api_id, const u32 id);
int zynqmp_pm_set_feature_config(enum pm_feature_config_id id, u32 value);
int zynqmp_pm_get_feature_config(enum pm_feature_config_id id, u32 *payload);
+int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value);
+int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config,
+ u32 value);
#else
static inline int zynqmp_pm_get_api_version(u32 *version)
{
@@ -733,6 +751,21 @@ static inline int zynqmp_pm_get_feature_config(enum pm_feature_config_id id,
{
return -ENODEV;
}
+
+static inline int zynqmp_pm_set_sd_config(u32 node,
+ enum pm_sd_config_type config,
+ u32 value)
+{
+ return -ENODEV;
+}
+
+static inline int zynqmp_pm_set_gem_config(u32 node,
+ enum pm_gem_config_type config,
+ u32 value)
+{
+ return -ENODEV;
+}
+
#endif

#endif /* __FIRMWARE_ZYNQMP_H__ */
--
2.25.1

2022-07-22 09:08:00

by Claudiu Beznea

Subject: Re: [PATCH net-next 1/2] firmware: xilinx: add support for sd/gem config

On 22.07.2022 11:11, Radhey Shyam Pandey wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> From: Ronak Jain <[email protected]>
>
> Add new APIs in firmware to configure SD/GEM registers. Internally
> it calls PM IOCTL for below SD/GEM register configuration:
> - SD/EMMC select
> - SD slot type
> - SD base clock
> - SD 8 bit support
> - SD fixed config
> - GEM SGMII Mode
> - GEM fixed config
>
> Signed-off-by: Ronak Jain <[email protected]>
> Signed-off-by: Radhey Shyam Pandey <[email protected]>
> ---
> drivers/firmware/xilinx/zynqmp.c | 31 ++++++++++++++++++++++++++
> include/linux/firmware/xlnx-zynqmp.h | 33 ++++++++++++++++++++++++++++
> 2 files changed, 64 insertions(+)
>
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index 7977a494a651..32a35bafb65e 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -1297,6 +1297,37 @@ int zynqmp_pm_get_feature_config(enum pm_feature_config_id id,
> id, 0, payload);
> }
>
> +/**
> + * zynqmp_pm_set_sd_config - PM call to set value of SD config registers
> + * @node: SD node ID
> + * @config: The config type of SD registers
> + * @value: Value to be set
> + *
> + * Return: Returns 0 on success or error value on failure.

You have spaces after "Return:", doesn't match with tabs that you have
after variable documentation.

> + */
> +int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value)
> +{
> + return zynqmp_pm_invoke_fn(PM_IOCTL, node, IOCTL_SET_SD_CONFIG,
> + config, value, NULL);
> +}
> +EXPORT_SYMBOL_GPL(zynqmp_pm_set_sd_config);
> +
> +/**
> + * zynqmp_pm_set_gem_config - PM call to set value of GEM config registers
> + * @node: GEM node ID
> + * @config: The config type of GEM registers
> + * @value: Value to be set
> + *
> + * Return: Returns 0 on success or error value on failure.

Same here.

> + */
> +int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config,
> + u32 value)
> +{
> + return zynqmp_pm_invoke_fn(PM_IOCTL, node, IOCTL_SET_GEM_CONFIG,
> + config, value, NULL);
> +}
> +EXPORT_SYMBOL_GPL(zynqmp_pm_set_gem_config);
> +
> /**
> * struct zynqmp_pm_shutdown_scope - Struct for shutdown scope
> * @subtype: Shutdown subtype
> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
> index 1ec73d5352c3..063a93c133f1 100644
> --- a/include/linux/firmware/xlnx-zynqmp.h
> +++ b/include/linux/firmware/xlnx-zynqmp.h
> @@ -152,6 +152,9 @@ enum pm_ioctl_id {
> /* Runtime feature configuration */
> IOCTL_SET_FEATURE_CONFIG = 26,
> IOCTL_GET_FEATURE_CONFIG = 27,
> + /* Dynamic SD/GEM configuration */
> + IOCTL_SET_SD_CONFIG = 30,
> + IOCTL_SET_GEM_CONFIG = 31,
> };
>
> enum pm_query_id {
> @@ -393,6 +396,18 @@ enum pm_feature_config_id {
> PM_FEATURE_EXTWDT_VALUE = 4,
> };
>
> +enum pm_sd_config_type {
> + SD_CONFIG_EMMC_SEL = 1, /* To set SD_EMMC_SEL in CTRL_REG_SD and SD_SLOTTYPE */
> + SD_CONFIG_BASECLK = 2, /* To set SD_BASECLK in SD_CONFIG_REG1 */
> + SD_CONFIG_8BIT = 3, /* To set SD_8BIT in SD_CONFIG_REG2 */
> + SD_CONFIG_FIXED = 4, /* To set fixed config registers */
> +};
> +
> +enum pm_gem_config_type {
> + GEM_CONFIG_SGMII_MODE = 1, /* To set GEM_SGMII_MODE in GEM_CLK_CTRL register */
> + GEM_CONFIG_FIXED = 2, /* To set fixed config registers */
> +};
> +
> /**
> * struct zynqmp_pm_query_data - PM query data
> * @qid: query ID
> @@ -468,6 +483,9 @@ int zynqmp_pm_feature(const u32 api_id);
> int zynqmp_pm_is_function_supported(const u32 api_id, const u32 id);
> int zynqmp_pm_set_feature_config(enum pm_feature_config_id id, u32 value);
> int zynqmp_pm_get_feature_config(enum pm_feature_config_id id, u32 *payload);
> +int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value);
> +int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config,
> + u32 value);
> #else
> static inline int zynqmp_pm_get_api_version(u32 *version)
> {
> @@ -733,6 +751,21 @@ static inline int zynqmp_pm_get_feature_config(enum pm_feature_config_id id,
> {
> return -ENODEV;
> }
> +
> +static inline int zynqmp_pm_set_sd_config(u32 node,
> + enum pm_sd_config_type config,
> + u32 value)
> +{
> + return -ENODEV;
> +}
> +
> +static inline int zynqmp_pm_set_gem_config(u32 node,
> + enum pm_gem_config_type config,
> + u32 value)
> +{
> + return -ENODEV;
> +}
> +
> #endif
>
> #endif /* __FIRMWARE_ZYNQMP_H__ */
> --
> 2.25.1
>

2022-07-25 13:12:51

by Pandey, Radhey Shyam

Subject: RE: [PATCH net-next 1/2] firmware: xilinx: add support for sd/gem config

> -----Original Message-----
> From: [email protected] <[email protected]>
> Sent: Friday, July 22, 2022 2:22 PM
> To: Pandey, Radhey Shyam <[email protected]>;
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; [email protected]
> Cc: [email protected]; [email protected];
> [email protected]; [email protected]; git (AMD-Xilinx) <[email protected]>
> Subject: Re: [PATCH net-next 1/2] firmware: xilinx: add support for sd/gem
> config
>
> On 22.07.2022 11:11, Radhey Shyam Pandey wrote:
> > EXTERNAL EMAIL: Do not click links or open attachments unless you know
> > the content is safe
> >
> > From: Ronak Jain <[email protected]>
> >
> > Add new APIs in firmware to configure SD/GEM registers. Internally it
> > calls PM IOCTL for below SD/GEM register configuration:
> > - SD/EMMC select
> > - SD slot type
> > - SD base clock
> > - SD 8 bit support
> > - SD fixed config
> > - GEM SGMII Mode
> > - GEM fixed config
> >
> > Signed-off-by: Ronak Jain <[email protected]>
> > Signed-off-by: Radhey Shyam Pandey <[email protected]>
> > ---
> > drivers/firmware/xilinx/zynqmp.c | 31 ++++++++++++++++++++++++++
> > include/linux/firmware/xlnx-zynqmp.h | 33
> > ++++++++++++++++++++++++++++
> > 2 files changed, 64 insertions(+)
> >
> > diff --git a/drivers/firmware/xilinx/zynqmp.c
> > b/drivers/firmware/xilinx/zynqmp.c
> > index 7977a494a651..32a35bafb65e 100644
> > --- a/drivers/firmware/xilinx/zynqmp.c
> > +++ b/drivers/firmware/xilinx/zynqmp.c
> > @@ -1297,6 +1297,37 @@ int zynqmp_pm_get_feature_config(enum
> pm_feature_config_id id,
> > id, 0, payload); }
> >
> > +/**
> > + * zynqmp_pm_set_sd_config - PM call to set value of SD config registers
> > + * @node: SD node ID
> > + * @config: The config type of SD registers
> > + * @value: Value to be set
> > + *
> > + * Return: Returns 0 on success or error value on failure.
>
> You have spaces after "Return:", doesn't match with tabs that you have after
> variable documentation.

Ok, will fix the return indentation to tab to match with variable documentation.
>
> > + */
> > +int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type
> config,
> > +u32 value) {
> > + return zynqmp_pm_invoke_fn(PM_IOCTL, node,
> IOCTL_SET_SD_CONFIG,
> > + config, value, NULL); }
> > +EXPORT_SYMBOL_GPL(zynqmp_pm_set_sd_config);
> > +
> > +/**
> > + * zynqmp_pm_set_gem_config - PM call to set value of GEM config
> registers
> > + * @node: GEM node ID
> > + * @config: The config type of GEM registers
> > + * @value: Value to be set
> > + *
> > + * Return: Returns 0 on success or error value on failure.
>
> Same here.

Will fix it in v2.
>
> > + */
> > +int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type
> config,
> > + u32 value) {
> > + return zynqmp_pm_invoke_fn(PM_IOCTL, node,
> IOCTL_SET_GEM_CONFIG,
> > + config, value, NULL); }
> > +EXPORT_SYMBOL_GPL(zynqmp_pm_set_gem_config);
> > +
> > /**
> > * struct zynqmp_pm_shutdown_scope - Struct for shutdown scope
> > * @subtype: Shutdown subtype
> > diff --git a/include/linux/firmware/xlnx-zynqmp.h
> > b/include/linux/firmware/xlnx-zynqmp.h
> > index 1ec73d5352c3..063a93c133f1 100644
> > --- a/include/linux/firmware/xlnx-zynqmp.h
> > +++ b/include/linux/firmware/xlnx-zynqmp.h
> > @@ -152,6 +152,9 @@ enum pm_ioctl_id {
> > /* Runtime feature configuration */
> > IOCTL_SET_FEATURE_CONFIG = 26,
> > IOCTL_GET_FEATURE_CONFIG = 27,
> > + /* Dynamic SD/GEM configuration */
> > + IOCTL_SET_SD_CONFIG = 30,
> > + IOCTL_SET_GEM_CONFIG = 31,
> > };
> >
> > enum pm_query_id {
> > @@ -393,6 +396,18 @@ enum pm_feature_config_id {
> > PM_FEATURE_EXTWDT_VALUE = 4,
> > };
> >
> > +enum pm_sd_config_type {
> > + SD_CONFIG_EMMC_SEL = 1, /* To set SD_EMMC_SEL in CTRL_REG_SD
> and SD_SLOTTYPE */
> > + SD_CONFIG_BASECLK = 2, /* To set SD_BASECLK in SD_CONFIG_REG1
> */
> > + SD_CONFIG_8BIT = 3, /* To set SD_8BIT in SD_CONFIG_REG2 */
> > + SD_CONFIG_FIXED = 4, /* To set fixed config registers */ };
> > +
> > +enum pm_gem_config_type {
> > + GEM_CONFIG_SGMII_MODE = 1, /* To set GEM_SGMII_MODE in
> GEM_CLK_CTRL register */
> > + GEM_CONFIG_FIXED = 2, /* To set fixed config registers */ };
> > +
> > /**
> > * struct zynqmp_pm_query_data - PM query data
> > * @qid: query ID
> > @@ -468,6 +483,9 @@ int zynqmp_pm_feature(const u32 api_id); int
> > zynqmp_pm_is_function_supported(const u32 api_id, const u32 id); int
> > zynqmp_pm_set_feature_config(enum pm_feature_config_id id, u32
> value);
> > int zynqmp_pm_get_feature_config(enum pm_feature_config_id id, u32
> > *payload);
> > +int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type
> config,
> > +u32 value); int zynqmp_pm_set_gem_config(u32 node, enum
> pm_gem_config_type config,
> > + u32 value);
> > #else
> > static inline int zynqmp_pm_get_api_version(u32 *version) { @@
> > -733,6 +751,21 @@ static inline int zynqmp_pm_get_feature_config(enum
> > pm_feature_config_id id, {
> > return -ENODEV;
> > }
> > +
> > +static inline int zynqmp_pm_set_sd_config(u32 node,
> > + enum pm_sd_config_type config,
> > + u32 value) {
> > + return -ENODEV;
> > +}
> > +
> > +static inline int zynqmp_pm_set_gem_config(u32 node,
> > + enum pm_gem_config_type config,
> > + u32 value) {
> > + return -ENODEV;
> > +}
> > +
> > #endif
> >
> > #endif /* __FIRMWARE_ZYNQMP_H__ */
> > --
> > 2.25.1
> >