From: Lokesh Vutla <lokeshvutla@ti.com> To: Marc Zyngier <maz@kernel.org>, Rob Herring <robh+dt@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de>, Nishanth Menon <nm@ti.com>, Tero Kristo <t-kristo@ti.com>, Santosh Shilimkar <ssantosh@kernel.org>, Linux ARM Mailing List <linux-arm-kernel@lists.infradead.org>, Sekhar Nori <nsekhar@ti.com>, Grygorii Strashko <grygorii.strashko@ti.com>, Peter Ujfalusi <peter.ujfalusi@ti.com>, Device Tree Mailing List <devicetree@vger.kernel.org>, Suman Anna <s-anna@ti.com>, Lokesh Vutla <lokeshvutla@ti.com> Subject: [PATCH v6 02/13] firmware: ti_sci: Drop unused structure ti_sci_rm_type_map Date: Thu, 6 Aug 2020 13:18:15 +0530 [thread overview] Message-ID: <20200806074826.24607-3-lokeshvutla@ti.com> (raw) In-Reply-To: <20200806074826.24607-1-lokeshvutla@ti.com> struct ti_sci_rm_type_map is no longer used. Drop its definition and its declarations. Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- drivers/firmware/ti_sci.c | 56 +-------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 81e4d7797ac0..03bd01ba5fe7 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -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 @@ static int ti_sci_cmd_core_reboot(const struct ti_sci_handle *handle) 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[] = { -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Lokesh Vutla <lokeshvutla@ti.com> To: Marc Zyngier <maz@kernel.org>, Rob Herring <robh+dt@kernel.org> Cc: Nishanth Menon <nm@ti.com>, Peter Ujfalusi <peter.ujfalusi@ti.com>, Grygorii Strashko <grygorii.strashko@ti.com>, Device Tree Mailing List <devicetree@vger.kernel.org>, Lokesh Vutla <lokeshvutla@ti.com>, Sekhar Nori <nsekhar@ti.com>, Tero Kristo <t-kristo@ti.com>, Santosh Shilimkar <ssantosh@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Linux ARM Mailing List <linux-arm-kernel@lists.infradead.org> Subject: [PATCH v6 02/13] firmware: ti_sci: Drop unused structure ti_sci_rm_type_map Date: Thu, 6 Aug 2020 13:18:15 +0530 [thread overview] Message-ID: <20200806074826.24607-3-lokeshvutla@ti.com> (raw) In-Reply-To: <20200806074826.24607-1-lokeshvutla@ti.com> struct ti_sci_rm_type_map is no longer used. Drop its definition and its declarations. Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- drivers/firmware/ti_sci.c | 56 +-------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 81e4d7797ac0..03bd01ba5fe7 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -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 @@ static int ti_sci_cmd_core_reboot(const struct ti_sci_handle *handle) 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[] = { -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-08-06 11:05 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-06 7:48 [PATCH v6 00/13] irqchip: ti,sci-intr/inta: Update the dt bindings to accept different interrupt parents Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 00/13] irqchip: ti, sci-intr/inta: " Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 01/13] firmware: ti_sci: Drop the device id to resource type translation Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-25 23:41 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla [this message] 2020-08-06 7:48 ` [PATCH v6 02/13] firmware: ti_sci: Drop unused structure ti_sci_rm_type_map Lokesh Vutla 2020-08-25 23:41 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 03/13] firmware: ti_sci: Add support for getting resource with subtype Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-25 23:41 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 04/13] dt-bindings: irqchip: ti,sci-intr: Update bindings to drop the usage of gic as parent Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 04/13] dt-bindings: irqchip: ti, sci-intr: " Lokesh Vutla 2020-08-25 23:41 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 05/13] dt-bindings: irqchip: Convert ti,sci-intr bindings to yaml Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 05/13] dt-bindings: irqchip: Convert ti, sci-intr " Lokesh Vutla 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 06/13] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 07/13] dt-bindings: irqchip: ti,sci-inta: Update docs to support different parent Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 07/13] dt-bindings: irqchip: ti, sci-inta: " Lokesh Vutla 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 08/13] dt-bindings: irqchip: Convert ti,sci-inta bindings to yaml Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 08/13] dt-bindings: irqchip: Convert ti, sci-inta " Lokesh Vutla 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 09/13] irqchip/ti-sci-inta: Do not store TISCI device id in platform device id field Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 10/13] irqchip/ti-sci-inta: Add support for INTA directly connecting to GIC Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 11/13] arm64: dts: k3-j721e: ti-sci-inta/intr: Update to latest bindings Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-12 13:35 ` Nishanth Menon 2020-08-12 13:35 ` Nishanth Menon 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 12/13] arm64: dts: k3-am65: " Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-12 13:35 ` Nishanth Menon 2020-08-12 13:35 ` Nishanth Menon 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-06 7:48 ` [PATCH v6 13/13] arm64: dts: k3-am65: Update the RM resource types Lokesh Vutla 2020-08-06 7:48 ` Lokesh Vutla 2020-08-12 13:36 ` Nishanth Menon 2020-08-12 13:36 ` Nishanth Menon 2020-08-25 23:40 ` [tip: irq/urgent] " tip-bot2 for Lokesh Vutla 2020-08-07 6:32 ` [PATCH v6 00/13] irqchip: ti,sci-intr/inta: Update the dt bindings to accept different interrupt parents Lokesh Vutla 2020-08-07 6:32 ` Lokesh Vutla 2020-08-12 2:14 ` Lokesh Vutla 2020-08-12 2:14 ` Lokesh Vutla 2020-08-12 13:40 ` Nishanth Menon 2020-08-12 13:40 ` Nishanth Menon 2020-08-13 9:41 ` Peter Ujfalusi 2020-08-13 9:41 ` Peter Ujfalusi 2020-08-13 10:03 ` Sekhar Nori 2020-08-13 10:03 ` Sekhar Nori 2020-08-13 10:20 ` Peter Ujfalusi 2020-08-13 10:20 ` Peter Ujfalusi 2020-08-16 21:03 ` [PATCH v6 00/13] irqchip: ti, sci-intr/inta: " Marc Zyngier 2020-08-16 21:03 ` Marc Zyngier 2020-08-17 17:30 ` Sekhar Nori 2020-08-17 17:30 ` Sekhar Nori
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200806074826.24607-3-lokeshvutla@ti.com \ --to=lokeshvutla@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=grygorii.strashko@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=maz@kernel.org \ --cc=nm@ti.com \ --cc=nsekhar@ti.com \ --cc=peter.ujfalusi@ti.com \ --cc=robh+dt@kernel.org \ --cc=s-anna@ti.com \ --cc=ssantosh@kernel.org \ --cc=t-kristo@ti.com \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.