[PATCH 2/2] of/fdt: add kernel command line option for dtb_compat string

[Dirk Brandewie]

On 11/15/2010 10:32 PM, Grant Likely wrote:
> On Mon, Nov 15, 2010 at 08:01:21PM -0800, dirk.brandewie at gmail.com wrote:
>> From: Dirk Brandewie<dirk.brandewie at gmail.com>
>>
>> Add support for specifying a "compatible" string from the kernel
>> command line and functions for the platform to find the compatible
>> blob present in the kernel image if any.
>>
>> Signed-off-by: Dirk Brandewie<dirk.brandewie at gmail.com>
>
> Hi Dirk,
>
> a couple of general comments:
>
> A lot of the information in the cover letter should really be here in
> the actual patch description.  Use the cover letter to provide context
> for the entire series, but put the specifics with each patch.  Version
> changelog history should also appear in patch description, not the
> cover letter.
>

OK

> For the next version, please cc: linux-kernel at vger.kernel.org.
> This series should have a wider review audience, particularly because
> it touches the linker sections and the kernel parameters.  You should
> also cc: linuxppc-dev at lists.ozlabs.org and
> microblaze-uclinux at itee.uq.edu.au for the patch that adds the common
> rules because it will affect both of those architectures directly.
>

Will do
> More comments below.
>

>> +#ifndef MODULE
>
> fdt.c cannot be compiled as a module.  Is this necessary?
>
>> +#ifdef CONFIG_OF_FLATTREE
>
> Unnecessary #ifdef.  fdt.c is only compiled when CONFIG_OF_FLATTREE is
> set.
>

Both #ifdef's removed
>> +char dtb_compat_name[MAX_DTB_COMPAT_STR] = "";
>> +
>> +char __init *of_get_dtb_compatible_string(void)
>> +{
>> +	return dtb_compat_name;
>> +}
>> +
>> +
>> +extern uint8_t __dtb_start[];
>> +extern uint8_t __dtb_end[];
>> +void *of_find_compatible_dtb(char *name)
>
> Please rename of_flat_dt_find_compatible_dtb() to match the naming
> conventions that I'm working to establish in this file.
>
> Also, it should have an __init annotation.
>

done

>> +{
>> +	void *rc = NULL;
>> +	unsigned long root, size;
>> +	struct boot_param_header  *orig_initial_boot_params;
>> +	uint8_t *blob;
>
> blob should be a void* here.  It is never used as a uint8.
>

I used uint8_t prevent compiler warning when blob is compared to __dtb_end

>> +
>> +	orig_initial_boot_params = initial_boot_params;
>> +	blob = __dtb_start;
>> +	initial_boot_params = (struct boot_param_header *)blob;
>> +
>> +	do {
>
> Start the loop with "while (blob<  __dtb_end) {" to protect against
> the possibility that __dtb_start == __dtb_end (no dtbs linked in).
>

Done

>> +		root = of_get_flat_dt_root();
>
> Just to be defencive, should check the value of
> initial_boot_params->magic before dereferencing the rest of the
> structure or trying to parse nodes.
>

Added as a condition to while loop

>> +		if (of_flat_dt_is_compatible(root, name)>  0) {
>> +			rc = (void *) blob;
>
> Unnecessary cast (regardless of whether blob is a void* or a uint8_t*).
>

done

>> +			break;
>> +		}
>> +
>> +		size =  be32_to_cpu(initial_boot_params->totalsize);
>> +		blob = (uint8_t *) ALIGN(((unsigned long)blob + size),
>> +					DTB_ALIGNMENT);
>
> I believe PTR_ALIGN() can be used and the casting removed.
>

done

>> +		initial_boot_params = (struct boot_param_header *)blob;
>> +	} while (blob<  __dtb_end);
>> +
>> +	if (rc == NULL)
>> +		initial_boot_params = orig_initial_boot_params;
>> +	return rc;
>> +}
>> +
>> +
>> +static int __init dtb_compat_setup(char *line)
>
> Please rename of_flat_dt_compat_setup()
>

done

>> +{
>> +	strncpy(dtb_compat_name, line, MAX_DTB_COMPAT_STR);
>> +	return 1;
>> +}
>
> I don't remember getting a response about whether or not
> of_find_compatible_dtb can be called directly from dtb_compat_setup.
> Doing so would eliminate the arbitrary MAX_DTB_COMPAT_STR because
> there would be no need to keep around a copy of dtb_compat_name.  It
> also means that of_find_compatible_dtb() can be restricted to the file
> scope.
>
> Is there a use-case for calling of_find_compatible_dtb() anywhere
> other than in dtb_compat_setup?
>

The use case for having these functions exposed is allowing the platfrom code 
decide the policy for which dtb will be used in the case where a dtb might have 
been passed in by the boot loader. These functions can be used as a fallback if 
a dtb was not passed in or to override of the passed in dtb by the platform code.
>> +
>> +early_param("dtb_compat", dtb_compat_setup);
>> +#endif
>> +#endif
>> +
>> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
>> index 7bbf5b3..c696da3c 100644
>> --- a/include/linux/of_fdt.h
>> +++ b/include/linux/of_fdt.h
>> @@ -58,6 +58,8 @@ struct boot_param_header {
>>   };
>>
>>   #if defined(CONFIG_OF_FLATTREE)
>> +#define MAX_DTB_COMPAT_STR 64
>> +
>
> Only used by drivers/of/fdt.c, so should not be in a header file.
>

removed

>>   /* TBD: Temporary export of fdt globals - remove when code fully merged */
>>   extern int __initdata dt_root_addr_cells;
>>   extern int __initdata dt_root_size_cells;
>> @@ -82,6 +84,9 @@ extern void early_init_dt_add_memory_arch(u64 base, u64 size);
>>   extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align);
>>   extern u64 dt_mem_next_cell(int s, __be32 **cellp);
>>
>> +extern char *of_get_dtb_compatible_string(void);
>> +extern void *of_find_compatible_dtb(char *name);
>> +
>
> As commented above, I don't think either of these need to be visible
> outside of fdt.c
>
> g.