diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-13 18:47:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-13 18:47:16 -0400 |
| commit | 3987e15e88a1d6a9a211b7637728fcc0acf74fbe (patch) | |
| tree | 5259b77db728b368c4900579c2d44337ae6de9e7 /drivers/firmware/psci.c | |
| parent | 213ffd49bdbd30512661eaf47b7445ef8a81bcdb (diff) | |
| parent | 969ea37dfd04e2800828fe2a26cd354d22569d18 (diff) | |
Merge branch '2024-04-13-assorted-fixes' into next
- Fix bootm_low handling, CONFIG_64BIT usage fixes, RNG fixes, cli
history fixes, allow bootelf to pass a device tree address, other
assorted fixes.
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 |