From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753430AbbLKS3e (ORCPT ); Fri, 11 Dec 2015 13:29:34 -0500 Received: from mail-bn1on0147.outbound.protection.outlook.com ([157.56.110.147]:17764 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751079AbbLKS1M (ORCPT ); Fri, 11 Dec 2015 13:27:12 -0500 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none;freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; From: "J. German Rivera" To: , , , CC: , , , , , , , , , , , , , , "J. German Rivera" Subject: [PATCH v4 08/11] staging: fsl-mc: set MSI domain for DPRC objects Date: Fri, 11 Dec 2015 12:09:46 -0600 Message-ID: <1449857389-2506-9-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1449857389-2506-1-git-send-email-German.Rivera@freescale.com> References: <1449857389-2506-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD054;1:vMiFkMD5dyIIbJi/qcVjq02axm0z8LF4nyHP3DGlhQccRQ7iZWDFOgk5yz7wO8/Lrm/mO/vCUdzbhizNVxoUwuLw0EmUqNwtfoySG3+n+5tcwFQiFr0WwA8xmqOpLYHHOr9Nm2kqn2L1UxNYJYblUUcXB7DiR/ffju+SjQ0cu8Vgcz4SVdqE1rDN7awjMuOXtPd/DHvLYlOJR90jXmVrNPVoXJibt3/E0ZJ8bsQvh+PUSlm+5b5uAJYw6cL3QV6W9dmh3s9k/UEW07QRAoXuFLlkLeoxuxuHsIHkEWaIxTkqUdeupbDi9atxEVfjuQeockcZOhUsilRSESiK8K6f3K9lEfp0JpqIgCAN4f/XLNUyECNVvxiFbKOqlNBHnLxLYSo9l4cW56WikFuJzzbeSTngLurRdjsSdtq0UKI6FqAaGZOiiC5FneS3JumWRume X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(76176999)(81156007)(92566002)(50986999)(77096005)(85326001)(2950100001)(97736004)(86362001)(229853001)(47776003)(48376002)(11100500001)(50466002)(106466001)(189998001)(5001770100001)(6806005)(5003940100001)(586003)(5001960100002)(50226001)(2201001)(5008740100001)(19580395003)(4001430100002)(107886002)(1096002)(1220700001)(87936001)(19580405001)(36756003)(104016004);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR0301MB2065;H:tx30smr01.am.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB2065;2:AhnVbaeAx8PTi9PJMFB2q0yX0z7oz8Jwe6DhnmvYsfcRJ15J7R3ni/0XhkbN+Ek2qxDKhC3lDl2lFIFdzXH5MUtq7MK/IFdRI2bu6SpnpVGOXSYy4jRaMZ0guK3Vi+xEGbXb9rRAQLHMcJZpn0Q8IQ==;3:AfCQYGuAg4047l1zPEqmaCerNwNgnjYNNpf0L3JEHxmd5uu61wvZGFQVjwamq0+KC8FQpalQJDDev8sm7pm/5wSys9rUi62UafHN2zcfPbaRdL6sKiRvcDT8J+6wb0WchDkJ19n0Wco0VCo+LR70Tedsg4q3CNGBVbf47N0m3aRS91iQ/KPUb+vd7yxDDO+bjP2FYDhh54TkK4OWOXBUJfHVuK0bGEjwnVUSOclAoAo=;25:fGPBqYYWRlI618qw3mQxyJrsn/+Bmspf+3xhPqF5ifBRNNoS8//eJolsHsD2IOq+wnlvvd8pxmL0x+/0Ijr/P9F7XCsoMzBjwHRasRdCPhiutlNFQrCjxHQTE43KAl5VFpDWgQys3ujyIczsa9+zGyKPaLJxGF881MUhd0xtd5QZ067pfnrNSB7LoAZXB6giy8jkD5hmzLx4ZMCwAWKEorY76pEwDN1px0N0Mxu4YnRcuNr/jHnU3COxW7ifj3gyxIoddKI/r/N8MU35Vr5Atg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB2065; X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB2065;20:GfxFywU0LNocunLh9WOrn4OqfI8bzoLQbmpLNiaXrO+X2Tx1yzaH5ApGd6Iu++CwA5DG7m6P/U78G7Qs0Mzl4VmmL4Ph/uJucb0jCrfdmW+SDsipa4eKDGE5id7SI9gEcgJp6mCAiCB+6Rzw8YBuHN0hxeo+3AS9FJJOb2W0X7mH7PxEsfyta/NNZq3yRN2SVnLwvht34BKVqqCMJDuBXhGq3fAjuYgBgm84iqWrxY+31TeY0D0E7tKZRWGsOrYH/oKycae/M9IxrrtYiezDf0uz3AKv1crmvACSYhj/DOW1Lgqa1vLZtI+qsqL1WLbYh7/T+1o/Lq2UJLCFtlmMpTqW+ZWtBOzXOKXAT+pzliA=;4:XQ89Y05FZRh9qBPNPWjk2B1zwHupCbEApeyjU5POaHd33KJ0B4hXiEbWP3amYPIUT5tEIS01EOqqmEh6wDv3nKYVO9hrMll8Ibk82eHJzZgPzCkFWEQSk0sii+56ZWVyeWa+XKsY5cMPBihUk6JdqXZ7GJ9isQEbKw8bBNYc46WJtwionn17XDXIPid4imd4fY7Y0gmnUBOgSmHCLih+6fJB7drkTrpR9r+/BPZ+O4Z23fBBbml9LxLsB2FtWOLFuhTRrq5viEYaefEi+Ky7GK3jFezycXSUPp62+1LbUGKPepbrVb3bPzb7IBtvjJjPrW5cJ3AHoQPQ0eXCNJaXnVjtPN6j4Em1d4AmubuLRxsiBaSTTjNE6Q/CbhQ4IQMhwAcVwdM3BSPRdTE+/IjdjbiVefyKASQfUGCMsGgK5XBEHjPk0inglI2rHpF0y31M X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046);SRVR:BLUPR0301MB2065;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB2065; X-Forefront-PRVS: 0787459938 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR0301MB2065;23:trVWj3PyFbgPBD3BxChkxGJ0TpaaADLyiqvZ45k?= =?us-ascii?Q?nhrG/fmXEhdOtyCIFhfUUp4YIIUqMvBKHA+F8ujlvGsSuXYcdiaZerpYXXqE?= =?us-ascii?Q?osppbMKYkNjtA+b4v93+N5xrR8sOejcPbVLTaHA++tvJLoIP4n4dbbDE5RI+?= =?us-ascii?Q?rxRe6PxZdqUNmMflEuehqEcTuT5EjCxRWeuly7rhpag/id6e0S8f/jG9JMiC?= =?us-ascii?Q?P2PWFwIijXy8oCLIX4WBD30oTLNvDiK8QiwySNPo49he72WP4NOQoRXo6jnP?= =?us-ascii?Q?EcjLKMbh4NEA+0AFLfVeGGVlqHfXnq6IMl5JY7wOGJD8BlhaN7XZpnBcKeFO?= =?us-ascii?Q?sDQ0VOOPDTRhPNNCDeLd9yCmJLRqhR9AUeuGTh0D86RZsjbUICHFaWeyNCYK?= =?us-ascii?Q?scJfmzELAynesNyrAApkriSwL6GRLwDkX/qNT2aGihs3uG6uSFcVgj9KuB7e?= =?us-ascii?Q?lWJaIoRr7BtuHqqblcTDME3Y/3R5k5FD6RgbsrMCgFY2XEOTjv4OIoUgou4w?= =?us-ascii?Q?q2grsUjUvcHuXQXyUfbd7b+E7Gqj4hsqVD/uOLGQ0ESKeqnGlav1l0ZKrmqm?= =?us-ascii?Q?Y0mJ+eLIIxf6t2QdbhGypSoZHX6E3YoO79HDGTtfMZcWetM2cJz2YSNMiYwr?= =?us-ascii?Q?YlbmJeRyt0lgmxKka8VoOIf2vSoSVDVKWClsHh+cMsVJ+z5aLemARAVmrCF1?= =?us-ascii?Q?W6khMumhlqC3LdcHH7KK/eA5/zQcokNgtdj1zEZ/V1nQIl3pgZcpEH3LK3dv?= =?us-ascii?Q?b9yIdxyFNST48619pYeqJCthdyUdwDRBgJJePuHMTyOT/E9pPc8nakno8F08?= =?us-ascii?Q?d2Cui7evYjryvWJcs/7wEVzrfWhPHFxxNSOHL/qi7xFLxDdD7UuLP74SJkcS?= =?us-ascii?Q?JXUfI6Py91G9Jd6EQwTf4bN19G6l5J4pyYFmiDl5aOxOTEhq0qOU3XQpQnsP?= =?us-ascii?Q?SFf+lgYq81961Vna4nWkARGOwXBOisrKaXfynDif2tVcVWH7RIr+ynIPtP7X?= =?us-ascii?Q?5hTBgsv+7D5w0kqEL9yIQgnhHde7lNhSMUKwTbdAY3ZL/xg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB2065;5:uvAsjtC+rfXgpsWUuQRf6wvDu2jIXG4fs2LyqlQfHDceTUvaX5gy9wHFiKJFfXeJ1qX6Sjx84RAfojC/3mY/AsrUnYnlIlAMJBaVobTGwT/s6Rt+CCjikFApPZ8LNJUHoynJDVtOAkyZ7hPGCYNjBA==;24:RjNGsZzNgXRJAuiDvNHDN4kQrknizSM/Bj3io1EpTxXgg/eStg3B020nOy0WFSHlLPuDLY1RLQtlgPTa6b0UPFCG9q0bDawaxxhXWYsaB10= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2015 18:27:09.0978 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0301MB2065 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org THE MSI domain associated with a root DPRC object is obtained form the device tree. Child DPRCs inherit the parent DPRC MSI domain. Signed-off-by: J. German Rivera --- CHANGE HISTORY Changes in v4: - Addressed comments from Marc Zyngier: * Changed call to fsl_mc_find_msi_domain() to match new signature changed in patch 3. Changes in v3: none Changes in v2: none drivers/staging/fsl-mc/bus/dprc-driver.c | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index ef1bb93..38fc404 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -13,6 +13,7 @@ #include "../include/mc-sys.h" #include #include +#include #include "dprc-cmd.h" struct dprc_child_objs { @@ -398,11 +399,16 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) { int error; size_t region_size; + struct device *parent_dev = mc_dev->dev.parent; struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev); + bool msi_domain_set = false; if (WARN_ON(strcmp(mc_dev->obj_desc.type, "dprc") != 0)) return -EINVAL; + if (WARN_ON(dev_get_msi_domain(&mc_dev->dev))) + return -EINVAL; + if (!mc_dev->mc_io) { /* * This is a child DPRC: @@ -421,6 +427,30 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) &mc_dev->mc_io); if (error < 0) return error; + /* + * Inherit parent MSI domain: + */ + dev_set_msi_domain(&mc_dev->dev, + dev_get_msi_domain(parent_dev)); + msi_domain_set = true; + } else { + /* + * This is a root DPRC + */ + struct irq_domain *mc_msi_domain; + + if (WARN_ON(parent_dev->bus == &fsl_mc_bus_type)) + return -EINVAL; + + error = fsl_mc_find_msi_domain(parent_dev, + &mc_msi_domain); + if (error < 0) { + dev_warn(&mc_dev->dev, + "WARNING: MC bus without interrupt support\n"); + } else { + dev_set_msi_domain(&mc_dev->dev, mc_msi_domain); + msi_domain_set = true; + } } error = dprc_open(mc_dev->mc_io, 0, mc_dev->obj_desc.id, @@ -446,6 +476,9 @@ error_cleanup_open: (void)dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle); error_cleanup_mc_io: + if (msi_domain_set) + dev_set_msi_domain(&mc_dev->dev, NULL); + fsl_destroy_mc_io(mc_dev->mc_io); return error; } @@ -463,6 +496,7 @@ error_cleanup_mc_io: static int dprc_remove(struct fsl_mc_device *mc_dev) { int error; + struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev); if (WARN_ON(strcmp(mc_dev->obj_desc.type, "dprc") != 0)) return -EINVAL; @@ -475,6 +509,11 @@ static int dprc_remove(struct fsl_mc_device *mc_dev) if (error < 0) dev_err(&mc_dev->dev, "dprc_close() failed: %d\n", error); + if (dev_get_msi_domain(&mc_dev->dev)) { + fsl_mc_cleanup_irq_pool(mc_bus); + dev_set_msi_domain(&mc_dev->dev, NULL); + } + dev_info(&mc_dev->dev, "DPRC device unbound from driver"); return 0; } -- 2.3.3