Commit 5418db1f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynqmp-soc-for-v5.13' of https://github.com/Xilinx/linux-xlnx into arm/drivers 

arm64: soc: ZynqMP SoC changes for v5.13

- Fix firmware removal path
- Cleanup eemi doc and *ops()

* tag 'zynqmp-soc-for-v5.13' of https://github.com/Xilinx/linux-xlnx:
  firmware: xilinx: Remove zynqmp_pm_get_eemi_ops() in IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)
  firmware: xilinx: Fix dereferencing freed memory

Link: https://lore.kernel.org/r/a44f8e9f-cea7-57ef-c3bc-10f5f5e064fc@monstr.eu


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 30be8446 79bfe480

Documentation/driver-api/xilinx/eemi.rst

+2 −29
Original line number Diff line number Diff line
@@ -16,35 +16,8 @@ components running across different processing clusters on a chip or 
device to communicate with a power management controller (PMC) on a

device to issue or respond to power management requests.



EEMI ops is a structure containing all eemi APIs supported by Zynq MPSoC.

The zynqmp-firmware driver maintain all EEMI APIs in zynqmp_eemi_ops

structure. Any driver who want to communicate with PMC using EEMI APIs

can call zynqmp_pm_get_eemi_ops().



Example of EEMI ops::



	/* zynqmp-firmware driver maintain all EEMI APIs */

	struct zynqmp_eemi_ops {

		int (*get_api_version)(u32 *version);

		int (*query_data)(struct zynqmp_pm_query_data qdata, u32 *out);

	};



	static const struct zynqmp_eemi_ops eemi_ops = {

		.get_api_version = zynqmp_pm_get_api_version,

		.query_data = zynqmp_pm_query_data,

	};



Example of EEMI ops usage::



	static const struct zynqmp_eemi_ops *eemi_ops;

	u32 ret_payload[PAYLOAD_ARG_CNT];

	int ret;



	eemi_ops = zynqmp_pm_get_eemi_ops();

	if (IS_ERR(eemi_ops))

		return PTR_ERR(eemi_ops);



	ret = eemi_ops->query_data(qdata, ret_payload);

Any driver who wants to communicate with PMC using EEMI APIs use the

functions provided for each function.



IOCTL

------

drivers/firmware/xilinx/zynqmp.c

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Xilinx Zynq MPSoC Firmware layer

 *

 *  Copyright (C) 2014-2020 Xilinx, Inc.

 *  Copyright (C) 2014-2021 Xilinx, Inc.

 *

 *  Michal Simek <michal.simek@xilinx.com>

 *  Davorin Mista <davorin.mista@aggios.com>
@@ -1280,12 +1280,13 @@ static int zynqmp_firmware_probe(struct platform_device *pdev) 
static int zynqmp_firmware_remove(struct platform_device *pdev)

{

	struct pm_api_feature_data *feature_data;

	struct hlist_node *tmp;

	int i;



	mfd_remove_devices(&pdev->dev);

	zynqmp_pm_api_debugfs_exit();



	hash_for_each(pm_api_features_map, i, feature_data, hentry) {

	hash_for_each_safe(pm_api_features_map, i, tmp, feature_data, hentry) {

		hash_del(&feature_data->hentry);

		kfree(feature_data);

	}

include/linux/firmware/xlnx-zynqmp.h

+0 −5
Original line number Diff line number Diff line
@@ -354,11 +354,6 @@ int zynqmp_pm_read_pggs(u32 index, u32 *value); 
int zynqmp_pm_system_shutdown(const u32 type, const u32 subtype);

int zynqmp_pm_set_boot_health_status(u32 value);

#else

static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)

{

	return ERR_PTR(-ENODEV);

}



static inline int zynqmp_pm_get_api_version(u32 *version)

{

	return -ENODEV;