From patchwork Fri Oct 20 13:18:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13430728 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04D87CDB474 for ; Fri, 20 Oct 2023 13:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+m+dfuutettHBvHXQuY23wX34f2vlZyCfmCD0mpWr8Y=; b=dxdpXNy+vzd6gF JKUD44nYByFsAXycB/AzWlOzaRPUPKw1PmPxqUv/7QLjvYMQXkK/FKBi5yAnTh4hV+NsbjcfSUovK bf6flpJPwc8Clsr0CWjrFn6wEAeMduD4IrZKUefVuEL/g8/ipSdCjkKaoOGA80KeUUZkbXvbF1ucA gztN7HvKD39w0On7lBOLYa4vBHfdMdGX4a5tvKymVz71EQ66SE8JeawMvo//wKpCYCEIx57qSnvGH tpSEADDBQHoEWEBQC6nClZLV7y/n1Hpwchx90aYNPNrjxq06FdulqnXND7LBeOYjDoW2mTEN9ktaG 7kjsmXIp9zKnSCrYk+Rg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qtpPb-002Lzj-32; Fri, 20 Oct 2023 13:19:36 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qtpPX-002Lxb-16 for linux-riscv@lists.infradead.org; Fri, 20 Oct 2023 13:19:33 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id C35E2CE3890; Fri, 20 Oct 2023 13:19:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 026B7C433CB; Fri, 20 Oct 2023 13:19:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697807969; bh=s9lAxVx/i8gVhbCv8vLi9IgysjBUEs18NVeWcNYj0Ec=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=V28Owap/115KRZtkoCQubejXzzzg6bOYaD0AOjNoqdvDVQhqjblDi/pRNwp/RtXe4 TV9nryX4zRaKt8EQx4SouxE0TGlGUjsAgAIVcdFg7LTfqIiSIZTEXfy/ogHEn94rCl qs+w93fOQ8KdwkEqYFUrrFLJNBh4EaAqJ2155djj4dB29yJQSX+7HXtuzh2yJGn6pB qwa5Jia+FOGUfzKSMCvscYN6EfuKupbgXjSVyghQLJp+l9D/fK9QL0Nyzw8OFg6p3g GmJPTZ/trSPImGPqAqzLcTiWhZoMlztL8zNTlkXZnsCFIAINThdLPQniGj3qA4jAbM BAWI+m3/kKroQ== From: Conor Dooley To: soc@kernel.org Cc: conor@kernel.org, Conor Dooley , Arnd Bergmann , Daire McNamara , Rob Herring , Krzysztof Kozlowski , Moritz Fischer , Wu Hao , Xu Yilun , Tom Rix , Russ Weight , linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH v3 2/6] soc: microchip: mpfs: enable access to the system controller's flash Date: Fri, 20 Oct 2023 14:18:40 +0100 Message-Id: <20231020-resigned-discourse-02c29c98b1f5@spud> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231020-agreeably-filing-3d48708e6262@spud> References: <20231020-agreeably-filing-3d48708e6262@spud> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3433; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=Q11Jo2EG71WcgZFIltWFHfbZ08soufDP+iiZnaYdgts=; b=owGbwMvMwCFWscWwfUFT0iXG02pJDKlGdbomjU0aG0QObtz1KrZm9sUXvywaQ6b5HDqosiBxK ot+4fITHaUsDGIcDLJiiiyJt/tapNb/cdnh3PMWZg4rE8gQBi5OAZiIhCojwwbBrTWsqnmLQmaw ML2Lm7et+Vj6zl1GPdMaZd6Le7EvjGJk2Jn1O0297/k0yzDtnr2eT0+t+lTWdiulcvLyVQ+y03+ /ZQIA X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231020_061931_722663_74044101 X-CRM114-Status: GOOD ( 19.01 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley The system controller has a flash that contains images used to reprogram the FPGA using IAP (In-Application Programming). Introduce a function that allows a driver with a reference to the system controller to get one to a flash device attached to it. Signed-off-by: Conor Dooley --- drivers/soc/microchip/Kconfig | 1 + drivers/soc/microchip/mpfs-sys-controller.c | 20 ++++++++++++++++++++ include/soc/microchip/mpfs.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/drivers/soc/microchip/Kconfig b/drivers/soc/microchip/Kconfig index eb656b33156b..9b0fdd95276e 100644 --- a/drivers/soc/microchip/Kconfig +++ b/drivers/soc/microchip/Kconfig @@ -1,6 +1,7 @@ config POLARFIRE_SOC_SYS_CTRL tristate "POLARFIRE_SOC_SYS_CTRL" depends on POLARFIRE_SOC_MAILBOX + depends on MTD help This driver adds support for the PolarFire SoC (MPFS) system controller. diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c index fbcd5fd24d7c..829d6c511efc 100644 --- a/drivers/soc/microchip/mpfs-sys-controller.c +++ b/drivers/soc/microchip/mpfs-sys-controller.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include #include #include @@ -30,6 +32,7 @@ struct mpfs_sys_controller { struct mbox_client client; struct mbox_chan *chan; struct completion c; + struct mtd_info *flash; struct kref consumers; }; @@ -99,6 +102,12 @@ static void mpfs_sys_controller_put(void *data) kref_put(&sys_controller->consumers, mpfs_sys_controller_delete); } +struct mtd_info *mpfs_sys_controller_get_flash(struct mpfs_sys_controller *mpfs_client) +{ + return mpfs_client->flash; +} +EXPORT_SYMBOL(mpfs_sys_controller_get_flash); + static struct platform_device subdevs[] = { { .name = "mpfs-rng", @@ -114,12 +123,23 @@ static int mpfs_sys_controller_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct mpfs_sys_controller *sys_controller; + struct device_node *np; int i, ret; sys_controller = kzalloc(sizeof(*sys_controller), GFP_KERNEL); if (!sys_controller) return -ENOMEM; + np = of_parse_phandle(dev->of_node, "microchip,bitstream-flash", 0); + if (!np) + goto no_flash; + + sys_controller->flash = of_get_mtd_device_by_node(np); + of_node_put(np); + if (IS_ERR(sys_controller->flash)) + return dev_err_probe(dev, PTR_ERR(sys_controller->flash), "Failed to get flash\n"); + +no_flash: sys_controller->client.dev = dev; sys_controller->client.rx_callback = mpfs_sys_controller_rx_callback; sys_controller->client.tx_block = 1U; diff --git a/include/soc/microchip/mpfs.h b/include/soc/microchip/mpfs.h index f916dcde457f..09722f83b0ca 100644 --- a/include/soc/microchip/mpfs.h +++ b/include/soc/microchip/mpfs.h @@ -38,6 +38,8 @@ int mpfs_blocking_transaction(struct mpfs_sys_controller *mpfs_client, struct mp struct mpfs_sys_controller *mpfs_sys_controller_get(struct device *dev); +struct mtd_info *mpfs_sys_controller_get_flash(struct mpfs_sys_controller *mpfs_client); + #endif /* if IS_ENABLED(CONFIG_POLARFIRE_SOC_SYS_CTRL) */ #if IS_ENABLED(CONFIG_MCHP_CLK_MPFS)