From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbcBKSlc (ORCPT ); Thu, 11 Feb 2016 13:41:32 -0500 Received: from mail-lb0-f173.google.com ([209.85.217.173]:34632 "EHLO mail-lb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752447AbcBKSl2 (ORCPT ); Thu, 11 Feb 2016 13:41:28 -0500 Subject: Re: [PATCH V4 22/23] arm64, pci, acpi: Assign legacy IRQs once device is enable. To: Lorenzo Pieralisi References: <1454606941-9523-1-git-send-email-tn@semihalf.com> <1454606941-9523-23-git-send-email-tn@semihalf.com> <20160211115843.GA24136@red-moon> <20160211171700.GB25235@red-moon> Cc: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, okaya@codeaurora.org, jiang.liu@linux.intel.com, Stefano.Stabellini@eu.citrix.com, robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, jchandra@broadcom.com, jcm@redhat.com From: Tomasz Nowicki Message-ID: <56BCD550.2050601@semihalf.com> Date: Thu, 11 Feb 2016 19:39:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20160211171700.GB25235@red-moon> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11.02.2016 18:17, Lorenzo Pieralisi wrote: > Here (on top of your series), ready for flak. > > Lorenzo > > -- >8 -- > diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c > index 0b53262..26ee291 100644 > --- a/arch/arm64/kernel/pci.c > +++ b/arch/arm64/kernel/pci.c > @@ -45,28 +45,23 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, > */ > int pcibios_enable_device(struct pci_dev *dev, int mask) > { > - int ret; > - > if (pci_has_flag(PCI_PROBE_ONLY)) > return 0; > > - ret = pci_enable_resources(dev, mask); > - if (ret < 0) > - return ret; > - > -#ifdef CONFIG_ACPI > - if (!pci_dev_msi_enabled(dev)) > - return acpi_pci_irq_enable(dev); > -#endif > - return 0; > + return pci_enable_resources(dev, mask); > } > > /* > - * Try to assign the IRQ number from DT when adding a new device > + * Try to assign the IRQ number when probing a new device > */ > -int pcibios_add_device(struct pci_dev *dev) > +int pcibios_alloc_irq(struct pci_dev *dev) > { > - dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > + if (acpi_disabled) > + dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); > +#ifdef CONFIG_ACPI > + else > + return acpi_pci_irq_enable(dev); > +#endif > > return 0; > } I miss that way of solving the problem. OK lets try this way. I will integrate it. Tomasz