Commit 4db8180f authored by Rajan Vaja's avatar Rajan Vaja Committed by Greg Kroah-Hartman
Browse files

firmware: xilinx: Remove eemi ops for fpga related APIs 



Use direct function call instead of using eemi ops for fpga related
APIs. Also remove eemi ops structure.

Signed-off-by: default avatarRajan Vaja <rajan.vaja@xilinx.com>
Signed-off-by: default avatarJolly Shah <jolly.shah@xilinx.com>
Link: https://lore.kernel.org/r/1587761887-4279-21-git-send-email-jolly.shah@xilinx.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc86f9c5

drivers/firmware/xilinx/zynqmp.c

+2 −28
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/firmware/xlnx-zynqmp.h>

#include "zynqmp-debug.h"



static const struct zynqmp_eemi_ops *eemi_ops_tbl;



static bool feature_check_enabled;

static u32 zynqmp_pm_features[PM_API_MAX];
@@ -671,8 +669,7 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_reset_get_status); 
 *

 * Return: Returns status, either success or error+reason

 */

static int zynqmp_pm_fpga_load(const u64 address, const u32 size,

			       const u32 flags)

int zynqmp_pm_fpga_load(const u64 address, const u32 size, const u32 flags)

{

	return zynqmp_pm_invoke_fn(PM_FPGA_LOAD, lower_32_bits(address),

				   upper_32_bits(address), size, flags, NULL);
@@ -687,7 +684,7 @@ static int zynqmp_pm_fpga_load(const u64 address, const u32 size, 
 *

 * Return: Returns status, either success or error+reason

 */

static int zynqmp_pm_fpga_get_status(u32 *value)

int zynqmp_pm_fpga_get_status(u32 *value)

{

	u32 ret_payload[PAYLOAD_ARG_CNT];

	int ret;
@@ -812,26 +809,6 @@ int zynqmp_pm_aes_engine(const u64 address, u32 *out) 
}

EXPORT_SYMBOL_GPL(zynqmp_pm_aes_engine);



static const struct zynqmp_eemi_ops eemi_ops = {

	.fpga_load = zynqmp_pm_fpga_load,

	.fpga_get_status = zynqmp_pm_fpga_get_status,

};



/**

 * zynqmp_pm_get_eemi_ops - Get eemi ops functions

 *

 * Return: Pointer of eemi_ops structure

 */

const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)

{

	if (eemi_ops_tbl)

		return eemi_ops_tbl;

	else

		return ERR_PTR(-EPROBE_DEFER);



}

EXPORT_SYMBOL_GPL(zynqmp_pm_get_eemi_ops);



static int zynqmp_firmware_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -878,9 +855,6 @@ static int zynqmp_firmware_probe(struct platform_device *pdev) 
	pr_info("%s Trustzone version v%d.%d\n", __func__,

		pm_tz_version >> 16, pm_tz_version & 0xFFFF);



	/* Assign eemi_ops_table */

	eemi_ops_tbl = &eemi_ops;



	zynqmp_pm_api_debugfs_init();



	ret = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, firmware_devs,

drivers/fpga/zynqmp-fpga.c

+3 −11
Original line number Diff line number Diff line
@@ -40,16 +40,12 @@ static int zynqmp_fpga_ops_write_init(struct fpga_manager *mgr, 
static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,

				 const char *buf, size_t size)

{

	const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();

	struct zynqmp_fpga_priv *priv;

	dma_addr_t dma_addr;

	u32 eemi_flags = 0;

	char *kbuf;

	int ret;



	if (IS_ERR_OR_NULL(eemi_ops) || !eemi_ops->fpga_load)

		return -ENXIO;



	priv = mgr->priv;



	kbuf = dma_alloc_coherent(priv->dev, size, &dma_addr, GFP_KERNEL);
@@ -63,7 +59,7 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr, 
	if (priv->flags & FPGA_MGR_PARTIAL_RECONFIG)

		eemi_flags |= XILINX_ZYNQMP_PM_FPGA_PARTIAL;



	ret = eemi_ops->fpga_load(dma_addr, size, eemi_flags);

	ret = zynqmp_pm_fpga_load(dma_addr, size, eemi_flags);



	dma_free_coherent(priv->dev, size, kbuf, dma_addr);
@@ -78,13 +74,9 @@ static int zynqmp_fpga_ops_write_complete(struct fpga_manager *mgr, 


static enum fpga_mgr_states zynqmp_fpga_ops_state(struct fpga_manager *mgr)

{

	const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();

	u32 status;



	if (IS_ERR_OR_NULL(eemi_ops) || !eemi_ops->fpga_get_status)

		return FPGA_MGR_STATE_UNKNOWN;

	u32 status = 0;



	eemi_ops->fpga_get_status(&status);

	zynqmp_pm_fpga_get_status(&status);

	if (status & IXR_FPGA_DONE_MASK)

		return FPGA_MGR_STATE_OPERATING;

drivers/spi/spi-zynqmp-gqspi.c

+0 −5
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ 


#define SPI_AUTOSUSPEND_TIMEOUT		3000

enum mode_type {GQSPI_MODE_IO, GQSPI_MODE_DMA};

static const struct zynqmp_eemi_ops *eemi_ops;



/**

 * struct zynqmp_qspi - Defines qspi driver instance
@@ -1015,10 +1014,6 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
	struct zynqmp_qspi *xqspi;

	struct device *dev = &pdev->dev;



	eemi_ops = zynqmp_pm_get_eemi_ops();

	if (IS_ERR(eemi_ops))

		return PTR_ERR(eemi_ops);



	master = spi_alloc_master(&pdev->dev, sizeof(*xqspi));

	if (!master)

		return -ENOMEM;

include/linux/firmware/xlnx-zynqmp.h

+11 −5
Original line number Diff line number Diff line
@@ -293,16 +293,11 @@ struct zynqmp_pm_query_data { 
	u32 arg3;

};



struct zynqmp_eemi_ops {

	int (*fpga_load)(const u64 address, const u32 size, const u32 flags);

	int (*fpga_get_status)(u32 *value);

};



int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 arg0, u32 arg1,

			u32 arg2, u32 arg3, u32 *ret_payload);



#if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)

const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void);

int zynqmp_pm_get_api_version(u32 *version);

int zynqmp_pm_get_chipid(u32 *idcode, u32 *version);

int zynqmp_pm_query_data(struct zynqmp_pm_query_data qdata, u32 *out);
@@ -333,6 +328,8 @@ int zynqmp_pm_set_requirement(const u32 node, const u32 capabilities, 
			      const u32 qos,

			      const enum zynqmp_pm_request_ack ack);

int zynqmp_pm_aes_engine(const u64 address, u32 *out);

int zynqmp_pm_fpga_load(const u64 address, const u32 size, const u32 flags);

int zynqmp_pm_fpga_get_status(u32 *value);

#else

static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)

{
@@ -450,6 +447,15 @@ static inline int zynqmp_pm_aes_engine(const u64 address, u32 *out) 
{

	return -ENODEV;

}

static inline int zynqmp_pm_fpga_load(const u64 address, const u32 size,

				      const u32 flags)

{

	return -ENODEV;

}

static inline int zynqmp_pm_fpga_get_status(u32 *value)

{

	return -ENODEV;

}

#endif



#endif /* __FIRMWARE_ZYNQMP_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE