[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO
From: |
Laszlo Ersek |
Subject: |
Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors |
Date: |
Thu, 04 Jun 2015 14:51:03 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 |
On 06/04/15 10:02, Paolo Bonzini wrote:
>
>
> On 04/06/2015 08:19, Peter Crosthwaite wrote:
>> On Wed, Jun 3, 2015 at 10:08 AM, Paolo Bonzini <address@hidden> wrote:
>>> This is a required step to implement read_with_attrs and write_with_attrs.
>>>
>>> Signed-off-by: Paolo Bonzini <address@hidden>
>>> ---
>>> hw/block/pflash_cfi01.c | 96
>>> ++++++-------------------------------------------
>>
>> Nice stats.
>>
>>> 1 file changed, 10 insertions(+), 86 deletions(-)
>>>
>>> diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
>>> index 7507a15..0b3667a 100644
>>> --- a/hw/block/pflash_cfi01.c
>>> +++ b/hw/block/pflash_cfi01.c
>>> @@ -650,101 +650,25 @@ static void pflash_write(pflash_t *pfl, hwaddr
>>> offset,
>>> }
>>>
>>>
>>> -static uint32_t pflash_readb_be(void *opaque, hwaddr addr)
>>> -{
>>> - return pflash_read(opaque, addr, 1, 1);
>>> -}
>>> -
>>> -static uint32_t pflash_readb_le(void *opaque, hwaddr addr)
>>> -{
>>> - return pflash_read(opaque, addr, 1, 0);
>>> -}
>>> -
>>> -static uint32_t pflash_readw_be(void *opaque, hwaddr addr)
>>> +static uint64_t pflash_mem_read(void *opaque, hwaddr addr, unsigned len)
>>> {
>>> pflash_t *pfl = opaque;
>>> + bool be = !!(pfl->features & (1 << PFLASH_BE));
>>
>> !!() not needed. Otherwise
>
> I don't like magic bool-ification... Is there a coding style item that
> forbids this idiom in bool assignments?
(Side remark: in edk2, BOOLEAN is actually UINT8. !!(expr) -- or,
((expr) != 0) -- is a necessity there.)
Thanks
Laszlo
>
> Paolo
>
>> Reviewed-by: Peter Crosthwaite <address@hidden>
>>
>>>
>>> - return pflash_read(pfl, addr, 2, 1);
>>> + return pflash_read(pfl, addr, len, be);
>>> }
>>>
>>> -static uint32_t pflash_readw_le(void *opaque, hwaddr addr)
>>> +static void pflash_mem_write(void *opaque, hwaddr addr, uint64_t value,
>>> unsigned len)
>>> {
>>> pflash_t *pfl = opaque;
>>> + bool be = !!(pfl->features & (1 << PFLASH_BE));
>>>
>>> - return pflash_read(pfl, addr, 2, 0);
>>> + pflash_write(pfl, addr, value, len, be);
>>> }
>>>
>>> -static uint32_t pflash_readl_be(void *opaque, hwaddr addr)
>>> -{
>>> - pflash_t *pfl = opaque;
>>> -
>>> - return pflash_read(pfl, addr, 4, 1);
>>> -}
>>> -
>>> -static uint32_t pflash_readl_le(void *opaque, hwaddr addr)
>>> -{
>>> - pflash_t *pfl = opaque;
>>> -
>>> - return pflash_read(pfl, addr, 4, 0);
>>> -}
>>> -
>>> -static void pflash_writeb_be(void *opaque, hwaddr addr,
>>> - uint32_t value)
>>> -{
>>> - pflash_write(opaque, addr, value, 1, 1);
>>> -}
>>> -
>>> -static void pflash_writeb_le(void *opaque, hwaddr addr,
>>> - uint32_t value)
>>> -{
>>> - pflash_write(opaque, addr, value, 1, 0);
>>> -}
>>> -
>>> -static void pflash_writew_be(void *opaque, hwaddr addr,
>>> - uint32_t value)
>>> -{
>>> - pflash_t *pfl = opaque;
>>> -
>>> - pflash_write(pfl, addr, value, 2, 1);
>>> -}
>>> -
>>> -static void pflash_writew_le(void *opaque, hwaddr addr,
>>> - uint32_t value)
>>> -{
>>> - pflash_t *pfl = opaque;
>>> -
>>> - pflash_write(pfl, addr, value, 2, 0);
>>> -}
>>> -
>>> -static void pflash_writel_be(void *opaque, hwaddr addr,
>>> - uint32_t value)
>>> -{
>>> - pflash_t *pfl = opaque;
>>> -
>>> - pflash_write(pfl, addr, value, 4, 1);
>>> -}
>>> -
>>> -static void pflash_writel_le(void *opaque, hwaddr addr,
>>> - uint32_t value)
>>> -{
>>> - pflash_t *pfl = opaque;
>>> -
>>> - pflash_write(pfl, addr, value, 4, 0);
>>> -}
>>> -
>>> -static const MemoryRegionOps pflash_cfi01_ops_be = {
>>> - .old_mmio = {
>>> - .read = { pflash_readb_be, pflash_readw_be, pflash_readl_be, },
>>> - .write = { pflash_writeb_be, pflash_writew_be, pflash_writel_be, },
>>> - },
>>> - .endianness = DEVICE_NATIVE_ENDIAN,
>>> -};
>>> -
>>> -static const MemoryRegionOps pflash_cfi01_ops_le = {
>>> - .old_mmio = {
>>> - .read = { pflash_readb_le, pflash_readw_le, pflash_readl_le, },
>>> - .write = { pflash_writeb_le, pflash_writew_le, pflash_writel_le, },
>>> - },
>>> +static const MemoryRegionOps pflash_cfi01_ops = {
>>> + .read = pflash_mem_read,
>>> + .write = pflash_mem_write,
>>> .endianness = DEVICE_NATIVE_ENDIAN,
>>> };
>>>
>>> @@ -775,7 +699,7 @@ static void pflash_cfi01_realize(DeviceState *dev,
>>> Error **errp)
>>>
>>> memory_region_init_rom_device(
>>> &pfl->mem, OBJECT(dev),
>>> - pfl->features & (1 << PFLASH_BE) ? &pflash_cfi01_ops_be :
>>> &pflash_cfi01_ops_le,
>>> + &pflash_cfi01_ops,
>>> pfl,
>>> pfl->name, total_len, &local_err);
>>> if (local_err) {
>>> --
>>> 2.4.1
>>>
>>>
>>>
- [Qemu-devel] [PATCH v2 01/23] target-i386: introduce cpu_get_mem_attrs, (continued)
- [Qemu-devel] [PATCH v2 01/23] target-i386: introduce cpu_get_mem_attrs, Paolo Bonzini, 2015/06/03
- [Qemu-devel] [PATCH v2 03/23] target-i386: Use correct memory attributes for ioport accesses, Paolo Bonzini, 2015/06/03
- [Qemu-devel] [PATCH v2 05/23] target-i386: set G=1 in SMM big real mode selectors, Paolo Bonzini, 2015/06/03
- [Qemu-devel] [PATCH v2 02/23] target-i386: Use correct memory attributes for memory accesses, Paolo Bonzini, 2015/06/03
- [Qemu-devel] [PATCH v2 06/23] target-i386: wake up processors that receive an SMI, Paolo Bonzini, 2015/06/03
- [Qemu-devel] [PATCH v2 04/23] target-i386: mask NMIs on entry to SMM, Paolo Bonzini, 2015/06/03
- [Qemu-devel] [PATCH v2 07/23] pflash_cfi01: change big-endian property to BIT type, Paolo Bonzini, 2015/06/03
- [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors, Paolo Bonzini, 2015/06/03
- Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors, Peter Crosthwaite, 2015/06/04
- Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors, Paolo Bonzini, 2015/06/04
- Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors,
Laszlo Ersek <=
- Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors, Richard Henderson, 2015/06/09
- Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors, Michael S. Tsirkin, 2015/06/09
- Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors, Paolo Bonzini, 2015/06/17
- Re: [Qemu-devel] [PATCH v2 08/23] pflash_cfi01: change to new-style MMIO accessors, Markus Armbruster, 2015/06/17
[Qemu-devel] [PATCH v2 09/23] pflash_cfi01: add secure property, Paolo Bonzini, 2015/06/03
[Qemu-devel] [PATCH v2 10/23] vl: allow full-blown QemuOpts syntax for -global, Paolo Bonzini, 2015/06/03
[Qemu-devel] [PATCH v2 11/23] qom: add object_property_add_const_link, Paolo Bonzini, 2015/06/03
[Qemu-devel] [PATCH v2 12/23] vl: run "late" notifiers immediately, Paolo Bonzini, 2015/06/03