From nobody Sun Apr 19 21:59:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 504ABC433EF for ; Mon, 27 Jun 2022 08:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233443AbiF0Ixo (ORCPT ); Mon, 27 Jun 2022 04:53:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232059AbiF0Ixm (ORCPT ); Mon, 27 Jun 2022 04:53:42 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7456D6358 for ; Mon, 27 Jun 2022 01:53:38 -0700 (PDT) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 982AB3F210 for ; Mon, 27 Jun 2022 08:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656320016; bh=cVIA1rzk9lEClXQUVijI1mtxn42A8LDHnGLvrJ0uW4c=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=UHHapKF9EmLJwnFOQQ6S7DziubF+fHVost1Z3bnf4im//rUfYsRNeuxZRX7LC56lT /v0x6FL8VKlqzPfdyecNqEmVH+9HaSGGJvbWpd7v/9aO8LqasF5Osr30297jbNyFVe vtv4bX3JIXBHoAjGiNgw2plyfeuJJ6zGgA+dduVXAZWmeFTxm9tNmFx4fOhr59U2kF uGg2fNHk2V4Iw6JdsOZeTbaV44HKepvVfCzjy9EvIk8SMnvDMuL/MSopnV+nIqJGN8 foSKMaOs590mVFfyDwj+siHvBQRv1tDNDETty6UIo4yVNtsRe9jd7L8XKibL6jjwGM AVaFMs/6DiMkg== Received: by mail-ej1-f69.google.com with SMTP id sg40-20020a170907a42800b00722faf0aacbso2125065ejc.3 for ; Mon, 27 Jun 2022 01:53:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cVIA1rzk9lEClXQUVijI1mtxn42A8LDHnGLvrJ0uW4c=; b=oA8uXHf/1oR3WIqZd12H1dG3yI/H/t84Zx+3y4OJIVhEoPcFB2Pg+pwqriJmRFhGR9 SYSWVvXZQVpGk3CL5ojVba6NlKTsVMSqPKfMamc4LpVhtYM9yNOX05v61XoqetCmhs/A 31TNVEN70yRxMaRE2I2OBlAqeONheuTo33LMxxP5nvGeYazqtztSOtLVxNHs7Kks7XrW pVRlsbqK2PstGx/KI+odUI53AdaN+u8FjZ6pbngiB/lOE3j3T3pPRTpM/bsiosYtlHQm DX8TW0hKAhu+gHd1ZYv3wh+a8tnT4gLxADWvVNtBCx36oQafIFK7ZjvwfQuawQDTdLJq Dkrg== X-Gm-Message-State: AJIora/2KGB3hhWOdSu73UImqFIWglxJP3MEuzyUTCFMoXShXPlIQAxV OUxLu1UAEEA2BrzTDHIfFKCZYDX3p8hYpIRWw8BpGjVVgYcx23Xgseug3/kxB8E/ySMMhV5mI3o K7hTgxzSD+hQCXfC4VmwbOC2W/YNzve/WazEtOgmU2Q== X-Received: by 2002:a05:6402:1907:b0:435:c243:a66e with SMTP id e7-20020a056402190700b00435c243a66emr14848120edz.44.1656320015580; Mon, 27 Jun 2022 01:53:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sNHSVdtmZNUqbh6HEAFeSWdppkBk08VGF7GzfJ6T5jHtMcBxx0Ir+RtXruR6wV2wBKuoa6Rw== X-Received: by 2002:a05:6402:1907:b0:435:c243:a66e with SMTP id e7-20020a056402190700b00435c243a66emr14848107edz.44.1656320015403; Mon, 27 Jun 2022 01:53:35 -0700 (PDT) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id el3-20020a056402360300b0043585bb803fsm7049090edb.25.2022.06.27.01.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 01:53:34 -0700 (PDT) From: Emil Renner Berthing To: linux-gpio@vger.kernel.org Cc: Jianlong Huang , Linus Walleij , Michael Zhu , linux-kernel@vger.kernel.org Subject: [PATCH] pinctrl: starfive: Serialize adding groups and functions Date: Mon, 27 Jun 2022 10:53:33 +0200 Message-Id: <20220627085333.1774396-1-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jianlong Huang The pinctrl dt_node_to_map method may be called in parallel which leads us to call pinconf_generic_add_group and pinconf_generic_add_function in parallel. This is not supported though and leads to errors, so add a mutex to serialize these calls. Signed-off-by: Jianlong Huang Signed-off-by: Emil Renner Berthing --- drivers/pinctrl/pinctrl-starfive.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pinctrl/pinctrl-starfive.c b/drivers/pinctrl/pinctrl-s= tarfive.c index 2a86c1035cc8..3eb40e230d98 100644 --- a/drivers/pinctrl/pinctrl-starfive.c +++ b/drivers/pinctrl/pinctrl-starfive.c @@ -207,6 +207,7 @@ struct starfive_pinctrl { void __iomem *base; void __iomem *padctl; struct pinctrl_dev *pctl; + struct mutex mutex; /* serialize adding groups and functions */ }; =20 static inline unsigned int starfive_pin_to_gpio(const struct starfive_pinc= trl *sfp, @@ -522,6 +523,7 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *= pctldev, =20 nmaps =3D 0; ngroups =3D 0; + mutex_lock(&sfp->mutex); for_each_child_of_node(np, child) { int npins; int i; @@ -615,12 +617,14 @@ static int starfive_dt_node_to_map(struct pinctrl_dev= *pctldev, =20 *maps =3D map; *num_maps =3D nmaps; + mutex_unlock(&sfp->mutex); return 0; =20 put_child: of_node_put(child); free_map: pinctrl_utils_free_map(pctldev, map, nmaps); + mutex_unlock(&sfp->mutex); return ret; } =20 @@ -1267,6 +1271,7 @@ static int starfive_probe(struct platform_device *pde= v) platform_set_drvdata(pdev, sfp); sfp->gc.parent =3D dev; raw_spin_lock_init(&sfp->lock); + mutex_init(&sfp->mutex); =20 ret =3D devm_pinctrl_register_and_init(dev, &starfive_desc, sfp, &sfp->pc= tl); if (ret) --=20 2.36.1