From patchwork Mon Jun 7 17:23:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12304167 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=-17.0 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,USER_AGENT_GIT autolearn=ham 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 5DE61C47082 for ; Mon, 7 Jun 2021 17:27:14 +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 3036A6108D for ; Mon, 7 Jun 2021 17:27:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3036A6108D 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=kRKzftjKiT825TDHtyc6qQinxcZuzhoeDCYuN8kOT50=; b=L+B1XtVOFxgbSH 23Xmck3dtwtqUGxuqxAIxjzvC5EGiMe3ZK/b7Xvp2/7VDFWEOjO9GVaJtJGg7B0hKOjvibylN17Wy L6XZAKirFRJXUB2z3AYlLw6L6E1VYX3NHH4ZCYwRrN7rdUJdauRA4tbr1gbtKQJayy5U+RRNQDUlq QvfVOtMD1Zvh+Pr2wyyLsaTULfyykENU3fKabwVozblTElCNkXVw5RZutDsHrzNNJbwFo/XMnh1hB DLueThKZo2GP/K2zdB/lZyXMwbJeLhYmfsQcWGwLbyPegqFfEh0s/LuHgh7Bw/OSJaxDBJsKYFJeJ TNv9OY1RjpmfwwjPiePQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqIzy-004mJq-Ct; Mon, 07 Jun 2021 17:25:14 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqIzK-004mAB-DY for linux-arm-kernel@lists.infradead.org; Mon, 07 Jun 2021 17:24:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623086673; 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=SEbyFeW80QMIpdYKjW+aZzDgMZUI77VaMOflkO8h6rs=; b=jRLQYTyzxobljzGt04Zl/L8JCBhGPM03ngsihuIpWrNUx+T0bQ54uehArh8KJp5R1VvDx+ rDcPNsXtOhF2m8a5QXl8nO2ZmAFuHz+PxcR6Y2eCYL+xJuM2hNWjC7rZTUhQkpkqlPgocR 7R8RGsX6ArmP8gxwmXSk8N92ua+8xMc= Received: from mail-oo1-f72.google.com (mail-oo1-f72.google.com [209.85.161.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-mHhsOCbmNSer9oLCnHEbFw-1; Mon, 07 Jun 2021 13:24:32 -0400 X-MC-Unique: mHhsOCbmNSer9oLCnHEbFw-1 Received: by mail-oo1-f72.google.com with SMTP id o21-20020a4ae5950000b0290211a73e7f50so11465493oov.12 for ; Mon, 07 Jun 2021 10:24:32 -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=SEbyFeW80QMIpdYKjW+aZzDgMZUI77VaMOflkO8h6rs=; b=bq2UopldRg4NqCUhbOcygyVykWyScSDS/YMSQYgXmP4HF7SJ/dYCYap7lyYz1sJ7/i VK9n7PDe8PB98JHuxDF3F2HXl3L7VRSY7Ak3C7OccGqL6/OLrPIFC4ksQdXopbH3E5lj ysZT62aOjlpP6Tk5qTHWh0PduRz9rt9QDWPposMZ2x3PJHy+abtVxv3Tsp00ba5I2hKJ UGYoDd3ytbFgFKF9eb/HUrWyEaHQbxDAyHX1DIrgpWIz0r/tMhGJX5/VdN0RokPOttl/ c7MCi/YLSbnVLfudU+F+phYaVULZMy92pCjvIEhjitV+apRkVHZgxnAIHgM3Nff503Mj Ev7g== X-Gm-Message-State: AOAM532xLzEK64AH1tR+1U9Yi8WEi14De7UAFs0+ioPumEO9LVz7LXvc XJHjQsxtwtJ3Cf7jzTzlxSJJA27Ymz8daL3ccamjfE0iBnfplDR8CjUxonxoU4OzR+EW/k4UiO4 jVmoj94/P1XTNLHg1FKRr1kHGnk7lQutk+6Y= X-Received: by 2002:a4a:952b:: with SMTP id m40mr14054021ooi.69.1623086672035; Mon, 07 Jun 2021 10:24:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzU4iBtCJ074OuzGQTVAEsS9VugipnW5FrZyj5UcXmgr+HN+HU4/UgZKKLwOvSNn74uqAKqVw== X-Received: by 2002:a4a:952b:: with SMTP id m40mr14054006ooi.69.1623086671810; Mon, 07 Jun 2021 10:24:31 -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 15sm2409859oij.26.2021.06.07.10.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 10:24:31 -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 3/7] fpga: wrap the write() op Date: Mon, 7 Jun 2021 10:23:58 -0700 Message-Id: <20210607172402.2938697-4-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210607172402.2938697-1-trix@redhat.com> References: <20210607172402.2938697-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-20210607_102434_563060_62582795 X-CRM114-Status: GOOD ( 14.30 ) 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 The board should not be required to provide a write function. Move the op check to the wrapper. Default to -EOPNOTSUP so its users will fail gracefully. Signed-off-by: Tom Rix --- drivers/fpga/fpga-mgr.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index dadad2401502..c484b4309b2f 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -167,6 +167,13 @@ static int fpga_mgr_write_complete(struct fpga_manager *mgr, return 0; } +static int fpga_mgr_write(struct fpga_manager *mgr, const char *buf, size_t count) +{ + if (mgr->mops && mgr->mops->write) + return mgr->mops->write(mgr, buf, count); + return -EOPNOTSUPP; +} + /** * fpga_mgr_buf_load_sg - load fpga from image in buffer from a scatter list * @mgr: fpga manager @@ -203,7 +210,7 @@ static int fpga_mgr_buf_load_sg(struct fpga_manager *mgr, sg_miter_start(&miter, sgt->sgl, sgt->nents, SG_MITER_FROM_SG); while (sg_miter_next(&miter)) { - ret = mgr->mops->write(mgr, miter.addr, miter.length); + ret = fpga_mgr_write(mgr, miter.addr, miter.length); if (ret) break; } @@ -233,7 +240,7 @@ static int fpga_mgr_buf_load_mapped(struct fpga_manager *mgr, * Write the FPGA image to the FPGA. */ mgr->state = FPGA_MGR_STATE_WRITE; - ret = mgr->mops->write(mgr, buf, count); + ret = fpga_mgr_write(mgr, buf, count); if (ret) { dev_err(&mgr->dev, "Error while writing image data to FPGA\n"); mgr->state = FPGA_MGR_STATE_WRITE_ERR; @@ -577,9 +584,7 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name, struct fpga_manager *mgr; int id, ret; - if (!mops || !mops->state || - (!mops->write && !mops->write_sg) || - (mops->write && mops->write_sg)) { + if (!mops || !mops->state) { dev_err(dev, "Attempt to register without fpga_manager_ops\n"); return NULL; }