Re: [Adeos-main] [RTnet-users] e1000 & MSI

[Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>]

Bernhard Pfund wrote:
>> I see no option aside of ironing the inner code that reads/writes the PCI
>> config, so here is an ugly yet possible solution for x86, that might work
>> (totally untested):
>>
>> diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
>> index 6e64aaf..7f32101 100644
>> --- a/arch/x86/pci/common.c
>> +++ b/arch/x86/pci/common.c
>> @@ -75,7 +75,7 @@ int pcibios_scanned;
>>   * This interrupt-safe spinlock protects all accesses to PCI
>>   * configuration space.
>>   */
>> -DEFINE_SPINLOCK(pci_config_lock);
>> +IPIPE_DEFINE_SPINLOCK(pci_config_lock);
>>
>>  static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
>>  {
>> diff --git a/drivers/pci/access.c b/drivers/pci/access.c
>> index 39bb96b..9a74083 100644
>> --- a/drivers/pci/access.c
>> +++ b/drivers/pci/access.c
>> @@ -12,7 +12,7 @@
>>   * configuration space.
>>   */
>>
>> -static DEFINE_SPINLOCK(pci_lock);
>> +static IPIPE_DEFINE_SPINLOCK(pci_lock);
>>
>>  /*
>>   *  Wrappers for all PCI configuration access functions.  They just check
>>
> 
> This results in:
> 
> arch/x86/pci/common.c:78: error: conflicting types for ‘pci_config_lock’
> arch/x86/pci/pci.h:84: error: previous declaration of ‘pci_config_lock’
> was here
> 
> Didn't look into it, just tried ;)

You probably need to replace the DECLARE_SPINLOCK in pci.h with
IPIPE_DECLARE_SPINLOCK...

-- 
                                                 Gilles.