Commit f877a18c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-5.8' of... 

Merge tag 'fpga-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga

 into char-misc-next

Moritz writes:

FPGA Manager changes for 5.8

Here's the first set of changes for the 5.8-rc1 merge window.

Dominic's change adds support for accessing AFU regions with gdb.
Gustavo's change is a cleanup patch regarding variable lenght arrays.
Richard's changes update dt-bindings and add support for stratix and agilex.
Sergiu's changes update spi transfers with the new delay field.
Xu's change addresses an issue with a wrong return value.
Shubhrajyoti's change makes the Zynq FPGA driver return -EPROBE_DEFER on
check of devm_clk_get failure.
Xu's change for DFL enables multiple opens.

All of these patches have been reviewed, have appropriate Acked-by's and
have been in the last few linux-next releases without issues.

Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>

* tag 'fpga-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  fpga: dfl: afu: support debug access to memory-mapped afu regions
  fpga: dfl.h: Replace zero-length array with flexible-array member
  arm64: dts: agilex: correct service layer driver's compatible value
  dt-bindings, firmware: add compatible value Intel Stratix10 service layer binding
  fpga: stratix10-soc: add compatible property value for intel agilex
  arm64: dts: agilex: correct FPGA manager driver's compatible value
  dt-bindings: fpga: add compatible value to Stratix10 SoC FPGA manager binding
  fpga: machxo2-spi: Use new structure for SPI transfer delays
  fpga: ice40-spi: Use new structure for SPI transfer delays
  fpga: dfl: support multiple opens on feature device node.
parents 84c1e51d a2b9d4ea

Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Required properties: 
The svc node has the following mandatory properties, must be located under

the firmware node.



- compatible: "intel,stratix10-svc"

- compatible: "intel,stratix10-svc" or "intel,agilex-svc"

- method: smc or hvc

        smc - Secure Monitor Call

        hvc - Hypervisor Call

Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Required properties: 
The fpga_mgr node has the following mandatory property, must be located under

firmware/svc node.



- compatible : should contain "intel,stratix10-soc-fpga-mgr"

- compatible : should contain "intel,stratix10-soc-fpga-mgr" or

	       "intel,agilex-soc-fpga-mgr"



Example:

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -539,12 +539,12 @@ 


		firmware {

			svc {

				compatible = "intel,stratix10-svc";

				compatible = "intel,agilex-svc";

				method = "smc";

				memory-region = <&service_reserved>;



				fpga_mgr: fpga-mgr {

					compatible = "intel,stratix10-soc-fpga-mgr";

					compatible = "intel,agilex-soc-fpga-mgr";

				};

			};

		};

drivers/fpga/dfl-afu-main.c

+24 −11
Original line number Diff line number Diff line
@@ -561,14 +561,16 @@ static int afu_open(struct inode *inode, struct file *filp) 
	if (WARN_ON(!pdata))

		return -ENODEV;



	ret = dfl_feature_dev_use_begin(pdata);

	if (ret)

		return ret;



	dev_dbg(&fdev->dev, "Device File Open\n");

	mutex_lock(&pdata->lock);

	ret = dfl_feature_dev_use_begin(pdata, filp->f_flags & O_EXCL);

	if (!ret) {

		dev_dbg(&fdev->dev, "Device File Opened %d Times\n",

			dfl_feature_dev_use_count(pdata));

		filp->private_data = fdev;

	}

	mutex_unlock(&pdata->lock);



	return 0;

	return ret;

}



static int afu_release(struct inode *inode, struct file *filp)
@@ -581,12 +583,14 @@ static int afu_release(struct inode *inode, struct file *filp) 
	pdata = dev_get_platdata(&pdev->dev);



	mutex_lock(&pdata->lock);

	dfl_feature_dev_use_end(pdata);



	if (!dfl_feature_dev_use_count(pdata)) {

		__port_reset(pdev);

		afu_dma_region_destroy(pdata);

	}

	mutex_unlock(&pdata->lock);



	dfl_feature_dev_use_end(pdata);



	return 0;

}
@@ -746,6 +750,12 @@ static long afu_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	return -EINVAL;

}



static const struct vm_operations_struct afu_vma_ops = {

#ifdef CONFIG_HAVE_IOREMAP_PROT

	.access = generic_access_phys,

#endif

};



static int afu_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct platform_device *pdev = filp->private_data;
@@ -775,6 +785,9 @@ static int afu_mmap(struct file *filp, struct vm_area_struct *vma) 
	    !(region.flags & DFL_PORT_REGION_WRITE))

		return -EPERM;



	/* Support debug access to the mapping */

	vma->vm_ops = &afu_vma_ops;



	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);



	return remap_pfn_range(vma, vma->vm_start,

drivers/fpga/dfl-fme-main.c

+12 −7
Original line number Diff line number Diff line
@@ -604,14 +604,16 @@ static int fme_open(struct inode *inode, struct file *filp) 
	if (WARN_ON(!pdata))

		return -ENODEV;



	ret = dfl_feature_dev_use_begin(pdata);

	if (ret)

		return ret;



	dev_dbg(&fdev->dev, "Device File Open\n");

	mutex_lock(&pdata->lock);

	ret = dfl_feature_dev_use_begin(pdata, filp->f_flags & O_EXCL);

	if (!ret) {

		dev_dbg(&fdev->dev, "Device File Opened %d Times\n",

			dfl_feature_dev_use_count(pdata));

		filp->private_data = pdata;

	}

	mutex_unlock(&pdata->lock);



	return 0;

	return ret;

}



static int fme_release(struct inode *inode, struct file *filp)
@@ -620,7 +622,10 @@ static int fme_release(struct inode *inode, struct file *filp) 
	struct platform_device *pdev = pdata->dev;



	dev_dbg(&pdev->dev, "Device File Release\n");



	mutex_lock(&pdata->lock);

	dfl_feature_dev_use_end(pdata);

	mutex_unlock(&pdata->lock);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE