| Message ID | 20240816163504.789393-2-doug@schmorgal.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/net/can/xlnx-versal-canfd: Miscellaneous fixes | expand |
On Fri, Aug 16, 2024 at 09:35:01AM -0700, Doug Brown wrote: > The interrupt level should be 0 or 1. The existing code was using the > interrupt flags to determine the level. In the only machine currently > supported (xlnx-versal-virt), the GICv3 was masking off all bits except > bit 0 when applying it, resulting in the IRQ never being delivered. > > Signed-off-by: Doug Brown <doug@schmorgal.com> Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com> > --- > hw/net/can/xlnx-versal-canfd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c > index 5f083c21e9..ad0c4da3c8 100644 > --- a/hw/net/can/xlnx-versal-canfd.c > +++ b/hw/net/can/xlnx-versal-canfd.c > @@ -682,8 +682,8 @@ static uint8_t canfd_dlc_array[8] = {8, 12, 16, 20, 24, 32, 48, 64}; > > static void canfd_update_irq(XlnxVersalCANFDState *s) > { > - unsigned int irq = s->regs[R_INTERRUPT_STATUS_REGISTER] & > - s->regs[R_INTERRUPT_ENABLE_REGISTER]; > + const bool irq = (s->regs[R_INTERRUPT_STATUS_REGISTER] & > + s->regs[R_INTERRUPT_ENABLE_REGISTER]) != 0; > g_autofree char *path = object_get_canonical_path(OBJECT(s)); > > /* RX watermark interrupts. */ > -- > 2.34.1 >
diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 5f083c21e9..ad0c4da3c8 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -682,8 +682,8 @@ static uint8_t canfd_dlc_array[8] = {8, 12, 16, 20, 24, 32, 48, 64}; static void canfd_update_irq(XlnxVersalCANFDState *s) { - unsigned int irq = s->regs[R_INTERRUPT_STATUS_REGISTER] & - s->regs[R_INTERRUPT_ENABLE_REGISTER]; + const bool irq = (s->regs[R_INTERRUPT_STATUS_REGISTER] & + s->regs[R_INTERRUPT_ENABLE_REGISTER]) != 0; g_autofree char *path = object_get_canonical_path(OBJECT(s)); /* RX watermark interrupts. */
The interrupt level should be 0 or 1. The existing code was using the interrupt flags to determine the level. In the only machine currently supported (xlnx-versal-virt), the GICv3 was masking off all bits except bit 0 when applying it, resulting in the IRQ never being delivered. Signed-off-by: Doug Brown <doug@schmorgal.com> --- hw/net/can/xlnx-versal-canfd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)