From patchwork Sat Sep 15 01:32:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 146747 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1320365ljw; Fri, 14 Sep 2018 18:45:30 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbgDIgKElhkOSaJKN7pXcPtF+zInpxf2YuCYdXNZx23iRs3BXP6uT4oQA0eD0zluEbLfnEm X-Received: by 2002:a17:902:a987:: with SMTP id bh7-v6mr14775992plb.182.1536975930081; Fri, 14 Sep 2018 18:45:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536975930; cv=none; d=google.com; s=arc-20160816; b=fvioBoOmGpNZiKHE34VlrXU1KbzrKhTYeJYFerXm7rDasJyVM9py/JlTpOMedUPOe9 2+Aw2jARAHp5lbmg34sehUfVKY0bj1betb8psNWkhW9j6J2NyvRVoThSUjTkqGiBoR4z 87KARc8k8/iPEvQBCyJc6QyplyCCQ1Gt6FStWs4oJFs6XxHW+hXUqKSMrxCltFoSxFHB 0I+PRl0c1KEpkt/n89aEmDOjawgg37pKCRykqt51m9m+8pvFQJMMxNayyjP0LH/Bj/V2 G0WkXgW4YHBMV+TOLDUFaaISXjDrlCHNcOd+bfSUbsn8zmcZ0g7GOkrLIY2UAfYpesMV av7Q== 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; bh=DlS8LnDML+2+fNahijfTEWVkByo9n+WcrhJ3VDmjUAE=; b=xxsny3lqFnNIKV9o3Rd9s8v/irdxHW0iClMNyYnn2lHHbiSERdVKToJq3skCfQAmOs B74u2BStAgah8HefMDv/MjetznpDLZkjyVxd8P8BGyhrXXXXPBgz57kTLlWjIBthLxdL pU4zGHZptXr85bHHQueWOCloUA7GqOa9TTELKZyJ3OelrSSvDr5MduQww09oBVHqx3sv WHQrgYGTm3lCl9sdc2fDnn0fCfMBHOZHm0ZtjmR3jl0Qyhn1VloAGfvAsPa/pzrqt8hQ NWzvOhOeVr0Rnz4PLlhL7NHOoFz5IYjFgMwALx0PF3hWaFdOnoOeT6ega4PO4B6rml64 YdUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=GAtCJ5AM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 l2-v6si8392397pgb.417.2018.09.14.18.45.29; Fri, 14 Sep 2018 18:45:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=GAtCJ5AM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1729115AbeIOHC3 (ORCPT + 32 others); Sat, 15 Sep 2018 03:02:29 -0400 Received: from mail-dm3nam03on0104.outbound.protection.outlook.com ([104.47.41.104]:19456 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728320AbeIOGta (ORCPT ); Sat, 15 Sep 2018 02:49:30 -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:X-MS-Exchange-SenderADCheck; bh=DlS8LnDML+2+fNahijfTEWVkByo9n+WcrhJ3VDmjUAE=; b=GAtCJ5AMWxjCA/6up0KTe3kd6Rf4xY3/D/J4jYpQr2LFDHTClom+AUwVPFY93mxke8JRG1VmqHaAcAx7ylSAuuf24e56Nbo7Lpx4RPimVmmZ7YxaHbOHD1mfTtImZ32reIN87WQvI1+BIOVCy0eB6YPgF8PpBuofKbi6P3Fei9I= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0117.namprd21.prod.outlook.com (10.173.189.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.8; Sat, 15 Sep 2018 01:32:28 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::151:b6fe:32c8:cccd]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::151:b6fe:32c8:cccd%9]) with mapi id 15.20.1164.008; Sat, 15 Sep 2018 01:32:28 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Viresh Kumar , Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 4.14 03/57] arm64: dts: uniphier: Add missing cooling device properties for CPUs Thread-Topic: [PATCH AUTOSEL 4.14 03/57] arm64: dts: uniphier: Add missing cooling device properties for CPUs Thread-Index: AQHUTJP2zKIw6mH1IE2rNdzqRCGssw== Date: Sat, 15 Sep 2018 01:32:28 +0000 Message-ID: <20180915013223.179909-3-alexander.levin@microsoft.com> References: <20180915013223.179909-1-alexander.levin@microsoft.com> In-Reply-To: <20180915013223.179909-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; CY4PR21MB0117; 6:n4ZToTsh9+FeMr6uDvivqctsq+ScHu7ssNJ0lgLfRosUtcAJ6MyeM9q7kCGWZEhrMYemgz+8x24F1PC7tkH/zP0nrsWEnQDaWEZwlkbKlzdSrx8cA+7hD9TtmWbf+GxpkoSKismmAXZQ3HuDL85rtID9lH8+//BBiE9ZESbj4qaQhqG7YpXy1Dnlot41B7gpo5JCMltgRdS7SXKnVGov5uwtmEyf5pjjKEOGuUBEurCmVM7Z9sxPQCtC+3rZ7B0NoEyOsnOT+o8HV0/vor9rqBLLg/28N27UQWuMONvzcHmEqSmMzqJ1wPV8WE5KQPR3RpyELN+TPVcxC8HZTzxKFk/Xs8Bep19vrPs3d+dXgROeyeDDigGjLa3j2x/j6Eb0tCyBIeedYRY4XDucI8Gfzb6GaNoOjNQFMPHHJ6O0ZszkitCuoQtr0U9FPSQ0BNoe0c5vOnrVpp/3rJVpgstz8Q==; 5:DVZB8yJxQXmzVifYQiikXT55fN73ZYfUa3tYE6A1B9qxM1NCoF3IRgT0G7il4Y/aZ+npnPIUh+4VClj2KJT3CybU6FNzdBbVMRpMduTRtUeq4FeIvQSywZ8ZWm+y14u/j8stMIiGkVxFjp58/LNVxA///j2L7ufkK3zr6ffyKzk=; 7:1pwHgtqcialFUw27CqVBSYvQXWRkvZdGNap4rMR1nJUaDBQDzh5J6eJCURqqVEmyuxVDCXhE4oTsG3ofD+bb6LPLa17vvr8QqN686tfx1TrFCd/cNVyrbTdoLRhU3TlBexF2zJSjGeo/f5R7OCP6vFtVdr7S5cJlQnDRvEotPwHPsRHF0AEywfTUNnMfXa2r7yzDlbn+VUWaFyLXcTuIC1ThmIat52N7RmQQigCJHFKvl1SC+mkvxFdB+TebnTt0 x-ms-office365-filtering-correlation-id: bd22a9a5-3a2c-4f88-53ca-08d61aab1935 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0117; x-ms-traffictypediagnostic: CY4PR21MB0117: 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)(209352067349851); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231353)(944501410)(52105095)(2018427008)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(201708071742011)(7699050)(76991041); SRVR:CY4PR21MB0117; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0117; x-forefront-prvs: 0796EBEDE1 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(366004)(136003)(396003)(39860400002)(199004)(189003)(36756003)(316002)(2900100001)(110136005)(54906003)(8676002)(478600001)(5250100002)(2501003)(66066001)(72206003)(10090500001)(446003)(86612001)(476003)(2616005)(8936002)(102836004)(11346002)(486006)(14444005)(86362001)(256004)(575784001)(186003)(6506007)(22452003)(68736007)(26005)(217873002)(305945005)(2906002)(6116002)(3846002)(1076002)(106356001)(7736002)(5660300001)(105586002)(53936002)(14454004)(6436002)(81156014)(81166006)(6486002)(10290500003)(6512007)(99286004)(107886003)(76176011)(97736004)(4326008)(25786009); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0117; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Y7rgor75pFEC22zKGD8Zkd4/pd3G1hyytcmUZl5pTNGfr5LCFAo17SlKVMrLsjB9cUvjCsy0+tDq/CaTpv1aQEmx5gsv7l9Z3AnH2lSvQiDtRLbf1nFykHD9qDC2F+V9bv61kl1g9/BYom0pR7JKG6asnRGILLYWms/DkRdJKWvGQieU7V8I9FiC6YvnDNVPY9B+2JMtGMEFSfxwnFNIKLPCzJ0wPk7tcnlqLFMrapyE4YKa8LVTGFsM9SCzRFM8+7LyJjnPICA7HsG3u3vG9M4FcPkSBd+jl1ZWkiaAbQ98T41p8FFMIqJhMxDJlaxXrm3HU3uOQxdO8QxojUKgU2BWPCz9krd5yuTokL49N0Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd22a9a5-3a2c-4f88-53ca-08d61aab1935 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Sep 2018 01:32:28.2752 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0117 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Viresh Kumar [ Upstream commit af0e09d0c6762e486b0eb5cc4737396964c34fad ] The cooling device properties, like "#cooling-cells" and "dynamic-power-coefficient", should either be present for all the CPUs of a cluster or none. If these are present only for a subset of CPUs of a cluster then things will start falling apart as soon as the CPUs are brought online in a different order. For example, this will happen because the operating system looks for such properties in the CPU node it is trying to bring up, so that it can register a cooling device. Add such missing properties. Signed-off-by: Viresh Kumar Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.1 diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index a29c279b6e8e..dba6f0ff8106 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -55,6 +55,7 @@ clocks = <&sys_clk 32>; enable-method = "psci"; operating-points-v2 = <&cluster0_opp>; + #cooling-cells = <2>; }; cpu2: cpu@100 { @@ -73,6 +74,7 @@ clocks = <&sys_clk 33>; enable-method = "psci"; operating-points-v2 = <&cluster1_opp>; + #cooling-cells = <2>; }; }; From patchwork Sat Sep 15 01:32:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 146746 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1319411ljw; Fri, 14 Sep 2018 18:44:04 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYmIPomDn2Dz5b2iy1J4N0fkM0fvTiCmuc5SOm8mnEeo+JFh9lCK5EbUhK9D0BKdEmqKe2Y X-Received: by 2002:a63:e206:: with SMTP id q6-v6mr13621211pgh.223.1536975843852; Fri, 14 Sep 2018 18:44:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536975843; cv=none; d=google.com; s=arc-20160816; b=pSY8xd3FCKmiWarwmqQEYIPcvWrRW9Ao4BmV2/a7mTn9/SE+O//gsFZ555oSGXpe47 WwshF81Gb8M2xmgxl0eRO9GI76DlIDCmRmgN1l/N32sMfmLUlQWICEk4UmqvwI+Bcrhd aZFd18VKd+4IWjQR+wxA95uC8yI4QzwIVAUnc4oo/UB7cLAmawUpenEos+UEGE0XruJ+ yykw2lU9xC3XroxYRk8A5yYIfNXUGfM3kNE3ztsXJeYAp4oYJUoVWODEpB5EwuOxehh3 tc56YO4DzppuIDcW1SEOgXqduSxiothsLcY13LGXbyCwxncmekPppieJbDu5QhgNgOWa 2wvA== 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; bh=26GleA9ZzYa5wHyRGmOEnIsZ/gVwSb+bqRrT2JWk8ZE=; b=K+oan9ODVRHuq3NvS0Sai2pBt7LWzAQ3OTWlwaT4LtQV3LeXFD5pzk3zr/ZxxrYzOo A99/TX3q6TZXefyPUZQZkMiOr/CJrP7fimoSyH/xP8oesyo3f0jymkPR7/GD6PG9O4YN NcOQ5VCEGdniXnYAC81zrFFHEfjUAEWBjcwX29vzdzd8YL40wdG9aDHzCCArwRl4TEMF Z6SuS+u7N3Sh4/bxeAe7uAbOOCtiRz3gC0pAugaqmieXdNZDuMoY71Bk08EIV8S/mDmz go9kcO8yM5lHQ/MLdmTjlkyVSxbBMu+lO/MhWUvl1h7yJjwhPcPAm5fe8Tm2npPbYfs8 FFtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=H4QTkUhu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 m33-v6si8140391pgb.450.2018.09.14.18.44.03; Fri, 14 Sep 2018 18:44:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=H4QTkUhu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1729221AbeIOGtq (ORCPT + 32 others); Sat, 15 Sep 2018 02:49:46 -0400 Received: from mail-sn1nam02on0127.outbound.protection.outlook.com ([104.47.36.127]:18752 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729115AbeIOGtp (ORCPT ); Sat, 15 Sep 2018 02:49:45 -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:X-MS-Exchange-SenderADCheck; bh=26GleA9ZzYa5wHyRGmOEnIsZ/gVwSb+bqRrT2JWk8ZE=; b=H4QTkUhuodh0BrpM4VoFnI6ZdABIDgdpjmyh9Fucgl1FQBZt0aNTHGrJlOWfCqYxROESaAjZ4jWrif5L99q6mcL3ALnGqEq2l4h1Si3r/n4jW0vVorb1/b+dh13zLbPjuHIMcLIMN8dLKB2d6JlOpYF/ImIejlVeDYG7ENedjhI= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0822.namprd21.prod.outlook.com (10.173.192.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.9; Sat, 15 Sep 2018 01:32:41 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::151:b6fe:32c8:cccd]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::151:b6fe:32c8:cccd%9]) with mapi id 15.20.1164.008; Sat, 15 Sep 2018 01:32:41 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Ard Biesheuvel , Linus Torvalds , Peter Jones , Peter Zijlstra , Thomas Gleixner , "linux-efi@vger.kernel.org" , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.14 18/57] efi/esrt: Only call efi_mem_reserve() for boot services memory Thread-Topic: [PATCH AUTOSEL 4.14 18/57] efi/esrt: Only call efi_mem_reserve() for boot services memory Thread-Index: AQHUTJP+R/2bVXoT30qKFWNbw6VWkg== Date: Sat, 15 Sep 2018 01:32:41 +0000 Message-ID: <20180915013223.179909-18-alexander.levin@microsoft.com> References: <20180915013223.179909-1-alexander.levin@microsoft.com> In-Reply-To: <20180915013223.179909-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; CY4PR21MB0822; 6:4BVLezzoIOeIoL+cazF2cMy9SbRKHYXfJtEZgvfGmpcGRYhilYT8GVYFP2mijSN7G4ciuY0PeOPo9ZsscQGUFaglWk1r+H6/1Z6h24QufEt9FMxQ9wHpYCeoW8moF9LsfTVO4D6jxodCXNzJmUdyTOnK0RwY1bL+g5nTkjTlhWeEXWKFWAZX8pNcof9YpEg54OvQra8EfNvKE9VFdBW5dok5sU9G1yzgqFbLiXh2v+ctU/I6Wa2OIwq3wqBXwrxttva9Z1BfsquWwpBz8vAZYwK6ycXmETOtbui9cs3MzXfNfhkIW1K0I/GOlMPBeiVrcH0C2lgyLTYNwMBuCLz+0IhxEiqb+Mpj9PLJObuzD5hgioAJGl2BVeZrqyylTIxxu63P7iGkhzHB+DbmU/zRBQjSB6FXLRATqfq4WoxHAwPMdVM96LRcVXOba8tVdVE+Y4FJB0qtvu4MIYyZI8AYXw==; 5:23JRr+f7B/B7cSWAZFrFt5ZJ+5ZfoHjjPW5zkDGOE8Kri6vFz9zxQ4idnJ24Y1GPof6RFE7qAeyXDo3TYLnDFgYljB+sUCWoUw4qolDORGOgflzgqheH5o9VwZksCRx1OaBmdiwRXSBJtJjGvwuLPL2dkmAZu6hIV2k6jnLjojQ=; 7:7Cd33tBQ4HpyFmfwu+mdL/LD6BisW80bnHV8yihj2vGiqz+ra6dAigaPhsiW8luvXxkrHshtnTpAr4E4Sp+yTIilOEIgipZ9MNfX3XoBz/wOw+/jDqSHBG8NNfVi30ifeie+d9sPQJXtba2nQB9dgSi+xzMhOf8JEcGWCj/AFL8v/OsMKnn8q+BQ57geRBaJFWEpmC7UnGD0JVhzRWJaWK05r4NdufJk9sRudWbwlLu4eY5KbCYrH24ixN62PKYR x-ms-office365-filtering-correlation-id: 6e07f99d-be2f-4533-e3d8-08d61aab20d5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0822; x-ms-traffictypediagnostic: CY4PR21MB0822: 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)(9452136761055); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231353)(944501410)(52105095)(2018427008)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050)(76991041); SRVR:CY4PR21MB0822; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0822; x-forefront-prvs: 0796EBEDE1 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(136003)(396003)(346002)(376002)(189003)(199004)(1076002)(72206003)(6506007)(102836004)(478600001)(8936002)(10290500003)(2906002)(81166006)(81156014)(5660300001)(22452003)(2900100001)(8676002)(110136005)(54906003)(107886003)(99286004)(25786009)(4326008)(316002)(10090500001)(97736004)(305945005)(7736002)(6116002)(3846002)(256004)(14444005)(66066001)(76176011)(217873002)(6436002)(14454004)(36756003)(476003)(86612001)(6512007)(26005)(5250100002)(53936002)(486006)(106356001)(11346002)(2616005)(6486002)(575784001)(86362001)(446003)(186003)(105586002)(2501003)(68736007); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0822; H:CY4PR21MB0776.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: CW8p0g4XNv8IEs5HwZ23TIugKvJzEEwH3Tfz1qQSoqSjCd7vBWtEa5JdiEtDLPNpARxin0mCQx+r6qWMjwzsNSLG7H2+1pwnVKcNh85pTlrVoN6cHdBMJV8faVm9kvD242gLLQVIAB0rk+U9a1Q5rAv07LKueoAo6MTyIL9EbeYgdJS5p2km+o0HZHzkRETeyrCKoYDPCq4z44Ajt9+UJR2M2QG/P73GPbAlLvEiJjZ/DAWb2n8xg8HWVltbmuoDkAghfN4O8fFG8Lk3HXxEgPnT2p/6Sdcds33iXWpF7Gfs0vr7Q0MAb3yYcldzcEzwd+zQQOVF8OtdX5fFT4zGOUJqdSOXuCKcKMhhayLo7SA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e07f99d-be2f-4533-e3d8-08d61aab20d5 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Sep 2018 01:32:41.1028 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0822 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit 61f0d55569463a1af897117ff47d202b0ccb2e24 ] The following commit: 7e1550b8f208 ("efi: Drop type and attribute checks in efi_mem_desc_lookup()") refactored the implementation of efi_mem_desc_lookup() so that the type check is moved to the callers, one of which is the x86 version of efi_arch_mem_reserve(), where we added a modified check that only takes EFI_BOOT_SERVICES_DATA regions into account. This is reasonable, since it is the only memory type that requires this, but doing so uncovered some unexpected behavior in the ESRT code, which permits the ESRT table to reside in other types of memory than what the UEFI spec mandates (i.e., EFI_BOOT_SERVICES_DATA), and unconditionally calls efi_mem_reserve() on the region in question. This may result in errors such as esrt: Reserving ESRT space from 0x000000009c810318 to 0x000000009c810350. efi: Failed to lookup EFI memory descriptor for 0x000000009c810318 when the ESRT table is not in EFI_BOOT_SERVICES_DATA memory, but we try to reserve it nonetheless. So make the call to efi_mem_reserve() conditional on the memory type. Signed-off-by: Ard Biesheuvel Cc: Linus Torvalds Cc: Peter Jones Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- drivers/firmware/efi/esrt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index c47e0c6ec00f..f3c28777b8c6 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -333,7 +333,8 @@ void __init efi_esrt_init(void) end = esrt_data + size; pr_info("Reserving ESRT space from %pa to %pa.\n", &esrt_data, &end); - efi_mem_reserve(esrt_data, esrt_data_size); + if (md.type == EFI_BOOT_SERVICES_DATA) + efi_mem_reserve(esrt_data, esrt_data_size); pr_debug("esrt-init: loaded.\n"); err_memunmap: From patchwork Sat Sep 15 01:32:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 146742 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1312797ljw; Fri, 14 Sep 2018 18:33:40 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ2cMpRmlOHq1AgXuLqAZpDSjCumzc6mLdzt7K8uwyAV/ot+zX3qNVgZI1D9JDHH1Ny2vfM X-Received: by 2002:a63:2acc:: with SMTP id q195-v6mr11330016pgq.291.1536975220042; Fri, 14 Sep 2018 18:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536975220; cv=none; d=google.com; s=arc-20160816; b=cBU8F/x7xMMigr12PrVGfcj1088L4aPU4Zmzq9Av9Z+ZCDytySSEaB6to54cle/NIc 9jrYgZ9dkyjDby2qZZJR4l7MNI0181Asi0qeG2PocTiWObZyG6Q+CxEOesYhHt3N8V7T NmYiUNExaCZVMwaYU6V7tWghfAl9B0BM0u4rg80fmoYPZl5Y/dTxTgCxL0f3prkKVp3r k+SM7UA0hD+t3sP544uSj0ywG1SQ8iIH3sr7rlEdt3is9ckUJ53ssV0fX2fLr4CSQkQC NdE2t1r86kOvrIdDcDUAqVMLjy3ZGoRr109Jn4Z0F/RT27b8XvPZ9fHCFUhhFpJar34V ypxA== 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; bh=Sueif/pPx8V+tRejy0PNkPB8LXBoIiVBVjBFHwYOFz4=; b=eLhpwfNkxiXeWBlZjEa0lfAhDGJ4gt4bIMkfr0JA93Cr8MPMIOD0vJMK1eC1P9nPwT G9iR3iUgQhFGQiDNg/pkUJL+n6MIuBAtkDeVUYHRuSRIU/fDkB2KIBXnFjVYYWZt/jpN CA4YhUZBQJpUqVpvb2Dut1bWcVlnC94br8b1C9nPePJhiQe5iQ+bH0Ve/xDjqSECWfIz 2A3FWDq/sMMNmr6504vN0lYIxeDeaUiTHh+/9pCyABbKt3Y0u/pyqWfMQkp9XzGyeeEA lGlSigYOK4UrfIxCRBqXxAT9ocv1LDlPsGahALewuGi1xhr59q2nyoSRE5uW9HzK0l33 3QnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=DHEa0x5g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 x25-v6si8858075pfi.138.2018.09.14.18.33.39; Fri, 14 Sep 2018 18:33:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=DHEa0x5g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1729509AbeIOGuf (ORCPT + 32 others); Sat, 15 Sep 2018 02:50:35 -0400 Received: from mail-eopbgr730099.outbound.protection.outlook.com ([40.107.73.99]:42981 "EHLO NAM05-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729464AbeIOGue (ORCPT ); Sat, 15 Sep 2018 02:50:34 -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:X-MS-Exchange-SenderADCheck; bh=Sueif/pPx8V+tRejy0PNkPB8LXBoIiVBVjBFHwYOFz4=; b=DHEa0x5gBzK6gMLyTohdiWgwg/J7W6vDnPeNlWQaKhNkL9MHUdpiSDCHnJvRWGOG3nDPwfz8dOK293iQICF+gmbuJjv3iKmqeuMqee3Qjx+cBgH8tIB10qkEpk/YXoB21aE7cQRA8hoj4pfl4z7v8eKGf9YaEPKqoSJcMRTBctU= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0471.namprd21.prod.outlook.com (10.172.121.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.12; Sat, 15 Sep 2018 01:33:24 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::151:b6fe:32c8:cccd]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::151:b6fe:32c8:cccd%9]) with mapi id 15.20.1164.008; Sat, 15 Sep 2018 01:33:24 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: John Stultz , Thomas Gleixner , Ingo Molnar , Miroslav Lichvar , Richard Cochran , Prarit Bhargava , Stephen Boyd , Shuah Khan , "linux-kselftest@vger.kernel.org" , Sasha Levin Subject: [PATCH AUTOSEL 4.14 47/57] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Thread-Topic: [PATCH AUTOSEL 4.14 47/57] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Thread-Index: AQHUTJQIccxy9zzms0uLg4GDlrOaAg== Date: Sat, 15 Sep 2018 01:32:58 +0000 Message-ID: <20180915013223.179909-47-alexander.levin@microsoft.com> References: <20180915013223.179909-1-alexander.levin@microsoft.com> In-Reply-To: <20180915013223.179909-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; CY4PR21MB0471; 6:zxjK46ENT8ROMqKvdSEX9lZkW1zXL3lbxZeN5SWgS0eWnNWFDD8qIPo1w45uK2ykAQv44eAwJSGMg1Ert8peN/Xofij9QjdFs3y5f8V9HEHe4D4zZ0FP7eXjLgm45Qx7BK8qr3KNLmbB8/DLf+3EWdy//6Uepv2FoK4pPrArS330UlnpuldOx2HTK64famUyfkkH++DVTxytbeFVn9Z3ddSdJKIiToqIcqFWjisiHyoPDVfpmGLBzsyYBzMU/JwgGK3l6NhO3M0FICBntcZWluKxbdBU6jJ8SuB92vmWxXVZOIof1poTOpDvjCnmO22Uyb/VIne+jFJjfq7nMkhHK2zLJYFnbU+VYumAPlI9XTB++Yiv/PBbGEURhQ3Dw71spwnLvOlHmNdu6Ozjz/aRDoonVlAIkkYDajSQDLe9eW5xcBjj0QTuZyEzgG5SVe3WYAn55wJovz1xbaO/C6BcOw==; 5:XH+UjQiTtzwqc2ZBd/0EANqu8o2J8uiT6s0X7TiIiraJzKOmJjiBGx9iP7aieBf6rmi5xs4Mv5DxOe1HHftdz/pY637JanfKlT0QrYt/pPAawbVtx+pihWkDjBvovuRkjd3mQMs/vNK+FNVURgigNXZ8rhyOnaCYIaRG3TAvCos=; 7:TUG2yIsjYQSstCpBpUurtM8m2ptst5afhlBWLHrqgUdcj59V3iKc9aDrkoqUbVP/8lL0G/VijfMvVOtqH3cawxRwYZR7La2/u6XFtfJ30kREerOFfJcF0AC3MBngunfxcgDzsnaomE+4IGdSKGQVssHGL0J/8GRDyZr2/4UWOxKz3zye551FB7EANgzmw/vyhMihlF/zgnHZiM6KBQcQG74fP6R2QbpfCskocINI5qseC13oK+g4ZBpikaoLtnix x-ms-office365-filtering-correlation-id: 5deb6749-db1a-4727-6fed-08d61aab3abe x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0471; x-ms-traffictypediagnostic: CY4PR21MB0471: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(85827821059158); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231353)(944501410)(52105095)(2018427008)(10201501046)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050)(76991041); SRVR:CY4PR21MB0471; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0471; x-forefront-prvs: 0796EBEDE1 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(136003)(366004)(396003)(39860400002)(346002)(199004)(189003)(7736002)(8936002)(81156014)(305945005)(81166006)(8676002)(66066001)(316002)(7416002)(110136005)(106356001)(5660300001)(6666003)(54906003)(86362001)(102836004)(86612001)(22452003)(53936002)(6506007)(36756003)(107886003)(97736004)(76176011)(2906002)(476003)(99286004)(486006)(26005)(1076002)(39060400002)(217873002)(6512007)(186003)(72206003)(10290500003)(6346003)(478600001)(256004)(6436002)(11346002)(10090500001)(5250100002)(446003)(6486002)(2900100001)(14454004)(6116002)(4326008)(68736007)(3846002)(105586002)(25786009)(2501003)(2616005); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0471; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: N6VcWDw8TuCSWPJKDfFZilHV2qb+OKCeebUdp8RMWiML1R/+c/CZC4Z0gAgGFDemnbTRSAUjtNDlQ4uBkgp+uMu4ZG3v14hI7EifiH6LY5zbr8+Y+fv3A1HMbJloGLgqlQpT5p+a8/OM0R31rqKvR1poGR0Z88DDmJEv7/TIcan4R5G9IKlj3MUmkbng1jmmeugOpGZJHV5pYMHcyjMt7RjjW8Ffmo/pycSzMwrgZVE+jleAWGgHzcGDYl9TFpbrm/LPj4elL9N9kwm0vlTdIx/e9hJXY13KUOtVWK4f3pvOnXfM+QY4dqDQs7Hodm7Yq4xPdLneS2ll8RllgrBv9EYkxFHaa2PhDVsGG5IekuQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5deb6749-db1a-4727-6fed-08d61aab3abe X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Sep 2018 01:32:58.9615 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0471 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Stultz [ Upstream commit 1416270f4a1ae83ea84156ceba19a66a8f88be1f ] In the past we've warned when ADJ_OFFSET was in progress, usually caused by ntpd or some other time adjusting daemon running in non steady sate, which can cause the skew calculations to be incorrect. Thus, this patch checks to see if the clock was being adjusted when we fail so that we don't cause false negatives. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Miroslav Lichvar Cc: Richard Cochran Cc: Prarit Bhargava Cc: Stephen Boyd Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Suggested-by: Miroslav Lichvar Signed-off-by: John Stultz --- v2: Widened the checks to look for other clock adjustments that could happen, as suggested by Miroslav v3: Fixed up commit message Signed-off-by: Sasha Levin --- tools/testing/selftests/timers/raw_skew.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.17.1 diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c index ca6cd146aafe..dcf73c5dab6e 100644 --- a/tools/testing/selftests/timers/raw_skew.c +++ b/tools/testing/selftests/timers/raw_skew.c @@ -134,6 +134,11 @@ int main(int argv, char **argc) printf(" %lld.%i(act)", ppm/1000, abs((int)(ppm%1000))); if (llabs(eppm - ppm) > 1000) { + if (tx1.offset || tx2.offset || + tx1.freq != tx2.freq || tx1.tick != tx2.tick) { + printf(" [SKIP]\n"); + return ksft_exit_skip("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n"); + } printf(" [FAILED]\n"); return ksft_exit_fail(); }