firmware: xilinx: Remove eemi ops for set_requirement

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>

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index ce65bafd2fcfb857ce05bcf9f037a4a089da4a91..0c5c8bccbeba9063b26dc19525359f713ff7bc07 100644 (file)
--- 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 20bee26535d1c2b170c7c431a9929fe32be2a255..226d343f0a6a5bed451b40ae0f48b279aefffeb6 100644 (file)
--- 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 bfa8cca644557fc05aa43098248fb41a140ecfe4..5927f6f49980597c9e7c409ac640701b64ac1d44 100644 (file)
--- 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__ */