RE: [PATCH V4 1/2] firmware: imx: add dummy functions

From: Peng Fan
Date: Thu Feb 20 2020 - 02:46:22 EST




> Subject: Re: [PATCH V4 1/2] firmware: imx: add dummy functions
>
> On 20.02.2020 08:24, Peng Fan wrote:
> > From: Peng Fan <peng.fan@xxxxxxx>
> >
> > IMX_SCU_SOC could be enabled with COMPILE_TEST, however there is no
> > dummy functions when CONFIG_IMX_SCU not defined. Then there will be
> > build failure.
> >
> > So add dummy functions to avoid build failure for COMPILE_TEST
> >
> > Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
> > ---
> > include/linux/firmware/imx/ipc.h | 13 +++++++++++++
> > include/linux/firmware/imx/sci.h | 22 ++++++++++++++++++++++
> > include/linux/firmware/imx/svc/misc.h | 19 +++++++++++++++++++
> > 3 files changed, 54 insertions(+)
> >
> > diff --git a/include/linux/firmware/imx/ipc.h
> > b/include/linux/firmware/imx/ipc.h
> > index 6312c8cb084a..30475082f472 100644
> > --- a/include/linux/firmware/imx/ipc.h
> > +++ b/include/linux/firmware/imx/ipc.h
> > @@ -35,6 +35,7 @@ struct imx_sc_rpc_msg {
> > uint8_t func;
> > };
> >
> > +#ifdef CONFIG_IMX_SCU
> > /*
> > * This is an function to send an RPC message over an IPC channel.
> > * It is called by client-side SCFW API function shims.
> > @@ -56,4 +57,16 @@ int imx_scu_call_rpc(struct imx_sc_ipc *ipc, void
> *msg, bool have_resp);
> > * @return Returns an error code (0 = success, failed if < 0)
> > */
> > int imx_scu_get_handle(struct imx_sc_ipc **ipc);
> > +#else
> > +static inline int imx_scu_call_rpc(struct imx_sc_ipc *ipc, void *msg,
> > + bool have_resp)
> > +{
> > + return -ENOTSUPP;
> > +}
> > +
> > +static inline int imx_scu_get_handle(struct imx_sc_ipc **ipc) {
> > + return -ENOTSUPP;
> > +}
> > +#endif
> > #endif /* _SC_IPC_H */
> > diff --git a/include/linux/firmware/imx/sci.h
> > b/include/linux/firmware/imx/sci.h
> > index 17ba4e405129..7ea875b186e3 100644
> > --- a/include/linux/firmware/imx/sci.h
> > +++ b/include/linux/firmware/imx/sci.h
> > @@ -16,8 +16,30 @@
> > #include <linux/firmware/imx/svc/misc.h>
> > #include <linux/firmware/imx/svc/pm.h>
> >
> > +#ifdef CONFIG_IMX_SCU
> > int imx_scu_enable_general_irq_channel(struct device *dev);
> > int imx_scu_irq_register_notifier(struct notifier_block *nb);
> > int imx_scu_irq_unregister_notifier(struct notifier_block *nb);
> > int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable);
> > +#else
> > +static inline int imx_scu_enable_general_irq_channel(struct device
> > +*dev) {
> > + return -ENOTSUPP;
> > +}
> > +
> > +static inline int imx_scu_irq_register_notifier(struct notifier_block
> > +*nb) {
> > + return -ENOTSUPP;
> > +}
> > +
> > +static inline int imx_scu_irq_unregister_notifier(struct
> > +notifier_block *nb) {
> > + return -ENOTSUPP;
> > +}
> > +
> > +static inline int imx_scu_irq_group_enable(u8 group, u32 mask, u8
> > +enable) {
> > + return -ENOTSUPP;
> > +}
> > +#endif
> > #endif /* _SC_SCI_H */
> > diff --git a/include/linux/firmware/imx/svc/misc.h
> > b/include/linux/firmware/imx/svc/misc.h
> > index 031dd4d3c766..3f4a0f526b73 100644
> > --- a/include/linux/firmware/imx/svc/misc.h
> > +++ b/include/linux/firmware/imx/svc/misc.h
> > @@ -46,6 +46,7 @@ enum imx_misc_func {
> > * Control Functions
> > */
> >
> > +#ifdef CONFIG_IMX_SCU
> > int imx_sc_misc_set_control(struct imx_sc_ipc *ipc, u32 resource,
> > u8 ctrl, u32 val);
> >
> > @@ -54,5 +55,23 @@ int imx_sc_misc_get_control(struct imx_sc_ipc *ipc,
> > u32 resource,
> >
> > int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource,
> > bool enable, u64 phys_addr);
> > +#else
> Functions for dummy case below should be static inline.

Opps. Forgot to add these three.

Thanks,
Peng.

> > +int imx_sc_misc_set_control(struct imx_sc_ipc *ipc, u32 resource,
> > + u8 ctrl, u32 val)
> > +{
> > + return -ENOTSUPP;
> > +}
> > +
> > +int imx_sc_misc_get_control(struct imx_sc_ipc *ipc, u32 resource,
> > + u8 ctrl, u32 *val)
> > +{
> > + return -ENOTSUPP;
> > +}
> >
> > +int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource,
> > + bool enable, u64 phys_addr)
> > +{
> > + return -ENOTSUPP;
> > +}
> > +#endif
> > #endif /* _SC_MISC_API_H */
>