f4f53a5098
- hw/nvme: Remove redundant dma_blk_write - tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution - edid: set default resolution to 1280x800 (WXGA) - iotests/308: Fix for CAP_DAC_OVERRIDE - hvf: remove unused but set variable - vvfat: Fix vvfat_write() for writes before the root directory - hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT() - hw/pci: Remove unused pci_irq_pulse() method - ui/gtk: fix leaks found wtih fuzzing - target/i386: fix size of EBP writeback in gen_enter() - tests/qtest/fuzz: fix memleak in qos_fuzz.c - hw/core/loader: gunzip(): fix memory leak on error path - migration: fix a typo - scsi: fetch unit attention when creating the request - raw-format: Fix error message for invalid offset/size - tcg: Reset data_gen_ptr correctly - Fix calculation of minimum in colo_compare_tcp - hw/intc: Don't clear pending bits on IRQ lowering - target/arm: Drop user-only special case in sve_stN_r - usb-hub: Fix handling port power control messages - target/ppc: Set ctx->opcode for decode_insn32() - linux-user: Add proper strace format strings for getdents()/getdents64() - linux-user: Fix TARGET_PROT_SEM for XTENSA - linux-user/hppa: Set TASK_UNMAPPED_BASE to 0xfa000000 for hppa arch - linux-user/hppa: Dump IIR on register dump - tests: Fix typo in check-help output - qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ - hw/scsi/megasas: Simplify using the ldst API - gqa-win: get_pci_info: Clean dev_info if handle is valid - target/ppc: Fix 7448 support - vvfat: Fix size of temporary qcow file - docs: Correct 'vhost-user-blk' spelling - jackaudio: use ifdefs to hide unavailable functions - simplebench: Fix Python syntax error (reported by LGTM) - python: update type hints for mypy 0.930 - Python/aqmp: fix type definitions for mypy 0.920 - tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() - hw/ppc/e500: Prefer QOM cast - hw/ppc/e500: Remove unused "irqs" parameter - hw/ppc/e500: Add missing device tree properties to i2c controller node - linux-user: Show timespec on strace for futex() - linux-user: Add strace for clock_nanosleep() - linux-user: Fix strace of chmod() if mode == 0 - linux-user: Log failing executable in EXCP_DUMP() - linux-user: Add pidfd_open(), pidfd_send_signal() and pidfd_getfd() syscalls Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 87ebac5b5cfb97ddb7ac2af097703758fb0751c4)
71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From a95246497e6162574d5c874b2d4504f828afbb85 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 12 Dec 2024 12:20:12 +0800
|
|
Subject: [PATCH] hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from a29a9776407e68c5560687e07828925bda710150
|
|
|
|
The BIT_MASK() macro from bitops.h provides the mask of a bit
|
|
within a particular word of a multi-word bit array; it is intended
|
|
to be used with its counterpart BIT_WORD() that gives the index
|
|
of the word in the array.
|
|
|
|
In nrf51_rng we are using it for cases where we have a bit number
|
|
that we know is the index of a bit within a single word (in fact, it
|
|
happens that all the bit numbers we pass to it are zero). This
|
|
happens to give the right answer, but the macro that actually
|
|
does the job we want here is BIT().
|
|
|
|
Use BIT() instead of BIT_MASK().
|
|
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Message-ID: <20241108135644.4007151-1-peter.maydell@linaro.org>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/misc/nrf51_rng.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c
|
|
index fc86e1b697..e911b3a3a3 100644
|
|
--- a/hw/misc/nrf51_rng.c
|
|
+++ b/hw/misc/nrf51_rng.c
|
|
@@ -107,25 +107,25 @@ static void rng_write(void *opaque, hwaddr offset,
|
|
break;
|
|
case NRF51_RNG_REG_SHORTS:
|
|
s->shortcut_stop_on_valrdy =
|
|
- (value & BIT_MASK(NRF51_RNG_REG_SHORTS_VALRDY_STOP)) ? 1 : 0;
|
|
+ (value & BIT(NRF51_RNG_REG_SHORTS_VALRDY_STOP)) ? 1 : 0;
|
|
break;
|
|
case NRF51_RNG_REG_INTEN:
|
|
s->interrupt_enabled =
|
|
- (value & BIT_MASK(NRF51_RNG_REG_INTEN_VALRDY)) ? 1 : 0;
|
|
+ (value & BIT(NRF51_RNG_REG_INTEN_VALRDY)) ? 1 : 0;
|
|
break;
|
|
case NRF51_RNG_REG_INTENSET:
|
|
- if (value & BIT_MASK(NRF51_RNG_REG_INTEN_VALRDY)) {
|
|
+ if (value & BIT(NRF51_RNG_REG_INTEN_VALRDY)) {
|
|
s->interrupt_enabled = 1;
|
|
}
|
|
break;
|
|
case NRF51_RNG_REG_INTENCLR:
|
|
- if (value & BIT_MASK(NRF51_RNG_REG_INTEN_VALRDY)) {
|
|
+ if (value & BIT(NRF51_RNG_REG_INTEN_VALRDY)) {
|
|
s->interrupt_enabled = 0;
|
|
}
|
|
break;
|
|
case NRF51_RNG_REG_CONFIG:
|
|
s->filter_enabled =
|
|
- (value & BIT_MASK(NRF51_RNG_REG_CONFIG_DECEN)) ? 1 : 0;
|
|
+ (value & BIT(NRF51_RNG_REG_CONFIG_DECEN)) ? 1 : 0;
|
|
break;
|
|
|
|
default:
|
|
--
|
|
2.41.0.windows.1
|
|
|