[PATCH v3 0/8] irqchip: Fix some issues and do some code cleanups about Loongson

[PATCH v3 0/8] irqchip: Fix some issues and do some code cleanups about Loongson

[Tiezhu Yang]

Check the return value of irq_domain_translate_onecell() and
irq_domain_translate_twocell(), fix potential resource leak
and dead lock, do some code cleanups about Loongson to make
it more clean and readable.

v2:
  - In order to avoid git send-email failed, make the related patches
    about Loongson into a new patch series and add "Fixes" tag
v3:
  - Add a new patch "irqchip/loongson-liointc: Fix potential dead lock"
  - Fix another typo in loongson,liointc.yaml

Tiezhu Yang (8):
  irqchip/loongson-htpic: Remove redundant kfree operation
  irqchip/loongson-htpic: Remove unneeded select of I8259
  irqchip/loongson-htvec: Fix potential resource leak
  irqchip/loongson-htvec: Check return value of
    irq_domain_translate_onecell()
  irqchip/loongson-pch-pic: Check return value of
    irq_domain_translate_twocell()
  irqchip/loongson-pch-msi: Remove unneeded variable
  irqchip/loongson-liointc: Fix potential dead lock
  dt-bindings: interrupt-controller: Fix typos in loongson,liointc.yaml

 .../bindings/interrupt-controller/loongson,liointc.yaml   |  4 ++--
 drivers/irqchip/Kconfig                                   |  1 -
 drivers/irqchip/irq-loongson-htpic.c                      |  6 ++----
 drivers/irqchip/irq-loongson-htvec.c                      | 10 ++++++++--
 drivers/irqchip/irq-loongson-liointc.c                    |  1 +
 drivers/irqchip/irq-loongson-pch-msi.c                    |  7 +------
 drivers/irqchip/irq-loongson-pch-pic.c                    | 15 +++++++++------
 7 files changed, 23 insertions(+), 21 deletions(-)

-- 
2.1.0

[PATCH v3 1/8] irqchip/loongson-htpic: Remove redundant kfree operation

[Tiezhu Yang]

In the function htpic_of_init(), when kzalloc htpic fails, it should
return -ENOMEM directly, no need to execute "goto" to kfree.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/irq-loongson-htpic.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/irqchip/irq-loongson-htpic.c b/drivers/irqchip/irq-loongson-htpic.c
index dd018c2..63f7280 100644
--- a/drivers/irqchip/irq-loongson-htpic.c
+++ b/drivers/irqchip/irq-loongson-htpic.c
@@ -93,10 +93,8 @@ int __init htpic_of_init(struct device_node *node, struct device_node *parent)
 	}
 
 	htpic = kzalloc(sizeof(*htpic), GFP_KERNEL);
-	if (!htpic) {
-		err = -ENOMEM;
-		goto out_free;
-	}
+	if (!htpic)
+		return -ENOMEM;
 
 	htpic->base = of_iomap(node, 0);
 	if (!htpic->base) {
-- 
2.1.0

[PATCH v3 2/8] irqchip/loongson-htpic: Remove unneeded select of I8259

[Tiezhu Yang]

LOONGSON_HTPIC depends on MACH_LOONGSON64 and MACH_LOONGSON64 already
selects I8259 in arch/mips/Kconfig, so no need to select I8259 again
when config LOONGSON_HTPIC.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 216b3b8..bfc9719 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -541,7 +541,6 @@ config LOONGSON_HTPIC
 	default y
 	select IRQ_DOMAIN
 	select GENERIC_IRQ_CHIP
-	select I8259
 	help
 	  Support for the Loongson-3 HyperTransport PIC Controller.
 
-- 
2.1.0

[PATCH v3 3/8] irqchip/loongson-htvec: Fix potential resource leak

[Tiezhu Yang]

In the function htvec_of_init(), system resource "parent_irq"
was not released in an error case. Thus add a jump target for
the completion of the desired exception handling.

Fixes: 818e915fbac5 ("irqchip: Add Loongson HyperTransport Vector support")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/irq-loongson-htvec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-loongson-htvec.c b/drivers/irqchip/irq-loongson-htvec.c
index 1ece933..b36d403 100644
--- a/drivers/irqchip/irq-loongson-htvec.c
+++ b/drivers/irqchip/irq-loongson-htvec.c
@@ -192,7 +192,7 @@ static int htvec_of_init(struct device_node *node,
 	if (!priv->htvec_domain) {
 		pr_err("Failed to create IRQ domain\n");
 		err = -ENOMEM;
-		goto iounmap_base;
+		goto irq_dispose;
 	}
 
 	htvec_reset(priv);
@@ -203,6 +203,9 @@ static int htvec_of_init(struct device_node *node,
 
 	return 0;
 
+irq_dispose:
+	for (; i > 0; i--)
+		irq_dispose_mapping(parent_irq[i - 1]);
 iounmap_base:
 	iounmap(priv->base);
 free_priv:
-- 
2.1.0

[PATCH v3 4/8] irqchip/loongson-htvec: Check return value of irq_domain_translate_onecell()

[Tiezhu Yang]

Check the return value of irq_domain_translate_onecell() due to
it may returns -EINVAL if failed.

Fixes: 818e915fbac5 ("irqchip: Add Loongson HyperTransport Vector support")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/irq-loongson-htvec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-loongson-htvec.c b/drivers/irqchip/irq-loongson-htvec.c
index b36d403..720cf96 100644
--- a/drivers/irqchip/irq-loongson-htvec.c
+++ b/drivers/irqchip/irq-loongson-htvec.c
@@ -109,11 +109,14 @@ static struct irq_chip htvec_irq_chip = {
 static int htvec_domain_alloc(struct irq_domain *domain, unsigned int virq,
 			      unsigned int nr_irqs, void *arg)
 {
+	int ret;
 	unsigned long hwirq;
 	unsigned int type, i;
 	struct htvec *priv = domain->host_data;
 
-	irq_domain_translate_onecell(domain, arg, &hwirq, &type);
+	ret = irq_domain_translate_onecell(domain, arg, &hwirq, &type);
+	if (ret)
+		return ret;
 
 	for (i = 0; i < nr_irqs; i++) {
 		irq_domain_set_info(domain, virq + i, hwirq + i, &htvec_irq_chip,
-- 
2.1.0

[PATCH v3 5/8] irqchip/loongson-pch-pic: Check return value of irq_domain_translate_twocell()

[Tiezhu Yang]

Check the return value of irq_domain_translate_twocell() due to
it may returns -EINVAL if failed and use variable fwspec for it,
and then use a new variable parent_fwspec which is proper for
irq_domain_alloc_irqs_parent().

Fixes: ef8c01eb64ca ("irqchip: Add Loongson PCH PIC controller")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/irq-loongson-pch-pic.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c
index 2a05b93..016f32c 100644
--- a/drivers/irqchip/irq-loongson-pch-pic.c
+++ b/drivers/irqchip/irq-loongson-pch-pic.c
@@ -135,16 +135,19 @@ static int pch_pic_alloc(struct irq_domain *domain, unsigned int virq,
 	int err;
 	unsigned int type;
 	unsigned long hwirq;
-	struct irq_fwspec fwspec;
+	struct irq_fwspec *fwspec = arg;
+	struct irq_fwspec parent_fwspec;
 	struct pch_pic *priv = domain->host_data;
 
-	irq_domain_translate_twocell(domain, arg, &hwirq, &type);
+	err = irq_domain_translate_twocell(domain, fwspec, &hwirq, &type);
+	if (err)
+		return err;
 
-	fwspec.fwnode = domain->parent->fwnode;
-	fwspec.param_count = 1;
-	fwspec.param[0] = hwirq + priv->ht_vec_base;
+	parent_fwspec.fwnode = domain->parent->fwnode;
+	parent_fwspec.param_count = 1;
+	parent_fwspec.param[0] = hwirq + priv->ht_vec_base;
 
-	err = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
+	err = irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec);
 	if (err)
 		return err;
 
-- 
2.1.0

[PATCH v3 6/8] irqchip/loongson-pch-msi: Remove unneeded variable

[Tiezhu Yang]

irq_domain_alloc_irqs_parent() returns 0 on success and non-zero value
on failure, it is redudant to check its non-zero return value and then
return it, so just remove the variable "ret" and return directly in the
function pch_msi_parent_domain_alloc().

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/irq-loongson-pch-msi.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/irqchip/irq-loongson-pch-msi.c b/drivers/irqchip/irq-loongson-pch-msi.c
index 50becd2..12aeeab 100644
--- a/drivers/irqchip/irq-loongson-pch-msi.c
+++ b/drivers/irqchip/irq-loongson-pch-msi.c
@@ -100,17 +100,12 @@ static int pch_msi_parent_domain_alloc(struct irq_domain *domain,
 					unsigned int virq, int hwirq)
 {
 	struct irq_fwspec fwspec;
-	int ret;
 
 	fwspec.fwnode = domain->parent->fwnode;
 	fwspec.param_count = 1;
 	fwspec.param[0] = hwirq;
 
-	ret = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
-	if (ret)
-		return ret;
-
-	return 0;
+	return irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec);
 }
 
 static int pch_msi_middle_domain_alloc(struct irq_domain *domain,
-- 
2.1.0

[PATCH v3 7/8] irqchip/loongson-liointc: Fix potential dead lock

[Tiezhu Yang]

In the function liointc_set_type(), we need to call the function
irq_gc_unlock_irqrestore() before returning.

Fixes: dbb152267908 ("irqchip: Add driver for Loongson I/O Local Interrupt Controller")
Reported-by: Jianmin Lv <lvjianmin@loongson.cn>
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/irq-loongson-liointc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c
index 63b6147..6ef86a3 100644
--- a/drivers/irqchip/irq-loongson-liointc.c
+++ b/drivers/irqchip/irq-loongson-liointc.c
@@ -114,6 +114,7 @@ static int liointc_set_type(struct irq_data *data, unsigned int type)
 		liointc_set_bit(gc, LIOINTC_REG_INTC_POL, mask, false);
 		break;
 	default:
+		irq_gc_unlock_irqrestore(gc, flags);
 		return -EINVAL;
 	}
 	irq_gc_unlock_irqrestore(gc, flags);
-- 
2.1.0

[PATCH v3 8/8] dt-bindings: interrupt-controller: Fix typos in loongson,liointc.yaml

[Tiezhu Yang]

Fix the following two typos in loongson,liointc.yaml:
fron -> from
connected -> connect
it's -> its

Fixes: b6280c8bb6f5 ("dt-bindings: interrupt-controller: Add Loongson LIOINTC")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
---
 .../devicetree/bindings/interrupt-controller/loongson,liointc.yaml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
index b1db21e..732ad9a 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
@@ -51,8 +51,8 @@ properties:
     description: |
       This property points how the children interrupts will be mapped into CPU
       interrupt lines. Each cell refers to a parent interrupt line from 0 to 3
-      and each bit in the cell refers to a children interrupt fron 0 to 31.
-      If a CPU interrupt line didn't connected with liointc, then keep it's
+      and each bit in the cell refers to a children interrupt from 0 to 31.
+      If a CPU interrupt line didn't connect with liointc, then keep its
       cell with zero.
     $ref: /schemas/types.yaml#/definitions/uint32-array
     minItems: 4
-- 
2.1.0

Re: [PATCH v3 8/8] dt-bindings: interrupt-controller: Fix typos in loongson,liointc.yaml

[Rob Herring]

On Tue, Jul 07, 2020 at 10:12:52AM +0800, Tiezhu Yang wrote:
> Fix the following two typos in loongson,liointc.yaml:
> fron -> from
> connected -> connect
> it's -> its
> 
> Fixes: b6280c8bb6f5 ("dt-bindings: interrupt-controller: Add Loongson LIOINTC")
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: devicetree@vger.kernel.org
> ---
>  .../devicetree/bindings/interrupt-controller/loongson,liointc.yaml    | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
> index b1db21e..732ad9a 100644
> --- a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
> +++ b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
> @@ -51,8 +51,8 @@ properties:
>      description: |
>        This property points how the children interrupts will be mapped into CPU
>        interrupt lines. Each cell refers to a parent interrupt line from 0 to 3
> -      and each bit in the cell refers to a children interrupt fron 0 to 31.
> -      If a CPU interrupt line didn't connected with liointc, then keep it's
> +      and each bit in the cell refers to a children interrupt from 0 to 31.

While at it, s/children/child/

> +      If a CPU interrupt line didn't connect with liointc, then keep its
>        cell with zero.
>      $ref: /schemas/types.yaml#/definitions/uint32-array
>      minItems: 4
> -- 
> 2.1.0
> 

Re: [PATCH v3 8/8] dt-bindings: interrupt-controller: Fix typos in loongson,liointc.yaml

[Tiezhu Yang]

On 07/14/2020 05:41 AM, Rob Herring wrote:
> On Tue, Jul 07, 2020 at 10:12:52AM +0800, Tiezhu Yang wrote:
>> Fix the following two typos in loongson,liointc.yaml:
>> fron -> from
>> connected -> connect
>> it's -> its
>>
>> Fixes: b6280c8bb6f5 ("dt-bindings: interrupt-controller: Add Loongson LIOINTC")
>> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
>> Cc: Rob Herring <robh+dt@kernel.org>
>> Cc: devicetree@vger.kernel.org
>> ---
>>   .../devicetree/bindings/interrupt-controller/loongson,liointc.yaml    | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
>> index b1db21e..732ad9a 100644
>> --- a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
>> +++ b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
>> @@ -51,8 +51,8 @@ properties:
>>       description: |
>>         This property points how the children interrupts will be mapped into CPU
>>         interrupt lines. Each cell refers to a parent interrupt line from 0 to 3
>> -      and each bit in the cell refers to a children interrupt fron 0 to 31.
>> -      If a CPU interrupt line didn't connected with liointc, then keep it's
>> +      and each bit in the cell refers to a children interrupt from 0 to 31.
> While at it, s/children/child/

Hi,

Since the other patches of this series have no changes and they belong to
different subsystem which are independent, could I only send v4 of this
patch separately?

Thanks,
Tiezhu

>
>> +      If a CPU interrupt line didn't connect with liointc, then keep its
>>         cell with zero.
>>       $ref: /schemas/types.yaml#/definitions/uint32-array
>>       minItems: 4
>> -- 
>> 2.1.0
>>

Re: [PATCH v3 0/8] irqchip: Fix some issues and do some code cleanups about Loongson

[Marc Zyngier]

On Tue, 7 Jul 2020 10:12:44 +0800, Tiezhu Yang wrote:
> Check the return value of irq_domain_translate_onecell() and
> irq_domain_translate_twocell(), fix potential resource leak
> and dead lock, do some code cleanups about Loongson to make
> it more clean and readable.
> 
> v2:
>   - In order to avoid git send-email failed, make the related patches
>     about Loongson into a new patch series and add "Fixes" tag
> v3:
>   - Add a new patch "irqchip/loongson-liointc: Fix potential dead lock"
>   - Fix another typo in loongson,liointc.yaml
> 
> [...]

Applied to irq/irqchip-5.9, thanks!

[1/8] irqchip/loongson-htpic: Remove redundant kfree operation
      commit: f90fafecf4880b9785da85feb9b3e6d85fbf2287
[2/8] irqchip/loongson-htpic: Remove unneeded select of I8259
      commit: 85efd6059ae1a99e5e7205f37e910fd41dfa0ade
[3/8] irqchip/loongson-htvec: Fix potential resource leak
      commit: 652d54e77a438cf38a5731d8f9983c81e72dc429
[4/8] irqchip/loongson-htvec: Check return value of irq_domain_translate_onecell()
      commit: dbec37048d27cee36e103e113b5f9b1852bfe997
[5/8] irqchip/loongson-pch-pic: Check return value of irq_domain_translate_twocell()
      commit: 66a535c495f72e1deacc37dfa34acca2a06e3578
[6/8] irqchip/loongson-pch-msi: Remove unneeded variable
      commit: b10cbca8f03dd10dc241395a639d488f4144e986
[7/8] irqchip/loongson-liointc: Fix potential dead lock
      commit: fa03587cad9bd32aa552377de4f05c50181a35a8
[8/8] dt-bindings: interrupt-controller: Fix typos in loongson,liointc.yaml
      commit: 1055df97676a31df0b46942cb8bf66eb37ae318f

Cheers,

	M.
-- 
Without deviation from the norm, progress is not possible.

Re: [PATCH v3 0/8] irqchip: Fix some issues and do some code cleanups about Loongson

[Marc Zyngier]

On Tue, 7 Jul 2020 10:12:44 +0800, Tiezhu Yang wrote:
> Check the return value of irq_domain_translate_onecell() and
> irq_domain_translate_twocell(), fix potential resource leak
> and dead lock, do some code cleanups about Loongson to make
> it more clean and readable.
> 
> v2:
>   - In order to avoid git send-email failed, make the related patches
>     about Loongson into a new patch series and add "Fixes" tag
> v3:
>   - Add a new patch "irqchip/loongson-liointc: Fix potential dead lock"
>   - Fix another typo in loongson,liointc.yaml
> 
> [...]

Applied to irq/irqchip-5.9, thanks!

[1/8] irqchip/loongson-htpic: Remove redundant kfree operation
      commit: f90fafecf4880b9785da85feb9b3e6d85fbf2287
[2/8] irqchip/loongson-htpic: Remove unneeded select of I8259
      commit: 85efd6059ae1a99e5e7205f37e910fd41dfa0ade
[3/8] irqchip/loongson-htvec: Fix potential resource leak
      commit: 652d54e77a438cf38a5731d8f9983c81e72dc429
[4/8] irqchip/loongson-htvec: Check return value of irq_domain_translate_onecell()
      commit: dbec37048d27cee36e103e113b5f9b1852bfe997
[5/8] irqchip/loongson-pch-pic: Check return value of irq_domain_translate_twocell()
      commit: 66a535c495f72e1deacc37dfa34acca2a06e3578
[6/8] irqchip/loongson-pch-msi: Remove unneeded variable
      commit: b10cbca8f03dd10dc241395a639d488f4144e986
[7/8] irqchip/loongson-liointc: Fix potential dead lock
      commit: fa03587cad9bd32aa552377de4f05c50181a35a8
[8/8] dt-bindings: interrupt-controller: Fix typos in loongson,liointc.yaml
      commit: 1055df97676a31df0b46942cb8bf66eb37ae318f

Cheers,

	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