firmware: ti_sci: Drop unused structure ti_sci_rm_type_map (9b98e02a) · Commits · 戴 / test

drivers/firmware/ti_sci.c

+1 −55

Original line number	Diff line number	Diff line
		@@ -64,22 +64,6 @@ struct ti_sci_xfers_info {
		spinlock_t xfer_lock;
		};

		/**
		* struct ti_sci_rm_type_map - Structure representing TISCI Resource
		* management representation of dev_ids.
		* @dev_id: TISCI device ID
		* @type: Corresponding id as identified by TISCI RM.
		*
		* Note: This is used only as a work around for using RM range apis
		* for AM654 SoC. For future SoCs dev_id will be used as type
		* for RM range APIs. In order to maintain ABI backward compatibility
		* type is not being changed for AM654 SoC.
		*/
		struct ti_sci_rm_type_map {
		u32 dev_id;
		u16 type;
		};

		/**
		* struct ti_sci_desc - Description of SoC integration
		* @default_host_id: Host identifier representing the compute entity
		@@ -87,14 +71,12 @@ struct ti_sci_rm_type_map {
		* @max_msgs: Maximum number of messages that can be pending
		* simultaneously in the system
		* @max_msg_size: Maximum size of data per message that can be handled.
		* @rm_type_map: RM resource type mapping structure.
		*/
		struct ti_sci_desc {
		u8 default_host_id;
		int max_rx_timeout_ms;
		int max_msgs;
		int max_msg_size;
		struct ti_sci_rm_type_map *rm_type_map;
		};

		/**
		@@ -1710,33 +1692,6 @@ fail:
		return ret;
		}

		static int ti_sci_get_resource_type(struct ti_sci_info *info, u16 dev_id,
		u16 *type)
		{
		struct ti_sci_rm_type_map *rm_type_map = info->desc->rm_type_map;
		bool found = false;
		int i;

		/* If map is not provided then assume dev_id is used as type */
		if (!rm_type_map) {
		*type = dev_id;
		return 0;
		}

		for (i = 0; rm_type_map[i].dev_id; i++) {
		if (rm_type_map[i].dev_id == dev_id) {
		*type = rm_type_map[i].type;
		found = true;
		break;
		}
		}

		if (!found)
		return -EINVAL;

		return 0;
		}

		/**
		* ti_sci_get_resource_range - Helper to get a range of resources assigned
		* to a host. Resource is uniquely identified by
		@@ -1760,7 +1715,6 @@ static int ti_sci_get_resource_range(const struct ti_sci_handle *handle,
		struct ti_sci_xfer *xfer;
		struct ti_sci_info *info;
		struct device *dev;
		u16 type;
		int ret = 0;

		if (IS_ERR(handle))
		@@ -1780,15 +1734,9 @@ static int ti_sci_get_resource_range(const struct ti_sci_handle *handle,
		return ret;
		}

		ret = ti_sci_get_resource_type(info, dev_id, &type);
		if (ret) {
		dev_err(dev, "rm type lookup failed for %u\n", dev_id);
		goto fail;
		}

		req = (struct ti_sci_msg_req_get_resource_range *)xfer->xfer_buf;
		req->secondary_host = s_host;
		req->type = type & MSG_RM_RESOURCE_TYPE_MASK;
		req->type = dev_id & MSG_RM_RESOURCE_TYPE_MASK;
		req->subtype = subtype & MSG_RM_RESOURCE_SUBTYPE_MASK;

		ret = ti_sci_do_xfer(info, xfer);
		@@ -3352,7 +3300,6 @@ static const struct ti_sci_desc ti_sci_pmmc_k2g_desc = {
		/* Limited by MBOX_TX_QUEUE_LEN. K2G can handle upto 128 messages! */
		.max_msgs = 20,
		.max_msg_size = 64,
		.rm_type_map = NULL,
		};

		/* Description for AM654 */
		@@ -3363,7 +3310,6 @@ static const struct ti_sci_desc ti_sci_pmmc_am654_desc = {
		/* Limited by MBOX_TX_QUEUE_LEN. K2G can handle upto 128 messages! */
		.max_msgs = 20,
		.max_msg_size = 60,
		.rm_type_map = NULL,
		};

		static const struct of_device_id ti_sci_of_match[] = {

Admin message