From patchwork Wed Nov 14 22:21:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151124 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6247190ljp; Wed, 14 Nov 2018 14:22:20 -0800 (PST) X-Google-Smtp-Source: AJdET5diZkWOp1WEcwt0dDT1clPBQ5eHKe3toZimZId2p9AoKkZPuCYB0ugZqFXlBVilgNWm0XB+ X-Received: by 2002:a65:6684:: with SMTP id b4mr3441548pgw.55.1542234140225; Wed, 14 Nov 2018 14:22:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234140; cv=none; d=google.com; s=arc-20160816; b=uCptYHvrzjrHi5OuxfeohEuh4Zsgm2l7KrePn82J3FAdOoRkt7PYBJWfP7eTc+cwjz W/qzdguJyjMxMQmTI2grge6mn+VnnnKHF4aZwIuimRikpFQCRu6eMS5J7WKpmp+IWfPh ESq7CakJ4gzc/yvoYoYY1gHZ9Z30Z8ls/HBSTlE4uMcqNdcO4qnHychAC/U+eCNtQg50 kxFM67VTWgI7ceIw4Ce+zctLtXgmPvgqRlgAskZ/SneSieDRN7O2hlK5p6CoXB9kPHAS 1bntg3rNFgfRTPoGyU2iOUWbOXRjURKYN/d+4Yi+tKS5vSgWzW3k2RiU7VW+RifiLNYJ 9Xfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=6ca0fCSnISsZYtGEz5c7rBZHlKm673E7oxfjzRnUX9g=; b=NhAtO8+SsXHnCex2u2fKjaElJqDdgEBKOUBtagTi5cGh4Q2wWIi7okYr6VW0LzCFoF JwsXUuQ5gSX6diXwrVQK8HMgMcHBLBXgXA7rLjJ0uBrb6o92yZ+WCJgO+UcYIGxPeorO lgzJ8KRpULWM+KBSm16Qt8NoEE15IMbgXFSUE+r8AWjmA3hCRU/YW1GD9Hmy6gmh0bIu lnideZN9wYQmCEJPKJ7xk7IpPHtmNdqo7ks+qhrtF+DO5LdkTZ7ATXQ/1d2fyljCVy8M lr2Z/sC+MO1iI5U9JE1olacdpbEQsjudgfGm/tzTCT0ZCJQC5w6P0WpZfYGQpncuXHbU jqPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=npy0LUHo; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o6-v6si29247129pfa.162.2018.11.14.14.22.19; Wed, 14 Nov 2018 14:22:20 -0800 (PST) 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=@kernel.org header.s=default header.b=npy0LUHo; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728739AbeKOI1V (ORCPT + 32 others); Thu, 15 Nov 2018 03:27:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:34408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728569AbeKOI1T (ORCPT ); Thu, 15 Nov 2018 03:27:19 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C053D22525; Wed, 14 Nov 2018 22:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234135; bh=iXQaoahU+WSY4TNy7hOIhTM5342jw2UAAu3tiNpo0Ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=npy0LUHo09X4qo2Rnls8Fq7ZmQPP2L6BjAwvXyCIgCOdZcbpEmR/Gxk3eU/TddS1X FF5uv0/jQ962/rwiGjmCEu5xPVijJwfYIi40M8OVa6WCmpHBCn4FhD0gIDJ+XbhggR HCvxlR3qpOeP65xM6Tyna5tZZqeM/gCPJ54sZvcU= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , Mark Rutland , Sasha Levin Subject: [PATCH AUTOSEL 4.19 31/73] ARM: dts: fsl: Fix improperly quoted stdout-path values Date: Wed, 14 Nov 2018 17:21:25 -0500 Message-Id: <20181114222207.98701-31-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222207.98701-1-sashal@kernel.org> References: <20181114222207.98701-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 1af6ab3bac8458fc2e92ad7bb97b62de4a1fddef ] A quoted label reference doesn't expand to the node path and is taken as a literal string. Dropping the quotes can fix this unless the baudrate string is appended in which case we have to use the alias. At least on VF610, the problem was masked by setting the console in bootargs. Use the alias syntax with baudrate parameter so we can drop setting the console in bootargs. Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: NXP Linux Team Cc: Mark Rutland Reviewed-by: Fabio Estevam Reviewed-by: Stefan Agner Signed-off-by: Rob Herring Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx53-ppd.dts | 2 +- arch/arm/boot/dts/vf610m4-colibri.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/arch/arm/boot/dts/imx53-ppd.dts b/arch/arm/boot/dts/imx53-ppd.dts index cdb90bee7b4a..f202396e3f2a 100644 --- a/arch/arm/boot/dts/imx53-ppd.dts +++ b/arch/arm/boot/dts/imx53-ppd.dts @@ -55,7 +55,7 @@ }; chosen { - stdout-path = "&uart1:115200n8"; + stdout-path = "serial0:115200n8"; }; memory@70000000 { diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts index 41ec66a96990..ca6249558760 100644 --- a/arch/arm/boot/dts/vf610m4-colibri.dts +++ b/arch/arm/boot/dts/vf610m4-colibri.dts @@ -50,8 +50,8 @@ compatible = "fsl,vf610m4"; chosen { - bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw"; - stdout-path = "&uart2"; + bootargs = "clk_ignore_unused init=/linuxrc rw"; + stdout-path = "serial2:115200"; }; memory@8c000000 { From patchwork Wed Nov 14 22:21:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151125 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6247222ljp; Wed, 14 Nov 2018 14:22:21 -0800 (PST) X-Google-Smtp-Source: AJdET5ffILSfjOKIknmdiLrvi9g9vSfMyGFvg3KGdpwl57JOhqSCbKY0uAJKer+OMstygf0OH4Gy X-Received: by 2002:a17:902:b498:: with SMTP id y24-v6mr3756997plr.179.1542234141791; Wed, 14 Nov 2018 14:22:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234141; cv=none; d=google.com; s=arc-20160816; b=yooBcnAZ5sb1fOzt4PXpZv0DpgTKxzNaQDMD+d4pFVLuJlkO3jQz0rcsqnskCqIz95 L3Mxei6H1aDRmMsJqMgsxzn29TLf4e4OkKPVkPsIuRzD5um3yoi56wcDzobqFu7CIlf5 P037B1ssvtb6w4JN897SqORjJdVqnLSP04j6bV09bAHhh/fze+m6gwKZBB2OLaDeqIUm v8+eJnqEVcgQhvENDLRCRcUwO6Qb47DKtbzBRWCRLwgnWa3ovtwaY5tU0gTuBhes1AkP YUvgXrs/M/nh+0+Dx/KbjcChgpfd25srahE3awqbUoq5wrfa7SVcVyIu9xisqD/MigiB TR7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=YzN2BCgSKS56OAIN3clOZ/GDAyZyA0xi0cZN+5E3T6Y=; b=Hw1z58uambNJu5n9CLjlrHUT9+Ig/djhhp0pozQH85kTMb42RGBMXbZ/RxPTQSPf8D v1ghW//m8bUO5IAzGMfBhkx1svcyappKpvAFhTc0eNR4FHFpqg1QRz/8fRc59DlRKOTh c5AilQpi7TtmAHPxBbfZegDPjyXgT+8PZzVlLOKk1KHza9F/kwCupokxAr/G7Yqcab8N +M9sp3zdLoSLfzV5nDaQJzwaaTEzrx4lA0NciafEmsFCl/Jpo/zOYAtr7nnSAJFNrrGK 4X1+NgoMjenx3fjNimaYuyAZNy3fyJv5hciKS2f/5SbLX1uj3NuSYzwwh8iKM8vQ4BhC mVGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=o92YglzZ; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o6-v6si29247129pfa.162.2018.11.14.14.22.21; Wed, 14 Nov 2018 14:22:21 -0800 (PST) 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=@kernel.org header.s=default header.b=o92YglzZ; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728855AbeKOI1W (ORCPT + 32 others); Thu, 15 Nov 2018 03:27:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:34470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728689AbeKOI1V (ORCPT ); Thu, 15 Nov 2018 03:27:21 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B2312252D; Wed, 14 Nov 2018 22:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234137; bh=ySSQ3pcYerKH4OiBJKAgte5YYA9tT0QRHveHFw8BwvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o92YglzZSJB+kiKzWt9fGg2Ul7JUnALoEOiNDmR5PoWijYQY/dof1ViRBrMcz6rz7 TGKAi6UAPICEUHSVlNEy3WdnwfuEtyLSqkP3nRxpyap4HopvrWSqlZYz0p0R9kyhg/ SK2Exwsg82E0A3avtQHys1vd27msPJJX67G440pc= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jeremy Linton , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.19 39/73] lib/raid6: Fix arm64 test build Date: Wed, 14 Nov 2018 17:21:33 -0500 Message-Id: <20181114222207.98701-39-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222207.98701-1-sashal@kernel.org> References: <20181114222207.98701-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Linton [ Upstream commit 313a06e636808387822af24c507cba92703568b1 ] The lib/raid6/test fails to build the neon objects on arm64 because the correct machine type is 'aarch64'. Once this is correctly enabled, the neon recovery objects need to be added to the build. Reviewed-by: Ard Biesheuvel Signed-off-by: Jeremy Linton Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- lib/raid6/test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile index 5d73f5cb4d8a..79777645cac9 100644 --- a/lib/raid6/test/Makefile +++ b/lib/raid6/test/Makefile @@ -27,7 +27,7 @@ ifeq ($(ARCH),arm) CFLAGS += -I../../../arch/arm/include -mfpu=neon HAS_NEON = yes endif -ifeq ($(ARCH),arm64) +ifeq ($(ARCH),aarch64) CFLAGS += -I../../../arch/arm64/include HAS_NEON = yes endif @@ -41,7 +41,7 @@ ifeq ($(IS_X86),yes) gcc -c -x assembler - >&/dev/null && \ rm ./-.o && echo -DCONFIG_AS_AVX512=1) else ifeq ($(HAS_NEON),yes) - OBJS += neon.o neon1.o neon2.o neon4.o neon8.o + OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else HAS_ALTIVEC := $(shell printf '\#include \nvector int a;\n' |\ From patchwork Wed Nov 14 22:21: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: 151136 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6264407ljp; Wed, 14 Nov 2018 14:42:07 -0800 (PST) X-Google-Smtp-Source: AJdET5cFJM/geOGi6YP7VwBtby1+ZyDUueyc4tIHSfJgAFUZRMToTXXjMJLLt9LfIqRON8o3ikYi X-Received: by 2002:a17:902:8c89:: with SMTP id t9-v6mr3795990plo.336.1542235326946; Wed, 14 Nov 2018 14:42:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542235326; cv=none; d=google.com; s=arc-20160816; b=PKaWJqKq+YSC0b1snQKi/2ziCkBehtK8A25XnV9u+h/AGibWGoI9VZtzU51Mwr+nUk 5zCOvxjliRlmuO5NEdyf0E6TQmLXVowhBv66xH3wkhnJmiE737fLWuiWtM0bPDaXmnuF YG1O9duIsrgsaFQeOO54HGH96TxSiV7qW8pECQpqUfACI2V5vbPXGTPCR50NTo/acVpl bRyp8zYtgS9CoUdjLbuD77tjsGMUvgJIaybZnFnU6SsH48tslqoNxUqU5grItR/F8YvL dWwmQTP3GtfmqfqSquf38/Xz0357VnQ/TbFUnC/XNZarT1viEOZ/1oEreE4H9ZBV0p2G TOag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=RI2rb08ZKuxEXnMUxV0KaIg1d21CjJEX4MHQUlUDxpY=; b=Zano/tfG+IdMF1QZv9AinKQ9fQuLDnfsLP+qJpgMAyiC9kHP1Vjxd/JWgFT+Sexqmt CirwBLHQzKJA4eQ/qyu9jtG//liy0ziLMTrBQvrDE46JCD5feCoAUMPwbflQ5ijk0sQC PmAIT/uSiRIzEFeRgJmJ/LREjZ8pGfV3kvsCjQQHENJUbuXgeBf2osQN7jqMgdcKziPi uDLGeHhct6juXDnlnp+ftXvvHJmqGne+u2wnIsiqaMKrE3A/FiZBiOWKClCQJeEr/izj VftOKdqtllMF6bgcsgMOi9fT4EXOTJQf9Bdb8ogVpqI0dfS4PwLfcJrN8hcE86mT5v2o fsJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eUJGPjhi; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n1-v6si25103928pld.378.2018.11.14.14.42.06; Wed, 14 Nov 2018 14:42:06 -0800 (PST) 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=@kernel.org header.s=default header.b=eUJGPjhi; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387613AbeKOIrO (ORCPT + 32 others); Thu, 15 Nov 2018 03:47:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:34392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728689AbeKOI1W (ORCPT ); Thu, 15 Nov 2018 03:27:22 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C42022513; Wed, 14 Nov 2018 22:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234139; bh=xNiRCS4AfeOQtRse7eeCVDZeEpPpA502djnbNXIq+Wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eUJGPjhi9Y6kEnLGGIK1Dr41ApxJxQFb73MT/uuOgVl0jrYfp+WMp7bJwaA4tnEkv PW2djxlHHuKjMYwoXdFu43g7r+QQDyEsU/tU3ouZ6DeqcrW707gg6ZSe6Yi/hxbw6d VeVukN3Uwmv+JKFEOPPRpCWH1gGyUedS8LCKMAic= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jerome Brunet , Stephen Boyd , Sasha Levin Subject: [PATCH AUTOSEL 4.19 47/73] clk: meson: axg: mark fdiv2 and fdiv3 as critical Date: Wed, 14 Nov 2018 17:21:41 -0500 Message-Id: <20181114222207.98701-47-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222207.98701-1-sashal@kernel.org> References: <20181114222207.98701-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jerome Brunet [ Upstream commit d6ee1e7e9004d3d246cdfa14196989e0a9466c16 ] Similar to gxbb and gxl platforms, axg SCPI Cortex-M co-processor uses the fdiv2 and fdiv3 to, among other things, provide the cpu clock. Until clock hand-off mechanism makes its way to CCF and the generic SCPI claims platform specific clocks, these clocks must be marked as critical to make sure they are never disabled when needed by the co-processor. Fixes: 05f814402d61 ("clk: meson: add fdiv clock gates") Signed-off-by: Jerome Brunet Acked-by: Neil Armstrong Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/meson/axg.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.17.1 diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 00ce62ad6416..8cf74fc423e6 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -319,6 +319,7 @@ static struct clk_regmap axg_fclk_div2 = { .ops = &clk_regmap_gate_ops, .parent_names = (const char *[]){ "fclk_div2_div" }, .num_parents = 1, + .flags = CLK_IS_CRITICAL, }, }; @@ -343,6 +344,18 @@ static struct clk_regmap axg_fclk_div3 = { .ops = &clk_regmap_gate_ops, .parent_names = (const char *[]){ "fclk_div3_div" }, .num_parents = 1, + /* + * FIXME: + * This clock, as fdiv2, is used by the SCPI FW and is required + * by the platform to operate correctly. + * Until the following condition are met, we need this clock to + * be marked as critical: + * a) The SCPI generic driver claims and enable all the clocks + * it needs + * b) CCF has a clock hand-off mechanism to make the sure the + * clock stays on until the proper driver comes along + */ + .flags = CLK_IS_CRITICAL, }, }; From patchwork Wed Nov 14 22:22:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151126 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6247788ljp; Wed, 14 Nov 2018 14:22:59 -0800 (PST) X-Google-Smtp-Source: AJdET5eCU1d/F17XkSz87+PGLraiqxKV14WzpL6uGuDdOYkUJqnUa79VyYx2zsbWB1LhjzRD6kQm X-Received: by 2002:a62:2681:: with SMTP id m123-v6mr3720982pfm.131.1542234179598; Wed, 14 Nov 2018 14:22:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234179; cv=none; d=google.com; s=arc-20160816; b=Y6jTBRUqepH389afUfl2tiFZCIw+crh99+lFd6kkPzxexw/dtLFsXzBl0A9C6FBUdz bNjYUEdfxbDDtTfaGL4Oz8izLVoUApagjBHZpFU1iOJLAgFPjLJpElQVeJaYg13mPwIu Cra3NLjl0QcPxS9oFZZsZu88cASeCRFxsOlbbVIk7KjEFanp7dNRlmjoJUeMGxIwSkFE RYmKzjMf5Pmh8lwn+HZqQMXqpINPvQHEkBgUNma2R1rdnLU+wzb83jEITZrArmyZlFm9 WGLICW8Z8wVeUKPr7kSN1J9UTjimvisKmoHW6q7GMv+KZWWzxoehX7D/lmcAhKAAVwIX RAGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=HOz/ymljh5ws6053mNvgaUY8xxSe5NoOJXk52ut4NAY=; b=ieMqIQW4lokQoP7lCJOc/510iVOtSQXRt5N59Acoidqyo7AkH6HQKCsi4I/O0YsVwQ /njSeX7vQtxOWgg5rtu9ow0RxYObQJAzD0mos9knE2STTTeaGDEKtPKm/42bOOTM7BwG HDAVnkry8ALIT0LKXTgD4GtUIL5wB7GYiqj64ztR9A3KV0oJ350lsbX2aHOQ5aHL2fYn QPHv+8ifvKfsH675ybztfUUbdROfQjbR4ml3uIySqKBPzAvUhXkZcKo7Mv9ck5noAhzg fRcNkhhUm+Hm3pClFiVlexP+M6zmOCuUU+k9jfiadDIGkQv657NiG69EI6i9WrODCGMc Lqdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ftcM1fdv; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j191si25113407pgc.15.2018.11.14.14.22.59; Wed, 14 Nov 2018 14:22:59 -0800 (PST) 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=@kernel.org header.s=default header.b=ftcM1fdv; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387599AbeKOI2B (ORCPT + 32 others); Thu, 15 Nov 2018 03:28:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:34416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729131AbeKOI12 (ORCPT ); Thu, 15 Nov 2018 03:27:28 -0500 Received: from sasha-vm.mshome.net (unknown [64.114.255.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 89C2E22527; Wed, 14 Nov 2018 22:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234145; bh=PI+hZZNFGUt+emewcGFBoB5orr2rU7k1HOxK1T4GxAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ftcM1fdvpZvicG3uP91MTWZRkdGkDgdl6iFugdrEtxQnKPaStyXMdhoqTriywdBdk s4EdZqk5Uk0V4hnDBRXmnVGM8BppX8H4e+lhyx2sC+AvM0ZaEqed5jU0MDa5UrWcWm ktq+H4jlA57m0voTZr9gaJhW06tkNHnq8nIzIm1s= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 4.19 71/73] kbuild: deb-pkg: fix too low build version number Date: Wed, 14 Nov 2018 17:22:05 -0500 Message-Id: <20181114222207.98701-71-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222207.98701-1-sashal@kernel.org> References: <20181114222207.98701-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada [ Upstream commit bbcde0a7241261cd0ca8d8e6b94a4113a4b71443 ] Since commit b41d920acff8 ("kbuild: deb-pkg: split generating packaging and build"), the build version of the kernel contained in a deb package is too low by 1. Prior to the bad commit, the kernel was built first, then the number in .version file was read out, and written into the debian control file. Now, the debian control file is created before the kernel is actually compiled, which is causing the version number mismatch. Let the mkdebian script pass KBUILD_BUILD_VERSION=${revision} to require the build system to use the specified version number. Fixes: b41d920acff8 ("kbuild: deb-pkg: split generating packaging and build") Reported-by: Doug Smythies Signed-off-by: Masahiro Yamada Tested-by: Doug Smythies Signed-off-by: Sasha Levin --- scripts/package/mkdebian | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 663a7f343b42..edcad61fe3cd 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -88,6 +88,7 @@ set_debarch() { version=$KERNELRELEASE if [ -n "$KDEB_PKGVERSION" ]; then packageversion=$KDEB_PKGVERSION + revision=${packageversion##*-} else revision=$(cat .version 2>/dev/null||echo 1) packageversion=$version-$revision @@ -205,10 +206,12 @@ cat < debian/rules #!$(command -v $MAKE) -f build: - \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= + \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ + KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= binary-arch: - \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= intdeb-pkg + \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \ + KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg clean: rm -rf debian/*tmp debian/files