From: marc.zyngier@arm•com (Marc Zyngier)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v4 11/14] ARM64: KVM: fix vgic_bitmap_get_reg function for BE 64bit case
Date: Sat, 21 Jun 2014 10:58:13 +0100 [thread overview]
Message-ID: <86wqcak2iy.fsf@arm.com> (raw)
In-Reply-To: <20140614150451.GG14023@lvm> (Christoffer Dall's message of "Sat, 14 Jun 2014 16:04:51 +0100")
On Sat, Jun 14 2014 at 04:04:51 PM, Christoffer Dall <christoffer.dall@linaro•org> wrote:
> On Thu, Jun 12, 2014 at 09:30:10AM -0700, Victor Kamensky wrote:
>> Fix vgic_bitmap_get_reg function to return 'right' word address of
>> 'unsigned long' bitmap value in case of BE 64bit image.
>>
>> Signed-off-by: Victor Kamensky <victor.kamensky@linaro•org>
>> ---
>> virt/kvm/arm/vgic.c | 24 ++++++++++++++++++++++--
>> 1 file changed, 22 insertions(+), 2 deletions(-)
>>
>> diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
>> index 529c336..b4ffd82 100644
>> --- a/virt/kvm/arm/vgic.c
>> +++ b/virt/kvm/arm/vgic.c
>> @@ -101,14 +101,34 @@ static u32 vgic_nr_lr;
>>
>> static unsigned int vgic_maint_irq;
>>
>> +/*
>> + * struct vgic_bitmap contains unions that provide two views of
>> + * the same data. In one case it is an array of registers of
>> + * u32's, and in the other case it is a bitmap of unsigned
>> + * longs.
>> + *
>> + * This does not work on 64-bit BE systems, because the bitmap access
>> + * will store two consecutive 32-bit words with the higher-addressed
>> + * register's bits at the lower index and the lower-addressed register's
>> + * bits at the higher index.
>> + *
>> + * Therefore, swizzle the register index when accessing the 32-bit word
>> + * registers to access the right register's value.
>> + */
>> +#if defined(CONFIG_CPU_BIG_ENDIAN) && BITS_PER_LONG == 64
>> +#define REG_OFFSET_SWIZZLE 1
>> +#else
>> +#define REG_OFFSET_SWIZZLE 0
>> +#endif
>> +
>> static u32 *vgic_bitmap_get_reg(struct vgic_bitmap *x,
>> int cpuid, u32 offset)
>> {
>> offset >>= 2;
>> if (!offset)
>> - return x->percpu[cpuid].reg;
>> + return x->percpu[cpuid].reg + (offset ^ REG_OFFSET_SWIZZLE);
>> else
>> - return x->shared.reg + offset - 1;
>> + return x->shared.reg + ((offset - 1) ^ REG_OFFSET_SWIZZLE);
>> }
>>
>> static int vgic_bitmap_get_irq_val(struct vgic_bitmap *x,
>> --
>> 1.8.1.4
>>
>
> I had wished there was a cleaner way to abstract this, but I can't think
> of a cleaner solution, and restructuring the whole thing would be very
> invasive.
>
> I'm curious to hear from Marc on this one, but you can add:
>
> Reviewed-by: Christoffer Dall <christoffer.dall@linaro•org>
>
> because it looks correct.
>
> Thanks for picking up my suggestion on the commenting.
I tried hard to find another solution, but I think this is unfortunately
the best we can have... ;-)
So:
Acked-by: Marc Zyngier <narc.zyngier@arm•com>
I will have to fold in a similar solution for the vgic-dyn series.
Thanks,
M.
--
Jazz is not dead. It just smells funny.
next prev parent reply other threads:[~2014-06-21 9:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 16:29 [PATCH v4 00/14] ARM/ARM64: KVM: big endian host support Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 01/14] ARM: KVM: switch hypervisor into BE mode in case of BE host Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 02/14] ARM: KVM: fix vgic V7 assembler code to work in BE image Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 03/14] ARM: KVM: handle 64bit values passed to mrcc or from mcrr instructions in BE case Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 04/14] ARM: KVM: __kvm_vcpu_run function return result fix " Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 05/14] ARM: KVM: vgic mmio should hold data as LE bytes array " Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 06/14] ARM: KVM: MMIO support BE host running LE code Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 07/14] ARM: KVM: one_reg coproc set and get BE fixes Victor Kamensky
2014-06-14 15:04 ` Christoffer Dall
2014-06-12 16:30 ` [PATCH v4 08/14] ARM: KVM: enable KVM in Kconfig on big-endian systems Victor Kamensky
2014-06-14 15:04 ` Christoffer Dall
2014-06-12 16:30 ` [PATCH v4 09/14] ARM64: KVM: MMIO support BE host running LE code Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 10/14] ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 11/14] ARM64: KVM: fix vgic_bitmap_get_reg function for BE 64bit case Victor Kamensky
2014-06-14 15:04 ` Christoffer Dall
2014-06-21 9:58 ` Marc Zyngier [this message]
2014-06-12 16:30 ` [PATCH v4 12/14] ARM64: KVM: vgic_elrsr and vgic_eisr need to be byteswapped in BE case Victor Kamensky
2014-06-14 15:04 ` Christoffer Dall
2014-06-14 15:42 ` Victor Kamensky
2014-06-14 15:47 ` Christoffer Dall
2014-06-19 3:46 ` Victor Kamensky
2014-06-21 9:53 ` Marc Zyngier
2014-06-21 17:19 ` Victor Kamensky
2014-06-23 8:26 ` Marc Zyngier
2014-06-23 16:40 ` Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 13/14] ARM64: KVM: set and get of sys registers " Victor Kamensky
2014-06-12 16:30 ` [PATCH v4 14/14] ARM64: KVM: fix big endian issue in access_vm_reg for 32bit guest Victor Kamensky
2014-06-14 15:05 ` Christoffer Dall
2014-06-19 5:43 ` Victor Kamensky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86wqcak2iy.fsf@arm.com \
--to=marc.zyngier@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox