From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760716AbbJ3T7Y (ORCPT ); Fri, 30 Oct 2015 15:59:24 -0400 Received: from mail-bl2on0138.outbound.protection.outlook.com ([65.55.169.138]:12208 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1760665AbbJ3T7R (ORCPT ); Fri, 30 Oct 2015 15:59:17 -0400 Authentication-Results: spf=fail (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 v2 08/11] staging: fsl-mc: set MSI domain for DPRC objects Date: Fri, 30 Oct 2015 14:43:34 -0500 Message-ID: <1446234217-25512-9-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1446234217-25512-1-git-send-email-German.Rivera@freescale.com> References: <1446234217-25512-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD045;1:mX+9n0tpD7qw2SK/RqbeLHvVk+NkIfhlhI8KfdfL5q7JyTv73+PXWBP98vXDK+8R/6JtMJPlppcMrcHam0IiB4FwdF+Mdsd7QwF0D0TqplQpeZFFRIIUJJCrMdaq0TCep+tmv/4h31f7+4toCw3+4DuMibFEBFlJtdbfqnTFOZYV24to1tjUVfCpOzMHtQ+fj9FH4pbat9NiK+qLc+Kn8qE+YREqG8iuFwTNcuz7EobDZde+amiIP6aPP2Z9Tlc2xB7UkqVojmzKILax1nUyjY2fK0KblrJFhA+u+UZIPZrEyCMpyq07XeOSCNWKyb5LCCniezRzsV6hBaES3p9xRCTP0hUTazOFDb1IXPi10wVBGIAP8/7ULLCHsdN6oYVDHcblNp6h+iWpiM2hxA/25Q== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(5001770100001)(2201001)(86362001)(81156007)(5007970100001)(48376002)(85426001)(87936001)(36756003)(50466002)(104016004)(6806005)(47776003)(97736004)(4001430100002)(11100500001)(76176999)(50986999)(50226001)(92566002)(19580405001)(19580395003)(229853001)(107886002)(77096005)(5001960100002)(189998001)(106466001)(2950100001)(105606002)(5008740100001)(5003940100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB505;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB505;2:cfOfgSwsQGMJv28pc5zpHTTc9MwLQkrcivWmz1a+LEOKV25gN2aQWMJACe5LGC340EWD9BxFQRdqTZTHGvoe0TS6Mag9cs2o0cJ6aZ2jQsns3/lefq9or6z/M1OLYUX/RrjTAmfUzxzhv1dz6o2MRoFOSkEZ/YxRD+/ESvVS+Bw=;3:KdK4TTaDTdibin54j7wixjrO0BlsV185OHP31NnkiDPJlgbpqDTKMrEfSnUzGZWRnTyUUEwAZp9s9xD9pSmdeSpCuAmZ0ZE1cBynEtxXlV0IowUosfDNwEMbbt7goG8OD6pGQCBbdJcDXwlB6K8PHRauWE0ag5qKwY+dNM1zpBRR3UOLj4QAEFfuHwXPuTzHlvtNMODNRD6mEgTZTwV+dY8ymsq4YhtfcyNhriwjgf8=;25:QNtURKOLfY2vPzTQ6eLupQ7Coit22kgHUnHFXJz0coTMCJ/xhh6DqkpYNPE1vX//BFYbvXz4ZL9qVWnoamchlKVsyrZEB8fghamgjMPfe+doo5qj1zGegXbYjs2P2bNKh4EMGNGd63xs/2kBREZE+AWUfk7HbnDRxI9GDIMbcemb5F6egnQq2KGJFl6ZvovIQPp21gc6PyjjLNaZkbdh49FWxuf6y8tEzj90Cpln9QGCvL350AQV+JIMOk5SQuIOCgVRbQtpbYmgkBWrMEy5dw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB505; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB505;20:ETEWRheRujwkYsHnbyJ7po8T9KuhkLKag//auz9fUvxvYZdd/WoCgIqzf7K00yuKjpSFNttnhe0ZwcXBEQ+8kamJ9zzT9UK9jVwGMPmevoEQRvZ5neQNcAdLuGf/7mMAVBHPVCaUPI6vbZG8JLOAYFOzW+TYBCbOCpE/m+x9S5OCQTq2yx8KMcTA51X9OfKCS1wJYDdo0i+GPfFUTVvE60ethgNgvfgam0eyxQejmpbfHwT7IUWaCCfoHYYiGD9jUV6ky1LYHLx+x9GE9lKqImhxp2oKdPrWocIxl+GGf7ZarslhumAbrTw6KI1jdSPT5jOAZJZ7FSVs92tepoBLlBYKsQmogGvjoSosaAJ4hIs=;4:cXhOsbZrSmHsasBRbEUVrVEhWhLEhg7CazjixqBIQEaAQnS3k1Pzx51HU74MRs0ExMSxt2uWMYysHIJM/QAowGAWwmjmqPGsSZfwMDRZtJLafth38/jdWVfX1nnKPC4lEAOP96R+dyStMrgX8do0gAllu7Oge4/CMB0303iAZQjtwZXHISa88TwLGc7L4RuC9PdpsFsJ+ffELfmkw8v3t2FxWhq5ykyWjjpHjEMywEFJZ+fVk1c00QrWQ5KOAwAn0t4yW0HL7pU7PFpQr7zSA4mjBlsAoNkYDS7OH+hT9pmikJybD/0In2f+qZEZV4c/L/HWLDpXBDuL+LnoK3V1B5TUz9ozxvp0iwijY8o557U5qx1mLZftlIE1mUYMpyXzyMiIJcMLeij4DsLWZvJXRQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(3002001)(10201501046)(102215026);SRVR:BY2PR03MB505;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB505; X-Forefront-PRVS: 07459438AA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB505;23:PNfPUBmGvqQginDObTsV/KCerGlKJdKwL6auMKl0Ru?= =?us-ascii?Q?r1cehdjyxD83t3UNgVwOS6+5PsM+tOqz3/8GADl4Fow/MmFgm7Y3Kk3iSZqY?= =?us-ascii?Q?adTjB6TCvVFZppU9miFFPSfAUC4QHEwe2PPlBUpfdi8noC3NxN6jN5OgUx68?= =?us-ascii?Q?p1d4WpmUggKZht/GPmU4IKqT3fCHzhgxebb3YjbL/NU+FBRPrtzSAumn9o75?= =?us-ascii?Q?Ss0bjEpuF480/8FLYPSgORHPe3Xn7N6Mu6kecAfy4RKVmU1IQs7QjfGNoYUM?= =?us-ascii?Q?FayPsVzVHx4VAnlg29/LvnGvWtB5kbtdqXxdgD7CP5t/nMtyL7aRVhV0IJUX?= =?us-ascii?Q?SuVWp1JLWay+osrdEuqZVnX7bbciR8w3usjy7QD2RCE5Fybw2gO/qiqgpEAj?= =?us-ascii?Q?+TPT4sZKnoyyhBlNYZhlpwcnsi5EVQkaR8FVmbGVgbRxkuzpNE7aIi27C7KP?= =?us-ascii?Q?1OM7Pi+rlZDnyRcIMo5rFnFgQ2lTml8+gynYUJjdjc0kentfgcP1m1FdT4lF?= =?us-ascii?Q?Z82qqutjt7oTsKZO8MY/Y0SDfih0TY7iNuLkZKsS40f8G5R2MkW6g1GR+Bri?= =?us-ascii?Q?ICgdaKS2iMsukef/SVQgri2sqehuwHoEtZpIGw1W/5DZT8pKvjbLvKEG/aqO?= =?us-ascii?Q?Fj8LxYVFM5JPRsgLQbAvZ3bbHAhFfhCyeh1bUSTdLZS3km2DpAUbsfApq6Fp?= =?us-ascii?Q?T8aTkC2DH9zZXPuumJak2PevzEKh8cSbBjz7hNDKTMD5/km+D/w72zwUbW77?= =?us-ascii?Q?6hst/jFhuQRGhvvG1St6gvKBtHXaZ8dpdyX+aIUq1vaDmDnuGmGHlld3i99W?= =?us-ascii?Q?ObysxLF8kV0Ozf+P9Wb3cVz9BQ9vkJgOMQXmZUrriKrL0Zqrsw6mEMZYI7NW?= =?us-ascii?Q?sCd5XcGH1UaaKbDn/bYMtd645ZqXIU2xZ9n6X3ltkxusrc2WIYjj1E5oXbrt?= =?us-ascii?Q?B3XJSOGilrqOTXwwIjA/Q9D7N/sJSuyp2ASidjoIrw2m0OqGZfekkEpRjKZX?= =?us-ascii?Q?Z9N1ezR/8uC3QbVB3EmolxwrwnA7/Jexg1DOStAqeZ4vZj4R4VWjkr9zunaV?= =?us-ascii?Q?tdfuwGM2IO2CQ9jjMUm1rEEn9U?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB505;5:IY68ZGAFe97+hVyMjp6Tduyo0jjEV7m3zWh54MZMGsT1dCCJJclWSbfAfKW0pXn4oWCJEVsRD9L0V5iQ7mOmeTaJL8p61oKNMhB9eSPoSRJ7qN4F5SNhBwoSn70jAjpFwZPqBvcP0Wd8TeElwBBPDQ==;24:6SWLGubY5q1PX7JXcdzrw9g7WxqTsvj6C4wtG+Sex4ITkzaPwO34VVLQew7kB+YmRfVZfpBB9ytkY7gmsuGTeirsgwAeoA2ywgkonmb4WLA=;20:S87xPTz1wRzF4zigPv7Cx4R1aSLfmYccsQlcveGPDVwp0gvkE4XwszzVrXCrHu+vaij54adclTWhIYmh5WcHEQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2015 19:59:12.5858 (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: BY2PR03MB505 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 --- 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 3bcd161..455379d 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->of_node, + &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