7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- hw/net/can/sja1000: fix bug for single acceptance filter and standard frame
- tests/avocado: fix typo in replay_linux
- util/userfaultfd: Remove unused uffd_poll_events
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 57625e5ddfb167711ebd0b9486594ef8413d519c Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 17 Oct 2024 11:07:11 +0800
|
|
Subject: [PATCH] hw/net/can/sja1000: fix bug for single acceptance filter and
|
|
standard frame
|
|
|
|
cheery-pick from 25145a7d7735344a469551946fc2a7f19eb4aa3d
|
|
|
|
A CAN sja1000 standard frame filter mask has been computed and applied
|
|
incorrectly for standard frames when single Acceptance Filter Mode
|
|
(MOD_AFM = 1) has been selected. The problem has not been found
|
|
by Linux kernel testing because it uses dual filter mode (MOD_AFM = 0)
|
|
and leaves falters fully open.
|
|
|
|
The problem has been noticed by Grant Ramsay when testing with Zephyr
|
|
RTOS which uses single filter mode.
|
|
|
|
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
|
|
Reported-by: Grant Ramsay <gramsay@enphaseenergy.com>
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2028
|
|
Fixes: 733210e754 ("hw/net/can: SJA1000 chip register level emulation")
|
|
Message-ID: <20240103231426.5685-1-pisa@fel.cvut.cz>
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/net/can/can_sja1000.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
|
|
index 34eea684ce..5eefb8407e 100644
|
|
--- a/hw/net/can/can_sja1000.c
|
|
+++ b/hw/net/can/can_sja1000.c
|
|
@@ -108,7 +108,7 @@ void can_sja_single_filter(struct qemu_can_filter *filter,
|
|
}
|
|
|
|
filter->can_mask = (uint32_t)amr[0] << 3;
|
|
- filter->can_mask |= (uint32_t)amr[1] << 5;
|
|
+ filter->can_mask |= (uint32_t)amr[1] >> 5;
|
|
filter->can_mask = ~filter->can_mask & QEMU_CAN_SFF_MASK;
|
|
if (!(amr[1] & 0x10)) {
|
|
filter->can_mask |= QEMU_CAN_RTR_FLAG;
|
|
--
|
|
2.41.0.windows.1
|
|
|