lkml.org 
[lkml]   [2018]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v6 18/25] drivers: firmware: psci: Share a few internal PSCI functions
    On Wed, Mar 14, 2018 at 05:58:28PM +0100, Ulf Hansson wrote:
    > Following changes needs to be able to call psci_get|set_domain_state() and
    > psci_dt_parse_state_node(), but from a separate file. Let's make that
    > possible by sharing them via a new internal PSCI header file.
    >
    > Cc: Lina Iyer <ilina@codeaurora.org>
    > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    > ---
    > drivers/firmware/psci.c | 14 ++++++++------
    > drivers/firmware/psci.h | 13 +++++++++++++
    > 2 files changed, 21 insertions(+), 6 deletions(-)
    > create mode 100644 drivers/firmware/psci.h

    To mimimize the clutter in drivers/firmware/, it might be better to
    move this into a drivers/firmware/psci/ directory, which would also
    simplify the MAINTAINERS modification.

    Thanks,
    Mark.

    >
    > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
    > index 40b2b89..463f78c 100644
    > --- a/drivers/firmware/psci.c
    > +++ b/drivers/firmware/psci.c
    > @@ -34,6 +34,8 @@
    > #include <asm/smp_plat.h>
    > #include <asm/suspend.h>
    >
    > +#include "psci.h"
    > +
    > /*
    > * While a 64-bit OS can make calls with SMC32 calling conventions, for some
    > * calls it is necessary to use SMC64 to pass or return 64-bit values.
    > @@ -90,12 +92,12 @@ static u32 psci_function_id[PSCI_FN_MAX];
    > static DEFINE_PER_CPU(u32, domain_state);
    > static u32 psci_cpu_suspend_feature;
    >
    > -static inline u32 psci_get_domain_state(void)
    > +u32 psci_get_domain_state(void)
    > {
    > return this_cpu_read(domain_state);
    > }
    >
    > -static inline void psci_set_domain_state(u32 state)
    > +void psci_set_domain_state(u32 state)
    > {
    > this_cpu_write(domain_state, state);
    > }
    > @@ -285,10 +287,7 @@ static int __init psci_features(u32 psci_func_id)
    > psci_func_id, 0, 0);
    > }
    >
    > -#ifdef CONFIG_CPU_IDLE
    > -static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state);
    > -
    > -static int psci_dt_parse_state_node(struct device_node *np, u32 *state)
    > +int psci_dt_parse_state_node(struct device_node *np, u32 *state)
    > {
    > int err = of_property_read_u32(np, "arm,psci-suspend-param", state);
    >
    > @@ -305,6 +304,9 @@ static int psci_dt_parse_state_node(struct device_node *np, u32 *state)
    > return 0;
    > }
    >
    > +#ifdef CONFIG_CPU_IDLE
    > +static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state);
    > +
    > static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)
    > {
    > int i, ret = 0, count = 0;
    > diff --git a/drivers/firmware/psci.h b/drivers/firmware/psci.h
    > new file mode 100644
    > index 0000000..a2b4be5
    > --- /dev/null
    > +++ b/drivers/firmware/psci.h
    > @@ -0,0 +1,13 @@
    > +// SPDX-License-Identifier: GPL-2.0
    > +
    > +#ifndef __PSCI_H
    > +#define __PSCI_H
    > +
    > +struct device_node;
    > +
    > +u32 psci_get_domain_state(void);
    > +void psci_set_domain_state(u32 state);
    > +
    > +int psci_dt_parse_state_node(struct device_node *np, u32 *state);
    > +
    > +#endif /* __PSCI_H */
    > --
    > 2.7.4
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html

    \
     
     \ /
      Last update: 2018-03-14 18:31    [W:4.083 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site