Re: [PATCH 1/2] platform/chrome: cros_ec_proto: Update feature check

[Benson Leung <bleung@google.com>]

[-- Attachment #1: Type: text/plain, Size: 1629 bytes --]

Hi Prashant,

On Mon, Aug 02, 2021 at 11:47:10AM -0700, Prashant Malani wrote:
> EC feature flags now require more than 32 bits to be represented. In
> order to make cros_ec_check_features() usable for more recent features,
> update it to account for the extra 32 bits of features.
> 
> Signed-off-by: Prashant Malani <pmalani@chromium.org>

FYI, as discussed, this patch was dropped from the series.

> ---
>  drivers/platform/chrome/cros_ec_proto.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
> index a7404d69b2d3..772edad80593 100644
> --- a/drivers/platform/chrome/cros_ec_proto.c
> +++ b/drivers/platform/chrome/cros_ec_proto.c
> @@ -813,6 +813,7 @@ EXPORT_SYMBOL(cros_ec_get_host_event);
>  int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
>  {
>  	struct cros_ec_command *msg;
> +	u32 mask;
>  	int ret;
>  
>  	if (ec->features[0] == -1U && ec->features[1] == -1U) {
> @@ -839,7 +840,12 @@ int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
>  		kfree(msg);
>  	}
>  
> -	return ec->features[feature / 32] & EC_FEATURE_MASK_0(feature);
> +	if (feature >= 32)
> +		mask = EC_FEATURE_MASK_1(feature);
> +	else
> +		mask = EC_FEATURE_MASK_0(feature);
> +
> +	return ec->features[feature / 32] & mask;
>  }
>  EXPORT_SYMBOL_GPL(cros_ec_check_features);
>  
> -- 
> 2.32.0.554.ge1b32706d8-goog
> 

-- 
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
bleung@google.com
Chromium OS Project
bleung@chromium.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]