On Thu, Nov 28, 2019 at 04:55:15PM +0100, Andrew Jones wrote:
> Since QEMU commit 83ad95957c7e ("pl031: Expose RTCICR as proper WC
> register") the PL031 test gets into an infinite loop. Now we must
> write bit zero of RTCICR to clear the IRQ status. Before, writing
> anything to RTCICR would work. As '1' is a member of 'anything'
> writing it should work for old QEMU as well.
> 
> Cc: Alexander Graf <[email protected]>
> Signed-off-by: Andrew Jones <[email protected]>
> ---
>  arm/pl031.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Note, this is based on not yet merged "Switch the order of the
parameters in report() and report_xfail()".

> 
> diff --git a/arm/pl031.c b/arm/pl031.c
> index 1f63ef13994f..3b75fd653e96 100644
> --- a/arm/pl031.c
> +++ b/arm/pl031.c
> @@ -143,8 +143,8 @@ static void irq_handler(struct pt_regs *regs)
>               report(readl(&pl031->ris) == 1, "  RTC RIS == 1");
>               report(readl(&pl031->mis) == 1, "  RTC MIS == 1");
>  
> -             /* Writing any value should clear IRQ status */
> -             writel(0x80000000ULL, &pl031->icr);
> +             /* Writing one to bit zero should clear IRQ status */
> +             writel(1, &pl031->icr);
>  
>               report(readl(&pl031->ris) == 0, "  RTC RIS == 0");
>               report(readl(&pl031->mis) == 0, "  RTC MIS == 0");
> -- 
> 2.21.0
> 

_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

Reply via email to