Commit 3c201753 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Santosh Shilimkar
Browse files

firmware: ti_sci: rm: Add new ops for ring configuration 



The sysfw ring configuration message has been extended to include virtid
and asel value for the ring.
Add the ASEL_VALID to TI_SCI_MSG_VALUE_RM_ALL_NO_ORDER as it is required
for DMA rings.

Instead of extending the current .config() ops - which would need same
patch change in the ringacc driver - add ti_sci_msg_rm_ring_cfg struct and
a new ops using it to configure the ring.

This will allow easy update path in case new members are added for the ring
configuration.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
parent 4d8ddf67

drivers/firmware/ti_sci.c

+63 −0
Original line number Diff line number Diff line
@@ -2119,6 +2119,68 @@ fail: 
	return ret;

}



/**

 * ti_sci_cmd_rm_ring_cfg() - Configure a NAVSS ring

 * @handle:	Pointer to TI SCI handle.

 * @params:	Pointer to ti_sci_msg_rm_ring_cfg ring config structure

 *

 * Return: 0 if all went well, else returns appropriate error value.

 *

 * See @ti_sci_msg_rm_ring_cfg and @ti_sci_msg_rm_ring_cfg_req for

 * more info.

 */

static int ti_sci_cmd_rm_ring_cfg(const struct ti_sci_handle *handle,

				  const struct ti_sci_msg_rm_ring_cfg *params)

{

	struct ti_sci_msg_rm_ring_cfg_req *req;

	struct ti_sci_msg_hdr *resp;

	struct ti_sci_xfer *xfer;

	struct ti_sci_info *info;

	struct device *dev;

	int ret = 0;



	if (IS_ERR_OR_NULL(handle))

		return -EINVAL;



	info = handle_to_ti_sci_info(handle);

	dev = info->dev;



	xfer = ti_sci_get_one_xfer(info, TI_SCI_MSG_RM_RING_CFG,

				   TI_SCI_FLAG_REQ_ACK_ON_PROCESSED,

				   sizeof(*req), sizeof(*resp));

	if (IS_ERR(xfer)) {

		ret = PTR_ERR(xfer);

		dev_err(dev, "RM_RA:Message config failed(%d)\n", ret);

		return ret;

	}

	req = (struct ti_sci_msg_rm_ring_cfg_req *)xfer->xfer_buf;

	req->valid_params = params->valid_params;

	req->nav_id = params->nav_id;

	req->index = params->index;

	req->addr_lo = params->addr_lo;

	req->addr_hi = params->addr_hi;

	req->count = params->count;

	req->mode = params->mode;

	req->size = params->size;

	req->order_id = params->order_id;

	req->virtid = params->virtid;

	req->asel = params->asel;



	ret = ti_sci_do_xfer(info, xfer);

	if (ret) {

		dev_err(dev, "RM_RA:Mbox config send fail %d\n", ret);

		goto fail;

	}



	resp = (struct ti_sci_msg_hdr *)xfer->xfer_buf;

	ret = ti_sci_is_response_ack(resp) ? 0 : -EINVAL;



fail:

	ti_sci_put_one_xfer(&info->minfo, xfer);

	dev_dbg(dev, "RM_RA:config ring %u ret:%d\n", params->index, ret);

	return ret;

}



/**

 * ti_sci_cmd_rm_psil_pair() - Pair PSI-L source to destination thread

 * @handle:	Pointer to TI SCI handle.
@@ -2847,6 +2909,7 @@ static void ti_sci_setup_ops(struct ti_sci_info *info) 
	iops->free_event_map = ti_sci_cmd_free_event_map;



	rops->config = ti_sci_cmd_ring_config;

	rops->set_cfg = ti_sci_cmd_rm_ring_cfg;



	psilops->pair = ti_sci_cmd_rm_psil_pair;

	psilops->unpair = ti_sci_cmd_rm_psil_unpair;

drivers/firmware/ti_sci.h

+7 −0
Original line number Diff line number Diff line
@@ -659,6 +659,8 @@ struct ti_sci_msg_req_manage_irq { 
 *	3 - Valid bit for @tisci_msg_rm_ring_cfg_req mode

 *	4 - Valid bit for @tisci_msg_rm_ring_cfg_req size

 *	5 - Valid bit for @tisci_msg_rm_ring_cfg_req order_id

 *	6 - Valid bit for @tisci_msg_rm_ring_cfg_req virtid

 *	7 - Valid bit for @tisci_msg_rm_ring_cfg_req ASEL

 * @nav_id: Device ID of Navigator Subsystem from which the ring is allocated

 * @index: ring index to be configured.

 * @addr_lo: 32 LSBs of ring base address to be programmed into the ring's
@@ -672,6 +674,9 @@ struct ti_sci_msg_req_manage_irq { 
 *	the formula (log2(size_bytes) - 2), where size_bytes cannot be

 *	greater than 256.

 * @order_id: Specifies the ring's bus order ID.

 * @virtid: Ring virt ID value

 * @asel: Ring ASEL (address select) value to be set into the ASEL field of the

 *	ring's RING_BA_HI register.

 */

struct ti_sci_msg_rm_ring_cfg_req {

	struct ti_sci_msg_hdr hdr;
@@ -684,6 +689,8 @@ struct ti_sci_msg_rm_ring_cfg_req { 
	u8 mode;

	u8 size;

	u8 order_id;

	u16 virtid;

	u8 asel;

} __packed;



/**

include/linux/soc/ti/ti_sci_protocol.h

+30 −1
Original line number Diff line number Diff line
@@ -275,17 +275,44 @@ struct ti_sci_rm_irq_ops { 
#define TI_SCI_MSG_VALUE_RM_RING_SIZE_VALID	BIT(4)

/* RA config.order_id parameter is valid for RM ring configure TISCI message */

#define TI_SCI_MSG_VALUE_RM_RING_ORDER_ID_VALID	BIT(5)

/* RA config.virtid parameter is valid for RM ring configure TISCI message */

#define TI_SCI_MSG_VALUE_RM_RING_VIRTID_VALID	BIT(6)

/* RA config.asel parameter is valid for RM ring configure TISCI message */

#define TI_SCI_MSG_VALUE_RM_RING_ASEL_VALID	BIT(7)



#define TI_SCI_MSG_VALUE_RM_ALL_NO_ORDER \

	(TI_SCI_MSG_VALUE_RM_RING_ADDR_LO_VALID | \

	TI_SCI_MSG_VALUE_RM_RING_ADDR_HI_VALID | \

	TI_SCI_MSG_VALUE_RM_RING_COUNT_VALID | \

	TI_SCI_MSG_VALUE_RM_RING_MODE_VALID | \

	TI_SCI_MSG_VALUE_RM_RING_SIZE_VALID)

	TI_SCI_MSG_VALUE_RM_RING_SIZE_VALID | \

	TI_SCI_MSG_VALUE_RM_RING_ASEL_VALID)



/**

 * struct ti_sci_msg_rm_ring_cfg - Ring configuration

 *

 * Parameters for Navigator Subsystem ring configuration

 * See @ti_sci_msg_rm_ring_cfg_req

 */

struct ti_sci_msg_rm_ring_cfg {

	u32 valid_params;

	u16 nav_id;

	u16 index;

	u32 addr_lo;

	u32 addr_hi;

	u32 count;

	u8 mode;

	u8 size;

	u8 order_id;

	u16 virtid;

	u8 asel;

};



/**

 * struct ti_sci_rm_ringacc_ops - Ring Accelerator Management operations

 * @config: configure the SoC Navigator Subsystem Ring Accelerator ring

 *	    Deprecated

 * @set_cfg: configure the SoC Navigator Subsystem Ring Accelerator ring

 */

struct ti_sci_rm_ringacc_ops {

	int (*config)(const struct ti_sci_handle *handle,
@@ -293,6 +320,8 @@ struct ti_sci_rm_ringacc_ops { 
		      u32 addr_lo, u32 addr_hi, u32 count, u8 mode,

		      u8 size, u8 order_id

	);

	int (*set_cfg)(const struct ti_sci_handle *handle,

		       const struct ti_sci_msg_rm_ring_cfg *params);

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE