lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 04/11] firmware: arm_scmi: Refactor polling helpers
    Date
    Refactor polling helpers to receive scmi_desc directly as a parameter and
    move all of them to common.h.

    No functional change.

    Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
    ---
    drivers/firmware/arm_scmi/common.h | 18 ++++++++++++++++
    drivers/firmware/arm_scmi/driver.c | 34 ++++++++----------------------
    2 files changed, 27 insertions(+), 25 deletions(-)

    diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
    index 096b66442d84..30d056febef1 100644
    --- a/drivers/firmware/arm_scmi/common.h
    +++ b/drivers/firmware/arm_scmi/common.h
    @@ -212,6 +212,24 @@ struct scmi_desc {
    const bool atomic_enabled;
    };

    +static inline bool is_polling_required(struct scmi_chan_info *cinfo,
    + const struct scmi_desc *desc)
    +{
    + return cinfo->no_completion_irq || desc->force_polling;
    +}
    +
    +static inline bool is_transport_polling_capable(const struct scmi_desc *desc)
    +{
    + return desc->ops->poll_done || desc->sync_cmds_completed_on_ret;
    +}
    +
    +static inline bool is_polling_enabled(struct scmi_chan_info *cinfo,
    + const struct scmi_desc *desc)
    +{
    + return is_polling_required(cinfo, desc) &&
    + is_transport_polling_capable(desc);
    +}
    +
    #ifdef CONFIG_ARM_SCMI_TRANSPORT_MAILBOX
    extern const struct scmi_desc scmi_mailbox_desc;
    #endif
    diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
    index 032d1140d631..9c77c931d91b 100644
    --- a/drivers/firmware/arm_scmi/driver.c
    +++ b/drivers/firmware/arm_scmi/driver.c
    @@ -648,25 +648,6 @@ static inline void scmi_clear_channel(struct scmi_info *info,
    info->desc->ops->clear_channel(cinfo);
    }

    -static inline bool is_polling_required(struct scmi_chan_info *cinfo,
    - struct scmi_info *info)
    -{
    - return cinfo->no_completion_irq || info->desc->force_polling;
    -}
    -
    -static inline bool is_transport_polling_capable(struct scmi_info *info)
    -{
    - return info->desc->ops->poll_done ||
    - info->desc->sync_cmds_completed_on_ret;
    -}
    -
    -static inline bool is_polling_enabled(struct scmi_chan_info *cinfo,
    - struct scmi_info *info)
    -{
    - return is_polling_required(cinfo, info) &&
    - is_transport_polling_capable(info);
    -}
    -
    static void scmi_handle_notification(struct scmi_chan_info *cinfo,
    u32 msg_hdr, void *priv)
    {
    @@ -909,7 +890,8 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
    struct scmi_chan_info *cinfo;

    /* Check for polling request on custom command xfers at first */
    - if (xfer->hdr.poll_completion && !is_transport_polling_capable(info)) {
    + if (xfer->hdr.poll_completion &&
    + !is_transport_polling_capable(info->desc)) {
    dev_warn_once(dev,
    "Polling mode is not supported by transport.\n");
    return -EINVAL;
    @@ -920,7 +902,7 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
    return -EINVAL;

    /* True ONLY if also supported by transport. */
    - if (is_polling_enabled(cinfo, info))
    + if (is_polling_enabled(cinfo, info->desc))
    xfer->hdr.poll_completion = true;

    /*
    @@ -1854,7 +1836,8 @@ static bool scmi_is_transport_atomic(const struct scmi_handle *handle,
    bool ret;
    struct scmi_info *info = handle_to_scmi_info(handle);

    - ret = info->desc->atomic_enabled && is_transport_polling_capable(info);
    + ret = info->desc->atomic_enabled &&
    + is_transport_polling_capable(info->desc);
    if (ret && atomic_threshold)
    *atomic_threshold = info->atomic_threshold;

    @@ -2061,8 +2044,8 @@ static int scmi_chan_setup(struct scmi_info *info, struct device_node *of_node,
    return ret;
    }

    - if (tx && is_polling_required(cinfo, info)) {
    - if (is_transport_polling_capable(info))
    + if (tx && is_polling_required(cinfo, info->desc)) {
    + if (is_transport_polling_capable(info->desc))
    dev_info(&tdev->dev,
    "Enabled polling mode TX channel - prot_id:%d\n",
    prot_id);
    @@ -2491,7 +2474,8 @@ static int scmi_probe(struct platform_device *pdev)
    if (scmi_notification_init(handle))
    dev_err(dev, "SCMI Notifications NOT available.\n");

    - if (info->desc->atomic_enabled && !is_transport_polling_capable(info))
    + if (info->desc->atomic_enabled &&
    + !is_transport_polling_capable(info->desc))
    dev_err(dev,
    "Transport is not polling capable. Atomic mode not supported.\n");

    --
    2.34.1
    \
     
     \ /
      Last update: 2022-10-19 22:47    [W:4.120 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site