From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752640AbdF0Onb (ORCPT ); Tue, 27 Jun 2017 10:43:31 -0400 Received: from mail-by2nam01on0084.outbound.protection.outlook.com ([104.47.34.84]:53072 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752669AbdF0OmX (ORCPT ); Tue, 27 Jun 2017 10:42:23 -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; From: To: , CC: , , , , , , , , , , , , Laurentiu Tudor Subject: [PATCH v2 04/15] staging: fsl-mc: decouple the mc-bus public headers from dprc.h Date: Tue, 27 Jun 2017 17:41:24 +0300 Message-ID: <20170627144135.15599-5-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170627144135.15599-1-laurentiu.tudor@nxp.com> References: <20170627144135.15599-1-laurentiu.tudor@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131430481303833970;(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)(336005)(39840400002)(39860400002)(39410400002)(39380400002)(39850400002)(39400400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(5890100001)(4326008)(2876002)(8936002)(50466002)(2950100002)(498600001)(6666003)(48376002)(54906002)(81166006)(189998001)(5660300001)(8676002)(86152003)(76176999)(50986999)(36756003)(1076002)(5003940100001)(7416002)(85426001)(86362001)(356003)(106466001)(305945005)(47776003)(575784001)(105606002)(38730400002)(77096006)(39060400002)(33646002)(53936002)(8656002)(50226002)(2906002)(104016004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR03MB2572;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;A:1;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN1BFFO11FD019;1:+kQWqCuQBDCplkCWJ0Ls/581vm5sNUa5cJ7YFCaBu?= =?us-ascii?Q?pre6uHC0tbQ5e2uG3iMzxrm19AvhnvEw7JmuczdunPA3m8WMOZzD85juA5I5?= =?us-ascii?Q?UGF4zt6YrAD9XKO+yBZKyGoMoKU5XIHNDJS+9A53CZMoW5q43z1AE+x7Txfc?= =?us-ascii?Q?I+0Y6yZgDYTFKPQfLe16HGuajVAY/ZSJ20JMqbxBsPqKmYESMA1Fe6en4xp9?= =?us-ascii?Q?/o5Ley4XViFIVzMdG8nAVtbFdieKsSDRGQVLblbRZsIIV4dKOkCwKaLlaklo?= =?us-ascii?Q?kviPLl64ybiGk9R6RDpXW7cuE3xRd0IZWhgxeCn//k1/p7t+/sBPuDjDoPLV?= =?us-ascii?Q?7Xao+uNirtw0rjrH3kGyTJ9u/K+b4ADejhhzTMY5UPhi79WNO6WZLlcMkI8U?= =?us-ascii?Q?Slyon0THvm6coD1K6v4lUozgzc+64Y+t577c8kdlfl/45BbO//6yELX6OlDg?= =?us-ascii?Q?FSH6j/5VaKLqoZ6tUSLtE6MU8nSeKeU6ZlfgafMOruMS11C2zklhPzBu9Yxb?= =?us-ascii?Q?C1J0S9sWdYk5oaA+1D9tTSAXIqWqgNpalSlm/4srrFjXz5JY21rZrB3xuDFB?= =?us-ascii?Q?aE5y9hVl/Gike5kvg6FBjP7zpuYv8jiUeSHpLFk5Q6ag/kgw5NpOl9wD9cK1?= =?us-ascii?Q?uBof+KnD6nGavMtA4QgCQ7+l5RwEZBjQ0QpVQhZY00Bcz3/coLq+8fHXYnlW?= =?us-ascii?Q?kCUyjHZJYQ7pzRcG9Whk6zUnG8JIiV745Q5XjC2yw2JFb0BkMK4hCwK6q3LE?= =?us-ascii?Q?d5sHoXFUtlTmxIKdOwbECSmPlx3+CP5ntZse/Xe7g2WexN9Z90B7tYoz0rbu?= =?us-ascii?Q?g/DcymoBH9oF5NCkBSja8N7o930XaveIZDYqgwiKAoTlw8S6Oxkc4FuPRQOD?= =?us-ascii?Q?Jy5lyCrxOs90ZWHpqQHSQqKMQblWXBF5wVS4dcgxdMGRE5JDOdqJkIiWxyuI?= =?us-ascii?Q?pCVqPiq0F+iuJACimpEmatDB9JUGjhchKzpIhEFvcBUFBrCy3Ksk+K24zuSt?= =?us-ascii?Q?Dw2JHc95EcDIaB6zaJK9zDLklUZbX0U45O4cUwvgyi5AKkn5PIXTY2eUH9U0?= =?us-ascii?Q?wrwCEoYQjiwK6FCl2XBV50JXgZD?= MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d83353d1-6999-421e-ac13-08d4bd6ab13a X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506067)(300135500095);SRVR:DM5PR03MB2572; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2572;3:IWBSWstcX3/vANCM/J/qvEK6CXmIEo0MjNbU1ZuSz3zo0pE5A3xkm11otmUgqWJFd3xe9/FoGgQ8e9rjOMPzfKyysK6iKl6BIJB0/gwyO5ZLoqiWsr3k0iy7rYK0WFrH51rvOxxsG44LwpUF3se1yVvCp2WgaCy+NuhY9HKKnrdIt220y/oVkH10TLlLChIDJ/CWp2DOkzv5PFORYlHCuAkLNVCpfiy0VB81FsmjP9V6BRnDGuQi5KNIe00Me/KiCk2SmPNJN2e5ea0IQnvVa2LFwTk/finmwReKWceEv23Tp9JLOG3TLps3FEAJm1AdTBbN4yuZSSerBnRtDvRheY1mRtyquJKIDVUliA77nwu5bIqiwZYQHVMPHB/JygI1P0x65bDai0neVVYu2UjkXjqx+MagGkPxpNoYtS1d9ypjPbAiWhLqmPNFnwc+59PQdUSw2uRIgJtpxkqC+ScmLJfRSsSwnbDCFZwLIPGpxo4vmdTAkM2Minfu+3oJ+iBhDfjswc05w+XWzxaeyiEoiFFVc5VGQh4GytFtsLppyhQCMulvlAHP21Uo3sbY7Ul9XylsmyJt+n86L7nE5/OpvLawcHuZhTImG0cdv7Af4cf86h+sJYYmsw52c5pOSUfb8wV2WLDlJ5zq26cGSW/vB5I7SEzossN53sUV0bfmidRXfv3tR3t+YfyqBIo0HW2N8WpCcLklcGbhhCuXTvw2TWERkbVB7anylQi5pDxnCQeixVFwf9d3geOyDcetqjUgyYOIOzzrFhfI8zlW2btjGaTX+xYEE2sdPpiYofpyELah/SJF/EaQtGPW8m4msOvrFioPhoQX0Ksqg7HoJbgqCw== X-MS-TrafficTypeDiagnostic: DM5PR03MB2572: X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2572;25:KgtaAMa+GK2a4jF9dB1YnlZ+tPI5uG4pZMR9CHo7nmx/pCPoNBMRWRYQwxTJY1c2xJMJA5SEupaIZFd4K20iJmNsnOX7piBIl9nF85yeF1rA5IpAJlzWUN+MewamvH+8gk/i6sIRICC0hobt42XLW8YkXIuAf0FA53ZsEmcSs5pZybm0PILlVEvDKHRv5rPFHnV1BmDsXwFLdOJ2wOAAJHUPHI5ArMpFBCzhls/FkGR/0HB1UV1Gd0XRbSwjocFl+Kkxwl086teReNu6D8W9n+8YlXuObIfjLzOJ8tH5etjEJKEl4Wya8KCh1Ee/kQazgtXjOSSshZaVZ2m5nNa6X/xHM+MW+4/Aqtjt1xFFJmmNUHIU2GJbi6k4E9PIEi0CHyCFVxpw8x4RxHzJXWXIxRNxRS6kXVC0LvGhhkUx+LPogLFpoLsPt0wArhaiuS7Ev9Hv3oiPFdMd5PEvDqqyqD0Y4tXFIl8oFmp0zOSLMyO+mhM5Pk2BxNAgMNxzISTc7vGXx6uoBb/qoRL9UnDSZTRVz6y/1URj4aTUZaF1yDIDVJ1UyOsPZ/RQMhipQ8iBMmH4OSmOimYUXogNODqNvY8O6MJzYH1mGNEVGFBrufXCwTnfM3g2X4whgCKHpujlcCGxEoEDODG33+Z4vYOSeFTgDoNZzAorQhG4AeJps8ci/O9CDishLGfv2sBJBWaXP0FuHHcSruO8gwsYZesgEcM4CUIZzNJx4AlLRj2lOy8tTayLRgwwLpjTS7oU9x2j+6p3B7vhpsIKaxfk8QcnBL3F4rSDL7TkZmecgkmr/Xf2OaWU/MGM0oV9UtjkDeMov5pyr0qVKOQaBS2Ov5GfH7+yWgdBDFyTniZmxfl5DjOCfhxTii+PjHy1aFthF3Db/ZVTZlxe2WfoFLgucZg8XzWBRBCRE7rpCDoPcDhJ6ZI= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2572;31:oUpA3GD+vLze6GNpNNKojcYlCQCpzIEUccVq1uPohbbm2pcPJ8hwDYz2d+5VETWHV+4xaohpJfdQhLpPfusV3ZLeG8/v8ZEnw6qNv87EInpg/iZOgK1PQSAFeTPMaC7wAf2nZrIBIGlM73cHDsEo3NM7NZ0lW6TovsAC0r34nU1Ky+ZyKCGTWhY34op9A7v7Z6fuWA24BEdxzPbx5jMsmpK04IWH4ZCDOZcoiUZEBDHgk2ZTyJBETiAFGuDM/HEhNHCSmucqDPA5+rzLFniKtePcyjxK6EwGhKg9SAFvRTGHgkTUBo12n1dClT+yr+uJeNEC91nZoz0ye8rDu6S2fJHlsstqDcTbjSJnoBRrMdNVAzmyZuaJSyalFh1xfZvV5Nxb0z/KdPCqbeh6rUva5kRfRAXFjjZJjf6zRldsbNSt9uH2f8/zrllz2/ETQMSI4RdJR3qGtOfqSzy/Rxa7soViVY4C5DYv8Q5XNPmglkkdvtromXr6/y0YFM1DwiyhV6RSb+AcZqPbNi9rpdrCcQQO7gAh1Y3up6qoelKgY42O9UdR0e7v6/+xZuUQyp20LDaAFxlIT4gYx9vesX/j0egOkFAtWC9KoLWl2B9myWCY/Ecte+Bolj7Xx9nFVEOS41HUoiz1m1Si1QLQJ3aG3cDpGyQFtDLybmy9/Jt4+4/DxVZLOX+iAUMMdOLiU6UsI7doAiec5RN/Ek1Jm2eEVA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236129657087228)(185117386973197)(247924648384137); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6096035)(20161123563025)(20161123561025)(20161123565025)(20161123559100)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123556025)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM5PR03MB2572;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM5PR03MB2572; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR03MB2572;4:TFtWTpDZjbJ+H+DvwwWaJyP690aHeQCZz/JKhjcf12?= =?us-ascii?Q?sILP4VeKdXl6h7dPS8kZcs4vft8OfaZFYoU5BmV7oI+GbtrxYzgKGKFe39CI?= =?us-ascii?Q?TIzTPGej46TJMEEMunZKDHmMNdnwuX5LViyWFpIMeyaPB03Uog0ENKNsMmHU?= =?us-ascii?Q?G6fry5u38YV/cZzQFr5GfergnjOsN+QKwLDv2/fy2+hOQJJwRyIF3qelTory?= =?us-ascii?Q?KEniHBKecFum1DIWmYmanvE911C7GHUZz+wwK0IXarpvWclfoKuk9MqmMNaw?= =?us-ascii?Q?Js1AZ2tYjP82v2F5R7mQd+ZMyYV8SrIFyRZMdFppFe2qJvqX2rD/CPbf8fGQ?= =?us-ascii?Q?GBAZ2GS/FMmq6le96TuExNvvYM2LsqTLnFTkvDPqQFoxaFUmvDpbRPMvsAEO?= =?us-ascii?Q?3bG1MEeOF9smwYezTOdJq5IMAUTV0yJLfZW26P6vuFM8cKFMxx/01ENUVEwU?= =?us-ascii?Q?gKvUije8p61ozgxsEgkx9zsEVnrpNk7Vj1GUDHXEWFU6Wx9wNA1L1QHIGcLS?= =?us-ascii?Q?73Eqse3m7rRQDoTOsyMkQ2IVORqKtHVcA82WXotKeKPgw1BLW2iLMQ1AOKhi?= =?us-ascii?Q?XKmo3j4C0VfrXXXn91yiIIdTYYUTnFXU/UeSQKtz9rmjUmoH9bRYdMDP4nOV?= =?us-ascii?Q?VWtjZvZX+NMD2PITw9kI68qU+MTZWYCf76nvTW8b4IFs5t2UFAImChtNW6QY?= =?us-ascii?Q?t1uJ9uBjyd/+xxtQ57+ixQPTfsmhIwNBuVbvc5w0qk68ToREluGH9dmzY1f4?= =?us-ascii?Q?E9/ljnfgj9lF4oA/aiDlN8JhTqEI3S/lEgpcpQBI2BPFEHkbaA9k/NXv1U8b?= =?us-ascii?Q?Ydc2QxhQ3njK+oLk+nypm0XHo8eMoVzbJbksjdrvQDRCE4Rg4HJsx9nveJBU?= =?us-ascii?Q?HW2J9MLiK7uuPNPlwFtJKyNjxb8skc0DTOg0qRzUOsxCkPVdEoSpn0izV2Oz?= =?us-ascii?Q?Py3xhP2Meuzsm50l0P+BL6J2avhbxulIlriTEa6hNOkc159bOeS2XuLV3BTd?= =?us-ascii?Q?8KoK2B8AxLTAoUG1sYig30fg4CzGtEzwL9v5zKRWW+5ouWmnGnxELI0+2tSI?= =?us-ascii?Q?Q0XCkyUOBiRl0lC+7VKArlN5Po/ryqwuz6Aj8m8biw40gaCHz6OtMtGtTn2l?= =?us-ascii?Q?h1gQ0jQIsKyaQl5WQDbFj4vDlxO5YgyC0PFxM3zjqogHEI6NjoYMZMxs/tGB?= =?us-ascii?Q?KJRo+btduyrq0u0Cz0N8OJiR+wvdPKT0kmiBJTQnzeH34+RnNBLakleHjWQB?= =?us-ascii?Q?L7jjZTBy5+ENlPfjCYmMFLC6HJzLD1a0al9rvx8sG6YuAWSKyEoaFPbGyl/4?= =?us-ascii?Q?U327ypPW200oTuDJNvfOazTS8tQkUrzyThIx5cIfYI?= X-Forefront-PRVS: 0351D213B3 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR03MB2572;23:/Mh5XIgWfe0F8fbPCCIGPqtYquYKrhvUrpZ50L/Sk?= =?us-ascii?Q?lC03QI5tLXuVVRZz+tgl4sSkXBYGkb7tsu8u5VGJamRxQl/aw7d7bVjV/LJs?= =?us-ascii?Q?FWuEiB2vhRbYQxlL2Y53zsi0unqSpVoKPdUhqgtSz0B2OJJHHNTWMfTaVSGb?= =?us-ascii?Q?lFkDScZU6UNhCCmxf0/2KqnO38l6wTtdKReKLeGWx0x4alyMxkBPItVe57k3?= =?us-ascii?Q?3uhkg/3N0Bhm9vBA4eGv5C6GyPevdwUyHFJAKnFaaZP3jnG0MhVeyynNwqJg?= =?us-ascii?Q?dMVRRf+qIQDON8tRxAACE9NBuXvVvV6LtfhmxDrxmEDMi+nb7l0qVhRSA3FO?= =?us-ascii?Q?mAcEEbGzJNIWl73c/PckRv3cGHNHjN3wpPfQtDobNirDJQBRo8kwx14Y58IG?= =?us-ascii?Q?ktlwd1C/AombjYFJrMqg+HU2ow+67wORchgW/Ia9+uTCYB6QjfGS+tMpHw5U?= =?us-ascii?Q?GlDe0DWalv1V4q5z4V5y2wOw/pzkD23GboXMOtRLj3UbKS/o8OK5Tg7kjvRR?= =?us-ascii?Q?vh70cixSRdGYRkJcVUXZvjDO5ScN6mbrSra7yAQ3WmLSPz+zITCov3sb63HV?= =?us-ascii?Q?Gj0duHNCsdfoO4m3Qxjzbkh/vQXnbus/e9R+ENzHt8aOFPtnF+jnZUcnarPn?= =?us-ascii?Q?cY9G9EalCXygC7qpqtbYwMDxbMaDT+9sZFWMti2lySBQ+rYrs9okno72FRjz?= =?us-ascii?Q?XZmqzbWXWAYL8SVAYclcXfBNvTX7wxzHl9lp0FeDHBhhW2tgkUGPDchp9w0C?= =?us-ascii?Q?Iuf3jjxy2BL/CsKSQROZFKdEjv/b37qVg5sOZAHc7FadL6WC4pX1E/aXYhmx?= =?us-ascii?Q?hp9bxnVYrLgOqOgaAY6sdv/5pWaWjy9rqf5BhG6R0bZYwktSTCurdvrlnkak?= =?us-ascii?Q?aTK/IRic1sXanxSoE/R8uC/LN81huMvGk1ZUYbzaQ0zYNoUUf98WD96ChX4T?= =?us-ascii?Q?sEPKhhq/SyWN1f5qXs1oyrs4YSowMdR95S0c7AaRk4//m7xL1TLaq0xu/Jlg?= =?us-ascii?Q?CsBP69M90OgZ906FXKid0mPpiSU3FE+kXHo8kgXDTTg1UT69kGilDmDioP+i?= =?us-ascii?Q?Zoiw/aSpO3hABwvnC4mqR+FhFHbB4t5V+/LaXj/9L7cs7WCuInkrOHGSj/Bv?= =?us-ascii?Q?YcB/JiaY0zFlrwJ6s4vMVb/MjeDaiIRyyw2IG66e42mc8yIz2YhKE10Zi05X?= =?us-ascii?Q?+G4TjD6nzv2XE9p4wPnF3M/nBcMd9tE9JkvFbaa7bEoEU2eTPwfc6TELDHOt?= =?us-ascii?Q?ols7hmdN3EZgbrhejpQS1xJucYr15XLhmh8C/kMIW2WjgQvz9/Fh32YXhLrZ?= =?us-ascii?Q?4jPuu3EWcqpcKbwk05kc2CmPfKslyPN0i2o8aCBYEhL?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR03MB2572;6:TuQuhayniy78OebOZCId5ABFp64FDWINIGdKe/zV6s?= =?us-ascii?Q?zhKdT6rGcHR2UAo0cbpPLtXQTWqlYPr4SX3E6GKjOXbD0ZNRdQWzFJN+w7Rl?= =?us-ascii?Q?q8cmDatkmsU6LMetkihNEj6du/TaSgmgkCvqKo1VPxZzcjpN0ELPgEZD5rOI?= =?us-ascii?Q?kqgdEb5s+5+fjBv1BwtvUmivW82B+qumjDO66ShmUSIpSmZyaDhesh5yHQnM?= =?us-ascii?Q?3XPshd7v/7sBkboPdDlhj3SvmdDj70mW1gMJAjyRY9LbHlzM6dqYPdxjypzY?= =?us-ascii?Q?Eh/gN10v+qXRXMJ7lkb8cSymCLFXRGLaEmzeYPXckB0KfNNGNsZUD+F0XZYG?= =?us-ascii?Q?V3hPcfpdutzD6x6DK0ytJO7pileoDvelpcvvTyniP7out2B2pYMmfoLzizjT?= =?us-ascii?Q?6VoeGtrVh70i2gUIoyqEL0S99MN/jfkjAcx4Tupo+HS8wBcoQ2nn2T1ka8Zw?= =?us-ascii?Q?ofnthMACaeRLrk4zknS7t1eJZeI8qDUxIo/N5znoz/VZRYV6FHcj2kn9A92p?= =?us-ascii?Q?XzpDNc466i2ltCTJ/kQaDczUOzLxyf+3bdUa85c7ZHsbFsA5qiYfaneB9XnI?= =?us-ascii?Q?+6UA/golt3Nl9nQhflhgNlu0A+Vg3yklh/MNwwMSosu34XbOH3quWShIpbxw?= =?us-ascii?Q?TWmidWAaJ493L1u7Ni8r1A5MqlDs0PkTnnx7gG7fxfhNFVbyNhzoyWmRTq8q?= =?us-ascii?Q?xLaiZQVirpZmAlckg+nh5SWFbQ2NUhJuyEy6tSEbfyTTHU9xJJkSDHt/cV50?= =?us-ascii?Q?EN4MyQk2cG0d10WhM22MmtOW/3mxXDEIjmmV88S9TrFALy83u+EKbkd1gzjk?= =?us-ascii?Q?hgUBFrEBuuBBoZOooquOxT4u+QvVBWa58HLOE7wEG3w1iUWwyt8S0dUozgA7?= =?us-ascii?Q?/BYV0pLJRWeCpM6ADI7WhDPWQUrTcUbqD7LchqC+F3eHXvkYa6n2eqwRGKrb?= =?us-ascii?Q?C2zEhc3hmcaZnANbe3fmSpsZaIa89iDTaA3SB2dQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2572;5:+QgYwqUsEZksi/W/zouMRsLOzwPuGIhMH/MZuvZUhxI3o4uGAy44JkBAsBmo/HIHf26wDdU8Voy/Ugy3DMbZmo3GFgAQD6DkcDVqloaS28AEvQuKX5+Tk3lgwvkGrIdFHT1o8JTJLM60kpZpUw5NOa+Qlxiw+GpN0OErKvlqcNsSU4cSpB2sqBBOW2qhR22GZxCiRP4K5UXAAZr+6qHsGygO9MCo75F9r0rr30o0iwhUotMEMqW/XgOrUFlXwb5y1jsNW/UdmOlagHAEuxhwbs5wTE/SULSK9v43aQBqUOK8TyTObE5rBnRL/qU+uSoilxPJQHZb9yTdMFFAKmRSqSLBIUova1BEo4IgDJ/tDlJ03z2aAvtjhuGT3lDLEYosN4SIzhNSzyBmubh9ji20Tu+9yyc49Wcd1U1t9IZAbZDSwmiWr/stgEpyDYeuqEEuTV/RmAaavzoW3B+9f6YwgqTysATpJI+156fEb0/lmwPfwW02oGBm3EPQbhAkpLAh4ZEKKYwWJFkmvVk5e4DEAw==;24:tascj3sMxnIG/sisc9k5geiYhYuwhGds8l5DKoorMTHuVicT4/dv+N/bSioAM65KT9sDIj/7c+X55UK2OkZRX9fTcFoo9GK6s9OqoSNMJGo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2572;7:IcAfV2JO7mORutfOBTZRb6KjU31b0v1jhZPuaySIMV98N34Knq5pQRxRxjANqPc/WuZsNLQZoY3UoMHTlfK8am6e9XYyi5Dqesawo3QAcm0eSpdO/nlqm5PM0l/wukf4vq5pINQLsB62zgVfIlRCZQsKmeCXREzm2oIXb693ehY1BTdtS/xDYi2agrU8o6RaMOtWk7cwACYl95cyzATBxAyT2gsPkOaGBAXigxD0ENUxnn2aAwuzJmmqwhUV0j70kZ7dSsleGzFfAXTRNzZ1Yp/hu9HCa+49O5B46OGgeUH6XJX+/9vypKO59TrYEOBNGmLb9owjf8J9ogUbbRb6Lpg4Z9TZGxJtYT9wnSAqIxklLEmswrKcj0Bwl+4UcfH3ip86JUqjw+KM9xnzvjwO+xAIimdIy17C9YflZwh6q2Y55MQZsxYS5WTXWVSiTeRj963kBM4gYL3MVeSd2xEfMMO5dmfnE+eDmcwIuijzcwGQ8Rrac9h6/umTePMnaxiyTEtPexuZUzFOGOr1a/8t7dp67OhPIZTsDKWsxopAJChYqsxHrv2qStOqaT6XfonCpmBewu2n18Q385KmJaa8EUl0HS1IkNwiO3nZ2g/ozgHFwVkkyjVhy5Qs7uIO75PIxGJn03LaPSCsQgChMkxeT/xQCrm5x1PzGu8zYNn4Den3LrbKiH2UmJE2BJ74t5ze0Z85iQTdAR26VYiMR8ix6yutA3rSiVCltKR449SgxqojjJdpMxysX7qONdMQK+wyRr/6A6935aErmEefINthn8u1i10FsYzVFgDowiPj/Wg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2017 14:42:10.0245 (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: DM5PR03MB2572 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurentiu Tudor In its current form, the public headers of the mc-bus depend only on a structure "dprc_obj_desc" defined in dprc.h. Move it to the bus public header together with its associated defines and, in order to keep the naming prefixes consistent rename it to "fsl_mc_obj_desc". This will allow making dprc.h private in future patches. Signed-off-by: Laurentiu Tudor --- v2: - no changes drivers/staging/fsl-mc/bus/dprc-driver.c | 38 ++++++++++++------------ drivers/staging/fsl-mc/bus/dprc.c | 3 +- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 12 ++++---- drivers/staging/fsl-mc/bus/fsl-mc-private.h | 2 +- drivers/staging/fsl-mc/include/dprc.h | 46 ++--------------------------- drivers/staging/fsl-mc/include/mc.h | 41 ++++++++++++++++++++++++- 6 files changed, 71 insertions(+), 71 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 1765e2d..329ab10 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -21,13 +21,13 @@ #define FSL_MC_DPRC_DRIVER_NAME "fsl_mc_dprc" -struct dprc_child_objs { +struct fsl_mc_child_objs { int child_count; - struct dprc_obj_desc *child_array; + struct fsl_mc_obj_desc *child_array; }; static bool fsl_mc_device_match(struct fsl_mc_device *mc_dev, - struct dprc_obj_desc *obj_desc) + struct fsl_mc_obj_desc *obj_desc) { return mc_dev->obj_desc.id == obj_desc->id && !strcmp(mc_dev->obj_desc.type, obj_desc->type); @@ -37,7 +37,7 @@ static bool fsl_mc_device_match(struct fsl_mc_device *mc_dev, static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data) { int i; - struct dprc_child_objs *objs; + struct fsl_mc_child_objs *objs; struct fsl_mc_device *mc_dev; WARN_ON(!dev); @@ -46,7 +46,7 @@ static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data) objs = data; for (i = 0; i < objs->child_count; i++) { - struct dprc_obj_desc *obj_desc = &objs->child_array[i]; + struct fsl_mc_obj_desc *obj_desc = &objs->child_array[i]; if (strlen(obj_desc->type) != 0 && fsl_mc_device_match(mc_dev, obj_desc)) @@ -80,7 +80,7 @@ static int __fsl_mc_device_remove(struct device *dev, void *data) * been dynamically removed in the physical DPRC. */ static void dprc_remove_devices(struct fsl_mc_device *mc_bus_dev, - struct dprc_obj_desc *obj_desc_array, + struct fsl_mc_obj_desc *obj_desc_array, int num_child_objects_in_mc) { if (num_child_objects_in_mc != 0) { @@ -88,7 +88,7 @@ static void dprc_remove_devices(struct fsl_mc_device *mc_bus_dev, * Remove child objects that are in the DPRC in Linux, * but not in the MC: */ - struct dprc_child_objs objs; + struct fsl_mc_child_objs objs; objs.child_count = num_child_objects_in_mc; objs.child_array = obj_desc_array; @@ -106,13 +106,13 @@ static void dprc_remove_devices(struct fsl_mc_device *mc_bus_dev, static int __fsl_mc_device_match(struct device *dev, void *data) { - struct dprc_obj_desc *obj_desc = data; + struct fsl_mc_obj_desc *obj_desc = data; struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); return fsl_mc_device_match(mc_dev, obj_desc); } -static struct fsl_mc_device *fsl_mc_device_lookup(struct dprc_obj_desc +static struct fsl_mc_device *fsl_mc_device_lookup(struct fsl_mc_obj_desc *obj_desc, struct fsl_mc_device *mc_bus_dev) @@ -137,16 +137,16 @@ static struct fsl_mc_device *fsl_mc_device_lookup(struct dprc_obj_desc * device is unbound from the corresponding device driver. */ static void check_plugged_state_change(struct fsl_mc_device *mc_dev, - struct dprc_obj_desc *obj_desc) + struct fsl_mc_obj_desc *obj_desc) { int error; u32 plugged_flag_at_mc = - obj_desc->state & DPRC_OBJ_STATE_PLUGGED; + obj_desc->state & FSL_MC_OBJ_STATE_PLUGGED; if (plugged_flag_at_mc != - (mc_dev->obj_desc.state & DPRC_OBJ_STATE_PLUGGED)) { + (mc_dev->obj_desc.state & FSL_MC_OBJ_STATE_PLUGGED)) { if (plugged_flag_at_mc) { - mc_dev->obj_desc.state |= DPRC_OBJ_STATE_PLUGGED; + mc_dev->obj_desc.state |= FSL_MC_OBJ_STATE_PLUGGED; error = device_attach(&mc_dev->dev); if (error < 0) { dev_err(&mc_dev->dev, @@ -154,7 +154,7 @@ static void check_plugged_state_change(struct fsl_mc_device *mc_dev, error); } } else { - mc_dev->obj_desc.state &= ~DPRC_OBJ_STATE_PLUGGED; + mc_dev->obj_desc.state &= ~FSL_MC_OBJ_STATE_PLUGGED; device_release_driver(&mc_dev->dev); } } @@ -173,7 +173,7 @@ static void check_plugged_state_change(struct fsl_mc_device *mc_dev, * in the physical DPRC. */ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, - struct dprc_obj_desc *obj_desc_array, + struct fsl_mc_obj_desc *obj_desc_array, int num_child_objects_in_mc) { int error; @@ -181,7 +181,7 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, for (i = 0; i < num_child_objects_in_mc; i++) { struct fsl_mc_device *child_dev; - struct dprc_obj_desc *obj_desc = &obj_desc_array[i]; + struct fsl_mc_obj_desc *obj_desc = &obj_desc_array[i]; if (strlen(obj_desc->type) == 0) continue; @@ -228,7 +228,7 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, int dprc_get_obj_failures; int error; unsigned int irq_count = mc_bus_dev->obj_desc.irq_count; - struct dprc_obj_desc *child_obj_desc_array = NULL; + struct fsl_mc_obj_desc *child_obj_desc_array = NULL; error = dprc_get_obj_count(mc_bus_dev->mc_io, 0, @@ -255,7 +255,7 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, */ dprc_get_obj_failures = 0; for (i = 0; i < num_child_objects; i++) { - struct dprc_obj_desc *obj_desc = + struct fsl_mc_obj_desc *obj_desc = &child_obj_desc_array[i]; error = dprc_get_obj(mc_bus_dev->mc_io, @@ -283,7 +283,7 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, if ((strcmp(obj_desc->type, "dpseci") == 0) && (obj_desc->ver_major < 4)) obj_desc->flags |= - DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY; + FSL_MC_OBJ_FLAG_NO_MEM_SHAREABILITY; irq_count += obj_desc->irq_count; dev_dbg(&mc_bus_dev->dev, diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/staging/fsl-mc/bus/dprc.c index fcf7b47..a47f31d 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/staging/fsl-mc/bus/dprc.c @@ -29,6 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include "../include/mc.h" #include "../include/mc-sys.h" #include "../include/mc-cmd.h" #include "../include/dprc.h" @@ -496,7 +497,7 @@ int dprc_get_obj(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, int obj_index, - struct dprc_obj_desc *obj_desc) + struct fsl_mc_obj_desc *obj_desc) { struct mc_command cmd = { 0 }; struct dprc_cmd_get_obj *cmd_params; diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 7b48ade..8725a5c 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -82,7 +82,7 @@ static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv) * If the object is not 'plugged' don't match. * Only exception is the root DPRC, which is a special case. */ - if ((mc_dev->obj_desc.state & DPRC_OBJ_STATE_PLUGGED) == 0 && + if ((mc_dev->obj_desc.state & FSL_MC_OBJ_STATE_PLUGGED) == 0 && !fsl_mc_is_root_dprc(&mc_dev->dev)) goto out; @@ -339,7 +339,7 @@ static int fsl_mc_device_get_mmio_regions(struct fsl_mc_device *mc_dev, int i; int error; struct resource *regions; - struct dprc_obj_desc *obj_desc = &mc_dev->obj_desc; + struct fsl_mc_obj_desc *obj_desc = &mc_dev->obj_desc; struct device *parent_dev = mc_dev->dev.parent; enum dprc_region_type mc_region_type; @@ -432,7 +432,7 @@ static void fsl_mc_device_release(struct device *dev) /** * Add a newly discovered fsl-mc device to be visible in Linux */ -int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, +int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, struct device *parent_dev, struct fsl_mc_device **new_mc_dev) @@ -534,7 +534,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, } /* Objects are coherent, unless 'no shareability' flag set. */ - if (!(obj_desc->flags & DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY)) + if (!(obj_desc->flags & FSL_MC_OBJ_FLAG_NO_MEM_SHAREABILITY)) arch_setup_dma_ops(&mc_dev->dev, 0, 0, NULL, true); /* @@ -687,7 +687,7 @@ static int get_mc_addr_translation_ranges(struct device *dev, */ static int fsl_mc_bus_probe(struct platform_device *pdev) { - struct dprc_obj_desc obj_desc; + struct fsl_mc_obj_desc obj_desc; int error; struct fsl_mc *mc; struct fsl_mc_device *mc_bus_dev = NULL; @@ -746,7 +746,7 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) goto error_cleanup_mc_io; } - memset(&obj_desc, 0, sizeof(struct dprc_obj_desc)); + memset(&obj_desc, 0, sizeof(struct fsl_mc_obj_desc)); error = dprc_get_api_version(mc_io, 0, &obj_desc.ver_major, &obj_desc.ver_minor); diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h index 01ef9329..7f5406f 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -12,7 +12,7 @@ #include "../include/mc.h" -int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, +int __must_check fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, struct device *parent_dev, struct fsl_mc_device **new_mc_dev); diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index 2f4a7a7..21295e4 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h @@ -39,6 +39,7 @@ */ struct fsl_mc_io; +struct fsl_mc_obj_desc; int dprc_open(struct fsl_mc_io *mc_io, u32 cmd_flags, @@ -167,59 +168,18 @@ int dprc_get_obj_count(struct fsl_mc_io *mc_io, u16 token, int *obj_count); -/* Objects Attributes Flags */ - -/* Opened state - Indicates that an object is open by at least one owner */ -#define DPRC_OBJ_STATE_OPEN 0x00000001 -/* Plugged state - Indicates that the object is plugged */ -#define DPRC_OBJ_STATE_PLUGGED 0x00000002 - -/** - * Shareability flag - Object flag indicating no memory shareability. - * the object generates memory accesses that are non coherent with other - * masters; - * user is responsible for proper memory handling through IOMMU configuration. - */ -#define DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY 0x0001 - -/** - * struct dprc_obj_desc - Object descriptor, returned from dprc_get_obj() - * @type: Type of object: NULL terminated string - * @id: ID of logical object resource - * @vendor: Object vendor identifier - * @ver_major: Major version number - * @ver_minor: Minor version number - * @irq_count: Number of interrupts supported by the object - * @region_count: Number of mappable regions supported by the object - * @state: Object state: combination of DPRC_OBJ_STATE_ states - * @label: Object label - * @flags: Object's flags - */ -struct dprc_obj_desc { - char type[16]; - int id; - u16 vendor; - u16 ver_major; - u16 ver_minor; - u8 irq_count; - u8 region_count; - u32 state; - char label[16]; - u16 flags; -}; - int dprc_get_obj(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, int obj_index, - struct dprc_obj_desc *obj_desc); + struct fsl_mc_obj_desc *obj_desc); int dprc_get_obj_desc(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, char *obj_type, int obj_id, - struct dprc_obj_desc *obj_desc); + struct fsl_mc_obj_desc *obj_desc); int dprc_set_obj_irq(struct fsl_mc_io *mc_io, u32 cmd_flags, diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index 1c46c0c..60c7067 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -104,6 +104,45 @@ struct fsl_mc_device_irq { #define to_fsl_mc_irq(_mc_resource) \ container_of(_mc_resource, struct fsl_mc_device_irq, resource) +/* Opened state - Indicates that an object is open by at least one owner */ +#define FSL_MC_OBJ_STATE_OPEN 0x00000001 +/* Plugged state - Indicates that the object is plugged */ +#define FSL_MC_OBJ_STATE_PLUGGED 0x00000002 + +/** + * Shareability flag - Object flag indicating no memory shareability. + * the object generates memory accesses that are non coherent with other + * masters; + * user is responsible for proper memory handling through IOMMU configuration. + */ +#define FSL_MC_OBJ_FLAG_NO_MEM_SHAREABILITY 0x0001 + +/** + * struct fsl_mc_obj_desc - Object descriptor + * @type: Type of object: NULL terminated string + * @id: ID of logical object resource + * @vendor: Object vendor identifier + * @ver_major: Major version number + * @ver_minor: Minor version number + * @irq_count: Number of interrupts supported by the object + * @region_count: Number of mappable regions supported by the object + * @state: Object state: combination of FSL_MC_OBJ_STATE_ states + * @label: Object label: NULL terminated string + * @flags: Object's flags + */ +struct fsl_mc_obj_desc { + char type[16]; + int id; + u16 vendor; + u16 ver_major; + u16 ver_minor; + u8 irq_count; + u8 region_count; + u32 state; + char label[16]; + u16 flags; +}; + /** * Bit masks for a MC object device (struct fsl_mc_device) flags */ @@ -150,7 +189,7 @@ struct fsl_mc_device { u16 icid; u16 mc_handle; struct fsl_mc_io *mc_io; - struct dprc_obj_desc obj_desc; + struct fsl_mc_obj_desc obj_desc; struct resource *regions; struct fsl_mc_device_irq **irqs; struct fsl_mc_resource *resource; -- 2.9.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: laurentiu.tudor@nxp.com (laurentiu.tudor at nxp.com) Date: Tue, 27 Jun 2017 17:41:24 +0300 Subject: [PATCH v2 04/15] staging: fsl-mc: decouple the mc-bus public headers from dprc.h In-Reply-To: <20170627144135.15599-1-laurentiu.tudor@nxp.com> References: <20170627144135.15599-1-laurentiu.tudor@nxp.com> Message-ID: <20170627144135.15599-5-laurentiu.tudor@nxp.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Laurentiu Tudor In its current form, the public headers of the mc-bus depend only on a structure "dprc_obj_desc" defined in dprc.h. Move it to the bus public header together with its associated defines and, in order to keep the naming prefixes consistent rename it to "fsl_mc_obj_desc". This will allow making dprc.h private in future patches. Signed-off-by: Laurentiu Tudor --- v2: - no changes drivers/staging/fsl-mc/bus/dprc-driver.c | 38 ++++++++++++------------ drivers/staging/fsl-mc/bus/dprc.c | 3 +- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 12 ++++---- drivers/staging/fsl-mc/bus/fsl-mc-private.h | 2 +- drivers/staging/fsl-mc/include/dprc.h | 46 ++--------------------------- drivers/staging/fsl-mc/include/mc.h | 41 ++++++++++++++++++++++++- 6 files changed, 71 insertions(+), 71 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 1765e2d..329ab10 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -21,13 +21,13 @@ #define FSL_MC_DPRC_DRIVER_NAME "fsl_mc_dprc" -struct dprc_child_objs { +struct fsl_mc_child_objs { int child_count; - struct dprc_obj_desc *child_array; + struct fsl_mc_obj_desc *child_array; }; static bool fsl_mc_device_match(struct fsl_mc_device *mc_dev, - struct dprc_obj_desc *obj_desc) + struct fsl_mc_obj_desc *obj_desc) { return mc_dev->obj_desc.id == obj_desc->id && !strcmp(mc_dev->obj_desc.type, obj_desc->type); @@ -37,7 +37,7 @@ static bool fsl_mc_device_match(struct fsl_mc_device *mc_dev, static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data) { int i; - struct dprc_child_objs *objs; + struct fsl_mc_child_objs *objs; struct fsl_mc_device *mc_dev; WARN_ON(!dev); @@ -46,7 +46,7 @@ static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data) objs = data; for (i = 0; i < objs->child_count; i++) { - struct dprc_obj_desc *obj_desc = &objs->child_array[i]; + struct fsl_mc_obj_desc *obj_desc = &objs->child_array[i]; if (strlen(obj_desc->type) != 0 && fsl_mc_device_match(mc_dev, obj_desc)) @@ -80,7 +80,7 @@ static int __fsl_mc_device_remove(struct device *dev, void *data) * been dynamically removed in the physical DPRC. */ static void dprc_remove_devices(struct fsl_mc_device *mc_bus_dev, - struct dprc_obj_desc *obj_desc_array, + struct fsl_mc_obj_desc *obj_desc_array, int num_child_objects_in_mc) { if (num_child_objects_in_mc != 0) { @@ -88,7 +88,7 @@ static void dprc_remove_devices(struct fsl_mc_device *mc_bus_dev, * Remove child objects that are in the DPRC in Linux, * but not in the MC: */ - struct dprc_child_objs objs; + struct fsl_mc_child_objs objs; objs.child_count = num_child_objects_in_mc; objs.child_array = obj_desc_array; @@ -106,13 +106,13 @@ static void dprc_remove_devices(struct fsl_mc_device *mc_bus_dev, static int __fsl_mc_device_match(struct device *dev, void *data) { - struct dprc_obj_desc *obj_desc = data; + struct fsl_mc_obj_desc *obj_desc = data; struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); return fsl_mc_device_match(mc_dev, obj_desc); } -static struct fsl_mc_device *fsl_mc_device_lookup(struct dprc_obj_desc +static struct fsl_mc_device *fsl_mc_device_lookup(struct fsl_mc_obj_desc *obj_desc, struct fsl_mc_device *mc_bus_dev) @@ -137,16 +137,16 @@ static struct fsl_mc_device *fsl_mc_device_lookup(struct dprc_obj_desc * device is unbound from the corresponding device driver. */ static void check_plugged_state_change(struct fsl_mc_device *mc_dev, - struct dprc_obj_desc *obj_desc) + struct fsl_mc_obj_desc *obj_desc) { int error; u32 plugged_flag_at_mc = - obj_desc->state & DPRC_OBJ_STATE_PLUGGED; + obj_desc->state & FSL_MC_OBJ_STATE_PLUGGED; if (plugged_flag_at_mc != - (mc_dev->obj_desc.state & DPRC_OBJ_STATE_PLUGGED)) { + (mc_dev->obj_desc.state & FSL_MC_OBJ_STATE_PLUGGED)) { if (plugged_flag_at_mc) { - mc_dev->obj_desc.state |= DPRC_OBJ_STATE_PLUGGED; + mc_dev->obj_desc.state |= FSL_MC_OBJ_STATE_PLUGGED; error = device_attach(&mc_dev->dev); if (error < 0) { dev_err(&mc_dev->dev, @@ -154,7 +154,7 @@ static void check_plugged_state_change(struct fsl_mc_device *mc_dev, error); } } else { - mc_dev->obj_desc.state &= ~DPRC_OBJ_STATE_PLUGGED; + mc_dev->obj_desc.state &= ~FSL_MC_OBJ_STATE_PLUGGED; device_release_driver(&mc_dev->dev); } } @@ -173,7 +173,7 @@ static void check_plugged_state_change(struct fsl_mc_device *mc_dev, * in the physical DPRC. */ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, - struct dprc_obj_desc *obj_desc_array, + struct fsl_mc_obj_desc *obj_desc_array, int num_child_objects_in_mc) { int error; @@ -181,7 +181,7 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, for (i = 0; i < num_child_objects_in_mc; i++) { struct fsl_mc_device *child_dev; - struct dprc_obj_desc *obj_desc = &obj_desc_array[i]; + struct fsl_mc_obj_desc *obj_desc = &obj_desc_array[i]; if (strlen(obj_desc->type) == 0) continue; @@ -228,7 +228,7 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, int dprc_get_obj_failures; int error; unsigned int irq_count = mc_bus_dev->obj_desc.irq_count; - struct dprc_obj_desc *child_obj_desc_array = NULL; + struct fsl_mc_obj_desc *child_obj_desc_array = NULL; error = dprc_get_obj_count(mc_bus_dev->mc_io, 0, @@ -255,7 +255,7 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, */ dprc_get_obj_failures = 0; for (i = 0; i < num_child_objects; i++) { - struct dprc_obj_desc *obj_desc = + struct fsl_mc_obj_desc *obj_desc = &child_obj_desc_array[i]; error = dprc_get_obj(mc_bus_dev->mc_io, @@ -283,7 +283,7 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, if ((strcmp(obj_desc->type, "dpseci") == 0) && (obj_desc->ver_major < 4)) obj_desc->flags |= - DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY; + FSL_MC_OBJ_FLAG_NO_MEM_SHAREABILITY; irq_count += obj_desc->irq_count; dev_dbg(&mc_bus_dev->dev, diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/staging/fsl-mc/bus/dprc.c index fcf7b47..a47f31d 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/staging/fsl-mc/bus/dprc.c @@ -29,6 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include "../include/mc.h" #include "../include/mc-sys.h" #include "../include/mc-cmd.h" #include "../include/dprc.h" @@ -496,7 +497,7 @@ int dprc_get_obj(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, int obj_index, - struct dprc_obj_desc *obj_desc) + struct fsl_mc_obj_desc *obj_desc) { struct mc_command cmd = { 0 }; struct dprc_cmd_get_obj *cmd_params; diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 7b48ade..8725a5c 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -82,7 +82,7 @@ static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv) * If the object is not 'plugged' don't match. * Only exception is the root DPRC, which is a special case. */ - if ((mc_dev->obj_desc.state & DPRC_OBJ_STATE_PLUGGED) == 0 && + if ((mc_dev->obj_desc.state & FSL_MC_OBJ_STATE_PLUGGED) == 0 && !fsl_mc_is_root_dprc(&mc_dev->dev)) goto out; @@ -339,7 +339,7 @@ static int fsl_mc_device_get_mmio_regions(struct fsl_mc_device *mc_dev, int i; int error; struct resource *regions; - struct dprc_obj_desc *obj_desc = &mc_dev->obj_desc; + struct fsl_mc_obj_desc *obj_desc = &mc_dev->obj_desc; struct device *parent_dev = mc_dev->dev.parent; enum dprc_region_type mc_region_type; @@ -432,7 +432,7 @@ static void fsl_mc_device_release(struct device *dev) /** * Add a newly discovered fsl-mc device to be visible in Linux */ -int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, +int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, struct device *parent_dev, struct fsl_mc_device **new_mc_dev) @@ -534,7 +534,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, } /* Objects are coherent, unless 'no shareability' flag set. */ - if (!(obj_desc->flags & DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY)) + if (!(obj_desc->flags & FSL_MC_OBJ_FLAG_NO_MEM_SHAREABILITY)) arch_setup_dma_ops(&mc_dev->dev, 0, 0, NULL, true); /* @@ -687,7 +687,7 @@ static int get_mc_addr_translation_ranges(struct device *dev, */ static int fsl_mc_bus_probe(struct platform_device *pdev) { - struct dprc_obj_desc obj_desc; + struct fsl_mc_obj_desc obj_desc; int error; struct fsl_mc *mc; struct fsl_mc_device *mc_bus_dev = NULL; @@ -746,7 +746,7 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) goto error_cleanup_mc_io; } - memset(&obj_desc, 0, sizeof(struct dprc_obj_desc)); + memset(&obj_desc, 0, sizeof(struct fsl_mc_obj_desc)); error = dprc_get_api_version(mc_io, 0, &obj_desc.ver_major, &obj_desc.ver_minor); diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h index 01ef9329..7f5406f 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -12,7 +12,7 @@ #include "../include/mc.h" -int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, +int __must_check fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, struct device *parent_dev, struct fsl_mc_device **new_mc_dev); diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index 2f4a7a7..21295e4 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h @@ -39,6 +39,7 @@ */ struct fsl_mc_io; +struct fsl_mc_obj_desc; int dprc_open(struct fsl_mc_io *mc_io, u32 cmd_flags, @@ -167,59 +168,18 @@ int dprc_get_obj_count(struct fsl_mc_io *mc_io, u16 token, int *obj_count); -/* Objects Attributes Flags */ - -/* Opened state - Indicates that an object is open by at least one owner */ -#define DPRC_OBJ_STATE_OPEN 0x00000001 -/* Plugged state - Indicates that the object is plugged */ -#define DPRC_OBJ_STATE_PLUGGED 0x00000002 - -/** - * Shareability flag - Object flag indicating no memory shareability. - * the object generates memory accesses that are non coherent with other - * masters; - * user is responsible for proper memory handling through IOMMU configuration. - */ -#define DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY 0x0001 - -/** - * struct dprc_obj_desc - Object descriptor, returned from dprc_get_obj() - * @type: Type of object: NULL terminated string - * @id: ID of logical object resource - * @vendor: Object vendor identifier - * @ver_major: Major version number - * @ver_minor: Minor version number - * @irq_count: Number of interrupts supported by the object - * @region_count: Number of mappable regions supported by the object - * @state: Object state: combination of DPRC_OBJ_STATE_ states - * @label: Object label - * @flags: Object's flags - */ -struct dprc_obj_desc { - char type[16]; - int id; - u16 vendor; - u16 ver_major; - u16 ver_minor; - u8 irq_count; - u8 region_count; - u32 state; - char label[16]; - u16 flags; -}; - int dprc_get_obj(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, int obj_index, - struct dprc_obj_desc *obj_desc); + struct fsl_mc_obj_desc *obj_desc); int dprc_get_obj_desc(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, char *obj_type, int obj_id, - struct dprc_obj_desc *obj_desc); + struct fsl_mc_obj_desc *obj_desc); int dprc_set_obj_irq(struct fsl_mc_io *mc_io, u32 cmd_flags, diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index 1c46c0c..60c7067 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -104,6 +104,45 @@ struct fsl_mc_device_irq { #define to_fsl_mc_irq(_mc_resource) \ container_of(_mc_resource, struct fsl_mc_device_irq, resource) +/* Opened state - Indicates that an object is open by at least one owner */ +#define FSL_MC_OBJ_STATE_OPEN 0x00000001 +/* Plugged state - Indicates that the object is plugged */ +#define FSL_MC_OBJ_STATE_PLUGGED 0x00000002 + +/** + * Shareability flag - Object flag indicating no memory shareability. + * the object generates memory accesses that are non coherent with other + * masters; + * user is responsible for proper memory handling through IOMMU configuration. + */ +#define FSL_MC_OBJ_FLAG_NO_MEM_SHAREABILITY 0x0001 + +/** + * struct fsl_mc_obj_desc - Object descriptor + * @type: Type of object: NULL terminated string + * @id: ID of logical object resource + * @vendor: Object vendor identifier + * @ver_major: Major version number + * @ver_minor: Minor version number + * @irq_count: Number of interrupts supported by the object + * @region_count: Number of mappable regions supported by the object + * @state: Object state: combination of FSL_MC_OBJ_STATE_ states + * @label: Object label: NULL terminated string + * @flags: Object's flags + */ +struct fsl_mc_obj_desc { + char type[16]; + int id; + u16 vendor; + u16 ver_major; + u16 ver_minor; + u8 irq_count; + u8 region_count; + u32 state; + char label[16]; + u16 flags; +}; + /** * Bit masks for a MC object device (struct fsl_mc_device) flags */ @@ -150,7 +189,7 @@ struct fsl_mc_device { u16 icid; u16 mc_handle; struct fsl_mc_io *mc_io; - struct dprc_obj_desc obj_desc; + struct fsl_mc_obj_desc obj_desc; struct resource *regions; struct fsl_mc_device_irq **irqs; struct fsl_mc_resource *resource; -- 2.9.4