* [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
2021-12-06 11:20 [PATCH v4 0/3] Add support for runtime features Ronak Jain
@ 2021-12-06 11:20 ` Ronak Jain
2021-12-21 9:17 ` Greg KH
2021-12-06 11:21 ` [PATCH v4 2/3] firmware: zynqmp: Add documentation for runtime feature config Ronak Jain
2021-12-06 11:21 ` [PATCH v4 3/3] firmware: xilinx: Add sysfs support for " Ronak Jain
2 siblings, 1 reply; 9+ messages in thread
From: Ronak Jain @ 2021-12-06 11:20 UTC (permalink / raw)
To: michal.simek, linux-kernel
Cc: gregkh, rajan.vaja, corbet, linux-arm-kernel, arnd,
lakshmi.sai.krishna.potthuri, Ronak Jain
Add support for runtime features by using an IOCTL call. The features
can be enabled or disabled from the firmware as well as the features
can be configured at runtime by querying IOCTL_SET_FEATURE_CONFIG id.
Similarly, the user can get the configured values of features by
querying IOCTL_GET_FEATURE_CONFIG id.
Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
---
Changes in v4:
- Update commit message
Changes in v3:
- Resolved merged conflict
Changes in v2:
- Resolved merged conflict
- Update commit message
---
drivers/firmware/xilinx/zynqmp.c | 27 +++++++++++++++++++++++++++
include/linux/firmware/xlnx-zynqmp.h | 25 +++++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 3dd45a7420dc..6b05844e67d7 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -1129,6 +1129,33 @@ int zynqmp_pm_system_shutdown(const u32 type, const u32 subtype)
0, 0, NULL);
}
+/**
+ * zynqmp_pm_set_feature_config - PM call to request IOCTL for feature config
+ * @id: The config ID of the feature to be configured
+ * @value: The config value of the feature to be configured
+ *
+ * Return: Returns 0 on success or error value on failure.
+ */
+int zynqmp_pm_set_feature_config(enum pm_feature_config_id id, u32 value)
+{
+ return zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_SET_FEATURE_CONFIG,
+ id, value, NULL);
+}
+
+/**
+ * zynqmp_pm_get_feature_config - PM call to get value of configured feature
+ * @id: The config id of the feature to be queried
+ * @payload: Returned value array
+ *
+ * Return: Returns 0 on success or error value on failure.
+ */
+int zynqmp_pm_get_feature_config(enum pm_feature_config_id id,
+ u32 *payload)
+{
+ return zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_GET_FEATURE_CONFIG,
+ id, 0, payload);
+}
+
/**
* 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 47fd4e52a423..772f7d6ba682 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -126,6 +126,9 @@ enum pm_ioctl_id {
/* Set healthy bit value */
IOCTL_SET_BOOT_HEALTH_STATUS = 17,
IOCTL_OSPI_MUX_SELECT = 21,
+ /* Runtime feature configuration */
+ IOCTL_SET_FEATURE_CONFIG = 26,
+ IOCTL_GET_FEATURE_CONFIG = 27,
};
enum pm_query_id {
@@ -359,6 +362,14 @@ enum ospi_mux_select_type {
PM_OSPI_MUX_SEL_LINEAR = 1,
};
+enum pm_feature_config_id {
+ PM_FEATURE_INVALID = 0,
+ PM_FEATURE_OVERTEMP_STATUS = 1,
+ PM_FEATURE_OVERTEMP_VALUE = 2,
+ PM_FEATURE_EXTWDT_STATUS = 3,
+ PM_FEATURE_EXTWDT_VALUE = 4,
+};
+
/**
* struct zynqmp_pm_query_data - PM query data
* @qid: query ID
@@ -427,6 +438,8 @@ int zynqmp_pm_pinctrl_get_config(const u32 pin, const u32 param,
int zynqmp_pm_pinctrl_set_config(const u32 pin, const u32 param,
u32 value);
int zynqmp_pm_load_pdi(const u32 src, const u64 address);
+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);
#else
static inline int zynqmp_pm_get_api_version(u32 *version)
{
@@ -658,6 +671,18 @@ static inline int zynqmp_pm_load_pdi(const u32 src, const u64 address)
{
return -ENODEV;
}
+
+static inline int zynqmp_pm_set_feature_config(enum pm_feature_config_id id,
+ u32 value)
+{
+ return -ENODEV;
+}
+
+static inline int zynqmp_pm_get_feature_config(enum pm_feature_config_id id,
+ u32 *payload)
+{
+ return -ENODEV;
+}
#endif
#endif /* __FIRMWARE_ZYNQMP_H__ */
--
2.32.0.93.g670b81a
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
2021-12-06 11:20 ` [PATCH v4 1/3] firmware: xilinx: " Ronak Jain
@ 2021-12-21 9:17 ` Greg KH
2021-12-23 8:55 ` Ronak Jain
0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2021-12-21 9:17 UTC (permalink / raw)
To: Ronak Jain
Cc: michal.simek, linux-kernel, rajan.vaja, corbet, linux-arm-kernel,
arnd, lakshmi.sai.krishna.potthuri
On Mon, Dec 06, 2021 at 03:20:59AM -0800, Ronak Jain wrote:
> Add support for runtime features by using an IOCTL call. The features
> can be enabled or disabled from the firmware as well as the features
> can be configured at runtime by querying IOCTL_SET_FEATURE_CONFIG id.
> Similarly, the user can get the configured values of features by
> querying IOCTL_GET_FEATURE_CONFIG id.
>
> Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
> ---
> Changes in v4:
> - Update commit message
>
> Changes in v3:
> - Resolved merged conflict
>
> Changes in v2:
> - Resolved merged conflict
> - Update commit message
> ---
> drivers/firmware/xilinx/zynqmp.c | 27 +++++++++++++++++++++++++++
> include/linux/firmware/xlnx-zynqmp.h | 25 +++++++++++++++++++++++++
> 2 files changed, 52 insertions(+)
I still get merge conflicts with this change:
checking file drivers/firmware/xilinx/zynqmp.c
Hunk #1 succeeded at 1156 (offset 27 lines).
checking file include/linux/firmware/xlnx-zynqmp.h
Hunk #1 FAILED at 126.
Hunk #2 succeeded at 376 (offset 17 lines).
Hunk #3 FAILED at 435.
Hunk #4 succeeded at 697 (offset 31 lines).
2 out of 4 hunks FAILED
What branch/tree are you making it against?
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
2021-12-21 9:17 ` Greg KH
@ 2021-12-23 8:55 ` Ronak Jain
2021-12-23 9:04 ` Greg KH
0 siblings, 1 reply; 9+ messages in thread
From: Ronak Jain @ 2021-12-23 8:55 UTC (permalink / raw)
To: Greg KH
Cc: Michal Simek, linux-kernel, Rajan Vaja, corbet, linux-arm-kernel,
arnd, Sai Krishna Potthuri
Hi Greg,
> -----Original Message-----
> From: Greg KH <gregkh@linuxfoundation.org>
> Sent: Tuesday, December 21, 2021 2:48 PM
> To: Ronak Jain <ronakj@xilinx.com>
> Cc: Michal Simek <michals@xilinx.com>; linux-kernel@vger.kernel.org; Rajan
> Vaja <RAJANV@xilinx.com>; corbet@lwn.net; linux-arm-
> kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri
> <lakshmis@xilinx.com>
> Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
>
> On Mon, Dec 06, 2021 at 03:20:59AM -0800, Ronak Jain wrote:
> > Add support for runtime features by using an IOCTL call. The features
> > can be enabled or disabled from the firmware as well as the features
> > can be configured at runtime by querying IOCTL_SET_FEATURE_CONFIG id.
> > Similarly, the user can get the configured values of features by
> > querying IOCTL_GET_FEATURE_CONFIG id.
> >
> > Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
> > ---
> > Changes in v4:
> > - Update commit message
> >
> > Changes in v3:
> > - Resolved merged conflict
> >
> > Changes in v2:
> > - Resolved merged conflict
> > - Update commit message
> > ---
> > drivers/firmware/xilinx/zynqmp.c | 27 +++++++++++++++++++++++++++
> > include/linux/firmware/xlnx-zynqmp.h | 25 +++++++++++++++++++++++++
> > 2 files changed, 52 insertions(+)
>
> I still get merge conflicts with this change:
>
> checking file drivers/firmware/xilinx/zynqmp.c Hunk #1 succeeded at 1156
> (offset 27 lines).
> checking file include/linux/firmware/xlnx-zynqmp.h
> Hunk #1 FAILED at 126.
> Hunk #2 succeeded at 376 (offset 17 lines).
> Hunk #3 FAILED at 435.
> Hunk #4 succeeded at 697 (offset 31 lines).
> 2 out of 4 hunks FAILED
>
>
> What branch/tree are you making it against?
>
I have created patches on the master branch of https://github.com/torvalds/linux.
Thanks,
Ronak
> thanks,
>
> greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
2021-12-23 8:55 ` Ronak Jain
@ 2021-12-23 9:04 ` Greg KH
2021-12-23 9:06 ` Ronak Jain
0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2021-12-23 9:04 UTC (permalink / raw)
To: Ronak Jain
Cc: Michal Simek, linux-kernel, Rajan Vaja, corbet, linux-arm-kernel,
arnd, Sai Krishna Potthuri
On Thu, Dec 23, 2021 at 08:55:09AM +0000, Ronak Jain wrote:
> Hi Greg,
>
> > -----Original Message-----
> > From: Greg KH <gregkh@linuxfoundation.org>
> > Sent: Tuesday, December 21, 2021 2:48 PM
> > To: Ronak Jain <ronakj@xilinx.com>
> > Cc: Michal Simek <michals@xilinx.com>; linux-kernel@vger.kernel.org; Rajan
> > Vaja <RAJANV@xilinx.com>; corbet@lwn.net; linux-arm-
> > kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri
> > <lakshmis@xilinx.com>
> > Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
> >
> > On Mon, Dec 06, 2021 at 03:20:59AM -0800, Ronak Jain wrote:
> > > Add support for runtime features by using an IOCTL call. The features
> > > can be enabled or disabled from the firmware as well as the features
> > > can be configured at runtime by querying IOCTL_SET_FEATURE_CONFIG id.
> > > Similarly, the user can get the configured values of features by
> > > querying IOCTL_GET_FEATURE_CONFIG id.
> > >
> > > Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
> > > ---
> > > Changes in v4:
> > > - Update commit message
> > >
> > > Changes in v3:
> > > - Resolved merged conflict
> > >
> > > Changes in v2:
> > > - Resolved merged conflict
> > > - Update commit message
> > > ---
> > > drivers/firmware/xilinx/zynqmp.c | 27 +++++++++++++++++++++++++++
> > > include/linux/firmware/xlnx-zynqmp.h | 25 +++++++++++++++++++++++++
> > > 2 files changed, 52 insertions(+)
> >
> > I still get merge conflicts with this change:
> >
> > checking file drivers/firmware/xilinx/zynqmp.c Hunk #1 succeeded at 1156
> > (offset 27 lines).
> > checking file include/linux/firmware/xlnx-zynqmp.h
> > Hunk #1 FAILED at 126.
> > Hunk #2 succeeded at 376 (offset 17 lines).
> > Hunk #3 FAILED at 435.
> > Hunk #4 succeeded at 697 (offset 31 lines).
> > 2 out of 4 hunks FAILED
> >
> >
> > What branch/tree are you making it against?
> >
> I have created patches on the master branch of https://github.com/torvalds/linux.
Please work against linux-next, it has the combined work of everyone
else as well.
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
2021-12-23 9:04 ` Greg KH
@ 2021-12-23 9:06 ` Ronak Jain
0 siblings, 0 replies; 9+ messages in thread
From: Ronak Jain @ 2021-12-23 9:06 UTC (permalink / raw)
To: Greg KH
Cc: Michal Simek, linux-kernel, Rajan Vaja, corbet, linux-arm-kernel,
arnd, Sai Krishna Potthuri
Hi Greg,
> -----Original Message-----
> From: Greg KH <gregkh@linuxfoundation.org>
> Sent: Thursday, December 23, 2021 2:35 PM
> To: Ronak Jain <ronakj@xilinx.com>
> Cc: Michal Simek <michals@xilinx.com>; linux-kernel@vger.kernel.org; Rajan
> Vaja <RAJANV@xilinx.com>; corbet@lwn.net; linux-arm-
> kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri
> <lakshmis@xilinx.com>
> Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
>
> On Thu, Dec 23, 2021 at 08:55:09AM +0000, Ronak Jain wrote:
> > Hi Greg,
> >
> > > -----Original Message-----
> > > From: Greg KH <gregkh@linuxfoundation.org>
> > > Sent: Tuesday, December 21, 2021 2:48 PM
> > > To: Ronak Jain <ronakj@xilinx.com>
> > > Cc: Michal Simek <michals@xilinx.com>; linux-kernel@vger.kernel.org;
> > > Rajan Vaja <RAJANV@xilinx.com>; corbet@lwn.net; linux-arm-
> > > kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri
> > > <lakshmis@xilinx.com>
> > > Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for
> > > runtime features
> > >
> > > On Mon, Dec 06, 2021 at 03:20:59AM -0800, Ronak Jain wrote:
> > > > Add support for runtime features by using an IOCTL call. The
> > > > features can be enabled or disabled from the firmware as well as
> > > > the features can be configured at runtime by querying
> IOCTL_SET_FEATURE_CONFIG id.
> > > > Similarly, the user can get the configured values of features by
> > > > querying IOCTL_GET_FEATURE_CONFIG id.
> > > >
> > > > Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
> > > > ---
> > > > Changes in v4:
> > > > - Update commit message
> > > >
> > > > Changes in v3:
> > > > - Resolved merged conflict
> > > >
> > > > Changes in v2:
> > > > - Resolved merged conflict
> > > > - Update commit message
> > > > ---
> > > > drivers/firmware/xilinx/zynqmp.c | 27
> +++++++++++++++++++++++++++
> > > > include/linux/firmware/xlnx-zynqmp.h | 25
> > > > +++++++++++++++++++++++++
> > > > 2 files changed, 52 insertions(+)
> > >
> > > I still get merge conflicts with this change:
> > >
> > > checking file drivers/firmware/xilinx/zynqmp.c Hunk #1 succeeded at
> > > 1156 (offset 27 lines).
> > > checking file include/linux/firmware/xlnx-zynqmp.h
> > > Hunk #1 FAILED at 126.
> > > Hunk #2 succeeded at 376 (offset 17 lines).
> > > Hunk #3 FAILED at 435.
> > > Hunk #4 succeeded at 697 (offset 31 lines).
> > > 2 out of 4 hunks FAILED
> > >
> > >
> > > What branch/tree are you making it against?
> > >
> > I have created patches on the master branch of
> https://github.com/torvalds/linux.
>
> Please work against linux-next, it has the combined work of everyone else as
> well.
Sure.
Thanks,
Ronak
>
> thanks,
>
> greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v4 2/3] firmware: zynqmp: Add documentation for runtime feature config
2021-12-06 11:20 [PATCH v4 0/3] Add support for runtime features Ronak Jain
2021-12-06 11:20 ` [PATCH v4 1/3] firmware: xilinx: " Ronak Jain
@ 2021-12-06 11:21 ` Ronak Jain
2021-12-21 9:18 ` Greg KH
2021-12-06 11:21 ` [PATCH v4 3/3] firmware: xilinx: Add sysfs support for " Ronak Jain
2 siblings, 1 reply; 9+ messages in thread
From: Ronak Jain @ 2021-12-06 11:21 UTC (permalink / raw)
To: michal.simek, linux-kernel
Cc: gregkh, rajan.vaja, corbet, linux-arm-kernel, arnd,
lakshmi.sai.krishna.potthuri, Ronak Jain
Add documentation for sysfs entries like feature_config_id and
feature_config_value for runtime feature configuration. The support is
added for an over temperature and external watchdog features.
Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
---
Changes in v4:
- Add separate sysfs entries for runtime feature config
- Update commit message
Changes in v3:
- None
Changes in v2:
- Update commit message
---
.../ABI/stable/sysfs-driver-firmware-zynqmp | 141 ++++++++++++++++++
1 file changed, 141 insertions(+)
diff --git a/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp b/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
index f5724bb5b462..0978a766bd65 100644
--- a/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
+++ b/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
@@ -113,3 +113,144 @@ Description:
# echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/health_status
Users: Xilinx
+
+What: /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+Date: Dec 2021
+KernelVersion: 5.16
+Contact: "Ronak Jain" <ronak.jain@xilinx.com>
+Description:
+ This sysfs interface allows user to configure features at
+ runtime. The user can enable or disable features running at
+ firmware as well as the user can configure the parameters of
+ the features at runtime. The supported features are over
+ temperature and external watchdog. Here, the external watchdog
+ is completely different than the /dev/watchdog as the external
+ watchdog is running on the firmware and it is used to monitor
+ the health of firmware not APU(Linux). Also, the external
+ watchdog is interfaced outside of the zynqmp soc.
+
+ The supported config ids are for the feature configuration is,
+ 1. PM_FEATURE_OVERTEMP_STATUS = 1, the user can enable or
+ disable the over temperature feature.
+ 2. PM_FEATURE_OVERTEMP_VALUE = 2, the user can configure the
+ over temperature limit in Degree Celsius.
+ 3. PM_FEATURE_EXTWDT_STATUS = 3, the user can enable or disable
+ the external watchdog feature.
+ 4. PM_FEATURE_EXTWDT_VALUE = 4, the user can configure the
+ external watchdog feature.
+
+ Usage:
+
+ Select over temperature config ID to enable/disable feature
+ # echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+
+ Check over temperature config ID is selected or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ The expected result is 1.
+
+ Select over temperature config ID to configure OT limit
+ # echo 2 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+
+ Check over temperature config ID is selected or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ The expected result is 2.
+
+ Select external watchdog config ID to enable/disable feature
+ # echo 3 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+
+ Check external watchdog config ID is selected or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ The expected result is 3.
+
+ Select external watchdog config ID to configure time interval
+ # echo 4 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+
+ Check external watchdog config ID is selected or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ The expected result is 4.
+
+Users: Xilinx
+
+What: /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+Date: Dec 2021
+KernelVersion: 5.16
+Contact: "Ronak Jain" <ronak.jain@xilinx.com>
+Description:
+ This sysfs interface allows to configure features at runtime.
+ The user can enable or disable features running at firmware.
+ Also, the user can configure the parameters of the features
+ at runtime. The supported features are over temperature and
+ external watchdog. Here, the external watchdog is completely
+ different than the /dev/watchdog as the external watchdog is
+ running on the firmware and it is used to monitor the health
+ of firmware not APU(Linux). Also, the external watchdog is
+ interfaced outside of the zynqmp soc.
+
+ By default the features are disabled in the firmware. The user
+ can enable features by querying appropriate config id of the
+ features.
+
+ The default limit for the over temperature is 90 Degree Celsius.
+ The default timer interval for the external watchdog is 570ms.
+
+ The supported config ids are for the feature configuration is,
+ 1. PM_FEATURE_OVERTEMP_STATUS = 1, the user can enable or
+ disable the over temperature feature.
+ 2. PM_FEATURE_OVERTEMP_VALUE = 2, the user can configure the
+ over temperature limit in Degree Celsius.
+ 3. PM_FEATURE_EXTWDT_STATUS = 3, the user can enable or disable
+ the external watchdog feature.
+ 4. PM_FEATURE_EXTWDT_VALUE = 4, the user can configure the
+ external watchdog feature.
+
+ Usage:
+
+ Enable over temperature feature
+ # echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ # echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+
+ Check whether the over temperature feature is enabled or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+ The expected result is 1.
+
+ Disable over temperature feature
+ # echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ # echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+
+ Check whether the over temperature feature is disabled or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+ The expected result is 0.
+
+ Configure over temperature limit to 50 Degree Celsius
+ # echo 2 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ # echo 50 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+
+ Check whether the over temperature limit is configured or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+ The expected result is 50.
+
+ Enable external watchdog feature
+ # echo 3 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ # echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+
+ Check whether the external watchdog feature is enabled or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+ The expected result is 1.
+
+ Disable external watchdog feature
+ # echo 3 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ # echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+
+ Check whether the external watchdog feature is disabled or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+ The expected result is 0.
+
+ Configure external watchdog timer interval to 500ms
+ # echo 4 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
+ # echo 500 > /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+
+ Check whether the external watchdog timer interval is configured or not
+ # cat /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_value
+ The expected result is 500.
+
+Users: Xilinx
--
2.32.0.93.g670b81a
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v4 2/3] firmware: zynqmp: Add documentation for runtime feature config
2021-12-06 11:21 ` [PATCH v4 2/3] firmware: zynqmp: Add documentation for runtime feature config Ronak Jain
@ 2021-12-21 9:18 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2021-12-21 9:18 UTC (permalink / raw)
To: Ronak Jain
Cc: michal.simek, linux-kernel, rajan.vaja, corbet, linux-arm-kernel,
arnd, lakshmi.sai.krishna.potthuri
On Mon, Dec 06, 2021 at 03:21:00AM -0800, Ronak Jain wrote:
> Add documentation for sysfs entries like feature_config_id and
> feature_config_value for runtime feature configuration. The support is
> added for an over temperature and external watchdog features.
>
> Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
> ---
> Changes in v4:
> - Add separate sysfs entries for runtime feature config
> - Update commit message
>
> Changes in v3:
> - None
>
> Changes in v2:
> - Update commit message
> ---
> .../ABI/stable/sysfs-driver-firmware-zynqmp | 141 ++++++++++++++++++
> 1 file changed, 141 insertions(+)
>
> diff --git a/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp b/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
> index f5724bb5b462..0978a766bd65 100644
> --- a/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
> +++ b/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
> @@ -113,3 +113,144 @@ Description:
> # echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/health_status
>
> Users: Xilinx
> +
> +What: /sys/devices/platform/firmware\:zynqmp-firmware/feature_config_id
> +Date: Dec 2021
> +KernelVersion: 5.16
no, 5.16 will not have these files, sorry.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v4 3/3] firmware: xilinx: Add sysfs support for feature config
2021-12-06 11:20 [PATCH v4 0/3] Add support for runtime features Ronak Jain
2021-12-06 11:20 ` [PATCH v4 1/3] firmware: xilinx: " Ronak Jain
2021-12-06 11:21 ` [PATCH v4 2/3] firmware: zynqmp: Add documentation for runtime feature config Ronak Jain
@ 2021-12-06 11:21 ` Ronak Jain
2 siblings, 0 replies; 9+ messages in thread
From: Ronak Jain @ 2021-12-06 11:21 UTC (permalink / raw)
To: michal.simek, linux-kernel
Cc: gregkh, rajan.vaja, corbet, linux-arm-kernel, arnd,
lakshmi.sai.krishna.potthuri, Ronak Jain
Add support for sysfs interface for runtime features configuration.
The user can configure the features at runtime. First, the user need
to select the config id of the supported features and then the user
can configure the parameters of the feature based on the config id.
Signed-off-by: Ronak Jain <ronak.jain@xilinx.com>
---
Changes in v4:
- Update commit message
Changes in v3:
- Added zynqmp_devinfo structure to store device instances
- Modified feature_conf_id from atomic variable to u32
- Update commit message
- Resolved merge conflicts
Changes in v2:
- Update commit message
---
drivers/firmware/xilinx/zynqmp.c | 93 ++++++++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 6b05844e67d7..f78711f09338 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -38,6 +38,16 @@
static bool feature_check_enabled;
static DEFINE_HASHTABLE(pm_api_features_map, PM_API_FEATURE_CHECK_MAX_ORDER);
+/**
+ * struct zynqmp_devinfo - Structure for Zynqmp device instance
+ * @dev: Device Pointer
+ * @feature_conf_id: Feature conf id
+ */
+struct zynqmp_devinfo {
+ struct device *dev;
+ u32 feature_conf_id;
+};
+
/**
* struct pm_api_feature_data - PM API Feature data
* @pm_api_id: PM API Id, used as key to index into hashmap
@@ -1424,6 +1434,78 @@ static DEVICE_ATTR_RW(pggs1);
static DEVICE_ATTR_RW(pggs2);
static DEVICE_ATTR_RW(pggs3);
+static ssize_t feature_config_id_show(struct device *device,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct zynqmp_devinfo *devinfo = dev_get_drvdata(device);
+
+ return sysfs_emit(buf, "%d\n", devinfo->feature_conf_id);
+}
+
+static ssize_t feature_config_id_store(struct device *device,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ u32 config_id;
+ int ret;
+ struct zynqmp_devinfo *devinfo = dev_get_drvdata(device);
+
+ if (!buf)
+ return -EINVAL;
+
+ ret = kstrtou32(buf, 10, &config_id);
+ if (ret)
+ return ret;
+
+ devinfo->feature_conf_id = config_id;
+
+ return count;
+}
+
+static DEVICE_ATTR_RW(feature_config_id);
+
+static ssize_t feature_config_value_show(struct device *device,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int ret;
+ u32 ret_payload[PAYLOAD_ARG_CNT];
+ struct zynqmp_devinfo *devinfo = dev_get_drvdata(device);
+
+ ret = zynqmp_pm_get_feature_config(devinfo->feature_conf_id,
+ ret_payload);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%d\n", ret_payload[1]);
+}
+
+static ssize_t feature_config_value_store(struct device *device,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ u32 value;
+ int ret;
+ struct zynqmp_devinfo *devinfo = dev_get_drvdata(device);
+
+ if (!buf)
+ return -EINVAL;
+
+ ret = kstrtou32(buf, 10, &value);
+ if (ret)
+ return ret;
+
+ ret = zynqmp_pm_set_feature_config(devinfo->feature_conf_id,
+ value);
+ if (ret)
+ return ret;
+
+ return count;
+}
+
+static DEVICE_ATTR_RW(feature_config_value);
+
static struct attribute *zynqmp_firmware_attrs[] = {
&dev_attr_ggs0.attr,
&dev_attr_ggs1.attr,
@@ -1435,6 +1517,8 @@ static struct attribute *zynqmp_firmware_attrs[] = {
&dev_attr_pggs3.attr,
&dev_attr_shutdown_scope.attr,
&dev_attr_health_status.attr,
+ &dev_attr_feature_config_id.attr,
+ &dev_attr_feature_config_value.attr,
NULL,
};
@@ -1444,6 +1528,7 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *np;
+ struct zynqmp_devinfo *devinfo;
int ret;
np = of_find_compatible_node(NULL, NULL, "xlnx,zynqmp");
@@ -1460,6 +1545,14 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
if (ret)
return ret;
+ devinfo = devm_kzalloc(dev, sizeof(*devinfo), GFP_KERNEL);
+ if (!devinfo)
+ return -ENOMEM;
+
+ devinfo->dev = dev;
+
+ platform_set_drvdata(pdev, devinfo);
+
/* Check PM API version number */
zynqmp_pm_get_api_version(&pm_api_version);
if (pm_api_version < ZYNQMP_PM_VERSION) {
--
2.32.0.93.g670b81a
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread