Re: [PATCH v4 3/4] OPP: Add support of "opp-microwatt" for advanced EM registration

[Lukasz Luba]

On 3/2/22 07:45, Viresh Kumar wrote:
> On 01-03-22, 09:35, Lukasz Luba wrote:
> >   /**
> >    * dev_pm_opp_of_register_em() - Attempt to register an Energy Model
> >    * @dev		: Device for which an Energy Model has to be registered
> > @@ -1517,6 +1567,12 @@ int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus)
> >   		goto failed;
> >   	}
> >   
> > +	/* First, try to find more precised Energy Model in DT */
> > +	if (_of_has_opp_microwatt_property(dev)) {
> > +		em_cb.active_power = _get_dt_power;
>
> You can also do (to fix the warning) this instead:
>
> em_cb = EM_DATA_CB(_get_dt_power);
>
> Similar for the else part.

Unfortunately, not for this case. When we declare that em_cb
it can handle the brackets '{ }', but not later in the code no.
In both configs it won't fly:

EM:
drivers/opp/of.c: In function ‘dev_pm_opp_of_register_em’:
./include/linux/energy_model.h:118:38: error: expected expression before 
‘{’ token
 #define EM_DATA_CB(_active_power_cb) { .active_power = &_active_power_cb }
                                      ^
drivers/opp/of.c:1573:11: note: in expansion of macro ‘EM_DATA_CB’
   em_cb = EM_DATA_CB(_get_dt_power);
           ^~~~~~~~~~
./include/linux/energy_model.h:118:38: error: expected expression before 
‘{’ token
 #define EM_DATA_CB(_active_power_cb) { .active_power = &_active_power_cb }
                                      ^
drivers/opp/of.c:1600:10: note: in expansion of macro ‘EM_DATA_CB’
  em_cb = EM_DATA_CB(_get_power);
          ^~~~~~~~~~

!EM:
drivers/opp/of.c: In function ‘dev_pm_opp_of_register_em’:
./include/linux/energy_model.h:266:38: error: expected expression before 
‘{’ token
 #define EM_DATA_CB(_active_power_cb) { }
                                      ^
drivers/opp/of.c:1573:11: note: in expansion of macro ‘EM_DATA_CB’
   em_cb = EM_DATA_CB(_get_dt_power);
           ^~~~~~~~~~
./include/linux/energy_model.h:266:38: error: expected expression before 
‘{’ token
 #define EM_DATA_CB(_active_power_cb) { }
                                      ^
drivers/opp/of.c:1600:10: note: in expansion of macro ‘EM_DATA_CB’
  em_cb = EM_DATA_CB(_get_power);
          ^~~~~~~~~~


If you like, I can introduce new dual-macro implementation
in energy_modle.h which would sole this issue:

ifdef EM:
#define EM_SET_ACTIVE_POWER_CB(em_cb, cb) ((em_cb).active_power = cb)

ifndef EM:
#define EM_SET_ACTIVE_POWER_CB(em_cb, cb) do { } while (0)


Then we would keep the single call to the registration EM and
we would have:

        if (_of_has_opp_microwatt_property(dev)) {
                EM_SET_ACTIVE_POWER_CB(em_cb, _get_dt_power);
                goto register_em;
        }


	
        EM_SET_ACTIVE_POWER_CB(em_cb, _get_power);

register_em:
        ret = em_dev_register_perf_domain(dev, nr_opp, &em_cb, cpus, true);


I can do that, please let me know.