korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

firmware: xilinx: Remove eemi ops for set_requirement

Browse Source 
Use direct function call instead of using eemi ops for
set_requirement.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
Signed-off-by: Jolly Shah <jolly.shah@xilinx.com>
Link: https://lore.kernel.org/r/1587761887-4279-19-git-send-email-jolly.shah@xilinx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rajan Vaja 2020-04-24 13:58:00 -07:00 committed by Greg Kroah-Hartman
parent 07fb1a4619
commit cbbbda71fe
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firmware/xilinx/zynqmp.c
View File

@ -778,13 +778,14 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_release_node);
* *
* Return: Returns status, either success or error+reason * Return: Returns status, either success or error+reason
*/ */
static int zynqmp_pm_set_requirement(const u32 node, const u32 capabilities, int zynqmp_pm_set_requirement(const u32 node, const u32 capabilities,
const u32 qos, const u32 qos,
const enum zynqmp_pm_request_ack ack) const enum zynqmp_pm_request_ack ack)
{ {
return zynqmp_pm_invoke_fn(PM_SET_REQUIREMENT, node, capabilities, return zynqmp_pm_invoke_fn(PM_SET_REQUIREMENT, node, capabilities,
qos, ack, NULL); qos, ack, NULL);
} }
EXPORT_SYMBOL_GPL(zynqmp_pm_set_requirement);
/** /**
* zynqmp_pm_aes - Access AES hardware to encrypt/decrypt the data using * zynqmp_pm_aes - Access AES hardware to encrypt/decrypt the data using
@ -811,7 +812,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
} }
static const struct zynqmp_eemi_ops eemi_ops = { static const struct zynqmp_eemi_ops eemi_ops = {
.set_requirement = zynqmp_pm_set_requirement,
.fpga_load = zynqmp_pm_fpga_load, .fpga_load = zynqmp_pm_fpga_load,
.fpga_get_status = zynqmp_pm_fpga_get_status, .fpga_get_status = zynqmp_pm_fpga_get_status,
.aes = zynqmp_pm_aes_engine, .aes = zynqmp_pm_aes_engine,

16
drivers/soc/xilinx/zynqmp_pm_domains.c
View File

@ -23,8 +23,6 @@
/* Flag stating if PM nodes mapped to the PM domain has been requested */ /* Flag stating if PM nodes mapped to the PM domain has been requested */
#define ZYNQMP_PM_DOMAIN_REQUESTED BIT(0) #define ZYNQMP_PM_DOMAIN_REQUESTED BIT(0)
static const struct zynqmp_eemi_ops *eemi_ops;
static int min_capability; static int min_capability;
/** /**
@ -76,11 +74,8 @@ static int zynqmp_gpd_power_on(struct generic_pm_domain *domain)
int ret; int ret;
struct zynqmp_pm_domain *pd; struct zynqmp_pm_domain *pd;
if (!eemi_ops->set_requirement)
return -ENXIO;
pd = container_of(domain, struct zynqmp_pm_domain, gpd); pd = container_of(domain, struct zynqmp_pm_domain, gpd);
ret = eemi_ops->set_requirement(pd->node_id, ret = zynqmp_pm_set_requirement(pd->node_id,
ZYNQMP_PM_CAPABILITY_ACCESS, ZYNQMP_PM_CAPABILITY_ACCESS,
ZYNQMP_PM_MAX_QOS, ZYNQMP_PM_MAX_QOS,
ZYNQMP_PM_REQUEST_ACK_BLOCKING); ZYNQMP_PM_REQUEST_ACK_BLOCKING);
@ -111,9 +106,6 @@ static int zynqmp_gpd_power_off(struct generic_pm_domain *domain)
u32 capabilities = min_capability; u32 capabilities = min_capability;
bool may_wakeup; bool may_wakeup;
if (!eemi_ops->set_requirement)
return -ENXIO;
pd = container_of(domain, struct zynqmp_pm_domain, gpd); pd = container_of(domain, struct zynqmp_pm_domain, gpd);
/* If domain is already released there is nothing to be done */ /* If domain is already released there is nothing to be done */
@ -134,7 +126,7 @@ static int zynqmp_gpd_power_off(struct generic_pm_domain *domain)
} }
} }
ret = eemi_ops->set_requirement(pd->node_id, capabilities, 0, ret = zynqmp_pm_set_requirement(pd->node_id, capabilities, 0,
ZYNQMP_PM_REQUEST_ACK_NO); ZYNQMP_PM_REQUEST_ACK_NO);
/** /**
* If powering down of any node inside this domain fails, * If powering down of any node inside this domain fails,
@ -260,10 +252,6 @@ static int zynqmp_gpd_probe(struct platform_device *pdev)
struct zynqmp_pm_domain *pd; struct zynqmp_pm_domain *pd;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
eemi_ops = zynqmp_pm_get_eemi_ops();
if (IS_ERR(eemi_ops))
return PTR_ERR(eemi_ops);
pd = devm_kcalloc(dev, ZYNQMP_NUM_DOMAINS, sizeof(*pd), GFP_KERNEL); pd = devm_kcalloc(dev, ZYNQMP_NUM_DOMAINS, sizeof(*pd), GFP_KERNEL);
if (!pd) if (!pd)
return -ENOMEM; return -ENOMEM;

14
include/linux/firmware/xlnx-zynqmp.h
View File

@ -296,10 +296,6 @@ struct zynqmp_pm_query_data {
struct zynqmp_eemi_ops { struct zynqmp_eemi_ops {
int (*fpga_load)(const u64 address, const u32 size, const u32 flags); int (*fpga_load)(const u64 address, const u32 size, const u32 flags);
int (*fpga_get_status)(u32 *value); int (*fpga_get_status)(u32 *value);
int (*set_requirement)(const u32 node,
const u32 capabilities,
const u32 qos,
const enum zynqmp_pm_request_ack ack);
int (*aes)(const u64 address, u32 *out); int (*aes)(const u64 address, u32 *out);
}; };
@ -334,6 +330,9 @@ int zynqmp_pm_set_suspend_mode(u32 mode);
int zynqmp_pm_request_node(const u32 node, const u32 capabilities, int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
const u32 qos, const enum zynqmp_pm_request_ack ack); const u32 qos, const enum zynqmp_pm_request_ack ack);
int zynqmp_pm_release_node(const u32 node); int zynqmp_pm_release_node(const u32 node);
int zynqmp_pm_set_requirement(const u32 node, const u32 capabilities,
const u32 qos,
const enum zynqmp_pm_request_ack ack);
#else #else
static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void) static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
{ {
@ -440,6 +439,13 @@ static inline int zynqmp_pm_release_node(const u32 node)
{ {
return -ENODEV; return -ENODEV;
} }
static inline int zynqmp_pm_set_requirement(const u32 node,
const u32 capabilities,
const u32 qos,
const enum zynqmp_pm_request_ack ack)
{
return -ENODEV;
}
#endif #endif
#endif /* __FIRMWARE_ZYNQMP_H__ */ #endif /* __FIRMWARE_ZYNQMP_H__ */