diff options
author | Tom Rini <trini@konsulko.com> | 2024-04-02 07:03:25 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-04-02 07:03:25 -0400 |
commit | d312d9831f25a8e70d64df46fb2fe9aab2e8c939 (patch) | |
tree | 9afa8b258222e66221f8239d8ad51372d63c5ac3 /drivers/firmware/psci.c | |
parent | 25049ad560826f7dc1c4740883b0016014a59789 (diff) | |
parent | bc39e06778168a34bb4e0a34fbee4edbde4414d8 (diff) |
Merge branch 'next'
Merge in all changes from the next branch now that the release is out.
Diffstat (limited to 'drivers/firmware/psci.c')
-rw-r--r-- | drivers/firmware/psci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c6b9efab41c..03544d76ed4 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -135,10 +135,13 @@ static int bind_smccc_features(struct udevice *dev, int psci_method) PSCI_VERSION_MAJOR(psci_0_2_get_version()) == 0) return 0; - if (request_psci_features(ARM_SMCCC_ARCH_FEATURES) == + if (request_psci_features(ARM_SMCCC_VERSION) == PSCI_RET_NOT_SUPPORTED) return 0; + if (invoke_psci_fn(ARM_SMCCC_VERSION, 0, 0, 0) < ARM_SMCCC_VERSION_1_1) + return 0; + if (psci_method == PSCI_METHOD_HVC) pdata->invoke_fn = smccc_invoke_hvc; else |