From: Jolly Shah <jolly.shah@xilinx.com>
To: ard.biesheuvel@linaro.org, mingo@kernel.org,
gregkh@linuxfoundation.org, matt@codeblueprint.co.uk,
sudeep.holla@arm.com, hkallweit1@gmail.com,
keescook@chromium.org, dmitry.torokhov@gmail.com,
michal.simek@xilinx.com
Cc: Jolly Shah <jolly.shah@xilinx.com>,
Rajan Vaja <rajan.vaja@xilinx.com>,
rajanv@xilinx.com, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 18/25] firmware: xilinx: Remove eemi ops for set_requirement
Date: Thu, 9 Apr 2020 12:12:07 -0700 [thread overview]
Message-ID: <1586459534-8997-19-git-send-email-jolly.shah@xilinx.com> (raw)
In-Reply-To: <1586459534-8997-1-git-send-email-jolly.shah@xilinx.com>
From: Rajan Vaja <rajan.vaja@xilinx.com>
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>
---
drivers/firmware/xilinx/zynqmp.c | 8 ++++----
drivers/soc/xilinx/zynqmp_pm_domains.c | 16 ++--------------
include/linux/firmware/xlnx-zynqmp.h | 14 ++++++++++----
3 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index ce65bafd..0c5c8bc 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -778,13 +778,14 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_release_node);
*
* Return: Returns status, either success or error+reason
*/
-static int zynqmp_pm_set_requirement(const u32 node, const u32 capabilities,
- const u32 qos,
- const enum zynqmp_pm_request_ack ack)
+int zynqmp_pm_set_requirement(const u32 node, const u32 capabilities,
+ const u32 qos,
+ const enum zynqmp_pm_request_ack ack)
{
return zynqmp_pm_invoke_fn(PM_SET_REQUIREMENT, node, capabilities,
qos, ack, NULL);
}
+EXPORT_SYMBOL_GPL(zynqmp_pm_set_requirement);
/**
* 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 = {
- .set_requirement = zynqmp_pm_set_requirement,
.fpga_load = zynqmp_pm_fpga_load,
.fpga_get_status = zynqmp_pm_fpga_get_status,
.aes = zynqmp_pm_aes_engine,
diff --git a/drivers/soc/xilinx/zynqmp_pm_domains.c b/drivers/soc/xilinx/zynqmp_pm_domains.c
index 20bee26..226d343 100644
--- a/drivers/soc/xilinx/zynqmp_pm_domains.c
+++ b/drivers/soc/xilinx/zynqmp_pm_domains.c
@@ -23,8 +23,6 @@
/* Flag stating if PM nodes mapped to the PM domain has been requested */
#define ZYNQMP_PM_DOMAIN_REQUESTED BIT(0)
-static const struct zynqmp_eemi_ops *eemi_ops;
-
static int min_capability;
/**
@@ -76,11 +74,8 @@ static int zynqmp_gpd_power_on(struct generic_pm_domain *domain)
int ret;
struct zynqmp_pm_domain *pd;
- if (!eemi_ops->set_requirement)
- return -ENXIO;
-
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_MAX_QOS,
ZYNQMP_PM_REQUEST_ACK_BLOCKING);
@@ -111,9 +106,6 @@ static int zynqmp_gpd_power_off(struct generic_pm_domain *domain)
u32 capabilities = min_capability;
bool may_wakeup;
- if (!eemi_ops->set_requirement)
- return -ENXIO;
-
pd = container_of(domain, struct zynqmp_pm_domain, gpd);
/* 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);
/**
* 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 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);
if (!pd)
return -ENOMEM;
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index bfa8cca..5927f6f 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -296,10 +296,6 @@ struct zynqmp_pm_query_data {
struct zynqmp_eemi_ops {
int (*fpga_load)(const u64 address, const u32 size, const u32 flags);
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);
};
@@ -334,6 +330,9 @@ int zynqmp_pm_set_suspend_mode(u32 mode);
int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
const u32 qos, const enum zynqmp_pm_request_ack ack);
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
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;
}
+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 /* __FIRMWARE_ZYNQMP_H__ */
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-09 19:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 19:11 [PATCH v4 00/25] firmware: xilinx: Add xilinx specific sysfs interface Jolly Shah
2020-04-09 19:11 ` [PATCH v4 01/25] firmware: xilinx: Remove eemi ops for get_api_version Jolly Shah
2020-04-09 19:11 ` [PATCH v4 02/25] firmware: xilinx: Remove eemi ops for get_chipid Jolly Shah
2020-04-09 19:11 ` [PATCH v4 03/25] firmware: xilinx: Remove eemi ops for query_data Jolly Shah
2020-04-09 19:11 ` [PATCH v4 04/25] firmware: xilinx: Remove eemi ops for clock_enable Jolly Shah
2020-04-09 19:11 ` [PATCH v4 05/25] firmware: xilinx: Remove eemi ops for clock_disable Jolly Shah
2020-04-09 19:11 ` [PATCH v4 06/25] firmware: xilinx: Remove eemi ops for clock_getstate Jolly Shah
2020-04-09 19:11 ` [PATCH v4 07/25] firmware: xilinx: Remove eemi ops for clock_setdivider Jolly Shah
2020-04-09 19:11 ` [PATCH v4 08/25] firmware: xilinx: Remove eemi ops for clock_getdivider Jolly Shah
2020-04-09 19:11 ` [PATCH v4 09/25] firmware: xilinx: Remove eemi ops for clock set/get rate Jolly Shah
2020-04-09 19:11 ` [PATCH v4 10/25] firmware: xilinx: Remove eemi ops for clock set/get parent Jolly Shah
2020-04-09 19:12 ` [PATCH v4 11/25] firmware: xilinx: Use APIs instead of IOCTLs Jolly Shah
2020-04-09 19:12 ` [PATCH v4 12/25] firmware: xilinx: Remove eemi ops for reset_assert Jolly Shah
2020-04-09 19:12 ` [PATCH v4 13/25] firmware: xilinx: Remove eemi ops for reset_get_status Jolly Shah
2020-04-09 19:12 ` [PATCH v4 14/25] firmware: xilinx: Remove eemi ops for init_finalize Jolly Shah
2020-04-09 19:12 ` [PATCH v4 15/25] firmware: xilinx: Remove eemi ops for set_suspend_mode Jolly Shah
2020-04-09 19:12 ` [PATCH v4 16/25] firmware: xilinx: Remove eemi ops for request_node Jolly Shah
2020-04-09 19:12 ` [PATCH v4 17/25] firmware: xilinx: Remove eemi ops for release_node Jolly Shah
2020-04-09 19:12 ` Jolly Shah [this message]
2020-04-09 19:12 ` [PATCH v4 19/25] firmware: xilinx: Remove eemi ops for aes engine Jolly Shah
2020-04-09 19:12 ` [PATCH v4 20/25] firmware: xilinx: Remove eemi ops for fpga related APIs Jolly Shah
2020-04-09 19:12 ` [PATCH v4 21/25] firmware: xilinx: Add APIs to read/write GGS/PGGS registers Jolly Shah
2020-04-09 19:12 ` [PATCH v4 22/25] firmware: xilinx: Add sysfs interface Jolly Shah
2020-04-09 19:12 ` [PATCH v4 23/25] firmware: xilinx: Add system shutdown API interface Jolly Shah
2020-04-09 19:12 ` [PATCH v4 24/25] firmware: xilinx: Add sysfs to set shutdown scope Jolly Shah
2020-04-09 19:12 ` [PATCH v4 25/25] firmware: xilinx: Add sysfs and API to set boot health status Jolly Shah
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1586459534-8997-19-git-send-email-jolly.shah@xilinx.com \
--to=jolly.shah@xilinx.com \
--cc=ard.biesheuvel@linaro.org \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=michal.simek@xilinx.com \
--cc=mingo@kernel.org \
--cc=rajan.vaja@xilinx.com \
--cc=rajanv@xilinx.com \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).