firmware: ti_sci: rm: Remove ring_get_config support (4d8ddf67) · Commits · 戴 / test

drivers/firmware/ti_sci.c

+0 −80

Original line number	Diff line number	Diff line
		@@ -2119,85 +2119,6 @@ fail:
		return ret;
		}

		/**
		* ti_sci_cmd_ring_get_config() - get RA ring configuration
		* @handle: Pointer to TI SCI handle.
		* @nav_id: Device ID of Navigator Subsystem from which the ring is
		* allocated
		* @index: Ring index
		* @addr_lo: Returns ring's base address lo 32 bits
		* @addr_hi: Returns ring's base address hi 32 bits
		* @count: Returns number of ring elements
		* @mode: Returns mode of the ring
		* @size: Returns ring element size
		* @order_id: Returns ring's bus order ID
		*
		* Return: 0 if all went well, else returns appropriate error value.
		*
		* See @ti_sci_msg_rm_ring_get_cfg_req for more info.
		*/
		static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle,
		u32 nav_id, u32 index, u8 *mode,
		u32 addr_lo, u32 addr_hi,
		u32 count, u8 size, u8 *order_id)
		{
		struct ti_sci_msg_rm_ring_get_cfg_resp *resp;
		struct ti_sci_msg_rm_ring_get_cfg_req *req;
		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_GET_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 get config failed(%d)\n", ret);
		return ret;
		}
		req = (struct ti_sci_msg_rm_ring_get_cfg_req *)xfer->xfer_buf;
		req->nav_id = nav_id;
		req->index = index;

		ret = ti_sci_do_xfer(info, xfer);
		if (ret) {
		dev_err(dev, "RM_RA:Mbox get config send fail %d\n", ret);
		goto fail;
		}

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

		if (!ti_sci_is_response_ack(resp)) {
		ret = -ENODEV;
		} else {
		if (mode)
		*mode = resp->mode;
		if (addr_lo)
		*addr_lo = resp->addr_lo;
		if (addr_hi)
		*addr_hi = resp->addr_hi;
		if (count)
		*count = resp->count;
		if (size)
		*size = resp->size;
		if (order_id)
		*order_id = resp->order_id;
		};

		fail:
		ti_sci_put_one_xfer(&info->minfo, xfer);
		dev_dbg(dev, "RM_RA:get config ring %u ret:%d\n", index, ret);
		return ret;
		}

		/**
		* ti_sci_cmd_rm_psil_pair() - Pair PSI-L source to destination thread
		* @handle: Pointer to TI SCI handle.
		@@ -2926,7 +2847,6 @@ 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->get_config = ti_sci_cmd_ring_get_config;

		psilops->pair = ti_sci_cmd_rm_psil_pair;
		psilops->unpair = ti_sci_cmd_rm_psil_unpair;

drivers/firmware/ti_sci.h

+0 −44

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@
		#define TI_SCI_MSG_RM_RING_RECONFIG 0x1102
		#define TI_SCI_MSG_RM_RING_RESET 0x1103
		#define TI_SCI_MSG_RM_RING_CFG 0x1110
		#define TI_SCI_MSG_RM_RING_GET_CFG 0x1111

		/* PSI-L requests */
		#define TI_SCI_MSG_RM_PSIL_PAIR 0x1280
		@@ -687,49 +686,6 @@ struct ti_sci_msg_rm_ring_cfg_req {
		u8 order_id;
		} __packed;

		/**
		* struct ti_sci_msg_rm_ring_get_cfg_req - Get RA ring's configuration
		*
		* Gets the configuration of the non-real-time register fields of a ring. The
		* host, or a supervisor of the host, who owns the ring must be the requesting
		* host. The values of the non-real-time registers are returned in
		* @ti_sci_msg_rm_ring_get_cfg_resp.
		*
		* @hdr: Generic Header
		* @nav_id: Device ID of Navigator Subsystem from which the ring is allocated
		* @index: ring index.
		*/
		struct ti_sci_msg_rm_ring_get_cfg_req {
		struct ti_sci_msg_hdr hdr;
		u16 nav_id;
		u16 index;
		} __packed;

		/**
		* struct ti_sci_msg_rm_ring_get_cfg_resp - Ring get configuration response
		*
		* Response received by host processor after RM has handled
		* @ti_sci_msg_rm_ring_get_cfg_req. The response contains the ring's
		* non-real-time register values.
		*
		* @hdr: Generic Header
		* @addr_lo: Ring 32 LSBs of base address
		* @addr_hi: Ring 16 MSBs of base address.
		* @count: Ring number of elements.
		* @mode: Ring mode.
		* @size: encoded Ring element size
		* @order_id: ing order ID.
		*/
		struct ti_sci_msg_rm_ring_get_cfg_resp {
		struct ti_sci_msg_hdr hdr;
		u32 addr_lo;
		u32 addr_hi;
		u32 count;
		u8 mode;
		u8 size;
		u8 order_id;
		} __packed;

		/**
		* struct ti_sci_msg_psil_pair - Pairs a PSI-L source thread to a destination
		* thread

include/linux/soc/ti/ti_sci_protocol.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -286,8 +286,6 @@ struct ti_sci_rm_irq_ops {
		/**
		* struct ti_sci_rm_ringacc_ops - Ring Accelerator Management operations
		* @config: configure the SoC Navigator Subsystem Ring Accelerator ring
		* @get_config: get the SoC Navigator Subsystem Ring Accelerator ring
		* configuration
		*/
		struct ti_sci_rm_ringacc_ops {
		int (config)(const struct ti_sci_handle handle,
		@@ -295,10 +293,6 @@ struct ti_sci_rm_ringacc_ops {
		u32 addr_lo, u32 addr_hi, u32 count, u8 mode,
		u8 size, u8 order_id
		);
		int (get_config)(const struct ti_sci_handle handle,
		u32 nav_id, u32 index, u8 *mode,
		u32 addr_lo, u32 addr_hi, u32 *count,
		u8 size, u8 order_id);
		};

		/**

Admin message