From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755775AbbJUPyc (ORCPT ); Wed, 21 Oct 2015 11:54:32 -0400 Received: from mail-bl2on0096.outbound.protection.outlook.com ([65.55.169.96]:57056 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755529AbbJUPxK (ORCPT ); Wed, 21 Oct 2015 11:53:10 -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;arm.com; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NWKUSE-08-0A2-02 X-M-MSG: From: Suravee Suthikulpanit To: , , , , CC: , , , , , , , , Suravee Suthikulpanit , Murali Karicheri Subject: [PATCH V4 7/8] PCI: OF: Move of_pci_dma_configure() to pci_dma_configure() Date: Wed, 21 Oct 2015 08:52:10 -0700 Message-ID: <1445442731-28819-8-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1445442731-28819-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1445442731-28819-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(77096005)(2201001)(87936001)(92566002)(50986999)(53416004)(76176999)(46102003)(2950100001)(101416001)(19580395003)(189998001)(5003600100002)(575784001)(36756003)(86362001)(5003940100001)(64706001)(19580405001)(47776003)(48376002)(50466002)(97736004)(5001770100001)(106466001)(105586002)(5008740100001)(5007970100001)(11100500001)(229853001)(5001920100001)(50226001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0862;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;2:L/n6ijz9zaK+iDE2wShT+yROvCU8Dt8CjyB7gT5OEu7KqR9OXmKzeQuvNvGWFPH1xIWprgMZ2bQ7Bpk2Z9b0mQEzQkF1L8okTdfk768DoiowzcS9k60lgyaVjoQFkLjUQlGyox7v13zNBtea5M7yS8hY1Wie6bUUmAdu+S4sLro=;3:HhZ9qZn6g/O447UTHn0TTmDXXzpgpO4XX+HsCOLrxg79TkMyUloIJ36YyOXwSdn+e3XkQyNNTu4dXDqejvU8x/EVwV97G6EKipzxzO89t/zZkVVh7SZ0L6qmlilyc/GoaJZagt7F235yreVtAaMbJpBqe/VND2DgMdwwJLMufkNZLxyBiH0iKw4KR4Pq+jHpS/eCXR+6iOP/GeiqVVvEO2aWmAcUzj2O7chgTau9mIWrDDmvD88OfrFtLw5OJVWm;25:UTHsNk0Hl+/JBm6rGDQYSEFm5B09TLcIFWGrjfW1y3e8wR9jpsRRqfCofYAQ406z3BfkW5cX4/cgYBQCW0+TG/1p6/eykchvbGIpqyYllWEa8/nz5iAuW3EBc1UMPWCz3hCZi2XRAkaFYCr4aGTQUbZiaw8eMACmDY92cpxOTYPOQwX/ITnocSZl5cig56awVsk9PZ0sPwvPzw6xXZbNAhGlIhZMcTXRfCPeEhAiZWlA2ZT5qMzTztLwrEZpyN2vPluSo5DE6z21IeRFICVkMg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0862; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;20:HrIjVJO+F2g6y3Ok3JpWpAblK2pSQbJAm4d/VNNVuwLxUMtcq1G6ruouXJy63gsxK4gftIi6/P6NHdUMyp6bdOYIZVnaLRdS+wv6wQGZ3TC9G7t1kH5/DgJ3XPp7W9e10rM98hpG6t3XMU1WuhGUE37w6bgzaKwz9pY7wHhplkf1HSSuqdtgXFb6vvXSy58qYAJ1dn6VdN61UroiEcQR+APK7Is98Va2ZsqiOtR/+10uqxy6QgX5xblKUqSV5addqnQnjk8pTBSfsX6Oxyy0ZmvYpylrNBt+Yn0ocAhg4Ygh6fDQsPqg+0R7C4no7XmjPmWr80F+HpXUL2HIhXxTXbxyYKBacGjV8xDlAAogEtwj7t5URzFmGj+dVVR1/5+RmrscnQ/W4kgy38JhJ7/8ZteTZWTwQBkJEXYUJeOywKVjkDouolxjSDYsMVvMYoKqn63hxBs1vlRzfNwy/0jtInC+Z3FhMJPuWkTDrCCcyGggB6I2AsaqEUEhZe6GZ8fj;4:mD/HWAIm5XHS8rX808kbvku9EBvdfTbTpE15qX8UpSRsRoSqCqFSW8kEMj0//rffVtcSO/dlN1Miovn83YlEYvJxaZ+AqHUMxRjR3ToONC1bWZc8+MwnZc/ivfTGUErTSJ5O6M0IDfFab5xG8DXvX7tDfgB1JQtrizeZu/gq+Wiz3j3r0pgFPBPGzu9rucXQday7IP7gL9T+5T7b4JGLSivTyQUoQBfEt31Qc0GQdeN8yPQvb7H4Jl/cD0aIyTmauPwhetqblatzL+JXsVJ/XoWCUduu+DwFvaAAIrl4aHlzW6QrjiWAJgcArYDtONDDwVDkSEcbIh/1pxuOgY7Ay+U+EIUB0BQKQ0anMMKKbYo81yQ0vZ102g7MwLRIYq/G X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(102115026);SRVR:SN1PR12MB0862;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0862; X-Forefront-PRVS: 073631BD3D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0862;23:b+HkRvd0z/wtcFfSrgFgMFcW5V0Lp/EPfs2zqRprZ?= =?us-ascii?Q?2uKirGAZ1quS7/VPFno/8zByeIGJLDzjgzx1a45bs4/Tgsve9MBMRVpfTlHt?= =?us-ascii?Q?QsCm6fyvAmy04iUytq+M+CArhh1Uq1rt/2XZdB+x1VfaRZXT2pmANYTJrm5Y?= =?us-ascii?Q?LxKx7LnWZj6Vd5Sp+GlJlrf7Nmhl7OEQ/GP+Kn88RCEpzWvV00bFoVIKgoyI?= =?us-ascii?Q?odcF+21mdV6ft6ifTXcRq+YC8Mu0akGEZSUgRE24ru6ztL5NC06WbuYN5JNF?= =?us-ascii?Q?P+nawB0xNxEMP2KMguGUpdq305tavkUTNcP30D9qMHf/2m1Hgb1JpNCXFZM+?= =?us-ascii?Q?6w34gfRExVFj3Zui86hiKNH0J5sxVv8Imp7mUtJP3ESpXcXuyP4cEr41h8u6?= =?us-ascii?Q?CXpsg8CfrOLeVeFUcvcFrPvEjJDPdgPObFjwdOUsYGOFnwg3D1ekWG15v6y9?= =?us-ascii?Q?uwxm+KOFrziLE7xuEVC3CJQOYZTk1R9VMurUpqCMWLQEyoyhRx3BhSvWaIKM?= =?us-ascii?Q?w1WVGdXSYZiZAqgo9FJYCIoqs9l7Tx7gipWgwSna+7Hn1vT70/Evz0SHg8xY?= =?us-ascii?Q?SbF4RSNFpDwXm2lYxmP5UCZEYe2r2afAAKuvjabrg3ICHHZqOgsjC0QOTVze?= =?us-ascii?Q?paCQ3OWOAcUF3BHZ1aBTlAcKQVIimzvrePTIRaAFtASBDUR5+xO6Vdjhk9JU?= =?us-ascii?Q?0X/WuMIq7F6eNQk6/k5XAH/kwF1GS91zaK/mAZY5fETNb83CidWIlJOe1bR7?= =?us-ascii?Q?dglaRmb5E4tRVJrH2hTESe1ttRI0Su7qtUxc0BEpSXNPZGHGhk3uVXouAVnM?= =?us-ascii?Q?wL4NUEA/WF42oWYCtazumTJXUPypyhRHJxeCGjFJKF/XDbbjYjkFIr9VJN+r?= =?us-ascii?Q?IvKJTzzTZkPx7dKyoUIx2QnZgbkK2UbxunZHOZm4kiPYtjQmL4flzDFINoLd?= =?us-ascii?Q?gWxsSq3S9YIg+8xbjt8UJXmRGCsKctROoa5cuwTJhCNHnhSP+Sb6g2V4x0s1?= =?us-ascii?Q?nAgHlBymL6eub+kvrLG+xbk5cTY6DbHZ9zQIMaS3hfYxA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0862;5:l0UZ7RavfVJrPQawZX8Dt6/tkbWhY4o0TSJZAP0SN8bl1z4KJsI2KzkpyiE+601/WzvfSz49n0Xjj8eDFpiraScI1XLrJsAHc8nmNeGsONta9zMNJus7+zfFpRuDRzONOU28TpwGXiynPZ1QRGFLmA==;24:c9m3EBgUh3JDWC/0lTAYhrmvTBJop972+CuTOp+2Y20bR4VLnOfIbf3ol7gilXQmiq/gneGxZ5n/NTbWv7dqwBekqKmBWb08NDCI7ys/IQ8=;20:qKaxrkKa1OtvQOPjN+p6Hxw2JsGD+JHWpT0wj2gNDODmvFADhtV3W+cfvf+hsH6qT+FghfnKoUYUnGtyN5G3HYCMkGbvEYIPUrQzoFTYIuIzteZKaAFtzjGgDF1L1WpWGE5Azxezm4CLJwAKN7MMOv5w+pncSup8e+Q3rLWzmjmk5jRX+TLEkKPqwmdU03JkFde9fqZwz4K1wZSdYD0TYQXiIQjnp/nkKys434YVJ91yNtR59ah+n80Ik2IS3yWG SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 15:53:06.3878 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0862 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch move of_pci_dma_configure() to a more generic pci_dma_configure(), which can be extended by non-OF code (e.g. ACPI). This has no functional change. Signed-off-by: Suravee Suthikulpanit Acked-by: Rob Herring CC: Bjorn Helgaas CC: Catalin Marinas CC: Will Deacon CC: Rafael J. Wysocki CC: Murali Karicheri --- drivers/of/of_pci.c | 20 -------------------- drivers/pci/probe.c | 27 +++++++++++++++++++++++++-- include/linux/of_pci.h | 3 --- 3 files changed, 25 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 eea8b42..09264f8 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" @@ -1635,6 +1637,27 @@ static void pci_set_msi_domain(struct pci_dev *dev) dev_get_msi_domain(&dev->bus->dev)); } +/** + * 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). + */ +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); + } + + pci_put_host_bridge_device(bridge); +} + void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) { int ret; @@ -1648,7 +1671,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); pci_set_dma_max_seg_size(dev, 65536); pci_set_dma_seg_boundary(dev, 0xffffffff); diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index 29fd3fe..ce0e5ab 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -16,7 +16,6 @@ int of_pci_get_devfn(struct device_node *np); int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin); int of_pci_parse_bus_range(struct device_node *node, struct resource *res); int of_get_pci_domain_nr(struct device_node *node); -void of_pci_dma_configure(struct pci_dev *pci_dev); #else static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) { @@ -51,8 +50,6 @@ of_get_pci_domain_nr(struct device_node *node) { return -1; } - -static inline void of_pci_dma_configure(struct pci_dev *pci_dev) { } #endif #if defined(CONFIG_OF_ADDRESS) -- 2.1.0