From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932172AbbIWVjh (ORCPT ); Wed, 23 Sep 2015 17:39:37 -0400 Received: from mail-bn1on0141.outbound.protection.outlook.com ([157.56.110.141]:15442 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755848AbbIWVje (ORCPT ); Wed, 23 Sep 2015 17:39:34 -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 v3 2/6] staging: fsl-mc: uprev dpmng binary interface to v8.0 Date: Wed, 23 Sep 2015 16:10:59 -0500 Message-ID: <1443042663-21580-3-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1443042663-21580-1-git-send-email-German.Rivera@freescale.com> References: <1443042663-21580-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11OLC001;1:wmOe5zzRwIfHhI//uvTnfikCjdDjD4931vunk9vgM0v7kCQwpIeZncacYmjfWr6tLYiCUmTnpuzzPelS4WcgwitKFLWblf7HXKDNPVlrhE8zVN/XUl6DojIs6GMCRcoJsgmsDt/YIRUKfaUdMqEjJWpGoY6vmKq9vstduncLTesSK9+b7YCd9TJDF3AhlqManOChfI8loC9Y8J1ylEgEngBt9+6D6HN3dCtrqfwAv1bDHoVZREwOH49lsCMWT90hjfv6jiiCxH0IkNz8MFCCuKvU7f9Pvyc2n8XkG61IIiLTxyjFBuZtlkl/qOitswoh+GiC8MMVGsIVkKa3z4daPBf9niyV3PuAPUK2iM2iFgoIQYI92xMcIQe9EUAC4KSJZFSpEsY1x3KLLFhn6HGmlA== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(46102003)(77156002)(81156007)(97736004)(4001540100001)(5003940100001)(5001770100001)(48376002)(87936001)(5001860100001)(6806005)(36756003)(50466002)(5001960100002)(104016004)(189998001)(107886002)(5007970100001)(106466001)(92566002)(50226001)(85426001)(2201001)(2950100001)(47776003)(5001830100001)(50986999)(11100500001)(76176999)(5001920100001)(86362001)(64706001)(68736005)(62966003)(77096005)(105606002)(229853001)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR0301MB1309;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1309;2:KzJ4ZgYpniUlHXP0vOmbTD+C60MiCHdOtetzZdf0KziOaqJ7QLqqY2fojRIxwnEIlB1lvP3XfqYFqCemcVCQLhQ0vPZihQUHoUBK9ZZXOBD24cetsklJaE/bwH45OPR3vFQQ8h8iVbQZrnnl8VRl/PLKlm6wAd42Y5DhEP3/pWI=;3:qLPejtSb7UGSNDve7DMgTjGhF60Ewc5QQ0fCuBz9w1efLpK3NghEfbKX4PDkco5DegpA18LKPjiWQlqeSTDznA6w13ljSoFVqISpKVy2W5nWkFrLmhp0v3WoLIaM9Kvsu1kHQeHTB5Q8SoyOsOQOVRSV3gtXtW3cYYH/YFA/UnEHckT0wmuHxp4DHH8UHpx06VYt3OqyZyV9AEr2L9/ZuCML3Sjhd9eZg872voj6w84=;25:sDt4ntCfwIiSPTvVfWOHQDhrFYfdUjjp/wTyaoLsXQSEmmsEiiY45Q2ESvypKYnkvCXN+JsXEb/AEX0ho5c7qXyZMWJAR11sEvuDoqw9froDo3nOlx1KKTTSwc1S/gjQlxDQEcWl/lv1Hlkuv78xNllAPSAZoJmWsoW0sfRo2rtNdcVzKseBYneBtUgbPfiCqFy65N8xYmDTKu2/qXCPi1trqKB7sFSnq9UtqD5LE1KbnKG+IqoSFEYsvbaaRFXz/lTHQzMc9SXdzuVmH7rjmQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1309; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1309;20:pm96h1lRKCUxPdCTF68EhUJ+obDQKxJptDvbsL4rAOPUloIcxHreBsZWurCVaVttXcgxf1sgHQwDsc+8tPwVAtD5pAcZvHnhZemZF8l2EPYYBcSqMZCjimqEqwWgVyiyk/T5YNQMgGcWY+dwoAuzy5QPli9gn6Y+WskjWib41kGNcSsQuHCQOpxzw9qd3cP2VGctubUz3MUes/YjkwIBpa0yyJ1HaAWcMEyyNJOymUiK+l+wil0kKgt3JaRcDfororoYSLqe7lM1vgrigkdld6Lzq4aaAxWCqYLzXYp0Dum+3XFt+xU5i85h0+eHPDYoUnzxuTc8BMFLLuHdt3lcgEaPAxsAWK/5iBRWW2Z8EGg=;4:ieEtsGgAioxV8x96VjGqOWr+k3iNO7lquRie9hcC7+7sQWO8tEzMV1FAMrESIgovApBeetehOcZwT7tn41fEXuHv//TkFC6Sn6bWEmRToSlXp1bJdczyLGKa7pvtiyBRLy+KH87xETItDqM2DoxOujcMHTr8oxVWR/H+l+V8HirkAt3chJ71qkmaESvvaTxNWfCv+4dBFiGwzovkTw/xwmqtpwR225bBhuZNn7sOpzdP5z0p5U6ap14/7pCPzTPSUZerD/XaIg8Omes41802for5OXv5+PVH2mCW+0nCU2U4fXI57IiI8W6ESAhcoHM7ahmbPcNZ4RQlRWZVe20gc0C6OPA1AMniRztkDGhpHnI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001);SRVR:DM2PR0301MB1309;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1309; X-Forefront-PRVS: 07083FF734 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB1309;23:MbN6+kKxrgqTGQ/fdzQfyaiBC+hWjQIBL5axsR+?= =?us-ascii?Q?rgP6YxbklRTK6LLDmF/8kz4K5MhMsTtQDM+gzRZe2dRcL4WDrqjDXQ6xQFBn?= =?us-ascii?Q?fc5/5sFeSz0NkKgRKaVJELZIAu/dLrlbScCpcxhKyAWB982eGrG05Grf++Sw?= =?us-ascii?Q?QeNlRQkeCagTItM5vSNNtFx9kqvdxA4zlLmw4lfCJACzgU9N+6XnUhBEgU7A?= =?us-ascii?Q?m98Wdke1Bnb1hWygDEV1ao0KrXbI2MYF3gnFvROOebOYHNF8NLqoryn7jvnF?= =?us-ascii?Q?KMe3RpMj5yeUZN2+wVjU5AczW+TCkta7zpbORm8t/bC2O+S5X+oZ+mwg7ze2?= =?us-ascii?Q?Gr/yRgZeE4CEextw8uJCq9KGd4+4zz7PM5/1ZHrzt/cGjKRe/cNxerXvt/XV?= =?us-ascii?Q?TV6kIEGLUe6CIWKykZTSwm7Wh8ZSJ/rGp/QJ4A1INGXENDnI171zpsddXieD?= =?us-ascii?Q?oCZIX4JT//dlFWh1QEvpUNZR2+ZL42ZY/mvIvp3aJRoHz+Q1wvEIxRRx5Sda?= =?us-ascii?Q?D1IXzI1ZuBhOR15+yQyJ60vzrcYZo3ENMMtF4JVjkj4DMxpBalnXrsLqC5tp?= =?us-ascii?Q?F+ume0k2OnrxcDmc9MHhKeZqAOFN4YNCtjBizh2Kz0eT5dtWQKxNjjEga/0F?= =?us-ascii?Q?yI+fZSotGz8LjijTPYnmSCxyZ4NOXqeyv9oDj/oQldlgfUPAm8aG8x5C0yCi?= =?us-ascii?Q?vJroRUqk4pIAG/TgNmhB/611AYepM8kWlWmH5Nsua2M4zI2NKvuRHRGc85BF?= =?us-ascii?Q?Y+v9ttW1dFK6gZPr3StT0RS3BD1OrhDWAX1r0di95IFvAVheBUDiBNEUDGx+?= =?us-ascii?Q?THpREScGEtfdG01Usw8vw9SZ2AJRFXpgvb49o5iv0xi32OEA0PpA58xjLwsm?= =?us-ascii?Q?EJ/uwNKZk2K+CI9W7L34L+vPTCjDkbVlW51npZZQHCBN2DMKuKek0a4HQYGQ?= =?us-ascii?Q?rARsfxMeKMm3QtFnOHBSQnm1crVg2YnKg55ZuXvkfH57sC3Outiss7yO0KPO?= =?us-ascii?Q?9cWT4S3416ZnZ5W1sVJJlcas0YyruSGoZ+AHgcJYNW2zVs2JoWD/ipC301aF?= =?us-ascii?Q?6NfYjdUgqLznWqlJc3LxjVB3JVIGW9FToq9ud/3xm+mCXLW+SyDaY2F7YYeR?= =?us-ascii?Q?GLEBw/B7QjzcnELHrC0+uBpZFe5BqLx6KCVHjfDp/MSZK64B3E+PkhBMvJTB?= =?us-ascii?Q?VGbgojMggeNdzKx207LWv9zbGAgB0iMwQFowtsgYFpOW0HMeZ8+8k/XJNNQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1309;5:iZu8PJS3uelE/H2BF6/4OlXKrAzVnKu3UeP7SSm909H7Z++XSK6RNFEViws+Zay0TntdCrP8tYZvt+ti43P4g7hGmTHnsGky4eaTMsWF/GwTZNsKfAKZFc2vbZLRvTqfY3voqRYe7Qcm4dDI656JNw==;24:WeUPx8dUaMy8IcWClMHtWH5BNJAjSD2W0NXNAkx3t+8+kf2gWeSPMMm7S5D+3sc0TlGv1GksDc7PeR6EkDHU/BsVwIOwkxA0qAmEbbnjtbc=;20:nnQx3YXlf9FjxWHTKOdNeH5GCNrdBBnDracdLo3vzTioLI5NgoPyV9XqWnsYWhmPqlFYG0dsbSjHLTtWzrLGcQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2015 21:25:04.6508 (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: DM2PR0301MB1309 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add cmd_flags parameter to all dpmng APIs to comply with 8.0 MC firmware interface. Updated MC version major number. --- drivers/staging/fsl-mc/bus/dpmng.c | 14 ++++++++++---- drivers/staging/fsl-mc/bus/mc-bus.c | 4 ++-- drivers/staging/fsl-mc/include/dpmng.h | 14 ++++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dpmng.c b/drivers/staging/fsl-mc/bus/dpmng.c index 58328e8..1aeca05 100644 --- a/drivers/staging/fsl-mc/bus/dpmng.c +++ b/drivers/staging/fsl-mc/bus/dpmng.c @@ -34,14 +34,17 @@ #include "../include/dpmng.h" #include "dpmng-cmd.h" -int mc_get_version(struct fsl_mc_io *mc_io, struct mc_version *mc_ver_info) +int mc_get_version(struct fsl_mc_io *mc_io, + uint32_t cmd_flags, + struct mc_version *mc_ver_info) { struct mc_command cmd = { 0 }; int err; /* prepare command */ cmd.header = mc_encode_cmd_header(DPMNG_CMDID_GET_VERSION, - MC_CMD_PRI_LOW, 0); + cmd_flags, + 0); /* send command to mc*/ err = mc_send_command(mc_io, &cmd); @@ -56,14 +59,17 @@ int mc_get_version(struct fsl_mc_io *mc_io, struct mc_version *mc_ver_info) return 0; } -int dpmng_get_container_id(struct fsl_mc_io *mc_io, int *container_id) +int dpmng_get_container_id(struct fsl_mc_io *mc_io, + uint32_t cmd_flags, + int *container_id) { struct mc_command cmd = { 0 }; int err; /* prepare command */ cmd.header = mc_encode_cmd_header(DPMNG_CMDID_GET_CONT_ID, - MC_CMD_PRI_LOW, 0); + cmd_flags, + 0); /* send command to mc*/ err = mc_send_command(mc_io, &cmd); diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c index b3a60a0..f3718a3 100644 --- a/drivers/staging/fsl-mc/bus/mc-bus.c +++ b/drivers/staging/fsl-mc/bus/mc-bus.c @@ -630,7 +630,7 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) if (error < 0) return error; - error = mc_get_version(mc_io, &mc_version); + error = mc_get_version(mc_io, 0, &mc_version); if (error != 0) { dev_err(&pdev->dev, "mc_get_version() failed with error %d\n", error); @@ -661,7 +661,7 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) if (error < 0) goto error_cleanup_mc_io; - error = dpmng_get_container_id(mc_io, &container_id); + error = dpmng_get_container_id(mc_io, 0, &container_id); if (error < 0) { dev_err(&pdev->dev, "dpmng_get_container_id() failed: %d\n", error); diff --git a/drivers/staging/fsl-mc/include/dpmng.h b/drivers/staging/fsl-mc/include/dpmng.h index 1b052b8..4a0996c 100644 --- a/drivers/staging/fsl-mc/include/dpmng.h +++ b/drivers/staging/fsl-mc/include/dpmng.h @@ -41,11 +41,11 @@ struct fsl_mc_io; /** * Management Complex firmware version information */ -#define MC_VER_MAJOR 6 +#define MC_VER_MAJOR 8 #define MC_VER_MINOR 0 /** - * struct mc_versoin + * struct mc_version * @major: Major version number: incremented on API compatibility changes * @minor: Minor version number: incremented on API additions (that are * backward compatible); reset when major version is incremented @@ -62,19 +62,25 @@ struct mc_version { * mc_get_version() - Retrieves the Management Complex firmware * version information * @mc_io: Pointer to opaque I/O object + * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' * @mc_ver_info: Returned version information structure * * Return: '0' on Success; Error code otherwise. */ -int mc_get_version(struct fsl_mc_io *mc_io, struct mc_version *mc_ver_info); +int mc_get_version(struct fsl_mc_io *mc_io, + uint32_t cmd_flags, + struct mc_version *mc_ver_info); /** * dpmng_get_container_id() - Get container ID associated with a given portal. * @mc_io: Pointer to MC portal's I/O object + * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' * @container_id: Requested container ID * * Return: '0' on Success; Error code otherwise. */ -int dpmng_get_container_id(struct fsl_mc_io *mc_io, int *container_id); +int dpmng_get_container_id(struct fsl_mc_io *mc_io, + uint32_t cmd_flags, + int *container_id); #endif /* __FSL_DPMNG_H */ -- 2.3.3