From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754315AbcHWWRS (ORCPT ); Tue, 23 Aug 2016 18:17:18 -0400 Received: from mail-bl2nam02on0086.outbound.protection.outlook.com ([104.47.38.86]:40864 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753295AbcHWWRQ (ORCPT ); Tue, 23 Aug 2016 18:17:16 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Stuart Yoder To: CC: , , , , , , Stuart Yoder Subject: [PATCH 05/14] staging: fsl-mc: create private include for fsl-mc bus components Date: Tue, 23 Aug 2016 17:13:30 -0500 Message-ID: <1471990410-28525-1-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.9.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131164642334174960;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(36756003)(305945005)(77096005)(50466002)(7846002)(104016004)(85426001)(68736007)(48376002)(106466001)(626004)(2351001)(92566002)(356003)(229853001)(19580395003)(5003940100001)(2906002)(50226002)(8676002)(8666005)(19580405001)(110136002)(105606002)(189998001)(50986999)(8936002)(87936001)(81166006)(86362001)(5660300001)(586003)(81156014)(97736004)(4326007)(47776003)(33646002)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR03MB2228;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD011;1:Hf+DOHl3+um9h1fXFLEPDhhat5gnYAIVRC4OVWxjdbcwO8h0RLvAiTAOujSbUgrmdUAmsNFYjfpdoUgRbxQp3i9qXc/oySuQr+P+QEC4AQOXxRk3b9W/n/Kykl3JHWo0eFPSr2PnT0SdRjKRhPQ7drgM7nO687s3LJ6t4m1wDJm8ElmI6c+fX53HPYolSaBCD4Sp7V4zkJJ9VIQKsx/aAuo12vav/F5mfbBG8WTZf4pe9DQt6gWgdvr6q+IOJbbyM0hbFW7R0EHgEyCECtbgLz1VBIrKnTqMqWZj1aaNOOQrjB2VmfqOu52MHVHEXywMEoyj6QiDsgsFEJspquVqpq9LvPMMqWTYO3oSCzOo0JosnmLZ8G+tQpv0fx3xVJj1WRLmPyjGntHnW1tsCkBx3nlRWj4DseKrbQtNMp7Ox9Fl7VUizjzGYbuhqRg04ZiNORucUFk6DGPu1+73ilE/2b32cpSg4Y/UWs4CPtatacMTurkjJKOOYN1BvF0XjVFzl8yDz9mc01mMeIKRqQteNxnAfQcxSgEhhmQX2xeP1RgMw/Z3Otae4aHREXQOtStD0q8sSV1eLkQAF5wYRSN8X2x9Tbt2Wac80uuqQQkPLTRGaauGpatsHaFsZEz0HxQqe+3nchfsKjnpsxFKBBVSn1kSHq8XbjGFx5nWfeFWL+XpKbdpG7GO7wfa6eaENf8Pen9gUeiqmTPhSm9p8WCk6z5Dtg14w63EtBVOfSWlmUw= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 691cd71f-eb61-419c-0d8f-08d3cba33be0 X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2228;2:Q3ANXdVnu4xUjIGofKWGPdED5z8LVvBDtt09evhV3+jvzj1+MXg3XwsiJLKucZqhTgSpsrzLOnkDJyCYw9HCFC/B9qyZ0c7qr3zFG1QIqx7/r1r7k5cBS7bevCY6ffM4tVHKrf+0nQgsntj7Xx+lPBZ58yQH3AUJgcKPjQrspWAK+Y8hGDWIgtqZJbGtkKRj;3:9n0/6jbVcd7t3tWNHW5i1aOGErIb7/X2QXmJIxW/ZUHLo45rsY7ZML7baQ0kbqRztSJ1aGpyjv1n7UsqITLztJWb2p4Ic9IDgpIL5xRawjQ+c0KuZQzyiw+l+ly009kRD3JDb7aNcSMAuT18Oq1S9ztUjmLdNqapPpoMhw2Mk8xpjs+rg1dMdfLsvn4NMOBD0Fi7cPyBcBt94AM+Ri6WjAur2UeJ9BZ8IxNtRofGRv8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB2228; X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2228;25:9ZDj+4n+lJ4UtmVF8v/qCSEJE9Y6b4Mcw5e+S9OY+UGG6c7N+Gwp6wnLLnqDLHm6RbKPaQj+2BserJC7c6Vx93lI/rpSMoY8r273dtLzdPA3oGft+KWe2rpSy09aFU7OGTzg4BYipwWXNnQONqs3O6G+0fRZuroh9Ba9ox6NfURzp/8M9LuiSL7Rxj166NCZ2yZM8lORFkN8k7a5ZPCldurKMrzbgmB0oUBiFiQilOHEEvfFspfohW3uk+MEPvI9znshe+G75JNVz9qOZNXJY4odiVUR3utsR/5otIittoHQPdNCEH1HHJjW16unTB6BfVsyYFQ2mp75j2EonAoXSw5pMiYJRMooFKmybxmEkzOQpFpKfJ28JaNkuMzAiGk3pU8eS6vnefEAwnc94A62lJdWKY0bJ4ldNg8xtcipb0QC0VLKAPBB5QdLSwnuO1rwTv6fyugVFjOnawePArG0wzT3hilKNxna1t3bHUgrqDEJcx5w8qXhbo5ng//E4sF/o8isHVpE5yN00JHj5CcWFelpr6YMzB82jf4g5JRsAEbFVdnZ0z6SshSa89RPA6irJGAFlzNA9nNzZ2x9WvKQ+//THSsANI1ZRkwYzu+nxJs59qy36W13qVpwxThkFicJlIDc4iAnHLZJuC3HhbLzcc8njfN+a7uBqrvoHzwhlXThx0irVpJ4jqBfuWnEoCyeQolzOXdLDT2fD91DKY7Qj0NLQUgb4VX3Tdm2RfiuNjU= X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2228;31:zhBP8P10uice8B6lwT0rqvOQ//VK9lU9+cR6xZHiHQCLNdtKcOfw2+l5uaVvEZAW3czuVTt/G3kzbCJXiJJYaYMB0bMF8xGILjUpfopbZDvwqkVKTMfYfpthvAk3E7qy/kyEZsE0Q8aidMiD1LWVssPugGF85TwSt6ugQfowCqkSmacBUpeWksJAaZgVXvxbDFwkRJxydB7gvw5cIMwkrbt9klrVrdkDWHTA9a1jS2g=;4:4opjWt1Gpnjb/SCcQrJEy/WPbYdFJ5xvdKL89QscaDXgMLeONZbdjm+Sk2Qq9SAEXlikuhpBYRItlok1TL8mU1WTJTOoFyuKzAQWEe0NtOOeIaBbZLbFzHIgjhoDne693NE3LDmsnrcEjHFsZpqQ7a0V0gRZJmThPaM2+ZyGrReuUh6jtiZijUmj7HxNh+Wzyp9444rtZ9kznYfXQyL/H85R1BE38ELUXLIdQuw24YklEFHpPEMDDXmKEco3+5lt3YcrJxLNSLAAlN8RaLazgkO1NYlBQ8aDggAdbDIf4Lh0+IkHH61DF4et1rW8jxJf1nV9ByQ1eCiHUUNHEoq4uEix+TeT+KTDG1o8tRzZUe1UJHUKASNjNF1flOKwv7yaHh4Zz6/SRv4j4ABiwJ7RKWOH8SUWTzYQUiKr7iFRaNwhxm4gUBR214FCtW5z5nxJc+In4QrQR3Zs+P11bCtaRiWvoyXApo4YY2TJ3Jk8VkQSMz0DyC6dFFtfrBm2kJ73MMsKITzUIKMNE0N58FHIErn4LDtwA3NwoNE3V7LHQSo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:BN3PR03MB2228;BCL:0;PCL:0;RULEID:(400006);SRVR:BN3PR03MB2228; X-Forefront-PRVS: 004395A01C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN3PR03MB2228;23:JDKNVrSvEXLvRUeGA1Sbwx9Yg16hXzZcRXMkUeoyW?= =?us-ascii?Q?Gc1I/8ATNbRxutRu+ZZx/XqbE035ekOUGqMASVkccoglPIdqsEcITmA8Reyn?= =?us-ascii?Q?c8Sqi4ZXS9uoelZCEXtldY3NgV7g0+C+XPuPFTKTTav/zEaGi9io11melXAw?= =?us-ascii?Q?vNmQOD1vSaUOiwp/xANBr9jKrlCy3alf3XBwinWa3ZNNG1C4LZhCtTar9qDc?= =?us-ascii?Q?O8pN5AZvA2iPxFpmv0DQxITb8sHdftfqTL+5ULb0EtYK7ud5f91uvaKanCe2?= =?us-ascii?Q?BC443EdwHEnbG7V83XWqC6JYQ5DOk92sy5iBdYTR93YzwAU4NhYMdLQrrNu5?= =?us-ascii?Q?D+Z9QTIV3Sq2Fyo+Xg856uC/uIioz0YjF0jniKQjYwupTJEn8YFvQwuQexxS?= =?us-ascii?Q?OofofDQZplZ+8tyhi+VCg05rVPGNRxvj8jCCu/S76rG6a2LOu2DqBeUaK177?= =?us-ascii?Q?Fk8wV0udRySDoJ2T5PyBmquRLhyUv3lhApSCfEXujIs5dzLv5VCr10scmY3C?= =?us-ascii?Q?YGXYS8hf2hbbhj0s02m9qoFQ9DU05VeZLpV1N2vYhV/uDnXOIpkM8VGFE6VI?= =?us-ascii?Q?tknRDFAIh25vm8reF/X2mjIh359RRde27BjcQDjPkaFUtu4wQUn2K5gww79S?= =?us-ascii?Q?RWKcMZcWSYa8mPXJpIOr3SORYDp6DZABz7aprY23Rh/oP7nRoWYKxhFO7hJn?= =?us-ascii?Q?2K2sTUbU+K9EBE92qqScZX7tjiv1fPRu/pf+AvrGmxVhgFSAs4wuqiXatx2A?= =?us-ascii?Q?LnF5b7UUg5wx6d8XiQnmaVgnI2OJUhrcTdQBtsAKt1Y5im/XBA3xkXYj96se?= =?us-ascii?Q?yrYJunPSG1Hkq4SqIymyeGGNWH/B/frFnrxHclX4fPo8IxkdDD/KLrs715c3?= =?us-ascii?Q?RmLxP1HUi2OBfEUCmO72HFcqQXXKYazVKNEf6eabRlTwP6/3w7CbuqpPsHHy?= =?us-ascii?Q?d0rG/+f07oj8/GFPLlql+1fcBtxgZDqX7LBco7iDG0cejUD8rIhv144gczkZ?= =?us-ascii?Q?PnBYTmw1Cblni2GVntYi+gqFbkLin5HLI/ZZstlqRYPmYERZ2epgkPHUjkc8?= =?us-ascii?Q?kQfaMAWMaHe/O1COt6P5LuFMjth8sM70jAV9FFBnVk04zJLzA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB2228;6:8xMxvR/6kqOlYqBFe0TAznPUfTUtjRxsgn8cVs9EvBn40/XCMym2C8plyYTNm2U25Y7fPXnZpxtXlL1vRFXIjsPvbTeneemOt+zvbqpTHgMXVturkQNM1AanBhy/5634VjtuE8hfZfGQdyl/YqUPUdH0HhlbwgQ/FoW5v8vPmxL7JkOullVVOmlPmKL6eoOGiqWfgWduODqU7mGY6t1BP0TQlEEpl+Dk7wZ127hDzwB/vgHs0wJaKdejxD0mJdJqbWMtwh5bgA2PxHjtmF8JiSsB/0ePiZVFAoiAD7Kp6Q0=;5:sGA9cwxUg9nHZq2S1viHg6QmvXVSijckK1kHdPE/DJtztGwjnEzb33+aGGebmNDJZG43AxhT/8aCHElfQdyGRcudJ4bBzALEL97+5O6UzJLwhCu9jKjKtJWqW0J8vBFt8kIELaII9Z0PsmQrt4r2W0gBPeoqf2sbWreg8JjtdeM=;24:qktGMCNWwvLzFN8k1RQ0yGZwNUKPvYwHiI2eOn0Y/31FzQunYTLvISh/uWyg0QJHX/b4K4tuDqJoz46mkxQkCHQof4kex2RAg5uYXB4BQGI=;7:WhCPEofNTcF7wmVbypfY3Ro01FLPkMK0He33wkk8PnV1/T+Mie4+r0LF8r5Acuegx1TR7Ewdk37PAmxYegBVJNc47vydTBmvpgomyuxexi4Uqfn1al45oLB1wm28sT/lxoKmkY3XZcXkzf0Ml7q5UYYDgnC2OfyrVdWwyaptuhyeB39n/2KWBMFM02DkwJrX8aTalx4FFdmSdvCuGTHUnBxhBlnPZIg8JSW7Ctmyj0NwVuQiuDW/LrQj+oxp84JK SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 22:17:13.2146 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2228 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mc-bus.h header file is intended to be public for system related drivers that may need to make fsl-mc bus specific calls-- gic its, smmu, vfio. But, currently it contains definitions private/internal to the fsl-mc bus itself. Split those definitions out into a new fsl-mc bus private header. Signed-off-by: Stuart Yoder --- drivers/staging/fsl-mc/bus/dprc-driver.c | 1 + drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 1 + drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 1 + drivers/staging/fsl-mc/bus/fsl-mc-private.h | 44 +++++++++++++++++++++++++++ drivers/staging/fsl-mc/include/mc-bus.h | 23 -------------- 5 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 drivers/staging/fsl-mc/bus/fsl-mc-private.h diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 89d53da..576244b 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -16,6 +16,7 @@ #include #include #include "dprc-cmd.h" +#include "fsl-mc-private.h" struct dprc_child_objs { int child_count; diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c index 9695f44..e865375 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c @@ -15,6 +15,7 @@ #include "../include/dpcon-cmd.h" #include "dpmcp-cmd.h" #include "dpmcp.h" +#include "fsl-mc-private.h" #include #define FSL_MC_IS_ALLOCATABLE(_obj_type) \ diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 975d30b..180ff07 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -20,6 +20,7 @@ #include #include "../include/dpmng.h" #include "../include/mc-sys.h" +#include "fsl-mc-private.h" #include "dprc-cmd.h" static struct kmem_cache *mc_dev_cache; diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h new file mode 100644 index 0000000..1479934 --- /dev/null +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -0,0 +1,44 @@ +/* + * Freescale Management Complex (MC) bus private declarations + * + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ +#ifndef _FSL_MC_PRIVATE_H_ +#define _FSL_MC_PRIVATE_H_ + +int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, + struct fsl_mc_io *mc_io, + struct device *parent_dev, + struct fsl_mc_device **new_mc_dev); + +void fsl_mc_device_remove(struct fsl_mc_device *mc_dev); + +int __init dprc_driver_init(void); + +void dprc_driver_exit(void); + +int __init fsl_mc_allocator_driver_init(void); + +void fsl_mc_allocator_driver_exit(void); + +int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus, + enum fsl_mc_pool_type pool_type, + struct fsl_mc_resource + **new_resource); + +void fsl_mc_resource_free(struct fsl_mc_resource *resource); + +int fsl_mc_msi_domain_alloc_irqs(struct device *dev, + unsigned int irq_count); + +void fsl_mc_msi_domain_free_irqs(struct device *dev); + +int __init its_fsl_mc_msi_init(void); + +void its_fsl_mc_msi_cleanup(void); + +#endif /* _FSL_MC_PRIVATE_H_ */ diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h index 2098b3c..8a32e55 100644 --- a/drivers/staging/fsl-mc/include/mc-bus.h +++ b/drivers/staging/fsl-mc/include/mc-bus.h @@ -102,13 +102,6 @@ struct fsl_mc_bus { #define to_fsl_mc_bus(_mc_dev) \ container_of(_mc_dev, struct fsl_mc_bus, mc_dev) -int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, - struct fsl_mc_io *mc_io, - struct device *parent_dev, - struct fsl_mc_device **new_mc_dev); - -void fsl_mc_device_remove(struct fsl_mc_device *mc_dev); - int dprc_scan_container(struct fsl_mc_device *mc_bus_dev); int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, @@ -122,13 +115,6 @@ int __init fsl_mc_allocator_driver_init(void); void fsl_mc_allocator_driver_exit(void); -int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus, - enum fsl_mc_pool_type pool_type, - struct fsl_mc_resource - **new_resource); - -void fsl_mc_resource_free(struct fsl_mc_resource *resource); - struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode, struct msi_domain_info *info, struct irq_domain *parent); @@ -136,15 +122,6 @@ struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode, int fsl_mc_find_msi_domain(struct device *mc_platform_dev, struct irq_domain **mc_msi_domain); -int fsl_mc_msi_domain_alloc_irqs(struct device *dev, - unsigned int irq_count); - -void fsl_mc_msi_domain_free_irqs(struct device *dev); - -int __init its_fsl_mc_msi_init(void); - -void its_fsl_mc_msi_cleanup(void); - int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus, unsigned int irq_count); -- 1.9.0