Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753575AbbEPPMS (ORCPT ); Sat, 16 May 2015 11:12:18 -0400 Received: from mail-by2on0110.outbound.protection.outlook.com ([207.46.100.110]:13972 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751417AbbEPPMN convert rfc822-to-8bit (ORCPT ); Sat, 16 May 2015 11:12:13 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; arm.com; dkim=none (message not signed) header.d=none; X-WSS-ID: 0NOG7K1-08-FNG-02 X-M-MSG: From: "Suthikulpanit, Suravee" To: "Rafael J. Wysocki" CC: "lenb@kernel.org" , "catalin.marinas@arm.com" , "will.deacon@arm.com" , "bhelgaas@google.com" , "Lendacky, Thomas" , "herbert@gondor.apana.org.au" , "davem@davemloft.net" , "arnd@arndb.de" , "msalter@redhat.com" , "hanjun.guo@linaro.org" , "al.stone@linaro.org" , "grant.likely@linaro.org" , "Duran, Leo" , "linux-arm-kernel@lists.infradead.org" , "linux-acpi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linaro-acpi@lists.linaro.org" , "netdev@vger.kernel.org" , "linux-crypto@vger.kernel.org" , Rob Herring , "Murali Karicheri" , David Woodhouse Subject: Re: [V4 PATCH 3/6] pci: Generic function for setting up PCI device DMA coherency Thread-Topic: [V4 PATCH 3/6] pci: Generic function for setting up PCI device DMA coherency Thread-Index: AQHQj1VvpPJ62S4nuEu0eQDk2WWPXJ19+pwAgACrXQA= Date: Sat, 16 May 2015 15:12:05 +0000 Message-ID: In-Reply-To: <3954735.qeaTp8qOcM@vostro.rjw.lan> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/14.3.0.121105 x-originating-ip: [10.177.96.11] Content-Type: text/plain; charset="iso-8859-1" Content-ID: Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD028;1:lMzpFCg48z+5yqaBSohJKCdJX35GgieOBJXL+tTF3q4kdwzirptoaPwexye1IoQYp+V7fvoWriaQIimJ6P6nQ9TqviShvGkjRoGs2qlqItkTkSIX3TrpKWYfDtc4drcRpciRYo+BV46hkAZHqmnWmvcpRjqyIUjBuS17Z+eCcu3alGK7B2iQMNW+wagfxMBW7qTOkHI9yPUkuWa2glONJTpWpas4QQmF5AMl114k/XFA4WPQOf5LJcWXQRbsOV8pxlfFyuqskKcW0jMMy+vhne6HrdlvJjmKV9QQWz3JTKUGj0HBSRs8Pp3t7WE9YnaC X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(428002)(377454003)(24454002)(164054003)(479174004)(199003)(51704005)(189002)(50986999)(54356999)(47776003)(105586002)(86362001)(110136002)(189998001)(5250100002)(36756003)(2900100001)(2950100001)(102836002)(19580395003)(4001350100001)(19580405001)(62966003)(77156002)(50466002)(2656002)(92566002)(83506001)(46102003)(87936001)(106466001)(106116001)(101416001)(53416004)(23756003);DIR:OUT;SFP:1102;SCL:1;SRVR:CO1PR02MB080;H:atltwp02.amd.com;FPR:;SPF:None;MLV:sfv;A:1;MX:1;LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO1PR02MB080; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:CO1PR02MB080;BCL:0;PCL:0;RULEID:;SRVR:CO1PR02MB080; X-Forefront-PRVS: 057859F9C5 X-OriginatorOrg: amd4.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2015 15:12:07.3851 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR02MB080 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4806 Lines: 152 Hi Rafael, On 5/15/15, 18:59, "Rafael J. Wysocki" wrote: >On Friday, May 15, 2015 04:23:11 PM Suravee Suthikulpanit wrote: >> This patch refactors of_pci_dma_configure() into a more generic >> pci_dma_configure(), which can be reused by non-OF code. >> Then, it adds support for setting up PCI device DMA coherency from >> ACPI _CCA object that should normally be specified in the DSDT node >> of its PCI host bridge.. >> >> Signed-off-by: Suravee Suthikulpanit >> CC: Bjorn Helgaas >> CC: Catalin Marinas >> CC: Rob Herring >> CC: Will Deacon >> CC: Rafael J. Wysocki >> CC: Murali Karicheri >> --- >> drivers/of/of_pci.c | 20 -------------------- >> drivers/pci/probe.c | 35 +++++++++++++++++++++++++++++++++-- >> include/linux/of_pci.h | 3 --- >> 3 files changed, 33 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c >> index 5751dc5..b66ee4e 100644 >> --- a/drivers/of/of_pci.c >> +++ b/drivers/of/of_pci.c >> @@ -117,26 +117,6 @@ int of_get_pci_domain_nr(struct device_node *node) >> } >> EXPORT_SYMBOL_GPL(of_get_pci_domain_nr); >> >> -/** >> - * of_pci_dma_configure - Setup DMA configuration >> - * @dev: ptr to pci_dev struct of the PCI device >> - * >> - * Function to update PCI devices's DMA configuration using the same >> - * info from the OF node of host bridge's parent (if any). >> - */ >> -void of_pci_dma_configure(struct pci_dev *pci_dev) >> -{ >> - struct device *dev = &pci_dev->dev; >> - struct device *bridge = pci_get_host_bridge_device(pci_dev); >> - >> - if (!bridge->parent) >> - return; >> - >> - of_dma_configure(dev, bridge->parent->of_node); >> - pci_put_host_bridge_device(bridge); >> -} >> -EXPORT_SYMBOL_GPL(of_pci_dma_configure); >> - >> #if defined(CONFIG_OF_ADDRESS) >> /** >> * of_pci_get_host_bridge_resources - Parse PCI host bridge resources >>from DT >> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c >> index 6675a7a..3c6f2e5 100644 >> --- a/drivers/pci/probe.c >> +++ b/drivers/pci/probe.c >> @@ -6,12 +6,14 @@ >> #include >> #include >> #include >> -#include >> +#include >> #include >> #include >> #include >> #include >> #include >> +#include >> +#include >> #include >> #include "pci.h" >> >> @@ -1508,6 +1510,35 @@ static void pci_init_capabilities(struct pci_dev >>*dev) >> pci_enable_acs(dev); >> } >> >> +/** >> + * pci_dma_configure - Setup DMA configuration >> + * @pci_dev: ptr to pci_dev struct of the PCI device >> + * >> + * Function to update PCI devices's DMA configuration using the same >> + * info from the OF node or ACPI node of host bridge's parent (if any). >> + */ >> +static void pci_dma_configure(struct pci_dev *pci_dev) >> +{ >> + struct device *dev = &pci_dev->dev; >> + struct device *bridge = pci_get_host_bridge_device(pci_dev); >> + struct device *host = bridge->parent; >> + struct acpi_device *adev; >> + >> + if (!host) >> + return; >> + >> + if (acpi_disabled) { >> + of_dma_configure(dev, host->of_node); > >I'd rather do > > if (IS_ENABLED(CONFIG_OF) && host->of_node) { > of_dma_configure(dev, host->of_node); > } else { > struct acpi_device *adev = ACPI_COMPANION(host); > > if (adev && acpi_dma_is_supported(adev)) { Ok, I?ll update this. > >> + } else if (has_acpi_companion(host)) { >> + adev = acpi_node(host->fwnode); >> + if (acpi_dma_is_supported(adev)) >> + arch_setup_dma_ops(dev, 0, 0, NULL, >> + acpi_dma_is_coherent(adev)); >> + } >> + >> + pci_put_host_bridge_device(bridge); >> +} >> + >> void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) >> { >> int ret; >> @@ -1521,7 +1552,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_dma_configure(dev); > >Also I'm not quite sure if that's actually OK. > >We should be handling the DMA setup on x86 in the ACPI case already >without it. >Or is this a NOP on x86? You are correct. x86 doesn?t implement the arch_setup_dma_ops(). Therefore, this is a NOP on x86. Thanks, Suravee -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/