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

Merge tag 'fpga-for-6.3-final' of... 

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

 into char-misc-next

Xu writes:

FPGA Manager changes for 6.3-final

Intel m10 bmc secure update:

- Ilpo's change fixes the return value of driver internal function

DFL PCI driver:

- Bjorn's change drops redundant pci_enable_pcie_error_reporting()

Xilinx:

- Michal's change uses xlnx_pr_decouple_read() instead of readl() to
  resolve sparse issue.

FPGA core:

- Alexis's change fixes kernel warning on fpga bridge register

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our fixes branch)

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.3-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: bridge: properly initialize bridge device before populating children
  fpga: xilinx-pr-decoupler: Use readl wrapper instead of pure readl
  fpga: dfl-pci: Drop redundant pci_enable_pcie_error_reporting()
  fpga: m10bmc-sec: Fix rsu_send_data() to return FW_UPLOAD_ERR_HW_ERROR
parents 265f1ecf dc70eb86

drivers/fpga/dfl-pci.c

+6 −14
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/module.h>

#include <linux/stddef.h>

#include <linux/errno.h>

#include <linux/aer.h>



#include "dfl.h"
@@ -376,10 +375,6 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid) 
		return ret;

	}



	ret = pci_enable_pcie_error_reporting(pcidev);

	if (ret && ret != -EINVAL)

		dev_info(&pcidev->dev, "PCIE AER unavailable %d.\n", ret);



	pci_set_master(pcidev);



	ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(64));
@@ -387,26 +382,24 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid) 
		ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(32));

	if (ret) {

		dev_err(&pcidev->dev, "No suitable DMA support available.\n");

		goto disable_error_report_exit;

		return ret;

	}



	ret = cci_init_drvdata(pcidev);

	if (ret) {

		dev_err(&pcidev->dev, "Fail to init drvdata %d.\n", ret);

		goto disable_error_report_exit;

		return ret;

	}



	ret = cci_enumerate_feature_devs(pcidev);

	if (!ret)

		return ret;



	if (ret) {

		dev_err(&pcidev->dev, "enumeration failure %d.\n", ret);



disable_error_report_exit:

	pci_disable_pcie_error_reporting(pcidev);

		return ret;

	}



	return 0;

}



static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs)

{

	struct cci_drvdata *drvdata = pci_get_drvdata(pcidev);
@@ -448,7 +441,6 @@ static void cci_pci_remove(struct pci_dev *pcidev) 
		cci_pci_sriov_configure(pcidev, 0);



	cci_remove_feature_devs(pcidev);

	pci_disable_pcie_error_reporting(pcidev);

}



static struct pci_driver cci_pci_driver = {

drivers/fpga/fpga-bridge.c

+2 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ fpga_bridge_register(struct device *parent, const char *name, 
	bridge->dev.parent = parent;

	bridge->dev.of_node = parent->of_node;

	bridge->dev.id = id;

	of_platform_populate(bridge->dev.of_node, NULL, NULL, &bridge->dev);



	ret = dev_set_name(&bridge->dev, "br%d", id);

	if (ret)
@@ -375,6 +374,8 @@ fpga_bridge_register(struct device *parent, const char *name, 
		return ERR_PTR(ret);

	}



	of_platform_populate(bridge->dev.of_node, NULL, NULL, &bridge->dev);



	return bridge;



error_device:

drivers/fpga/intel-m10-bmc-sec-update.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static enum fw_upload_err rsu_send_data(struct m10bmc_sec *sec) 


	ret = sec->ops->rsu_status(sec);

	if (ret < 0)

		return ret;

		return FW_UPLOAD_ERR_HW_ERROR;

	status = ret;



	if (!rsu_status_ok(status)) {

drivers/fpga/xilinx-pr-decoupler.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int xlnx_pr_decoupler_enable_show(struct fpga_bridge *bridge) 
	if (err)

		return err;



	status = readl(priv->io_base);

	status = xlnx_pr_decouple_read(priv, CTRL_OFFSET);



	clk_disable(priv->clk);