From patchwork Mon Jun 7 17:23:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12304163 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 1AC81C47082 for ; Mon, 7 Jun 2021 17:26:50 +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 E02726105A for ; Mon, 7 Jun 2021 17:26:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E02726105A 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=MCVi92SULpiV9e3wCTFqoMmEBQYgEyVIFxPbLww7Xqk=; b=yndtuTmF0O7BoR QJlLdzfQyP89E5yQR77P5Lo2ILdlkkpGlb5b7o4+Y12dNzUjA8RDNJ3ExhkIUCsCf/xEUFQSsfSkw tAiryp33Hae5MtWo//erZ1L4QiK0CUaJO7+077C6U3AHMnju6fOflUTG9AKTcOwWXdlanrojxqwNO e1QCVpKfi+XKtTMwma5WOoWsz8zc+XJa4VNNVDr4LVD1flKdVwckqtHxpUfUJFvkTaLSXRjZy+tc7 0hL9ZgQkgovxHuND+WGaIiHUtwIzXrA+JoBREKTYk5gW/H4Unfqh39TGnXZFsGdDOhoIrxfPZzahv BQnkXnzd5z0pasmxLJ3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqIzY-004mER-K8; Mon, 07 Jun 2021 17:24:48 +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 1lqIzJ-004m96-5u for linux-arm-kernel@lists.infradead.org; Mon, 07 Jun 2021 17:24:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623086671; 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=9Kr/vWB+/nwKdeKs8KkDEzQieFV1Y1AcDYKa+Pf56V8=; b=b7xpPuSnbaatdYNPfRFr8WGK5390VSSwdJwoIfVVzYKPAbZW3UzLyK/z3LeKTSM75WqMez 2lXFafO6TbZXdnHpnN2PiBvwiDrD2PCY4neGf6bOQDGkBhFY3FkG3ZcN8w+cITK1QvpzHL aRbSlbfnWYYHCAChYlKwotm2F2cJaq4= Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-500-fzoATg3CMKqC2clU0kZURQ-1; Mon, 07 Jun 2021 13:24:30 -0400 X-MC-Unique: fzoATg3CMKqC2clU0kZURQ-1 Received: by mail-ot1-f69.google.com with SMTP id 59-20020a9d0dc10000b02902a57e382ca1so12029724ots.7 for ; Mon, 07 Jun 2021 10:24:30 -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=9Kr/vWB+/nwKdeKs8KkDEzQieFV1Y1AcDYKa+Pf56V8=; b=ltCYqam51AtN7dUgkc+COaAV7jOwsGlEmbxJdzKoi8NMDp5hDUrj95huGs+2qJ4tOJ qukj4iGgirSHPcGkIuG0ECFq9dZ9e+23ZVR9de7IyuMwEt+lTmpEYVizPXG2tDPIsdSl +Sk+KVPMPbG+CfSh54nCREV4c3OokGhi4V+4sceFLuX1IVCm/7z0R4t5cCYW2qBGPrS5 1wLWzl9fu13elYDqVJPwemkD1hedi+BnOSi5QYNl85VNbGr6drxfDWhmpP6OAqF2JGgS eoQuE0k4XgfnMoDC4XveqRCLEN/focCTinQa2xpV65A49Hd9MmUDBvb5XQnMjMMYDRrU PEvQ== X-Gm-Message-State: AOAM533r13vqHvlZhCukgaXHbeH1ibyvkB2xyAspe+5N29S2ZBHXCEmZ NQxsfiDm58TW7WuX+DWAM+FAxvPVVAGT7UhVzv5eo35eJve8cJ40IhHnboVws/aYkI1EmTcJEsc GpJ2QBl0VTA6mXjPoINnlzXixz1aM5MM7laA= X-Received: by 2002:a05:6830:208c:: with SMTP id y12mr14976940otq.129.1623086669451; Mon, 07 Jun 2021 10:24:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxx+lDqZrglifUpJyQXQIS8VUnzoYQx644bk2oknGt1yXO+O7Fiz78iL3xYwnV4DBj9rU5fJQ== X-Received: by 2002:a05:6830:208c:: with SMTP id y12mr14976930otq.129.1623086669317; Mon, 07 Jun 2021 10:24:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 10:24:29 -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 1/7] fpga: wrap the write_init() op Date: Mon, 7 Jun 2021 10:23:56 -0700 Message-Id: <20210607172402.2938697-2-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_102433_323600_A9CC45F9 X-CRM114-Status: GOOD ( 15.40 ) 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_init() op if there is nothing for it do. So add a wrapper and move the op checking. Default to success. Signed-off-by: Tom Rix --- drivers/fpga/fpga-mgr.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index b85bc47c91a9..24547e36a56d 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -69,6 +69,14 @@ void fpga_image_info_free(struct fpga_image_info *info) } EXPORT_SYMBOL_GPL(fpga_image_info_free); +static int fpga_mgr_write_init(struct fpga_manager *mgr, + struct fpga_image_info *info, + const char *buf, size_t count) +{ + if (mgr->mops && mgr->mops->write_init) + return mgr->mops->write_init(mgr, info, buf, count); + return 0; +} /* * Call the low level driver's write_init function. This will do the * device-specific things to get the FPGA into the state where it is ready to @@ -83,9 +91,9 @@ static int fpga_mgr_write_init_buf(struct fpga_manager *mgr, mgr->state = FPGA_MGR_STATE_WRITE_INIT; if (!mgr->mops->initial_header_size) - ret = mgr->mops->write_init(mgr, info, NULL, 0); + ret = fpga_mgr_write_init(mgr, info, NULL, 0); else - ret = mgr->mops->write_init( + ret = fpga_mgr_write_init( mgr, info, buf, min(mgr->mops->initial_header_size, count)); if (ret) { @@ -569,7 +577,7 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name, int id, ret; if (!mops || !mops->write_complete || !mops->state || - !mops->write_init || (!mops->write && !mops->write_sg) || + (!mops->write && !mops->write_sg) || (mops->write && mops->write_sg)) { dev_err(dev, "Attempt to register without fpga_manager_ops\n"); return NULL;