firmware: arm_ffa: Reject higher major version as incompatible

[ Upstream commit efff6a7f16b34fd902f342b58bd8bafc2d6f2fd1 ]

When the firmware compatibility was handled previously in the commit
8e3f9da608f1 ("firmware: arm_ffa: Handle compatibility with different firmware versions"),
we only addressed firmware versions that have higher minor versions
compared to the driver version which is should be considered compatible
unless the firmware returns NOT_SUPPORTED.

However, if the firmware reports higher major version than the driver
supported, we need to reject it. If the firmware can work in a compatible
mode with the driver requested version, it must return the same major
version as requested.

Tested-by: Viresh Kumar <viresh.kumar@linaro.org>
Message-Id: <20250217-ffa_updates-v3-12-bd1d9de615e7@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
index 03d22cbb2ad47044ff52e0895c1a4de7e238091d..ca9a27fceb1fd5528eba96bb5d3b490aa8322717 100644 (file)
--- a/drivers/firmware/arm_ffa/driver.c
+++ b/drivers/firmware/arm_ffa/driver.c
@@ -150,6 +150,14 @@ static int ffa_version_check(u32 *version)
                return -EOPNOTSUPP;
        }
 
+       if (FFA_MAJOR_VERSION(ver.a0) > FFA_MAJOR_VERSION(FFA_DRIVER_VERSION)) {
+               pr_err("Incompatible v%d.%d! Latest supported v%d.%d\n",
+                      FFA_MAJOR_VERSION(ver.a0), FFA_MINOR_VERSION(ver.a0),
+                      FFA_MAJOR_VERSION(FFA_DRIVER_VERSION),
+                      FFA_MINOR_VERSION(FFA_DRIVER_VERSION));
+               return -EINVAL;
+       }
+
        if (ver.a0 < FFA_MIN_VERSION) {
                pr_err("Incompatible v%d.%d! Earliest supported v%d.%d\n",
                       FFA_MAJOR_VERSION(ver.a0), FFA_MINOR_VERSION(ver.a0),