From patchwork Mon Apr 9 00:20:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132989 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp747016ljb; Sun, 8 Apr 2018 20:12:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx48KayIWUVeQVT5Ew5k2p1plinG97gKF7CzugV7thDal0iNmKVacL3oH+O6cJ81iqYWovfzd X-Received: by 10.101.101.206 with SMTP id y14mr8832503pgv.220.1523243529006; Sun, 08 Apr 2018 20:12:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523243528; cv=none; d=google.com; s=arc-20160816; b=IjlH8y8ztHSOZOyyAPBvRqZ/AexeADEobKBzph0zYn4Whx2QIIYaGMQhDsxUt7txLG gtm7QqqHAEcjVdznkeMrHmto2HMznthPAPG4UU2w+MNIdWlrGpAuw275YTl6Z56EwAvw LfPkL2H4ng20Ns0By6ArUqzXVb2zxKXfxbTQJAg1KaVXSbVdrB/PMCo+QekwnyoderSt Z6+ESpqc5Qda0qBqE4c/bz0zUkoZbxyRRAN8ThqNnNlWDWV7ahFPurweztqOb/lzMUsS HQItscILZUYfoq8v3GvisaFwtMo8D0UA6cQ1Hq8I/ieRYSTz4ZXKwTyF8ciJWlLo/01o Bqcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=QDiIq7HlLk8Q8TKxkmKX/JAStV+qZIpbW7ub5eSgeQA=; b=0MwLfBtkvgGUF3QeLIa5RcM1Gvj3PYO2rfI7xSDtMZZsnAmUHRkpqrnG3gkxrvLJ5+ 7P5QC4lYLN4fAmpxF1g1mIlt4DrX7e5FQ+J7qz/6MI4+jHYNLw+Wan4Iu1H8qN3ONboe 4PekZpJd4k4iAHpdBJ4L+O7XD4txk42rH3c7jo3kAAJIAkmWVdRYAjauXx+zVjL5qTLP DgDpa3ZpJ3C2v+L9lgSw39i0b8xKL77zqZn3TpVDaU81ghM2dhApwVh2yhDsacdF8QfN KSVwDaS1a6jHxy4TpUo1lcpmhnTZmuxbj+4PpfENNPWZJK8KeqQ1evLrePr+cOYIZVU9 TReg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=irlLpjTy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r72si12015741pfa.338.2018.04.08.20.12.08; Sun, 08 Apr 2018 20:12:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=irlLpjTy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754701AbeDIDMG (ORCPT + 11 others); Sun, 8 Apr 2018 23:12:06 -0400 Received: from mail-dm3nam03on0092.outbound.protection.outlook.com ([104.47.41.92]:13920 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754966AbeDIAXz (ORCPT ); Sun, 8 Apr 2018 20:23:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=QDiIq7HlLk8Q8TKxkmKX/JAStV+qZIpbW7ub5eSgeQA=; b=irlLpjTy5aOPL4xsLf125dZVArp5ObrGEDVx4tSWW9wNfYZmas+ImkR9FqWCo/Iovp289u+CoxywwKsgBCGsm3Lx9nJIMxfK1X0CNJmo0EDQLhEfKQMlFB/LHkoglF/R2ML2kfd08Zd8sErEt8XM6CYu3sbOtFk9dnKYwlXWh7A= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0984.namprd21.prod.outlook.com (52.132.133.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:23:53 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:23:53 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Corentin LABBE , Herbert Xu , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 078/161] crypto: artpec6 - remove select on non-existing CRYPTO_SHA384 Thread-Topic: [PATCH AUTOSEL for 4.14 078/161] crypto: artpec6 - remove select on non-existing CRYPTO_SHA384 Thread-Index: AQHTz5ideoep7nGgHUm5aa6VyoyTmQ== Date: Mon, 9 Apr 2018 00:20:50 +0000 Message-ID: <20180409001936.162706-78-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0984; 7:GQr4DOlTDNKB79iXd78mYg1E2EZop5jTdpRPlAtOwGw+DWOtqaQrIV72k14bZ1+nxzuGaBpDIRW1mQN6LlYaUazT/w0QpPtdmwoF/wCMLIa6ybqJCsJODKoJ2nmTxp0fmcZKotMH31QTLNjdxOOaiL2GZejC0JehW1bZkli3mCxhsaaa9CkDSySQmpC4aqYbyo+HqwrR0B0YD/JcGkiEiKJ3ZiNSY5V6oNYdaVsP8LvgYC7YEbalm4rnwNWQV6rT; 20:hdpLCbiOm2b4Y5ib0Lq1njf5tU2eJIgzhasQdRcKJUfuevTyBO4HT5bIxeKXxEuAyU/JaTCNI7/JPnu+/jxVo6I0AULQQ5od7v925QK1Ob+jx5gxNjyLrt+tJRDTSjqGzyVavpV2HA4b45k8vl/bdaMCIGAW/CFO2AwQb+vy5JQ= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: a55e1695-dc98-4884-4b01-08d59db02ccd x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0984; x-ms-traffictypediagnostic: DM5PR2101MB0984: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0984; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0984; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(346002)(376002)(366004)(39860400002)(396003)(52314003)(189003)(199004)(5250100002)(2501003)(110136005)(54906003)(6116002)(6436002)(11346002)(39060400002)(1076002)(486006)(25786009)(105586002)(2900100001)(102836004)(86612001)(3846002)(68736007)(107886003)(316002)(10290500003)(5660300001)(86362001)(2616005)(305945005)(4326008)(446003)(6486002)(22452003)(7736002)(476003)(8676002)(81156014)(81166006)(8936002)(6512007)(10090500001)(186003)(3280700002)(106356001)(76176011)(2906002)(99286004)(26005)(97736004)(59450400001)(14454004)(478600001)(53936002)(6506007)(36756003)(72206003)(66066001)(3660700001)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0984; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 1+j02U1QyqDQOlw5rn6cl5jxbXzYlUIEycoWMQotL0Byc7idZcIUfNBKnMz0zYgTL6ij9wwBfz8OfhQKGTK/k+vbGS8/ivjoDW3acVsGGb6n2qdp6mPPKs6ykpKOanQaGLHtiRIJGqwiwx6w5OKn3K6rwQBZpeJtFPzxgUJe3HQPf4QjI0FNUhwb4Nb0wVlu6MuBMtFP8XGtsV4zmc8kGPHxo1k7HgrwDHRsXcR/NSKv7xWdhK/tsH2epailKSN4pVlY6lWJ58+KDjWeZUxX79yAcxd3PMiwwFrCsGhSvWvAniWLWFbr761kEw3aOy0Zf5Ft8+5AD2pTTU5CdfKm/5bcMtrev6Ipc09OVFH0J0lco1jRRD2mpGGdqgF1jbUI586w9/lS0o1CbQfcHCg/t1zAPg2tQVJRyf89p47NQhE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a55e1695-dc98-4884-4b01-08d59db02ccd X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:20:50.2846 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0984 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Corentin LABBE [ Upstream commit 980b4c95e78e4113cb7b9f430f121dab1c814b6c ] Since CRYPTO_SHA384 does not exists, Kconfig should not select it. Anyway, all SHA384 stuff is in CRYPTO_SHA512 which is already selected. Fixes: a21eb94fc4d3i ("crypto: axis - add ARTPEC-6/7 crypto accelerator driver") Signed-off-by: Corentin Labbe Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/Kconfig | 1 - 1 file changed, 1 deletion(-) -- 2.15.1 diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index fe33c199fc1a..143f8bc403b9 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -721,7 +721,6 @@ config CRYPTO_DEV_ARTPEC6 select CRYPTO_HASH select CRYPTO_SHA1 select CRYPTO_SHA256 - select CRYPTO_SHA384 select CRYPTO_SHA512 help Enables the driver for the on-chip crypto accelerator From patchwork Mon Apr 9 00:21:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132986 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp736232ljb; Sun, 8 Apr 2018 19:55:45 -0700 (PDT) X-Google-Smtp-Source: AIpwx48hNhrwZB/zI3oGJQpDhdyrth9p79tUPoFy1ZLZibNfyT93VNWfqXnGQV19TmH/gdGHknAn X-Received: by 10.167.131.203 with SMTP id j11mr27859104pfn.101.1523242545791; Sun, 08 Apr 2018 19:55:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523242545; cv=none; d=google.com; s=arc-20160816; b=evVG1yJdtEJGTzfb4O2Q1+xY7nMdCcPf8KhXJTw6IwD4ikQYmuo1PbLpS6yWGRMyHo j5ZVuMNTCdQJqY9GCbNIHMXkK06eIhqsqBJoaXu/cVzeW1r2dgC0ozODipsXKEHx4czi +8dOrFHvuqXpSzJ8jtA9DWjIUfIrGaHJOf1LOl/wwYPHPJkPhXTe6HYHYSnC4CUWPFG6 g6qrnp2YLix1ZoCtkhdDVtpozFVuJmnQRAxOzbIUaIA0+G7cK8HFiNjNTSSKPnbA+2Qx +mvcjGOEsjKBMRSYqkv5ShrSmQUFa4wZyJzvs7UMywNlW+l4KuXce64jxT1hppgEu2gS C82Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=kakoV9CdMkuL/glL+w+l5739qxSEUeGhjkDRELCkEkI=; b=szlY3jSXkE37lmb33NYfPiXPNeh4ZyW8Gsg8LGXThQ9YDveoSXtzLC+hy6GYIozHUn JvZjs2HPbMsVbvdg8oygA+JR8ElpWdCJkFyp6241JQdFBj+IXLXiSA5enfTm3gZOEDWL Zmt34jDcQqTTmDIfv/vRHv9bYkUkJXX0fAz9ZGUcUQ45nj751eCqKhnkC2UEZgD9C2Ke gi0Op1L4Crgst+Sy+1vmuUP/EE3hfKWAMTGxDIUVwfsaLnrcf108QSdD77wM1ntXK09+ dQT7Zy0bINsixwt6SXOdSj9RtA/1Wry7MuATZWyGF2bOyMPdxOU3xxEnimSxi0DiKWei /q2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=LfpozW9b; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2-v6si13664513pli.242.2018.04.08.19.55.45; Sun, 08 Apr 2018 19:55:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=LfpozW9b; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758138AbeDICzl (ORCPT + 11 others); Sun, 8 Apr 2018 22:55:41 -0400 Received: from mail-bn3nam01on0139.outbound.protection.outlook.com ([104.47.33.139]:14848 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755228AbeDIAZr (ORCPT ); Sun, 8 Apr 2018 20:25:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kakoV9CdMkuL/glL+w+l5739qxSEUeGhjkDRELCkEkI=; b=LfpozW9bv6E2YCHc38HvKFbLEpp4fy8CCfaHrBGzrp93fUY//NGKhjd0fJspz3IeUwzRckZm+qbauCjVsvqJiZTRmFA7tTZbIMLmyn/GYGKeJkiDn744YQv81gb6GLjb2iW4PGB8xyr0LeC7mOlyljJXvFLH1Tkvw4LnUt78l6o= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:25:39 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:25:39 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Ulf Hansson , "Rafael J . Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 134/161] PM / domains: Fix up domain-idle-states OF parsing Thread-Topic: [PATCH AUTOSEL for 4.14 134/161] PM / domains: Fix up domain-idle-states OF parsing Thread-Index: AQHTz5i8U2QhzCmslEakZ+z4lRC8sw== Date: Mon, 9 Apr 2018 00:21:43 +0000 Message-ID: <20180409001936.162706-134-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1013; 7:Pi/KMvGFMl0TbZ1GcNYkGsi8YhMWw26ahBTF4dLyENqMTshly59q3IaitF3Reig3aZXfvNDXK2YSAImHQYxqb8zHC3oRwLr/lzwK47Dj1NYrQDHwsv7Q0GbavIf6uejJSoTO21ymRlbVZLpK1fo2MJTFvmMa5R+yFlStcMuJ4ZZpdlrAI+loQdqrVC3fTgqZV6IS1okBnfAMjTi0eyXEtVoDkf5F5Uk/+77GRjgyKagkrUPYv/oy1xaf1YnexRn6; 20:W1GfnhtVwM9rS9iUW3FHuk+ukw7KYfqpxDjD1feWR9bAE3bylrI3hZ1p+M2wEbl5MqsyS8w69H+Um9hYMrp4XAh81Ro9m9GgKy/UIayOwXQdwZaL7625CJ/JVn9RCEd1PTi2WXGfsf6SiTGA3EkxUkGqnk+LK4vKTmtWlwnFGew= X-MS-Office365-Filtering-Correlation-Id: 69fd2398-45a2-424e-6e8a-08d59db06c1f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020); SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(131327999870524)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1013; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(3280700002)(2616005)(8936002)(7736002)(476003)(446003)(11346002)(53936002)(3660700001)(86362001)(86612001)(81156014)(2906002)(186003)(81166006)(105586002)(1076002)(8676002)(26005)(97736004)(25786009)(6512007)(3846002)(68736007)(72206003)(106356001)(5660300001)(6486002)(6666003)(6116002)(14454004)(4326008)(305945005)(6436002)(2501003)(5250100002)(10290500003)(478600001)(2900100001)(59450400001)(22452003)(110136005)(316002)(99286004)(66066001)(10090500001)(107886003)(76176011)(102836004)(54906003)(6506007)(36756003)(486006)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1013; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: s701McDk1IN1u/O3M58j8YX2DGoKX19seN1yXgYhXXusSRZdPOqx6Nvl9pRVmpFW2QFjjDjmWdf7CaEk62ZUQ8RU+qwae42nNRd9zI4Cj7Gw9YB5c1Ph7rG6tMm0+bGHr7/gQ2iBiHL1GQmUU0LF+meuSp0vwTDhzCpFz6LfxYA1xTjoIK+MZxKuBlogGXYfcpA+wZB+elQfHlLDpKFIY3kaTkO1bFPuVKJkZSr1E1guLF6+T5lwLCNUPVKfCa+ay5IE543MVslMgd1C8C6n5AsNyg7yUMAN8uXggKpnwiJ3WHaLnIVTDIW31ernVE6NV7wZLJ6HhzHPI3S0mleSxSaMkgeES4RT6dfJQgPIOES4ilO+ijQAKsjaip3g/9xZPMJ1bkB9u1poYi/uCMxnmnfZ/PmcPTcu40NK/dqp6do= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69fd2398-45a2-424e-6e8a-08d59db06c1f X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:21:43.2061 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ulf Hansson [ Upstream commit a3381e3a65cbaf612c8f584906c4dba27e84267c ] Commit b539cc82d493 (PM / Domains: Ignore domain-idle-states that are not compatible), made it possible to ignore non-compatible domain-idle-states OF nodes. However, in case that happens while doing the OF parsing, the number of elements in the allocated array would exceed the numbers actually needed, thus wasting memory. Fix this by pre-iterating the genpd OF node and counting the number of compatible domain-idle-states nodes, before doing the allocation. While doing this, it makes sense to rework the code a bit to avoid open coding, of parts responsible for the OF node iteration. Let's also take the opportunity to clarify the function header for of_genpd_parse_idle_states(), about what is being returned in case of errors. Fixes: b539cc82d493 (PM / Domains: Ignore domain-idle-states that are not compatible) Signed-off-by: Ulf Hansson Reviewed-by: Lina Iyer Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/base/power/domain.c | 76 +++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 31 deletions(-) -- 2.15.1 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 70f8904f46a3..b3b78079aa9f 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2206,6 +2206,38 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state, return 0; } +static int genpd_iterate_idle_states(struct device_node *dn, + struct genpd_power_state *states) +{ + int ret; + struct of_phandle_iterator it; + struct device_node *np; + int i = 0; + + ret = of_count_phandle_with_args(dn, "domain-idle-states", NULL); + if (ret <= 0) + return ret; + + /* Loop over the phandles until all the requested entry is found */ + of_for_each_phandle(&it, ret, dn, "domain-idle-states", NULL, 0) { + np = it.node; + if (!of_match_node(idle_state_match, np)) + continue; + if (states) { + ret = genpd_parse_state(&states[i], np); + if (ret) { + pr_err("Parsing idle state node %pOF failed with err %d\n", + np, ret); + of_node_put(np); + return ret; + } + } + i++; + } + + return i; +} + /** * of_genpd_parse_idle_states: Return array of idle states for the genpd. * @@ -2215,49 +2247,31 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state, * * Returns the device states parsed from the OF node. The memory for the states * is allocated by this function and is the responsibility of the caller to - * free the memory after use. + * free the memory after use. If no domain idle states is found it returns + * -EINVAL and in case of errors, a negative error code. */ int of_genpd_parse_idle_states(struct device_node *dn, struct genpd_power_state **states, int *n) { struct genpd_power_state *st; - struct device_node *np; - int i = 0; - int err, ret; - int count; - struct of_phandle_iterator it; - const struct of_device_id *match_id; + int ret; - count = of_count_phandle_with_args(dn, "domain-idle-states", NULL); - if (count <= 0) - return -EINVAL; + ret = genpd_iterate_idle_states(dn, NULL); + if (ret <= 0) + return ret < 0 ? ret : -EINVAL; - st = kcalloc(count, sizeof(*st), GFP_KERNEL); + st = kcalloc(ret, sizeof(*st), GFP_KERNEL); if (!st) return -ENOMEM; - /* Loop over the phandles until all the requested entry is found */ - of_for_each_phandle(&it, err, dn, "domain-idle-states", NULL, 0) { - np = it.node; - match_id = of_match_node(idle_state_match, np); - if (!match_id) - continue; - ret = genpd_parse_state(&st[i++], np); - if (ret) { - pr_err - ("Parsing idle state node %pOF failed with err %d\n", - np, ret); - of_node_put(np); - kfree(st); - return ret; - } + ret = genpd_iterate_idle_states(dn, st); + if (ret <= 0) { + kfree(st); + return ret < 0 ? ret : -EINVAL; } - *n = i; - if (!i) - kfree(st); - else - *states = st; + *states = st; + *n = ret; return 0; } From patchwork Mon Apr 9 00:22:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132985 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp733740ljb; Sun, 8 Apr 2018 19:51:38 -0700 (PDT) X-Google-Smtp-Source: AIpwx49unGa1hUHwWIsT26XkOYTJEbttxbcMDY/cpeWms8JZQFAb6LUVqd3nHt/ZXEkGx5VeU6Mq X-Received: by 10.101.88.78 with SMTP id s14mr9489337pgr.97.1523242297835; Sun, 08 Apr 2018 19:51:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523242297; cv=none; d=google.com; s=arc-20160816; b=b0Xdn+v3w2uC1Yl6BvBoLlH1uyM+8tR9xLbl6a4R3cDnxeaJ6FF5mgcT91ykIQf/ac QT/GDAXYhYNIXneAw8H2YwK/7eACj5aiYfRhIbRL0aNckIFeRwbo5AfaaUcVXIoEYr7J L5G6Nm290b3nO3ybG+U/R4KIISD2IxeErfT2T+5GC70YK5pfNF4f4VIbyFNY+gpQWAh4 eorOUKPdVVyFnVNYg15Hq5WZfAXqyI4yjTgcup1vFPQ8mB4WpFDbJdARwMcy2ZkbXswR +zkOcaIjIcN5mZLAbOrUzcJUefPSzGPuYVUQ4k0R/olfhkQYQihFqeMoXD54PFslHZOE 1dQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=eupEr1OImIC1dqrHon02FUZNbis2rWHcIzoICgpkI+s=; b=plGvHDI0fAdfMm4nE/qlQDk5PL1YhPfOQKghKawd8UPqnQtT/SKYkhmpaqq3cMF8Yx P/Tj5et5+WEYcHAgHIUfGkksNz1EDEz3whx5UQXz560V9N0E+MFaOrwVEr6A3ksRWca0 r0VpbG2ODmVBNcpd4h+KSe7ETrXjljt9INttaOlOoMiEDxms6NDv8USmeDVgSXwopwF0 UYJESkbAIOsf9xlxflXIMr6qhrkJjEEBfSkTk+S/yuA0oaabOY73J+7FQ1EAXR7z4vJu Tvi8KkGkmvgoMM92BEqr05P/r0agXzkcY6E8uIenoD+EiBkTLwK8jmqmZfIjxwuHHHer C7fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=RXfbn8Wm; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t198si1272188pgc.600.2018.04.08.19.51.37; Sun, 08 Apr 2018 19:51:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=RXfbn8Wm; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755465AbeDICve (ORCPT + 11 others); Sun, 8 Apr 2018 22:51:34 -0400 Received: from mail-by2nam01on0099.outbound.protection.outlook.com ([104.47.34.99]:2811 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755340AbeDIA0c (ORCPT ); Sun, 8 Apr 2018 20:26:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=eupEr1OImIC1dqrHon02FUZNbis2rWHcIzoICgpkI+s=; b=RXfbn8WmfwMS25C1dNKKRQ5E0nv7A2YRfaLKeOujzOFcsIqfxgjPD92Lnji3Bfb0h5DcM15Jib2W0tiUchD4p6tHXUgufTKPmAVknPNznzKshhmIhjfrSH+/PYqEQZayBHiQvPxpmdsALgjdH1X6kAnIIlqYaKSfjIOwQR61vIU= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1015.namprd21.prod.outlook.com (52.132.133.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:26:25 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:26:25 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Will Deacon , Linus Torvalds , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 156/161] locking/qspinlock: Ensure node->count is updated before initialising node Thread-Topic: [PATCH AUTOSEL for 4.14 156/161] locking/qspinlock: Ensure node->count is updated before initialising node Thread-Index: AQHTz5jH4uJdvGUNy02wUjiAgr8Quw== Date: Mon, 9 Apr 2018 00:22:01 +0000 Message-ID: <20180409001936.162706-156-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1015; 7:53SuDfl/fo8WtDJ7+8JBn+G19qkD/ROwJ2yGTCersUFy3JFpKeF1HxPJs7ZnhZiwDzIZmWGV24hsfptHunaxUQJz7mQOBsQIOON9/xGOumMtkYH0zrYjF+6oIy1295rWF8dDT/v4xaQW2oHnEmAln6baOZfS/SVQhgGPtByXUPeF8Io7Cz/PyTYyu7YkUjhKY4kDw5dZVIcW0L7iR9IS7azspnxQIyFnlIWX+EPYKLxjHvrjfPTAER2/Ig+V7pyy; 20:Tg935W3i6SMr4pRzFRJ3EBeacJWv2BmcbDdTMD5+wLigZ+LN13LhBvZZj7fKZBGER8D2f5iuwXdIN7cgASy6Q1g2dtytYbImyjE1l98Y5Ody1D9ik3b6EkkW6Noe8NyJjBP+EyBZJ5eFBPROawZEWk8zfv2KD3iI/DjqZhdqFN4= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 04a717e3-0bb4-4e46-efa8-08d59db0874e x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171)(42068640409301); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1015; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1015; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(396003)(39860400002)(39380400002)(376002)(346002)(366004)(51234002)(189003)(199004)(53936002)(4326008)(478600001)(72206003)(3280700002)(2616005)(14454004)(305945005)(5250100002)(3660700001)(2501003)(2900100001)(54906003)(110136005)(86362001)(1076002)(966005)(107886003)(6506007)(36756003)(446003)(68736007)(6512007)(7736002)(486006)(2906002)(6306002)(5660300001)(6436002)(3846002)(86612001)(6486002)(66066001)(11346002)(476003)(6666003)(59450400001)(26005)(10090500001)(316002)(22452003)(8676002)(81156014)(81166006)(6116002)(105586002)(99286004)(186003)(106356001)(76176011)(25786009)(97736004)(10290500003)(102836004)(8936002)(22906009)(217873001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1015; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 7xvzHHzKptnVCXH9jUkY8u8aG8D7lJILlxsVQIhkWNC77ac9qfLDosxmItQrI3DQbB7eH9UMCpUSiuzAOBuTdlDYKA2ww9AZ4xsEfsZJwE/HP0fARqB60RtheUZqfSx6mlDF8QgrgoFdOiMQ98solg1xvswv7peUIbVpUgJN67rrbXYaDBDQHZdvRZC+RMTnedW4DUpEV01QCvq4GGyWzOtYg56aq5NpJOu4evLjyswduV1hEG+IQyICuPC+jPEz5rYeI489Q5IluqbQlhLqJuSP9xrv95P68xhA5xq4kd5dSC4jBmsSPOTxc1Fm3sNglVz3lsGrsXIUN/s4RouLdkUj0RddrH1nBKMWaRPd4Qb6ZU7z3GGjhnjgs7ZMAHhPUq/3m/Cmf7NWfiltOjuVhTkTfe5HKOePIuZeNahGi0Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04a717e3-0bb4-4e46-efa8-08d59db0874e X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:22:01.5654 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon [ Upstream commit 11dc13224c975efcec96647a4768a6f1bb7a19a8 ] When queuing on the qspinlock, the count field for the current CPU's head node is incremented. This needn't be atomic because locking in e.g. IRQ context is balanced and so an IRQ will return with node->count as it found it. However, the compiler could in theory reorder the initialisation of node[idx] before the increment of the head node->count, causing an IRQ to overwrite the initialised node and potentially corrupt the lock state. Avoid the potential for this harmful compiler reordering by placing a barrier() between the increment of the head node->count and the subsequent node initialisation. Signed-off-by: Will Deacon Acked-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1518528177-19169-3-git-send-email-will.deacon@arm.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/locking/qspinlock.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.15.1 diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c index 294294c71ba4..50dc42aeaa56 100644 --- a/kernel/locking/qspinlock.c +++ b/kernel/locking/qspinlock.c @@ -379,6 +379,14 @@ queue: tail = encode_tail(smp_processor_id(), idx); node += idx; + + /* + * Ensure that we increment the head node->count before initialising + * the actual node. If the compiler is kind enough to reorder these + * stores, then an IRQ could overwrite our assignments. + */ + barrier(); + node->locked = 0; node->next = NULL; pv_init_node(node);