Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933453AbcDTJof (ORCPT ); Wed, 20 Apr 2016 05:44:35 -0400 Received: from foss.arm.com ([217.140.101.70]:45828 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932923AbcDTJoe (ORCPT ); Wed, 20 Apr 2016 05:44:34 -0400 Subject: Re: [PATCH v7 8/8] genirq/msi: use the MSI doorbell's IOVA when requested To: Eric Auger , eric.auger@st.com, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org References: <1461085990-2547-1-git-send-email-eric.auger@linaro.org> <1461085990-2547-9-git-send-email-eric.auger@linaro.org> Cc: patches@linaro.org, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, julien.grall@arm.com From: Marc Zyngier X-Enigmail-Draft-Status: N1110 Organization: ARM Ltd Message-ID: <57174F7D.4090501@arm.com> Date: Wed, 20 Apr 2016 10:44:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.7.0 MIME-Version: 1.0 In-Reply-To: <1461085990-2547-9-git-send-email-eric.auger@linaro.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1870 Lines: 58 On 19/04/16 18:13, Eric Auger wrote: > On MSI message composition we now use the MSI doorbell's IOVA in > place of the doorbell's PA in case the device is upstream to an > IOMMU that requires MSI addresses to be mapped. The doorbell's > allocation and mapping happened on an early stage (pci_enable_msi). > > Signed-off-by: Eric Auger > > --- > v6 -> v7: > - allocation/mapping is done at an earlier stage. We now just perform > the iova lookup. So it is safe now to be called in a code that cannot > sleep. iommu_msi_set_doorbell_iova is moved in the dma-reserved-iommu > API: I think it cleans things up with respect to various #ifdef CONFIGS. > > v5: > - use macros to increase the readability > - add comments > - fix a typo that caused a compilation error if CONFIG_IOMMU_API > is not set > --- > kernel/irq/msi.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c > index e45907e..0ebb2d8 100644 > --- a/kernel/irq/msi.c > +++ b/kernel/irq/msi.c > @@ -19,6 +19,7 @@ > > /* Temparory solution for building, will be removed later */ > #include > +#include > > struct msi_desc *alloc_msi_entry(struct device *dev) > { > @@ -64,8 +65,12 @@ static int msi_compose(struct irq_data *irq_data, > > if (erase) > memset(msg, 0, sizeof(*msg)); > - else > + else { > ret = irq_chip_compose_msi_msg(irq_data, msg); > + if (ret) > + return ret; > + iommu_msi_mapping_translate_msg(irq_data, msg); I've just commented on this function in its respective series. I really think it deals with the wrong data structure. Id rather see something like: struct device *dev = msi_desc_to_dev(irq_data_get_msi_desc(irq_data)); iommu_msi_msg_pa_to_va(dev, msg); Thanks, M. -- Jazz is not dead. It just smells funny...