Re: [Xenomai] [PATCH v2] hal/arm: Add Zynq v3.5.7 patches

[Stefan Roese <sr@denx.de>]

On 15.01.2014 15:15, Gilles Chanteperdrix wrote:
> On 01/15/2014 02:53 PM, Stefan Roese wrote:
>> Xilinx Zynq is already supported in the mainline Xenomai git repository.
>> This patch adds support for the v3.5.7 Linux Kernel with the latest
>> arm-6 i-pipe patch additionally to the already present v3.8 support.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> ---
>> v2:
>> - Base pre-patch on top of a different git reopsitory based on v3.5.7
>> - Remove defconfig and other board specific stuff from post-patch
>> - All this leads to minimal pre- and post- patches as requested
>>    by Gilles
> 
> Hi Stefan,
> 
> this looks fine to me, except:
> 
> 
>> +diff --git a/arch/arm/kernel/ipipe.c b/arch/arm/kernel/ipipe.c
>> +index ff4ad1a..cf5f29b 100644
>> +--- a/arch/arm/kernel/ipipe.c
>> ++++ b/arch/arm/kernel/ipipe.c
>> +@@ -574,8 +574,6 @@ EXPORT_SYMBOL_GPL(__ipipe_serial_debug);
>> +
>> + EXPORT_SYMBOL_GPL(do_munmap);
>> + EXPORT_SYMBOL_GPL(show_stack);
>> +-EXPORT_SYMBOL_GPL(init_mm);
>> +-EXPORT_SYMBOL_GPL(cpu_architecture);
>> + #ifndef MULTI_CPU
>> + EXPORT_SYMBOL_GPL(cpu_do_switch_mm);
>> + #endif
> 
> If you need to remove these two lines, they should be removed from the 
> I-pipe patch itself, not in the Zynq-specific patch. But, why do you 
> need to remove them?

Its a long time since I implemented this patch. I just rechecked and
without this removal, I get the following compilation/linking error:

...
  LINK    vmlinux
  LD      vmlinux.o
mm/built-in.o: In function `__crc_init_mm':
migrate.c:(*ABS*+0x3d9f9d12): multiple definition of `__crc_init_mm'
make: *** [vmlinux] Error 1

Any other (recommended) way to solve this?

>> +diff --git a/drivers/gpio/gpio-xilinxps.c b/drivers/gpio/gpio-xilinxps.c
> 
>> +-	device_pin_num = irq_to_gpio(irq_data->irq); /* get pin num within the device */
>> ++	device_pin_num = irq_data->hwirq; /* get pin num within the device */
> 
> Why do you need to change that? Is it related to the I-pipe patch?

This post-patch includes a few gpio related update/fix patches. As they
are required for the ironing of the GPIO ipipe interrupt support.

Thinking a bit more about this, I could perhaps also move these gpio
updates into the DENX Linux git repository instead. I'll prepare a v3
soon with this change.

<snip>

> I do not really mind the changes in gpios, but I do not think removing 
> the EXPORT_SYMBOL from ipipe.c makes sense. These should only be useful 
> if you compile Xenomai completely as module, but should still be useful.

See above.

Thanks,
Stefan