Re: [kvm-unit-tests PATCH 1/3] s390x: Fix sclp facility bit numbers

Janosch Frank
2022-05-10T17:13:27Z

On 5/5/22 14:46, Janis Schoetterl-Glausch wrote:
> sclp_feat_check takes care of adjusting the bit numbering such that they
> can be defined as they are in the documentation.
>
> Fixes: 4dd649c8 ("lib: s390x: sclp: Extend feature probing")
> Signed-off-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>

The fixing part of this is:
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

But please add the (E)SOP bits in the other patches.

> ---
> lib/s390x/sclp.h | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h
> index fead007a..4ce2209f 100644
> --- a/lib/s390x/sclp.h
> +++ b/lib/s390x/sclp.h
> @@ -134,13 +134,15 @@ struct sclp_facilities {
> };
>
> /* bit number within a certain byte */
> -#define SCLP_FEAT_85_BIT_GSLS 7
> -#define SCLP_FEAT_98_BIT_KSS 0
> -#define SCLP_FEAT_116_BIT_64BSCAO 7
> -#define SCLP_FEAT_116_BIT_CMMA 6
> -#define SCLP_FEAT_116_BIT_ESCA 3
> -#define SCLP_FEAT_117_BIT_PFMFI 6
> -#define SCLP_FEAT_117_BIT_IBS 5
> +#define SCLP_FEAT_80_BIT_SOP 2
> +#define SCLP_FEAT_85_BIT_GSLS 0
> +#define SCLP_FEAT_85_BIT_ESOP 6
> +#define SCLP_FEAT_98_BIT_KSS 7
> +#define SCLP_FEAT_116_BIT_64BSCAO 0
> +#define SCLP_FEAT_116_BIT_CMMA 1
> +#define SCLP_FEAT_116_BIT_ESCA 4
> +#define SCLP_FEAT_117_BIT_PFMFI 1
> +#define SCLP_FEAT_117_BIT_IBS 2
>
> typedef struct ReadInfo {
> SCCBHeader h;