On 5/28/21 5:59 PM, Abhyuday Godhasara wrote:
> Add macros for the Node-Id of Error events.
>
> Move supported api callback ids from zynqmp-power to zynqmp-firmware.
>
> Signed-off-by: Rajan Vaja <[email protected]>
> Signed-off-by: Abhyuday Godhasara <[email protected]>
> ---
> drivers/soc/xilinx/zynqmp_power.c | 6 ------
> include/linux/firmware/xlnx-zynqmp.h | 13 +++++++++++++
> 2 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/soc/xilinx/zynqmp_power.c b/drivers/soc/xilinx/zynqmp_power.c
> index c556623..76478fe 100644
> --- a/drivers/soc/xilinx/zynqmp_power.c
> +++ b/drivers/soc/xilinx/zynqmp_power.c
> @@ -46,12 +46,6 @@ static const char *const suspend_modes[] = {
>
> static enum pm_suspend_mode suspend_mode = PM_SUSPEND_MODE_STD;
>
> -enum pm_api_cb_id {
> - PM_INIT_SUSPEND_CB = 30,
> - PM_ACKNOWLEDGE_CB,
> - PM_NOTIFY_CB,
> -};
> -
> static void zynqmp_pm_get_callback_data(u32 *buf)
> {
> zynqmp_pm_invoke_fn(GET_CALLBACK_DATA, 0, 0, 0, 0, buf);
> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
> index 6557832..c715756 100644
> --- a/include/linux/firmware/xlnx-zynqmp.h
> +++ b/include/linux/firmware/xlnx-zynqmp.h
> @@ -60,6 +60,19 @@
> #define XILINX_ZYNQMP_PM_FPGA_FULL 0x0U
> #define XILINX_ZYNQMP_PM_FPGA_PARTIAL BIT(0)
>
> +/*
> + * Node IDs for the Error Events.
> + */
> +#define EVENT_ERROR_PMC_ERR1 (0x28100000U)
> +#define EVENT_ERROR_PMC_ERR2 (0x28104000U)
> +#define EVENT_ERROR_PSM_ERR1 (0x28108000U)
> +#define EVENT_ERROR_PSM_ERR2 (0x2810C000U)
> +
> +enum pm_api_cb_id {
> + PM_INIT_SUSPEND_CB = 30,
No information about why PM_ACKNOWLEDGE_CB was removed. Doing it via
separate patch would be the best.
M
> + PM_NOTIFY_CB = 32,
> +};
> +
> enum pm_api_id {
> PM_GET_API_VERSION = 1,
> PM_REGISTER_NOTIFIER = 5,
>
Hi,
> -----Original Message-----
> From: Michal Simek <[email protected]>
> Sent: Monday, June 21, 2021 4:42 PM
> To: Abhyuday Godhasara <[email protected]>; Michal Simek
> <[email protected]>
> Cc: Rajan Vaja <[email protected]>; Manish Narani <[email protected]>;
> [email protected]; Amit Sunil Dhamne <[email protected]>; Sai
> Krishna Potthuri <[email protected]>; Jiaying Liang <[email protected]>;
> [email protected]; [email protected]
> Subject: Re: [PATCH 2/6] firmware: xilinx: add macros of node ids for error
> event
>
>
>
> On 5/28/21 5:59 PM, Abhyuday Godhasara wrote:
> > Add macros for the Node-Id of Error events.
> >
> > Move supported api callback ids from zynqmp-power to zynqmp-firmware.
> >
> > Signed-off-by: Rajan Vaja <[email protected]>
> > Signed-off-by: Abhyuday Godhasara <[email protected]>
> > ---
> > drivers/soc/xilinx/zynqmp_power.c | 6 ------
> > include/linux/firmware/xlnx-zynqmp.h | 13 +++++++++++++
> > 2 files changed, 13 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/soc/xilinx/zynqmp_power.c
> > b/drivers/soc/xilinx/zynqmp_power.c
> > index c556623..76478fe 100644
> > --- a/drivers/soc/xilinx/zynqmp_power.c
> > +++ b/drivers/soc/xilinx/zynqmp_power.c
> > @@ -46,12 +46,6 @@ static const char *const suspend_modes[] = {
> >
> > static enum pm_suspend_mode suspend_mode = PM_SUSPEND_MODE_STD;
> >
> > -enum pm_api_cb_id {
> > - PM_INIT_SUSPEND_CB = 30,
> > - PM_ACKNOWLEDGE_CB,
> > - PM_NOTIFY_CB,
> > -};
> > -
> > static void zynqmp_pm_get_callback_data(u32 *buf) {
> > zynqmp_pm_invoke_fn(GET_CALLBACK_DATA, 0, 0, 0, 0, buf); diff --git
> > a/include/linux/firmware/xlnx-zynqmp.h
> > b/include/linux/firmware/xlnx-zynqmp.h
> > index 6557832..c715756 100644
> > --- a/include/linux/firmware/xlnx-zynqmp.h
> > +++ b/include/linux/firmware/xlnx-zynqmp.h
> > @@ -60,6 +60,19 @@
> > #define XILINX_ZYNQMP_PM_FPGA_FULL 0x0U
> > #define XILINX_ZYNQMP_PM_FPGA_PARTIAL BIT(0)
> >
> > +/*
> > + * Node IDs for the Error Events.
> > + */
> > +#define EVENT_ERROR_PMC_ERR1 (0x28100000U)
> > +#define EVENT_ERROR_PMC_ERR2 (0x28104000U)
> > +#define EVENT_ERROR_PSM_ERR1 (0x28108000U)
> > +#define EVENT_ERROR_PSM_ERR2 (0x2810C000U)
> > +
> > +enum pm_api_cb_id {
> > + PM_INIT_SUSPEND_CB = 30,
>
> No information about why PM_ACKNOWLEDGE_CB was removed. Doing it via
> separate patch would be the best.
[Abhyuday] Will not remove PM_ACKNOWLEDGE_CB as to be in sync with firmware.
>
> M
>
> > + PM_NOTIFY_CB = 32,
> > +};
> > +
> > enum pm_api_id {
> > PM_GET_API_VERSION = 1,
> > PM_REGISTER_NOTIFIER = 5,
> >
Thanks,
Abhyuday