From patchwork Sat Sep 15 01:29: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: 146749 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1324944ljw; Fri, 14 Sep 2018 18:52:32 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbkg8FVA7Q6dEtsQ/3EWEB8U1DsU198VUgh3q9dexBFo9KlK5ZDOwRuCQYxB5ZLy6F3FsqZ X-Received: by 2002:a65:448a:: with SMTP id l10-v6mr14293676pgq.382.1536976352603; Fri, 14 Sep 2018 18:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536976352; cv=none; d=google.com; s=arc-20160816; b=BN6B1fvWhyG6A1yoc1tN03CQBCY/Fm9L0Otzb8Nc6oyp+BA2iN+C/TYx8+UrPjso38 YP4ECZxd4a00UyHgONYZFmJ+IVZfUvHTmKziI5gsJdan8Crq/3dFy5TTFbNEfcI9dnKn Q2ifCbN6oIH357HFsslHOfh3RwZ21paJ8gFb2jJbLECcjMTJW4785V/BWoRWzt+jAlDO gpAOvmoUx0lVYJqwnDrUJsVpI+lw/UUPDP64zEu3YTPQ+dwI6d0Rd80Mm5WdSflvs9dS zzUBpMISdx0VBS482lK/hl8V6yBfvlUH6Ov0i5T2NXru9ZeNEi+P3kIbFqg6pTDwFvdL xkig== 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=P+coewou0ynbq0N+SU8HMqbkUvJmwk49zLYpWuSOx6Y=; b=hiozblgxb7rLMZUxTX5okPSAbVrazc5snoVhBvllWoMCN/MGyK2TKIlUi7/qRi5TuT NAiR38G6ATuIrU4xh+G76j6UE61cQoQmjTr/2qJm+KCN8vA/mzFkd31FljyugBGvXYJd 1oq9I5LHSvIvQutk8CA5RfoqQh1oNaS7HgMa9/otrO9CimbbzcOe6H5NwSAHoI1f87Tz +ub9DzBfUUkwvXzj+Y5CrFQG4KXqQTb9o/ljEboBYxF/MUAYQ1h22zFs2HHj1Fn78bk5 ok0k0ue1bYgYF8JTBlwdEFV08eSMvbG9Z0rCbzQpYuS2fq4iHDTdOLciCJeoYBWTHNml LxwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=nxeOeGGD; 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 t31-v6si6698165pga.167.2018.09.14.18.52.32; Fri, 14 Sep 2018 18:52:32 -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=nxeOeGGD; 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 S1726439AbeIOHJf (ORCPT + 13 others); Sat, 15 Sep 2018 03:09:35 -0400 Received: from mail-eopbgr680131.outbound.protection.outlook.com ([40.107.68.131]:36298 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725907AbeIOGqv (ORCPT ); Sat, 15 Sep 2018 02:46:51 -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=P+coewou0ynbq0N+SU8HMqbkUvJmwk49zLYpWuSOx6Y=; b=nxeOeGGDdBK8ZJCsE1o44mlYzojRpQuyJQOgUXSarip77AoUy7P0WdeQSQ6Mo/KQctH7Y1sAJC0bul66d0/7Bry+DzjQhN2Yemukw4WNs32amaJwD/MNzKT0VjohH1HPApPb+7f0n+IyeFgQvjVanz8vVw4t28tXPyEbJf3tv5Y= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0840.namprd21.prod.outlook.com (10.173.192.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.11; Sat, 15 Sep 2018 01:29:50 +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:29:50 +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.18 03/92] arm64: dts: uniphier: Add missing cooling device properties for CPUs Thread-Topic: [PATCH AUTOSEL 4.18 03/92] arm64: dts: uniphier: Add missing cooling device properties for CPUs Thread-Index: AQHUTJOYDww9DoLOdEa8jG7S/uZEnA== Date: Sat, 15 Sep 2018 01:29:50 +0000 Message-ID: <20180915012944.179481-3-alexander.levin@microsoft.com> References: <20180915012944.179481-1-alexander.levin@microsoft.com> In-Reply-To: <20180915012944.179481-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; CY4PR21MB0840; 6:v8AKFuHJkotndYc3pZQoNY9I2FHsTOEgQTp3BHS5BFyfcEYM/KOVIu2Yxfhpq0V3lnsdMsJtyuyyWwkRlMmUqdyg7mOd58VEAvpvPVJ9J94FXELJc18fSlqxKv8ngrBkmJS+mRsliFv1NbnA0D7+K5PZrU4CL9WEmFwooPjnM7Q2Qzi2c1dxVmAHf/EgvbYxQRKKj2XAyJiKbuGuCg0y6Io3EnomqnKTzuX2IekYrhxWUce8HTKfeTT9vNBaokQJHhnKRRuIC42qFCWMDNbOhvlBQDpX+c5u7pw5G/zj2bb6XS0M6Y3WW4h5IbdC/JYF5A2JpHPF+o1EHlKG7EhH9VXOFtglI1MAHUnGzt1G8y98JFI4TaPNEB+0517olXpCwAWdVoWLiDPDRPJktjPCHjWQFX/9NAL3rd430jIHBifF12na/jkQX0KCCWlpk1Itu7jLMSF9oZnbYkEUAZsuoA==; 5:hHF22ymuM6CRsduZuT5TK9PP+XJxpVibPFlAoag4iOsk54bXesyvkkbX2rfCJS2IAhCH4fJsNN3UGQMKglDk5/M+JWOIbqDx7A2oZE+AloqHhhYqNM3aAugQ5puPJsbCQ0th3HKywI+nYCZd/ogHhtEgtLpkNODzFsBJBztj0og=; 7:KGft6GazySF2tahO73xOUR9X1EbIvkESeEpgRB5n43GLt3MZyMDNCV4LDzaXW60dK0k6fsLhMWvEwNuDLuewfGOK3578jAVwCcFfS6FC80jqPMpJr2Qz5uDCdq6XrvBgsO8BCUaI49ZBFfdwjy0f+91OTehaOOBj7Yz0vH/MckC5mN7n/XdmrI9Xf1DBtZUGkCJEhFPgu7vGPmDu+OBo/FxmWwWMjQIrduXhQWFNbSRAHpM4QoMj3iBUvbTOdAUN x-ms-office365-filtering-correlation-id: f6609983-3466-4ac9-c69f-08d61aaabaf0 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:CY4PR21MB0840; x-ms-traffictypediagnostic: CY4PR21MB0840: 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)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699050)(76991041); SRVR:CY4PR21MB0840; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0840; x-forefront-prvs: 0796EBEDE1 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(136003)(39860400002)(396003)(376002)(189003)(199004)(14444005)(6116002)(81166006)(2906002)(446003)(478600001)(3846002)(8676002)(106356001)(105586002)(10090500001)(22452003)(8936002)(486006)(2616005)(72206003)(36756003)(11346002)(81156014)(186003)(26005)(14454004)(6506007)(217873002)(4326008)(25786009)(256004)(107886003)(102836004)(6346003)(476003)(1076002)(10290500003)(575784001)(86362001)(66066001)(6436002)(6486002)(86612001)(53936002)(54906003)(2900100001)(97736004)(7736002)(6512007)(305945005)(76176011)(99286004)(2501003)(5660300001)(316002)(110136005)(5250100002)(68736007); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0840; 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) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: efHN+zkKhWKvAkIUpp8BMHRpn0flnynEEjx/Nxfc9NZIfUcIU/hBinnS5XMaIS53G/gSttLn5jynbR03MtCG1wdXU/SrqUiUyOSdxqmuWtm4OnsKsREmtYEHJ0zSHmw6mt/y7yL1ek5cpnCHlE2gt1rJIeBvxQJzcsThrM2vvQaO/bS8rCIVdAQIo1/a7mobRO6pxbkpL4R2PRU4iDyTz97ZREGdSOPoLkGZZSP09PuRDmOD38DGm4nu1kR8vibypUAH3cal6VnQM7VklmOIJX0CRKwLP/Md4bLejvI5T4S7J94PAf0Y6FWksulOhNUgrq13lJv/S0WU2Ggm3ssUUZBXdRLbZt0q1LZyqS8zgpI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6609983-3466-4ac9-c69f-08d61aaabaf0 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Sep 2018 01:29:50.1826 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0840 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 0298bd0d0e1a..caf112629caa 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -58,6 +58,7 @@ clocks = <&sys_clk 32>; enable-method = "psci"; operating-points-v2 = <&cluster0_opp>; + #cooling-cells = <2>; }; cpu2: cpu@100 { @@ -77,6 +78,7 @@ clocks = <&sys_clk 33>; enable-method = "psci"; operating-points-v2 = <&cluster1_opp>; + #cooling-cells = <2>; }; }; From patchwork Sat Sep 15 01:30:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 146741 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1311532ljw; Fri, 14 Sep 2018 18:31:56 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb7kKWb8XRpR4FmOwK1OhZ6Ncv5S7Md2MdBbBoSB1yuYvdZMPjrJoX0B54lzha9BO8RasXq X-Received: by 2002:a63:798c:: with SMTP id u134-v6mr10491784pgc.111.1536975115892; Fri, 14 Sep 2018 18:31:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536975115; cv=none; d=google.com; s=arc-20160816; b=I/UL5Pii+dK1TMvN/g//L083JjPwhWe8xox803XmeLeFQpajxjDBUMI4hDdUuEDpEm Bo38egayIHd9jH5kB9V7thJ8z1N8Pdw9rLVI4uPBimG4l2ETFAOWf0HqjomcIBJiSdSQ Z03hU7SFlfbCj76H2dHYS04yLFcS1fu+egHx9UCdtX6hgJwB3+Sly3lC4Gp/Jwm1Mb50 s+lUj3HBItSEcXQR3+JFLdnnSENzExZwjRs8MYEr7y6W70VqiLWRfvSh0QOW5kcQAns1 NChBSaFMk5tIf87uP9V1TAprW1AbBe0nRtsA7B+CZi0Ete2gPb0zbYRC+leLhS7DMEZt vT7A== 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=QrnF2q/nx6LDoEK5zR5RRl+ImiMrlolZ2YNyNuQhgBtNn7oq5qNhcaXxpJbn4qq0Ri 0i15nS5vIj7YuBQF9K7Xt9bwHRdImsE28Mb579lN0s5t8jvowdoCnHXk267qQK9VhS+i f1L+atvyAEw9WzMRzbt59mY+T/EDehAvteBFyzsRLg7z379XZxhSsdjGFMg7Hd0S2JkS 5W1xbBd18lh3Jo9GpyZAuoOPUAy/ULYlpL68aPJar5CQe7dj8qVrsVdgM3Em+1NkKX/X xD/Q5tynndlONpyd2XrIxvBC5vXpA8N6b5l2VTNGRCERWoEGIpL/fMVkc04kMCFmvnRt +ssw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=HyCG+s3L; 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 2-v6si8848486pfd.39.2018.09.14.18.31.55; Fri, 14 Sep 2018 18:31:55 -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=HyCG+s3L; 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 S1728352AbeIOGsv (ORCPT + 13 others); Sat, 15 Sep 2018 02:48:51 -0400 Received: from mail-eopbgr730136.outbound.protection.outlook.com ([40.107.73.136]:54496 "EHLO NAM05-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728900AbeIOGsu (ORCPT ); Sat, 15 Sep 2018 02:48:50 -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=HyCG+s3LNBJ/VRq4TGGXbujF7gPAWHAPYeA+HT3AyPlTGN+UQamkVEo/DlZMIuLM925SQ1A9hGlwvTHBuo5s1LCQ56zbcssqmBcslBxIHqZQkSDWdX+IgFHqExiLuwyIqfetBxpl/9iD/ekPv6A6PdTEdM2hWlrv9VE34kFk3Gw= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0470.namprd21.prod.outlook.com (10.172.121.148) 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:31:36 +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:31:36 +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.18 75/92] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Thread-Topic: [PATCH AUTOSEL 4.18 75/92] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Thread-Index: AQHUTJO3P6hK+RWZ+kO9xo9VBMkWtg== Date: Sat, 15 Sep 2018 01:30:42 +0000 Message-ID: <20180915012944.179481-74-alexander.levin@microsoft.com> References: <20180915012944.179481-1-alexander.levin@microsoft.com> In-Reply-To: <20180915012944.179481-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; CY4PR21MB0470; 6:Blt0cJj4yDHHnsaNDIbvvOBENm4zF/Rf084iiXbU6HjNZ3dCk+qfZttXbJpSWw1+TQluKA4OssdMmwW8wYEDrPe+YKCu8WTiA93soWzjOwWapctwlQCJ0ZdC9hAB+FaDcKtjzqzmm+RocIDjhT3Bd+lt+qI0ynF/fWQ/WusSMu2M1e2XQLe9+OS/N2ezx+ju8pl5DQMil8rsgSNFBaQx2qrjOfSKvGURKQZyUJZiuuIsA7xlDcEOA+zB/RPIXl5SC6sU98M53AvO8XvNa1vGcsMyHxkm4T8MXCA1K0DQpQ1U/GglMNN8PBPin7p2SNoijYh7dHuuaDYYkqlVRi9ivrEkGShJ5fYaNlDE8qU8JTu+eToFQKKVMKXwSPYb+qtRH5aRJw3+S/K4JIKeJetOYUf98e2/9k3Wivfq+FIG8Sj8bzqSV1Xng6yHABfDB1onaHFRiuYxD3vPR8fKsV+EUg==; 5:z3tUMiT3jurZKUf8jC1yAh6PuIH5tpkJeYv58O611/pVPo3N6fIRTSD19X40eG1DMP9DfegRyZKrnDr1LVbsAZ2mRitKJ/NM2aUQYhXq1tPCQ54bQpkEN6Pb3SGksLeI6YBEW0rz1Qs6kvSOOE2RuSR7njeo24zZjFCq73VlM0w=; 7:Wss3Q6kw+BbsM0Z9kniTqsqlZuNKzYwhVzNU6CkHYGu2OIDy0t/SdKW+ZM/tj0GY4EKAwKg1O49Ru95Z6a5CjpPh1cuFePTMFOuePdO6V/pRsS+/VFr+ZLLU0ASuWGA9c9vw7+Eoszr/F8SIlJTS/evtx4dYwE7ISHsjTGaeSap4AovGMBoOW5tYtWhIv8T6VC9sKb44K9bw3WZGGf05qqCZfyQkTlKpa6ueeEeukMtp33UXBTD74RwvfiWC5vAb x-ms-office365-filtering-correlation-id: 2c6aa5d2-094f-4162-b631-08d61aaafa47 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:CY4PR21MB0470; x-ms-traffictypediagnostic: CY4PR21MB0470: 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)(8121501046)(5005006)(3231353)(944501410)(52105095)(2018427008)(10201501046)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(201708071742011)(7699050)(76991041); SRVR:CY4PR21MB0470; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0470; x-forefront-prvs: 0796EBEDE1 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(136003)(39860400002)(396003)(346002)(376002)(189003)(199004)(6506007)(2501003)(2906002)(6486002)(6436002)(5250100002)(99286004)(486006)(14454004)(81156014)(26005)(81166006)(8936002)(6346003)(102836004)(8676002)(186003)(2616005)(476003)(446003)(10290500003)(11346002)(97736004)(478600001)(72206003)(10090500001)(6666003)(105586002)(217873002)(36756003)(106356001)(22452003)(316002)(256004)(5660300001)(54906003)(110136005)(3846002)(6116002)(25786009)(66066001)(107886003)(4326008)(86362001)(2900100001)(39060400002)(7416002)(68736007)(6512007)(53936002)(86612001)(76176011)(1076002)(305945005)(7736002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0470; 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) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: epwlNa9Cxff4LPw20vkmRl42cqSa7W9xsTM20k0qrokI0DBvZ7wEjAUUEY47NPJVPVaewI49t1Ei3GogqklWupx5LK2ZHS7x5jBzzu6gDYgHu4dRiNfART0LG8K7anwHd3G5dV53Ybus2yzaIVqS62Nmp/8tILyKMql11Vw3IdcfGlBZ6CcDBDZ8+ofPr3jm1LZmU0ObSMbZU9UYO+7Q9JHmOObIkogawbbAl2Pywj+/B0q/sW+K0UNDvERJtQGYILHU0J9k78+OEVpUULSv1a3YNxxGVGFqnrrtAFZrPuw4R/s3xeXCNKWO6uw+CZgJyaBhrTq3WC0dLVSPWZ7Zy7c7aQyZLSWmyGCkElNRd5Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c6aa5d2-094f-4162-b631-08d61aaafa47 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Sep 2018 01:30:42.4480 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0470 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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(); }