Add basic protocol handles definitions and private data helpers support.
A protocol handle identifies a protocol instance initialized against a
specific handle; it embeds all the references to the core SCMI xfer methods
that will be needed by a protocol implementation to build and send its own
protocol specific messages using common core methods.
As such, in the interface, a protocol handle will be passed down from the
core to the protocol specific initialization callback at init time.
Anyway at this point only definitions are introduced, all protocols
initialization code and SCMI drivers probing is still based on the old
interface, so no functional change.
Signed-off-by: Cristian Marussi <[email protected]>
---
drivers/firmware/arm_scmi/common.h | 59 ++++++++++++++++++++++++++++++
drivers/firmware/arm_scmi/driver.c | 45 +++++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index e052507dc918..977e31224efe 100644
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -149,6 +149,65 @@ int scmi_xfer_get_init(const struct scmi_handle *h, u8 msg_id, u8 prot_id,
size_t tx_size, size_t rx_size, struct scmi_xfer **p);
void scmi_reset_rx_to_maxsz(const struct scmi_handle *handle,
struct scmi_xfer *xfer);
+
+struct scmi_xfer_ops;
+
+/**
+ * struct scmi_protocol_handle - Reference to an initialized protocol instance
+ *
+ * @dev: A reference to the associated SCMI instance device (handle->dev).
+ * @xops: A reference to a struct holding refs to the core xfer operations that
+ * can be used by the protocol implementation to generate SCMI messages.
+ * @set_priv: A method to set protocol private data for this instance.
+ * @get_priv: A method to get protocol private data previously set.
+ *
+ * This structure represents a protocol initialized against specific SCMI
+ * instance and it will be used as follows:
+ * - as a parameter fed from the core to the protocol initialization code so
+ * that it can access the core xfer operations to build and generate SCMI
+ * messages exclusively for the specific underlying protocol instance.
+ * - as an opaque handle fed by an SCMI driver user when it tries to access
+ * this protocol through its own protocol operations.
+ * In this case this handle will be returned as an opaque object together
+ * with the related protocol operations when the SCMI driver tries to access
+ * the protocol.
+ */
+struct scmi_protocol_handle {
+ struct device *dev;
+ const struct scmi_xfer_ops *xops;
+ int (*set_priv)(const struct scmi_protocol_handle *ph, void *priv);
+ void *(*get_priv)(const struct scmi_protocol_handle *ph);
+};
+
+/**
+ * struct scmi_xfer_ops - References to the core SCMI xfer operations.
+ * @version_get: Get this version protocol.
+ * @xfer_get_init: Initialize one struct xfer if any xfer slot is free.
+ * @reset_rx_to_maxsz: Reset rx size to max transport size.
+ * @do_xfer: Do the SCMI transfer.
+ * @do_xfer_with_response: Do the SCMI transfer waiting for a response.
+ * @xfer_put: Free the xfer slot.
+ *
+ * Note that all this operations expect a protocol handle as first parameter;
+ * they then internally use it to infer the underlying protocol number: this
+ * way is not possible for a protocol implementation to forge messages for
+ * another protocol.
+ */
+struct scmi_xfer_ops {
+ int (*version_get)(const struct scmi_protocol_handle *ph, u32 *version);
+ int (*xfer_get_init)(const struct scmi_protocol_handle *ph, u8 msg_id,
+ size_t tx_size, size_t rx_size,
+ struct scmi_xfer **p);
+ void (*reset_rx_to_maxsz)(const struct scmi_protocol_handle *ph,
+ struct scmi_xfer *xfer);
+ int (*do_xfer)(const struct scmi_protocol_handle *ph,
+ struct scmi_xfer *xfer);
+ int (*do_xfer_with_response)(const struct scmi_protocol_handle *ph,
+ struct scmi_xfer *xfer);
+ void (*xfer_put)(const struct scmi_protocol_handle *ph,
+ struct scmi_xfer *xfer);
+};
+
int scmi_handle_put(const struct scmi_handle *handle);
struct scmi_handle *scmi_handle_get(struct device *dev);
void scmi_set_handle(struct scmi_device *scmi_dev);
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 48059a4406df..10fe9aacae1b 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -72,19 +72,28 @@ struct scmi_xfers_info {
/**
* struct scmi_protocol_instance - Describe an initialized protocol instance.
+ * @handle: Reference to the SCMI handle associated to this protocol instance.
* @proto: A reference to the protocol descriptor.
* @gid: A reference for per-protocol devres management.
* @users: A refcount to track effective users of this protocol.
+ * @priv: Reference for optional protocol private data.
+ * @ph: An embedded protocol handle that will be passed down to protocol
+ * initialization code to identify this instance.
*
* Each protocol is initialized independently once for each SCMI platform in
* which is defined by DT and implemented by the SCMI server fw.
*/
struct scmi_protocol_instance {
+ const struct scmi_handle *handle;
const struct scmi_protocol *proto;
void *gid;
refcount_t users;
+ void *priv;
+ struct scmi_protocol_handle ph;
};
+#define ph_to_pi(h) container_of(h, struct scmi_protocol_instance, ph)
+
/**
* struct scmi_info - Structure representing a SCMI instance
*
@@ -543,6 +552,38 @@ int scmi_version_get(const struct scmi_handle *handle, u8 protocol,
return ret;
}
+/**
+ * scmi_set_protocol_priv - Set protocol specific data at init time
+ *
+ * @ph: A reference to the protocol handle.
+ * @priv: The private data to set.
+ *
+ * Return: 0 on Success
+ */
+static int scmi_set_protocol_priv(const struct scmi_protocol_handle *ph,
+ void *priv)
+{
+ struct scmi_protocol_instance *pi = ph_to_pi(ph);
+
+ pi->priv = priv;
+
+ return 0;
+}
+
+/**
+ * scmi_get_protocol_priv - Set protocol specific data at init time
+ *
+ * @ph: A reference to the protocol handle.
+ *
+ * Return: Protocol private data if any was set.
+ */
+static void *scmi_get_protocol_priv(const struct scmi_protocol_handle *ph)
+{
+ const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+
+ return pi->priv;
+}
+
/**
* scmi_get_protocol_instance - Protocol initialization helper.
* @handle: A reference to the SCMI platform instance.
@@ -588,6 +629,10 @@ scmi_get_protocol_instance(struct scmi_handle *handle, u8 protocol_id)
pi->gid = gid;
pi->proto = proto;
+ pi->handle = handle;
+ pi->ph.dev = handle->dev;
+ pi->ph.set_priv = scmi_set_protocol_priv;
+ pi->ph.get_priv = scmi_get_protocol_priv;
refcount_set(&pi->users, 1);
/* proto->init is assured NON NULL by scmi_protocol_register */
ret = pi->proto->init_instance(handle);
--
2.17.1
On 1/6/21 3:15 PM, Cristian Marussi wrote:
> Add basic protocol handles definitions and private data helpers support.
>
> A protocol handle identifies a protocol instance initialized against a
> specific handle; it embeds all the references to the core SCMI xfer methods
> that will be needed by a protocol implementation to build and send its own
> protocol specific messages using common core methods.
>
> As such, in the interface, a protocol handle will be passed down from the
> core to the protocol specific initialization callback at init time.
>
> Anyway at this point only definitions are introduced, all protocols
> initialization code and SCMI drivers probing is still based on the old
> interface, so no functional change.
>
> Signed-off-by: Cristian Marussi <[email protected]>
> ---
> drivers/firmware/arm_scmi/common.h | 59 ++++++++++++++++++++++++++++++
> drivers/firmware/arm_scmi/driver.c | 45 +++++++++++++++++++++++
> 2 files changed, 104 insertions(+)
>
> diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
> index e052507dc918..977e31224efe 100644
> --- a/drivers/firmware/arm_scmi/common.h
> +++ b/drivers/firmware/arm_scmi/common.h
> @@ -149,6 +149,65 @@ int scmi_xfer_get_init(const struct scmi_handle *h, u8 msg_id, u8 prot_id,
> size_t tx_size, size_t rx_size, struct scmi_xfer **p);
> void scmi_reset_rx_to_maxsz(const struct scmi_handle *handle,
> struct scmi_xfer *xfer);
> +
> +struct scmi_xfer_ops;
> +
> +/**
> + * struct scmi_protocol_handle - Reference to an initialized protocol instance
> + *
> + * @dev: A reference to the associated SCMI instance device (handle->dev).
> + * @xops: A reference to a struct holding refs to the core xfer operations that
> + * can be used by the protocol implementation to generate SCMI messages.
> + * @set_priv: A method to set protocol private data for this instance.
> + * @get_priv: A method to get protocol private data previously set.
> + *
> + * This structure represents a protocol initialized against specific SCMI
> + * instance and it will be used as follows:
> + * - as a parameter fed from the core to the protocol initialization code so
> + * that it can access the core xfer operations to build and generate SCMI
> + * messages exclusively for the specific underlying protocol instance.
> + * - as an opaque handle fed by an SCMI driver user when it tries to access
> + * this protocol through its own protocol operations.
> + * In this case this handle will be returned as an opaque object together
> + * with the related protocol operations when the SCMI driver tries to access
> + * the protocol.
> + */
> +struct scmi_protocol_handle {
> + struct device *dev;
> + const struct scmi_xfer_ops *xops;
> + int (*set_priv)(const struct scmi_protocol_handle *ph, void *priv);
> + void *(*get_priv)(const struct scmi_protocol_handle *ph);
> +};
> +
> +/**
> + * struct scmi_xfer_ops - References to the core SCMI xfer operations.
> + * @version_get: Get this version protocol.
> + * @xfer_get_init: Initialize one struct xfer if any xfer slot is free.
> + * @reset_rx_to_maxsz: Reset rx size to max transport size.
> + * @do_xfer: Do the SCMI transfer.
> + * @do_xfer_with_response: Do the SCMI transfer waiting for a response.
> + * @xfer_put: Free the xfer slot.
> + *
> + * Note that all this operations expect a protocol handle as first parameter;
> + * they then internally use it to infer the underlying protocol number: this
> + * way is not possible for a protocol implementation to forge messages for
> + * another protocol.
> + */
> +struct scmi_xfer_ops {
Maybe move the definition above struct scmi_protocol_handle to avoid a
declaration ?
--
Warm Regards
Thara
Hi Thara
thanks for reviewing.
On Thu, Jan 07, 2021 at 09:29:17AM -0500, Thara Gopinath wrote:
>
>
> On 1/6/21 3:15 PM, Cristian Marussi wrote:
> > Add basic protocol handles definitions and private data helpers support.
> >
> > A protocol handle identifies a protocol instance initialized against a
> > specific handle; it embeds all the references to the core SCMI xfer methods
> > that will be needed by a protocol implementation to build and send its own
> > protocol specific messages using common core methods.
> >
> > As such, in the interface, a protocol handle will be passed down from the
> > core to the protocol specific initialization callback at init time.
> >
> > Anyway at this point only definitions are introduced, all protocols
> > initialization code and SCMI drivers probing is still based on the old
> > interface, so no functional change.
> >
> > Signed-off-by: Cristian Marussi <[email protected]>
> > ---
> > drivers/firmware/arm_scmi/common.h | 59 ++++++++++++++++++++++++++++++
> > drivers/firmware/arm_scmi/driver.c | 45 +++++++++++++++++++++++
> > 2 files changed, 104 insertions(+)
> >
> > diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
> > index e052507dc918..977e31224efe 100644
> > --- a/drivers/firmware/arm_scmi/common.h
> > +++ b/drivers/firmware/arm_scmi/common.h
> > @@ -149,6 +149,65 @@ int scmi_xfer_get_init(const struct scmi_handle *h, u8 msg_id, u8 prot_id,
> > size_t tx_size, size_t rx_size, struct scmi_xfer **p);
> > void scmi_reset_rx_to_maxsz(const struct scmi_handle *handle,
> > struct scmi_xfer *xfer);
> > +
> > +struct scmi_xfer_ops;
> > +
> > +/**
> > + * struct scmi_protocol_handle - Reference to an initialized protocol instance
> > + *
> > + * @dev: A reference to the associated SCMI instance device (handle->dev).
> > + * @xops: A reference to a struct holding refs to the core xfer operations that
> > + * can be used by the protocol implementation to generate SCMI messages.
> > + * @set_priv: A method to set protocol private data for this instance.
> > + * @get_priv: A method to get protocol private data previously set.
> > + *
> > + * This structure represents a protocol initialized against specific SCMI
> > + * instance and it will be used as follows:
> > + * - as a parameter fed from the core to the protocol initialization code so
> > + * that it can access the core xfer operations to build and generate SCMI
> > + * messages exclusively for the specific underlying protocol instance.
> > + * - as an opaque handle fed by an SCMI driver user when it tries to access
> > + * this protocol through its own protocol operations.
> > + * In this case this handle will be returned as an opaque object together
> > + * with the related protocol operations when the SCMI driver tries to access
> > + * the protocol.
> > + */
> > +struct scmi_protocol_handle {
> > + struct device *dev;
> > + const struct scmi_xfer_ops *xops;
> > + int (*set_priv)(const struct scmi_protocol_handle *ph, void *priv);
> > + void *(*get_priv)(const struct scmi_protocol_handle *ph);
> > +};
> > +
> > +/**
> > + * struct scmi_xfer_ops - References to the core SCMI xfer operations.
> > + * @version_get: Get this version protocol.
> > + * @xfer_get_init: Initialize one struct xfer if any xfer slot is free.
> > + * @reset_rx_to_maxsz: Reset rx size to max transport size.
> > + * @do_xfer: Do the SCMI transfer.
> > + * @do_xfer_with_response: Do the SCMI transfer waiting for a response.
> > + * @xfer_put: Free the xfer slot.
> > + *
> > + * Note that all this operations expect a protocol handle as first parameter;
> > + * they then internally use it to infer the underlying protocol number: this
> > + * way is not possible for a protocol implementation to forge messages for
> > + * another protocol.
> > + */
> > +struct scmi_xfer_ops {
>
> Maybe move the definition above struct scmi_protocol_handle to avoid a
> declaration ?
>
But all the ops defined inside scmi_xfer_ops refers then to a param
struct scmi_protocol_handle, so I'd need anyway a similar declaration
the other way around.
If not:
linux/drivers/firmware/arm_scmi/common.h:178:32: warning: ‘struct scmi_protocol_handle’ declared inside parameter list will not be visible outside of this definition or declaration
Thanks
Cristian
>
> --
> Warm Regards
> Thara
On 1/8/21 7:04 AM, Cristian Marussi wrote:
> Hi Thara
>
> thanks for reviewing.
>
> On Thu, Jan 07, 2021 at 09:29:17AM -0500, Thara Gopinath wrote:
>>
>>
>> On 1/6/21 3:15 PM, Cristian Marussi wrote:
>>> Add basic protocol handles definitions and private data helpers support.
>>>
>>> A protocol handle identifies a protocol instance initialized against a
>>> specific handle; it embeds all the references to the core SCMI xfer methods
>>> that will be needed by a protocol implementation to build and send its own
>>> protocol specific messages using common core methods.
>>>
>>> As such, in the interface, a protocol handle will be passed down from the
>>> core to the protocol specific initialization callback at init time.
>>>
>>> Anyway at this point only definitions are introduced, all protocols
>>> initialization code and SCMI drivers probing is still based on the old
>>> interface, so no functional change.
>>>
>>> Signed-off-by: Cristian Marussi <[email protected]>
>>> ---
>>> drivers/firmware/arm_scmi/common.h | 59 ++++++++++++++++++++++++++++++
>>> drivers/firmware/arm_scmi/driver.c | 45 +++++++++++++++++++++++
>>> 2 files changed, 104 insertions(+)
>>>
>>> diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
>>> index e052507dc918..977e31224efe 100644
>>> --- a/drivers/firmware/arm_scmi/common.h
>>> +++ b/drivers/firmware/arm_scmi/common.h
>>> @@ -149,6 +149,65 @@ int scmi_xfer_get_init(const struct scmi_handle *h, u8 msg_id, u8 prot_id,
>>> size_t tx_size, size_t rx_size, struct scmi_xfer **p);
>>> void scmi_reset_rx_to_maxsz(const struct scmi_handle *handle,
>>> struct scmi_xfer *xfer);
>>> +
>>> +struct scmi_xfer_ops;
>>> +
>>> +/**
>>> + * struct scmi_protocol_handle - Reference to an initialized protocol instance
>>> + *
>>> + * @dev: A reference to the associated SCMI instance device (handle->dev).
>>> + * @xops: A reference to a struct holding refs to the core xfer operations that
>>> + * can be used by the protocol implementation to generate SCMI messages.
>>> + * @set_priv: A method to set protocol private data for this instance.
>>> + * @get_priv: A method to get protocol private data previously set.
>>> + *
>>> + * This structure represents a protocol initialized against specific SCMI
>>> + * instance and it will be used as follows:
>>> + * - as a parameter fed from the core to the protocol initialization code so
>>> + * that it can access the core xfer operations to build and generate SCMI
>>> + * messages exclusively for the specific underlying protocol instance.
>>> + * - as an opaque handle fed by an SCMI driver user when it tries to access
>>> + * this protocol through its own protocol operations.
>>> + * In this case this handle will be returned as an opaque object together
>>> + * with the related protocol operations when the SCMI driver tries to access
>>> + * the protocol.
>>> + */
>>> +struct scmi_protocol_handle {
>>> + struct device *dev;
>>> + const struct scmi_xfer_ops *xops;
>>> + int (*set_priv)(const struct scmi_protocol_handle *ph, void *priv);
>>> + void *(*get_priv)(const struct scmi_protocol_handle *ph);
>>> +};
>>> +
>>> +/**
>>> + * struct scmi_xfer_ops - References to the core SCMI xfer operations.
>>> + * @version_get: Get this version protocol.
>>> + * @xfer_get_init: Initialize one struct xfer if any xfer slot is free.
>>> + * @reset_rx_to_maxsz: Reset rx size to max transport size.
>>> + * @do_xfer: Do the SCMI transfer.
>>> + * @do_xfer_with_response: Do the SCMI transfer waiting for a response.
>>> + * @xfer_put: Free the xfer slot.
>>> + *
>>> + * Note that all this operations expect a protocol handle as first parameter;
>>> + * they then internally use it to infer the underlying protocol number: this
>>> + * way is not possible for a protocol implementation to forge messages for
>>> + * another protocol.
>>> + */
>>> +struct scmi_xfer_ops {
>>
>> Maybe move the definition above struct scmi_protocol_handle to avoid a
>> declaration ?
>>
>
> But all the ops defined inside scmi_xfer_ops refers then to a param
> struct scmi_protocol_handle, so I'd need anyway a similar declaration
> the other way around.
>
> If not:
>
> linux/drivers/firmware/arm_scmi/common.h:178:32: warning: ‘struct scmi_protocol_handle’ declared inside parameter list will not be visible outside of this definition or declaration
Ya. got it. I had not realized this.
>
> Thanks
>
> Cristian
>>
>> --
>> Warm Regards
>> Thara
--
Warm Regards
Thara