From patchwork Wed Nov 14 22:22:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151135 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6260728ljp; Wed, 14 Nov 2018 14:37:46 -0800 (PST) X-Google-Smtp-Source: AJdET5c5Ymid7LDh6EJQjpoXTGIcKsE95Yjb/auZDDTHku1lq0YQtQJRBJsPiuHdQjWHrdI1Qzth X-Received: by 2002:a65:594b:: with SMTP id g11-v6mr3342499pgu.229.1542235066185; Wed, 14 Nov 2018 14:37:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542235066; cv=none; d=google.com; s=arc-20160816; b=DKH390IXvmIQWs7TMvzrqUP4O0NlBXAE/OtHNd4YiMvEOD+0HztVoSulEwBUtj43SF PNiyi6RSD8Al1MgXUGMd3mEsjiDGq4KIkJm7vx7Hrnb7AZRd6Pf9G3alf4TRF1/rTQXa ghj0ZII7wcuEAMpxbjya5ewLvss6y52sM4ZKqDpbFWig389y3aoMcWC6T8hIRB8lDfXM Rf9bGo0BOIkvrSZ8PhslhoobpMDjHMbDKGZpm/EW2csSG3a7Ur8NIIbQGkTixqlBNDta pl1zOLc/lsVntPPoIN6SrHBaO80tYYQ0TCiMgi3EYDAmj7QWI/Iqewx3kC2Sm1NlPV2v BNgA== 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=obRV8rT8XEBUWT9uFVMJrjAaaHe0rpX11rHlCYh1iCo=; b=D22XdAXft+sAU+l9XuxHzYbIrtr+NMOUpomO3DBdKfVv+lKFFDLCDiFOUkVfbQqqlU gNsDBM4VbeDNyBAIW2myTrYKRZ0y/51RXoxgOyON331Jycilso4z1KUxJSj0ZIAEoMi6 0iGo+/K2hQu8nETcd/8zU8oUycTRIeR00NLL1cjTF+Gzbn3jP4RRoU/9qN6ZHw+3Pg0C IygP5I8p0neXR5542i0UVGOTtonOVf5v1MXog63wzhrA6CrVmygQMEpAKIuz9TtzVTs6 GxpkaUlISUwNfiJKSIY8sclKeldgRQp3YDncexQEgByY+XeKuQkWUAh/qPvx7JjLcPjD R4WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gS3f3rBN; 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 j2-v6si27335989pfg.10.2018.11.14.14.37.45; Wed, 14 Nov 2018 14:37:46 -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=gS3f3rBN; 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 S2388533AbeKOImw (ORCPT + 32 others); Thu, 15 Nov 2018 03:42:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:36278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733164AbeKOI3Z (ORCPT ); Thu, 15 Nov 2018 03:29:25 -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 9C03322544; Wed, 14 Nov 2018 22:24:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234260; bh=8MWU8JAfSzjbGXva6fgpsaHEvMjZFsEwCcHtGRpQkCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gS3f3rBN+ZIgtenB+5Rn85/70K7uSXUOIX/xEb3e25HOH7JIUhUyIzucu6MFZu3S/ PMYXQH3rlwBDA/CQcteceU7nkZmx5wMLhaTaRRshdUqVrDMf61yWRdeJAGH/BvzGjo dujpOnaouDFD7YHlYKq7RMAae2rVv06Muh5A7xQI= 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 , devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 4.18 24/59] ARM: dts: fsl: Fix improperly quoted stdout-path values Date: Wed, 14 Nov 2018 17:22:56 -0500 Message-Id: <20181114222335.99339-24-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-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 3aa6f693fa9f..1228789f0f3a 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:23:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151127 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6248857ljp; Wed, 14 Nov 2018 14:24:28 -0800 (PST) X-Google-Smtp-Source: AJdET5f9e6iMAz3wgo+0iFXIHISbDMJkekPLj6rdoXj06IHSVTSsOqCNGx5u8qhx/1+ReGfB6KLL X-Received: by 2002:a17:902:24e7:: with SMTP id l36-v6mr3677187plg.243.1542234268308; Wed, 14 Nov 2018 14:24:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234268; cv=none; d=google.com; s=arc-20160816; b=tmtqqxrsxX1I0/f5yfzBJd4SG0zYetFEBB4JPNe6XbItXW0VcEAFfQn7tlnVYkaR3N TRSnXbxRjHqczI5AGsTGmmva+/SbSWMIdixynh+O4j5ZmthSgXw3S8vOofhR7ce/DoNN /q+ZBDpM7PL6xKWT3RijDs0iOI9qIJFsvZsTwxe9nkzj23fYrj8P3PtbbqBaETN2iX6U n2nconwmgY+J688xdMkCdO1k7b2CezWrHNG416b81k0bncP3TIDCa9NshOSJasjqZH6T eYDLZLnRDoONv1xCJ0TuZ8OATleeWUQFADY/a+RXYRrYUXe2UOshEYVPsWVLm3DMITfi 5YVA== 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=vvIFYYdpiHp6tS6CCU+am+XPC2kUBg4j9g7JzQu9tPuoUxAM2cUTTBG2Vag0ezpPcA yroDGdQPI0/iPAznlZuOcNapnrdK1e02Zv5HrgEpLc/o9mRrZ1G1r5f0PncAD11MBF01 N7d2dTMV8PoQjBrvrSw07W5t+S8IKwPMIq9xKw0GVEyZta47cz6fqri4mzJjNOCab0hw ZVuhAilSrff3x8KLYFe27IXQQNrCEiP3fYhJE8KdJt9uC1MM/qo4j4Uh9g+Z8n6qnX9l R8ABk5yzHGWIHYriPf8DZru+a5VoABKNdtNc0zoa6e51vKYCOjJYZMJCH6cSTrDgHF5g QXgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kW3P0lt6; 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 w13-v6si24845095plq.198.2018.11.14.14.24.28; Wed, 14 Nov 2018 14:24:28 -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=kW3P0lt6; 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 S2388350AbeKOI3a (ORCPT + 32 others); Thu, 15 Nov 2018 03:29:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:36428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726506AbeKOI33 (ORCPT ); Thu, 15 Nov 2018 03:29:29 -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 58BB422527; Wed, 14 Nov 2018 22:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234265; bh=ySSQ3pcYerKH4OiBJKAgte5YYA9tT0QRHveHFw8BwvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kW3P0lt6rbdPsGurEEWhHwFo3w4TXHJs9RL6BX/+u9fm06af/9Iz/y6AjPVj5yaSa XMqORQHERk7voSYyPCKlCdOjJyWa72hghqDvyWLrxOeTtrKKo7o5AreQabsPS7N5Wm o+enpAAFzDbTDrNfuMMLbk+jTCbQH19EMws8+o0M= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jeremy Linton , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.18 30/59] lib/raid6: Fix arm64 test build Date: Wed, 14 Nov 2018 17:23:02 -0500 Message-Id: <20181114222335.99339-30-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-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:23:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151128 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6249027ljp; Wed, 14 Nov 2018 14:24:39 -0800 (PST) X-Google-Smtp-Source: AJdET5ezFszz+FSpjfEWi68zizChiiX6oKa8R8GjNNixMaewbudRxXXZVW6Ivtlyw+F8QhUCWCmT X-Received: by 2002:a62:5504:: with SMTP id j4-v6mr3802464pfb.166.1542234279522; Wed, 14 Nov 2018 14:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234279; cv=none; d=google.com; s=arc-20160816; b=0RCZoAZXPDmICmXdAFOq8nr9Vd7V/zaxKBOzme3Nc2Kg+9uRLKSgGgiukXcbeFAzI3 +EXD0BRRVQfd6MA2rrxRN/N541bRZvnRZUQRQMkrNHMcjmBnQCHA19+9oD9AVRFJhRlU UA4z+1fD0DZY7OpBmVM6gByuxP8gAROkhxOwp+WZxkaPjt6wAaffg5HKsOFjT0Gj/d3x ZPrSdb1yYHJH/Ap7qzds9m4uGgULIqtDxXUpZS13xawkt+3PIAUtrg3XSGHwwclqhUI1 lCVNiq1D67S5UGMMCsuHu/B378AkFUR7IPScpnGtOY4B/3Vn4G0kiNfFVCzpdV5eFRws WcgQ== 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=Fm2nsTu5DgV7MahBDDzWviI+oRuXEIvUe6UAQUKcv9s=; b=GReB81LMixihQVqslXRucE8QE39xNUjULReNmNSycF0Iog9GxdbNylwFWqU0tezUqL j2Mjc4LBgOJMsRh2SqsKIC5fObWA3kkMB9zfj+soZ8dIWGU8lUV8I3lw/UBhK29xhUqq 2zmUFKbRoaZ/eJ2gBq0Sq5dT32RVMGfmKwAfA9MVQSFJzyPbr+6JZCVERsMKFFbzkbKi QPAgxKEf330FO5mLZ/qyiTVbMucqxN3Pj/L2F0iR21cc5riheqHXbsTZc9l+t6xiDloA y12n3ApWtQvvKJ7dUSTjT8TP5WyCH6lexavW4n1gJSRa3YwW45WTL+0NIJR6Jy0iRg/o VsuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="oLs/Z2hR"; 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 b124si929753pfg.47.2018.11.14.14.24.39; Wed, 14 Nov 2018 14:24:39 -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="oLs/Z2hR"; 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 S2388431AbeKOI3k (ORCPT + 32 others); Thu, 15 Nov 2018 03:29:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:36652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732360AbeKOI3k (ORCPT ); Thu, 15 Nov 2018 03:29:40 -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 313C122529; Wed, 14 Nov 2018 22:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234276; bh=8WrDsZ4kKm/oVsjSplgvqLOtdVCKMMm0ezO0p/64XwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oLs/Z2hRPnwqC1uaXsVcM2jviNMAmyTMOj4CrS2KlYOSPN1/FLl1MIWjhq4qYYQWR D1yfXiFPd9JeCZWPBTJKJnwOzK4nt9YLJjpW5436erl2dD/Q2jfvr1kfWWCCwS4H1Z UDJ2JqwtO9ACUGluWvDrxLRYfwZzwDPlSpdJFsrw= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jerome Brunet , Stephen Boyd , Sasha Levin , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH AUTOSEL 4.18 37/59] clk: meson: axg: mark fdiv2 and fdiv3 as critical Date: Wed, 14 Nov 2018 17:23:09 -0500 Message-Id: <20181114222335.99339-37-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-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 bd4dbc696b88..cfd26fd7e404 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -320,6 +320,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, }, }; @@ -344,6 +345,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:23:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151129 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6249757ljp; Wed, 14 Nov 2018 14:25:31 -0800 (PST) X-Google-Smtp-Source: AJdET5eqy+F11xJsrcTjh6wgaqghP3ffxS7Z3m7ciscN6/oULo6gUC2RuqdA9a/iaeQDhMa49pt1 X-Received: by 2002:a63:134f:: with SMTP id 15mr3427445pgt.19.1542234331549; Wed, 14 Nov 2018 14:25:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542234331; cv=none; d=google.com; s=arc-20160816; b=q6Tw+yHfsC+pwAuwSII6QqSl5IgEE58BSLfis57LmdtpvlaZ6O6ntlDTZTetfeoFVu 0L09NLiKCattUikPpE0QG3Ew9Etk6eJORcAfgK7sGlRMSX8kl8qR1Wr3mfrN5HUno9rO NO4aEE/+uBCI7KsvTURS0ouY7A34RS6qOY4lJRgvkwAC89c+O5hVIaezrrRBSSl24zAx IWsousX58P4eK7fZJY+rbF6Th55Wum7YYzlPwobnenKf5naodejUvyq4dM4baQox0dI5 CHKDS/0Y0iInTbHdV6Uli81c9YE2b2AnmnPAfv0gtWGoV4DVZIkFkugFG43bEiL+3t07 TETQ== 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=jEPdxzZSskVTvOuOl7KK8o/HoUULfPZ+lyCXLDkazC8=; b=zBJ6ywE3zhVJ/qOKFTQb62xwt1QjcHkgbsLDg+dExjDdpUWM1kpYkxpvxKVzkdLndt qJBSQV19DDMjFlxWdC0e4oF3u9+Os5flWUBLTp99F/HnTStb4ylZK/472F5TxFEL+swx I2fOAMIbL64ZmTQ+9QCpNWzDYfXcLfooBtXJuNBv5m2NScSjXD7OBmuYUad4FeNEs6FM cXHKwcadvA9T565Ksz/T7CBDjbwVipDvwN8wmMdYXEsusGfd54ZpyJh6MZTZ+nc7A3SI mQckGtkxy2GgpBgQQjGOQixUCDgps5wg8cJr7UtJd54hxhH5kqrT9iJphehJKFLyOfdG jSwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XIujG34l; 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 v13si24435687pgn.355.2018.11.14.14.25.31; Wed, 14 Nov 2018 14:25:31 -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=XIujG34l; 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 S2388799AbeKOIaU (ORCPT + 32 others); Thu, 15 Nov 2018 03:30:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:37496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726774AbeKOIaT (ORCPT ); Thu, 15 Nov 2018 03:30: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 100E822527; Wed, 14 Nov 2018 22:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542234315; bh=0Ts0QyzdxiYbzsgw8If12FeW0yBrnHSXS3cOb//WgMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XIujG34lLnr2Zh1DX8bq1JSG2qU3vvArhNEfLdwrmMZZivf8EOmHytM693nfFx+XF V8+j89RY4gkGPqrO1Q/XoT0hzA7ww6y9c5S5C3/qKqWb8EGCAIfkMQMR3KMolhdR0Y bVm1eHEM3NXCIPnbbyw36O+R6acigADfFM5LFXdo= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Sasha Levin , linux-kbuild@vger.kernel.org Subject: [PATCH AUTOSEL 4.18 58/59] kbuild: deb-pkg: fix too low build version number Date: Wed, 14 Nov 2018 17:23:30 -0500 Message-Id: <20181114222335.99339-58-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222335.99339-1-sashal@kernel.org> References: <20181114222335.99339-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 985d72d1ab34..d2c4365c189f 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -56,6 +56,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 @@ -173,10 +174,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