From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933637AbdKOUV3 (ORCPT ); Wed, 15 Nov 2017 15:21:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:58400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933582AbdKOUUo (ORCPT ); Wed, 15 Nov 2017 15:20:44 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0EA521929 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: Greg Kroah-Hartman Cc: Moritz Fischer , Alan Tull , linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH v6 16/18] fpga: of-fpga-region: accept overlays that don't program FPGA Date: Wed, 15 Nov 2017 14:20:26 -0600 Message-Id: <1510777228-4291-17-git-send-email-atull@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510777228-4291-1-git-send-email-atull@kernel.org> References: <1510777228-4291-1-git-send-email-atull@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Moritz Fischer --- v4: Patch added to patchset in v4 v5: no change to this patch in this version of patchset v6: Add Moritz' ack --- 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 1533506..c6b2119 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