From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-f66.google.com ([209.85.222.66]:41216 "EHLO mail-ua1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbeIEQZa (ORCPT ); Wed, 5 Sep 2018 12:25:30 -0400 Received: by mail-ua1-f66.google.com with SMTP id h1-v6so5514892uao.8 for ; Wed, 05 Sep 2018 04:55:35 -0700 (PDT) MIME-Version: 1.0 References: <20180611121513.9673-1-marek.vasut+renesas@gmail.com> In-Reply-To: <20180611121513.9673-1-marek.vasut+renesas@gmail.com> From: Geert Uytterhoeven Date: Wed, 5 Sep 2018 13:55:23 +0200 Message-ID: Subject: Re: [PATCH V5] ARM: shmobile: Rework the PMIC IRQ line quirk To: Marek Vasut Cc: Linux ARM , Marek Vasut , Geert Uytterhoeven , Kuninori Morimoto , Simon Horman , Wolfram Sang , Linux-Renesas Content-Type: text/plain; charset="UTF-8" Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: Hi Marek, On Mon, Jun 11, 2018 at 2:15 PM Marek Vasut wrote: > Rather than hard-coding the quirk topology, which stopped scaling, > parse the information from DT. The code looks for all compatible > PMICs -- da9063 and da9210 -- and checks if their IRQ line is tied > to the same pin. If so, the code sends a matching sequence to the > PMIC to deassert the IRQ. > > Signed-off-by: Marek Vasut > Cc: Geert Uytterhoeven > Cc: Kuninori Morimoto > Cc: Simon Horman > Cc: Wolfram Sang > Cc: linux-renesas-soc@vger.kernel.org > Acked-by: Wolfram Sang > Tested-by: Geert Uytterhoeven (on Koelsch) > --- > V2: - Replace the DT shared IRQ check loop with memcmp() > - Send the I2C message to deassert the IRQ line to all PMICs > in the list with shared IRQ line instead of just one > - Add comment that this works only in case all the PMICs are > on the same I2C bus > V3: - Drop the addr = 0x00 init > - Drop reinit of argsa in rcar_gen2_regulator_quirk > V4: - Squash regulator_quirk on single line > - Drop !np check in for_each_matching_node_and_match() > - Use argsa in of_irq_parse_one > V5: - Check kzalloc failure > - Rename da...._msgs to da...._msg > - Don't reinit quirk->shared Thanks for the update! > --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > @@ -122,7 +142,12 @@ static struct notifier_block regulator_quirk_nb = { > > static int __init rcar_gen2_regulator_quirk(void) > { > - u32 mon; > + struct regulator_quirk *quirk, *pos, *tmp; > + struct of_phandle_args *argsa, *argsb; > + const struct of_device_id *id; > + struct device_node *np; > + u32 mon, addr; > + int ret; > > if (!of_machine_is_compatible("renesas,koelsch") && > !of_machine_is_compatible("renesas,lager") && > @@ -130,22 +155,76 @@ static int __init rcar_gen2_regulator_quirk(void) > !of_machine_is_compatible("renesas,gose")) > return -ENODEV; > > + for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) { > + if (!of_device_is_available(np)) > + break; > + > + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); > + if (!quirk) { > + ret = -ENOMEM; > + goto err_mem; > + } > + > + argsa = &quirk->irq_args; > + memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg)); > + > + ret = of_property_read_u32(np, "reg", &addr); > + if (ret) > + return ret; I think it's safer to skip this entry and continue, after calling kfree(quirk), of course. > + > + quirk->id = id; > + quirk->i2c_msg.addr = addr; > + > + ret = of_irq_parse_one(np, 0, argsa); > + if (ret) > + return ret; kfree(quirk) and continue... > + > + list_for_each_entry(pos, &quirk_list, list) { > + argsb = &pos->irq_args; > + > + if (argsa->args_count != argsb->args_count) > + continue; > + > + ret = memcmp(argsa->args, argsb->args, > + argsa->args_count * > + sizeof(argsa->args[0])); > + if (!ret) { > + pos->shared = true; > + quirk->shared = true; > + } > + } > + > + list_add_tail(&quirk->list, &quirk_list); > + } > + With the above fixed: Reviewed-by: Geert Uytterhoeven Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds From mboxrd@z Thu Jan 1 00:00:00 1970 From: geert@linux-m68k.org (Geert Uytterhoeven) Date: Wed, 5 Sep 2018 13:55:23 +0200 Subject: [PATCH V5] ARM: shmobile: Rework the PMIC IRQ line quirk In-Reply-To: <20180611121513.9673-1-marek.vasut+renesas@gmail.com> References: <20180611121513.9673-1-marek.vasut+renesas@gmail.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Marek, On Mon, Jun 11, 2018 at 2:15 PM Marek Vasut wrote: > Rather than hard-coding the quirk topology, which stopped scaling, > parse the information from DT. The code looks for all compatible > PMICs -- da9063 and da9210 -- and checks if their IRQ line is tied > to the same pin. If so, the code sends a matching sequence to the > PMIC to deassert the IRQ. > > Signed-off-by: Marek Vasut > Cc: Geert Uytterhoeven > Cc: Kuninori Morimoto > Cc: Simon Horman > Cc: Wolfram Sang > Cc: linux-renesas-soc at vger.kernel.org > Acked-by: Wolfram Sang > Tested-by: Geert Uytterhoeven (on Koelsch) > --- > V2: - Replace the DT shared IRQ check loop with memcmp() > - Send the I2C message to deassert the IRQ line to all PMICs > in the list with shared IRQ line instead of just one > - Add comment that this works only in case all the PMICs are > on the same I2C bus > V3: - Drop the addr = 0x00 init > - Drop reinit of argsa in rcar_gen2_regulator_quirk > V4: - Squash regulator_quirk on single line > - Drop !np check in for_each_matching_node_and_match() > - Use argsa in of_irq_parse_one > V5: - Check kzalloc failure > - Rename da...._msgs to da...._msg > - Don't reinit quirk->shared Thanks for the update! > --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > @@ -122,7 +142,12 @@ static struct notifier_block regulator_quirk_nb = { > > static int __init rcar_gen2_regulator_quirk(void) > { > - u32 mon; > + struct regulator_quirk *quirk, *pos, *tmp; > + struct of_phandle_args *argsa, *argsb; > + const struct of_device_id *id; > + struct device_node *np; > + u32 mon, addr; > + int ret; > > if (!of_machine_is_compatible("renesas,koelsch") && > !of_machine_is_compatible("renesas,lager") && > @@ -130,22 +155,76 @@ static int __init rcar_gen2_regulator_quirk(void) > !of_machine_is_compatible("renesas,gose")) > return -ENODEV; > > + for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) { > + if (!of_device_is_available(np)) > + break; > + > + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); > + if (!quirk) { > + ret = -ENOMEM; > + goto err_mem; > + } > + > + argsa = &quirk->irq_args; > + memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg)); > + > + ret = of_property_read_u32(np, "reg", &addr); > + if (ret) > + return ret; I think it's safer to skip this entry and continue, after calling kfree(quirk), of course. > + > + quirk->id = id; > + quirk->i2c_msg.addr = addr; > + > + ret = of_irq_parse_one(np, 0, argsa); > + if (ret) > + return ret; kfree(quirk) and continue... > + > + list_for_each_entry(pos, &quirk_list, list) { > + argsb = &pos->irq_args; > + > + if (argsa->args_count != argsb->args_count) > + continue; > + > + ret = memcmp(argsa->args, argsb->args, > + argsa->args_count * > + sizeof(argsa->args[0])); > + if (!ret) { > + pos->shared = true; > + quirk->shared = true; > + } > + } > + > + list_add_tail(&quirk->list, &quirk_list); > + } > + With the above fixed: Reviewed-by: Geert Uytterhoeven Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds