On Thu, 2 Dec 2021 13:11:22 +0000
Janosch Frank <frankja@xxxxxxxxxxxxx> wrote:
> The specification and the kernel use UVC_CMD_PREPARE_RESET so let's
> fix our naming up.
>
> The call bit is named correctly but is not the same as the name we use
> on KVM. So let's clear that up too.
>
> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
Reviewed-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
> ---
> lib/s390x/asm/uv.h | 4 ++--
> s390x/uv-guest.c | 2 +-
> s390x/uv-host.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/s390x/asm/uv.h b/lib/s390x/asm/uv.h
> index 97c90e81..70bf65c4 100644
> --- a/lib/s390x/asm/uv.h
> +++ b/lib/s390x/asm/uv.h
> @@ -39,7 +39,7 @@
> #define UVC_CMD_VERIFY_IMG 0x0302
> #define UVC_CMD_CPU_RESET 0x0310
> #define UVC_CMD_CPU_RESET_INITIAL 0x0311
> -#define UVC_CMD_PERF_CONF_CLEAR_RESET 0x0320
> +#define UVC_CMD_PREPARE_RESET 0x0320
> #define UVC_CMD_CPU_RESET_CLEAR 0x0321
> #define UVC_CMD_CPU_SET_STATE 0x0330
> #define UVC_CMD_SET_UNSHARED_ALL 0x0340
> @@ -66,7 +66,7 @@ enum uv_cmds_inst {
> BIT_UVC_CMD_CPU_RESET = 15,
> BIT_UVC_CMD_CPU_RESET_INITIAL = 16,
> BIT_UVC_CMD_CPU_SET_STATE = 17,
> - BIT_UVC_CMD_PREPARE_CLEAR_RESET = 18,
> + BIT_UVC_CMD_PREPARE_RESET = 18,
> BIT_UVC_CMD_CPU_PERFORM_CLEAR_RESET = 19,
> BIT_UVC_CMD_UNSHARE_ALL = 20,
> BIT_UVC_CMD_PIN_PAGE_SHARED = 21,
> diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c
> index 44ad2154..99120cae 100644
> --- a/s390x/uv-guest.c
> +++ b/s390x/uv-guest.c
> @@ -142,7 +142,7 @@ static struct {
> { "verify", UVC_CMD_VERIFY_IMG, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_VERIFY_IMG },
> { "cpu reset", UVC_CMD_CPU_RESET, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_CPU_RESET },
> { "cpu initial reset", UVC_CMD_CPU_RESET_INITIAL, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_CPU_RESET_INITIAL },
> - { "conf clear reset", UVC_CMD_PERF_CONF_CLEAR_RESET, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_PREPARE_CLEAR_RESET },
> + { "prepare clear reset", UVC_CMD_PREPARE_RESET, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_PREPARE_RESET },
> { "cpu clear reset", UVC_CMD_CPU_RESET_CLEAR, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_CPU_PERFORM_CLEAR_RESET },
> { "cpu set state", UVC_CMD_CPU_SET_STATE, sizeof(struct uv_cb_cpu_set_state), BIT_UVC_CMD_CPU_SET_STATE },
> { "pin shared", UVC_CMD_PIN_PAGE_SHARED, sizeof(struct uv_cb_cfs), BIT_UVC_CMD_PIN_PAGE_SHARED },
> diff --git a/s390x/uv-host.c b/s390x/uv-host.c
> index 92a41069..de2e4850 100644
> --- a/s390x/uv-host.c
> +++ b/s390x/uv-host.c
> @@ -55,7 +55,7 @@ static struct cmd_list cmds[] = {
> { "verify", UVC_CMD_VERIFY_IMG, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_VERIFY_IMG },
> { "cpu reset", UVC_CMD_CPU_RESET, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_CPU_RESET },
> { "cpu initial reset", UVC_CMD_CPU_RESET_INITIAL, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_CPU_RESET_INITIAL },
> - { "conf clear reset", UVC_CMD_PERF_CONF_CLEAR_RESET, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_PREPARE_CLEAR_RESET },
> + { "conf clear reset", UVC_CMD_PREPARE_RESET, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_PREPARE_RESET },
> { "cpu clear reset", UVC_CMD_CPU_RESET_CLEAR, sizeof(struct uv_cb_nodata), BIT_UVC_CMD_CPU_PERFORM_CLEAR_RESET },
> { "cpu set state", UVC_CMD_CPU_SET_STATE, sizeof(struct uv_cb_cpu_set_state), BIT_UVC_CMD_CPU_SET_STATE },
> { "pin shared", UVC_CMD_PIN_PAGE_SHARED, sizeof(struct uv_cb_cfs), BIT_UVC_CMD_PIN_PAGE_SHARED },
