From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758856AbbIVXXG (ORCPT ); Tue, 22 Sep 2015 19:23:06 -0400 Received: from mail-bn1bon0135.outbound.protection.outlook.com ([157.56.111.135]:35755 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752437AbbIVXXD (ORCPT ); Tue, 22 Sep 2015 19:23:03 -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 2/6] staging: fsl-mc: uprev dpmng binary interface to v8.0 Date: Tue, 22 Sep 2015 18:08:55 -0500 Message-ID: <1442963339-32084-3-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1442963339-32084-1-git-send-email-German.Rivera@freescale.com> References: <1442963339-32084-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD027;1:mMmsqYDaS5sFxi/xfSqZXXLqiYnFsj+vh4/A7AtjuxDVeFFQ9Q4JHrXQ2ann6FeFdMRhonOfk0eeSy/fysMfsO7jwtyCnsrx94AQFfXzECkfst9+Ayg+C8VX9KeXZEbC6bFH/9+nvJo7mjy29j9Kx5JJjHyDqF7vvQrem0bONZsRDdWOR3WiigaYgQ5Jnk6I3Un45JgftZoTpP/Ep4xiSGQMO6Yvdnp8/+Iz1iGZNz0+18qA0u5J/W46fpOfB4PFPCI0Cg1cxjdwRVWEo41FSy5txnLkG77bsmIrguCE8rYDM2FLFmtRb9CYYnQteduCYqh7W/bd8oKJ4htAHxJPDM4ThY819FoRLH/4SYAmOVUcSkpo8bhiPDs+nIM98d1txSq9rH9euQLMI7A8DBY/ew== 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)(48376002)(64706001)(47776003)(50466002)(2201001)(50986999)(229853001)(5003940100001)(6806005)(86362001)(76176999)(85426001)(105606002)(106466001)(46102003)(11100500001)(92566002)(87936001)(77156002)(81156007)(50226001)(62966003)(189998001)(77096005)(68736005)(5001860100001)(36756003)(5001960100002)(97736004)(107886002)(5001830100001)(5007970100001)(5001770100001)(2950100001)(4001540100001)(104016004)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0301MB1307;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;CY1PR0301MB1307;2:DjwGTqTPIuY6YByfKTqKa+W6J3CffaN9TAbq16FIvHwM0VAUSCBg7I7r31U8A631a3U4yAS8pLMupyT9eJZmXmME6RCl0Uiwx5D3yBxxeXT2wDPl4lzAbvqyZ7IjEqSWqJbWSY7fYW4Y9a5wtGcZ8KG5Gnh8M7mxyIkqsR2rlUY=;3:+CN+kGkTsdlejzDCYm+XjlZb+TiLxdhFazi54KcJzLAzJ17U41KJ0AcyH5KV5NXVGwGdnZ/n5xEx8LPGJ3TNcDAjx4MDYIj++hohp3qjbQbCHneK9ujgimiVhAswJ1iF/FrN1kaWW4yCOQjZnWX7ArU9ncH1IsmsYP9t1rJB7ez7dnxGl5Hq8BcdwYz9lBBJ8c5GnXinKwXyxZAJYxbTORtv6FbYR8sdbScS5RySQlw=;25:icfAm80GLdn01AZruTRHuQhi/NX1KeEktB6iwaLRkP2ajY71Yct1PyrdZG5kM4deR5rYqvCIjG1L8RaAeub1LhxZxf2WAmXV/WBjLUL4SPsTE809V1iVSOstYyf32dKZxvG/mIVa/G7AFwAhqSqqjakvC4aSwyaoaRO44h3fUsFWIWhEPhJrmMsuBzS2JnFiy4/a9UzCku8XGR7xlNwanR9M+YhcMgtl88KoZbR2XnXZRSHtm1rvh+QaBj6hyKzFUxZVGwGtTe9Zb2I5ShIZQQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1307; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1307;20:Wh6BFc3LPsxpX1VCG7IBlg1egxdFKpK0nbMsMKg/oEAsX90G4IM9bbdqfpYcCnynROe4fy2QpujMmWiRJPSX4j0Lrvlc5EMoQuwbP4+hYmnJxnH8eGPnOyGg0RcSrMUmgC/UAZ8xhSxE1gQKggqeY4RZclMSFO8091ogWTcPeEo/+HPmSeTTJIUXzswop9DHiI/9Dgoe4NH6DEsZsyb4WqBTb0ducA00lm8BqI2hxaBSDendx92XOzLjv8a9olBS02BExviHjZTmW2Dr5jXWp6IJnOSUYyXTPNsr9cosWCQ2Gx9eEuN685jPxGXNLYN/aL+a8fLoG6BTkfzMYU1Xc5jDfAK5cQdDJWzyAHGC5eo=;4:abYUBykxZ8wv98WgcUcUKp56uR80MGvc88XUX7LJoBmHX3FBKUFdt/h9F49M0eDVjfDqY6XXc0IkIN4TemgaVe8OxcGu9Azl03xUkeppdOr2h1/jZeFjthSDJoLRZjd46V1evJ3afFK5D1ggkAjzaaq7iWlZ7rtSpSBpHqLcHOsNeTA+iAsaZBVcGCwvPi1G48fIpUcmJbfX6H50EvubrKCSQKpANI2zY+4AAn7XOj6QHTwCQjGlPfJG304X2E24AP2wKCcP+bLJZWs8LYgmLcOnKEQ7Xi4eyjB7mythv44yrLObBkE/w/hUKRtX8Qb7EgQJJ74MSQio7SGI4zq5cxz69jTeeJDiOzNrNTTUpfg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001);SRVR:CY1PR0301MB1307;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1307; X-Forefront-PRVS: 0707248B64 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB1307;23:iYIpIbmCHeqQq/nTVNCAfbqLKs+/oNQjeTVJ7sL?= =?us-ascii?Q?wwhTXzAoQkDIe/3eVREmxv865k1SuYLV7vCdy6EF0dbdnx7dV7I0dHAttns4?= =?us-ascii?Q?+BpcAcLwwRtIR2L+mJmFcow/hP7cApElZa4pfLi0b3gecSb068NTJfLBefN0?= =?us-ascii?Q?An7nFBiUd0lb4WxRVbHan4OM/H2XU4PSQ/Wjel/ZNrJXiwC/386QxSkhQSWk?= =?us-ascii?Q?rQnbOvbwwSIL0UXubHijZ/gWIs/SINrwOPamzSJJ0YcZ9nrMoS0HUA6JPX6n?= =?us-ascii?Q?Z5ZhN2rOipG3loQ+UKv09yHJAR3Fm7m4XY6Kh45k9cqiSde6S8e3Vw0CisQH?= =?us-ascii?Q?1GifJbEaIgcHo8e5NOKnxqlOrzrf3P2nIFFt3EAOmhLdMMNd71YsJ8h9jseB?= =?us-ascii?Q?pGnOev3Zqvx0QuS7xODz+S5zWiCQDroAevbYAlyfSx4FLDoQbwrY+peziiI7?= =?us-ascii?Q?KKaJFQSbdt7eqj/rZie0J4UIB1U/NU1GoUJlP6w/PjpJLYDg17TZtZA5tcno?= =?us-ascii?Q?BPgXmNwbc+JUgcbIzbyDBAZOVnEXDtpv8n4JF+g4EXxe08DqPEnygaW13WPB?= =?us-ascii?Q?xyu/eZX2k444LpUrrdJPsrX9iISTltrzntrUMIjd82zlgUo+CirM5RUH9Uwk?= =?us-ascii?Q?rpR/wisd7lVMZSH5iVgBAlXjgTcqOSYQD3/ciydBp9lBN0I2unA/uqlEwJLA?= =?us-ascii?Q?26HMDBG1hhFv/XUMBGatTYATm/Udf03pNyULzboJFCjN2Ku52l0L4VmoAexD?= =?us-ascii?Q?N5kQWVpFD6dZ+eJg3aP4rJaiSNxbzXt5J4d7c9BsS14QbAyneQPECyr2QaN4?= =?us-ascii?Q?HCUZtbVZpngu29kezA3vEgYIYSSPXU6AqNNJOeQ0mTjEfwVWpOfKFl0Df1dl?= =?us-ascii?Q?+xj76TaDQvKA9/qiCMegjhTXGfCSuPTWaEstfXNYoMaqDpJkvE6sEY17feyi?= =?us-ascii?Q?ODJSK6dgHx4kh8RYrwPj0j99ysPWhRxMTv49nsi9qN+/di4UzloWR4pekZtH?= =?us-ascii?Q?iR9qCKazqy6za8F34Nn3y4K61Tk28/w0VYUHPG6k52BV8EomT14Yh6UBgONv?= =?us-ascii?Q?y+f4ez+0jc1HfqjTH2EiOm3yI9KnwktjEZDcnXIp3+YzOruVcsd+ZryZigFq?= =?us-ascii?Q?neDYDdHdWG+AK7Bt5c63B+at3Da5zrdZ3QopeI8AvyBHkOcKTGWfe6eWFe7E?= =?us-ascii?Q?GxEemM1mKhk7W+Uc8cm5Zcw3xqrPXXKvpAkSS?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1307;5:w26prKecELK9ucZdNC15yo6bA5SJDemIdwS6rE/o3cr3gkrU6ddRzgyV6S3+u6PGNTybn1nJBP/IB1f+FLRkh/U0j0k47lDvFGfFwrZVyk2TBbePD/pLEfeHPWtDzuYWNq5oucXZW9l2FxSxdE9lQQ==;24:bFX9yS//Bzh09/IP80F2ztXh87lFBdK7Pos2FuAaQvHtONxgyBtq6tIrjyIBdzMA0OfDUnFft1usiQDq0tCqBNuXeRR5Td6/CVlD/3h9cCU=;20:H9sQOBmFhrsGrAaT48h9r6gkUdk75NnczN9wiaXzjYEPn/oo0BZZTQ5WXON2RYJjU4yf1AdjbjfivXMUqHUYPg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2015 23:22:59.0186 (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: CY1PR0301MB1307 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