[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64()
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64() |
Date: |
Mon, 18 Dec 2017 17:16:15 -0800 |
On Thu, Dec 14, 2017 at 7:15 PM, Philippe Mathieu-Daudé <address@hidden> wrote:
> This makes the code slightly safer, also easier to review.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
I just looked at the surrounding code and realised what mask actually
is set to. Now I understand what you mean.
Reviewed-by: Alistair Francis <address@hidden>
Alistair
> ---
> hw/sd/sdhci.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index b7d2a20985..3c78033d49 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -1132,12 +1132,10 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t
> val, unsigned size)
> MASKED_WRITE(s->admaerr, mask, value);
> break;
> case SDHC_ADMASYSADDR:
> - s->admasysaddr = (s->admasysaddr & (0xFFFFFFFF00000000ULL |
> - (uint64_t)mask)) | (uint64_t)value;
> + s->admasysaddr = deposit64(s->admasysaddr, 0, 32, value);
> break;
> case SDHC_ADMASYSADDR + 4:
> - s->admasysaddr = (s->admasysaddr & (0x00000000FFFFFFFFULL |
> - ((uint64_t)mask << 32))) | ((uint64_t)value << 32);
> + s->admasysaddr = deposit64(s->admasysaddr, 32, 32, value);
> break;
> case SDHC_FEAER:
> s->acmd12errsts |= value;
> --
> 2.15.1
>
>
- [Qemu-devel] [PATCH v2 00/20] SDHCI: housekeeping, add a qtest and fix few issues, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 01/20] sdhci: clean up includes, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64(), Philippe Mathieu-Daudé, 2017/12/14
- Re: [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64(),
Alistair Francis <=
- [Qemu-devel] [PATCH v2 03/20] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 04/20] sdhci: refactor same sysbus/pci properties into a common one, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 05/20] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 06/20] sdhci: refactor common sysbus/pci class_init() into sdhci_class_init(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 07/20] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 08/20] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 09/20] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2017/12/14