* [PATCH v3 0/9] irqchip: ti, sci-intr/inta: Update the dt bindings to accept different interrupt parents
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
Hi Marc,
This is continuation of the RFC patches[0] regarding the driver
updates to support for following interrupt parent connection:
- INTR -> INTR
- INTA -> GICv3
The current existing driver assumes that INTR is always connected to
GICv3 and INTA is always connected to INTR.
As discussed this change breaks the DT backward compatibility but it
allows to not depend on TISCI firmware properties in DT node. IMHO, this
will ensure that any future changes will not effect DT properties.
This series depends on the the new Yaml bindings for common TISCI[1]
[0] https://lore.kernel.org/linux-arm-kernel/20190923042405.26064-1-lokeshvutla@ti.com/
[1] https://patchwork.kernel.org/patch/11676843/
Changes since v2:
- Fixed comments from Rob
- Fixed DT schema warnings.
Changes since v1:
- Rebased on top of latest Linux master
- Dropped DT patches.
Lokesh Vutla (9):
firmware: ti_sci: Drop the device id to resource type translation
firmware: ti_sci: Drop unused structure ti_sci_rm_type_map
firmware: ti_sci: Add support for getting resource with subtype
dt-bindings: irqchip: ti,sci-intr: Update bindings to drop the usage
of gic as parent
dt-bindings: irqchip: Convert ti,sci-intr bindings to yaml
irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
dt-bindings: irqchip: ti,sci-inta: Update docs to support different
parent.
dt-bindings: irqchip: Convert ti,sci-inta bindings to yaml
irqchip/ti-sci-inta: Add support for INTA directly connecting to GIC
.../interrupt-controller/ti,sci-inta.txt | 66 --------
.../interrupt-controller/ti,sci-inta.yaml | 98 +++++++++++
.../interrupt-controller/ti,sci-intr.txt | 82 ---------
.../interrupt-controller/ti,sci-intr.yaml | 102 ++++++++++++
MAINTAINERS | 4 +-
drivers/firmware/ti_sci.c | 155 ++++++++----------
drivers/irqchip/irq-ti-sci-inta.c | 90 ++++++++--
drivers/irqchip/irq-ti-sci-intr.c | 150 ++++++++++-------
include/linux/soc/ti/ti_sci_protocol.h | 13 ++
9 files changed, 451 insertions(+), 309 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 30+ messages in thread* [PATCH v3 1/9] firmware: ti_sci: Drop the device id to resource type translation
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
With ABI 3.0, sysfw deprecated special resource types used for AM65x
SoC. Instead started using device id as resource type similar to the
convention used in J721E SOC.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/firmware/ti_sci.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 4126be9e3216..930a65ed78ad 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -3355,16 +3355,6 @@ static const struct ti_sci_desc ti_sci_pmmc_k2g_desc = {
.rm_type_map = NULL,
};
-static struct ti_sci_rm_type_map ti_sci_am654_rm_type_map[] = {
- {.dev_id = 56, .type = 0x00b}, /* GIC_IRQ */
- {.dev_id = 179, .type = 0x000}, /* MAIN_NAV_UDMASS_IA0 */
- {.dev_id = 187, .type = 0x009}, /* MAIN_NAV_RA */
- {.dev_id = 188, .type = 0x006}, /* MAIN_NAV_UDMAP */
- {.dev_id = 194, .type = 0x007}, /* MCU_NAV_UDMAP */
- {.dev_id = 195, .type = 0x00a}, /* MCU_NAV_RA */
- {.dev_id = 0, .type = 0x000}, /* end of table */
-};
-
/* Description for AM654 */
static const struct ti_sci_desc ti_sci_pmmc_am654_desc = {
.default_host_id = 12,
@@ -3373,7 +3363,7 @@ 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 = ti_sci_am654_rm_type_map,
+ .rm_type_map = NULL,
};
static const struct of_device_id ti_sci_of_match[] = {
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 1/9] firmware: ti_sci: Drop the device id to resource type translation
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
With ABI 3.0, sysfw deprecated special resource types used for AM65x
SoC. Instead started using device id as resource type similar to the
convention used in J721E SOC.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/firmware/ti_sci.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 4126be9e3216..930a65ed78ad 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -3355,16 +3355,6 @@ static const struct ti_sci_desc ti_sci_pmmc_k2g_desc = {
.rm_type_map = NULL,
};
-static struct ti_sci_rm_type_map ti_sci_am654_rm_type_map[] = {
- {.dev_id = 56, .type = 0x00b}, /* GIC_IRQ */
- {.dev_id = 179, .type = 0x000}, /* MAIN_NAV_UDMASS_IA0 */
- {.dev_id = 187, .type = 0x009}, /* MAIN_NAV_RA */
- {.dev_id = 188, .type = 0x006}, /* MAIN_NAV_UDMAP */
- {.dev_id = 194, .type = 0x007}, /* MCU_NAV_UDMAP */
- {.dev_id = 195, .type = 0x00a}, /* MCU_NAV_RA */
- {.dev_id = 0, .type = 0x000}, /* end of table */
-};
-
/* Description for AM654 */
static const struct ti_sci_desc ti_sci_pmmc_am654_desc = {
.default_host_id = 12,
@@ -3373,7 +3363,7 @@ 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 = ti_sci_am654_rm_type_map,
+ .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
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 2/9] firmware: ti_sci: Drop unused structure ti_sci_rm_type_map
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
struct ti_sci_rm_type_map is no longer used. Drop its definition and its
declarations.
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 930a65ed78ad..a81ddec9e669 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
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 2/9] firmware: ti_sci: Drop unused structure ti_sci_rm_type_map
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
struct ti_sci_rm_type_map is no longer used. Drop its definition and its
declarations.
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 930a65ed78ad..a81ddec9e669 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
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 3/9] firmware: ti_sci: Add support for getting resource with subtype
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
With SYSFW ABI 3.0 changes, interrupts coming out of an interrupt
controller is identified by a type and it is consistent across SoCs.
Similarly global events for Interrupt aggregator. So add an API to get
resource range using a resource type.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/firmware/ti_sci.c | 89 +++++++++++++++++++-------
include/linux/soc/ti/ti_sci_protocol.h | 13 ++++
2 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index a81ddec9e669..918117be4a73 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -3208,61 +3208,50 @@ u32 ti_sci_get_num_resources(struct ti_sci_resource *res)
EXPORT_SYMBOL_GPL(ti_sci_get_num_resources);
/**
- * devm_ti_sci_get_of_resource() - Get a TISCI resource assigned to a device
+ * devm_ti_sci_get_resource_sets() - Get a TISCI resources assigned to a device
* @handle: TISCI handle
* @dev: Device pointer to which the resource is assigned
* @dev_id: TISCI device id to which the resource is assigned
- * @of_prop: property name by which the resource are represented
+ * @sub_types: Array of sub_types assigned corresponding to device
+ * @sets: Number of sub_types
*
* Return: Pointer to ti_sci_resource if all went well else appropriate
* error pointer.
*/
-struct ti_sci_resource *
-devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
- struct device *dev, u32 dev_id, char *of_prop)
+static struct ti_sci_resource *
+devm_ti_sci_get_resource_sets(const struct ti_sci_handle *handle,
+ struct device *dev, u32 dev_id, u32 *sub_types,
+ u32 sets)
{
struct ti_sci_resource *res;
bool valid_set = false;
- u32 resource_subtype;
int i, ret;
res = devm_kzalloc(dev, sizeof(*res), GFP_KERNEL);
if (!res)
return ERR_PTR(-ENOMEM);
- ret = of_property_count_elems_of_size(dev_of_node(dev), of_prop,
- sizeof(u32));
- if (ret < 0) {
- dev_err(dev, "%s resource type ids not available\n", of_prop);
- return ERR_PTR(ret);
- }
- res->sets = ret;
-
+ res->sets = sets;
res->desc = devm_kcalloc(dev, res->sets, sizeof(*res->desc),
GFP_KERNEL);
if (!res->desc)
return ERR_PTR(-ENOMEM);
for (i = 0; i < res->sets; i++) {
- ret = of_property_read_u32_index(dev_of_node(dev), of_prop, i,
- &resource_subtype);
- if (ret)
- return ERR_PTR(-EINVAL);
-
ret = handle->ops.rm_core_ops.get_range(handle, dev_id,
- resource_subtype,
+ sub_types[i],
&res->desc[i].start,
&res->desc[i].num);
if (ret) {
dev_dbg(dev, "dev = %d subtype %d not allocated for this host\n",
- dev_id, resource_subtype);
+ dev_id, sub_types[i]);
res->desc[i].start = 0;
res->desc[i].num = 0;
continue;
}
dev_dbg(dev, "dev = %d, subtype = %d, start = %d, num = %d\n",
- dev_id, resource_subtype, res->desc[i].start,
+ dev_id, sub_types[i], res->desc[i].start,
res->desc[i].num);
valid_set = true;
@@ -3280,6 +3269,62 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
return ERR_PTR(-EINVAL);
}
+/**
+ * devm_ti_sci_get_of_resource() - Get a TISCI resource assigned to a device
+ * @handle: TISCI handle
+ * @dev: Device pointer to which the resource is assigned
+ * @dev_id: TISCI device id to which the resource is assigned
+ * @of_prop: property name by which the resource are represented
+ *
+ * Return: Pointer to ti_sci_resource if all went well else appropriate
+ * error pointer.
+ */
+struct ti_sci_resource *
+devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
+ struct device *dev, u32 dev_id, char *of_prop)
+{
+ struct ti_sci_resource *res;
+ u32 *sub_types;
+ int sets;
+
+ sets = of_property_count_elems_of_size(dev_of_node(dev), of_prop,
+ sizeof(u32));
+ if (sets < 0) {
+ dev_err(dev, "%s resource type ids not available\n", of_prop);
+ return ERR_PTR(sets);
+ }
+
+ sub_types = kcalloc(sets, sizeof(*sub_types), GFP_KERNEL);
+ if (!sub_types)
+ return ERR_PTR(-ENOMEM);
+
+ of_property_read_u32_array(dev_of_node(dev), of_prop, sub_types, sets);
+ res = devm_ti_sci_get_resource_sets(handle, dev, dev_id, sub_types,
+ sets);
+
+ kfree(sub_types);
+ return res;
+}
+EXPORT_SYMBOL_GPL(devm_ti_sci_get_of_resource);
+
+/**
+ * devm_ti_sci_get_resource() - Get a resource range assigned to the device
+ * @handle: TISCI handle
+ * @dev: Device pointer to which the resource is assigned
+ * @dev_id: TISCI device id to which the resource is assigned
+ * @suub_type: TISCI resource subytpe representing the resource.
+ *
+ * Return: Pointer to ti_sci_resource if all went well else appropriate
+ * error pointer.
+ */
+struct ti_sci_resource *
+devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev,
+ u32 dev_id, u32 sub_type)
+{
+ return devm_ti_sci_get_resource_sets(handle, dev, dev_id, &sub_type, 1);
+}
+EXPORT_SYMBOL_GPL(devm_ti_sci_get_resource);
+
static int tisci_reboot_handler(struct notifier_block *nb, unsigned long mode,
void *cmd)
{
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index 9531ec823298..68e47f6324be 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -220,6 +220,9 @@ struct ti_sci_rm_core_ops {
u16 *range_start, u16 *range_num);
};
+#define TI_SCI_RESASG_SUBTYPE_IR_OUTPUT 0
+#define TI_SCI_RESASG_SUBTYPE_IA_VINT 0xa
+#define TI_SCI_RESASG_SUBTYPE_GLOBAL_EVENT_SEVT 0xd
/**
* struct ti_sci_rm_irq_ops: IRQ management operations
* @set_irq: Set an IRQ route between the requested source
@@ -556,6 +559,9 @@ u32 ti_sci_get_num_resources(struct ti_sci_resource *res);
struct ti_sci_resource *
devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
struct device *dev, u32 dev_id, char *of_prop);
+struct ti_sci_resource *
+devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev,
+ u32 dev_id, u32 sub_type);
#else /* CONFIG_TI_SCI_PROTOCOL */
@@ -609,6 +615,13 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
{
return ERR_PTR(-EINVAL);
}
+
+static inline struct ti_sci_resource *
+devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev,
+ u32 dev_id, u32 sub_type);
+{
+ return ERR_PTR(-EINVAL);
+}
#endif /* CONFIG_TI_SCI_PROTOCOL */
#endif /* __TISCI_PROTOCOL_H */
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 3/9] firmware: ti_sci: Add support for getting resource with subtype
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
With SYSFW ABI 3.0 changes, interrupts coming out of an interrupt
controller is identified by a type and it is consistent across SoCs.
Similarly global events for Interrupt aggregator. So add an API to get
resource range using a resource type.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/firmware/ti_sci.c | 89 +++++++++++++++++++-------
include/linux/soc/ti/ti_sci_protocol.h | 13 ++++
2 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index a81ddec9e669..918117be4a73 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -3208,61 +3208,50 @@ u32 ti_sci_get_num_resources(struct ti_sci_resource *res)
EXPORT_SYMBOL_GPL(ti_sci_get_num_resources);
/**
- * devm_ti_sci_get_of_resource() - Get a TISCI resource assigned to a device
+ * devm_ti_sci_get_resource_sets() - Get a TISCI resources assigned to a device
* @handle: TISCI handle
* @dev: Device pointer to which the resource is assigned
* @dev_id: TISCI device id to which the resource is assigned
- * @of_prop: property name by which the resource are represented
+ * @sub_types: Array of sub_types assigned corresponding to device
+ * @sets: Number of sub_types
*
* Return: Pointer to ti_sci_resource if all went well else appropriate
* error pointer.
*/
-struct ti_sci_resource *
-devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
- struct device *dev, u32 dev_id, char *of_prop)
+static struct ti_sci_resource *
+devm_ti_sci_get_resource_sets(const struct ti_sci_handle *handle,
+ struct device *dev, u32 dev_id, u32 *sub_types,
+ u32 sets)
{
struct ti_sci_resource *res;
bool valid_set = false;
- u32 resource_subtype;
int i, ret;
res = devm_kzalloc(dev, sizeof(*res), GFP_KERNEL);
if (!res)
return ERR_PTR(-ENOMEM);
- ret = of_property_count_elems_of_size(dev_of_node(dev), of_prop,
- sizeof(u32));
- if (ret < 0) {
- dev_err(dev, "%s resource type ids not available\n", of_prop);
- return ERR_PTR(ret);
- }
- res->sets = ret;
-
+ res->sets = sets;
res->desc = devm_kcalloc(dev, res->sets, sizeof(*res->desc),
GFP_KERNEL);
if (!res->desc)
return ERR_PTR(-ENOMEM);
for (i = 0; i < res->sets; i++) {
- ret = of_property_read_u32_index(dev_of_node(dev), of_prop, i,
- &resource_subtype);
- if (ret)
- return ERR_PTR(-EINVAL);
-
ret = handle->ops.rm_core_ops.get_range(handle, dev_id,
- resource_subtype,
+ sub_types[i],
&res->desc[i].start,
&res->desc[i].num);
if (ret) {
dev_dbg(dev, "dev = %d subtype %d not allocated for this host\n",
- dev_id, resource_subtype);
+ dev_id, sub_types[i]);
res->desc[i].start = 0;
res->desc[i].num = 0;
continue;
}
dev_dbg(dev, "dev = %d, subtype = %d, start = %d, num = %d\n",
- dev_id, resource_subtype, res->desc[i].start,
+ dev_id, sub_types[i], res->desc[i].start,
res->desc[i].num);
valid_set = true;
@@ -3280,6 +3269,62 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
return ERR_PTR(-EINVAL);
}
+/**
+ * devm_ti_sci_get_of_resource() - Get a TISCI resource assigned to a device
+ * @handle: TISCI handle
+ * @dev: Device pointer to which the resource is assigned
+ * @dev_id: TISCI device id to which the resource is assigned
+ * @of_prop: property name by which the resource are represented
+ *
+ * Return: Pointer to ti_sci_resource if all went well else appropriate
+ * error pointer.
+ */
+struct ti_sci_resource *
+devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
+ struct device *dev, u32 dev_id, char *of_prop)
+{
+ struct ti_sci_resource *res;
+ u32 *sub_types;
+ int sets;
+
+ sets = of_property_count_elems_of_size(dev_of_node(dev), of_prop,
+ sizeof(u32));
+ if (sets < 0) {
+ dev_err(dev, "%s resource type ids not available\n", of_prop);
+ return ERR_PTR(sets);
+ }
+
+ sub_types = kcalloc(sets, sizeof(*sub_types), GFP_KERNEL);
+ if (!sub_types)
+ return ERR_PTR(-ENOMEM);
+
+ of_property_read_u32_array(dev_of_node(dev), of_prop, sub_types, sets);
+ res = devm_ti_sci_get_resource_sets(handle, dev, dev_id, sub_types,
+ sets);
+
+ kfree(sub_types);
+ return res;
+}
+EXPORT_SYMBOL_GPL(devm_ti_sci_get_of_resource);
+
+/**
+ * devm_ti_sci_get_resource() - Get a resource range assigned to the device
+ * @handle: TISCI handle
+ * @dev: Device pointer to which the resource is assigned
+ * @dev_id: TISCI device id to which the resource is assigned
+ * @suub_type: TISCI resource subytpe representing the resource.
+ *
+ * Return: Pointer to ti_sci_resource if all went well else appropriate
+ * error pointer.
+ */
+struct ti_sci_resource *
+devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev,
+ u32 dev_id, u32 sub_type)
+{
+ return devm_ti_sci_get_resource_sets(handle, dev, dev_id, &sub_type, 1);
+}
+EXPORT_SYMBOL_GPL(devm_ti_sci_get_resource);
+
static int tisci_reboot_handler(struct notifier_block *nb, unsigned long mode,
void *cmd)
{
diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index 9531ec823298..68e47f6324be 100644
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -220,6 +220,9 @@ struct ti_sci_rm_core_ops {
u16 *range_start, u16 *range_num);
};
+#define TI_SCI_RESASG_SUBTYPE_IR_OUTPUT 0
+#define TI_SCI_RESASG_SUBTYPE_IA_VINT 0xa
+#define TI_SCI_RESASG_SUBTYPE_GLOBAL_EVENT_SEVT 0xd
/**
* struct ti_sci_rm_irq_ops: IRQ management operations
* @set_irq: Set an IRQ route between the requested source
@@ -556,6 +559,9 @@ u32 ti_sci_get_num_resources(struct ti_sci_resource *res);
struct ti_sci_resource *
devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
struct device *dev, u32 dev_id, char *of_prop);
+struct ti_sci_resource *
+devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev,
+ u32 dev_id, u32 sub_type);
#else /* CONFIG_TI_SCI_PROTOCOL */
@@ -609,6 +615,13 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle,
{
return ERR_PTR(-EINVAL);
}
+
+static inline struct ti_sci_resource *
+devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev,
+ u32 dev_id, u32 sub_type);
+{
+ return ERR_PTR(-EINVAL);
+}
#endif /* CONFIG_TI_SCI_PROTOCOL */
#endif /* __TISCI_PROTOCOL_H */
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 4/9] dt-bindings: irqchip: ti,sci-intr: Update bindings to drop the usage of gic as parent
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
Drop the firmware related dt-bindings and use the hardware specified
interrupt numbers within Interrupt Router. This ensures interrupt router
DT node need not assume any interrupt parent type.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-intr.txt | 31 ++++++++++---------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
index 1a8718f8855d..8b56b2de1c73 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
@@ -44,15 +44,17 @@ Required Properties:
4: If intr supports level triggered interrupts.
- interrupt-controller: Identifies the node as an interrupt controller
- #interrupt-cells: Specifies the number of cells needed to encode an
- interrupt source. The value should be 2.
- First cell should contain the TISCI device ID of source
- Second cell should contain the interrupt source offset
- within the device.
+ interrupt source. The value should be 1.
+ First cell should contain interrupt router input number
+ as specified by hardware.
- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dst-id: TISCI device ID of the destination IRQ controller.
-- ti,sci-rm-range-girq: Array of TISCI subtype ids representing the host irqs
- assigned to this interrupt router. Each subtype id
- corresponds to a range of host irqs.
+- ti,sci-dev-id: TISCI device id of interrupt controller.
+- ti,interrupt-ranges: Set of triplets containing ranges that convert
+ the INTR output interrupt numbers to parent's
+ interrupt number. Each triplet has following entries:
+ - First entry specifies the base for intr output irq
+ - Second entry specifies the base for parent irqs
+ - Third entry specifies the limit
For more details on TISCI IRQ resource management refer:
http://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
@@ -62,21 +64,20 @@ Example:
The following example demonstrates both interrupt router node and the consumer
node(main gpio) on the AM654 SoC:
-main_intr: interrupt-controller0 {
+main_gpio_intr: interrupt-controller0 {
compatible = "ti,sci-intr";
ti,intr-trigger-type = <1>;
interrupt-controller;
interrupt-parent = <&gic500>;
- #interrupt-cells = <2>;
+ #interrupt-cells = <1>;
ti,sci = <&dmsc>;
- ti,sci-dst-id = <56>;
- ti,sci-rm-range-girq = <0x1>;
+ ti,sci-dev-id = <131>;
+ ti,interrupt-ranges = <0 360 32>;
};
main_gpio0: gpio@600000 {
...
- interrupt-parent = <&main_intr>;
- interrupts = <57 256>, <57 257>, <57 258>,
- <57 259>, <57 260>, <57 261>;
+ interrupt-parent = <&main_gpio_intr>;
+ interrupts = <192>, <193>, <194>, <195>, <196>, <197>;
...
};
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 4/9] dt-bindings: irqchip: ti, sci-intr: Update bindings to drop the usage of gic as parent
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
Drop the firmware related dt-bindings and use the hardware specified
interrupt numbers within Interrupt Router. This ensures interrupt router
DT node need not assume any interrupt parent type.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-intr.txt | 31 ++++++++++---------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
index 1a8718f8855d..8b56b2de1c73 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
@@ -44,15 +44,17 @@ Required Properties:
4: If intr supports level triggered interrupts.
- interrupt-controller: Identifies the node as an interrupt controller
- #interrupt-cells: Specifies the number of cells needed to encode an
- interrupt source. The value should be 2.
- First cell should contain the TISCI device ID of source
- Second cell should contain the interrupt source offset
- within the device.
+ interrupt source. The value should be 1.
+ First cell should contain interrupt router input number
+ as specified by hardware.
- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dst-id: TISCI device ID of the destination IRQ controller.
-- ti,sci-rm-range-girq: Array of TISCI subtype ids representing the host irqs
- assigned to this interrupt router. Each subtype id
- corresponds to a range of host irqs.
+- ti,sci-dev-id: TISCI device id of interrupt controller.
+- ti,interrupt-ranges: Set of triplets containing ranges that convert
+ the INTR output interrupt numbers to parent's
+ interrupt number. Each triplet has following entries:
+ - First entry specifies the base for intr output irq
+ - Second entry specifies the base for parent irqs
+ - Third entry specifies the limit
For more details on TISCI IRQ resource management refer:
http://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
@@ -62,21 +64,20 @@ Example:
The following example demonstrates both interrupt router node and the consumer
node(main gpio) on the AM654 SoC:
-main_intr: interrupt-controller0 {
+main_gpio_intr: interrupt-controller0 {
compatible = "ti,sci-intr";
ti,intr-trigger-type = <1>;
interrupt-controller;
interrupt-parent = <&gic500>;
- #interrupt-cells = <2>;
+ #interrupt-cells = <1>;
ti,sci = <&dmsc>;
- ti,sci-dst-id = <56>;
- ti,sci-rm-range-girq = <0x1>;
+ ti,sci-dev-id = <131>;
+ ti,interrupt-ranges = <0 360 32>;
};
main_gpio0: gpio@600000 {
...
- interrupt-parent = <&main_intr>;
- interrupts = <57 256>, <57 257>, <57 258>,
- <57 259>, <57 260>, <57 261>;
+ interrupt-parent = <&main_gpio_intr>;
+ interrupts = <192>, <193>, <194>, <195>, <196>, <197>;
...
};
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 5/9] dt-bindings: irqchip: Convert ti,sci-intr bindings to yaml
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
In order to automate the verification of DT nodes convert
ti,sci-intr.txt ti,sci-intr.yaml.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-intr.txt | 83 --------------
.../interrupt-controller/ti,sci-intr.yaml | 102 ++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 103 insertions(+), 84 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
deleted file mode 100644
index 8b56b2de1c73..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-Texas Instruments K3 Interrupt Router
-=====================================
-
-The Interrupt Router (INTR) module provides a mechanism to mux M
-interrupt inputs to N interrupt outputs, where all M inputs are selectable
-to be driven per N output. An Interrupt Router can either handle edge triggered
-or level triggered interrupts and that is fixed in hardware.
-
- Interrupt Router
- +----------------------+
- | Inputs Outputs |
- +-------+ | +------+ +-----+ |
- | GPIO |----------->| | irq0 | | 0 | | Host IRQ
- +-------+ | +------+ +-----+ | controller
- | . . | +-------+
- +-------+ | . . |----->| IRQ |
- | INTA |----------->| . . | +-------+
- +-------+ | . +-----+ |
- | +------+ | N | |
- | | irqM | +-----+ |
- | +------+ |
- | |
- +----------------------+
-
-There is one register per output (MUXCNTL_N) that controls the selection.
-Configuration of these MUXCNTL_N registers is done by a system controller
-(like the Device Memory and Security Controller on K3 AM654 SoC). System
-controller will keep track of the used and unused registers within the Router.
-Driver should request the system controller to get the range of GIC IRQs
-assigned to the requesting hosts. It is the drivers responsibility to keep
-track of Host IRQs.
-
-Communication between the host processor running an OS and the system
-controller happens through a protocol called TI System Control Interface
-(TISCI protocol). For more details refer:
-Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
-
-TISCI Interrupt Router Node:
-----------------------------
-Required Properties:
-- compatible: Must be "ti,sci-intr".
-- ti,intr-trigger-type: Should be one of the following:
- 1: If intr supports edge triggered interrupts.
- 4: If intr supports level triggered interrupts.
-- interrupt-controller: Identifies the node as an interrupt controller
-- #interrupt-cells: Specifies the number of cells needed to encode an
- interrupt source. The value should be 1.
- First cell should contain interrupt router input number
- as specified by hardware.
-- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dev-id: TISCI device id of interrupt controller.
-- ti,interrupt-ranges: Set of triplets containing ranges that convert
- the INTR output interrupt numbers to parent's
- interrupt number. Each triplet has following entries:
- - First entry specifies the base for intr output irq
- - Second entry specifies the base for parent irqs
- - Third entry specifies the limit
-
-For more details on TISCI IRQ resource management refer:
-http://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
-
-Example:
---------
-The following example demonstrates both interrupt router node and the consumer
-node(main gpio) on the AM654 SoC:
-
-main_gpio_intr: interrupt-controller0 {
- compatible = "ti,sci-intr";
- ti,intr-trigger-type = <1>;
- interrupt-controller;
- interrupt-parent = <&gic500>;
- #interrupt-cells = <1>;
- ti,sci = <&dmsc>;
- ti,sci-dev-id = <131>;
- ti,interrupt-ranges = <0 360 32>;
-};
-
-main_gpio0: gpio@600000 {
- ...
- interrupt-parent = <&main_gpio_intr>;
- interrupts = <192>, <193>, <194>, <195>, <196>, <197>;
- ...
-};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
new file mode 100644
index 000000000000..f7a3e51a5212
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
@@ -0,0 +1,102 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/ti,sci-intr.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments K3 Interrupt Router
+
+maintainers:
+ - Lokesh Vutla <lokeshvutla@ti.com>
+
+allOf:
+ - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+
+description: |
+ The Interrupt Router (INTR) module provides a mechanism to mux M
+ interrupt inputs to N interrupt outputs, where all M inputs are selectable
+ to be driven per N output. An Interrupt Router can either handle edge
+ triggered or level triggered interrupts and that is fixed in hardware.
+
+ Interrupt Router
+ +----------------------+
+ | Inputs Outputs |
+ +-------+ | +------+ +-----+ |
+ | GPIO |----------->| | irq0 | | 0 | | Host IRQ
+ +-------+ | +------+ +-----+ | controller
+ | . . | +-------+
+ +-------+ | . . |----->| IRQ |
+ | INTA |----------->| . . | +-------+
+ +-------+ | . +-----+ |
+ | +------+ | N | |
+ | | irqM | +-----+ |
+ | +------+ |
+ | |
+ +----------------------+
+
+ There is one register per output (MUXCNTL_N) that controls the selection.
+ Configuration of these MUXCNTL_N registers is done by a system controller
+ (like the Device Memory and Security Controller on K3 AM654 SoC). System
+ controller will keep track of the used and unused registers within the Router.
+ Driver should request the system controller to get the range of GIC IRQs
+ assigned to the requesting hosts. It is the drivers responsibility to keep
+ track of Host IRQs.
+
+ Communication between the host processor running an OS and the system
+ controller happens through a protocol called TI System Control Interface
+ (TISCI protocol).
+
+properties:
+ compatible:
+ const: ti,sci-intr
+
+ ti,intr-trigger-type:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ enum: [1, 4]
+ description: |
+ Should be one of the following.
+ 1 = If intr supports edge triggered interrupts.
+ 4 = If intr supports level triggered interrupts.
+
+ interrupt-controller: true
+
+ '#interrupt-cells':
+ const: 1
+ description: |
+ The 1st cell should contain interrupt router input hw number.
+
+ ti,interrupt-ranges:
+ $ref: /schemas/types.yaml#/definitions/uint32-matrix
+ description: |
+ Interrupt ranges that converts the INTR output hw irq numbers
+ to parents's input interrupt numbers.
+ - items:
+ items:
+ - description: |
+ "output_irq" specifies the base for intr output irq
+ - description: |
+ "parent's input irq" specifies the base for parent irq
+ - description: |
+ "limit" specifies the limit for translation
+
+required:
+ - compatible
+ - ti,intr-trigger-type
+ - interrupt-controller
+ - '#interrupt-cells'
+ - ti,sci
+ - ti,sci-dev-id
+ - ti,interrupt-ranges
+
+examples:
+ - |
+ main_gpio_intr: interrupt-controller0 {
+ compatible = "ti,sci-intr";
+ ti,intr-trigger-type = <1>;
+ interrupt-controller;
+ interrupt-parent = <&gic500>;
+ #interrupt-cells = <1>;
+ ti,sci = <&dmsc>;
+ ti,sci-dev-id = <131>;
+ ti,interrupt-ranges = <0 360 32>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index ba3474e1ce6a..28a8eba81d2b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16908,7 +16908,7 @@ F: Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
F: Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt
F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
-F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
F: Documentation/devicetree/bindings/reset/ti,sci-reset.txt
F: Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
F: drivers/clk/keystone/sci-clk.c
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 5/9] dt-bindings: irqchip: Convert ti, sci-intr bindings to yaml
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
In order to automate the verification of DT nodes convert
ti,sci-intr.txt ti,sci-intr.yaml.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-intr.txt | 83 --------------
.../interrupt-controller/ti,sci-intr.yaml | 102 ++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 103 insertions(+), 84 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
deleted file mode 100644
index 8b56b2de1c73..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-Texas Instruments K3 Interrupt Router
-=====================================
-
-The Interrupt Router (INTR) module provides a mechanism to mux M
-interrupt inputs to N interrupt outputs, where all M inputs are selectable
-to be driven per N output. An Interrupt Router can either handle edge triggered
-or level triggered interrupts and that is fixed in hardware.
-
- Interrupt Router
- +----------------------+
- | Inputs Outputs |
- +-------+ | +------+ +-----+ |
- | GPIO |----------->| | irq0 | | 0 | | Host IRQ
- +-------+ | +------+ +-----+ | controller
- | . . | +-------+
- +-------+ | . . |----->| IRQ |
- | INTA |----------->| . . | +-------+
- +-------+ | . +-----+ |
- | +------+ | N | |
- | | irqM | +-----+ |
- | +------+ |
- | |
- +----------------------+
-
-There is one register per output (MUXCNTL_N) that controls the selection.
-Configuration of these MUXCNTL_N registers is done by a system controller
-(like the Device Memory and Security Controller on K3 AM654 SoC). System
-controller will keep track of the used and unused registers within the Router.
-Driver should request the system controller to get the range of GIC IRQs
-assigned to the requesting hosts. It is the drivers responsibility to keep
-track of Host IRQs.
-
-Communication between the host processor running an OS and the system
-controller happens through a protocol called TI System Control Interface
-(TISCI protocol). For more details refer:
-Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
-
-TISCI Interrupt Router Node:
-----------------------------
-Required Properties:
-- compatible: Must be "ti,sci-intr".
-- ti,intr-trigger-type: Should be one of the following:
- 1: If intr supports edge triggered interrupts.
- 4: If intr supports level triggered interrupts.
-- interrupt-controller: Identifies the node as an interrupt controller
-- #interrupt-cells: Specifies the number of cells needed to encode an
- interrupt source. The value should be 1.
- First cell should contain interrupt router input number
- as specified by hardware.
-- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dev-id: TISCI device id of interrupt controller.
-- ti,interrupt-ranges: Set of triplets containing ranges that convert
- the INTR output interrupt numbers to parent's
- interrupt number. Each triplet has following entries:
- - First entry specifies the base for intr output irq
- - Second entry specifies the base for parent irqs
- - Third entry specifies the limit
-
-For more details on TISCI IRQ resource management refer:
-http://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
-
-Example:
---------
-The following example demonstrates both interrupt router node and the consumer
-node(main gpio) on the AM654 SoC:
-
-main_gpio_intr: interrupt-controller0 {
- compatible = "ti,sci-intr";
- ti,intr-trigger-type = <1>;
- interrupt-controller;
- interrupt-parent = <&gic500>;
- #interrupt-cells = <1>;
- ti,sci = <&dmsc>;
- ti,sci-dev-id = <131>;
- ti,interrupt-ranges = <0 360 32>;
-};
-
-main_gpio0: gpio@600000 {
- ...
- interrupt-parent = <&main_gpio_intr>;
- interrupts = <192>, <193>, <194>, <195>, <196>, <197>;
- ...
-};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
new file mode 100644
index 000000000000..f7a3e51a5212
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
@@ -0,0 +1,102 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/ti,sci-intr.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments K3 Interrupt Router
+
+maintainers:
+ - Lokesh Vutla <lokeshvutla@ti.com>
+
+allOf:
+ - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+
+description: |
+ The Interrupt Router (INTR) module provides a mechanism to mux M
+ interrupt inputs to N interrupt outputs, where all M inputs are selectable
+ to be driven per N output. An Interrupt Router can either handle edge
+ triggered or level triggered interrupts and that is fixed in hardware.
+
+ Interrupt Router
+ +----------------------+
+ | Inputs Outputs |
+ +-------+ | +------+ +-----+ |
+ | GPIO |----------->| | irq0 | | 0 | | Host IRQ
+ +-------+ | +------+ +-----+ | controller
+ | . . | +-------+
+ +-------+ | . . |----->| IRQ |
+ | INTA |----------->| . . | +-------+
+ +-------+ | . +-----+ |
+ | +------+ | N | |
+ | | irqM | +-----+ |
+ | +------+ |
+ | |
+ +----------------------+
+
+ There is one register per output (MUXCNTL_N) that controls the selection.
+ Configuration of these MUXCNTL_N registers is done by a system controller
+ (like the Device Memory and Security Controller on K3 AM654 SoC). System
+ controller will keep track of the used and unused registers within the Router.
+ Driver should request the system controller to get the range of GIC IRQs
+ assigned to the requesting hosts. It is the drivers responsibility to keep
+ track of Host IRQs.
+
+ Communication between the host processor running an OS and the system
+ controller happens through a protocol called TI System Control Interface
+ (TISCI protocol).
+
+properties:
+ compatible:
+ const: ti,sci-intr
+
+ ti,intr-trigger-type:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ enum: [1, 4]
+ description: |
+ Should be one of the following.
+ 1 = If intr supports edge triggered interrupts.
+ 4 = If intr supports level triggered interrupts.
+
+ interrupt-controller: true
+
+ '#interrupt-cells':
+ const: 1
+ description: |
+ The 1st cell should contain interrupt router input hw number.
+
+ ti,interrupt-ranges:
+ $ref: /schemas/types.yaml#/definitions/uint32-matrix
+ description: |
+ Interrupt ranges that converts the INTR output hw irq numbers
+ to parents's input interrupt numbers.
+ - items:
+ items:
+ - description: |
+ "output_irq" specifies the base for intr output irq
+ - description: |
+ "parent's input irq" specifies the base for parent irq
+ - description: |
+ "limit" specifies the limit for translation
+
+required:
+ - compatible
+ - ti,intr-trigger-type
+ - interrupt-controller
+ - '#interrupt-cells'
+ - ti,sci
+ - ti,sci-dev-id
+ - ti,interrupt-ranges
+
+examples:
+ - |
+ main_gpio_intr: interrupt-controller0 {
+ compatible = "ti,sci-intr";
+ ti,intr-trigger-type = <1>;
+ interrupt-controller;
+ interrupt-parent = <&gic500>;
+ #interrupt-cells = <1>;
+ ti,sci = <&dmsc>;
+ ti,sci-dev-id = <131>;
+ ti,interrupt-ranges = <0 360 32>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index ba3474e1ce6a..28a8eba81d2b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16908,7 +16908,7 @@ F: Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
F: Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt
F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
-F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
F: Documentation/devicetree/bindings/reset/ti,sci-reset.txt
F: Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
F: drivers/clk/keystone/sci-clk.c
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
Driver assumes that Interrupt parent to Interrupt router is always GIC.
This is not true always and an Interrupt Router can be a parent to
Interrupt Router. Update the driver to detect the parent and request the
parent irqs accordingly.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/irqchip/irq-ti-sci-intr.c | 150 ++++++++++++++++++------------
1 file changed, 91 insertions(+), 59 deletions(-)
diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
index 59d51a20bbd8..0b73816e77fc 100644
--- a/drivers/irqchip/irq-ti-sci-intr.c
+++ b/drivers/irqchip/irq-ti-sci-intr.c
@@ -17,29 +17,18 @@
#include <linux/of_irq.h>
#include <linux/soc/ti/ti_sci_protocol.h>
-#define TI_SCI_DEV_ID_MASK 0xffff
-#define TI_SCI_DEV_ID_SHIFT 16
-#define TI_SCI_IRQ_ID_MASK 0xffff
-#define TI_SCI_IRQ_ID_SHIFT 0
-#define HWIRQ_TO_DEVID(hwirq) (((hwirq) >> (TI_SCI_DEV_ID_SHIFT)) & \
- (TI_SCI_DEV_ID_MASK))
-#define HWIRQ_TO_IRQID(hwirq) ((hwirq) & (TI_SCI_IRQ_ID_MASK))
-#define TO_HWIRQ(dev, index) ((((dev) & TI_SCI_DEV_ID_MASK) << \
- TI_SCI_DEV_ID_SHIFT) | \
- ((index) & TI_SCI_IRQ_ID_MASK))
-
/**
* struct ti_sci_intr_irq_domain - Structure representing a TISCI based
* Interrupt Router IRQ domain.
* @sci: Pointer to TISCI handle
- * @dst_irq: TISCI resource pointer representing GIC irq controller.
- * @dst_id: TISCI device ID of the GIC irq controller.
+ * @out_irqs: TISCI resource pointer representing INTR irqs.
+ * @pdev: Pointer to platform device.
* @type: Specifies the trigger type supported by this Interrupt Router
*/
struct ti_sci_intr_irq_domain {
const struct ti_sci_handle *sci;
- struct ti_sci_resource *dst_irq;
- u32 dst_id;
+ struct ti_sci_resource *out_irqs;
+ struct platform_device *pdev;
u32 type;
};
@@ -70,15 +59,44 @@ static int ti_sci_intr_irq_domain_translate(struct irq_domain *domain,
{
struct ti_sci_intr_irq_domain *intr = domain->host_data;
- if (fwspec->param_count != 2)
+ if (fwspec->param_count != 1)
return -EINVAL;
- *hwirq = TO_HWIRQ(fwspec->param[0], fwspec->param[1]);
+ *hwirq = fwspec->param[0];
*type = intr->type;
return 0;
}
+/**
+ * ti_sci_intr_xlate_irq() - Translate hwirq to parent's hwirq.
+ * @intr: IRQ domain corresponding to Interrupt Router
+ * @irq: Hardware irq corresponding to the above irq domain
+ *
+ * Return parent irq number if translation is available else -ENOENT.
+ */
+static int ti_sci_intr_xlate_irq(struct ti_sci_intr_irq_domain *intr, u32 irq)
+{
+ struct device_node *np = dev_of_node(&intr->pdev->dev);
+ u32 base, pbase, size, len;
+ const __be32 *range;
+
+ range = of_get_property(np, "ti,interrupt-ranges", &len);
+ if (!range)
+ return irq;
+
+ for (len /= sizeof(*range); len >= 3; len -= 3) {
+ base = be32_to_cpu(*range++);
+ pbase = be32_to_cpu(*range++);
+ size = be32_to_cpu(*range++);
+
+ if (base <= irq && irq < base + size)
+ return irq - base + pbase;
+ }
+
+ return -ENOENT;
+}
+
/**
* ti_sci_intr_irq_domain_free() - Free the specified IRQs from the domain.
* @domain: Domain to which the irqs belong
@@ -89,66 +107,77 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain,
unsigned int virq, unsigned int nr_irqs)
{
struct ti_sci_intr_irq_domain *intr = domain->host_data;
- struct irq_data *data, *parent_data;
- u16 dev_id, irq_index;
+ struct irq_data *data;
+ int out_irq;
- parent_data = irq_domain_get_irq_data(domain->parent, virq);
data = irq_domain_get_irq_data(domain, virq);
- irq_index = HWIRQ_TO_IRQID(data->hwirq);
- dev_id = HWIRQ_TO_DEVID(data->hwirq);
+ out_irq = (uintptr_t)data->chip_data;
- intr->sci->ops.rm_irq_ops.free_irq(intr->sci, dev_id, irq_index,
- intr->dst_id, parent_data->hwirq);
- ti_sci_release_resource(intr->dst_irq, parent_data->hwirq);
+ intr->sci->ops.rm_irq_ops.free_irq(intr->sci,
+ intr->pdev->id, data->hwirq,
+ intr->pdev->id, out_irq);
+ ti_sci_release_resource(intr->out_irqs, out_irq);
irq_domain_free_irqs_parent(domain, virq, 1);
irq_domain_reset_irq_data(data);
}
/**
- * ti_sci_intr_alloc_gic_irq() - Allocate GIC specific IRQ
+ * ti_sci_intr_alloc_parent_irq() - Allocate parent IRQ
* @domain: Pointer to the interrupt router IRQ domain
* @virq: Corresponding Linux virtual IRQ number
* @hwirq: Corresponding hwirq for the IRQ within this IRQ domain
*
- * Returns 0 if all went well else appropriate error pointer.
+ * Returns parent irq if all went well else appropriate error pointer.
*/
-static int ti_sci_intr_alloc_gic_irq(struct irq_domain *domain,
- unsigned int virq, u32 hwirq)
+static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
+ unsigned int virq, u32 hwirq)
{
struct ti_sci_intr_irq_domain *intr = domain->host_data;
+ struct device_node *parent_node;
struct irq_fwspec fwspec;
- u16 dev_id, irq_index;
- u16 dst_irq;
- int err;
-
- dev_id = HWIRQ_TO_DEVID(hwirq);
- irq_index = HWIRQ_TO_IRQID(hwirq);
+ u16 out_irq, p_hwirq;
+ int err = 0;
- dst_irq = ti_sci_get_free_resource(intr->dst_irq);
- if (dst_irq == TI_SCI_RESOURCE_NULL)
+ out_irq = ti_sci_get_free_resource(intr->out_irqs);
+ if (out_irq == TI_SCI_RESOURCE_NULL)
return -EINVAL;
- fwspec.fwnode = domain->parent->fwnode;
- fwspec.param_count = 3;
- fwspec.param[0] = 0; /* SPI */
- fwspec.param[1] = dst_irq - 32; /* SPI offset */
- fwspec.param[2] = intr->type;
+ p_hwirq = ti_sci_intr_xlate_irq(intr, out_irq);
+ if (p_hwirq < 0)
+ goto err_irqs;
+
+ parent_node = of_irq_find_parent(dev_of_node(&intr->pdev->dev));
+ fwspec.fwnode = of_node_to_fwnode(parent_node);
+ if (of_property_read_u32(parent_node, "#interrupt-cells",
+ &fwspec.param_count))
+ goto err_irqs;
+
+ if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
+ /* Parent is GIC */
+ fwspec.param[0] = 0; /* SPI */
+ fwspec.param[1] = p_hwirq - 32; /* SPI offset */
+ fwspec.param[2] = intr->type;
+ } else {
+ /* Parent is Interrupt Router */
+ fwspec.param[0] = p_hwirq;
+ }
err = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
if (err)
goto err_irqs;
- err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci, dev_id, irq_index,
- intr->dst_id, dst_irq);
+ err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci,
+ intr->pdev->id, hwirq,
+ intr->pdev->id, out_irq);
if (err)
goto err_msg;
- return 0;
+ return p_hwirq;
err_msg:
irq_domain_free_irqs_parent(domain, virq, 1);
err_irqs:
- ti_sci_release_resource(intr->dst_irq, dst_irq);
+ ti_sci_release_resource(intr->out_irqs, out_irq);
return err;
}
@@ -168,18 +197,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain,
struct irq_fwspec *fwspec = data;
unsigned long hwirq;
unsigned int flags;
- int err;
+ int err, p_hwirq;
err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);
if (err)
return err;
- err = ti_sci_intr_alloc_gic_irq(domain, virq, hwirq);
- if (err)
- return err;
+ p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
+ if (p_hwirq < 0)
+ return p_hwirq;
irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
- &ti_sci_intr_irq_chip, NULL);
+ &ti_sci_intr_irq_chip,
+ (void *)(uintptr_t)p_hwirq);
return 0;
}
@@ -214,6 +244,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
if (!intr)
return -ENOMEM;
+ intr->pdev = pdev;
ret = of_property_read_u32(dev_of_node(dev), "ti,intr-trigger-type",
&intr->type);
if (ret) {
@@ -230,19 +261,18 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
return ret;
}
- ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
- &intr->dst_id);
+ ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
+ &pdev->id);
if (ret) {
- dev_err(dev, "missing 'ti,sci-dst-id' property\n");
+ dev_err(dev, "missing 'ti,sci-dev-id' property\n");
return -EINVAL;
}
- intr->dst_irq = devm_ti_sci_get_of_resource(intr->sci, dev,
- intr->dst_id,
- "ti,sci-rm-range-girq");
- if (IS_ERR(intr->dst_irq)) {
+ intr->out_irqs = devm_ti_sci_get_resource(intr->sci, dev, pdev->id,
+ TI_SCI_RESASG_SUBTYPE_IR_OUTPUT);
+ if (IS_ERR(intr->out_irqs)) {
dev_err(dev, "Destination irq resource allocation failed\n");
- return PTR_ERR(intr->dst_irq);
+ return PTR_ERR(intr->out_irqs);
}
domain = irq_domain_add_hierarchy(parent_domain, 0, 0, dev_of_node(dev),
@@ -252,6 +282,8 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ dev_info(dev, "Interrupt Router %d domain created\n", pdev->id);
+
return 0;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
Driver assumes that Interrupt parent to Interrupt router is always GIC.
This is not true always and an Interrupt Router can be a parent to
Interrupt Router. Update the driver to detect the parent and request the
parent irqs accordingly.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/irqchip/irq-ti-sci-intr.c | 150 ++++++++++++++++++------------
1 file changed, 91 insertions(+), 59 deletions(-)
diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
index 59d51a20bbd8..0b73816e77fc 100644
--- a/drivers/irqchip/irq-ti-sci-intr.c
+++ b/drivers/irqchip/irq-ti-sci-intr.c
@@ -17,29 +17,18 @@
#include <linux/of_irq.h>
#include <linux/soc/ti/ti_sci_protocol.h>
-#define TI_SCI_DEV_ID_MASK 0xffff
-#define TI_SCI_DEV_ID_SHIFT 16
-#define TI_SCI_IRQ_ID_MASK 0xffff
-#define TI_SCI_IRQ_ID_SHIFT 0
-#define HWIRQ_TO_DEVID(hwirq) (((hwirq) >> (TI_SCI_DEV_ID_SHIFT)) & \
- (TI_SCI_DEV_ID_MASK))
-#define HWIRQ_TO_IRQID(hwirq) ((hwirq) & (TI_SCI_IRQ_ID_MASK))
-#define TO_HWIRQ(dev, index) ((((dev) & TI_SCI_DEV_ID_MASK) << \
- TI_SCI_DEV_ID_SHIFT) | \
- ((index) & TI_SCI_IRQ_ID_MASK))
-
/**
* struct ti_sci_intr_irq_domain - Structure representing a TISCI based
* Interrupt Router IRQ domain.
* @sci: Pointer to TISCI handle
- * @dst_irq: TISCI resource pointer representing GIC irq controller.
- * @dst_id: TISCI device ID of the GIC irq controller.
+ * @out_irqs: TISCI resource pointer representing INTR irqs.
+ * @pdev: Pointer to platform device.
* @type: Specifies the trigger type supported by this Interrupt Router
*/
struct ti_sci_intr_irq_domain {
const struct ti_sci_handle *sci;
- struct ti_sci_resource *dst_irq;
- u32 dst_id;
+ struct ti_sci_resource *out_irqs;
+ struct platform_device *pdev;
u32 type;
};
@@ -70,15 +59,44 @@ static int ti_sci_intr_irq_domain_translate(struct irq_domain *domain,
{
struct ti_sci_intr_irq_domain *intr = domain->host_data;
- if (fwspec->param_count != 2)
+ if (fwspec->param_count != 1)
return -EINVAL;
- *hwirq = TO_HWIRQ(fwspec->param[0], fwspec->param[1]);
+ *hwirq = fwspec->param[0];
*type = intr->type;
return 0;
}
+/**
+ * ti_sci_intr_xlate_irq() - Translate hwirq to parent's hwirq.
+ * @intr: IRQ domain corresponding to Interrupt Router
+ * @irq: Hardware irq corresponding to the above irq domain
+ *
+ * Return parent irq number if translation is available else -ENOENT.
+ */
+static int ti_sci_intr_xlate_irq(struct ti_sci_intr_irq_domain *intr, u32 irq)
+{
+ struct device_node *np = dev_of_node(&intr->pdev->dev);
+ u32 base, pbase, size, len;
+ const __be32 *range;
+
+ range = of_get_property(np, "ti,interrupt-ranges", &len);
+ if (!range)
+ return irq;
+
+ for (len /= sizeof(*range); len >= 3; len -= 3) {
+ base = be32_to_cpu(*range++);
+ pbase = be32_to_cpu(*range++);
+ size = be32_to_cpu(*range++);
+
+ if (base <= irq && irq < base + size)
+ return irq - base + pbase;
+ }
+
+ return -ENOENT;
+}
+
/**
* ti_sci_intr_irq_domain_free() - Free the specified IRQs from the domain.
* @domain: Domain to which the irqs belong
@@ -89,66 +107,77 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain,
unsigned int virq, unsigned int nr_irqs)
{
struct ti_sci_intr_irq_domain *intr = domain->host_data;
- struct irq_data *data, *parent_data;
- u16 dev_id, irq_index;
+ struct irq_data *data;
+ int out_irq;
- parent_data = irq_domain_get_irq_data(domain->parent, virq);
data = irq_domain_get_irq_data(domain, virq);
- irq_index = HWIRQ_TO_IRQID(data->hwirq);
- dev_id = HWIRQ_TO_DEVID(data->hwirq);
+ out_irq = (uintptr_t)data->chip_data;
- intr->sci->ops.rm_irq_ops.free_irq(intr->sci, dev_id, irq_index,
- intr->dst_id, parent_data->hwirq);
- ti_sci_release_resource(intr->dst_irq, parent_data->hwirq);
+ intr->sci->ops.rm_irq_ops.free_irq(intr->sci,
+ intr->pdev->id, data->hwirq,
+ intr->pdev->id, out_irq);
+ ti_sci_release_resource(intr->out_irqs, out_irq);
irq_domain_free_irqs_parent(domain, virq, 1);
irq_domain_reset_irq_data(data);
}
/**
- * ti_sci_intr_alloc_gic_irq() - Allocate GIC specific IRQ
+ * ti_sci_intr_alloc_parent_irq() - Allocate parent IRQ
* @domain: Pointer to the interrupt router IRQ domain
* @virq: Corresponding Linux virtual IRQ number
* @hwirq: Corresponding hwirq for the IRQ within this IRQ domain
*
- * Returns 0 if all went well else appropriate error pointer.
+ * Returns parent irq if all went well else appropriate error pointer.
*/
-static int ti_sci_intr_alloc_gic_irq(struct irq_domain *domain,
- unsigned int virq, u32 hwirq)
+static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
+ unsigned int virq, u32 hwirq)
{
struct ti_sci_intr_irq_domain *intr = domain->host_data;
+ struct device_node *parent_node;
struct irq_fwspec fwspec;
- u16 dev_id, irq_index;
- u16 dst_irq;
- int err;
-
- dev_id = HWIRQ_TO_DEVID(hwirq);
- irq_index = HWIRQ_TO_IRQID(hwirq);
+ u16 out_irq, p_hwirq;
+ int err = 0;
- dst_irq = ti_sci_get_free_resource(intr->dst_irq);
- if (dst_irq == TI_SCI_RESOURCE_NULL)
+ out_irq = ti_sci_get_free_resource(intr->out_irqs);
+ if (out_irq == TI_SCI_RESOURCE_NULL)
return -EINVAL;
- fwspec.fwnode = domain->parent->fwnode;
- fwspec.param_count = 3;
- fwspec.param[0] = 0; /* SPI */
- fwspec.param[1] = dst_irq - 32; /* SPI offset */
- fwspec.param[2] = intr->type;
+ p_hwirq = ti_sci_intr_xlate_irq(intr, out_irq);
+ if (p_hwirq < 0)
+ goto err_irqs;
+
+ parent_node = of_irq_find_parent(dev_of_node(&intr->pdev->dev));
+ fwspec.fwnode = of_node_to_fwnode(parent_node);
+ if (of_property_read_u32(parent_node, "#interrupt-cells",
+ &fwspec.param_count))
+ goto err_irqs;
+
+ if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
+ /* Parent is GIC */
+ fwspec.param[0] = 0; /* SPI */
+ fwspec.param[1] = p_hwirq - 32; /* SPI offset */
+ fwspec.param[2] = intr->type;
+ } else {
+ /* Parent is Interrupt Router */
+ fwspec.param[0] = p_hwirq;
+ }
err = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
if (err)
goto err_irqs;
- err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci, dev_id, irq_index,
- intr->dst_id, dst_irq);
+ err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci,
+ intr->pdev->id, hwirq,
+ intr->pdev->id, out_irq);
if (err)
goto err_msg;
- return 0;
+ return p_hwirq;
err_msg:
irq_domain_free_irqs_parent(domain, virq, 1);
err_irqs:
- ti_sci_release_resource(intr->dst_irq, dst_irq);
+ ti_sci_release_resource(intr->out_irqs, out_irq);
return err;
}
@@ -168,18 +197,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain,
struct irq_fwspec *fwspec = data;
unsigned long hwirq;
unsigned int flags;
- int err;
+ int err, p_hwirq;
err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);
if (err)
return err;
- err = ti_sci_intr_alloc_gic_irq(domain, virq, hwirq);
- if (err)
- return err;
+ p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
+ if (p_hwirq < 0)
+ return p_hwirq;
irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
- &ti_sci_intr_irq_chip, NULL);
+ &ti_sci_intr_irq_chip,
+ (void *)(uintptr_t)p_hwirq);
return 0;
}
@@ -214,6 +244,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
if (!intr)
return -ENOMEM;
+ intr->pdev = pdev;
ret = of_property_read_u32(dev_of_node(dev), "ti,intr-trigger-type",
&intr->type);
if (ret) {
@@ -230,19 +261,18 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
return ret;
}
- ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
- &intr->dst_id);
+ ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
+ &pdev->id);
if (ret) {
- dev_err(dev, "missing 'ti,sci-dst-id' property\n");
+ dev_err(dev, "missing 'ti,sci-dev-id' property\n");
return -EINVAL;
}
- intr->dst_irq = devm_ti_sci_get_of_resource(intr->sci, dev,
- intr->dst_id,
- "ti,sci-rm-range-girq");
- if (IS_ERR(intr->dst_irq)) {
+ intr->out_irqs = devm_ti_sci_get_resource(intr->sci, dev, pdev->id,
+ TI_SCI_RESASG_SUBTYPE_IR_OUTPUT);
+ if (IS_ERR(intr->out_irqs)) {
dev_err(dev, "Destination irq resource allocation failed\n");
- return PTR_ERR(intr->dst_irq);
+ return PTR_ERR(intr->out_irqs);
}
domain = irq_domain_add_hierarchy(parent_domain, 0, 0, dev_of_node(dev),
@@ -252,6 +282,8 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ dev_info(dev, "Interrupt Router %d domain created\n", pdev->id);
+
return 0;
}
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-25 14:06 ` Marc Zyngier
-1 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:06 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Rob Herring, Thomas Gleixner, Nishanth Menon, Tero Kristo,
Santosh Shilimkar, Linux ARM Mailing List, Sekhar Nori,
Grygorii Strashko, Peter Ujfalusi, Device Tree Mailing List,
Suman Anna
On Fri, 24 Jul 2020 15:18:34 +0100,
Lokesh Vutla <lokeshvutla@ti.com> wrote:
>
> Driver assumes that Interrupt parent to Interrupt router is always GIC.
> This is not true always and an Interrupt Router can be a parent to
> Interrupt Router. Update the driver to detect the parent and request the
> parent irqs accordingly.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
> drivers/irqchip/irq-ti-sci-intr.c | 150 ++++++++++++++++++------------
> 1 file changed, 91 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
> index 59d51a20bbd8..0b73816e77fc 100644
> --- a/drivers/irqchip/irq-ti-sci-intr.c
> +++ b/drivers/irqchip/irq-ti-sci-intr.c
> @@ -17,29 +17,18 @@
> #include <linux/of_irq.h>
> #include <linux/soc/ti/ti_sci_protocol.h>
>
> -#define TI_SCI_DEV_ID_MASK 0xffff
> -#define TI_SCI_DEV_ID_SHIFT 16
> -#define TI_SCI_IRQ_ID_MASK 0xffff
> -#define TI_SCI_IRQ_ID_SHIFT 0
> -#define HWIRQ_TO_DEVID(hwirq) (((hwirq) >> (TI_SCI_DEV_ID_SHIFT)) & \
> - (TI_SCI_DEV_ID_MASK))
> -#define HWIRQ_TO_IRQID(hwirq) ((hwirq) & (TI_SCI_IRQ_ID_MASK))
> -#define TO_HWIRQ(dev, index) ((((dev) & TI_SCI_DEV_ID_MASK) << \
> - TI_SCI_DEV_ID_SHIFT) | \
> - ((index) & TI_SCI_IRQ_ID_MASK))
> -
> /**
> * struct ti_sci_intr_irq_domain - Structure representing a TISCI based
> * Interrupt Router IRQ domain.
> * @sci: Pointer to TISCI handle
> - * @dst_irq: TISCI resource pointer representing GIC irq controller.
> - * @dst_id: TISCI device ID of the GIC irq controller.
> + * @out_irqs: TISCI resource pointer representing INTR irqs.
> + * @pdev: Pointer to platform device.
> * @type: Specifies the trigger type supported by this Interrupt Router
> */
> struct ti_sci_intr_irq_domain {
> const struct ti_sci_handle *sci;
> - struct ti_sci_resource *dst_irq;
> - u32 dst_id;
> + struct ti_sci_resource *out_irqs;
> + struct platform_device *pdev;
> u32 type;
> };
>
> @@ -70,15 +59,44 @@ static int ti_sci_intr_irq_domain_translate(struct irq_domain *domain,
> {
> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>
> - if (fwspec->param_count != 2)
> + if (fwspec->param_count != 1)
> return -EINVAL;
>
> - *hwirq = TO_HWIRQ(fwspec->param[0], fwspec->param[1]);
> + *hwirq = fwspec->param[0];
> *type = intr->type;
>
> return 0;
> }
>
> +/**
> + * ti_sci_intr_xlate_irq() - Translate hwirq to parent's hwirq.
> + * @intr: IRQ domain corresponding to Interrupt Router
> + * @irq: Hardware irq corresponding to the above irq domain
> + *
> + * Return parent irq number if translation is available else -ENOENT.
> + */
> +static int ti_sci_intr_xlate_irq(struct ti_sci_intr_irq_domain *intr, u32 irq)
> +{
> + struct device_node *np = dev_of_node(&intr->pdev->dev);
> + u32 base, pbase, size, len;
> + const __be32 *range;
> +
> + range = of_get_property(np, "ti,interrupt-ranges", &len);
> + if (!range)
> + return irq;
> +
> + for (len /= sizeof(*range); len >= 3; len -= 3) {
> + base = be32_to_cpu(*range++);
> + pbase = be32_to_cpu(*range++);
> + size = be32_to_cpu(*range++);
> +
> + if (base <= irq && irq < base + size)
> + return irq - base + pbase;
> + }
> +
> + return -ENOENT;
> +}
> +
> /**
> * ti_sci_intr_irq_domain_free() - Free the specified IRQs from the domain.
> * @domain: Domain to which the irqs belong
> @@ -89,66 +107,77 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain,
> unsigned int virq, unsigned int nr_irqs)
> {
> struct ti_sci_intr_irq_domain *intr = domain->host_data;
> - struct irq_data *data, *parent_data;
> - u16 dev_id, irq_index;
> + struct irq_data *data;
> + int out_irq;
>
> - parent_data = irq_domain_get_irq_data(domain->parent, virq);
> data = irq_domain_get_irq_data(domain, virq);
> - irq_index = HWIRQ_TO_IRQID(data->hwirq);
> - dev_id = HWIRQ_TO_DEVID(data->hwirq);
> + out_irq = (uintptr_t)data->chip_data;
>
> - intr->sci->ops.rm_irq_ops.free_irq(intr->sci, dev_id, irq_index,
> - intr->dst_id, parent_data->hwirq);
> - ti_sci_release_resource(intr->dst_irq, parent_data->hwirq);
> + intr->sci->ops.rm_irq_ops.free_irq(intr->sci,
> + intr->pdev->id, data->hwirq,
> + intr->pdev->id, out_irq);
> + ti_sci_release_resource(intr->out_irqs, out_irq);
> irq_domain_free_irqs_parent(domain, virq, 1);
> irq_domain_reset_irq_data(data);
> }
>
> /**
> - * ti_sci_intr_alloc_gic_irq() - Allocate GIC specific IRQ
> + * ti_sci_intr_alloc_parent_irq() - Allocate parent IRQ
> * @domain: Pointer to the interrupt router IRQ domain
> * @virq: Corresponding Linux virtual IRQ number
> * @hwirq: Corresponding hwirq for the IRQ within this IRQ domain
> *
> - * Returns 0 if all went well else appropriate error pointer.
> + * Returns parent irq if all went well else appropriate error pointer.
> */
> -static int ti_sci_intr_alloc_gic_irq(struct irq_domain *domain,
> - unsigned int virq, u32 hwirq)
> +static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
> + unsigned int virq, u32 hwirq)
> {
> struct ti_sci_intr_irq_domain *intr = domain->host_data;
> + struct device_node *parent_node;
> struct irq_fwspec fwspec;
> - u16 dev_id, irq_index;
> - u16 dst_irq;
> - int err;
> -
> - dev_id = HWIRQ_TO_DEVID(hwirq);
> - irq_index = HWIRQ_TO_IRQID(hwirq);
> + u16 out_irq, p_hwirq;
> + int err = 0;
>
> - dst_irq = ti_sci_get_free_resource(intr->dst_irq);
> - if (dst_irq == TI_SCI_RESOURCE_NULL)
> + out_irq = ti_sci_get_free_resource(intr->out_irqs);
> + if (out_irq == TI_SCI_RESOURCE_NULL)
> return -EINVAL;
>
> - fwspec.fwnode = domain->parent->fwnode;
> - fwspec.param_count = 3;
> - fwspec.param[0] = 0; /* SPI */
> - fwspec.param[1] = dst_irq - 32; /* SPI offset */
> - fwspec.param[2] = intr->type;
> + p_hwirq = ti_sci_intr_xlate_irq(intr, out_irq);
> + if (p_hwirq < 0)
> + goto err_irqs;
> +
> + parent_node = of_irq_find_parent(dev_of_node(&intr->pdev->dev));
> + fwspec.fwnode = of_node_to_fwnode(parent_node);
> + if (of_property_read_u32(parent_node, "#interrupt-cells",
> + &fwspec.param_count))
> + goto err_irqs;
> +
> + if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
> + /* Parent is GIC */
> + fwspec.param[0] = 0; /* SPI */
> + fwspec.param[1] = p_hwirq - 32; /* SPI offset */
> + fwspec.param[2] = intr->type;
So you pick up param_count from the parent node, but:
- you don't check that you have indeed at least 3 cells (unlikely to
fail, but still)
- you leave the rest of the param array uninitialised if param_count
was > 3, which is allowed by the GICv3 binding.
This definitely needs fixing.
> + } else {
> + /* Parent is Interrupt Router */
> + fwspec.param[0] = p_hwirq;
> + }
>
> err = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
> if (err)
> goto err_irqs;
>
> - err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci, dev_id, irq_index,
> - intr->dst_id, dst_irq);
> + err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci,
> + intr->pdev->id, hwirq,
> + intr->pdev->id, out_irq);
> if (err)
> goto err_msg;
>
> - return 0;
> + return p_hwirq;
>
> err_msg:
> irq_domain_free_irqs_parent(domain, virq, 1);
> err_irqs:
> - ti_sci_release_resource(intr->dst_irq, dst_irq);
> + ti_sci_release_resource(intr->out_irqs, out_irq);
> return err;
> }
>
> @@ -168,18 +197,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain,
> struct irq_fwspec *fwspec = data;
> unsigned long hwirq;
> unsigned int flags;
> - int err;
> + int err, p_hwirq;
>
> err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);
> if (err)
> return err;
>
> - err = ti_sci_intr_alloc_gic_irq(domain, virq, hwirq);
> - if (err)
> - return err;
> + p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
> + if (p_hwirq < 0)
> + return p_hwirq;
>
> irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
> - &ti_sci_intr_irq_chip, NULL);
> + &ti_sci_intr_irq_chip,
> + (void *)(uintptr_t)p_hwirq);
>
> return 0;
> }
> @@ -214,6 +244,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
> if (!intr)
> return -ENOMEM;
>
> + intr->pdev = pdev;
> ret = of_property_read_u32(dev_of_node(dev), "ti,intr-trigger-type",
> &intr->type);
> if (ret) {
> @@ -230,19 +261,18 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
> return ret;
> }
>
> - ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
> - &intr->dst_id);
> + ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
> + &pdev->id);
This feels very dodgy. You are hijacking a random field in the
platform device data structure, which shouldn't be any of your
business. What was wrong with having a separate field for something
that is obviously platform specific?
> if (ret) {
> - dev_err(dev, "missing 'ti,sci-dst-id' property\n");
> + dev_err(dev, "missing 'ti,sci-dev-id' property\n");
> return -EINVAL;
> }
>
> - intr->dst_irq = devm_ti_sci_get_of_resource(intr->sci, dev,
> - intr->dst_id,
> - "ti,sci-rm-range-girq");
> - if (IS_ERR(intr->dst_irq)) {
> + intr->out_irqs = devm_ti_sci_get_resource(intr->sci, dev, pdev->id,
> + TI_SCI_RESASG_SUBTYPE_IR_OUTPUT);
> + if (IS_ERR(intr->out_irqs)) {
> dev_err(dev, "Destination irq resource allocation failed\n");
> - return PTR_ERR(intr->dst_irq);
> + return PTR_ERR(intr->out_irqs);
> }
>
> domain = irq_domain_add_hierarchy(parent_domain, 0, 0, dev_of_node(dev),
> @@ -252,6 +282,8 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> + dev_info(dev, "Interrupt Router %d domain created\n", pdev->id);
> +
> return 0;
> }
>
> --
> 2.27.0
>
>
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
@ 2020-07-25 14:06 ` Marc Zyngier
0 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:06 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Sekhar Nori, Tero Kristo, Rob Herring,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
On Fri, 24 Jul 2020 15:18:34 +0100,
Lokesh Vutla <lokeshvutla@ti.com> wrote:
>
> Driver assumes that Interrupt parent to Interrupt router is always GIC.
> This is not true always and an Interrupt Router can be a parent to
> Interrupt Router. Update the driver to detect the parent and request the
> parent irqs accordingly.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
> drivers/irqchip/irq-ti-sci-intr.c | 150 ++++++++++++++++++------------
> 1 file changed, 91 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
> index 59d51a20bbd8..0b73816e77fc 100644
> --- a/drivers/irqchip/irq-ti-sci-intr.c
> +++ b/drivers/irqchip/irq-ti-sci-intr.c
> @@ -17,29 +17,18 @@
> #include <linux/of_irq.h>
> #include <linux/soc/ti/ti_sci_protocol.h>
>
> -#define TI_SCI_DEV_ID_MASK 0xffff
> -#define TI_SCI_DEV_ID_SHIFT 16
> -#define TI_SCI_IRQ_ID_MASK 0xffff
> -#define TI_SCI_IRQ_ID_SHIFT 0
> -#define HWIRQ_TO_DEVID(hwirq) (((hwirq) >> (TI_SCI_DEV_ID_SHIFT)) & \
> - (TI_SCI_DEV_ID_MASK))
> -#define HWIRQ_TO_IRQID(hwirq) ((hwirq) & (TI_SCI_IRQ_ID_MASK))
> -#define TO_HWIRQ(dev, index) ((((dev) & TI_SCI_DEV_ID_MASK) << \
> - TI_SCI_DEV_ID_SHIFT) | \
> - ((index) & TI_SCI_IRQ_ID_MASK))
> -
> /**
> * struct ti_sci_intr_irq_domain - Structure representing a TISCI based
> * Interrupt Router IRQ domain.
> * @sci: Pointer to TISCI handle
> - * @dst_irq: TISCI resource pointer representing GIC irq controller.
> - * @dst_id: TISCI device ID of the GIC irq controller.
> + * @out_irqs: TISCI resource pointer representing INTR irqs.
> + * @pdev: Pointer to platform device.
> * @type: Specifies the trigger type supported by this Interrupt Router
> */
> struct ti_sci_intr_irq_domain {
> const struct ti_sci_handle *sci;
> - struct ti_sci_resource *dst_irq;
> - u32 dst_id;
> + struct ti_sci_resource *out_irqs;
> + struct platform_device *pdev;
> u32 type;
> };
>
> @@ -70,15 +59,44 @@ static int ti_sci_intr_irq_domain_translate(struct irq_domain *domain,
> {
> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>
> - if (fwspec->param_count != 2)
> + if (fwspec->param_count != 1)
> return -EINVAL;
>
> - *hwirq = TO_HWIRQ(fwspec->param[0], fwspec->param[1]);
> + *hwirq = fwspec->param[0];
> *type = intr->type;
>
> return 0;
> }
>
> +/**
> + * ti_sci_intr_xlate_irq() - Translate hwirq to parent's hwirq.
> + * @intr: IRQ domain corresponding to Interrupt Router
> + * @irq: Hardware irq corresponding to the above irq domain
> + *
> + * Return parent irq number if translation is available else -ENOENT.
> + */
> +static int ti_sci_intr_xlate_irq(struct ti_sci_intr_irq_domain *intr, u32 irq)
> +{
> + struct device_node *np = dev_of_node(&intr->pdev->dev);
> + u32 base, pbase, size, len;
> + const __be32 *range;
> +
> + range = of_get_property(np, "ti,interrupt-ranges", &len);
> + if (!range)
> + return irq;
> +
> + for (len /= sizeof(*range); len >= 3; len -= 3) {
> + base = be32_to_cpu(*range++);
> + pbase = be32_to_cpu(*range++);
> + size = be32_to_cpu(*range++);
> +
> + if (base <= irq && irq < base + size)
> + return irq - base + pbase;
> + }
> +
> + return -ENOENT;
> +}
> +
> /**
> * ti_sci_intr_irq_domain_free() - Free the specified IRQs from the domain.
> * @domain: Domain to which the irqs belong
> @@ -89,66 +107,77 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain,
> unsigned int virq, unsigned int nr_irqs)
> {
> struct ti_sci_intr_irq_domain *intr = domain->host_data;
> - struct irq_data *data, *parent_data;
> - u16 dev_id, irq_index;
> + struct irq_data *data;
> + int out_irq;
>
> - parent_data = irq_domain_get_irq_data(domain->parent, virq);
> data = irq_domain_get_irq_data(domain, virq);
> - irq_index = HWIRQ_TO_IRQID(data->hwirq);
> - dev_id = HWIRQ_TO_DEVID(data->hwirq);
> + out_irq = (uintptr_t)data->chip_data;
>
> - intr->sci->ops.rm_irq_ops.free_irq(intr->sci, dev_id, irq_index,
> - intr->dst_id, parent_data->hwirq);
> - ti_sci_release_resource(intr->dst_irq, parent_data->hwirq);
> + intr->sci->ops.rm_irq_ops.free_irq(intr->sci,
> + intr->pdev->id, data->hwirq,
> + intr->pdev->id, out_irq);
> + ti_sci_release_resource(intr->out_irqs, out_irq);
> irq_domain_free_irqs_parent(domain, virq, 1);
> irq_domain_reset_irq_data(data);
> }
>
> /**
> - * ti_sci_intr_alloc_gic_irq() - Allocate GIC specific IRQ
> + * ti_sci_intr_alloc_parent_irq() - Allocate parent IRQ
> * @domain: Pointer to the interrupt router IRQ domain
> * @virq: Corresponding Linux virtual IRQ number
> * @hwirq: Corresponding hwirq for the IRQ within this IRQ domain
> *
> - * Returns 0 if all went well else appropriate error pointer.
> + * Returns parent irq if all went well else appropriate error pointer.
> */
> -static int ti_sci_intr_alloc_gic_irq(struct irq_domain *domain,
> - unsigned int virq, u32 hwirq)
> +static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
> + unsigned int virq, u32 hwirq)
> {
> struct ti_sci_intr_irq_domain *intr = domain->host_data;
> + struct device_node *parent_node;
> struct irq_fwspec fwspec;
> - u16 dev_id, irq_index;
> - u16 dst_irq;
> - int err;
> -
> - dev_id = HWIRQ_TO_DEVID(hwirq);
> - irq_index = HWIRQ_TO_IRQID(hwirq);
> + u16 out_irq, p_hwirq;
> + int err = 0;
>
> - dst_irq = ti_sci_get_free_resource(intr->dst_irq);
> - if (dst_irq == TI_SCI_RESOURCE_NULL)
> + out_irq = ti_sci_get_free_resource(intr->out_irqs);
> + if (out_irq == TI_SCI_RESOURCE_NULL)
> return -EINVAL;
>
> - fwspec.fwnode = domain->parent->fwnode;
> - fwspec.param_count = 3;
> - fwspec.param[0] = 0; /* SPI */
> - fwspec.param[1] = dst_irq - 32; /* SPI offset */
> - fwspec.param[2] = intr->type;
> + p_hwirq = ti_sci_intr_xlate_irq(intr, out_irq);
> + if (p_hwirq < 0)
> + goto err_irqs;
> +
> + parent_node = of_irq_find_parent(dev_of_node(&intr->pdev->dev));
> + fwspec.fwnode = of_node_to_fwnode(parent_node);
> + if (of_property_read_u32(parent_node, "#interrupt-cells",
> + &fwspec.param_count))
> + goto err_irqs;
> +
> + if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
> + /* Parent is GIC */
> + fwspec.param[0] = 0; /* SPI */
> + fwspec.param[1] = p_hwirq - 32; /* SPI offset */
> + fwspec.param[2] = intr->type;
So you pick up param_count from the parent node, but:
- you don't check that you have indeed at least 3 cells (unlikely to
fail, but still)
- you leave the rest of the param array uninitialised if param_count
was > 3, which is allowed by the GICv3 binding.
This definitely needs fixing.
> + } else {
> + /* Parent is Interrupt Router */
> + fwspec.param[0] = p_hwirq;
> + }
>
> err = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
> if (err)
> goto err_irqs;
>
> - err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci, dev_id, irq_index,
> - intr->dst_id, dst_irq);
> + err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci,
> + intr->pdev->id, hwirq,
> + intr->pdev->id, out_irq);
> if (err)
> goto err_msg;
>
> - return 0;
> + return p_hwirq;
>
> err_msg:
> irq_domain_free_irqs_parent(domain, virq, 1);
> err_irqs:
> - ti_sci_release_resource(intr->dst_irq, dst_irq);
> + ti_sci_release_resource(intr->out_irqs, out_irq);
> return err;
> }
>
> @@ -168,18 +197,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain,
> struct irq_fwspec *fwspec = data;
> unsigned long hwirq;
> unsigned int flags;
> - int err;
> + int err, p_hwirq;
>
> err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);
> if (err)
> return err;
>
> - err = ti_sci_intr_alloc_gic_irq(domain, virq, hwirq);
> - if (err)
> - return err;
> + p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
> + if (p_hwirq < 0)
> + return p_hwirq;
>
> irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
> - &ti_sci_intr_irq_chip, NULL);
> + &ti_sci_intr_irq_chip,
> + (void *)(uintptr_t)p_hwirq);
>
> return 0;
> }
> @@ -214,6 +244,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
> if (!intr)
> return -ENOMEM;
>
> + intr->pdev = pdev;
> ret = of_property_read_u32(dev_of_node(dev), "ti,intr-trigger-type",
> &intr->type);
> if (ret) {
> @@ -230,19 +261,18 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
> return ret;
> }
>
> - ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
> - &intr->dst_id);
> + ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
> + &pdev->id);
This feels very dodgy. You are hijacking a random field in the
platform device data structure, which shouldn't be any of your
business. What was wrong with having a separate field for something
that is obviously platform specific?
> if (ret) {
> - dev_err(dev, "missing 'ti,sci-dst-id' property\n");
> + dev_err(dev, "missing 'ti,sci-dev-id' property\n");
> return -EINVAL;
> }
>
> - intr->dst_irq = devm_ti_sci_get_of_resource(intr->sci, dev,
> - intr->dst_id,
> - "ti,sci-rm-range-girq");
> - if (IS_ERR(intr->dst_irq)) {
> + intr->out_irqs = devm_ti_sci_get_resource(intr->sci, dev, pdev->id,
> + TI_SCI_RESASG_SUBTYPE_IR_OUTPUT);
> + if (IS_ERR(intr->out_irqs)) {
> dev_err(dev, "Destination irq resource allocation failed\n");
> - return PTR_ERR(intr->dst_irq);
> + return PTR_ERR(intr->out_irqs);
> }
>
> domain = irq_domain_add_hierarchy(parent_domain, 0, 0, dev_of_node(dev),
> @@ -252,6 +282,8 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> + dev_info(dev, "Interrupt Router %d domain created\n", pdev->id);
> +
> return 0;
> }
>
> --
> 2.27.0
>
>
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
2020-07-25 14:06 ` Marc Zyngier
@ 2020-07-25 14:37 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-25 14:37 UTC (permalink / raw)
To: Marc Zyngier
Cc: Rob Herring, Thomas Gleixner, Nishanth Menon, Tero Kristo,
Santosh Shilimkar, Linux ARM Mailing List, Sekhar Nori,
Grygorii Strashko, Peter Ujfalusi, Device Tree Mailing List,
Suman Anna
On 25/07/20 7:36 pm, Marc Zyngier wrote:
> On Fri, 24 Jul 2020 15:18:34 +0100,
> Lokesh Vutla <lokeshvutla@ti.com> wrote:
>>
>> Driver assumes that Interrupt parent to Interrupt router is always GIC.
>> This is not true always and an Interrupt Router can be a parent to
>> Interrupt Router. Update the driver to detect the parent and request the
>> parent irqs accordingly.
>>
>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>> ---
>> drivers/irqchip/irq-ti-sci-intr.c | 150 ++++++++++++++++++------------
>> 1 file changed, 91 insertions(+), 59 deletions(-)
>>
>> diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
>> index 59d51a20bbd8..0b73816e77fc 100644
>> --- a/drivers/irqchip/irq-ti-sci-intr.c
>> +++ b/drivers/irqchip/irq-ti-sci-intr.c
>> @@ -17,29 +17,18 @@
>> #include <linux/of_irq.h>
>> #include <linux/soc/ti/ti_sci_protocol.h>
>>
>> -#define TI_SCI_DEV_ID_MASK 0xffff
>> -#define TI_SCI_DEV_ID_SHIFT 16
>> -#define TI_SCI_IRQ_ID_MASK 0xffff
>> -#define TI_SCI_IRQ_ID_SHIFT 0
>> -#define HWIRQ_TO_DEVID(hwirq) (((hwirq) >> (TI_SCI_DEV_ID_SHIFT)) & \
>> - (TI_SCI_DEV_ID_MASK))
>> -#define HWIRQ_TO_IRQID(hwirq) ((hwirq) & (TI_SCI_IRQ_ID_MASK))
>> -#define TO_HWIRQ(dev, index) ((((dev) & TI_SCI_DEV_ID_MASK) << \
>> - TI_SCI_DEV_ID_SHIFT) | \
>> - ((index) & TI_SCI_IRQ_ID_MASK))
>> -
>> /**
>> * struct ti_sci_intr_irq_domain - Structure representing a TISCI based
>> * Interrupt Router IRQ domain.
>> * @sci: Pointer to TISCI handle
>> - * @dst_irq: TISCI resource pointer representing GIC irq controller.
>> - * @dst_id: TISCI device ID of the GIC irq controller.
>> + * @out_irqs: TISCI resource pointer representing INTR irqs.
>> + * @pdev: Pointer to platform device.
>> * @type: Specifies the trigger type supported by this Interrupt Router
>> */
>> struct ti_sci_intr_irq_domain {
>> const struct ti_sci_handle *sci;
>> - struct ti_sci_resource *dst_irq;
>> - u32 dst_id;
>> + struct ti_sci_resource *out_irqs;
>> + struct platform_device *pdev;
>> u32 type;
>> };
>>
>> @@ -70,15 +59,44 @@ static int ti_sci_intr_irq_domain_translate(struct irq_domain *domain,
>> {
>> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>>
>> - if (fwspec->param_count != 2)
>> + if (fwspec->param_count != 1)
>> return -EINVAL;
>>
>> - *hwirq = TO_HWIRQ(fwspec->param[0], fwspec->param[1]);
>> + *hwirq = fwspec->param[0];
>> *type = intr->type;
>>
>> return 0;
>> }
>>
>> +/**
>> + * ti_sci_intr_xlate_irq() - Translate hwirq to parent's hwirq.
>> + * @intr: IRQ domain corresponding to Interrupt Router
>> + * @irq: Hardware irq corresponding to the above irq domain
>> + *
>> + * Return parent irq number if translation is available else -ENOENT.
>> + */
>> +static int ti_sci_intr_xlate_irq(struct ti_sci_intr_irq_domain *intr, u32 irq)
>> +{
>> + struct device_node *np = dev_of_node(&intr->pdev->dev);
>> + u32 base, pbase, size, len;
>> + const __be32 *range;
>> +
>> + range = of_get_property(np, "ti,interrupt-ranges", &len);
>> + if (!range)
>> + return irq;
>> +
>> + for (len /= sizeof(*range); len >= 3; len -= 3) {
>> + base = be32_to_cpu(*range++);
>> + pbase = be32_to_cpu(*range++);
>> + size = be32_to_cpu(*range++);
>> +
>> + if (base <= irq && irq < base + size)
>> + return irq - base + pbase;
>> + }
>> +
>> + return -ENOENT;
>> +}
>> +
>> /**
>> * ti_sci_intr_irq_domain_free() - Free the specified IRQs from the domain.
>> * @domain: Domain to which the irqs belong
>> @@ -89,66 +107,77 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain,
>> unsigned int virq, unsigned int nr_irqs)
>> {
>> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>> - struct irq_data *data, *parent_data;
>> - u16 dev_id, irq_index;
>> + struct irq_data *data;
>> + int out_irq;
>>
>> - parent_data = irq_domain_get_irq_data(domain->parent, virq);
>> data = irq_domain_get_irq_data(domain, virq);
>> - irq_index = HWIRQ_TO_IRQID(data->hwirq);
>> - dev_id = HWIRQ_TO_DEVID(data->hwirq);
>> + out_irq = (uintptr_t)data->chip_data;
>>
>> - intr->sci->ops.rm_irq_ops.free_irq(intr->sci, dev_id, irq_index,
>> - intr->dst_id, parent_data->hwirq);
>> - ti_sci_release_resource(intr->dst_irq, parent_data->hwirq);
>> + intr->sci->ops.rm_irq_ops.free_irq(intr->sci,
>> + intr->pdev->id, data->hwirq,
>> + intr->pdev->id, out_irq);
>> + ti_sci_release_resource(intr->out_irqs, out_irq);
>> irq_domain_free_irqs_parent(domain, virq, 1);
>> irq_domain_reset_irq_data(data);
>> }
>>
>> /**
>> - * ti_sci_intr_alloc_gic_irq() - Allocate GIC specific IRQ
>> + * ti_sci_intr_alloc_parent_irq() - Allocate parent IRQ
>> * @domain: Pointer to the interrupt router IRQ domain
>> * @virq: Corresponding Linux virtual IRQ number
>> * @hwirq: Corresponding hwirq for the IRQ within this IRQ domain
>> *
>> - * Returns 0 if all went well else appropriate error pointer.
>> + * Returns parent irq if all went well else appropriate error pointer.
>> */
>> -static int ti_sci_intr_alloc_gic_irq(struct irq_domain *domain,
>> - unsigned int virq, u32 hwirq)
>> +static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
>> + unsigned int virq, u32 hwirq)
>> {
>> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>> + struct device_node *parent_node;
>> struct irq_fwspec fwspec;
>> - u16 dev_id, irq_index;
>> - u16 dst_irq;
>> - int err;
>> -
>> - dev_id = HWIRQ_TO_DEVID(hwirq);
>> - irq_index = HWIRQ_TO_IRQID(hwirq);
>> + u16 out_irq, p_hwirq;
>> + int err = 0;
>>
>> - dst_irq = ti_sci_get_free_resource(intr->dst_irq);
>> - if (dst_irq == TI_SCI_RESOURCE_NULL)
>> + out_irq = ti_sci_get_free_resource(intr->out_irqs);
>> + if (out_irq == TI_SCI_RESOURCE_NULL)
>> return -EINVAL;
>>
>> - fwspec.fwnode = domain->parent->fwnode;
>> - fwspec.param_count = 3;
>> - fwspec.param[0] = 0; /* SPI */
>> - fwspec.param[1] = dst_irq - 32; /* SPI offset */
>> - fwspec.param[2] = intr->type;
>> + p_hwirq = ti_sci_intr_xlate_irq(intr, out_irq);
>> + if (p_hwirq < 0)
>> + goto err_irqs;
>> +
>> + parent_node = of_irq_find_parent(dev_of_node(&intr->pdev->dev));
>> + fwspec.fwnode = of_node_to_fwnode(parent_node);
>> + if (of_property_read_u32(parent_node, "#interrupt-cells",
>> + &fwspec.param_count))
>> + goto err_irqs;
>> +
>> + if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
>> + /* Parent is GIC */
>> + fwspec.param[0] = 0; /* SPI */
>> + fwspec.param[1] = p_hwirq - 32; /* SPI offset */
>> + fwspec.param[2] = intr->type;
>
> So you pick up param_count from the parent node, but:
> - you don't check that you have indeed at least 3 cells (unlikely to
> fail, but still)
> - you leave the rest of the param array uninitialised if param_count
> was > 3, which is allowed by the GICv3 binding.
>
> This definitely needs fixing.
Initially I was using count for determining the parent, which was wrong then I
moved to compatible and kept the param_count from parent as is. I could just
assign fwspec.count = 3 directly here. WIll fix in v4.
>
>> + } else {
>> + /* Parent is Interrupt Router */
>> + fwspec.param[0] = p_hwirq;
and count = 1 here.
>> + }
>>
>> err = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
>> if (err)
>> goto err_irqs;
>>
>> - err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci, dev_id, irq_index,
>> - intr->dst_id, dst_irq);
>> + err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci,
>> + intr->pdev->id, hwirq,
>> + intr->pdev->id, out_irq);
>> if (err)
>> goto err_msg;
>>
>> - return 0;
>> + return p_hwirq;
>>
>> err_msg:
>> irq_domain_free_irqs_parent(domain, virq, 1);
>> err_irqs:
>> - ti_sci_release_resource(intr->dst_irq, dst_irq);
>> + ti_sci_release_resource(intr->out_irqs, out_irq);
>> return err;
>> }
>>
>> @@ -168,18 +197,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain,
>> struct irq_fwspec *fwspec = data;
>> unsigned long hwirq;
>> unsigned int flags;
>> - int err;
>> + int err, p_hwirq;
>>
>> err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);
>> if (err)
>> return err;
>>
>> - err = ti_sci_intr_alloc_gic_irq(domain, virq, hwirq);
>> - if (err)
>> - return err;
>> + p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
>> + if (p_hwirq < 0)
>> + return p_hwirq;
>>
>> irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
>> - &ti_sci_intr_irq_chip, NULL);
>> + &ti_sci_intr_irq_chip,
>> + (void *)(uintptr_t)p_hwirq);
>>
>> return 0;
>> }
>> @@ -214,6 +244,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
>> if (!intr)
>> return -ENOMEM;
>>
>> + intr->pdev = pdev;
>> ret = of_property_read_u32(dev_of_node(dev), "ti,intr-trigger-type",
>> &intr->type);
>> if (ret) {
>> @@ -230,19 +261,18 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
>> return ret;
>> }
>>
>> - ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
>> - &intr->dst_id);
>> + ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
>> + &pdev->id);
>
> This feels very dodgy. You are hijacking a random field in the
> platform device data structure, which shouldn't be any of your
pdev->id is pretty much unused field today. I was kind of hoping that in future
it can be utilized to populated field with TISCI device IDs in some generic
manner. So thought of using it now.
> business. What was wrong with having a separate field for something
> that is obviously platform specific?
No reason. I could just add a new filed in the intr structure.
Thanks and regards,
Lokesh
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
@ 2020-07-25 14:37 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-25 14:37 UTC (permalink / raw)
To: Marc Zyngier
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Sekhar Nori, Tero Kristo, Rob Herring,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
On 25/07/20 7:36 pm, Marc Zyngier wrote:
> On Fri, 24 Jul 2020 15:18:34 +0100,
> Lokesh Vutla <lokeshvutla@ti.com> wrote:
>>
>> Driver assumes that Interrupt parent to Interrupt router is always GIC.
>> This is not true always and an Interrupt Router can be a parent to
>> Interrupt Router. Update the driver to detect the parent and request the
>> parent irqs accordingly.
>>
>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>> ---
>> drivers/irqchip/irq-ti-sci-intr.c | 150 ++++++++++++++++++------------
>> 1 file changed, 91 insertions(+), 59 deletions(-)
>>
>> diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
>> index 59d51a20bbd8..0b73816e77fc 100644
>> --- a/drivers/irqchip/irq-ti-sci-intr.c
>> +++ b/drivers/irqchip/irq-ti-sci-intr.c
>> @@ -17,29 +17,18 @@
>> #include <linux/of_irq.h>
>> #include <linux/soc/ti/ti_sci_protocol.h>
>>
>> -#define TI_SCI_DEV_ID_MASK 0xffff
>> -#define TI_SCI_DEV_ID_SHIFT 16
>> -#define TI_SCI_IRQ_ID_MASK 0xffff
>> -#define TI_SCI_IRQ_ID_SHIFT 0
>> -#define HWIRQ_TO_DEVID(hwirq) (((hwirq) >> (TI_SCI_DEV_ID_SHIFT)) & \
>> - (TI_SCI_DEV_ID_MASK))
>> -#define HWIRQ_TO_IRQID(hwirq) ((hwirq) & (TI_SCI_IRQ_ID_MASK))
>> -#define TO_HWIRQ(dev, index) ((((dev) & TI_SCI_DEV_ID_MASK) << \
>> - TI_SCI_DEV_ID_SHIFT) | \
>> - ((index) & TI_SCI_IRQ_ID_MASK))
>> -
>> /**
>> * struct ti_sci_intr_irq_domain - Structure representing a TISCI based
>> * Interrupt Router IRQ domain.
>> * @sci: Pointer to TISCI handle
>> - * @dst_irq: TISCI resource pointer representing GIC irq controller.
>> - * @dst_id: TISCI device ID of the GIC irq controller.
>> + * @out_irqs: TISCI resource pointer representing INTR irqs.
>> + * @pdev: Pointer to platform device.
>> * @type: Specifies the trigger type supported by this Interrupt Router
>> */
>> struct ti_sci_intr_irq_domain {
>> const struct ti_sci_handle *sci;
>> - struct ti_sci_resource *dst_irq;
>> - u32 dst_id;
>> + struct ti_sci_resource *out_irqs;
>> + struct platform_device *pdev;
>> u32 type;
>> };
>>
>> @@ -70,15 +59,44 @@ static int ti_sci_intr_irq_domain_translate(struct irq_domain *domain,
>> {
>> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>>
>> - if (fwspec->param_count != 2)
>> + if (fwspec->param_count != 1)
>> return -EINVAL;
>>
>> - *hwirq = TO_HWIRQ(fwspec->param[0], fwspec->param[1]);
>> + *hwirq = fwspec->param[0];
>> *type = intr->type;
>>
>> return 0;
>> }
>>
>> +/**
>> + * ti_sci_intr_xlate_irq() - Translate hwirq to parent's hwirq.
>> + * @intr: IRQ domain corresponding to Interrupt Router
>> + * @irq: Hardware irq corresponding to the above irq domain
>> + *
>> + * Return parent irq number if translation is available else -ENOENT.
>> + */
>> +static int ti_sci_intr_xlate_irq(struct ti_sci_intr_irq_domain *intr, u32 irq)
>> +{
>> + struct device_node *np = dev_of_node(&intr->pdev->dev);
>> + u32 base, pbase, size, len;
>> + const __be32 *range;
>> +
>> + range = of_get_property(np, "ti,interrupt-ranges", &len);
>> + if (!range)
>> + return irq;
>> +
>> + for (len /= sizeof(*range); len >= 3; len -= 3) {
>> + base = be32_to_cpu(*range++);
>> + pbase = be32_to_cpu(*range++);
>> + size = be32_to_cpu(*range++);
>> +
>> + if (base <= irq && irq < base + size)
>> + return irq - base + pbase;
>> + }
>> +
>> + return -ENOENT;
>> +}
>> +
>> /**
>> * ti_sci_intr_irq_domain_free() - Free the specified IRQs from the domain.
>> * @domain: Domain to which the irqs belong
>> @@ -89,66 +107,77 @@ static void ti_sci_intr_irq_domain_free(struct irq_domain *domain,
>> unsigned int virq, unsigned int nr_irqs)
>> {
>> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>> - struct irq_data *data, *parent_data;
>> - u16 dev_id, irq_index;
>> + struct irq_data *data;
>> + int out_irq;
>>
>> - parent_data = irq_domain_get_irq_data(domain->parent, virq);
>> data = irq_domain_get_irq_data(domain, virq);
>> - irq_index = HWIRQ_TO_IRQID(data->hwirq);
>> - dev_id = HWIRQ_TO_DEVID(data->hwirq);
>> + out_irq = (uintptr_t)data->chip_data;
>>
>> - intr->sci->ops.rm_irq_ops.free_irq(intr->sci, dev_id, irq_index,
>> - intr->dst_id, parent_data->hwirq);
>> - ti_sci_release_resource(intr->dst_irq, parent_data->hwirq);
>> + intr->sci->ops.rm_irq_ops.free_irq(intr->sci,
>> + intr->pdev->id, data->hwirq,
>> + intr->pdev->id, out_irq);
>> + ti_sci_release_resource(intr->out_irqs, out_irq);
>> irq_domain_free_irqs_parent(domain, virq, 1);
>> irq_domain_reset_irq_data(data);
>> }
>>
>> /**
>> - * ti_sci_intr_alloc_gic_irq() - Allocate GIC specific IRQ
>> + * ti_sci_intr_alloc_parent_irq() - Allocate parent IRQ
>> * @domain: Pointer to the interrupt router IRQ domain
>> * @virq: Corresponding Linux virtual IRQ number
>> * @hwirq: Corresponding hwirq for the IRQ within this IRQ domain
>> *
>> - * Returns 0 if all went well else appropriate error pointer.
>> + * Returns parent irq if all went well else appropriate error pointer.
>> */
>> -static int ti_sci_intr_alloc_gic_irq(struct irq_domain *domain,
>> - unsigned int virq, u32 hwirq)
>> +static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain,
>> + unsigned int virq, u32 hwirq)
>> {
>> struct ti_sci_intr_irq_domain *intr = domain->host_data;
>> + struct device_node *parent_node;
>> struct irq_fwspec fwspec;
>> - u16 dev_id, irq_index;
>> - u16 dst_irq;
>> - int err;
>> -
>> - dev_id = HWIRQ_TO_DEVID(hwirq);
>> - irq_index = HWIRQ_TO_IRQID(hwirq);
>> + u16 out_irq, p_hwirq;
>> + int err = 0;
>>
>> - dst_irq = ti_sci_get_free_resource(intr->dst_irq);
>> - if (dst_irq == TI_SCI_RESOURCE_NULL)
>> + out_irq = ti_sci_get_free_resource(intr->out_irqs);
>> + if (out_irq == TI_SCI_RESOURCE_NULL)
>> return -EINVAL;
>>
>> - fwspec.fwnode = domain->parent->fwnode;
>> - fwspec.param_count = 3;
>> - fwspec.param[0] = 0; /* SPI */
>> - fwspec.param[1] = dst_irq - 32; /* SPI offset */
>> - fwspec.param[2] = intr->type;
>> + p_hwirq = ti_sci_intr_xlate_irq(intr, out_irq);
>> + if (p_hwirq < 0)
>> + goto err_irqs;
>> +
>> + parent_node = of_irq_find_parent(dev_of_node(&intr->pdev->dev));
>> + fwspec.fwnode = of_node_to_fwnode(parent_node);
>> + if (of_property_read_u32(parent_node, "#interrupt-cells",
>> + &fwspec.param_count))
>> + goto err_irqs;
>> +
>> + if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
>> + /* Parent is GIC */
>> + fwspec.param[0] = 0; /* SPI */
>> + fwspec.param[1] = p_hwirq - 32; /* SPI offset */
>> + fwspec.param[2] = intr->type;
>
> So you pick up param_count from the parent node, but:
> - you don't check that you have indeed at least 3 cells (unlikely to
> fail, but still)
> - you leave the rest of the param array uninitialised if param_count
> was > 3, which is allowed by the GICv3 binding.
>
> This definitely needs fixing.
Initially I was using count for determining the parent, which was wrong then I
moved to compatible and kept the param_count from parent as is. I could just
assign fwspec.count = 3 directly here. WIll fix in v4.
>
>> + } else {
>> + /* Parent is Interrupt Router */
>> + fwspec.param[0] = p_hwirq;
and count = 1 here.
>> + }
>>
>> err = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
>> if (err)
>> goto err_irqs;
>>
>> - err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci, dev_id, irq_index,
>> - intr->dst_id, dst_irq);
>> + err = intr->sci->ops.rm_irq_ops.set_irq(intr->sci,
>> + intr->pdev->id, hwirq,
>> + intr->pdev->id, out_irq);
>> if (err)
>> goto err_msg;
>>
>> - return 0;
>> + return p_hwirq;
>>
>> err_msg:
>> irq_domain_free_irqs_parent(domain, virq, 1);
>> err_irqs:
>> - ti_sci_release_resource(intr->dst_irq, dst_irq);
>> + ti_sci_release_resource(intr->out_irqs, out_irq);
>> return err;
>> }
>>
>> @@ -168,18 +197,19 @@ static int ti_sci_intr_irq_domain_alloc(struct irq_domain *domain,
>> struct irq_fwspec *fwspec = data;
>> unsigned long hwirq;
>> unsigned int flags;
>> - int err;
>> + int err, p_hwirq;
>>
>> err = ti_sci_intr_irq_domain_translate(domain, fwspec, &hwirq, &flags);
>> if (err)
>> return err;
>>
>> - err = ti_sci_intr_alloc_gic_irq(domain, virq, hwirq);
>> - if (err)
>> - return err;
>> + p_hwirq = ti_sci_intr_alloc_parent_irq(domain, virq, hwirq);
>> + if (p_hwirq < 0)
>> + return p_hwirq;
>>
>> irq_domain_set_hwirq_and_chip(domain, virq, hwirq,
>> - &ti_sci_intr_irq_chip, NULL);
>> + &ti_sci_intr_irq_chip,
>> + (void *)(uintptr_t)p_hwirq);
>>
>> return 0;
>> }
>> @@ -214,6 +244,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
>> if (!intr)
>> return -ENOMEM;
>>
>> + intr->pdev = pdev;
>> ret = of_property_read_u32(dev_of_node(dev), "ti,intr-trigger-type",
>> &intr->type);
>> if (ret) {
>> @@ -230,19 +261,18 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
>> return ret;
>> }
>>
>> - ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
>> - &intr->dst_id);
>> + ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
>> + &pdev->id);
>
> This feels very dodgy. You are hijacking a random field in the
> platform device data structure, which shouldn't be any of your
pdev->id is pretty much unused field today. I was kind of hoping that in future
it can be utilized to populated field with TISCI device IDs in some generic
manner. So thought of using it now.
> business. What was wrong with having a separate field for something
> that is obviously platform specific?
No reason. I could just add a new filed in the intr structure.
Thanks and regards,
Lokesh
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
2020-07-25 14:37 ` Lokesh Vutla
@ 2020-07-25 14:42 ` Marc Zyngier
-1 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:42 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Rob Herring, Thomas Gleixner, Nishanth Menon, Tero Kristo,
Santosh Shilimkar, Linux ARM Mailing List, Sekhar Nori,
Grygorii Strashko, Peter Ujfalusi, Device Tree Mailing List,
Suman Anna
On 2020-07-25 15:37, Lokesh Vutla wrote:
> On 25/07/20 7:36 pm, Marc Zyngier wrote:
>> On Fri, 24 Jul 2020 15:18:34 +0100,
>> Lokesh Vutla <lokeshvutla@ti.com> wrote:
>>>
>>> Driver assumes that Interrupt parent to Interrupt router is always
>>> GIC.
>>> This is not true always and an Interrupt Router can be a parent to
>>> Interrupt Router. Update the driver to detect the parent and request
>>> the
>>> parent irqs accordingly.
>>>
>>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>>> ---
>>> drivers/irqchip/irq-ti-sci-intr.c | 150
>>> ++++++++++++++++++------------
>>> 1 file changed, 91 insertions(+), 59 deletions(-)
>>>
>>> diff --git a/drivers/irqchip/irq-ti-sci-intr.c
>>> b/drivers/irqchip/irq-ti-sci-intr.c
>>> index 59d51a20bbd8..0b73816e77fc 100644
>>> --- a/drivers/irqchip/irq-ti-sci-intr.c
>>> +++ b/drivers/irqchip/irq-ti-sci-intr.c
[...]
>>> - ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
>>> - &intr->dst_id);
>>> + ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
>>> + &pdev->id);
>>
>> This feels very dodgy. You are hijacking a random field in the
>> platform device data structure, which shouldn't be any of your
>
> pdev->id is pretty much unused field today. I was kind of hoping that
> in future
> it can be utilized to populated field with TISCI device IDs in some
> generic
> manner. So thought of using it now.
It isn't unused. DT doesn't make active use of it for now, not that's
not
something you can rely on.
>> business. What was wrong with having a separate field for something
>> that is obviously platform specific?
>
> No reason. I could just add a new filed in the intr structure.
Please do.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v3 6/9] irqchip/ti-sci-intr: Add support for INTR being a parent to INTR
@ 2020-07-25 14:42 ` Marc Zyngier
0 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:42 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Sekhar Nori, Tero Kristo, Rob Herring,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
On 2020-07-25 15:37, Lokesh Vutla wrote:
> On 25/07/20 7:36 pm, Marc Zyngier wrote:
>> On Fri, 24 Jul 2020 15:18:34 +0100,
>> Lokesh Vutla <lokeshvutla@ti.com> wrote:
>>>
>>> Driver assumes that Interrupt parent to Interrupt router is always
>>> GIC.
>>> This is not true always and an Interrupt Router can be a parent to
>>> Interrupt Router. Update the driver to detect the parent and request
>>> the
>>> parent irqs accordingly.
>>>
>>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>>> ---
>>> drivers/irqchip/irq-ti-sci-intr.c | 150
>>> ++++++++++++++++++------------
>>> 1 file changed, 91 insertions(+), 59 deletions(-)
>>>
>>> diff --git a/drivers/irqchip/irq-ti-sci-intr.c
>>> b/drivers/irqchip/irq-ti-sci-intr.c
>>> index 59d51a20bbd8..0b73816e77fc 100644
>>> --- a/drivers/irqchip/irq-ti-sci-intr.c
>>> +++ b/drivers/irqchip/irq-ti-sci-intr.c
[...]
>>> - ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dst-id",
>>> - &intr->dst_id);
>>> + ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
>>> + &pdev->id);
>>
>> This feels very dodgy. You are hijacking a random field in the
>> platform device data structure, which shouldn't be any of your
>
> pdev->id is pretty much unused field today. I was kind of hoping that
> in future
> it can be utilized to populated field with TISCI device IDs in some
> generic
> manner. So thought of using it now.
It isn't unused. DT doesn't make active use of it for now, not that's
not
something you can rely on.
>> business. What was wrong with having a separate field for something
>> that is obviously platform specific?
>
> No reason. I could just add a new filed in the intr structure.
Please do.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v3 7/9] dt-bindings: irqchip: ti,sci-inta: Update docs to support different parent.
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
Drop the firmware related interrupt ranges and use the hardware specified
interrupt numbers within Interrupt Aggregator. This ensures interrupt
aggregator DT node need not assume any interrupt parent type.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-inta.txt | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
index 7841cb099e13..b14abec580a2 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
@@ -43,13 +43,14 @@ TISCI Interrupt Aggregator Node:
- msi-controller: Identifies the node as an MSI controller.
- interrupt-parent: phandle of irq parent.
- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dev-id: TISCI device ID of the Interrupt Aggregator.
-- ti,sci-rm-range-vint: Array of TISCI subtype ids representing vints(inta
- outputs) range within this INTA, assigned to the
- requesting host context.
-- ti,sci-rm-range-global-event: Array of TISCI subtype ids representing the
- global events range reaching this IA and are assigned
- to the requesting host context.
+- ti,sci-dev-id: TISCI device id of interrupt controller.
+- ti,interrupt-ranges: Set of triplets containing ranges that convert
+ the INTA output interrupt numbers to parent's
+ interrupt number. Each triplet has following entries:
+ - First entry specifies the base for vint
+ - Second entry specifies the base for parent irqs
+ - Third entry specifies the limit
+
Example:
--------
@@ -61,6 +62,5 @@ main_udmass_inta: interrupt-controller@33d00000 {
interrupt-parent = <&main_navss_intr>;
ti,sci = <&dmsc>;
ti,sci-dev-id = <179>;
- ti,sci-rm-range-vint = <0x0>;
- ti,sci-rm-range-global-event = <0x1>;
+ interrupt-ranges = <0 0 256>;
};
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 7/9] dt-bindings: irqchip: ti, sci-inta: Update docs to support different parent.
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
Drop the firmware related interrupt ranges and use the hardware specified
interrupt numbers within Interrupt Aggregator. This ensures interrupt
aggregator DT node need not assume any interrupt parent type.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-inta.txt | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
index 7841cb099e13..b14abec580a2 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
@@ -43,13 +43,14 @@ TISCI Interrupt Aggregator Node:
- msi-controller: Identifies the node as an MSI controller.
- interrupt-parent: phandle of irq parent.
- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dev-id: TISCI device ID of the Interrupt Aggregator.
-- ti,sci-rm-range-vint: Array of TISCI subtype ids representing vints(inta
- outputs) range within this INTA, assigned to the
- requesting host context.
-- ti,sci-rm-range-global-event: Array of TISCI subtype ids representing the
- global events range reaching this IA and are assigned
- to the requesting host context.
+- ti,sci-dev-id: TISCI device id of interrupt controller.
+- ti,interrupt-ranges: Set of triplets containing ranges that convert
+ the INTA output interrupt numbers to parent's
+ interrupt number. Each triplet has following entries:
+ - First entry specifies the base for vint
+ - Second entry specifies the base for parent irqs
+ - Third entry specifies the limit
+
Example:
--------
@@ -61,6 +62,5 @@ main_udmass_inta: interrupt-controller@33d00000 {
interrupt-parent = <&main_navss_intr>;
ti,sci = <&dmsc>;
ti,sci-dev-id = <179>;
- ti,sci-rm-range-vint = <0x0>;
- ti,sci-rm-range-global-event = <0x1>;
+ interrupt-ranges = <0 0 256>;
};
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 8/9] dt-bindings: irqchip: Convert ti,sci-inta bindings to yaml
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
In order to automate the verification of DT nodes convert
ti,sci-inta.txt ti,sci-inta.yaml.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-inta.txt | 66 -------------
.../interrupt-controller/ti,sci-inta.yaml | 98 +++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 99 insertions(+), 67 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
deleted file mode 100644
index b14abec580a2..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Texas Instruments K3 Interrupt Aggregator
-=========================================
-
-The Interrupt Aggregator (INTA) provides a centralized machine
-which handles the termination of system events to that they can
-be coherently processed by the host(s) in the system. A maximum
-of 64 events can be mapped to a single interrupt.
-
-
- Interrupt Aggregator
- +-----------------------------------------+
- | Intmap VINT |
- | +--------------+ +------------+ |
- m ------>| | vint | bit | | 0 |.....|63| vint0 |
- . | +--------------+ +------------+ | +------+
- . | . . | | HOST |
-Globalevents ------>| . . |------>| IRQ |
- . | . . | | CTRL |
- . | . . | +------+
- n ------>| +--------------+ +------------+ |
- | | vint | bit | | 0 |.....|63| vintx |
- | +--------------+ +------------+ |
- | |
- +-----------------------------------------+
-
-Configuration of these Intmap registers that maps global events to vint is done
-by a system controller (like the Device Memory and Security Controller on K3
-AM654 SoC). Driver should request the system controller to get the range
-of global events and vints assigned to the requesting host. Management
-of these requested resources should be handled by driver and requests
-system controller to map specific global event to vint, bit pair.
-
-Communication between the host processor running an OS and the system
-controller happens through a protocol called TI System Control Interface
-(TISCI protocol). For more details refer:
-Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
-
-TISCI Interrupt Aggregator Node:
--------------------------------
-- compatible: Must be "ti,sci-inta".
-- reg: Should contain registers location and length.
-- interrupt-controller: Identifies the node as an interrupt controller
-- msi-controller: Identifies the node as an MSI controller.
-- interrupt-parent: phandle of irq parent.
-- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dev-id: TISCI device id of interrupt controller.
-- ti,interrupt-ranges: Set of triplets containing ranges that convert
- the INTA output interrupt numbers to parent's
- interrupt number. Each triplet has following entries:
- - First entry specifies the base for vint
- - Second entry specifies the base for parent irqs
- - Third entry specifies the limit
-
-
-Example:
---------
-main_udmass_inta: interrupt-controller@33d00000 {
- compatible = "ti,sci-inta";
- reg = <0x0 0x33d00000 0x0 0x100000>;
- interrupt-controller;
- msi-controller;
- interrupt-parent = <&main_navss_intr>;
- ti,sci = <&dmsc>;
- ti,sci-dev-id = <179>;
- interrupt-ranges = <0 0 256>;
-};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
new file mode 100644
index 000000000000..ea9da698f008
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
@@ -0,0 +1,98 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/ti,sci-inta.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments K3 Interrupt Aggregator
+
+maintainers:
+ - Lokesh Vutla <lokeshvutla@ti.com>
+
+allOf:
+ - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+
+description: |
+ The Interrupt Aggregator (INTA) provides a centralized machine
+ which handles the termination of system events to that they can
+ be coherently processed by the host(s) in the system. A maximum
+ of 64 events can be mapped to a single interrupt.
+
+ Interrupt Aggregator
+ +-----------------------------------------+
+ | Intmap VINT |
+ | +--------------+ +------------+ |
+ m ------>| | vint | bit | | 0 |.....|63| vint0 |
+ . | +--------------+ +------------+ | +------+
+ . | . . | | HOST |
+ Globalevents ------>| . . |----->| IRQ |
+ . | . . | | CTRL |
+ . | . . | +------+
+ n ------>| +--------------+ +------------+ |
+ | | vint | bit | | 0 |.....|63| vintx |
+ | +--------------+ +------------+ |
+ | |
+ +-----------------------------------------+
+
+ Configuration of these Intmap registers that maps global events to vint is
+ done by a system controller (like the Device Memory and Security Controller
+ on AM654 SoC). Driver should request the system controller to get the range
+ of global events and vints assigned to the requesting host. Management
+ of these requested resources should be handled by driver and requests
+ system controller to map specific global event to vint, bit pair.
+
+ Communication between the host processor running an OS and the system
+ controller happens through a protocol called TI System Control Interface
+ (TISCI protocol).
+
+properties:
+ compatible:
+ const: ti,sci-inta
+
+ reg:
+ maxItems: 1
+
+ interrupt-controller: true
+
+ msi-controller: true
+
+ ti,interrupt-ranges:
+ $ref: /schemas/types.yaml#/definitions/uint32-matrix
+ description: |
+ Interrupt ranges that converts the INTR output hw irq numbers
+ to parents's input interrupt numbers.
+ - items:
+ items:
+ - description: |
+ "output_irq" specifies the base for inta output irq
+ - description: |
+ "parent's input irq" specifies the base for parent irq
+ - description: |
+ "limit" specifies the limit for translation
+
+required:
+ - compatible
+ - reg
+ - interrupt-controller
+ - msi-controller
+ - ti,sci
+ - ti,sci-dev-id
+ - ti,interrupt-ranges
+
+examples:
+ - |
+ bus {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ main_udmass_inta: msi-controller@33d00000 {
+ compatible = "ti,sci-inta";
+ reg = <0x0 0x33d00000 0x0 0x100000>;
+ interrupt-controller;
+ msi-controller;
+ interrupt-parent = <&main_navss_intr>;
+ ti,sci = <&dmsc>;
+ ti,sci-dev-id = <179>;
+ ti,interrupt-ranges = <0 0 256>;
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 28a8eba81d2b..53dd64376949 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16907,7 +16907,7 @@ S: Maintained
F: Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
F: Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt
-F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
+F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
F: Documentation/devicetree/bindings/reset/ti,sci-reset.txt
F: Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 8/9] dt-bindings: irqchip: Convert ti, sci-inta bindings to yaml
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
In order to automate the verification of DT nodes convert
ti,sci-inta.txt ti,sci-inta.yaml.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
.../interrupt-controller/ti,sci-inta.txt | 66 -------------
.../interrupt-controller/ti,sci-inta.yaml | 98 +++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 99 insertions(+), 67 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
deleted file mode 100644
index b14abec580a2..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Texas Instruments K3 Interrupt Aggregator
-=========================================
-
-The Interrupt Aggregator (INTA) provides a centralized machine
-which handles the termination of system events to that they can
-be coherently processed by the host(s) in the system. A maximum
-of 64 events can be mapped to a single interrupt.
-
-
- Interrupt Aggregator
- +-----------------------------------------+
- | Intmap VINT |
- | +--------------+ +------------+ |
- m ------>| | vint | bit | | 0 |.....|63| vint0 |
- . | +--------------+ +------------+ | +------+
- . | . . | | HOST |
-Globalevents ------>| . . |------>| IRQ |
- . | . . | | CTRL |
- . | . . | +------+
- n ------>| +--------------+ +------------+ |
- | | vint | bit | | 0 |.....|63| vintx |
- | +--------------+ +------------+ |
- | |
- +-----------------------------------------+
-
-Configuration of these Intmap registers that maps global events to vint is done
-by a system controller (like the Device Memory and Security Controller on K3
-AM654 SoC). Driver should request the system controller to get the range
-of global events and vints assigned to the requesting host. Management
-of these requested resources should be handled by driver and requests
-system controller to map specific global event to vint, bit pair.
-
-Communication between the host processor running an OS and the system
-controller happens through a protocol called TI System Control Interface
-(TISCI protocol). For more details refer:
-Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
-
-TISCI Interrupt Aggregator Node:
--------------------------------
-- compatible: Must be "ti,sci-inta".
-- reg: Should contain registers location and length.
-- interrupt-controller: Identifies the node as an interrupt controller
-- msi-controller: Identifies the node as an MSI controller.
-- interrupt-parent: phandle of irq parent.
-- ti,sci: Phandle to TI-SCI compatible System controller node.
-- ti,sci-dev-id: TISCI device id of interrupt controller.
-- ti,interrupt-ranges: Set of triplets containing ranges that convert
- the INTA output interrupt numbers to parent's
- interrupt number. Each triplet has following entries:
- - First entry specifies the base for vint
- - Second entry specifies the base for parent irqs
- - Third entry specifies the limit
-
-
-Example:
---------
-main_udmass_inta: interrupt-controller@33d00000 {
- compatible = "ti,sci-inta";
- reg = <0x0 0x33d00000 0x0 0x100000>;
- interrupt-controller;
- msi-controller;
- interrupt-parent = <&main_navss_intr>;
- ti,sci = <&dmsc>;
- ti,sci-dev-id = <179>;
- interrupt-ranges = <0 0 256>;
-};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
new file mode 100644
index 000000000000..ea9da698f008
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
@@ -0,0 +1,98 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/ti,sci-inta.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments K3 Interrupt Aggregator
+
+maintainers:
+ - Lokesh Vutla <lokeshvutla@ti.com>
+
+allOf:
+ - $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
+
+description: |
+ The Interrupt Aggregator (INTA) provides a centralized machine
+ which handles the termination of system events to that they can
+ be coherently processed by the host(s) in the system. A maximum
+ of 64 events can be mapped to a single interrupt.
+
+ Interrupt Aggregator
+ +-----------------------------------------+
+ | Intmap VINT |
+ | +--------------+ +------------+ |
+ m ------>| | vint | bit | | 0 |.....|63| vint0 |
+ . | +--------------+ +------------+ | +------+
+ . | . . | | HOST |
+ Globalevents ------>| . . |----->| IRQ |
+ . | . . | | CTRL |
+ . | . . | +------+
+ n ------>| +--------------+ +------------+ |
+ | | vint | bit | | 0 |.....|63| vintx |
+ | +--------------+ +------------+ |
+ | |
+ +-----------------------------------------+
+
+ Configuration of these Intmap registers that maps global events to vint is
+ done by a system controller (like the Device Memory and Security Controller
+ on AM654 SoC). Driver should request the system controller to get the range
+ of global events and vints assigned to the requesting host. Management
+ of these requested resources should be handled by driver and requests
+ system controller to map specific global event to vint, bit pair.
+
+ Communication between the host processor running an OS and the system
+ controller happens through a protocol called TI System Control Interface
+ (TISCI protocol).
+
+properties:
+ compatible:
+ const: ti,sci-inta
+
+ reg:
+ maxItems: 1
+
+ interrupt-controller: true
+
+ msi-controller: true
+
+ ti,interrupt-ranges:
+ $ref: /schemas/types.yaml#/definitions/uint32-matrix
+ description: |
+ Interrupt ranges that converts the INTR output hw irq numbers
+ to parents's input interrupt numbers.
+ - items:
+ items:
+ - description: |
+ "output_irq" specifies the base for inta output irq
+ - description: |
+ "parent's input irq" specifies the base for parent irq
+ - description: |
+ "limit" specifies the limit for translation
+
+required:
+ - compatible
+ - reg
+ - interrupt-controller
+ - msi-controller
+ - ti,sci
+ - ti,sci-dev-id
+ - ti,interrupt-ranges
+
+examples:
+ - |
+ bus {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ main_udmass_inta: msi-controller@33d00000 {
+ compatible = "ti,sci-inta";
+ reg = <0x0 0x33d00000 0x0 0x100000>;
+ interrupt-controller;
+ msi-controller;
+ interrupt-parent = <&main_navss_intr>;
+ ti,sci = <&dmsc>;
+ ti,sci-dev-id = <179>;
+ ti,interrupt-ranges = <0 0 256>;
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 28a8eba81d2b..53dd64376949 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16907,7 +16907,7 @@ S: Maintained
F: Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
F: Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt
-F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
+F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
F: Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
F: Documentation/devicetree/bindings/reset/ti,sci-reset.txt
F: Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 9/9] irqchip/ti-sci-inta: Add support for INTA directly connecting to GIC
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-24 14:18 ` Lokesh Vutla
-1 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Thomas Gleixner, Nishanth Menon, Tero Kristo, Santosh Shilimkar,
Linux ARM Mailing List, Sekhar Nori, Grygorii Strashko,
Peter Ujfalusi, Device Tree Mailing List, Suman Anna,
Lokesh Vutla
Driver assumes that Interrupt parent to Interrupt Aggregator is always
Interrupt router. This is not true always and GIC can be a parent to
Interrupt Aggregator. Update the driver to detect the parent and request
the parent irqs accordingly.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/irqchip/irq-ti-sci-inta.c | 90 ++++++++++++++++++++++++++-----
1 file changed, 77 insertions(+), 13 deletions(-)
diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
index 7e3ebf6ed2cd..00c17ade118a 100644
--- a/drivers/irqchip/irq-ti-sci-inta.c
+++ b/drivers/irqchip/irq-ti-sci-inta.c
@@ -8,6 +8,7 @@
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/irq.h>
#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/interrupt.h>
@@ -128,6 +129,37 @@ static void ti_sci_inta_irq_handler(struct irq_desc *desc)
chained_irq_exit(irq_desc_get_chip(desc), desc);
}
+/**
+ * ti_sci_inta_xlate_irq() - Translate hwirq to parent's hwirq.
+ * @inta: IRQ domain corresponding to Interrupt Aggregator
+ * @irq: Hardware irq corresponding to the above irq domain
+ *
+ * Return parent irq number if translation is available else -ENOENT.
+ */
+static int ti_sci_inta_xlate_irq(struct ti_sci_inta_irq_domain *inta,
+ u16 vint_id)
+{
+ struct device_node *np = dev_of_node(&inta->pdev->dev);
+ u32 base, parent_base, size;
+ const __be32 *range;
+ int len;
+
+ range = of_get_property(np, "ti,interrupt-ranges", &len);
+ if (!range)
+ return vint_id;
+
+ for (len /= sizeof(*range); len >= 3; len -= 3) {
+ base = be32_to_cpu(*range++);
+ parent_base = be32_to_cpu(*range++);
+ size = be32_to_cpu(*range++);
+
+ if (base <= vint_id && vint_id < base + size)
+ return vint_id - base + parent_base;
+ }
+
+ return -ENOENT;
+}
+
/**
* ti_sci_inta_alloc_parent_irq() - Allocate parent irq to Interrupt aggregator
* @domain: IRQ domain corresponding to Interrupt Aggregator
@@ -139,30 +171,55 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
struct ti_sci_inta_irq_domain *inta = domain->host_data;
struct ti_sci_inta_vint_desc *vint_desc;
struct irq_fwspec parent_fwspec;
+ struct device_node *parent_node;
unsigned int parent_virq;
- u16 vint_id;
+ u16 vint_id, p_hwirq;
+ int ret;
vint_id = ti_sci_get_free_resource(inta->vint);
if (vint_id == TI_SCI_RESOURCE_NULL)
return ERR_PTR(-EINVAL);
+ p_hwirq = ti_sci_inta_xlate_irq(inta, vint_id);
+ if (p_hwirq < 0) {
+ ret = p_hwirq;
+ goto free_vint;
+ }
+
vint_desc = kzalloc(sizeof(*vint_desc), GFP_KERNEL);
- if (!vint_desc)
- return ERR_PTR(-ENOMEM);
+ if (!vint_desc) {
+ ret = -ENOMEM;
+ goto free_vint;
+ }
vint_desc->domain = domain;
vint_desc->vint_id = vint_id;
INIT_LIST_HEAD(&vint_desc->list);
- parent_fwspec.fwnode = of_node_to_fwnode(of_irq_find_parent(dev_of_node(&inta->pdev->dev)));
- parent_fwspec.param_count = 2;
- parent_fwspec.param[0] = inta->pdev->id;
- parent_fwspec.param[1] = vint_desc->vint_id;
+ parent_node = of_irq_find_parent(dev_of_node(&inta->pdev->dev));
+ parent_fwspec.fwnode = of_node_to_fwnode(parent_node);
+ if (of_property_read_u32(parent_node, "#interrupt-cells",
+ &parent_fwspec.param_count)) {
+ ret = -EINVAL;
+ goto free_vint_desc;
+ }
+
+ if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
+ /* Parent is GIC */
+ parent_fwspec.param[0] = 0;
+ parent_fwspec.param[1] = p_hwirq - 32;
+ parent_fwspec.param[2] = IRQ_TYPE_LEVEL_HIGH;
+ } else {
+ /* Parent is Interrupt Router */
+ parent_fwspec.param[0] = p_hwirq;
+ }
parent_virq = irq_create_fwspec_mapping(&parent_fwspec);
if (parent_virq == 0) {
- kfree(vint_desc);
- return ERR_PTR(-EINVAL);
+ dev_err(&inta->pdev->dev, "Parent IRQ allocation failed\n");
+ ret = -EINVAL;
+ goto free_vint_desc;
+
}
vint_desc->parent_virq = parent_virq;
@@ -171,6 +228,11 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
ti_sci_inta_irq_handler, vint_desc);
return vint_desc;
+free_vint_desc:
+ kfree(vint_desc);
+free_vint:
+ ti_sci_release_resource(inta->vint, vint_id);
+ return ERR_PTR(ret);
}
/**
@@ -555,15 +617,15 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
return -EINVAL;
}
- inta->vint = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
- "ti,sci-rm-range-vint");
+ inta->vint = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
+ TI_SCI_RESASG_SUBTYPE_IA_VINT);
if (IS_ERR(inta->vint)) {
dev_err(dev, "VINT resource allocation failed\n");
return PTR_ERR(inta->vint);
}
- inta->global_event = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
- "ti,sci-rm-range-global-event");
+ inta->global_event = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
+ TI_SCI_RESASG_SUBTYPE_GLOBAL_EVENT_SEVT);
if (IS_ERR(inta->global_event)) {
dev_err(dev, "Global event resource allocation failed\n");
return PTR_ERR(inta->global_event);
@@ -594,6 +656,8 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&inta->vint_list);
mutex_init(&inta->vint_mutex);
+ dev_info(dev, "Interrupt Aggregator domain %d created\n", pdev->id);
+
return 0;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v3 9/9] irqchip/ti-sci-inta: Add support for INTA directly connecting to GIC
@ 2020-07-24 14:18 ` Lokesh Vutla
0 siblings, 0 replies; 30+ messages in thread
From: Lokesh Vutla @ 2020-07-24 14:18 UTC (permalink / raw)
To: Marc Zyngier, Rob Herring
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Lokesh Vutla, Sekhar Nori, Tero Kristo,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
Driver assumes that Interrupt parent to Interrupt Aggregator is always
Interrupt router. This is not true always and GIC can be a parent to
Interrupt Aggregator. Update the driver to detect the parent and request
the parent irqs accordingly.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/irqchip/irq-ti-sci-inta.c | 90 ++++++++++++++++++++++++++-----
1 file changed, 77 insertions(+), 13 deletions(-)
diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
index 7e3ebf6ed2cd..00c17ade118a 100644
--- a/drivers/irqchip/irq-ti-sci-inta.c
+++ b/drivers/irqchip/irq-ti-sci-inta.c
@@ -8,6 +8,7 @@
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/irq.h>
#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/interrupt.h>
@@ -128,6 +129,37 @@ static void ti_sci_inta_irq_handler(struct irq_desc *desc)
chained_irq_exit(irq_desc_get_chip(desc), desc);
}
+/**
+ * ti_sci_inta_xlate_irq() - Translate hwirq to parent's hwirq.
+ * @inta: IRQ domain corresponding to Interrupt Aggregator
+ * @irq: Hardware irq corresponding to the above irq domain
+ *
+ * Return parent irq number if translation is available else -ENOENT.
+ */
+static int ti_sci_inta_xlate_irq(struct ti_sci_inta_irq_domain *inta,
+ u16 vint_id)
+{
+ struct device_node *np = dev_of_node(&inta->pdev->dev);
+ u32 base, parent_base, size;
+ const __be32 *range;
+ int len;
+
+ range = of_get_property(np, "ti,interrupt-ranges", &len);
+ if (!range)
+ return vint_id;
+
+ for (len /= sizeof(*range); len >= 3; len -= 3) {
+ base = be32_to_cpu(*range++);
+ parent_base = be32_to_cpu(*range++);
+ size = be32_to_cpu(*range++);
+
+ if (base <= vint_id && vint_id < base + size)
+ return vint_id - base + parent_base;
+ }
+
+ return -ENOENT;
+}
+
/**
* ti_sci_inta_alloc_parent_irq() - Allocate parent irq to Interrupt aggregator
* @domain: IRQ domain corresponding to Interrupt Aggregator
@@ -139,30 +171,55 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
struct ti_sci_inta_irq_domain *inta = domain->host_data;
struct ti_sci_inta_vint_desc *vint_desc;
struct irq_fwspec parent_fwspec;
+ struct device_node *parent_node;
unsigned int parent_virq;
- u16 vint_id;
+ u16 vint_id, p_hwirq;
+ int ret;
vint_id = ti_sci_get_free_resource(inta->vint);
if (vint_id == TI_SCI_RESOURCE_NULL)
return ERR_PTR(-EINVAL);
+ p_hwirq = ti_sci_inta_xlate_irq(inta, vint_id);
+ if (p_hwirq < 0) {
+ ret = p_hwirq;
+ goto free_vint;
+ }
+
vint_desc = kzalloc(sizeof(*vint_desc), GFP_KERNEL);
- if (!vint_desc)
- return ERR_PTR(-ENOMEM);
+ if (!vint_desc) {
+ ret = -ENOMEM;
+ goto free_vint;
+ }
vint_desc->domain = domain;
vint_desc->vint_id = vint_id;
INIT_LIST_HEAD(&vint_desc->list);
- parent_fwspec.fwnode = of_node_to_fwnode(of_irq_find_parent(dev_of_node(&inta->pdev->dev)));
- parent_fwspec.param_count = 2;
- parent_fwspec.param[0] = inta->pdev->id;
- parent_fwspec.param[1] = vint_desc->vint_id;
+ parent_node = of_irq_find_parent(dev_of_node(&inta->pdev->dev));
+ parent_fwspec.fwnode = of_node_to_fwnode(parent_node);
+ if (of_property_read_u32(parent_node, "#interrupt-cells",
+ &parent_fwspec.param_count)) {
+ ret = -EINVAL;
+ goto free_vint_desc;
+ }
+
+ if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
+ /* Parent is GIC */
+ parent_fwspec.param[0] = 0;
+ parent_fwspec.param[1] = p_hwirq - 32;
+ parent_fwspec.param[2] = IRQ_TYPE_LEVEL_HIGH;
+ } else {
+ /* Parent is Interrupt Router */
+ parent_fwspec.param[0] = p_hwirq;
+ }
parent_virq = irq_create_fwspec_mapping(&parent_fwspec);
if (parent_virq == 0) {
- kfree(vint_desc);
- return ERR_PTR(-EINVAL);
+ dev_err(&inta->pdev->dev, "Parent IRQ allocation failed\n");
+ ret = -EINVAL;
+ goto free_vint_desc;
+
}
vint_desc->parent_virq = parent_virq;
@@ -171,6 +228,11 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
ti_sci_inta_irq_handler, vint_desc);
return vint_desc;
+free_vint_desc:
+ kfree(vint_desc);
+free_vint:
+ ti_sci_release_resource(inta->vint, vint_id);
+ return ERR_PTR(ret);
}
/**
@@ -555,15 +617,15 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
return -EINVAL;
}
- inta->vint = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
- "ti,sci-rm-range-vint");
+ inta->vint = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
+ TI_SCI_RESASG_SUBTYPE_IA_VINT);
if (IS_ERR(inta->vint)) {
dev_err(dev, "VINT resource allocation failed\n");
return PTR_ERR(inta->vint);
}
- inta->global_event = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
- "ti,sci-rm-range-global-event");
+ inta->global_event = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
+ TI_SCI_RESASG_SUBTYPE_GLOBAL_EVENT_SEVT);
if (IS_ERR(inta->global_event)) {
dev_err(dev, "Global event resource allocation failed\n");
return PTR_ERR(inta->global_event);
@@ -594,6 +656,8 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&inta->vint_list);
mutex_init(&inta->vint_mutex);
+ dev_info(dev, "Interrupt Aggregator domain %d created\n", pdev->id);
+
return 0;
}
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v3 9/9] irqchip/ti-sci-inta: Add support for INTA directly connecting to GIC
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-25 14:10 ` Marc Zyngier
-1 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:10 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Rob Herring, Thomas Gleixner, Nishanth Menon, Tero Kristo,
Santosh Shilimkar, Linux ARM Mailing List, Sekhar Nori,
Grygorii Strashko, Peter Ujfalusi, Device Tree Mailing List,
Suman Anna
On Fri, 24 Jul 2020 15:18:37 +0100,
Lokesh Vutla <lokeshvutla@ti.com> wrote:
>
> Driver assumes that Interrupt parent to Interrupt Aggregator is always
> Interrupt router. This is not true always and GIC can be a parent to
> Interrupt Aggregator. Update the driver to detect the parent and request
> the parent irqs accordingly.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
> drivers/irqchip/irq-ti-sci-inta.c | 90 ++++++++++++++++++++++++++-----
> 1 file changed, 77 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
> index 7e3ebf6ed2cd..00c17ade118a 100644
> --- a/drivers/irqchip/irq-ti-sci-inta.c
> +++ b/drivers/irqchip/irq-ti-sci-inta.c
> @@ -8,6 +8,7 @@
>
> #include <linux/err.h>
> #include <linux/io.h>
> +#include <linux/irq.h>
> #include <linux/irqchip.h>
> #include <linux/irqdomain.h>
> #include <linux/interrupt.h>
> @@ -128,6 +129,37 @@ static void ti_sci_inta_irq_handler(struct irq_desc *desc)
> chained_irq_exit(irq_desc_get_chip(desc), desc);
> }
>
> +/**
> + * ti_sci_inta_xlate_irq() - Translate hwirq to parent's hwirq.
> + * @inta: IRQ domain corresponding to Interrupt Aggregator
> + * @irq: Hardware irq corresponding to the above irq domain
> + *
> + * Return parent irq number if translation is available else -ENOENT.
> + */
> +static int ti_sci_inta_xlate_irq(struct ti_sci_inta_irq_domain *inta,
> + u16 vint_id)
> +{
> + struct device_node *np = dev_of_node(&inta->pdev->dev);
> + u32 base, parent_base, size;
> + const __be32 *range;
> + int len;
> +
> + range = of_get_property(np, "ti,interrupt-ranges", &len);
> + if (!range)
> + return vint_id;
> +
> + for (len /= sizeof(*range); len >= 3; len -= 3) {
> + base = be32_to_cpu(*range++);
> + parent_base = be32_to_cpu(*range++);
> + size = be32_to_cpu(*range++);
> +
> + if (base <= vint_id && vint_id < base + size)
> + return vint_id - base + parent_base;
> + }
> +
> + return -ENOENT;
> +}
> +
> /**
> * ti_sci_inta_alloc_parent_irq() - Allocate parent irq to Interrupt aggregator
> * @domain: IRQ domain corresponding to Interrupt Aggregator
> @@ -139,30 +171,55 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
> struct ti_sci_inta_irq_domain *inta = domain->host_data;
> struct ti_sci_inta_vint_desc *vint_desc;
> struct irq_fwspec parent_fwspec;
> + struct device_node *parent_node;
> unsigned int parent_virq;
> - u16 vint_id;
> + u16 vint_id, p_hwirq;
> + int ret;
>
> vint_id = ti_sci_get_free_resource(inta->vint);
> if (vint_id == TI_SCI_RESOURCE_NULL)
> return ERR_PTR(-EINVAL);
>
> + p_hwirq = ti_sci_inta_xlate_irq(inta, vint_id);
> + if (p_hwirq < 0) {
> + ret = p_hwirq;
> + goto free_vint;
> + }
> +
> vint_desc = kzalloc(sizeof(*vint_desc), GFP_KERNEL);
> - if (!vint_desc)
> - return ERR_PTR(-ENOMEM);
> + if (!vint_desc) {
> + ret = -ENOMEM;
> + goto free_vint;
> + }
>
> vint_desc->domain = domain;
> vint_desc->vint_id = vint_id;
> INIT_LIST_HEAD(&vint_desc->list);
>
> - parent_fwspec.fwnode = of_node_to_fwnode(of_irq_find_parent(dev_of_node(&inta->pdev->dev)));
> - parent_fwspec.param_count = 2;
> - parent_fwspec.param[0] = inta->pdev->id;
> - parent_fwspec.param[1] = vint_desc->vint_id;
> + parent_node = of_irq_find_parent(dev_of_node(&inta->pdev->dev));
> + parent_fwspec.fwnode = of_node_to_fwnode(parent_node);
> + if (of_property_read_u32(parent_node, "#interrupt-cells",
> + &parent_fwspec.param_count)) {
> + ret = -EINVAL;
> + goto free_vint_desc;
> + }
> +
> + if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
> + /* Parent is GIC */
> + parent_fwspec.param[0] = 0;
> + parent_fwspec.param[1] = p_hwirq - 32;
> + parent_fwspec.param[2] = IRQ_TYPE_LEVEL_HIGH;
Same comment as on patch #6.
> + } else {
> + /* Parent is Interrupt Router */
> + parent_fwspec.param[0] = p_hwirq;
> + }
>
> parent_virq = irq_create_fwspec_mapping(&parent_fwspec);
> if (parent_virq == 0) {
> - kfree(vint_desc);
> - return ERR_PTR(-EINVAL);
> + dev_err(&inta->pdev->dev, "Parent IRQ allocation failed\n");
> + ret = -EINVAL;
> + goto free_vint_desc;
> +
> }
> vint_desc->parent_virq = parent_virq;
>
> @@ -171,6 +228,11 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
> ti_sci_inta_irq_handler, vint_desc);
>
> return vint_desc;
> +free_vint_desc:
> + kfree(vint_desc);
> +free_vint:
> + ti_sci_release_resource(inta->vint, vint_id);
> + return ERR_PTR(ret);
> }
>
> /**
> @@ -555,15 +617,15 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
> return -EINVAL;
> }
>
> - inta->vint = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
> - "ti,sci-rm-range-vint");
> + inta->vint = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
> + TI_SCI_RESASG_SUBTYPE_IA_VINT);
Same comment as on patch #6 as well, although the pdev->id hijacking
already existed. I believe this should be fixed, unless you can
explain why this can't possibly be implemented in a different way.
> if (IS_ERR(inta->vint)) {
> dev_err(dev, "VINT resource allocation failed\n");
> return PTR_ERR(inta->vint);
> }
>
> - inta->global_event = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
> - "ti,sci-rm-range-global-event");
> + inta->global_event = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
> + TI_SCI_RESASG_SUBTYPE_GLOBAL_EVENT_SEVT);
> if (IS_ERR(inta->global_event)) {
> dev_err(dev, "Global event resource allocation failed\n");
> return PTR_ERR(inta->global_event);
> @@ -594,6 +656,8 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
> INIT_LIST_HEAD(&inta->vint_list);
> mutex_init(&inta->vint_mutex);
>
> + dev_info(dev, "Interrupt Aggregator domain %d created\n", pdev->id);
> +
> return 0;
> }
>
> --
> 2.27.0
>
>
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v3 9/9] irqchip/ti-sci-inta: Add support for INTA directly connecting to GIC
@ 2020-07-25 14:10 ` Marc Zyngier
0 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:10 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Sekhar Nori, Tero Kristo, Rob Herring,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
On Fri, 24 Jul 2020 15:18:37 +0100,
Lokesh Vutla <lokeshvutla@ti.com> wrote:
>
> Driver assumes that Interrupt parent to Interrupt Aggregator is always
> Interrupt router. This is not true always and GIC can be a parent to
> Interrupt Aggregator. Update the driver to detect the parent and request
> the parent irqs accordingly.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
> drivers/irqchip/irq-ti-sci-inta.c | 90 ++++++++++++++++++++++++++-----
> 1 file changed, 77 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
> index 7e3ebf6ed2cd..00c17ade118a 100644
> --- a/drivers/irqchip/irq-ti-sci-inta.c
> +++ b/drivers/irqchip/irq-ti-sci-inta.c
> @@ -8,6 +8,7 @@
>
> #include <linux/err.h>
> #include <linux/io.h>
> +#include <linux/irq.h>
> #include <linux/irqchip.h>
> #include <linux/irqdomain.h>
> #include <linux/interrupt.h>
> @@ -128,6 +129,37 @@ static void ti_sci_inta_irq_handler(struct irq_desc *desc)
> chained_irq_exit(irq_desc_get_chip(desc), desc);
> }
>
> +/**
> + * ti_sci_inta_xlate_irq() - Translate hwirq to parent's hwirq.
> + * @inta: IRQ domain corresponding to Interrupt Aggregator
> + * @irq: Hardware irq corresponding to the above irq domain
> + *
> + * Return parent irq number if translation is available else -ENOENT.
> + */
> +static int ti_sci_inta_xlate_irq(struct ti_sci_inta_irq_domain *inta,
> + u16 vint_id)
> +{
> + struct device_node *np = dev_of_node(&inta->pdev->dev);
> + u32 base, parent_base, size;
> + const __be32 *range;
> + int len;
> +
> + range = of_get_property(np, "ti,interrupt-ranges", &len);
> + if (!range)
> + return vint_id;
> +
> + for (len /= sizeof(*range); len >= 3; len -= 3) {
> + base = be32_to_cpu(*range++);
> + parent_base = be32_to_cpu(*range++);
> + size = be32_to_cpu(*range++);
> +
> + if (base <= vint_id && vint_id < base + size)
> + return vint_id - base + parent_base;
> + }
> +
> + return -ENOENT;
> +}
> +
> /**
> * ti_sci_inta_alloc_parent_irq() - Allocate parent irq to Interrupt aggregator
> * @domain: IRQ domain corresponding to Interrupt Aggregator
> @@ -139,30 +171,55 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
> struct ti_sci_inta_irq_domain *inta = domain->host_data;
> struct ti_sci_inta_vint_desc *vint_desc;
> struct irq_fwspec parent_fwspec;
> + struct device_node *parent_node;
> unsigned int parent_virq;
> - u16 vint_id;
> + u16 vint_id, p_hwirq;
> + int ret;
>
> vint_id = ti_sci_get_free_resource(inta->vint);
> if (vint_id == TI_SCI_RESOURCE_NULL)
> return ERR_PTR(-EINVAL);
>
> + p_hwirq = ti_sci_inta_xlate_irq(inta, vint_id);
> + if (p_hwirq < 0) {
> + ret = p_hwirq;
> + goto free_vint;
> + }
> +
> vint_desc = kzalloc(sizeof(*vint_desc), GFP_KERNEL);
> - if (!vint_desc)
> - return ERR_PTR(-ENOMEM);
> + if (!vint_desc) {
> + ret = -ENOMEM;
> + goto free_vint;
> + }
>
> vint_desc->domain = domain;
> vint_desc->vint_id = vint_id;
> INIT_LIST_HEAD(&vint_desc->list);
>
> - parent_fwspec.fwnode = of_node_to_fwnode(of_irq_find_parent(dev_of_node(&inta->pdev->dev)));
> - parent_fwspec.param_count = 2;
> - parent_fwspec.param[0] = inta->pdev->id;
> - parent_fwspec.param[1] = vint_desc->vint_id;
> + parent_node = of_irq_find_parent(dev_of_node(&inta->pdev->dev));
> + parent_fwspec.fwnode = of_node_to_fwnode(parent_node);
> + if (of_property_read_u32(parent_node, "#interrupt-cells",
> + &parent_fwspec.param_count)) {
> + ret = -EINVAL;
> + goto free_vint_desc;
> + }
> +
> + if (of_device_is_compatible(parent_node, "arm,gic-v3")) {
> + /* Parent is GIC */
> + parent_fwspec.param[0] = 0;
> + parent_fwspec.param[1] = p_hwirq - 32;
> + parent_fwspec.param[2] = IRQ_TYPE_LEVEL_HIGH;
Same comment as on patch #6.
> + } else {
> + /* Parent is Interrupt Router */
> + parent_fwspec.param[0] = p_hwirq;
> + }
>
> parent_virq = irq_create_fwspec_mapping(&parent_fwspec);
> if (parent_virq == 0) {
> - kfree(vint_desc);
> - return ERR_PTR(-EINVAL);
> + dev_err(&inta->pdev->dev, "Parent IRQ allocation failed\n");
> + ret = -EINVAL;
> + goto free_vint_desc;
> +
> }
> vint_desc->parent_virq = parent_virq;
>
> @@ -171,6 +228,11 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
> ti_sci_inta_irq_handler, vint_desc);
>
> return vint_desc;
> +free_vint_desc:
> + kfree(vint_desc);
> +free_vint:
> + ti_sci_release_resource(inta->vint, vint_id);
> + return ERR_PTR(ret);
> }
>
> /**
> @@ -555,15 +617,15 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
> return -EINVAL;
> }
>
> - inta->vint = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
> - "ti,sci-rm-range-vint");
> + inta->vint = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
> + TI_SCI_RESASG_SUBTYPE_IA_VINT);
Same comment as on patch #6 as well, although the pdev->id hijacking
already existed. I believe this should be fixed, unless you can
explain why this can't possibly be implemented in a different way.
> if (IS_ERR(inta->vint)) {
> dev_err(dev, "VINT resource allocation failed\n");
> return PTR_ERR(inta->vint);
> }
>
> - inta->global_event = devm_ti_sci_get_of_resource(inta->sci, dev, pdev->id,
> - "ti,sci-rm-range-global-event");
> + inta->global_event = devm_ti_sci_get_resource(inta->sci, dev, pdev->id,
> + TI_SCI_RESASG_SUBTYPE_GLOBAL_EVENT_SEVT);
> if (IS_ERR(inta->global_event)) {
> dev_err(dev, "Global event resource allocation failed\n");
> return PTR_ERR(inta->global_event);
> @@ -594,6 +656,8 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
> INIT_LIST_HEAD(&inta->vint_list);
> mutex_init(&inta->vint_mutex);
>
> + dev_info(dev, "Interrupt Aggregator domain %d created\n", pdev->id);
> +
> return 0;
> }
>
> --
> 2.27.0
>
>
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v3 0/9] irqchip: ti, sci-intr/inta: Update the dt bindings to accept different interrupt parents
2020-07-24 14:18 ` Lokesh Vutla
@ 2020-07-25 14:12 ` Marc Zyngier
-1 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:12 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Rob Herring, Thomas Gleixner, Nishanth Menon, Tero Kristo,
Santosh Shilimkar, Linux ARM Mailing List, Sekhar Nori,
Grygorii Strashko, Peter Ujfalusi, Device Tree Mailing List,
Suman Anna
On Fri, 24 Jul 2020 15:18:28 +0100,
Lokesh Vutla <lokeshvutla@ti.com> wrote:
>
> Hi Marc,
> This is continuation of the RFC patches[0] regarding the driver
> updates to support for following interrupt parent connection:
> - INTR -> INTR
> - INTA -> GICv3
> The current existing driver assumes that INTR is always connected to
> GICv3 and INTA is always connected to INTR.
>
> As discussed this change breaks the DT backward compatibility but it
> allows to not depend on TISCI firmware properties in DT node. IMHO, this
> will ensure that any future changes will not effect DT properties.
>
> This series depends on the the new Yaml bindings for common TISCI[1]
Assuming you fix the issues I have pointed out for patches 6 and 9,
this will need some Acks for the firmware parts, as the irqchip
patches are not standalone.
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v3 0/9] irqchip: ti, sci-intr/inta: Update the dt bindings to accept different interrupt parents
@ 2020-07-25 14:12 ` Marc Zyngier
0 siblings, 0 replies; 30+ messages in thread
From: Marc Zyngier @ 2020-07-25 14:12 UTC (permalink / raw)
To: Lokesh Vutla
Cc: Nishanth Menon, Peter Ujfalusi, Grygorii Strashko,
Device Tree Mailing List, Sekhar Nori, Tero Kristo, Rob Herring,
Santosh Shilimkar, Thomas Gleixner, Linux ARM Mailing List
On Fri, 24 Jul 2020 15:18:28 +0100,
Lokesh Vutla <lokeshvutla@ti.com> wrote:
>
> Hi Marc,
> This is continuation of the RFC patches[0] regarding the driver
> updates to support for following interrupt parent connection:
> - INTR -> INTR
> - INTA -> GICv3
> The current existing driver assumes that INTR is always connected to
> GICv3 and INTA is always connected to INTR.
>
> As discussed this change breaks the DT backward compatibility but it
> allows to not depend on TISCI firmware properties in DT node. IMHO, this
> will ensure that any future changes will not effect DT properties.
>
> This series depends on the the new Yaml bindings for common TISCI[1]
Assuming you fix the issues I have pointed out for patches 6 and 9,
this will need some Acks for the firmware parts, as the irqchip
patches are not standalone.
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 30+ messages in thread