From nobody Sun Sep 14 01:59:03 2025 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 0E71DC636BD for ; Fri, 27 Jan 2023 10:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232208AbjA0Kkn (ORCPT ); Fri, 27 Jan 2023 05:40:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231659AbjA0Kkh (ORCPT ); Fri, 27 Jan 2023 05:40:37 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 512379EE2 for ; Fri, 27 Jan 2023 02:40:24 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id m15so3122912wms.4 for ; Fri, 27 Jan 2023 02:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nTkajujz2PbWOlDLokzlXiyxOl9BSGAFgie62+J1Eyo=; b=s+W5+n62jwib/xTTJBkNb7ee9T+KKMqFWtG3GXq+NtAnt+YYBi917eRTRIFwvM3vf9 44UgBD5tabXE6aj7lFEyAXedD4cqV8i+KDJtIS+9Uf3gv0YZlDYl5csLnGY7AwTHH+9q /4WvmwO3fzuXfqBr6Bp+l3/fqVMOniQE/s3YrBF23q/2bvYhvQDv7+5LSaFn7SPZDkeu otekpHHl6F92kyeyL6K38rrBuscggPJfZQi72MQG83ncBRVUBz1gmUx5Dr7fx3mtyEZR rozoRfzgFu1lzLf7ZAJsVE8ANaexRJM4jvJwLbK3ixI15dpUYL2FdmhE6icmZUf3FFTU 6FsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nTkajujz2PbWOlDLokzlXiyxOl9BSGAFgie62+J1Eyo=; b=kCnwV1I47u1E73fSKXVp5mdlz8y9dtfFCb48zGXDkYaJm65EMRhWMlJd1/wlHx7+6c zAryzn3nRMs4QrnmPngejYsbzHSLayWj/zMnfGPsTKnFxglWFqKrYcHUZwZyO0mhlwlT wFksLqv5zBbWy3F32zcGrg5YP+kPixw3ZowKQDG3J9JvmBenLi8RS7LSIHo4hXt2k+d6 80wkvZXWrne61UBorl5ZahbKBIz5RwLQBFaGGnWXijyIEu7FOV4PoKJ/aeCvgcaQXqKW bfKS0cysLr6qkUP7DiEIOReb3jZT1sJ+L2Fe8J174ZPziAJISJ+txiOhMJCihD3aT3sy t5rw== X-Gm-Message-State: AFqh2kqAaiBYvxfGjvFvbvmsnsY9AXH87I0qqWKGpCrgeN5F7Q7UzyWx 9Asgj0ctfai3DOhra/cS8FtXLbAjUUqw2kdo X-Google-Smtp-Source: AMrXdXv2uX+g92Qeopbr15XptCvYgcTmav6tLAuhuLtOiXhi9z2GXTk8Wy0JmTm/815r6cJctVUNTQ== X-Received: by 2002:a05:600c:3d14:b0:3da:f793:fff6 with SMTP id bh20-20020a05600c3d1400b003daf793fff6mr38791890wmb.16.1674816022840; Fri, 27 Jan 2023 02:40:22 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:22 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Jiasheng Jiang , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 01/10] nvmem: brcm_nvram: Add check for kzalloc Date: Fri, 27 Jan 2023 10:40:06 +0000 Message-Id: <20230127104015.23839-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: Jiasheng Jiang Add the check for the return value of kzalloc in order to avoid NULL pointer dereference. Cc: stable@vger.kernel.org Fixes: 6e977eaa8280 ("nvmem: brcm_nvram: parse NVRAM content into NVMEM cel= ls") Signed-off-by: Jiasheng Jiang Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/brcm_nvram.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c index 34130449f2d2..39aa27942f28 100644 --- a/drivers/nvmem/brcm_nvram.c +++ b/drivers/nvmem/brcm_nvram.c @@ -98,6 +98,9 @@ static int brcm_nvram_parse(struct brcm_nvram *priv) len =3D le32_to_cpu(header.len); =20 data =3D kzalloc(len, GFP_KERNEL); + if (!data) + return -ENOMEM; + memcpy_fromio(data, priv->base, len); data[len - 1] =3D '\0'; =20 --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 4087CC61DA4 for ; Fri, 27 Jan 2023 10:40:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231592AbjA0Kkr (ORCPT ); Fri, 27 Jan 2023 05:40:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232038AbjA0Kki (ORCPT ); Fri, 27 Jan 2023 05:40:38 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0DE323108 for ; Fri, 27 Jan 2023 02:40:25 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id m16-20020a05600c3b1000b003dc4050c94aso294778wms.4 for ; Fri, 27 Jan 2023 02:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z8JigJRkcBANuuqC9qhP9AGV2DKNCqyg3IFC5VkSl6g=; b=kXTmFXj0BWlK+pOfcdMieNrk/fikFXp4LSPc698F7/dzgahpbYjcCXxdqe5q8fNzkg fsm6dn7RBy7P2npJFiZoZdMxNZxoDje2cXTpHQI7McFTWqNmpcf5PUrDiOSI+foLWRUj h+OOHfib0gzsDr+KzrLm1eLHd0jlPEySomMRtj5mrOnwaluH5twe1f9zTRCxbjxvx2Sl klbs7k3Y+QSB8d8hrC+4Q5Je1Isfn9TcTR6Lc9a4nTbSCU0XpMKQcDIq0XbaWXTZVnFv Rs7NnqADz+oaEswOTEfyKfkJXBte5MjDj3croTgGItuNlzserPTADYwOJFLIjYT+MFuy 4epA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z8JigJRkcBANuuqC9qhP9AGV2DKNCqyg3IFC5VkSl6g=; b=cKmwTWY6fsE/O5Qg+59eF2b7qDA6bAuiB1UAV8cVJG6mIZSpu+aP2AX2zDnyq/Pq4f +sZ1iThrPZ/+ALRUsHzw08Zu0n7Ye4vIMH7Qw9Wu3Bru4AHdrrYzi9MURqTv6zBrfybu +qzC89F6cP2IRYI8Vwj5FSV5FJ/W38cRRfeT04HudgpgUbO0h3oJMTR0c7FGxFGiHQiE /ZOWsrcIh/T1Rc7Nd92C5qxnRDFQIIANLNy1gRSnm51DI0FRFKnilAOywKItKg98siXE YeeaVzbCdleHbjFIIOjtXPbQADzGNEhvCng1hWASbNqlVLTgM6aQhWkwIm82H5ZWzVgk GwLw== X-Gm-Message-State: AFqh2krmtAb5Nmm16wLsqmaMxdiqWRdYwAACf8VLfOixacqy6nkVG7IX uoAFLgzx/QtK/fuBPWZe0aDtrA== X-Google-Smtp-Source: AMrXdXsllspl/clFU/ZTonPJMhLnvgGbawItS1vB789Gb13V7ttXlffW5WJtXZF8V/703exHgCr2pQ== X-Received: by 2002:a05:600c:4ab0:b0:3da:f959:4737 with SMTP id b48-20020a05600c4ab000b003daf9594737mr40401330wmp.36.1674816024453; Fri, 27 Jan 2023 02:40:24 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:23 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Samuel Holland , stable@vger.kernel.org, Heiko Stuebner , Srinivas Kandagatla Subject: [PATCH 02/10] nvmem: sunxi_sid: Always use 32-bit MMIO reads Date: Fri, 27 Jan 2023 10:40:07 +0000 Message-Id: <20230127104015.23839-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: Samuel Holland The SID SRAM on at least some SoCs (A64 and D1) returns different values when read with bus cycles narrower than 32 bits. This is not immediately obvious, because memcpy_fromio() uses word-size accesses as long as enough data is being copied. The vendor driver always uses 32-bit MMIO reads, so do the same here. This is faster than the register-based method, which is currently used as a workaround on A64. And it fixes the values returned on D1, where the SRAM method was being used. The special case for the last word is needed to maintain .word_size =3D=3D 1 for sysfs ABI compatibility, as noted previously in commit de2a3eaea552 ("nvmem: sunxi_sid: Optimize register read-out method"). Cc: stable@vger.kernel.org Fixes: 07ae4fde9efa ("nvmem: sunxi_sid: Add support for D1 variant") Tested-by: Heiko Stuebner Signed-off-by: Samuel Holland Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/sunxi_sid.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c index 5750e1f4bcdb..92dfe4cb10e3 100644 --- a/drivers/nvmem/sunxi_sid.c +++ b/drivers/nvmem/sunxi_sid.c @@ -41,8 +41,21 @@ static int sunxi_sid_read(void *context, unsigned int of= fset, void *val, size_t bytes) { struct sunxi_sid *sid =3D context; + u32 word; + + /* .stride =3D 4 so offset is guaranteed to be aligned */ + __ioread32_copy(val, sid->base + sid->value_offset + offset, bytes / 4); =20 - memcpy_fromio(val, sid->base + sid->value_offset + offset, bytes); + val +=3D round_down(bytes, 4); + offset +=3D round_down(bytes, 4); + bytes =3D bytes % 4; + + if (!bytes) + return 0; + + /* Handle any trailing bytes */ + word =3D readl_relaxed(sid->base + sid->value_offset + offset); + memcpy(val, &word, bytes); =20 return 0; } --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 28DE2C54EAA for ; Fri, 27 Jan 2023 10:40:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232273AbjA0Kkt (ORCPT ); Fri, 27 Jan 2023 05:40:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232085AbjA0Kkj (ORCPT ); Fri, 27 Jan 2023 05:40:39 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52DAE2100 for ; Fri, 27 Jan 2023 02:40:27 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so5111268wma.1 for ; Fri, 27 Jan 2023 02:40:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YZ/dbwvC/OCtxSOOA9d0W6psKQ4eaQ3lNNXdRstbkvE=; b=X8+c4bFDhkMae3h9yR37umPXww2KuYISs2Z4DzhfxCcstci/9R35mJh1PjSvLNS8c9 EaZVlfYCsYnvToqRUGEYaSL3t9ZhpqXV/CpzVm95kXNJDnZpFyHzl/OnH1zMQTqUiAU/ DACtZaEq075QrpzVGASl3D0IeI7FJBaV4hciAOCyQ3u98LqO6GA5ulXfFEjD0mXqnzB2 MAThoSN6DalvumbBGq3CFJ1t2tkVvkGPn4UVamRYJS72g8KhmRzTnNSEb27DGFPX/iiO iLiGLmkTcWNTYpqlZzQbK7VFtrFWA4ZxH+22XdMHBnKpxh+EsYxhQ94PUTn5hKDUStCq +knQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZ/dbwvC/OCtxSOOA9d0W6psKQ4eaQ3lNNXdRstbkvE=; b=6LmmUyXZtuttXICIgzh1s5yDTXC7qTvdlI35yhxa2xtWFUBKUUN/xTUgYEsGHlwzBc ind8HZQZvGp72F9MSoJYfBhWkDHmXSOxukc4937ZckiC1js1D3aMhUBMAiuwIuLfP+tG jWF5G3cZXCGN2Zg3/XKKPF6tj1l7FFqNKQrBCujaUz2i+cD5kAZWXIIBol/qD1cq+dmp 6F0C8iphGWy9Z//s4C4x6KDwNZg986WytJpeG7Ok9Ok+T6sFlfdBJNFheo3c10S+c6AB mJ0wlQScHZg9wKC1tcBCUMgPyLntcTaQ7vFAhgagmhXo8lAjb5VOddvdeZWT/g+myK34 Pd6w== X-Gm-Message-State: AFqh2kriAHX2rORSoiMepZqsxiAoXO3auhOGqiQuV+J1JNkOotLtNUd2 vqdWuZCubh+LrX/j7ln0P9lKKnvw4CB7PWz+ X-Google-Smtp-Source: AMrXdXunRyCNUeRvYQwcSeNf87YzGs38JNZ4bVyc3TExAaKLL5xqHLa6C46l/motOy17v0nF47IsQA== X-Received: by 2002:a7b:c5d6:0:b0:3d9:fb89:4e3d with SMTP id n22-20020a7bc5d6000000b003d9fb894e3dmr40936818wmk.28.1674816025916; Fri, 27 Jan 2023 02:40:25 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:25 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 03/10] nvmem: core: initialise nvmem->id early Date: Fri, 27 Jan 2023 10:40:08 +0000 Message-Id: <20230127104015.23839-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: "Russell King (Oracle)" The error path for wp_gpio attempts to free the IDA nvmem->id, but this has yet to be assigned, so will always be zero - leaking the ID allocated by ida_alloc(). Fix this by moving the initialisation of nvmem->id earlier. Cc: stable@vger.kernel.org Fixes: f7d8d7dcd978 ("nvmem: fix memory leak in error path") Signed-off-by: Russell King (Oracle) Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 321d7d63e068..7394a7598efa 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -770,6 +770,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) return ERR_PTR(rval); } =20 + nvmem->id =3D rval; + if (config->wp_gpio) nvmem->wp_gpio =3D config->wp_gpio; else if (!config->ignore_wp) @@ -785,7 +787,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) kref_init(&nvmem->refcnt); INIT_LIST_HEAD(&nvmem->cells); =20 - nvmem->id =3D rval; nvmem->owner =3D config->owner; if (!nvmem->owner && config->dev->driver) nvmem->owner =3D config->dev->driver->owner; --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 88A64C61DA4 for ; Fri, 27 Jan 2023 10:40:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232215AbjA0Kkx (ORCPT ); Fri, 27 Jan 2023 05:40:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232116AbjA0Kkj (ORCPT ); Fri, 27 Jan 2023 05:40:39 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCA782CC4B for ; Fri, 27 Jan 2023 02:40:28 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id q8so3121508wmo.5 for ; Fri, 27 Jan 2023 02:40:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GQA8ie8gDGnN9i1Gkqhn40XBHeOG+J3va8u+Gl+XlVM=; b=xUyNMLLS9r+SAEJJHrAvAUjeGlDUCS0MsFCqN8jBJQOEBAteMPkiFOvkPkEtNggLbw g+IPrcJBOAaUPy/h+Bq87sYMPJcbBFWP/LTBijYpoovlnqmU/cXdZvpfPatgEamol52Q HULZRCbRz+Z2kfplRBjEsMa0HTvF0fB2w/qPA6w+Qth57PZ+4fQ11JKVqw2vAl9/6JqE B03LXZpbRoEkQScZKjgFvKdWQr6kBgDxosUNl3xO4OTy6PsfW7tSmpkmU2ULkFg5Ui9h r+qMtxDVGeQX2fB8/ywWsqKvrAHk2QzGVwwsZs/VJQqHgM1S+mjbecMkcIkXWdWqLqy8 4mSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GQA8ie8gDGnN9i1Gkqhn40XBHeOG+J3va8u+Gl+XlVM=; b=ALytOypMribMvb875Ioxbt6OdtBM14xnSamSO7PEsn3ApNkvgXuMmPOi9zVFwY54nH DzW9OQ6/MMHLP6LO4a5I7AHtCuXkkLQxBo0L8HujKrl4yTUnHlSP2ZGd1UWYr1LUwIrI npdP9CzWVJwmdJibt6CV1bUkcRF7pQFJjQuDATXlPRyCcCjEiFxHuI3hoeRPbS0Lx2Hs HjVKGGTy7/JbICRF3w1/HPEOrr8V5xXb21OeCFlumozv4lsoPjjTGVMS/PADlEcsGpqa T3gYiQ4rn6+KgK2GKdaBciv9S1xWnV91udtxFH0AQZb6ookPOPuZRjXs9aH1KoEcWhS4 7ccg== X-Gm-Message-State: AFqh2kpZ2j20upxB6VH5RK+UvsaI+hC3Qs6hc/rp9YMStrCBLl6SRzJi KvX57UJXmo7TH8/rl2Pelfd1tg== X-Google-Smtp-Source: AMrXdXsvHJxiuNWojgCPjR8TCJ+EfBZUNvV59SyJ1A9XHpIJpl0+uq8rgDMQpwcrRRrT5XOqZBzasQ== X-Received: by 2002:a05:600c:434b:b0:3d9:cc40:a8dc with SMTP id r11-20020a05600c434b00b003d9cc40a8dcmr37194425wme.27.1674816027291; Fri, 27 Jan 2023 02:40:27 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:26 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 04/10] nvmem: core: remove nvmem_config wp_gpio Date: Fri, 27 Jan 2023 10:40:09 +0000 Message-Id: <20230127104015.23839-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: "Russell King (Oracle)" No one provides wp_gpio, so let's remove it to avoid issues with the nvmem core putting this gpio. Cc: stable@vger.kernel.org Signed-off-by: Russell King (Oracle) Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 4 +--- include/linux/nvmem-provider.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 7394a7598efa..608f3ad2e2e4 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -772,9 +772,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) =20 nvmem->id =3D rval; =20 - if (config->wp_gpio) - nvmem->wp_gpio =3D config->wp_gpio; - else if (!config->ignore_wp) + if (!config->ignore_wp) nvmem->wp_gpio =3D gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) { diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index 50caa117cb62..bb15c9234e21 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -70,7 +70,6 @@ struct nvmem_keepout { * @word_size: Minimum read/write access granularity. * @stride: Minimum read/write access stride. * @priv: User context passed to read/write callbacks. - * @wp-gpio: Write protect pin * @ignore_wp: Write Protect pin is managed by the provider. * * Note: A default "nvmem" name will be assigned to the device if @@ -85,7 +84,6 @@ struct nvmem_config { const char *name; int id; struct module *owner; - struct gpio_desc *wp_gpio; const struct nvmem_cell_info *cells; int ncells; const struct nvmem_keepout *keepout; --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 EE86EC38142 for ; Fri, 27 Jan 2023 10:40:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232214AbjA0Kk4 (ORCPT ); Fri, 27 Jan 2023 05:40:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbjA0Kkk (ORCPT ); Fri, 27 Jan 2023 05:40:40 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9FF68AC1 for ; Fri, 27 Jan 2023 02:40:29 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id e19-20020a05600c439300b003db1cac0c1fso5093061wmn.5 for ; Fri, 27 Jan 2023 02:40:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1ee8M/Zfl0pOs8Tnpp0ye8rZhC7jbLJshdfxfwBd8N4=; b=N554l+a4UV+5pp3GziZ82E2uFpGyeuI2jtL1QNcQGYgpzh5aSUxjUvIIiLbjIrld4C REZvNGQ2vU/7eosArZXgOoNYv3RBWM+XOdggo3BbrRjJJ9sDNVwv2Q2xd68Pi2hztqel tdT+A0vNpZyBZ8WsL5idXJQygTTSusA2UER5+8TJdregZCPUA88rcHaBTPiGATUKC/1g EkSoPO1TzRgpNJyc2YTqTpE8RHCAhm/BFGX2QDtSNLqwQbEaQUNkD6o6DQsG/5nk5sBu FwQmlldnm7sPp79qOrrsdMMrCZW95X3k82j/wbiUeV/YNJP1wxwLMtrQUf69+vLUeg1Y 7Qqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1ee8M/Zfl0pOs8Tnpp0ye8rZhC7jbLJshdfxfwBd8N4=; b=q4Nt04CLBxoG7L2KcmWhTSA8y3sPdcPdXh3JJHEIlmpmbMt4CaBfdUuucvn6dngqnY LsWRp0UqctOYJIFa3oFltb4rGWVkejLsE8f6U0bDAiVNEt+YtX9TU4SH+GlQFGeBQ/+/ 1Ni01UztWtm8Dm7c0jxlNr1EsuwbLft+1PJ5rzcqqD3MuA0Uwc27ES5USduHY2m2S+UK bjVyqMmrSH156aWjGgL/P27yunJX4Npds/5SXbnUw+nhiBbuVQqxAXcFmC+pbEoAOyw0 Aew5nvP3Xdj++DPIxVGOckUi3ZEpOIySzxEn/n/7hvg3uR1OQQL9Y/C3lYLWb9q0+W1e BvNQ== X-Gm-Message-State: AFqh2kr6Ecy1rPrjxMjC585l9AnS5OJiznJzm3cPyj/ns1vCtK0kxRMD ueBByQwJkB/zXVuX4PtpRoIIlQ== X-Google-Smtp-Source: AMrXdXv8r1WlZJ6abS3W4jl0IXaMTirvycwLOdaiLvCf+FE0El2w8WwrvDeu0IQx1yRWvhtGHId1Kg== X-Received: by 2002:a05:600c:4395:b0:3c6:f7ff:6f87 with SMTP id e21-20020a05600c439500b003c6f7ff6f87mr37673436wmn.11.1674816028506; Fri, 27 Jan 2023 02:40:28 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:27 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , stable@vger.kernel.org, kernel test robot , Dan Carpenter , Srinivas Kandagatla Subject: [PATCH 05/10] nvmem: core: fix cleanup after dev_set_name() Date: Fri, 27 Jan 2023 10:40:10 +0000 Message-Id: <20230127104015.23839-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: "Russell King (Oracle)" If dev_set_name() fails, we leak nvmem->wp_gpio as the cleanup does not put this. While a minimal fix for this would be to add the gpiod_put() call, we can do better if we split device_register(), and use the tested nvmem_release() cleanup code by initialising the device early, and putting the device. This results in a slightly larger fix, but results in clear code. Note: this patch depends on "nvmem: core: initialise nvmem->id early" and "nvmem: core: remove nvmem_config wp_gpio". Cc: stable@vger.kernel.org Fixes: 5544e90c8126 ("nvmem: core: add error handling for dev_set_name") Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Russell King (Oracle) [Srini: Fixed subject line and error code handing with wp_gpio while applyi= ng.] Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 608f3ad2e2e4..ac77a019aed7 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -772,14 +772,18 @@ struct nvmem_device *nvmem_register(const struct nvme= m_config *config) =20 nvmem->id =3D rval; =20 + nvmem->dev.type =3D &nvmem_provider_type; + nvmem->dev.bus =3D &nvmem_bus_type; + nvmem->dev.parent =3D config->dev; + + device_initialize(&nvmem->dev); + if (!config->ignore_wp) nvmem->wp_gpio =3D gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) { - ida_free(&nvmem_ida, nvmem->id); rval =3D PTR_ERR(nvmem->wp_gpio); - kfree(nvmem); - return ERR_PTR(rval); + goto err_put_device; } =20 kref_init(&nvmem->refcnt); @@ -791,9 +795,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) nvmem->stride =3D config->stride ?: 1; nvmem->word_size =3D config->word_size ?: 1; nvmem->size =3D config->size; - nvmem->dev.type =3D &nvmem_provider_type; - nvmem->dev.bus =3D &nvmem_bus_type; - nvmem->dev.parent =3D config->dev; nvmem->root_only =3D config->root_only; nvmem->priv =3D config->priv; nvmem->type =3D config->type; @@ -821,11 +822,8 @@ struct nvmem_device *nvmem_register(const struct nvmem= _config *config) break; } =20 - if (rval) { - ida_free(&nvmem_ida, nvmem->id); - kfree(nvmem); - return ERR_PTR(rval); - } + if (rval) + goto err_put_device; =20 nvmem->read_only =3D device_property_present(config->dev, "read-only") || config->read_only || !nvmem->reg_write; @@ -836,7 +834,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) =20 dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); =20 - rval =3D device_register(&nvmem->dev); + rval =3D device_add(&nvmem->dev); if (rval) goto err_put_device; =20 --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 E91FEC54EAA for ; Fri, 27 Jan 2023 10:40:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232231AbjA0Kk6 (ORCPT ); Fri, 27 Jan 2023 05:40:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232119AbjA0Kkk (ORCPT ); Fri, 27 Jan 2023 05:40:40 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 731977DB8 for ; Fri, 27 Jan 2023 02:40:31 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id c10-20020a05600c0a4a00b003db0636ff84so3143377wmq.0 for ; Fri, 27 Jan 2023 02:40:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GdVhqoNMJZ7VRQato0f6F3FYR5fTivzxS5e1+eryPnY=; b=HDW24eJJdhwhV+CVT0ICQs/7fTg5iROOF/oAT2IWNdOit9oQq+6DY/kJ9JcNAjZqxD AwrE5rtjUnFMYYNQZBYYBEZfDnPmWEvAF2bLGLLEcgwWNlY1Iht+TSQJdZsR6xmy/L8J BNfZyv7af9V+7kov+7ZUCpbAxlQNVTQHzS/HgHvU2Xgove76KNh7I4FjHTttuqV2YGwx Ezwh+fSWe01rL50JV3EPYJRFPIGn10emy4OuO4Lmnn/Pyg1Yz06lDh4X4bhnAQ51kixG 6STeQ1nZqsLChC7rSPxbInFPWfcGQA2x2BCEZCZCCA5nxkj+xT8h6rqFzt8uBsBUUdis CmTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GdVhqoNMJZ7VRQato0f6F3FYR5fTivzxS5e1+eryPnY=; b=BBLRroVdFnZujjyB2O8ylxGdJOxtLOuAg0yEtIW4pdj6Cv9HCuvEPm5zySQaIVhDr0 SDhDFAv+6LJ88QAsQhbbU3Qpo3peK01WYc8KZH2WzkICeeNslv0uVryXOSpVHaBe1ebi OZPyzYtHxN6aHCHeTopf9P+YboQfI9cTjyuL11SevdwJfIOHKdpvKRnD6ryrBkxAFzcF RUFnfl43VvhN2eNX1Z5s5Yu5j7fyXJ6Bs6Bw0ugsPml4XJa2xIVbf2Z8AGXJKP1jpbJN ahDp89rCGEtHvqJ4U1ifpJGMWTTPr+5YFs/mcZSkJQ9amn1NVeVeJ9CymIbNX0rIVWZ4 Y4Ng== X-Gm-Message-State: AO0yUKV5GexQhe1/ErB7h5t1ZFEGMqpmBxKQLsFRpJ7dUeSaKGheAxNq zpYSuDsdJSjZ/nBUVxMO/n2TXw== X-Google-Smtp-Source: AK7set8JcMnvCSESnDwQu+Bq1VhE1q+tL0dAaWd0SJrFPXPsgc7tN+PE/VIwcc+c06H8/oscScf1Zw== X-Received: by 2002:a05:600c:707:b0:3dc:3577:fdb2 with SMTP id i7-20020a05600c070700b003dc3577fdb2mr1963492wmn.5.1674816030030; Fri, 27 Jan 2023 02:40:30 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:29 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 06/10] nvmem: core: fix registration vs use race Date: Fri, 27 Jan 2023 10:40:11 +0000 Message-Id: <20230127104015.23839-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: "Russell King (Oracle)" The i.MX6 CPU frequency driver sometimes fails to register at boot time due to nvmem_cell_read_u32() sporadically returning -ENOENT. This happens because there is a window where __nvmem_device_get() in of_nvmem_cell_get() is able to return the nvmem device, but as cells have been setup, nvmem_find_cell_entry_by_node() returns NULL. The occurs because the nvmem core registration code violates one of the fundamental principles of kernel programming: do not publish data structures before their setup is complete. Fix this by making nvmem core code conform with this principle. Cc: stable@vger.kernel.org Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem provide= rs") Signed-off-by: Russell King (Oracle) Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ac77a019aed7..e92c6f1aadbb 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -832,22 +832,16 @@ struct nvmem_device *nvmem_register(const struct nvme= m_config *config) nvmem->dev.groups =3D nvmem_dev_groups; #endif =20 - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval =3D device_add(&nvmem->dev); - if (rval) - goto err_put_device; - if (nvmem->nkeepout) { rval =3D nvmem_validate_keepouts(nvmem); if (rval) - goto err_device_del; + goto err_put_device; } =20 if (config->compat) { rval =3D nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_put_device; } =20 if (config->cells) { @@ -864,6 +858,12 @@ struct nvmem_device *nvmem_register(const struct nvmem= _config *config) if (rval) goto err_remove_cells; =20 + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval =3D device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); =20 return nvmem; @@ -873,8 +873,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev); =20 --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 0D6D1C38142 for ; Fri, 27 Jan 2023 10:41:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232349AbjA0KlB (ORCPT ); Fri, 27 Jan 2023 05:41:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232041AbjA0Kkk (ORCPT ); Fri, 27 Jan 2023 05:40:40 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 047C11F5EB for ; Fri, 27 Jan 2023 02:40:33 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id f12-20020a7bc8cc000000b003daf6b2f9b9so5099292wml.3 for ; Fri, 27 Jan 2023 02:40:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sr6CA9xjZwvud8xzQyK6dmW2Ra23HBqhT3DLj1X0by0=; b=rWfW+A9+dX4D+Iqs4/ibFCmB7czEciSj0MHxvMw1Tmmmyw5Kc/22/Ocevvr8+ZlUmS CY7oYhz9T5650eWArL6xtD2IM+VJz5FGEg/MsKDQ5OnTyr2nyOe0nu7rSUhLUlgytMAT PrfBnWL90QlVpCPVPv3neli5edKk+ZWj2Xmus07O4IL7LXRMlITk8Tp31Fu+RgYEqprM nPGzcF9MOywEqrEg3F/WFs635W/g/CnO5YhldqA488+ThVoWyCxEBjW/rGjDUf4VN2kE hcKoaD+FwLjW2xn2medwVmGCEpLwuy2PM12ACAfk9/v1kF6PjP9kw8xP3LRSOQ5AYMZ0 vTBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sr6CA9xjZwvud8xzQyK6dmW2Ra23HBqhT3DLj1X0by0=; b=NC5qygAysWUZbDlGaI3goOcL4CREsFmbYXy7jAbt8wA7ZiuOoMe/vSgUToAr5sovdD so8nKKDgAGE6/uBzBgKBzXavlW12DdcL+1pSl4SYZmpae2LXKaCqaMpsgATzEE1pCgQM g9ttiyLBjvlo741HJOhihH3rZvMQv4S4M3RkdAldc4JlN1DFHZ7jv/Hbg8jMaGWbNqRy z69JumnrQe7XCttrGgUCkn4x104GOlvlG2+fGpMyUJnE4GJOctDQumeII73CyVKdas5X BKK0xEGPHyBelkzNsTgnbyIH1AgifAUahiauZUlA1QoJNJ/YrXG38+EnsYwbVSo6kV9c +nMQ== X-Gm-Message-State: AO0yUKV/bioOBNY9uEWi+2Y0PuOXs5S04sYuzpp9h38zmLNcRaTCyDP+ V3N38jcwdUAX6bx62yLdphO9WA== X-Google-Smtp-Source: AK7set+tOtiGVim8zUWkNPhRPkneuLmW0MBPeqbl6VpXdZ8WBbsM96M8ldJ0TjdGk3S0caS1RL/wKA== X-Received: by 2002:a05:600c:1e0d:b0:3dc:3f1b:6757 with SMTP id ay13-20020a05600c1e0d00b003dc3f1b6757mr728908wmb.15.1674816031564; Fri, 27 Jan 2023 02:40:31 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:30 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Michael Walle , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 07/10] nvmem: core: fix device node refcounting Date: Fri, 27 Jan 2023 10:40:12 +0000 Message-Id: <20230127104015.23839-8-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: Michael Walle In of_nvmem_cell_get(), of_get_next_parent() is used on cell_np. This will decrement the refcount on cell_np, but cell_np is still used later in the code. Use of_get_parent() instead and of_node_put() in the appropriate places. Cc: stable@vger.kernel.org Fixes: 69aba7948cbe("nvmem: Add a simple NVMEM framework for consumers") Fixes: 7ae6478b304b ("nvmem: core: rework nvmem cell instance creation") Signed-off-by: Michael Walle Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index e92c6f1aadbb..cbe5df99db82 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1237,16 +1237,21 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_= node *np, const char *id) if (!cell_np) return ERR_PTR(-ENOENT); =20 - nvmem_np =3D of_get_next_parent(cell_np); - if (!nvmem_np) + nvmem_np =3D of_get_parent(cell_np); + if (!nvmem_np) { + of_node_put(cell_np); return ERR_PTR(-EINVAL); + } =20 nvmem =3D __nvmem_device_get(nvmem_np, device_match_of_node); of_node_put(nvmem_np); - if (IS_ERR(nvmem)) + if (IS_ERR(nvmem)) { + of_node_put(cell_np); return ERR_CAST(nvmem); + } =20 cell_entry =3D nvmem_find_cell_entry_by_node(nvmem, cell_np); + of_node_put(cell_np); if (!cell_entry) { __nvmem_device_put(nvmem); return ERR_PTR(-ENOENT); --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 B82D9C38142 for ; Fri, 27 Jan 2023 10:41:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232373AbjA0KlE (ORCPT ); Fri, 27 Jan 2023 05:41:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232151AbjA0Kkl (ORCPT ); Fri, 27 Jan 2023 05:40:41 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44BB31F907 for ; Fri, 27 Jan 2023 02:40:34 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id bk16so4546584wrb.11 for ; Fri, 27 Jan 2023 02:40:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V8G3RE+j+dO/dQrvTZDNE7AoRlUJelk3u0v90aEJQXY=; b=UdjOVq3P2mbBurpQdtJKye1U57rcIDFK7XwqD+hYVZhXesiUMf+AT0L7WbrC8If9p6 AO9W+wxlSRxPPbUYBizbe7vEwg5jEENu9XvDLSS4P0frN/p0MXMIcLGEOZm9dT4tWz/U 5DUaa2jdMjZmCwlfc2amRXUquiH+myAkL6rjX6eILZD1Y8VpF4HsWZc2AzUVurY/rMQG wYpUUMyvqRp9xYSTAnWvKqgMwcrmLqxKxvF35mZBCEdTC4Rdc8iGcH3xOd+uMwtiUp/q lhGLbSWWO/pEtH+J0i9m3Y+IYQ6oV9x1qT7Ae5QGQyMRU2GPWUUXJMTsQyQiXL1S2NWR qBFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V8G3RE+j+dO/dQrvTZDNE7AoRlUJelk3u0v90aEJQXY=; b=aLNWB+fvWUWzhIoqWRyT7iIZKyPR3atykUwJwO1ew7bgTCY4Jl3wAmvwr1WjLDSH4S 1odWTs7cF/J3TwjsAeuD4rB6/CeDuN6r6XZEH2ES/pBng0pl/sZ1DZUvSTFqax54u+O/ zMah+DtJUSKJ5jIGbrCmTxTHj6AnVhWSTorF/KLoFfgz1+xoYh7a342zGin7EPQrNTei L5nNm1JKtOcb0rNKS4WWwkuqpexttkdpT8B8yjJIJO+Ls1kONy0iybTZ+W1f2RDkGiOx 5YFcy3OmRlPb80y3tkbjyyqT8MfIY73GtyWBj1+MUKYkunr4ICV/OGsYbg2PxgJS8Fv/ BAGQ== X-Gm-Message-State: AO0yUKVlNw0LkHZhcgQXfB9XL6HfLdTkfzkExR6ot9m6wrEkmAB9Cmmw QKFvRbNhKipewGEy1Cxzs4I6YY3lkKP9lxEU X-Google-Smtp-Source: AK7set9uxMkIajlaN8z4Te9EETm0aXqDqUtlHpQBrX2xJc3WrExYC3rY6Jg9atEszh31/n7vSdZtnw== X-Received: by 2002:adf:d23c:0:b0:2bf:cfbc:2f15 with SMTP id k28-20020adfd23c000000b002bfcfbc2f15mr2674461wrh.30.1674816032805; Fri, 27 Jan 2023 02:40:32 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:32 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Michael Walle , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 08/10] nvmem: core: fix cell removal on error Date: Fri, 27 Jan 2023 10:40:13 +0000 Message-Id: <20230127104015.23839-9-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: Michael Walle nvmem_add_cells() could return an error after some cells are already added to the provider. In this case, the added cells are not removed. Remove any registered cells if nvmem_add_cells() fails. Cc: stable@vger.kernel.org Fixes: fa72d847d68d7 ("nvmem: check the return value of nvmem_add_cells()") Signed-off-by: Michael Walle Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index cbe5df99db82..563116405b3d 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -847,7 +847,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) if (config->cells) { rval =3D nvmem_add_cells(nvmem, config->cells, config->ncells); if (rval) - goto err_teardown_compat; + goto err_remove_cells; } =20 rval =3D nvmem_add_cells_from_table(nvmem); @@ -870,7 +870,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) =20 err_remove_cells: nvmem_device_remove_all_cells(nvmem); -err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); err_put_device: --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 99081C54EAA for ; Fri, 27 Jan 2023 10:41:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232435AbjA0KlK (ORCPT ); Fri, 27 Jan 2023 05:41:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232140AbjA0Kkl (ORCPT ); Fri, 27 Jan 2023 05:40:41 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CDEE9EFB for ; Fri, 27 Jan 2023 02:40:35 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id fl11-20020a05600c0b8b00b003daf72fc844so5124730wmb.0 for ; Fri, 27 Jan 2023 02:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZtVH5VgAz17FnfQMHHRW9JT+QmfExCAJP9BmlGuNLdk=; b=fjlWBHiEpuzwg1d05jkEHFOO/cM62PXN6MfAnanzh0WVouI5K1EP7NIOujlWeVVYCC VTuLyWEhTIzqC3hAyKNAwnmCTQ5eRY7vFVirjg0hREvRyKVjhzWj9yIXnz/b6lQc/W5j PX2rlZJ39UP/UoVz0nyQOznwoiCKMsrlO466j4HC45x9tA+lR1Ny8DmOEDSwqoIRV+3D 95C4Jl3SVb676lJRQV8DU9g5FjtdoRrwTiU7feUCX4Kj3qjoSz5Tt4SsUXW2JOYw/d8A DINQcgY3wNLzxl3XVv6BSs1fv6y0zZhBWVtcgTL0fHh4s52Y+V8X4xLoRU+fYWGThbe7 y57w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZtVH5VgAz17FnfQMHHRW9JT+QmfExCAJP9BmlGuNLdk=; b=InJ39XFaQNkYjhjzWpCVH36MLy8fuTl4/UcJKkkig/+a7doy2pO5QlvISnm9YBSla1 bj70f8bssOSLKEAFgWhNWtucEY03/ySYgZctY2IQsIkPutuFFKLytZZFHAWWQNxs+Og6 fxslyP5LPqzzIIk7a8EF3L/2jSrTG3bbBdKVt/yoFO/gGmS2Fck+aH1JYoNHMmWmbP6q ji1y69et2TyLvc1uVUGggA3uLiAsihmk7eefzeH5imtnQF20PrKEl4B5VqQ4dYR+1Q7C so63/dyOvQUc4UFq4hTvgkNnEWa1+maxibrdBXyW3+6Y3b3EoBfbc2/XROqBYpXKCmjv V8Nw== X-Gm-Message-State: AFqh2ko2KhdS1qG2QQqiR2/Y6G12rlAfAQEOKeY5zuZAR09V3qO716an 76vaXpMC8/cXXvGCGHI3OXgElQ== X-Google-Smtp-Source: AMrXdXujOH1FICldoJBBlDeyyg+bBCWxSi9/IVCvoRonFZa9zNcHu5DcrRA/1HLPmcSEZw1egKb3/g== X-Received: by 2002:a05:600c:1d22:b0:3d9:6bc3:b8b9 with SMTP id l34-20020a05600c1d2200b003d96bc3b8b9mr39648893wms.9.1674816034077; Fri, 27 Jan 2023 02:40:34 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:33 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , stable@vger.kernel.org, kernel test robot , Dan Carpenter , Srinivas Kandagatla Subject: [PATCH 09/10] nvmem: core: fix return value Date: Fri, 27 Jan 2023 10:40:14 +0000 Message-Id: <20230127104015.23839-10-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: "Russell King (Oracle)" Dan Carpenter points out that the return code was not set in commit 60c8b4aebd8e ("nvmem: core: fix cleanup after dev_set_name()"), but this is not the only issue - we also need to zero wp_gpio to prevent gpiod_put() being called on an error value. Cc: stable@vger.kernel.org Reported-by: kernel test robot Reported-by: Dan Carpenter Fixes: 60c8b4aebd8e ("nvmem: core: fix cleanup after dev_set_name()") Signed-off-by: Russell King (Oracle) Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 563116405b3d..34ee9d36ee7b 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -783,6 +783,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) { rval =3D PTR_ERR(nvmem->wp_gpio); + nvmem->wp_gpio =3D NULL; goto err_put_device; } =20 --=20 2.25.1 From nobody Sun Sep 14 01:59:03 2025 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 8135BC61DA4 for ; Fri, 27 Jan 2023 10:41:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232268AbjA0KlG (ORCPT ); Fri, 27 Jan 2023 05:41:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232157AbjA0Kkl (ORCPT ); Fri, 27 Jan 2023 05:40:41 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAC5FA5C4 for ; Fri, 27 Jan 2023 02:40:36 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id d4-20020a05600c3ac400b003db1de2aef0so3131454wms.2 for ; Fri, 27 Jan 2023 02:40:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LVFyvvqIkRzvUovTQs0s3jDn0ZcULXdzwuQvtfzyO/k=; b=oV9mSWhHUtgHqeSuyXNG423VqtkTvJp3igDAMP/EKKcM5gDvnZBRMdKQPXFVQK5fFr mLXZy9MWM2/ZsjrwwPm5n4pIFW84n4wwWhSUOn9YEHl48gj/uWUk4RrPZUuqwKuB9Yuj zYqcHPjywp5988sJllSQG7L3aP5BOJH73I/X3U+vG0ba+JqH10Yj+2xPCuPnICZHfTbO Vj4FuO/+L14vJwQ4pH2jen7f37oqFfshizKVGVX87V0Qq46hlgNzkhiln4vRk5s+c2kf f/M0b8mZ6qiMk+iIEh4nNKlznmM5G/jfqsD83O/XLrDZ5CbYy864dW+Q6LyVl1q8Gmrp iWug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LVFyvvqIkRzvUovTQs0s3jDn0ZcULXdzwuQvtfzyO/k=; b=LiuGY1VWGrhm8TnrplFcbIIdQYjHurAD4lsWsFhApBQmja3cW4cGWxxMD/X/Rx8eC0 Jkg20M3tCtmenvcS22+SYN82+eJ8YHg5/B0yZfu3Xr2Zc2o5p1lU1T63ool3BHDTrtt4 187HDvBh0Of7K6wIKxdnjDWCwSzlS2PNpxRQeKsToXBGbbgpuglJygBWWtOuJNEfXOOk dOymLUltWo6bS4YZoS8t02YovlVnvLOmf9HMkB2Hk+j3MZCT9i8ub9BeUO1HOkEz8hnI UQVbTCMKJUQF+kKlg3Eh+PMGcRD1HT1g91qaMJMErwwW5ufRdPf9HTqwv/gQ/CVRMp17 7jlQ== X-Gm-Message-State: AO0yUKUrI3w1yMhnApLLCyosepqkQpzRSnCgU+XbUEuQ0+BFU/i1DCxR ML4mW3FLjYnWPFlPjJVXOdz5bQ== X-Google-Smtp-Source: AK7set+YisgTnmyv5U9Og2xueykLP97orptchBjRMp7KuTHvyRn2RlHaX9IN+VxJ+k+o7JAEQ+Mg6A== X-Received: by 2002:a05:600c:3ca3:b0:3dc:1687:9ba2 with SMTP id bg35-20020a05600c3ca300b003dc16879ba2mr12981094wmb.35.1674816035343; Fri, 27 Jan 2023 02:40:35 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:34 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Bjorn Andersson , Srinivas Kandagatla Subject: [PATCH 10/10] nvmem: qcom-spmi-sdam: fix module autoloading Date: Fri, 27 Jan 2023 10:40:15 +0000 Message-Id: <20230127104015.23839-11-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> 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: Johan Hovold Add the missing module device table so that the driver can be autoloaded when built as a module. Fixes: 40ce9798794f ("nvmem: add QTI SDAM driver") Cc: stable@vger.kernel.org # 5.6 Signed-off-by: Johan Hovold Reviewed-by: Bjorn Andersson Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/qcom-spmi-sdam.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c index 4fcb63507ecd..8499892044b7 100644 --- a/drivers/nvmem/qcom-spmi-sdam.c +++ b/drivers/nvmem/qcom-spmi-sdam.c @@ -166,6 +166,7 @@ static const struct of_device_id sdam_match_table[] =3D= { { .compatible =3D "qcom,spmi-sdam" }, {}, }; +MODULE_DEVICE_TABLE(of, sdam_match_table); =20 static struct platform_driver sdam_driver =3D { .driver =3D { --=20 2.25.1