From: Alan Tull Date: Wed, 15 Nov 2017 20:20:18 +0000 (-0600) Subject: fpga: region: fix slow warning with more than one overlay X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ed81f5fc3c35c22d0fc62813cfa4e11b6aea0a64;p=openwrt%2Fstaging%2Fblogic.git fpga: region: fix slow warning with more than one overlay When DT overlays are applied, each FPGA region keeps track of the fpga image info as region->info. This pointer is assigned only if an overlay causes the FPGA to be programmed. As it stands, this pointer can be overwritten, causing a slow warning later when overlays are removed. This patch fixes this by changing the allowed behaviour. If a region has received an overlay that programmed the FPGA, reject other overlays that try to program the FPGA. To reprogram the FPGA, first remove the overlay. This makes sense as removing the overlay also removes the devices cleanly. Note that overlays that make DT changes without reprogramming the FPGA are exempt from this restriction. Signed-off-by: Alan Tull Acked-by: Moritz Fischer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c index afac5433978b..35af952a889a 100644 --- a/drivers/fpga/fpga-region.c +++ b/drivers/fpga/fpga-region.c @@ -355,6 +355,11 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region, const char *firmware_name; int ret; + if (region->info) { + dev_err(dev, "Region already has overlay applied.\n"); + return -EINVAL; + } + /* * Reject overlay if child FPGA Regions added in the overlay have * firmware-name property (would mean that an FPGA region that has