Re: [Xen-devel] [PATCH v2 5/7] xen/arm: gic: Check the size of the CPU and vCPU interface retrieved from DT

[Julien Grall <julien.grall@xxxxxxxxxx>]

On 01/10/15 13:08, Ian Campbell wrote:
> On Tue, 2015-09-29 at 17:21 +0100, Julien Grall wrote:
>> @@ -641,7 +643,30 @@ static int __init gicv2_init(void)
>>          panic("GICv2: Cannot find the maintenance IRQ");
>>      gicv2_info.maintenance_irq = res;
>>  
>> -    /* TODO: Add check on distributor, cpu size */
>> +    /* TODO: Add check on distributor */
>> +
>> +    /*
>> +     * The GICv2 CPU interface should at least be 8KB. Although, most of 
>> the DT
>> +     * doesn't correctly set it and use the GICv1 CPU interface size (i.e 
>> 4KB).
>> +     * Warn and then fixup.
>> +     */
>> +    if ( csize < SZ_8K )
>> +    {
>> +        printk(XENLOG_WARNING "GICv2: WARNING: "
>> +               "The CPU interface size is wrong: %#"PRIx64
>> +               " expected %#x\n",
> 
> You missed fixing a split string constant here.

Hmmm right. Although, I think the sentence is small so I don't need to
rewrite it.

>> +               csize, SZ_8K);
>> +        csize = SZ_8K;
>> +    }
>> +
>> +    /*
>> +     * Check if the CPU interface and virtual CPU interface have the
>> +     * same size.
>> +     */
>> +    if ( csize != vsize )
>> +        printk(XENLOG_WARNING "GICv2: WARNING: "
>> +               "The size of the CPU interface (%#"PRIpaddr") and the vCPU 
>> interface (%#"PRIpaddr") don't match\n",
> 
> Apart from the wrapping this is also just quite a long line in its own
> right (100+ characters with the prefix on the preceeding line) e.g. for
> reading a serial log.
> 
> How about s/the CPU interface/GICC/ and s/the vCPU interface/GICV/ ?
> 
> And maybe s/The size/Sizes/?

The two suggestions are fine for me.

There is a lot small things to fix in this patch series. Shall I resend it?

>>  
>> +    /*
>> +     * Only allow support of GICv2 compatible when the CPU interface
>> +     * and virtual CPU interface are 8KB
>> +     * XXX: Handle other size?
>> +     */
>> +    if ( csize != SZ_8K && vsize != SZ_8K )
>> +    {
>> +        printk(XENLOG_WARNING
>> +               "GICv3: WARNING: Not enabling support of GICv2 compat 
>> mode.\n"
> 
> s/of/for/
> 
>> +               "The size of the CPU interface (%#"PRIpaddr") and the vCPU 
>> interface (%#"PRIpaddr") should both be 8KB.\n",
> 
> Similarly here. Or just "GICC ("%#...") and GICV ("%#...") must both be 8KB"?

I'm fine with that.

Regards,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel