From patchwork Fri Jul 21 19:05:17 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: 9857511 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 687FE600F5 for ; Fri, 21 Jul 2017 19:05:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5557F285B7 for ; Fri, 21 Jul 2017 19:05:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48BEB285C6; Fri, 21 Jul 2017 19:05:27 +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 8B558285B7 for ; Fri, 21 Jul 2017 19:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754141AbdGUTFZ (ORCPT ); Fri, 21 Jul 2017 15:05:25 -0400 Received: from mail-by2nam01on0057.outbound.protection.outlook.com ([104.47.34.57]:43409 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752811AbdGUTFY (ORCPT ); Fri, 21 Jul 2017 15:05:24 -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=++eNhcEefV5BsHYBpwBGAi3uAzALahma/6g4+hUp9Lc=; b=He205GhIvgjNTCRV6JSXh8g+5OKmV3zsnGrwZImNm95RGIXsmffnBuGaZX/tqu8Uvc9ZU2Lufb25nqcvs8db1SpKExUSAKuszQqkyzM7qbJXPRPeHxzfGEWKTxXZEsGoNBX9Uk2Z1R57EosWsIi5TBsLCUlq0vdWrdJIz1BMq+8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Gary.Hook@amd.com; Received: from sosxen.amd.com (165.204.78.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.1282.10; Fri, 21 Jul 2017 19:05:20 +0000 Subject: [PATCH v2 4/4] crypto: ccp - Add XTS-AES-256 support for CCP version 5 From: Gary R Hook To: linux-crypto@vger.kernel.org Cc: thomas.lendacky@amd.com, herbert@gondor.apana.org.au, davem@davemloft.net Date: Fri, 21 Jul 2017 14:05:17 -0500 Message-ID: <150066391693.49973.13009982918500791325.stgit@sosxen.amd.com> In-Reply-To: <150066355075.49973.1565434199212056832.stgit@sosxen.amd.com> References: <150066355075.49973.1565434199212056832.stgit@sosxen.amd.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: MWHPR14CA0002.namprd14.prod.outlook.com (10.173.227.12) To BN6PR12MB1313.namprd12.prod.outlook.com (10.168.228.7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4fe0a2cf-bce7-4a9e-6f55-08d4d06b6f5e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN6PR12MB1313; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 3:aLrXg7OKp5xQeyCsoREFAar7VuMJroaLNA/xYEevOKvFwtxkI42sMXq7jtxBopqWlA++UCZSpmERjWejq7synn1bgnt8e6lXXzy2ZqfYCXXyCFqShuWOLiLA/Crh1HC4ctdQtXUxsitjERSUOTUUIM6GA3bi+V+Qpc8fPTc1OT+uOzOfNN+8SFtkKZlyAamTQQNedQJt+ylqrmm7SQ92bRis7koyFXDyX62FR5Tvqgapf348yYoLJHJmK20j8v0U7J11EwZ2Nm7Vi9wrkO3zd6Ujr0jlxChrW8BsPav6gMDR37hoq0oK42ZhNOKLOIwJI1lVlUGFKM1oHmWv0A2EoM/rVkWolY+FIxa3VYgwOsqRC1L+g/t2Wq+9FgbebgmmHqfRDY5mkKl6RgEB2alFW4e3w4ep8jrni0MUWIfuR9kuat6VLvBMfHrXEu6ZeVSTSzVPnsttKfWcld0bprcJI9OJrmcyFw1bKaHGx7RJkiuyPYgcWrYkYHKQdgKJYyJQ4+dv9suc7K8LBzKMVjj/VUHlu+1bhP9YuJuVI0r8L7QqR+Jbin1JYaGn3ZjRQKIefPeyCjRWI/rl5KJ4F8WynI13woWjhONge6B4Ovb/+bYib/SnD3YPrHHstSqKuwildBwQ35eQ2p6T8hIKXSPkLUL8zhwTD3v+nKOSzBNnP0FPMtI4k69nVTd8RS9ZnLiVfsztcUN17hOkyys3LyfcgTiD+Y/tZhnbdgQW9CFSI5uPo8XOra5bbJo+WxnNbXAZmZvzgBB2puk0S8DHefxfPQ== X-MS-TrafficTypeDiagnostic: BN6PR12MB1313: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 25:uOBCFvIc+8HxD/jkCoY1Fvj6gGge0pEeIAEuvr3ae9lRMjyHnApXXScxEh3mVfhRwtaOxgmHtG1JtR7CW+m4izA6m7VtHaDP3QVqxzcSrATlua8Ku25jNQ1iOix4bGRmN0XaoQOqOJz5x0Q2GCZPonvjOqN8s+vzhc+UvluCI+AWIXUNw02zNRkxLdvnOXb0wGaGycbgeSwZwPWcnBhqDgqQhg/aUWf+MNm/rkFfiPVKUMhLqq0frkiEsdn4IjgMEHIPbVNGd0f9tJOPdMVCfi0+g7JV2ztaT8MPag5v/Wt/dBvk8XDmivPmfpWVVABjqSp0sDpg/IN+Keza3fTopNK9gcu4mHh3Q+9Qu67NxG0RKGDTi5ZMCWhu+jBM8nZfu7Y86nxVr/WGfa+rcYafCBqyM/AJMCERg8GktBX0hSotha8r/hzvQ5vPw+A/zAg//+p3xNQwxon6VMKue8nKJyfRIgxY+GUmBLcjgO+3umRWh/8VhA9hPJN0OjNhyf/iQgQsWCD9bFHujqdUUt1aYl/8cS0Ad751p7AFIlM2IUsa3MfOHR1d4NegOPp1Mi/ty9sVU+kTuIXq0OegxjZh+Ro+Xk2qQ9J7I5ZEKmweaHoDaPeWrUIrAo+5NuAB5ueLUCZStGKFWda5txaO3FPKeBtKU2JPFhPeTe7P6B+gQ1ZEfU1Dxum2S4W4KP3k068QlCHQU76tPke12DHP+X39slv9C+nMqXT/jhnsr9Im6Jy4CkuNBmpH81ANVuzhoR74MRbqPKUtYeLqrk25olvxY2I8KiXr7mGGZQAHbYaA2llqb2akuqvFADGtfG1p8M/SKLceujknOtD3dRhtAPxSGdBZSJRq8Aaewd4gq0MNU6tLT+vqkkB7RypbYUQf2i0fVStFG5RqCSg7K81UBcaB0Z0k82uYmACEKL5vBDDKA W8= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 31:HVArYhlmU0fEPMCNdII69Yl5f4lIJ8HOjXqnWfRfGNP3+wFUUxOL9zXwh6OEk+ujWHAEAuWQQZFN7VH56nvjy21PuWw0nfiobHXJL1jBV9lbTkAdnoQGjTF4+XRjrUIyu7FtU2XICOBS3DOUoh70FgNLO6qjynMHEhlItsWsGechDdSEG0bDbvOWiTSt1bMmuf6iS+cTE7dPm/mLrYXCXOLQvV/TFCCxxViIkQ3jpfrc+52jXCjzlTzXikc07JhpgQ7aP4u0EC+jTSPlOQgWpxxbBuj1EXlW16ic7rkqxLI3bvUIf5a1JIYUvBYJgSbCmNbJWv+ZnsOQSxmJSGt5+7ZaDbu5+kPQbCKwBzcngO33QAq+Zjo50tLeK3JFpLbIEOeqiFfexINd8DpdzxI3gv80Kx6GZfBLmknqPKIwupsH6biXTDuhP96+LlPZX91FZvbmBq+UmGIkdBEbGNpQ/JxY6CULL039OTzH5qo7+XHAmFEyI8tFXLyChDEwsnjC/8BMhhxuzUQQFudLPd/RtZpjCELDWnvsI/tTWXuNf9ekD+EWHIpBs5IzPJzeuQ7ZVC9d8pW5rmfs04ZqLtE6CQ4NnVXHaHnFs5cW/Mu0iZRbOd2b2T+CHmeh759PnHV9fKXZb1O1lq01qqW4kQ+NYWw1kDZp58t63TEoG60mzmI= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 20:77KOwo50hCTuVu7LWsW8zEPOzVKG6YFT2mr9v1QnSyS5DcPI4t7+ThYhbWkpgyOAz6CIHDvu3kqr54CbUH02Dsz7wN2/Vqs1UwR0hqY+BM9544KQkaOK10MskoyVcx1aksSs8irN7h0hpo7iktBz5f0Agm6hG3UM7FOejc2KXsaGDcwsLMkCSvJuInckRXPRb0BfhZhEzmw3jNf/h1yErd0loobxTZaX2hNawJ0VoDY5zUa1gNPwkhxO42EpfOREsYTAQnMcSk/QCoBwDRS1b0e9LV4IRF0+wIQJ+A/l3X9GBj19qgFwqeHXCY5X3GtiXGjeEPaF7LojRD6axU4icIS4zPAj1H775DhfxWw/dAaSZI/1La9eYWMzRvHV0bu/U7b0BO1ncnDf0WtPBe/q8tK4tTtdkfo5ZYHrQ8Tx2RO6o/NHh770OBD3zXu9GHGFCkNFS7Jtf5ziS5HLnzj+S2ogKg6gzgLDv2lyT+a++jhtYpwbz4LXfLFD/m1o8+FG X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(20161123558100)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR12MB1313; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR12MB1313; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMzEzOzQ6SU5NRVZjMnl3WGZwRW4vSTBDUEllUmg3aWgv?= =?utf-8?B?eDRncUg3U0NFdHFSNDMvOTBqSWpKUytuckdKVTkxSHhmYzR4WWFqRWJuWkhW?= =?utf-8?B?UTRqcnZibkNFWkNFTnlFL2FHZS9QbXhsWmN4SnhEWVc1bUhlMi8vUUdmSi9z?= =?utf-8?B?djc0NWMxcVBwWDdpQ3N6MzFuM0VOZStBbEpKbE4yektsNEpsQUlQL1Jld1FO?= =?utf-8?B?RXdBK0haRUZ2ZUxqSFl5V1ZHWDBVcWFwdTVxbURQTUNkWmIxbjQxVGN5V0JK?= =?utf-8?B?UlZvQlU4RXJ3SWVYWndXc3YxZTFWUllQa3RENzF6VHM4OXN5ak1DMngrejJO?= =?utf-8?B?QllSRUhUOW5pS2VsL3d3bXRORnZ1MU1yclhvb0RycGpEeDh3NXNXeXo3N3RS?= =?utf-8?B?ZmZBZkVPclN2TGk5ZmFWeDNybnQ5U3piTW5KVGJqYzErRmlLWjNMektmYmlP?= =?utf-8?B?UWdZdFd6SFFQVCtjaG9hVitBZU9yZlRiT3FlUVRHYWd0dm5lRnpsZnY5SXZh?= =?utf-8?B?L3JHYmhmbnBVV09LWEgveDVlM25sR2VzNTAxeVBUMS9ON0U5S2VuT0lvbmdr?= =?utf-8?B?dHpLYUVyTktMTEdlYUVvSTU4RG5sWGY3T0xPV0xVTEFCdEptWFhTMFJvZXZv?= =?utf-8?B?NmtSaFFoZzVweFc4UHBsKzhuTE9ZUkllQ2ZORnVpSWtaS1RXWEYzcDlyRGd0?= =?utf-8?B?Ykg5cHhNZlVnMnNwdTM0ck81S2M4ZGdUNzI3THdQUWdHYkd2V1Z6VUZRMWV3?= =?utf-8?B?dFlKK1J5ZEc3cGduOTcvV2tKYm5LWDBZMngwZUdBekQ5QWV6RzhTaGZWTXJZ?= =?utf-8?B?RnpMSnlJTTBjcGEzMlZVYWx5RmpEaDF5WG9JQUYwb2JycFFudFRkeUlhc1Iz?= =?utf-8?B?WFp3NmVWNkhEUnBkOENraldYTW9QY2lqQjNZZWl6RUpBWFB0dnBzQzhONGt3?= =?utf-8?B?RUZNRGd1UGRNV1FVeU82MkpSLzM0RURPc1hBK0JYbC84ZXVIcEM2ODFMWStD?= =?utf-8?B?MUptYlpOdW9vdmh5aDUwMCswTXZJT01vOGpzRWY4UVdwTHdPTkNuT01pMC9K?= =?utf-8?B?OVJENXd1MzBtVnM4TWNMUDM0NkNqbW5ERXJYZU5uMytVd2h4ckJtSmxxTFE0?= =?utf-8?B?dkNtb0pnK09TWTg2S1VIYVNueFdBUi9MZEduSWlnTkxXM1BlWVhmVS9DaGhz?= =?utf-8?B?azQ3NlYxT1ZKTGdQMHpmM0EvRDhtbTQwYU92OFA0b3V1dmZwS2t2RSsvSWYx?= =?utf-8?B?NmNRcWRxUFo1VTZMTksvOG05MVFDUFdjWHVCVFNYYndHNVg0bFJzdXBqZmti?= =?utf-8?B?YU1vRU1DSk1NVzIyZXFUclN2MlplbVVPUGI0TkdkZm5nR0FDdU53UWVzYXVa?= =?utf-8?B?M2hQd1g1QnRodW93bWRDMWJtMXdWNjJkaHhIT3V1WG5PWkVwTnhkaWNXRmNk?= =?utf-8?B?QndLOWRqcHRndStvejlaWmc4SjBHY1dmQ1VwVW0rdk05ZUlFczA3SG9tR01t?= =?utf-8?B?dTA4cnpxMXMrTmx0d1cvZ1I4L3d2cTR1cy9ZRHppY1E4K1ZIY3RRejRlOTVi?= =?utf-8?B?TEZEV3BhT21PN2Z6Sm5ZblptREVtbldCRk5WUVFoOW1zUVJxbW9WYTdDTVI4?= =?utf-8?Q?If3QJM2IrDPcs3fJEQJ?= X-Forefront-PRVS: 0375972289 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39400400002)(39450400003)(39410400002)(39840400002)(39860400002)(39850400002)(199003)(189002)(4001350100001)(103116003)(101416001)(54356999)(2906002)(72206003)(230783001)(76176999)(50986999)(8676002)(81156014)(81166006)(4326008)(7736002)(305945005)(25786009)(97736004)(23676002)(189998001)(478600001)(38730400002)(110136004)(106356001)(105586002)(2361001)(2351001)(53416004)(42186005)(50466002)(68736007)(33646002)(55016002)(53936002)(6116002)(5660300001)(66066001)(3846002)(47776003)(230700001)(2950100002)(6916009)(6666003)(575784001)(83506001)(7350300001)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1313; H:sosxen.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMzEzOzIzOmt2ZGIrZHAyeDFvT0tSaUVLUVZ4d3NNZllX?= =?utf-8?B?L3d1a05YL1cyMVZDMU9wMnd1cEdnTnFUa2VmbUx2OGhacG5WTzdaL2I4RUcw?= =?utf-8?B?SVNjSy8wK1U3SUVGd21YUW41QXA3cjJUaEpaYkRNWFpHbitYSTJGaHk5Vmcw?= =?utf-8?B?VUpJK3RaU1ZLYkQ4RktWT2x6U2EydUtaN0VKVkk4dUFINkRHaEhJL1Zadnlp?= =?utf-8?B?N3dXSWJwSVQxWmlIY2VxRmxHd3VkOXNnaXZzNEthWlhzTHozSEFGaXhscHE0?= =?utf-8?B?MS82N2c2V09Qa3lyb1kvYmlyMXlLbkkxb3dqVyt3eXhYdmsvNEdTWFlmWGl6?= =?utf-8?B?VDBGc3hPcW8rNkpuR0paU2h0MUhGVG5lRDUycnphd3ZhTUxjY0IydHFwUGZR?= =?utf-8?B?Nnh5V3BHaXVpSFhZTldXODgwZlNOV2taUVZhK0Yrby9VUSt4cFpZamt3eHVr?= =?utf-8?B?SVBQMlpNQUZaeWdIV2UrcmlPOElzVGR6N3pqelBHRHI2bGhEcGRVVStRSjNj?= =?utf-8?B?TkNmK3preHJnc1k2TG5oVlVscFFSMU0zZnZMbm1tcnYvd2VheDYwaWg3aHpO?= =?utf-8?B?Mzg2L1JpRkRuWllCTEorc3NiR01lb1JzRlI3YmpreFk0TmVqOXhlZ3F2Ym53?= =?utf-8?B?YXhxdlFyMUVWMEloWnFwc1hmV0piTnQzUi9PMG8rQmdSK2ZMQWFrL0ZyRE5D?= =?utf-8?B?Q1ZzclJYcWw0SGpiM1MvNE4wdWxIOEdvODUwM25hdEg3U1EycVQvUDlqYXI5?= =?utf-8?B?bXBPdU1FdXp0azdBUmpvOVVrbkFyV25BcmZmNXJ6SVZXTHUzak9KL21CWE9G?= =?utf-8?B?SktvMTVTYVJMRjRlSzkrUUZIdThUUzdZUVBYN0l1WktKdjdteVpZdUFRdE5q?= =?utf-8?B?NW9kTTMyRG9Oa3Y0aVdacmJhU2xXTC9YL3JWNFU0azQ3VkduMTVqUURreXVv?= =?utf-8?B?bFo4T2xmeG9YTThtck1QUXl5SEpFZ1oxcTlZVzJMSnljbzdmc2k4ekg0dVI1?= =?utf-8?B?TzN5RXkvVVNSQ3BjNG44bnUwQ2ZXaTQ2UHM5TTdva3ZUNmxDM1ZOc2luNml1?= =?utf-8?B?Q213N0N1Q1h2SmMzb0s3d1hTdWwwdDVBMjBmKzFnRHpHQUlFSm5uRWZ1RHVu?= =?utf-8?B?QUE1Uy8vclN2R096TjBmT0pCTW91dWhyK0FXc05STHpDd0ZZQ0RYLys5eUkz?= =?utf-8?B?NDI5eFIwbWc0bjhpZVF6VHA2V2MxdmU2aDg0RmhwTGtUdjNxWXZ4UTFySDhw?= =?utf-8?B?NGhXNWVqWk9TUUlQTjJ2eHJIK05EcHRuWHNoMmorOERqWU5EZXdmS3VxOVlR?= =?utf-8?B?WHArQmNlY21NVVpNdVBFM05PTHpWdjY2K21aOExHa2FVdzRla1VzMW9qWGpF?= =?utf-8?B?c1hzNjJ4Z0FNdC8vYlJrVVpsVis2RUVNUmIwYkZCSnJ3SDdwdUk2Sk5HRnUy?= =?utf-8?B?dGY0WXBWdHlLQ3I5cUpMbm1pRzk5bDJXWHM4MU10bjFOeXNDMk8rRlIzcHFF?= =?utf-8?B?SVlSSS9nTlhnd3FBUWt4cDNURXFDYXhubEgyd0lJMXVSZTBNL3I4WGw1UVZE?= =?utf-8?B?a28ya1FzQmpiUFJ1NXRTL0RIelFta1ArV0xTWVhQOWFVQTYxY3FMdHJKbHAr?= =?utf-8?B?dGMwSzlvL3VKSW1zT0MzaDZJTTFIQmpnZGFRSVYrU2xLWEsrM0s0c3BmMExi?= =?utf-8?B?Yk1Lb2puSTJjV05SM2Z0eU1PbGhQRHJNQlcvUi9Udy9PTjd4WmwzQ0dGUUxR?= =?utf-8?B?SklsQ0xWTU5mTHFhQmh5aWRabkc4S0xDRTR3TnJmbUI5RGROZ0pCYS9Ia01O?= =?utf-8?B?TnJCbDRtdXMwWkdnN2VDS3J1c1dPRDh1bDBqZnZlMHJIZ09LTzVsb2hTL1Vx?= =?utf-8?Q?qddXbj6A2FM+zzLnwHazB0MYycAlnjsV?= X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMzEzOzY6RzcxSWZmbHh0NzhFQzk2SVFKYVdjZjBYRzl5?= =?utf-8?B?WlZSNEpWNmtZM1NZTlpLdDd3SXQ4Zmw2RUQwTExlQlJJSGkxc0V3OXZLSU1p?= =?utf-8?B?N1lBUmxmeEZOOElZbUx0TlN4aGRNdVVreHhDN2VPLzFudTlxUG92SlVzWUxB?= =?utf-8?B?RzVmdWg2bFQrTWUva1hBeEZLMy9JZDZ1YTBCRWc1UVR1dlg3T1kwWlJNQ3VJ?= =?utf-8?B?SVVnK3VNQjJ6M1J1OCtvRkl5eFlnS1V1WVBKV3ZHN0w0VXZqMDBpb1JQa0tu?= =?utf-8?B?QnE1WkQ3WmRRcFhoK2orTmMzalI0K1RBVmRlRW1FbU02WGk1RDZsNGRNKzJ2?= =?utf-8?B?NjRTNGVVL1dmWG5mUDF2K1ppUzlhZVE2d2FSdUU0aENoRHRkRUFhbXMwa1pm?= =?utf-8?B?V3FGck95UlVtN2JtNVNxdC9RNUNjUWNvdGlteldkSFVUczkzeWdISEVYTnhN?= =?utf-8?B?cGRrbGluNHNDZ09tTm92LzZkdjZUWFZlb0JyVTJMOTR6TEdzVlgzYXNKZERk?= =?utf-8?B?TnRZa2U5bGY1KzBuUTA5Ukc0bFVpcGtaUjErOUczQm5CK01OTklqU3lEWjcr?= =?utf-8?B?TkxNUHhuN1VRTHc4Wm4yM2tRelpyYjVHTjhHSHU4RVNxNG9hampUWWJwQnVV?= =?utf-8?B?WWFnU21ZRFgwV0FMZ2pNVjRWandYYXJFVFViN1hMMnMzVWtOMnc3YVpvSFNv?= =?utf-8?B?QllIY01DYW5uWmtaYk5aNDFYYkhpUmRlaUkrN2VpQU8vaFN3bEpBVmpwUDRs?= =?utf-8?B?dFkrRC9sazhCbS9BSForTDg0ZXhUVzdMblcyam50anYyMFVQU0wzZUlPN3lG?= =?utf-8?B?aDBrN3VkTzJGa2NpcjhXRGpQMG85LzhuZEdqOUpsRHgrb2ExOGY2elM3bExv?= =?utf-8?B?aUZFcFRqNDh0WVl2M1YxTVNGV2Vvd2RnN3pWdkEwcTNCN1ZnS3NIZlhzS3lo?= =?utf-8?B?dyttQmFOKzhjd0lyQkZ6NEFsYXRydllxRjJPanJtQkJQNEZveVZiMlZVKzBO?= =?utf-8?B?ejNxK2RGdHBwZ1gvaW9nNFNHS0puTmtZa1F2QU8ySGJGWFUzOWZkc2ZDQUgx?= =?utf-8?B?MUpRWm1PWXl5cDA5VDJxdlJlUndBclpFT01zeHd3WlFrVGp5T0hYckdkQmdF?= =?utf-8?B?R1JHOXVwTktmYWtkUG9aeGRXOFZ6U2NVWGFRREV3RGxjS05iTVNXZEgyVTZ4?= =?utf-8?B?RkxxOEhYRktMUU50MS96RGdCUW0zTng2R2owVXkwaUFWcUM5TThvRWpMTDda?= =?utf-8?B?azR3V2dmL1NZV3p6bzdjMHp4UTZDSDdGMU8vbHJFSnZpZG1Halk4d0liTzNX?= =?utf-8?B?NUVwVkN6TVpxWGpJMkZRVkU2MStQK0FSci9NWDZROThxQ1FMNmRYVW5kRmFO?= =?utf-8?Q?uenSpp6?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 5:KKwTL7BiLBksOwPUwdVn4FCJNU35IZav+Ur2lfFOcxKCcAotb3jAEHQN7aqUTI83sCrV25dAO2NCCIkOCmEe03bWUSX2dlaCaiDPjbqJC6Fjt8rhOHEQ4hG6lq8cW/bnOIMw+f4el+JenOOIqYMwEPMwKoE/eGYOFxlrgPFUrglUrTw5wxx1BlD5vDi5zyVzT6YdVRMG/fG62gf2S42KQC/munSdFWxT9xVPrFF6NQ8rPlxu6PSze5xM6tfIsK/g5vekRFaC38JRhSlC158ScSSSY7WyqS/D3qUlpcQmdoiF6xHpcbql3rg7/xZH9an5VISe23zd6yFJtNuYsyRj1Y9GLg1IG1cubgV2cLpSmwDnRPqlVRGG3kv3kM2saqz+Yld9iEaR1RbwY2ya2nAXKYEC4uFxmYeXAdbFWF6OEgdFboZkd4HW5HA3C+azh+vKeKdiuYj5nFVa/lm/T8fM0uAca8oRew3tAuak7AGr2HcIZt90hoJ0MozifClmR4A8; 24:qcd3/ZJLUD4Bx3mLgsQGr6NNdRIU4+sXV7Kwgqh5+jp6nErheMPZ9J4FbrhK395egwHMvRz3a+9D9iC0yZoNb2XEIipjdfeVcV7nHxY9VDM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 7:/xiqqPRBvpyRbh6uIMieYRLQm86kN939WYi+P1Ua9XuyHWSTcZ/e9cWk6eftm52FnQIXL6DTgvqqRMnWh4Ngqnk4HbUokC3v0HIypg0PVKXPieIHIraos1x523Cglg/mN515Mch4svjXooz/m8bJvONTZVZLD6Xk7rnnrzydFifgvcUbMwQzFXYxv5/7ypCY4s+E4ZZ0nbuTZGZvxMu5QyDrs5+SjL8svqnt4gF2bQospo5BS0jQB4uPBpmRcsdnil66PLI16coFM9BWcv8l9Mcb8YqRJ6W4kWcRkKWHT7Hxp+l2lCLsWTX180Sr8I6JJmpt6R9UoSwVWA2whqZ8xyUCqSKo9bUPTcJfDRQ0JrMSbLkNMsWn1mjedWzXDraorLs1fx9d8i4WkKe7Sc7KyqI2Ocg8a+6yH3rYdaxA2epRxpNz4iVg6n+EjHDv2DZGfOQ/pdS8gsPCf9jXXmL/DTjjGt1lNNm8VcINuY15V4w82/fj4fX6VMDoCc6w66b69PTe5TP1U3P4ZjRh6qkVzkJPjb40cq46Dhor46HZofUiFHE2oBnzhRCOSHJP00NmbwvJEbt+0bV+cUZWveJQVUW1eYLD9J++F7Vq6A2ULza4an7yTGeq+bOsARJ5rpQwsD5WAJW4qnJRIP741Aqe13mAjHACqq8tmFpuRePhqU8lVwV6FZkoalWwr21IUPASjryfKjcQLgiEcpSHzFZq/KtmyFIe1vvcfwsncY5fb57IvZ5xE/+9hAw7okHUB7QUYAzha/GJK2XgDaceHVZQCLoPwprMIqE2oVO/gh+yCyk= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1313; 20:Hl0lPyF4cWl+K1xBITm6wbdFhkKkfsDRe5j5v6PPx3Zt4RwQJuEoeiY+WJlNPAd76/OjhutP50A2boC0U5oyZUVI98tTBDS1/w+I6EYb/22nAFufuCwNRiRkOGE2ScWJ+48/DQyQ0YS8ItZvKlrez4quMKDWi5w0ob4Zf7kapNlV5UfJ4jhUGnwNX5jcYfaTADR0ImHC6zyJ9Ah3KQziOXOlZucs29cJ7k64CB7NBCc7Hctji5rIHuYAwJQy3BtF X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2017 19:05:20.2740 (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 Signed-off-by: Gary R Hook --- drivers/crypto/ccp/ccp-crypto-aes-xts.c | 16 +++++++++++++--- drivers/crypto/ccp/ccp-crypto.h | 2 +- drivers/crypto/ccp/ccp-ops.c | 3 +++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/ccp/ccp-crypto-aes-xts.c b/drivers/crypto/ccp/ccp-crypto-aes-xts.c index 3c37794ffe2d..4a3fe4d5ac71 100644 --- a/drivers/crypto/ccp/ccp-crypto-aes-xts.c +++ b/drivers/crypto/ccp/ccp-crypto-aes-xts.c @@ -80,19 +80,24 @@ static int ccp_aes_xts_setkey(struct crypto_ablkcipher *tfm, const u8 *key, { struct crypto_tfm *xfm = crypto_ablkcipher_tfm(tfm); struct ccp_ctx *ctx = crypto_tfm_ctx(xfm); + unsigned int ccpversion = ccp_version(); int ret; ret = xts_check_key(xfm, key, key_len); if (ret) return ret; - /* Only support 128-bit AES key with a 128-bit Tweak key, - * otherwise use the fallback + /* Version 3 devices support 128-bit keys; version 5 devices can + * accommodate 128- and 256-bit keys. */ switch (key_len) { case AES_KEYSIZE_128 * 2: memcpy(ctx->u.aes.key, key, key_len); break; + case AES_KEYSIZE_256 * 2: + if (ccpversion > CCP_VERSION(3, 0)) + memcpy(ctx->u.aes.key, key, key_len); + break; } ctx->u.aes.key_len = key_len / 2; sg_init_one(&ctx->u.aes.key_sg, ctx->u.aes.key, key_len); @@ -105,6 +110,7 @@ static int ccp_aes_xts_crypt(struct ablkcipher_request *req, { struct ccp_ctx *ctx = crypto_tfm_ctx(req->base.tfm); struct ccp_aes_req_ctx *rctx = ablkcipher_request_ctx(req); + unsigned int ccpversion = ccp_version(); unsigned int fallback = 0; unsigned int unit; u32 block_size; @@ -141,7 +147,11 @@ static int ccp_aes_xts_crypt(struct ablkcipher_request *req, */ if (unit_size == CCP_XTS_AES_UNIT_SIZE__LAST) fallback = 1; - if (ctx->u.aes.key_len != AES_KEYSIZE_128) + if ((ccpversion < CCP_VERSION(5, 0)) && + (ctx->u.aes.key_len != AES_KEYSIZE_128)) + fallback = 1; + if ((ctx->u.aes.key_len != AES_KEYSIZE_128) && + (ctx->u.aes.key_len != AES_KEYSIZE_256)) fallback = 1; if (fallback) { SKCIPHER_REQUEST_ON_STACK(subreq, ctx->u.aes.tfm_skcipher); diff --git a/drivers/crypto/ccp/ccp-crypto.h b/drivers/crypto/ccp/ccp-crypto.h index 156b8233853f..880f8acdd0cd 100644 --- a/drivers/crypto/ccp/ccp-crypto.h +++ b/drivers/crypto/ccp/ccp-crypto.h @@ -91,7 +91,7 @@ struct ccp_aes_ctx { struct scatterlist key_sg; unsigned int key_len; - u8 key[AES_MAX_KEY_SIZE]; + u8 key[AES_MAX_KEY_SIZE * 2]; u8 nonce[CTR_RFC3686_NONCE_SIZE]; diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c index 8113355151d2..fbd024f6e898 100644 --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c @@ -1065,6 +1065,8 @@ static int ccp_run_xts_aes_cmd(struct ccp_cmd_queue *cmd_q, if (xts->key_len == AES_KEYSIZE_128) aestype = CCP_AES_TYPE_128; + else if (xts->key_len == AES_KEYSIZE_256) + aestype = CCP_AES_TYPE_256; else return -EINVAL; @@ -1089,6 +1091,7 @@ static int ccp_run_xts_aes_cmd(struct ccp_cmd_queue *cmd_q, op.sb_ctx = cmd_q->sb_ctx; op.init = 1; op.u.xts.action = xts->action; + op.u.xts.type = aestype; op.u.xts.unit_size = xts->unit_size; /* A version 3 device only supports 128-bit keys, which fits into a