From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D926C433E0 for ; Sat, 23 Jan 2021 23:35:57 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4DF022CF6 for ; Sat, 23 Jan 2021 23:35:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4DF022CF6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0Iya+AaqWDLP6gVb8hdItMPKv/6uuHM6yisMpdvBnRk=; b=lA41EeDpt7hJcOCvIXFG8L6P6 T91VZ5QLoaKyOeBSSAHnoqd9hjgnVZ/1SeOLJ14KxEi5WdIx7IxMYqdWqJSc94FCihVsOR38tDRIR b7H4hm5RMhJgsju8+mGg0WBB7veZURjxLZIt5mLZYOV+/ABf2ZjMz9Xt0BK2aHaqy4iug8QBO+Afd HM5ovpJpV1JyRoGfjBf02zRj8SONGq44jmm2o61WxvwjgbLA0mWStJUJDxCM1OZr2NQI1cQXbNj78 WVzXsJeSa91BdK5xgCsrG1NuvTH1ER1WRVCGtzTn4eKgKMrdEj5o201lL2v4SeVoASfJpo/A98MTS qJ9UTb9HA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3SPc-0000og-AN; Sat, 23 Jan 2021 23:33:48 +0000 Received: from mail-pf1-f181.google.com ([209.85.210.181]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3SPZ-0000o7-09 for linux-arm-kernel@lists.infradead.org; Sat, 23 Jan 2021 23:33:46 +0000 Received: by mail-pf1-f181.google.com with SMTP id i63so6183231pfg.7 for ; Sat, 23 Jan 2021 15:33:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QAiIP8gQDPwczslWL4ZzqONRkPCYYFJ6gqUffbnV6eM=; b=syRjyWNYpWguCkeAlYf33syrR1gpegw4PdvGIQaAF51TFoXrKjwQzLAZEaBLpqXaiO xiuDPsCMmVle+UrwQHBMd6iwiIeWyhz8qH/kQWfsCTkxmmZwaRCasDmRLHsc5yX4BHIo gC3Mdti4+z58TaymFlHxuQOeXXfJDF6mIJ4e4hsj3PKbiaJycp8j9w9md2YFtlzgJBQk tySo1oRMFf/o2ffMWqTpMJPUwSqEgs7z7sSWjodyY7MQxwrOMrqcLRcPWhzr8X/NniW8 OORDmThZJas5y2YVw29KNC7RT93xFpprbq4oiGIii7dHR+0ebD5SN8ak+akiBXQCYK/7 mBBQ== X-Gm-Message-State: AOAM530r9kghKaDtOq/ibqvv1Sji24/BlfX+lKSg+L5VdGD3tKhRO0cm LgD3dVHJFcyQgwyEV16JrPQ= X-Google-Smtp-Source: ABdhPJy2ENJOW2QIEdiQN7/uOoLww1B1cg9Ku7TYBwT4NyGrzyHZ9NM59BBFaHrY65oIDcr86ZBVFQ== X-Received: by 2002:a63:fc56:: with SMTP id r22mr8420141pgk.3.1611444822071; Sat, 23 Jan 2021 15:33:42 -0800 (PST) Received: from localhost ([2601:647:5b00:1161:a4cc:eef9:fbc0:2781]) by smtp.gmail.com with ESMTPSA id y67sm12890498pfb.211.2021.01.23.15.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 15:33:40 -0800 (PST) Date: Sat, 23 Jan 2021 15:33:39 -0800 From: Moritz Fischer To: Nava kishore Manne Subject: Re: [PATCH 3/3] fpga: versal-fpga: Add versal fpga manager driver Message-ID: References: <20210118024318.9530-1-nava.manne@xilinx.com> <20210118024318.9530-3-nava.manne@xilinx.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210123_183345_095564_8C6536C2 X-CRM114-Status: GOOD ( 42.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "devicetree@vger.kernel.org" , "trix@redhat.com" , "linux-fpga@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "robh+dt@kernel.org" , Moritz Fischer , git , Michal Simek , Appana Durga Kedareswara Rao , "linux-arm-kernel@lists.infradead.org" , "chinnikishore369@gmail.com" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Nava, On Fri, Jan 22, 2021 at 10:34:15AM +0000, Nava kishore Manne wrote: > Hi Moritz, > > Thanks for the review. > Please find my response inline. > > > -----Original Message----- > > From: Moritz Fischer > > Sent: Tuesday, January 19, 2021 6:03 AM > > To: Nava kishore Manne > > Cc: mdf@kernel.org; trix@redhat.com; robh+dt@kernel.org; Michal Simek > > ; linux-fpga@vger.kernel.org; > > devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux- > > kernel@vger.kernel.org; git ; chinnikishore369@gmail.com; > > Appana Durga Kedareswara Rao > > Subject: Re: [PATCH 3/3] fpga: versal-fpga: Add versal fpga manager driver > > > > Hi Nava, > > > > On Mon, Jan 18, 2021 at 08:13:18AM +0530, Nava kishore Manne wrote: > > > This patch adds driver for versal fpga manager. > > Nit: Add support for Xilinx Versal FPGA manager > > Will fix in v2. > > > > > > > PDI source type can be DDR, OCM, QSPI flash etc.. > > No idea what PDI is :) > > Programmable device image (PDI). > This file is generated by Xilinx Vivado tool and it contains configuration data objects. > > > > But driver allocates memory always from DDR, Since driver supports > > > only DDR source type. > > > > > > Signed-off-by: Appana Durga Kedareswara rao > > > > > > Signed-off-by: Nava kishore Manne > > > --- > > > drivers/fpga/Kconfig | 8 ++ > > > drivers/fpga/Makefile | 1 + > > > drivers/fpga/versal-fpga.c | 149 > > > +++++++++++++++++++++++++++++++++++++ > > > 3 files changed, 158 insertions(+) > > > create mode 100644 drivers/fpga/versal-fpga.c > > > > > > diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index > > > 5645226ca3ce..9f779c3a6739 100644 > > > --- a/drivers/fpga/Kconfig > > > +++ b/drivers/fpga/Kconfig > > > @@ -216,4 +216,12 @@ config FPGA_MGR_ZYNQMP_FPGA > > > to configure the programmable logic(PL) through PS > > > on ZynqMP SoC. > > > > > > +config FPGA_MGR_VERSAL_FPGA > > > + tristate "Xilinx Versal FPGA" > > > + depends on ARCH_ZYNQMP || COMPILE_TEST > > > + help > > > + Select this option to enable FPGA manager driver support for > > > + Xilinx Versal SOC. This driver uses the versal soc firmware > > > + interface to load programmable logic(PL) images > > > + on versal soc. > > > endif # FPGA > > > diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index > > > d8e21dfc6778..40c9adb6a644 100644 > > > --- a/drivers/fpga/Makefile > > > +++ b/drivers/fpga/Makefile > > > @@ -18,6 +18,7 @@ obj-$(CONFIG_FPGA_MGR_TS73XX) += > > ts73xx-fpga.o > > > obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o > > > obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o > > > obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o > > > +obj-$(CONFIG_FPGA_MGR_VERSAL_FPGA) += versal-fpga.o > > > obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o > > > obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o > > > > > > diff --git a/drivers/fpga/versal-fpga.c b/drivers/fpga/versal-fpga.c > > > new file mode 100644 index 000000000000..2a42aa78b182 > > > --- /dev/null > > > +++ b/drivers/fpga/versal-fpga.c > > > @@ -0,0 +1,149 @@ > > > +// SPDX-License-Identifier: GPL-2.0+ > > > +/* > > > + * Copyright (C) 2021 Xilinx, Inc. > > > + */ > > > + > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > + > > > +/* Constant Definitions */ > > > +#define PDI_SOURCE_TYPE 0xF > > > + > > > +/** > > > + * struct versal_fpga_priv - Private data structure > > > + * @dev: Device data structure > > > + * @flags: flags which is used to identify the PL Image type > > > + */ > > > +struct versal_fpga_priv { > > > + struct device *dev; > > > + u32 flags; > > This seems unused ... please introduce them when/if you start using them. > > Will fix in v2. > > > > +}; > > > + > > > +static int versal_fpga_ops_write_init(struct fpga_manager *mgr, > > > + struct fpga_image_info *info, > > > + const char *buf, size_t size) { > > > + struct versal_fpga_priv *priv; > > > + > > > + priv = mgr->priv; > > > + priv->flags = info->flags; > > ? What uses this ? It seems this function could just be 'return 0' right now. > > Will fix in v2. > > > > + > > > + return 0; > > > +} > > > + > > > +static int versal_fpga_ops_write(struct fpga_manager *mgr, > > > + const char *buf, size_t size) > > > +{ > > > + struct versal_fpga_priv *priv; > > > + dma_addr_t dma_addr = 0; > > > + char *kbuf; > > > + int ret; > > > + > > > + priv = mgr->priv; > > > + > > > + kbuf = dma_alloc_coherent(priv->dev, size, &dma_addr, > > GFP_KERNEL); > > > + if (!kbuf) > > > + return -ENOMEM; > > > + > > > + memcpy(kbuf, buf, size); > > > + > > > + wmb(); /* ensure all writes are done before initiate FW call */ > > > + > > > + ret = zynqmp_pm_load_pdi(PDI_SOURCE_TYPE, dma_addr); > > > + > > > + dma_free_coherent(priv->dev, size, kbuf, dma_addr); > > > + > > > + return ret; > > > +} > > > + > > > +static int versal_fpga_ops_write_complete(struct fpga_manager *mgr, > > > + struct fpga_image_info *info) > > > +{ > > > + return 0; > > > +} > > > + > > > +static enum fpga_mgr_states versal_fpga_ops_state(struct fpga_manager > > > +*mgr) { > > > + return FPGA_MGR_STATE_OPERATING; > > Is that always the case? Shouldn't that be FPGA_MGR_STATE_UNKNOWN? > > For Versal SoC base PDI is always configured prior to Linux boot up. So I make the fpga state as OPERATING. > Please let know if it is not a proper implementation will think about the alternate solution. So you're saying I can't boot a Versal SoC without a PDI / Bitstream loaded? Interesting :) > > > > +} > > > + > > > +static const struct fpga_manager_ops versal_fpga_ops = { > > > + .state = versal_fpga_ops_state, > > > + .write_init = versal_fpga_ops_write_init, > > > + .write = versal_fpga_ops_write, > > > + .write_complete = versal_fpga_ops_write_complete, }; > > > + > > > +static int versal_fpga_probe(struct platform_device *pdev) { > > > + struct device *dev = &pdev->dev; > > > + struct versal_fpga_priv *priv; > > > + struct fpga_manager *mgr; > > > + int err, ret; > > Please pick one, err or ret. 'err' seems unused? > > Will fix in v2. > > > > + > > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > > > + if (!priv) > > > + return -ENOMEM; > > > + > > > + priv->dev = dev; > > > + ret = dma_set_mask_and_coherent(&pdev->dev, > > DMA_BIT_MASK(32)); > > > + if (ret < 0) { > > > + dev_err(dev, "no usable DMA configuration"); > > Nit: "no usable DMA configuration\n" > > Will fix in v2. > > > > + return ret; > > > + } > > > + > > > + mgr = devm_fpga_mgr_create(dev, "Xilinx Versal FPGA Manager", > > > + &versal_fpga_ops, priv); > > > + if (!mgr) > > > + return -ENOMEM; > > > + > > > + platform_set_drvdata(pdev, mgr); > > > + > > > > Replace this part: > > > + err = fpga_mgr_register(mgr); > > > + if (err) { > > > + dev_err(dev, "unable to register FPGA manager"); > > > + fpga_mgr_free(mgr); > > > + return err; > > > + } > > > > with: > > return devm_fpga_mgr_register(mgr); > > > > I tried to get rid of the boilerplate, since every driver repeats it (and above > > calling fpga_mgr_free(mgr) on a devm_fpga_mgr_create() created FPGA > > manager is wrong?) :) > > Thanks for pointing it. Will fix in v2. > > > > + > > > + return 0; > > > +} > > > + > > > > Then > > > +static int versal_fpga_remove(struct platform_device *pdev) { > > > + struct fpga_manager *mgr = platform_get_drvdata(pdev); > > > + > > > + fpga_mgr_unregister(mgr); > > > + fpga_mgr_free(mgr); > > > + > > > + return 0; > > > +} > > drop this since cleanup is now automatic. > > Thanks for pointing it. Will fix in v2. > > > > + > > > +static const struct of_device_id versal_fpga_of_match[] = { > > > + { .compatible = "xlnx,versal-fpga", }, > > > + {}, > > > +}; > > > + > > Nit: Drop the newline > > Will fix in v2. > > > > +MODULE_DEVICE_TABLE(of, versal_fpga_of_match); > > > + > > > +static struct platform_driver versal_fpga_driver = { > > > + .probe = versal_fpga_probe, > > > + .remove = versal_fpga_remove, > > > + .driver = { > > > + .name = "versal_fpga_manager", > > > + .of_match_table = of_match_ptr(versal_fpga_of_match), > > > + }, > > > +}; > > > + > > Nit: Drop the newline > > Will fix in v2. > > Regards, > Navakishore. - Moritz _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel