From patchwork Tue Jun 8 19:55:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12308065 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=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 3D5BCC47082 for ; Tue, 8 Jun 2021 19:58:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 130A56024A for ; Tue, 8 Jun 2021 19:58:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 130A56024A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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=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=bwrbkhBqjlIXbNXfRvx8/4rQfrUSIMDwi5ZydB5Ur+Y=; b=JLNFkDEkityp5V oTFabXEwui9lXjn8L1MROTMpJ78h2a9RxWJb8O5ag4NzKR1bl1xfZZ3qb1mFXUH7j5/TUiS5nYS4x fjLAchmQQTOSdbiqsMRk5IDL5Jvf/ctcld+3mMWLCU0FViAepTSOPUoL3g7cCBU72LvA3WBUec3GL e0Kzsz15ain/evHFUW+r6lASSF05ZgWsKVNLXaujbnwKVTXO4EFvoLqDJJDTg8EEsUNb0IJsUBlSw ih45zXdaX6xGgib7JBYG2YJPNcQn6LaJbPq4TytxcpI93sEyopJ7LnrCmpTyuSB5oSXE8OP1uBAsI YPfXkVWEAtdA1RlFestw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqhpq-00AK6Q-QA; Tue, 08 Jun 2021 19:56:27 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqhom-00AIiM-0p for linux-arm-kernel@lists.infradead.org; Tue, 08 Jun 2021 19:55:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623182119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ik8JGUYI3/+hbO9x+DDmD96jPOqQ4zVk4ycCcPjNv+o=; b=GTCkQ0CEbe6tNUS+r8exj5ZTbYCPS9h69WuXdoTCd3QVYhxqhsqpNhg9HbAhZjLYyOXD7Z qBbDLpbyzT8F5kFV5LE8up8bpaFpuseaYdDua3CYqr0Z7ApR/GD9wY/BZ609EaB+/19w4d U3nfQY+JYdzDhFyrztxXKAmil2KfHRY= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-HVY2EN5kNBWB6yglVgFn9g-1; Tue, 08 Jun 2021 15:55:15 -0400 X-MC-Unique: HVY2EN5kNBWB6yglVgFn9g-1 Received: by mail-ot1-f72.google.com with SMTP id 88-20020a9d06e10000b029030513a66c79so14700647otx.0 for ; Tue, 08 Jun 2021 12:55:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ik8JGUYI3/+hbO9x+DDmD96jPOqQ4zVk4ycCcPjNv+o=; b=XafGrXpGWTgUB2ibTmEJBM0kemug18skdxqHi/4YuzDvUqgdJLX5c86zZw4Iob8tTs bWi6Qp8t57/Ud0HYYOsGYnmKED/mQbAVqLRR82ytQX6GmoCgdDTCLU5N2DDNnkgZoj7v 8gJ+sl1Y+nfaimOvg/Jyixu2iZvuGp4ZPnunt0GbfSiGCeZLcGsYI0XftCqzIhOMeAxO GgGGvjpsvKY12EkzyjH579DJnrQwZ/aGMcxF+2/UqClGmOFDTpwiLbcAoIecKKslOx2r LJJ0Y+55MvDLWxBKngsCgHJHmhFC+Pxgemq+y2dzh/LYTPB8JwAdeiMz/i0dR/eiRyxE 6gfQ== X-Gm-Message-State: AOAM53095dg4cqx4CNcMe78nbJo6f9G//kp00uFDWFfY968jq2lf4+fJ 3NAi0bGWvQNoh8Fnl79Hnam8XUBZj9ySBLKnUjgjiXEAUOuoAJRHhWZCeohpQ5emVlI6l2PJnFN twS8e7Z4zqya0iHY4AaShTn7Taz/BydjeJic= X-Received: by 2002:aca:1a05:: with SMTP id a5mr3820095oia.26.1623182115009; Tue, 08 Jun 2021 12:55:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4gcno8v2BQWArONVSZdl6j/JvTWxDq9sZDI7o76liP0AeU55RDfKdp5C+vsmCglW/+gol4w== X-Received: by 2002:aca:1a05:: with SMTP id a5mr3820083oia.26.1623182114836; Tue, 08 Jun 2021 12:55:14 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id s17sm3024046oog.31.2021.06.08.12.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 12:55:14 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, michal.simek@xilinx.com Cc: linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH v2 2/7] fpga-mgr: make write_complete() op optional Date: Tue, 8 Jun 2021 12:55:01 -0700 Message-Id: <20210608195506.3022550-4-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210608195506.3022550-1-trix@redhat.com> References: <20210608195506.3022550-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210608_125520_248637_3A79F6A3 X-CRM114-Status: GOOD ( 14.63 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Tom Rix An FPGA manager should not be required to provide a write_complete function if there is nothing. Move the op check to the existing wrapper. Default to success. Remove noop function. Signed-off-by: Tom Rix --- drivers/fpga/fpga-mgr.c | 7 ++++--- drivers/fpga/zynqmp-fpga.c | 7 ------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index 24547e36a56d8..dadad24015020 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -152,10 +152,11 @@ static int fpga_mgr_write_init_sg(struct fpga_manager *mgr, static int fpga_mgr_write_complete(struct fpga_manager *mgr, struct fpga_image_info *info) { - int ret; + int ret = 0; mgr->state = FPGA_MGR_STATE_WRITE_COMPLETE; - ret = mgr->mops->write_complete(mgr, info); + if (mgr->mops && mgr->mops->write_complete) + ret = mgr->mops->write_complete(mgr, info); if (ret) { dev_err(&mgr->dev, "Error after writing image data to FPGA\n"); mgr->state = FPGA_MGR_STATE_WRITE_COMPLETE_ERR; @@ -576,7 +577,7 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name, struct fpga_manager *mgr; int id, ret; - if (!mops || !mops->write_complete || !mops->state || + if (!mops || !mops->state || (!mops->write && !mops->write_sg) || (mops->write && mops->write_sg)) { dev_err(dev, "Attempt to register without fpga_manager_ops\n"); diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c index 125743c9797ff..9efbd70aa6864 100644 --- a/drivers/fpga/zynqmp-fpga.c +++ b/drivers/fpga/zynqmp-fpga.c @@ -66,12 +66,6 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr, return ret; } -static int zynqmp_fpga_ops_write_complete(struct fpga_manager *mgr, - struct fpga_image_info *info) -{ - return 0; -} - static enum fpga_mgr_states zynqmp_fpga_ops_state(struct fpga_manager *mgr) { u32 status = 0; @@ -87,7 +81,6 @@ static const struct fpga_manager_ops zynqmp_fpga_ops = { .state = zynqmp_fpga_ops_state, .write_init = zynqmp_fpga_ops_write_init, .write = zynqmp_fpga_ops_write, - .write_complete = zynqmp_fpga_ops_write_complete, }; static int zynqmp_fpga_probe(struct platform_device *pdev)