On 19 December 2014 at 15:57, Gilles Chanteperdrix
<gilles.chanteperd...@xenomai.org> wrote:
> On Fri, Dec 19, 2014 at 12:20:13PM +0100, Frederik Bayart wrote:
>> On 18 December 2014 at 18:44, Gilles Chanteperdrix
>> <gilles.chanteperd...@xenomai.org> wrote:
>> > On Thu, Dec 18, 2014 at 05:53:33PM +0100, Frederik Bayart wrote:
>> >> Hallo,
>> >>
>> >> We have added msi to the rtcan_peak_pci driver
>> >> In attachment a zip file containing the old and the new rtcan_peak_pci.c
>> >> and the patch.
>> >> Can this patch be applied the the source tree ?
>> >
>> > Please send the patch alone, preferably inline, or as an attachment.
>> > This makes review and comment easier.
>> >
>> > --
>> > Gilles.
>>
>> Gilles,
>>
>> Below the patch. I used xenomai-3-3.0-rc2.tar because I haven't used
>> git yet but I verified that the
>> driver source didn't changed in git
>> (http://git.xenomai.org/xenomai-3.git/plain/kernel/drivers/can/sja1000/rtcan_peak_pci.c)
>>
>> Frederik
>>
>> --- a/kernel/drivers/can/sja1000/rtcan_peak_pci.c 2014-10-31
>> 15:18:44.000000000 +0100
>> +++ b/kernel/drivers/can/sja1000/rtcan_peak_pci.c 2014-12-18
>> 17:44:21.799350602 +0100
>> @@ -301,6 +301,8 @@
>> if ((ret = pci_write_config_word(pdev, 0x44, 0)))
>> goto failure_cleanup;
>>
>> + pci_enable_msi(pdev);
>> +
>
> You should get pci_enable_msi return status, and...
>
>> if (sub_sys_id > 3) {
>> if ((ret = rtcan_peak_pci_add_chan(pdev, CHANNEL_MASTER,
>> &master_dev)))
>> @@ -337,6 +339,8 @@
>> rtcan_peak_pci_del_chan(board->slave_dev, 0);
>> rtcan_peak_pci_del_chan(dev, 0);
>>
>> + pci_disable_msi(pdev);
>> +
>
> if it failed, do not use pci_disable_msi.
>
> --
> Gilles.
Is this necessary ? A lot of drivers seems to do this, but this check
is also done in pci_disable_msi :
void pci_disable_msi(struct pci_dev *dev)
{
if (!pci_msi_enable || !dev || !dev->msi_enabled)
return;
pci_msi_shutdown(dev);
free_msi_irqs(dev);
}
dev->msi_enabled is set at the end of pci_enable_msi
Frederik
_______________________________________________
Xenomai mailing list
Xenomai@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai
