From patchwork Thu Apr 20 20:24:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary R Hook X-Patchwork-Id: 9691227 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2434C6038D for ; Thu, 20 Apr 2017 20:24:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17CDB28479 for ; Thu, 20 Apr 2017 20:24:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C7DA2847B; Thu, 20 Apr 2017 20:24:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC19E2847A for ; Thu, 20 Apr 2017 20:24:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033656AbdDTUYX (ORCPT ); Thu, 20 Apr 2017 16:24:23 -0400 Received: from mail-co1nam03on0054.outbound.protection.outlook.com ([104.47.40.54]:6512 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033360AbdDTUYV (ORCPT ); Thu, 20 Apr 2017 16:24:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=BubfVhl/PuIRED07E8q04S3ZSz4GWM7axZ184DxhDig=; b=xzvpXSs7dgJtoCyg8YGov74ZEQ8vVku6FOPoOLd12MgOXUMczPVOoAZuCbLsDfJX/aunSBtu9VqstEbExBjKvbenI+IEXY30k3T+SYXzQwu8pxIj/B/zMOGBp43QSUasBiLuZ1+7GB5rQIKNfypdEju3CIwMg9n9KJxLfwp2Os8= Authentication-Results: amd.com; dkim=none (message not signed) header.d=none;amd.com; dmarc=none action=none header.from=amd.com; Received: from taos.amd.com (165.204.77.1) by BN6PR12MB1313.namprd12.prod.outlook.com (10.168.228.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Thu, 20 Apr 2017 20:24:16 +0000 Subject: [PATCH V3 1/2] crypto: ccp - Use only the relevant interrupt bits From: Gary R Hook To: CC: , , Date: Thu, 20 Apr 2017 15:24:09 -0500 Message-ID: <20170420202409.4843.6474.stgit@taos.amd.com> In-Reply-To: <20170420202030.4843.76826.stgit@taos.amd.com> References: <20170420202030.4843.76826.stgit@taos.amd.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR13CA0005.namprd13.prod.outlook.com (10.169.208.15) To BN6PR12MB1313.namprd12.prod.outlook.com (10.168.228.7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c97444e5-6c6e-4e13-024c-08d4882b38c2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:BN6PR12MB1313; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 3:gdY90RyZDiyf7fsn3GagnZC2j73Rb4RDVwz3AThd4LJg5hdjc1xUf3vKidgaab34jQVIcpWJ06GGpwWXlLFxT+uWIP1rD8s5Jf9BiPIo5Wh8bNk7feh6x8edJdNgEzC+iVlDXKh75/+MAlzwE8j8ItOTMGMq0hqBsKOaI+V30eOZF7lxyWtIltFaYgNnZ9zWlgxnZXLo8A1uMcfFS1/NTk7yWng6Bv3Wu10FBewIOEHw940olClOJqvNEYgY4MjpgI5eR/70yT6D73rsb2GuCB3/HOvLb/bQqkxiD+nEt4tgLHzUVXWsy8G/wxf6DT2WUZ93BgyIuof0gzTJhokV3+b2vD7+B3i75Rik3L3VMD0=; 25:kjP91EXmJFq73cMfF14n3ytfGmYeuWo66p2YXraBKi3YjPDpBpiuSCicbYUDVMzRtHLM+zt2DsjowVeAj/NEYJabYaXKh5aSjHyhjFcAKvIflOqbVQ6/KFrxXehGTx36/KYsl7QdG0Bn5oLo0KIA9DA0sWd282Kkbo+ZPp1HetormNiQi4bjHsJ/TCFSbjFifvpcs1DRrMdEqbXPIoXZ7807BnWzJOGgsWPgEk2perZdF7UbE4sTuv5igreQu1OysF9+5zUwaoqgxGcKPQxjYLNxygTkopYnTiSYjJmLJypWRXmTJEWMBAhLCx/eMt7pQeUQs/NdRmyoVcxZs9/DuTcNQl46tUqS8rmaXdMyBHi08jqdffbShByLEcVV1enrqIjTwE741lMvy4+iTjSlzsYy9hpqOBZFZVDblHlcdW+C0hIR6PWlfQ4YxShDxK7wM1N4jnsS2FQFZNKB8gas7A== X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 31:tBqnJ1n5hM4DeY1Lrzy1+LLinlB6Fk++hr4wz8/4CnprStD5XsWzYUCd58ozSXHYsfwV7KVo47Rm3WuUPUJW7br2uzzWFlGKjfOEt46CavPVHHNFKcCB0fqQa8D34PW8g2v4sBMi+qS7oeDEL+OTtPISku/8XwUTfDfe13+KA1KgGrIu6QO55qikeegm5CKnLX5X888GmsmfAgm51GfACDoswP8fEiptOX/iy+hRsPZDtHtf5JDZV5/qgm5XHitt1x6/Ak4zuEkLhMWggKmqIQ==; 20:QRif6UJj0+uTiBjsZ7yMyvJ3E7dc7WRzguvvGVIt2guTKAQMEPSMLrwy8gIb6JyLsU2walbRc/pdvJR9XUVQa6HAzkI6wtG2oWpIoWn2Yq3Hd1Fe2rL6uB4m61cZ5B6IsekvXvt0dtxuvb0WqY29rv2ewIH9jVu3wnkMpenUgO2ciJdba5ymu3A8ctC2T5nxC0SKv7RQ3ZFxsvHo1vTakHjtmU7B3RdpL376Zh5Nggk/VSq1K+94gMTJGS3EO5puCLEqr/I8nbqlT7kMTVceDO9AnkweC82m244PBVlMzB8aVENQ8HJr60eGx0s6bWRfiwBAKu+i0wJR4uLaeHqIASYUhZitEvI3qgVgXhUjCVnD2pJ3NUuQypxcLTwxImRPC9zznNKKCZW2F7vnvpu5AV/U4Xdl1n4nz/KLDLN3IN01PL85UPezEzrtG1BcprbdwVLDrhOAG822xPKw9ewqUGCgd4qfm+Sx0lVIC4NOxGMDGGRQ6HkxgiLwmihGJMvI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(6072148); SRVR:BN6PR12MB1313; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1313; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 4:qrN6s3YwJRNgJOTXJRYuLuXW+9G8Zf3NQVZc0grOinElY95dKyEGOjEjtKOW5dlJfpGSk+R6VhuJynkTRfYj7T8ZXTqqL5AFyvxh/eKcb7vosJkdhFSLIjHcrizCNi5nrsjwGn4AJCWCWHA+HO2kanvoZiyl1XW1rXB0WvDbbsxnqA9zwlW4kqWS5+KzVQNv24I4WMriQrUKdoSDRVHvJo0bW4eEY7OfzPAdMwT2Vc/rNCZp72924R1puAGlkWmkomP+RT4FaxiTHi4P4ToyZw2U89Qn2gGKS6SQ1NZMDK1NPAQZ89BNulkA3yCb9L0HqRo9zqOTvEi7KR+kWxuoM/1THRTZkN9VGuYLPXIzAxhxt2SfyUu4+3YH4i12jCkaPNkjzUR2TAKqLj99zQcJqCu9kfoNTxvTEPyPW3wO93F11po9UlSurHvIVmDF/mv17xbfnebfCR4bfqfInA8pN7H/5ukEEMnC5mRBKav47KCWRqTNMat/em7MwMVvsw9KSU/FVcHa6t5sjF7sZyINUKwTiv/1MTjbUJM4AspGLMy0cWDssHnZFTi5BVBJo8IIlX1rUDjtEwPQ7xsiQCASvVABaIegAo+MfnE/p1bCMpVi7Rll3mx0rP+K2CIVm/Mq68N0X/8psQ/TUhlFIxVDhh/VNUg1MmyibkGGOuLzVsh4qkk6tZUxUzQ9tv/JrcpZ0qzbNwpEsKBepzaS1OGzONNAVigP8+IBCKqlgAQv7mn9snXlWc6k5zkU65PoLDeK1WmAdSULiKzusmOYrY7H8s3kL6LFEgI12wdWxOM7Hv6qbGXU6wSCINsxKVf6ewFy X-Forefront-PRVS: 02830F0362 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39850400002)(39400400002)(39840400002)(39450400003)(39410400002)(39860400002)(76176999)(53936002)(55016002)(4326008)(6116002)(3846002)(1076002)(6666003)(38730400002)(110136004)(103116003)(97746001)(50986999)(2950100002)(6916009)(33646002)(189998001)(2351001)(54906002)(47776003)(66066001)(54356999)(230700001)(53416004)(4001350100001)(50466002)(2906002)(42186005)(7736002)(86362001)(305945005)(8676002)(23676002)(5660300001)(83506001)(25786009)(81166006)(71626007); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1313; H:taos.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMzEzOzIzOldBNFpIWnpBUU5wL051Vk5vR09zWld5ajYr?= =?utf-8?B?M1Q0MTNlclNaU2FZYUYyZTVWV3JZVWo3TEF4YTUzcGx2ZjZBZy8xemQvemRT?= =?utf-8?B?UWF4K1JST2g2dUUwdnpGUTJudExETWFlQ1Y0QlNLNUQ0ZEg0ams3RzVqQXJ1?= =?utf-8?B?MHJ3dXlOb3Z6UXgxMnpkYWtJQjEzM0JqU204bDdYdVJRMXVZNENQZkxiM0pM?= =?utf-8?B?UjM2aTJoNHBkZ3dNeUVVUGNhazhTM3l4bnRoS2EyMW02blF5c3E1V1EyWGli?= =?utf-8?B?aG1ueTAvd2lmVUg2U0ZnaU01RzVjWmxoZlp6WDJYSlNDb1d4djh2ME1oMFMz?= =?utf-8?B?b1RBZXhEaXJQekZCaXp0QlRzK2Z4QXVVeXd2dWI4dnBCRWpyaytpckd4bDA1?= =?utf-8?B?QW9VNGh5T29Rdnk2bUM0SkExMmh6RXhacC9nT0ZNdkp2RWlielovUFNNT2JH?= =?utf-8?B?b2tWZjVqci82SDVzVTFSdHpBLzhKeVZuTjNVV3RpSzhvZVZWcXZITkRZS1Fj?= =?utf-8?B?cTZWZkhCSkllZmN1aldKNnUzb1d2cnpjUDNELzJtTUFNdFBuYy8wYzhtcDNM?= =?utf-8?B?YUIyc1hPeW5iVEJEM3grdjlkMk5VaXZSbmtkR1A3WDhVVlZ5cTREMnRnT1dO?= =?utf-8?B?WWorejE3VFIzRXJUV2FXWUY4S0pzR2RQQ1lMdStYY0xRWkFnank2VUlnQ1gx?= =?utf-8?B?eXVmU25WUW5aWk5RQVFaT2I2QjVSZWZNMGdjbDlDUWFqWFN5UFdhNEVCd2lp?= =?utf-8?B?bXkrSzlCVzc4QnFqN1IwZTFBdnVvNmpNZEN2dnNUTnVzdGxqdi9XVDdpdmNE?= =?utf-8?B?dW1wejRZYStsbjVMOEJaNDZmOEg5eW1aMUJwMy9ldXVUZVZHaHREeEpDcHRF?= =?utf-8?B?RUE1MUxoeFI2OGJXWXNkOVNPejFzUy9IYnk5QUtCL20zQkkrK3FxRXhJYlhE?= =?utf-8?B?U1Jkb2FiRFE2SThiT240ZGtoWFYvQ2xZMmZxYkt2VHRYWVhOWHhTS1hkVG55?= =?utf-8?B?b215blFMWDEwVUdQN3E2STdENkcvUkN1MUFkQlZkSE42Q3VtS2ZwanJ2Zlpp?= =?utf-8?B?MWpqWEI5MXkvcGxpN1h1VGhBeUpicnBNMEFtbTYxNmtjYW0wRzBkQVI1cEtJ?= =?utf-8?B?YzBhQ00zSVZydEdPa01OOWpiN0hzQWMzczZiOXV6eCtjUXFwUnhodmNlWkdt?= =?utf-8?B?bDNWN1dBdXlnWjgxQkp1U1NiMUNvYU94RmRMNlVkN2I1dmlPYm0xMzJnNW16?= =?utf-8?B?cW9rYlNXVHhyaExuVFZVUUpKUlBxV2hpK1BCd055NHdZMVFCTGdoOUFHNGl0?= =?utf-8?B?OUFIOEgrQi9JekF1VDcwQkxKc3MrWVJycExuVkR5RFVQVDh6SjduYkVjWDBO?= =?utf-8?B?bzQ3L3pCVld3dHVJekdhQk94RHA2NGx0QWxEUkpTN2JuVFJXQWc2SDJ3QjBq?= =?utf-8?B?aVg4Uno5ZWZUY0ZPU0RsYytjL2ZTaHRhSlZoYWFLTmo3V01tdTU5WktTVGpk?= =?utf-8?B?UWhxMC9ybjkxZS9mNzI4Zit3Q3VFcHBVYUJaWWp6YTl0bGtTSkNBR2tpTjEv?= =?utf-8?B?TlpkTUEvUDhpcTJXcDdsK0NhTmUvR1E9PQ==?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 6:f94Bfl3FnHjfZ/x4CwAEjQ+e1ppo1Nsxdn87Te+Otjvq+dXxgTHU15fPxqnaCoEGlbuElljmi0m+t25AoZOlEXERgzkPCjT6aw0xjgZxLDjRehEv1nIobqbIsrAnrT2ntQTZP3V0y6jWuNYvYL284f1mQLCpPe6X/suelQ/qjkAWIprjQAbK7T///QHWaNfjoT5k8kBc05eo9GfUACiJ3XNIXaI8tKDu3Stnx4d2yhcuVgmrxGOO7JnB7+u1LfXCjBNfIhGufVfpoG3HoFTOfVAGiShob3taBPWYGl1bfCuLzeeiP3G9W+9ZMOSfoq3OURrxN7nOsvyediR1/UbXqCXMsGZHCiOdRfg/ULUy/SgOOTLdA3XcEXLEk2vsC7lxNj34oxdA8D1S6OdS2F82puBKW59U5GI3DGyRpi8o4fOfN62Ti0hx/P4MxIqkX3SAG4lKa8e/TXLZ+Im1XNtSff8/cKakxuFN5aHtcL/Mn3nuNb2hIOodeyU3aOXR2zb7SYpBdmR9tbBqPZtyh3aRDzZFtVjZxwq54helfVdOsCk=; 5:Czoq0P+PFaYVhWeGI/RCweaCl2YlD5KrqJT1ncDtMG1QRzYdrS6lnrCB7dtVuNX1+XLwx9G0KaDlHr1+L6tBeSSnGxDuQ9bWZ0BXbhGuXbNvMLdIIVp+GMvZK/P31aEm31s78AIZTW0SliD+BYZbHQ==; 24:KdjGH7QEIh/RAWIcZx5rglyXUMdrFLRrLW+BhB/qnTsuLKj6kavGX9TXOFta5dh90Ov5xCvNLQ267KiGDyN+L+h6wvc94680y15VsF5HaSw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 7:w50a0rB5/ZrP4uk3lh/TJDgrfBFE8Pqd19O1A4OKdnhsHqy1j9CCtuMco6K1BX0QgY8CIzC1l3sW/D/7FpNX8UPeMexO0XQokU2bUPvOkPxVWb/Op/RHkpFYrEVIu+DGfNr7ZL0F1BQrIv1JMf93Jaoh85jzB5zrA+gsAXildPuB3vCWanufSrsCbuaGvKZMUny/DuiL7hxFD6lP0Ww2XsxM414z9CN+KOfmtRNDLNYfJbzM8j6DPAImbQeD8/lElwC8PxSgqKd7CxWjYbZ8u56fEACbH18LJNQHIoeYkLcjkqPm4F8u97d4/6AmSlFVbrP7q+vTBZenWhWumFR0XQ==; 20:gZtGTQRgraimTO1gqSSrCjdO35kHombQANxr/5Xx5lJ7VvdINjdDYbRknXEkdxcIc0bxpP7grp6KL0Iv2aE1THUbly2VKeM9FXVREfTD7P3/szP/gXwXXly4FzqZZPmvTnbtnm2si/l9gbZRD518SEN5b9dG3V7xBP4XfetFjpiMo76bIY6cf3PwETF0YSCOWuca1l4Dsk93OxbKla6uzEMb91Y9CihlDS1iIDw7mUtREsQJcaqAB3I7+09rEqLJ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2017 20:24:16.5187 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1313 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Each CCP queue can product interrupts for 4 conditions: operation complete, queue empty, error, and queue stopped. This driver only works with completion and error events. Cc: # 4.9.x+ Signed-off-by: Gary R Hook --- drivers/crypto/ccp/ccp-dev-v5.c | 9 +++++---- drivers/crypto/ccp/ccp-dev.h | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c index e03d06a54d4e..c7972e733e43 100644 --- a/drivers/crypto/ccp/ccp-dev-v5.c +++ b/drivers/crypto/ccp/ccp-dev-v5.c @@ -801,7 +801,7 @@ static int ccp5_init(struct ccp_device *ccp) ioread32(cmd_q->reg_status); /* Clear the interrupts */ - iowrite32(ALL_INTERRUPTS, cmd_q->reg_interrupt_status); + iowrite32(SUPPORTED_INTERRUPTS, cmd_q->reg_interrupt_status); } dev_dbg(dev, "Requesting an IRQ...\n"); @@ -882,7 +882,7 @@ static int ccp5_init(struct ccp_device *ccp) /* Enable interrupts */ for (i = 0; i < ccp->cmd_q_count; i++) { cmd_q = &ccp->cmd_q[i]; - iowrite32(ALL_INTERRUPTS, cmd_q->reg_int_enable); + iowrite32(SUPPORTED_INTERRUPTS, cmd_q->reg_int_enable); } dev_dbg(dev, "Registering device...\n"); @@ -942,7 +942,7 @@ static void ccp5_destroy(struct ccp_device *ccp) iowrite32(cmd_q->qcontrol & ~CMD5_Q_RUN, cmd_q->reg_control); /* Disable the interrupts */ - iowrite32(ALL_INTERRUPTS, cmd_q->reg_interrupt_status); + iowrite32(SUPPORTED_INTERRUPTS, cmd_q->reg_interrupt_status); /* Clear the interrupt status */ iowrite32(0x00, cmd_q->reg_int_enable); @@ -1002,7 +1002,8 @@ static irqreturn_t ccp5_irq_handler(int irq, void *data) cmd_q->int_rcvd = 1; /* Acknowledge the interrupt and wake the kthread */ - iowrite32(ALL_INTERRUPTS, cmd_q->reg_interrupt_status); + iowrite32(SUPPORTED_INTERRUPTS, + cmd_q->reg_interrupt_status); wake_up_interruptible(&cmd_q->int_queue); } } diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h index 191274d41036..2dfec019a832 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h @@ -109,9 +109,8 @@ #define INT_COMPLETION 0x1 #define INT_ERROR 0x2 #define INT_QUEUE_STOPPED 0x4 -#define ALL_INTERRUPTS (INT_COMPLETION| \ - INT_ERROR| \ - INT_QUEUE_STOPPED) +#define INT_EMPTY_QUEUE 0x8 +#define SUPPORTED_INTERRUPTS (INT_COMPLETION | INT_ERROR) #define LSB_REGION_WIDTH 5 #define MAX_LSB_CNT 8