From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757352AbbAZX3o (ORCPT ); Mon, 26 Jan 2015 18:29:44 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:38616 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754575AbbAZX3k (ORCPT ); Mon, 26 Jan 2015 18:29:40 -0500 Message-ID: <54C6CDB6.2080207@ti.com> Date: Mon, 26 Jan 2015 18:28:54 -0500 From: Murali Karicheri User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Bjorn Helgaas CC: , , , , , Joerg Roedel , Grant Likely , Rob Herring , Will Deacon , Russell King , Arnd Bergmann , Suravee Suthikulpanit Subject: Re: [PATCH v4 5/6] PCI: update dma configuration from DT References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-6-git-send-email-m-karicheri2@ti.com> <20150123232725.GV29776@google.com> In-Reply-To: <20150123232725.GV29776@google.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/23/2015 06:27 PM, Bjorn Helgaas wrote: > On Fri, Jan 23, 2015 at 05:32:38PM -0500, Murali Karicheri wrote: >> If there is a DT node available for the root bridge's parent device, >> use the dma configuration from that device node. For example, keystone >> PCI devices would require dma_pfn_offset to be set correctly in the >> device structure of the pci device in order to have the correct dma mask. >> The DT node will have dma-ranges defined for this. Also support using >> the DT property dma-coherent to allow coherent DMA operation by the >> PCI device. >> >> This patch use the new helper function of_pci_dma_configure() to update >> the device dma configuration. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri > > I assume this series will be merged via some non-PCI tree, so: Not sure who will pick this. Since this is for PCI, will it be possible to apply this to arm-pci/next? > > Acked-by: Bjorn Helgaas I will add your ack for v5. Murali > >> --- >> drivers/pci/probe.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c >> index 23212f8..d7dcd6c 100644 >> --- a/drivers/pci/probe.c >> +++ b/drivers/pci/probe.c >> @@ -6,6 +6,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -1520,6 +1521,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) >> dev->dev.dma_mask =&dev->dma_mask; >> dev->dev.dma_parms =&dev->dma_parms; >> dev->dev.coherent_dma_mask = 0xffffffffull; >> + of_pci_dma_configure(dev); >> >> pci_set_dma_max_seg_size(dev, 65536); >> pci_set_dma_seg_boundary(dev, 0xffffffff); >> -- >> 1.7.9.5 >> -- Murali Karicheri Linux Kernel, Texas Instruments From mboxrd@z Thu Jan 1 00:00:00 1970 From: Murali Karicheri Subject: Re: [PATCH v4 5/6] PCI: update dma configuration from DT Date: Mon, 26 Jan 2015 18:28:54 -0500 Message-ID: <54C6CDB6.2080207@ti.com> References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-6-git-send-email-m-karicheri2@ti.com> <20150123232725.GV29776@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20150123232725.GV29776-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Bjorn Helgaas Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Russell King , Arnd Bergmann , linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Will Deacon , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Rob Herring , Grant Likely , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org On 01/23/2015 06:27 PM, Bjorn Helgaas wrote: > On Fri, Jan 23, 2015 at 05:32:38PM -0500, Murali Karicheri wrote: >> If there is a DT node available for the root bridge's parent device, >> use the dma configuration from that device node. For example, keystone >> PCI devices would require dma_pfn_offset to be set correctly in the >> device structure of the pci device in order to have the correct dma mask. >> The DT node will have dma-ranges defined for this. Also support using >> the DT property dma-coherent to allow coherent DMA operation by the >> PCI device. >> >> This patch use the new helper function of_pci_dma_configure() to update >> the device dma configuration. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri > > I assume this series will be merged via some non-PCI tree, so: Not sure who will pick this. Since this is for PCI, will it be possible to apply this to arm-pci/next? > > Acked-by: Bjorn Helgaas I will add your ack for v5. Murali > >> --- >> drivers/pci/probe.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c >> index 23212f8..d7dcd6c 100644 >> --- a/drivers/pci/probe.c >> +++ b/drivers/pci/probe.c >> @@ -6,6 +6,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -1520,6 +1521,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) >> dev->dev.dma_mask =&dev->dma_mask; >> dev->dev.dma_parms =&dev->dma_parms; >> dev->dev.coherent_dma_mask = 0xffffffffull; >> + of_pci_dma_configure(dev); >> >> pci_set_dma_max_seg_size(dev, 65536); >> pci_set_dma_seg_boundary(dev, 0xffffffff); >> -- >> 1.7.9.5 >> -- Murali Karicheri Linux Kernel, Texas Instruments From mboxrd@z Thu Jan 1 00:00:00 1970 From: m-karicheri2@ti.com (Murali Karicheri) Date: Mon, 26 Jan 2015 18:28:54 -0500 Subject: [PATCH v4 5/6] PCI: update dma configuration from DT In-Reply-To: <20150123232725.GV29776@google.com> References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-6-git-send-email-m-karicheri2@ti.com> <20150123232725.GV29776@google.com> Message-ID: <54C6CDB6.2080207@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 01/23/2015 06:27 PM, Bjorn Helgaas wrote: > On Fri, Jan 23, 2015 at 05:32:38PM -0500, Murali Karicheri wrote: >> If there is a DT node available for the root bridge's parent device, >> use the dma configuration from that device node. For example, keystone >> PCI devices would require dma_pfn_offset to be set correctly in the >> device structure of the pci device in order to have the correct dma mask. >> The DT node will have dma-ranges defined for this. Also support using >> the DT property dma-coherent to allow coherent DMA operation by the >> PCI device. >> >> This patch use the new helper function of_pci_dma_configure() to update >> the device dma configuration. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri > > I assume this series will be merged via some non-PCI tree, so: Not sure who will pick this. Since this is for PCI, will it be possible to apply this to arm-pci/next? > > Acked-by: Bjorn Helgaas I will add your ack for v5. Murali > >> --- >> drivers/pci/probe.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c >> index 23212f8..d7dcd6c 100644 >> --- a/drivers/pci/probe.c >> +++ b/drivers/pci/probe.c >> @@ -6,6 +6,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -1520,6 +1521,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) >> dev->dev.dma_mask =&dev->dma_mask; >> dev->dev.dma_parms =&dev->dma_parms; >> dev->dev.coherent_dma_mask = 0xffffffffull; >> + of_pci_dma_configure(dev); >> >> pci_set_dma_max_seg_size(dev, 65536); >> pci_set_dma_seg_boundary(dev, 0xffffffff); >> -- >> 1.7.9.5 >> -- Murali Karicheri Linux Kernel, Texas Instruments