* [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command
@ 2022-08-08 7:55 Qiang Liu
2022-08-08 9:13 ` Konrad, Frederic
0 siblings, 1 reply; 6+ messages in thread
From: Qiang Liu @ 2022-08-08 7:55 UTC (permalink / raw)
To: qemu-devel
Cc: Qiang Liu, Thomas Huth, Alistair Francis, Edgar E. Iglesias,
Peter Maydell, open list:Xilinx ZynqMP and...
In xlnx_dp_aux_set_command, when the command leads to the default
branch, xlxn-dp will abort and then crash.
This patch removes this abort and drops this operation.
Fixes: 58ac482 ("introduce xlnx-dp")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411
Reported-by: Qiang Liu <cyruscyliu@gmail.com>
Tested-by: Qiang Liu <cyruscyliu@gmail.com>
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
---
hw/display/xlnx_dp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index a071c81..b0828d6 100644
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -532,8 +532,8 @@ static void xlnx_dp_aux_set_command(XlnxDPState *s, uint32_t value)
qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not implemented\n");
break;
default:
- error_report("%s: invalid command: %u", __func__, cmd);
- abort();
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u", __func__, cmd);
+ return;
}
s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command
@ 2022-08-08 8:01 Qiang Liu
2022-08-08 8:21 ` Thomas Huth
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Qiang Liu @ 2022-08-08 8:01 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Alistair Francis, Edgar E. Iglesias, Peter Maydell,
open list:Xilinx ZynqMP and...
In xlnx_dp_aux_set_command, when the command leads to the default
branch, xlxn-dp will abort and then crash.
This patch removes this abort and drops this operation.
Fixes: 58ac482 ("introduce xlnx-dp")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411
Reported-by: Qiang Liu <cyruscyliu@gmail.com>
Tested-by: Qiang Liu <cyruscyliu@gmail.com>
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
---
hw/display/xlnx_dp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index a071c81..b0828d6 100644
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -532,8 +532,8 @@ static void xlnx_dp_aux_set_command(XlnxDPState *s, uint32_t value)
qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not implemented\n");
break;
default:
- error_report("%s: invalid command: %u", __func__, cmd);
- abort();
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u", __func__, cmd);
+ return;
}
s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command
2022-08-08 8:01 [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command Qiang Liu
@ 2022-08-08 8:21 ` Thomas Huth
2022-08-08 9:41 ` Laurent Vivier
2022-08-08 10:33 ` Alistair Francis
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Huth @ 2022-08-08 8:21 UTC (permalink / raw)
To: Qiang Liu, qemu-devel
Cc: Alistair Francis, Edgar E. Iglesias, Peter Maydell,
open list:Xilinx ZynqMP and..., QEMU Trivial
On 08/08/2022 10.01, Qiang Liu wrote:
> In xlnx_dp_aux_set_command, when the command leads to the default
> branch, xlxn-dp will abort and then crash.
>
> This patch removes this abort and drops this operation.
>
> Fixes: 58ac482 ("introduce xlnx-dp")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411
> Reported-by: Qiang Liu <cyruscyliu@gmail.com>
> Tested-by: Qiang Liu <cyruscyliu@gmail.com>
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
> ---
> hw/display/xlnx_dp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
> index a071c81..b0828d6 100644
> --- a/hw/display/xlnx_dp.c
> +++ b/hw/display/xlnx_dp.c
> @@ -532,8 +532,8 @@ static void xlnx_dp_aux_set_command(XlnxDPState *s, uint32_t value)
> qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not implemented\n");
> break;
> default:
> - error_report("%s: invalid command: %u", __func__, cmd);
> - abort();
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u", __func__, cmd);
> + return;
> }
>
> s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04;
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command
2022-08-08 7:55 Qiang Liu
@ 2022-08-08 9:13 ` Konrad, Frederic
0 siblings, 0 replies; 6+ messages in thread
From: Konrad, Frederic @ 2022-08-08 9:13 UTC (permalink / raw)
To: Qiang Liu, qemu-devel@nongnu.org
Cc: Thomas Huth, Alistair Francis, Edgar E. Iglesias, Peter Maydell,
open list:Xilinx ZynqMP and...
> -----Original Message-----
> From: Qemu-devel <qemu-devel-
> bounces+fkonrad=amd.com@nongnu.org> On Behalf Of Qiang Liu
> Sent: 08 August 2022 08:55
> To: qemu-devel@nongnu.org
> Cc: Qiang Liu <cyruscyliu@gmail.com>; Thomas Huth <thuth@redhat.com>;
> Alistair Francis <alistair@alistair23.me>; Edgar E. Iglesias
> <edgar.iglesias@gmail.com>; Peter Maydell <peter.maydell@linaro.org>;
> open list:Xilinx ZynqMP and... <qemu-arm@nongnu.org>
> Subject: [PATCH] xlnx_dp: drop unsupported AUXCommand in
> xlnx_dp_aux_set_command
>
> In xlnx_dp_aux_set_command, when the command leads to the default
> branch, xlxn-dp will abort and then crash.
>
> This patch removes this abort and drops this operation.
>
> Fixes: 58ac482 ("introduce xlnx-dp")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411
> Reported-by: Qiang Liu <cyruscyliu@gmail.com>
> Tested-by: Qiang Liu <cyruscyliu@gmail.com>
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
> ---
> hw/display/xlnx_dp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
> index a071c81..b0828d6 100644
> --- a/hw/display/xlnx_dp.c
> +++ b/hw/display/xlnx_dp.c
> @@ -532,8 +532,8 @@ static void xlnx_dp_aux_set_command(XlnxDPState
> *s, uint32_t value)
> qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not
> implemented\n");
> break;
> default:
> - error_report("%s: invalid command: %u", __func__, cmd);
> - abort();
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u",
> __func__, cmd);
> + return;
> }
>
> s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04;
> --
> 2.25.1
>
Looks good to me.
Reviewed-by: Frederic Konrad <fkonrad@amd.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command
2022-08-08 8:01 [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command Qiang Liu
2022-08-08 8:21 ` Thomas Huth
@ 2022-08-08 9:41 ` Laurent Vivier
2022-08-08 10:33 ` Alistair Francis
2 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2022-08-08 9:41 UTC (permalink / raw)
To: Qiang Liu, qemu-devel
Cc: Thomas Huth, Alistair Francis, Edgar E. Iglesias, Peter Maydell,
open list:Xilinx ZynqMP and..., qemu-trivial@nongnu.org,
Frederic Konrad
Le 08/08/2022 à 10:01, Qiang Liu a écrit :
> In xlnx_dp_aux_set_command, when the command leads to the default
> branch, xlxn-dp will abort and then crash.
>
> This patch removes this abort and drops this operation.
>
> Fixes: 58ac482 ("introduce xlnx-dp")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411
> Reported-by: Qiang Liu <cyruscyliu@gmail.com>
> Tested-by: Qiang Liu <cyruscyliu@gmail.com>
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
> ---
> hw/display/xlnx_dp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
> index a071c81..b0828d6 100644
> --- a/hw/display/xlnx_dp.c
> +++ b/hw/display/xlnx_dp.c
> @@ -532,8 +532,8 @@ static void xlnx_dp_aux_set_command(XlnxDPState *s, uint32_t value)
> qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not implemented\n");
> break;
> default:
> - error_report("%s: invalid command: %u", __func__, cmd);
> - abort();
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u", __func__, cmd);
> + return;
> }
>
> s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04;
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command
2022-08-08 8:01 [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command Qiang Liu
2022-08-08 8:21 ` Thomas Huth
2022-08-08 9:41 ` Laurent Vivier
@ 2022-08-08 10:33 ` Alistair Francis
2 siblings, 0 replies; 6+ messages in thread
From: Alistair Francis @ 2022-08-08 10:33 UTC (permalink / raw)
To: Qiang Liu
Cc: qemu-devel@nongnu.org Developers, Thomas Huth, Alistair Francis,
Edgar E. Iglesias, Peter Maydell, open list:Xilinx ZynqMP and...
On Mon, Aug 8, 2022 at 6:09 PM Qiang Liu <cyruscyliu@gmail.com> wrote:
>
> In xlnx_dp_aux_set_command, when the command leads to the default
> branch, xlxn-dp will abort and then crash.
>
> This patch removes this abort and drops this operation.
>
> Fixes: 58ac482 ("introduce xlnx-dp")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411
> Reported-by: Qiang Liu <cyruscyliu@gmail.com>
> Tested-by: Qiang Liu <cyruscyliu@gmail.com>
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/display/xlnx_dp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
> index a071c81..b0828d6 100644
> --- a/hw/display/xlnx_dp.c
> +++ b/hw/display/xlnx_dp.c
> @@ -532,8 +532,8 @@ static void xlnx_dp_aux_set_command(XlnxDPState *s, uint32_t value)
> qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not implemented\n");
> break;
> default:
> - error_report("%s: invalid command: %u", __func__, cmd);
> - abort();
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u", __func__, cmd);
> + return;
> }
>
> s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04;
> --
> 2.25.1
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-08 11:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-08 8:01 [PATCH] xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command Qiang Liu
2022-08-08 8:21 ` Thomas Huth
2022-08-08 9:41 ` Laurent Vivier
2022-08-08 10:33 ` Alistair Francis
-- strict thread matches above, loose matches on Subject: below --
2022-08-08 7:55 Qiang Liu
2022-08-08 9:13 ` Konrad, Frederic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).