Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640AbdIMUtT (ORCPT ); Wed, 13 Sep 2017 16:49:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:49814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392AbdIMUtP (ORCPT ); Wed, 13 Sep 2017 16:49:15 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6755F21E91 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=atull@kernel.org From: Alan Tull To: Moritz Fischer Cc: Alan Tull , linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH v4 16/18] fpga: of-fpga-region: accept overlays that don't program FPGA Date: Wed, 13 Sep 2017 15:48:39 -0500 Message-Id: <20170913204841.2730-17-atull@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170913204841.2730-1-atull@kernel.org> References: <20170913204841.2730-1-atull@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1203 Lines: 43 The FPGA may already have a static image programmed when Linux boots. In that case a DT overlay may be used to add the devices that already exist. This commit allows that by shuffling the order of some checks. Signed-off-by: Alan Tull --- v4: Patch added to patchset in v4 --- drivers/fpga/of-fpga-region.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c index 1797057..d942ae1 100644 --- a/drivers/fpga/of-fpga-region.c +++ b/drivers/fpga/of-fpga-region.c @@ -298,18 +298,19 @@ static int of_fpga_region_notify_pre_apply(struct fpga_region *region, struct fpga_image_info *info; int ret; - if (region->info) { - dev_err(dev, "Region already has overlay applied.\n"); - return -EINVAL; - } - info = of_fpga_region_parse_ov(region, nd->overlay); if (IS_ERR(info)) return PTR_ERR(info); + /* If overlay doesn't program the FPGA, accept it anyway. */ if (!info) return 0; + if (region->info) { + dev_err(dev, "Region already has overlay applied.\n"); + return -EINVAL; + } + region->info = info; ret = fpga_region_program_fpga(region); if (ret) { -- 2.7.4