7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - 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 - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 0b89dd1ae05d17f0bacbd34218799f00d04c8174 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 17 Oct 2024 11:13:06 +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 73201f9139..575df7d2f8 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
|
|
|