From patchwork Tue Aug 25 17:33:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suravee Suthikulpanit X-Patchwork-Id: 510571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F40891401DE for ; Wed, 26 Aug 2015 03:34:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755956AbbHYReN (ORCPT ); Tue, 25 Aug 2015 13:34:13 -0400 Received: from mail-bn1bon0119.outbound.protection.outlook.com ([157.56.111.119]:58687 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755562AbbHYReK (ORCPT ); Tue, 25 Aug 2015 13:34:10 -0400 Received: from BY1PR0201CA0034.namprd02.prod.outlook.com (10.160.191.172) by BY1PR02MB1148.namprd02.prod.outlook.com (10.162.108.15) with Microsoft SMTP Server (TLS) id 15.1.256.15; Tue, 25 Aug 2015 17:34:07 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::154) by BY1PR0201CA0034.outlook.office365.com (2a01:111:e400:4814::44) with Microsoft SMTP Server (TLS) id 15.1.243.23 via Frontend Transport; Tue, 25 Aug 2015 17:34:07 +0000 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from atltwp02.amd.com (165.204.84.222) by BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) with Microsoft SMTP Server id 15.1.249.14 via Frontend Transport; Tue, 25 Aug 2015 17:34:06 +0000 X-WSS-ID: 0NTNFGP-08-24L-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 214C4D16007; Tue, 25 Aug 2015 13:34:00 -0400 (EDT) Received: from SATLEXDAG01.amd.com (10.181.40.3) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Tue, 25 Aug 2015 12:34:14 -0500 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by SATLEXDAG01.amd.com (10.181.40.3) with Microsoft SMTP Server id 14.3.195.1; Tue, 25 Aug 2015 13:34:03 -0400 From: Suravee Suthikulpanit To: , , , , CC: , , , , , Suravee Suthikulpanit , Rob Herring , "Murali Karicheri" Subject: [PATCH V2 4/4] PCI: ACPI: Add support for PCI device DMA coherency Date: Wed, 26 Aug 2015 00:33:29 +0700 Message-ID: <1440524009-5359-5-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1440524009-5359-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1440524009-5359-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD027; 1:RWaMbCF9WMQiPlEWi6jWwHJc7Coir3Dijv5gDlXK2fFcqQMYtTAtXezau9Wv0uTP+rrk9oQfXnmtayuqjg0WdZ0CFCwg1xipiAEvQGMFAyPf3I0UznS/oogAdghBF9tE7O2UYj9nLkZ/c4Gb2rMdrl2dNsUvGu0IzwCvEiYeKICYY+YNqOdJl6CT4t9cx47GcoKVVd1HswuuwhAUToIUCFjwRwLJiVxrXbGXZtSt1r/ZEodgsEVCKgpXpHE5ieeIULAdW801PrUg0T45DKC1lHo8et++QBVmJ1Tgj52+FgiAY394xl/CHwNH3Lq0+JVwzv7S8C7u+WMDNbHqJdEtHFIKwfdEKPbQ1R78YVb5aCbHmutlRWk8c2hEqYppo2DL X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(428002)(3050300001)(199003)(189002)(4001540100001)(5007970100001)(62966003)(77156002)(50466002)(105586002)(19580405001)(19580395003)(2201001)(106466001)(86362001)(101416001)(5003600100002)(53416004)(189998001)(64706001)(47776003)(77096005)(68736005)(92566002)(2950100001)(50986999)(5001920100001)(5001860100001)(87936001)(48376002)(5001830100001)(76176999)(97736004)(5001770100001)(50226001)(46102003)(5003940100001)(229853001)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR02MB1148; H:atltwp02.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1148; 2:g7GR2lXlumeGF9yHmNUYPJrNXUH8DDj02CHmw5sRNB9hw+WNnjPacld5DyaWiFzBtQi+eSyCrpVGQ6KRoOsct2Sf9DHQrhIlzGfzwo2RHbdTavG1IoX181lQNsd0eWP+CDqEwgcHPyBBbgu5m8rf1tQcR3W/FO+qFfy5+CbVIwQ=; 3:ji2dQ3aHtI/KQql3vJGVKisphwr/0LDk2c124Cr5zRkMCb0sXfKW+ppNPJkY/hXZGLZN/zJs6dZNLdi8ZWijg/+4evuY4SyxMDzznhmHHrayK4CAsPlQuTzoLxIBiMtMrZIkskJBuUfvx+ZNzbTMIyJ9iT4nNWx5v2CjI3OALm1zM5suaYObof3JzLdEDU+6AcTpaKIR7Ego0E3Qkq1evjG8WR9OgfOTszgmhn7kjBbxgnN1d6SX8EZ2iSuwrFfD; 25:7V96D/yE8HE5dkM98e5M9OfIL7IY9vnlH5X6CYKHIdrU3InZ50Vj2N1bkVD4fJPZi6BxtlAvgyE1I+bUKX1vcVRsJ1v1l/2HeaMJ8H3W04tQH+3Gyff07ttzZGhuam0PUft8Qczmew3M6vix2GfPp/rj4tWBI7fyLhISPvTPb4oOi7WWRdzWz1gb7cIqjZ3uvECQnCNTtNKLIOKtmeGgHu39/HekVAWnQr4TKxWaWMsTnBHcoM22voDjMeVFAfFH0dQhnMILLp7kQSAJwaodBw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR02MB1148; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1148; 20:l29aogDgWSEEP5L8bYpEr+hX+xZA7VblsPf+ltYk+PaENUV5kjHiTXDiMLNhCeqC0VwQDEKRjtPUwa1oDQdvgZBuuPCCqGSLd+ygR4MfCg3qUoxjNyJFnAFyrV4uywueqGmHmthCa0/weOodX/xSOsFAgcY+CQbUJAxolkaIdSQH/tNMlmbnViFSlX/2TfffBWCXUVdj9YW/jk8bYMeB9OT44H5gKewVcf23mwrHscaWyW58/pmLfxdaXihvhvyu1+T57j9kDi2CEbci2tJeA6u+iFiDhIzJfy1BtyXBzvnrmF83nkdoZPa5K8+EzcGZ8rKqqlNzrN3MPm/Me+EHtgeUYUwtdLEbDq13XJft8NHKZ3kF1eVMNkB1GWOWtmbwu0Q7ImK/yDFCHk9iFs+cyWkOl9jTE9+653uoJW4RFrtK6on9iqBOtVyGgAynY3elFE6eK3XR0szJqTuJIMlG/k9ZIkTD2OaUVz4xRLCiyGPprphLUTVhb3KWX2+4haJp; 4:5xdeio7IZHvkH8FoXCQ8r9X2HtWVaca2B2cVkYEtb/CLXgN4H7ePOHNJ/xxiG05wzRl+oDk3VbOPq7HSQavlbzw5Pgi3a30GM4klMnNUn+RksKRPE+459l2Bl8YYxHsBoyB4dvtCoIxsm9T7aOqq8gs1UZ9l+eu2VBVSg1505Tm+9raAjEXm4wyULrQUCK8i9VTrjbPxImb50qc62zoLDp+cpoCuai8fMLif9VFoUQl/NVtNJGuBH9ZupL0pO1ZUbZJ9ZLTqhRHLeXZ3IGknXeNxs9G2nfBeMVE2q+4AY4P9HulMUWiPhUexUGOXAyLBqM4uXRfm9Qn0j7jRePtaPw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:BY1PR02MB1148; BCL:0; PCL:0; RULEID:; SRVR:BY1PR02MB1148; X-Forefront-PRVS: 06793E740F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR02MB1148; 23:hmiO0fh8+fl0hYQHPay8kLSGhZoZzEeatatC6YH6f?= =?us-ascii?Q?fRFwHU99eOLN/pMSDAAh2isNNOgMMU3gQqryCj7CyQANYwdvaelJP8WF343y?= =?us-ascii?Q?UYUqdLJF6v3Cz8MUp1mgEWl4U0zrun5FMHv4hSjpS71gy0lh5ShD3M4DbT7T?= =?us-ascii?Q?ezqdQ+XG5Ynb3RRXJ7+f6C9AO+wD7Kv7MSs83JVB1pc86/0bHbDlikD3TJE2?= =?us-ascii?Q?yetLApQbMXCDHmwPeBlFITlphPcLBLx8RhHc9dELlvHhDla5IAUNOBqdz8dy?= =?us-ascii?Q?lZzZ2XRi2wG4FZc9EB9EbAie57IN8GdqxPzASSajJRTkmn3Xru3wJI9KH3aS?= =?us-ascii?Q?9i50GmI2Y54XD8U2fzSdTYt78CCa/YYYjcVi2kfIIQ0UVHcV9VXTnCEiIWxG?= =?us-ascii?Q?wtiUeEzT+f2Wt7IXWzqLlENSLwIKSn9hXwt7VXwtnKxXmU8mmzSPGyGEux71?= =?us-ascii?Q?bXaSgMaxAwJ2+xKGqHqctkp33eoFa8ze9bAP7n7oyBipYHyKWtUYmdNfDyUe?= =?us-ascii?Q?sKSVNukgffD+5wxZ8orH7F5+wpuKISKZiQaEeWXYyN/HDYtzpG4LWGES9IY/?= =?us-ascii?Q?YNgnNUucbaPPPGZmAJFv1mfT3BrFcyHo04ZLkzVJOIf3xq/Om34D146/G0Br?= =?us-ascii?Q?RS3eWVb0513iVfe3nETDkxlOqKaHyRyOSN2uJN6rfJVJAOIMoQAtSKGzmHQG?= =?us-ascii?Q?E62LFXQj0NvVMFZQ+rk1j7EzBlXd9W1SOiNuctDFqLoJPRVn9CQpUWbTBt/k?= =?us-ascii?Q?7tDW4a1MRNMQbwssI1I0GbXauCkrm4O29yPQMc3fU0uhWExo4xE2y/IojJb7?= =?us-ascii?Q?GHCeSsDCBHBphviV7WoTpwxJt58PUkZRdhhTAUXdeHaMSHEAyKbG1DcFNk7p?= =?us-ascii?Q?FU+VK1luxKHJgftHkl1iY+/PJjWFj/ayOWCHbO8fGN6qizBUnjLkTuJ1ef7l?= =?us-ascii?Q?IxJEzcWx24/1zE4iWFrofuYLRB58H1LD8Vscru6XoIFHqlW9FgzzXCnLZ83/?= =?us-ascii?Q?0QcIiMCIp0nBRYaKCHfhf1haT/IxOVznsWLsE7YJhExsVnZf5D1oCrxcyWMZ?= =?us-ascii?Q?e4Bzt1oCm6M2Zr13m/bV6X9a3eeg069mpO9jk4KmPJPs12f/O684NRXhbfwl?= =?us-ascii?Q?oVVy040zIn3aPHeqmcP777pOtvyNUa4?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1148; 5:CGi2n+Mysyx+9WBHOO5BqdhAW+0Fnb3+6zW+1NwWdrSo+zCmVmmBpRnTkDFxX+EJgPjkKNcOtla/2/ao6AWEt2CJPRxAveDMANbixY3sw71uWd8l8+uxJBhFh02VVulcU+dO+NPlaWy8x2IQcd78pQ==; 24:9oz3zoixdgfL8mc5JUkhgxpH9TRCLX0kzeoYq36XM1x86IaE2n60xoY2m95sDkmhrl9MMJWhlT3/zmjHmCLU+PgtrdXLxtbnT3RKbf2DD8Y=; 20:vrI85+iSA2unHDxQnF3FwFzZP4PomTVCIx5SQauR0BRZnp4XkKXtROXoII3xt6mGadG2r/seiW/Dq2gKZjZABw== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2015 17:34:06.9837 (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: BY1PR02MB1148 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch 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/pci/probe.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 4de6594..2fd2a60 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1551,17 +1551,22 @@ static void pci_init_capabilities(struct pci_dev *dev) * @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). + * info from the OF node or ACPI node of host bridge's parent (if any). */ static void pci_dma_configure(struct pci_dev *dev) { struct device *bridge = pci_get_host_bridge_device(dev); if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) { - if (!bridge->parent) - return; - - of_dma_configure(&dev->dev, bridge->parent->of_node); + if (bridge->parent) + of_dma_configure(&dev->dev, + bridge->parent->of_node); + } else if (has_acpi_companion(bridge)) { + struct acpi_device *adev = to_acpi_node(bridge->fwnode); + int coherent = acpi_check_dma_coherency(adev); + + if (-1 != coherent) + arch_setup_dma_ops(&dev->dev, 0, 0, NULL, coherent); } pci_put_host_bridge_device(bridge);