On 2015/6/9 18:45, Alex Bennée wrote:
>
> Zhichao Huang <zhichao.huang@xxxxxxxxxx> writes:
>
>> As we're about to trap a bunch of CP14 registers, let's rework
>> the CP15 handling so it can be generalized and work with multiple
>> tables.
>>
>> Signed-off-by: Zhichao Huang <zhichao.huang@xxxxxxxxxx>
>> ---
>> arch/arm/kvm/coproc.c | 176 ++++++++++++++++++++++++++---------------
>> arch/arm/kvm/interrupts_head.S | 2 +-
>> 2 files changed, 112 insertions(+), 66 deletions(-)
>>
>> diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
>> index 9d283d9..d23395b 100644
>> --- a/arch/arm/kvm/coproc.c
>> +++ b/arch/arm/kvm/coproc.c
>> @@ -375,6 +375,9 @@ static const struct coproc_reg cp15_regs[] = {
>> { CRn(15), CRm( 0), Op1( 4), Op2( 0), is32, access_cbar},
>> };
>>
>> +static const struct coproc_reg cp14_regs[] = {
>> +};
>> +
>> /* Target specific emulation tables */
>> static struct kvm_coproc_target_table *target_tables[KVM_ARM_NUM_TARGETS];
>>
>> @@ -424,47 +427,75 @@ static const struct coproc_reg *find_reg(const struct coproc_params *params,
>> return NULL;
>> }
>>
>> -static int emulate_cp15(struct kvm_vcpu *vcpu,
>> - const struct coproc_params *params)
>> +/*
>> + * emulate_cp -- tries to match a cp14/cp15 access in a handling table,
>> + * and call the corresponding trap handler.
>> + *
>> + * @params: pointer to the descriptor of the access
>> + * @table: array of trap descriptors
>> + * @num: size of the trap descriptor array
>> + *
>> + * Return 0 if the access has been handled, and -1 if not.
>> + */
>> +static int emulate_cp(struct kvm_vcpu *vcpu,
>> + const struct coproc_params *params,
>> + const struct coproc_reg *table,
>> + size_t num)
>> {
>> - size_t num;
>> - const struct coproc_reg *table, *r;
>> -
>> - trace_kvm_emulate_cp15_imp(params->Op1, params->Rt1, params->CRn,
>> - params->CRm, params->Op2,
>> params->is_write);
>
> Where has this trace gone? We still want to be able to view register
> traps when debugging.
>
OK, I will add it in v3 patches.
>
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
