From patchwork Tue Nov 19 05:17:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179691 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp166995ilf; Mon, 18 Nov 2019 21:47:41 -0800 (PST) X-Google-Smtp-Source: APXvYqxz6R8jk3IaZN9bMVlAHNt8QdH983M2iJTmhSZbawH5WAcdGdnfdiJdSFPKFzUh7qn/7me2 X-Received: by 2002:a17:906:8305:: with SMTP id j5mr21046031ejx.48.1574142460932; Mon, 18 Nov 2019 21:47:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142460; cv=none; d=google.com; s=arc-20160816; b=pKt4rCPE+tmdNzpGePY9n1aZbt5zeu36be3pnpz5lNpPFEFJhpQ2RYoC6mGRmOHL4X ZVdFUeIl13yPSWvV7sMJcxRg2iP18rQWABeqmgMSwkXMZVM4wuSNyWvY3Ai0rMeiDj+d I1N2zwqWpShKr2QFhlEUlOTfGManVCeTnOjZsiFE8x+IbCgJ1g/AvABnk0MijZM/UAPt rjeRdntT8wiOcuUyJjCrPykil2OIQeJ6cKKjel3Li3nzX0BSVc5fROAWKpXkuUdomL1o drKePDDTIpuHaRDbmr0A446hrHz/7COYpY8Px1q2j/VET9FDM/mRicLSsUj3ZBo3pIsB xV2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ailskUb92KMyBQek+CAZlx/PlKgFpTsfNPlIeTjTc74=; b=FQqMf/xs3W6c035uVoa2QzrvPr8vxM2VHEzBNlvdW8aEPiHlqG5mwiyhHovcn01LUu dwXZSWsRzwj+DiT7v+Q4sltghfDhxTkCKWkKls+zfu6hmQNo7wub2rLo6gvqCJcNGxru H3JOk6WgGRA806R4vIMNOKsW0JqjyJp5RBmvCixhul444FLBER5gjQjzSGWmZEYk02aX +NLIuWmarBllSU8bf1+zCN9kHO9FMcVzhyNZ3qj/pj2qbjVK4e7eBs2y5Vf3dxoIrBFl RtvaAuF03l6DZz4S2fnZHi5e7WNTDlnV7gpamcM4zwbyPoGinPovmnh/R3BsYPEQOVO1 VUAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZFsyKyuv; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d6si15504902eda.262.2019.11.18.21.47.40; Mon, 18 Nov 2019 21:47:40 -0800 (PST) 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=@kernel.org header.s=default header.b=ZFsyKyuv; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731260AbfKSFrj (ORCPT + 15 others); Tue, 19 Nov 2019 00:47:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:44006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731258AbfKSFrj (ORCPT ); Tue, 19 Nov 2019 00:47:39 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA05B2071B; Tue, 19 Nov 2019 05:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142458; bh=RvVTYuH6J/bWSf35l6x4RJtqEASHSYMDdLh47axTfxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFsyKyuv6OfzvUHGnlpC/NqsqFODo7e/38MScJU0UsOUijV/eqrk16NaNMo5SKj4i 0cqFDGu6f2sifX4/qcXNtpK6VbQ3pN4XG3MGXdKd1zhJ8VaNnBwOHUbqNpS5KqybDK /6GlU1jKCO2eeD5MOROoBpMiJljUlL1YJiOzbMlQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Suman Anna , Bartosz Golaszewski , Bjorn Andersson , Sasha Levin Subject: [PATCH 4.14 038/239] remoteproc/davinci: Use %zx for formating size_t Date: Tue, 19 Nov 2019 06:17:18 +0100 Message-Id: <20191119051304.990573093@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 1e28dbbeced6152b9ea7c417ff8cef3f7dcf0f19 ] da8xx_rproc_mem size is of type size_t, so use %zx to format the debug print of it to avoid a compile warning. Acked-by: Suman Anna Reviewed-by: Bartosz Golaszewski Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/da8xx_remoteproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index bf3b9034c319e..a127d2ccd7ca5 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c @@ -207,7 +207,7 @@ static int da8xx_rproc_get_internal_memories(struct platform_device *pdev, res->start & DA8XX_RPROC_LOCAL_ADDRESS_MASK; drproc->mem[i].size = resource_size(res); - dev_dbg(dev, "memory %8s: bus addr %pa size 0x%x va %p da 0x%x\n", + dev_dbg(dev, "memory %8s: bus addr %pa size 0x%zx va %p da 0x%x\n", mem_names[i], &drproc->mem[i].bus_addr, drproc->mem[i].size, drproc->mem[i].cpu_addr, drproc->mem[i].dev_addr); From patchwork Tue Nov 19 05:17:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179686 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp165465ilf; Mon, 18 Nov 2019 21:45:44 -0800 (PST) X-Google-Smtp-Source: APXvYqxg+cK8q65NR3QPzFTy9ZjIl+pEhftdx6KZ2r5cR1I/ihrobzkFeo8iyvJ+FTkuOUJ5VjOQ X-Received: by 2002:a17:906:c2d6:: with SMTP id ch22mr33100228ejb.262.1574142344042; Mon, 18 Nov 2019 21:45:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142344; cv=none; d=google.com; s=arc-20160816; b=APvZBe8DjCHEAy32zpSE8ntmHD1xVV0tgupRjlHsnJVuUjSJU6fj8O04l3K3Wo5d3M mNTYPQmf1n/v+sj3kH6KoEB1c34VDC+IaCiiUI+yIHeGEchRfGKF4QlfoYxvynS629VG 30qG7RFdch8bSXmWWOfWfDyWc89ImjGGwv5Cv8zkz4egI697WG3rdC1IlVnPUQwn4/bN FM2x/e8SatpW3PUCPLDC9lvw7rNsDGFDIq3ZSvdUx2W+6oRDqGazgWrgUgkCy3attmHm 3vi0xHSWKFtBKVI0rGrcPlIWI7rDB2O+v2RpU0dsOIKGO0NHAjaayidX9sFD52C68d6Q T7fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2ykKu4jd6YO/+mPVVkzcpPTdfUE1XxFiKeXX2V/qenY=; b=Cfhp7OjcEcLza2rYVlL2HQGrr5uT+SrkVMWueLxJqqzbGgCDp0a1VuitdySWm+wgR0 lHpknSGSrtDyQMnpTqg4JsoVFb6gTD/b/tZSEmhBuOivn0PWD7ZBS4nimrOsv9XElXc7 nccKsgAGc1/t55roeWMY6g5J+6GWSzmRX71tXmTnt5twrG0XjyX3MDab1M4KLav7mnkQ 4bxfMqoFh0mK1FuqDbXKk/GHzNmn2DhPIcIqmGdeI4Wk8kc74iTKANygIWWYbA9Ypxl5 51Vw5pG5PvsWi2GGf0gobAQwtmZdyWwc55nqEmmjXifNHUDt9dRmtpk48/NXX9Q3ty4c OBkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xaujtmYx; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 8si13852185ejc.104.2019.11.18.21.45.43; Mon, 18 Nov 2019 21:45:44 -0800 (PST) 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=@kernel.org header.s=default header.b=xaujtmYx; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729316AbfKSFpm (ORCPT + 15 others); Tue, 19 Nov 2019 00:45:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:41390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730501AbfKSFpi (ORCPT ); Tue, 19 Nov 2019 00:45:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A7539222A4; Tue, 19 Nov 2019 05:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142338; bh=aluBxgyG66rH0miEhxbojvxTsEkxqtA5iSpzk78LF4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xaujtmYxCHDOS6LtxC4H0PfgEdq02lCe3+vGT/54/fhhGxEZgwWD/AFlfXNQM45u7 tXjlWadTh5TfhwUQRU+npHCAZjSTtcJZTPJkeSGyfio3uuoE/TIxU9ZyS//YIc+Tke YpRAHhu4QoEQFljhbgrMVTGCcALrJxfCq3CZUrR8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.14 048/239] ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook Date: Tue, 19 Nov 2019 06:17:28 +0100 Message-Id: <20191119051306.840109440@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit 64858773d78e820003a94e5a7179d368213655d6 ] This patch adds missing properties to the CODEC and sound nodes, so the audio will work also on Snow rev5 Chromebook. This patch is an extension to the commit e9eefc3f8ce0 ("ARM: dts: exynos: Add missing clock and DAI properties to the max98095 node in Snow Chromebook") and commit 6ab569936d60 ("ARM: dts: exynos: Enable HDMI audio on Snow Chromebook"). It has been reported that such changes work fine on the rev5 board too. Signed-off-by: Marek Szyprowski [krzk: Fixed typo in phandle to &max98090] Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/exynos5250-snow-rev5.dts b/arch/arm/boot/dts/exynos5250-snow-rev5.dts index 90560c316f644..cb986175b69b4 100644 --- a/arch/arm/boot/dts/exynos5250-snow-rev5.dts +++ b/arch/arm/boot/dts/exynos5250-snow-rev5.dts @@ -23,6 +23,14 @@ samsung,model = "Snow-I2S-MAX98090"; samsung,audio-codec = <&max98090>; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&max98090 0>, <&hdmi>; + }; }; }; @@ -34,6 +42,9 @@ interrupt-parent = <&gpx0>; pinctrl-names = "default"; pinctrl-0 = <&max98090_irq>; + clocks = <&pmu_system_controller 0>; + clock-names = "mclk"; + #sound-dai-cells = <1>; }; }; From patchwork Tue Nov 19 05:17:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179687 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp165558ilf; Mon, 18 Nov 2019 21:45:51 -0800 (PST) X-Google-Smtp-Source: APXvYqzZiwpyxeZ1wbl6VHDSIunIO683B6hfB1bEinw/6pHVZkbrtx8Ts5cFQ8HarAd4Q7Y5BcFY X-Received: by 2002:a17:907:212a:: with SMTP id qo10mr28993596ejb.197.1574142350885; Mon, 18 Nov 2019 21:45:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142350; cv=none; d=google.com; s=arc-20160816; b=T5ryCJlv30xTrW4w1v7Y96Gl+qpk0O0cvBD6g/mnNtrR7BowMD7CUbvlAjLZgLhRzw 6q8/VjNRYGYna0I3eXTeHM4nd3PbTyRx2RhZz2q8TkItt+vWzITrhMdHtuAigv694w/7 gkFz/KK/D8a7UpIzeTKfRTHV2D47+e6qNY4cMXNS0fI2DwSsxE3AwwwoGwvXk45c7uZj kIKcZt6cRavRzUBRK5EGx1CjytGTyX/nKS7qtvl65Asa+KZKBDJobimBNXurUwFtxgDI HMV0TwV1DOWqKdBqoOaTg2OW6raoUoiVYxB2cMmn3oxFOcF/flT2UBVu94ccdY/EiCAX 80hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UHAjfwpcYG0JKWAdPLEmwnyuq+QPaplRxRDHiAgm5tI=; b=HP8PWzicHN4h8QQYAZcxEm8g6Kzesu7SQSGqXfC2z6qgBitQ5zpR0B5cVrpr9BkGpy Ah62Pkbr2oud38FFuRCiBVK/jA6slbgHXHVWOkNjLjZSMUlcqHj0jWQQYowT/Ijs+UNu XNL1g3tMlqKvN+aTuBIkcJ5j0SeuWPwEY/LNyEWTH/fGxSV1I5uN5yGnxiidraKGasKY rCndPilz3HUZ3oEwcjWybo6Rlk7iArGkd1b8Rvc3B9I9y5mtAxaDKyawa1RoLuO9RHgh zXmijerOGnx1RPqHpuLeAJ/mEyJyklUugq0rBUhxGgIGSbrr9alH5XTGXfpRhT/8f3ZN D2Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Poaom7iu; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f8si16267349ede.120.2019.11.18.21.45.50; Mon, 18 Nov 2019 21:45:50 -0800 (PST) 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=@kernel.org header.s=default header.b=Poaom7iu; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730214AbfKSFps (ORCPT + 15 others); Tue, 19 Nov 2019 00:45:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:41524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730982AbfKSFpp (ORCPT ); Tue, 19 Nov 2019 00:45:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8B6E92082F; Tue, 19 Nov 2019 05:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142344; bh=gQc1TgP91Eg1fBE2eP6CQ+0ionmH6FlDG3R33s8qABo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Poaom7iuWaa9vyumom/6gTe/DRAlzjpxhw+KvvkJZC/WCk2xWOB4oAXHHuVL4ibmT zdFgspYoMwKc/doVtFVM305GNjfvelHluWsscj4n+j6dE3uoFF1Ejdvz4w0pVxMyY4 hrHOoK+0QVPPZC/i/EJBgp5TL0t9JjVjlHeSrV9g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Tomasz Figa , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.14 050/239] ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks Date: Tue, 19 Nov 2019 06:17:30 +0100 Message-Id: <20191119051307.357970632@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit f8f3b7fc21b1cb59385b780acd9b9a26d04cb7b2 ] Regulators, which are marked as 'on-in-suspend' seems to be critical for board operation, thus they must not be disabled anytime. This can be only assured by marking them as 'always-on', because otherwise some actions of their clients might result in turning them off. This patch restores suspend/resume operation on Peach-Pit Chromebook board. It partially reverts 'always-on' property removal done by the commit mentioned in the Fixes tag. Fixes: 665c441eea3d ("ARM: dts: exynos: Remove unneded always-on for regulators on Peach boards") Signed-off-by: Marek Szyprowski Tested-by: Tomasz Figa Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 +++ arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 +++ 2 files changed, 6 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 7ccee2cfe4812..442161d2acd57 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -301,6 +301,7 @@ regulator-name = "vdd_1v35"; regulator-min-microvolt = <1350000>; regulator-max-microvolt = <1350000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; @@ -322,6 +323,7 @@ regulator-name = "vdd_2v"; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; @@ -332,6 +334,7 @@ regulator-name = "vdd_1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 0900b38f60b4f..58af2254e5212 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -301,6 +301,7 @@ regulator-name = "vdd_1v35"; regulator-min-microvolt = <1350000>; regulator-max-microvolt = <1350000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; @@ -322,6 +323,7 @@ regulator-name = "vdd_2v"; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; @@ -332,6 +334,7 @@ regulator-name = "vdd_1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; From patchwork Tue Nov 19 05:18:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179692 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp167732ilf; Mon, 18 Nov 2019 21:48:33 -0800 (PST) X-Google-Smtp-Source: APXvYqwFEAxS2daCpmdJ92GPW9c1M2ci8exF5pe02rmpvFmesG7x8wzMFqliIiG6Wdcex1UdnJXi X-Received: by 2002:a17:906:4098:: with SMTP id u24mr31961164ejj.220.1574142513353; Mon, 18 Nov 2019 21:48:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142513; cv=none; d=google.com; s=arc-20160816; b=TWewXd2eiOC7j8bgwGDRNh3BB0iJkwx2glAC4EKY1XRZXzP6plGKDIbX6crEduk8j+ HSyhSZisPLHlJHPnpbFk02T6WlStTXpFxzSOQvXKB4NxhXvU0lHyLSaOTS3xxRhQahVW bCKpzUVbMKLEw8rzXnL3AL+esPm0OK2jxK0nWn4X9Q0znh/XlqjS2WVlpTRwZDVrbZ7p o1+a7qzjSrdwWOGXimMNEwFXaDtIbqw4H4bEXycypkqwiM+mVhcJ1uVUwnoytLWLCgLc H8naf04I+3lfR+I5UdHKPswWL+6ycILDzsgejeXfu5gOrNKDC4UFb70ifQReQxW2e5Yb GVFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=d6LHsHbkRq3rSY4/Nz+4SEavyEjBY5fbttjyIPhuBgo=; b=DUoSRPLMWsn2f2fBWXPp9NRBAPGSmAMSmmOEsseAJEaZa3iVvfCGMEp6kloqZfsUfc MrBXW0nnMpevQCeXuzx2DUAXFsYkzB3j52a+wzbtNH/EGl3W+cYQntda0KOnWendBu8E Bl1fYrf9LnpgDJGE6x54cfaoWf0Gylrm/MoWbmI4DwE7fK3w6x4+KQ2ybFDuombJc7zx dK3L21kj4ojh89ocpKFngHXD0m94BPNYLe9gJIpVQtvs98fOVQkgFf3FyS+OZQc9scO4 JEiRcYd91q03Qpm9e37g12n8UyV8dS68s6TIL6rQwfaEzOWD4XqLIKAikwi6Dt5RiTMT 8f7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zB2dSly+; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y9si13259897ejp.175.2019.11.18.21.48.33; Mon, 18 Nov 2019 21:48:33 -0800 (PST) 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=@kernel.org header.s=default header.b=zB2dSly+; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731367AbfKSFsa (ORCPT + 15 others); Tue, 19 Nov 2019 00:48:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:45094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731366AbfKSFs3 (ORCPT ); Tue, 19 Nov 2019 00:48:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 205F22071B; Tue, 19 Nov 2019 05:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142508; bh=+tsNtYF+z2Lyp9tPCd2Dr0PqAGfSfurgQujhAXNneP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zB2dSly+InjnRQmeygzpkYQS7ad8lse2+wZj4ihGblipnhO4383OMxPGEFQuWsGfN JB8wCY5nGwFIqSSwMhgapgNmejWra9kqst9Lk34U/5QznhNAoRz0OI1soVkxH+XVDO TYswGQyrDFk4r6kwigCLK4AQYYMCoRG2rtRb1prI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.14 105/239] nvmem: core: return error code instead of NULL from nvmem_device_get Date: Tue, 19 Nov 2019 06:18:25 +0100 Message-Id: <20191119051325.923866588@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit ca6ac25cecf0e740d7cc8e03e0ebbf8acbeca3df ] nvmem_device_get() should return ERR_PTR() on error or valid pointer on success, but one of the code path seems to return NULL, so fix it. Reported-by: Niklas Cassel Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/nvmem/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index b414d9d207d45..08b171731664e 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -617,7 +617,7 @@ static struct nvmem_device *nvmem_find(const char *name) d = bus_find_device(&nvmem_bus_type, NULL, (void *)name, nvmem_match); if (!d) - return NULL; + return ERR_PTR(-ENOENT); return to_nvmem_device(d); } From patchwork Tue Nov 19 05:18:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179694 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp167888ilf; Mon, 18 Nov 2019 21:48:44 -0800 (PST) X-Google-Smtp-Source: APXvYqzDVH5l+F5pqxliAmpGhEfluvJJT0G60o2wnWzOv67oe2vx4JSzDmZkZDBh6dIkyl2TZcsI X-Received: by 2002:a17:906:bc9:: with SMTP id y9mr32209065ejg.64.1574142524097; Mon, 18 Nov 2019 21:48:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142524; cv=none; d=google.com; s=arc-20160816; b=KIy6M1HB/gNLC6NCSBxuSfEFkhn4jX4VXnjkGCrdvt7xwt4UHluJrF1nyr+fFuF4rh k8ORVVDecwQu0pLlG0mnTo1OeTAR0UnVH2l9gIFSnHEYvGgp94zInUmzNsP8A3VPAsiQ yeL3rbkrFmGFw+gcQmlynxdqNhmN6ziX6mbhHRvNb/saY+KD6aDjSreY9Nz2V/KRR0a3 e1TQSvbfiI6HgcJyg71YUOqMJqNo0t8opb+JA9DRASLkufJbOEaGcVjT/JZy1keB5ZlG HFyhCVHFDGC3MdhabKOhO2QttnNKGbwoqnM53LLeAS1YzUjexeocckk7MW2CY12FHpcZ VOiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ltDWkFLVsldIRO7WAKDc9QzuyrJaMm61zm/rHo23tbI=; b=j6SpQLZKpPcbxG5h5lNwB2ZX4c3hgNVKjixO1T8YvjQfWEgdnEe5/7w/KR55WbocKK PnsP8+X9uRNsM3OJgWHwtyeUGox7cHabCNcaCiaX9aAcZxCHmbi/GSGsb9NKsJyLZP5J Z7Wa08mVjHQ5oXB9pvcGDUYdDjom8YKDmkyK2nCQUfSLQDWcfjaR/QjBdmYh6a7017DQ pX3/svEI9JwFK8wpIYkNV9tkud4R79CZDs+a6aX1K+nyT1m3PhBLDM0XrsVDUiLV9mT/ 34G6Akl9yIikJ0JFruZoRqXqiMvJFJyKUqRk3M9dxvlXH2C1btEZIPCl2tZYjVPQY2ib xI+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RJal1LjQ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w7si14950835edj.96.2019.11.18.21.48.43; Mon, 18 Nov 2019 21:48:44 -0800 (PST) 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=@kernel.org header.s=default header.b=RJal1LjQ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731086AbfKSFsm (ORCPT + 15 others); Tue, 19 Nov 2019 00:48:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:45268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727805AbfKSFsl (ORCPT ); Tue, 19 Nov 2019 00:48:41 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D65562071B; Tue, 19 Nov 2019 05:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142520; bh=dkRw0NLgbZfCKxHUgfLgac8iE4OQLyV4NXNb7ARPpdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RJal1LjQErmlwS7lwWTPgtDEOL2TTiiLSx0VZhooTu4JugD8pzLInT9y4VtzFoNSL aAWEapAI1Ltp77NuSfoCjLhkULT6i9YaVtYFWeB0Wg8K9JxceHpMhZRMW1eSqI9Evg pqRdsKKP90wM/OslXWwbuVbe9zo1i00YlahvY2Tc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Da Xue , Jerome Brunet , Kevin Hilman , Sasha Levin Subject: [PATCH 4.14 109/239] arm64: dts: meson: libretech: update board model Date: Tue, 19 Nov 2019 06:18:29 +0100 Message-Id: <20191119051327.375868907@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit b7eb0e26cc4a212fde09144cd49d4103170d2b9e ] There is actually several different libretech board with the CC suffix so the model name is not appropriate here. Update to something more specific Reported-by: Da Xue Signed-off-by: Jerome Brunet Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts index d71cbf596d1f7..0814b6b29b86a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -14,7 +14,7 @@ / { compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl"; - model = "Libre Technology CC"; + model = "Libre Computer Board AML-S905X-CC"; aliases { serial0 = &uart_AO; From patchwork Tue Nov 19 05:18:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179696 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp168305ilf; Mon, 18 Nov 2019 21:49:16 -0800 (PST) X-Google-Smtp-Source: APXvYqzy6vfsJNDoLTKTK/kxxPUL2gF1K6XhNR8hef0pwnf9boIFeDqgr56/5eI4TiINbyr04B9I X-Received: by 2002:a17:906:1805:: with SMTP id v5mr33182670eje.45.1574142556131; Mon, 18 Nov 2019 21:49:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142556; cv=none; d=google.com; s=arc-20160816; b=0p4zxiZ2CKIfz7VF3PqtaetDhuaSrJLKeyMlrzN1zxgqAH5M6KiJZ+zjDt5QUk4DY1 +XR1AFUK3BlKUPxWzT2UuD999fp0aJLYWQmFCE9YyfuYBQQKqLsn41l2yDbusffH+vSe Q+T/0Vzo17zYaGuNKeZ7G/xwttN+OD/clQ0wIvBefC/IUPc+1Qwipu4mfl/OVZcPR/lw lBjAoSO1O6U2u76Dneqq2IpjAGDCtzQ2s5GPMvBAx4JnphaEZ+q/kLPCIMNMZhN/6eVT VtB3g42zI9pa1nqNvdMB+rPYOqvFVs1/jtxo+lklQjJe8k4aH4cP8rHzfRjHZnCbDCFt cRlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gIJmlqeaFbIk5aH2qaOZ0B8T0KXtfRPqZJJ4cfDpzTY=; b=C8kA7aBKfVscQTGP44PpT3c3aHOIxEPzjUYHAG2558cl4TtiKRO2V2to0kUd70YGAY WSusKKiLRofira0nQMOM4ObEXUwv8XEXfsVXT1L1ROlzP6YZy0VxIbVYeN1Q2oukP266 YQSTObBfbL4bfj+MZI8TI+GdvAVpmhuXtEQOPKQdaHuy6s/zhQ38RB6vrjWd1KsuzbxI V/M2fq/K/F5nzasOAjKRxY0dWndOg9G9CGgwBTCQuH3WfX/oA6Lrp7F4BZl/qYrF42aq qiJW+yHpW1ZuHD/nlTy057rl4PpUwaLp3J2uKFao8QzXdQgC1gKt2Oa0l6QBk59ZPjlV zwQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RBygYwKI; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hh7si13172476ejb.57.2019.11.18.21.49.15; Mon, 18 Nov 2019 21:49:16 -0800 (PST) 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=@kernel.org header.s=default header.b=RBygYwKI; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730549AbfKSFtO (ORCPT + 15 others); Tue, 19 Nov 2019 00:49:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:45888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730779AbfKSFtN (ORCPT ); Tue, 19 Nov 2019 00:49:13 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 58A37208C3; Tue, 19 Nov 2019 05:49:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142552; bh=XTKduqN7mHhES6KQ6cLQz/6SZSC+gMKdX1Jkj9OtVMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RBygYwKIw7oruLMZG0sFuS1arLj77J93Rn387YR6+nBDs+gytXaX053q8K6oGZYi4 T/kufXkaCqS/GdsSnO3QvFjlTpeVvh6QHWvGlaAMI3XN6G4jjdFP8geXYIwXoV5FKQ se9agfvqfDlycFArCuU/Ehz93dhcQQWCQ/p4LWb0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paolo Valente , Jens Axboe , Sasha Levin Subject: [PATCH 4.14 119/239] blok, bfq: do not plug I/O if all queues are weight-raised Date: Tue, 19 Nov 2019 06:18:39 +0100 Message-Id: <20191119051329.460723697@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paolo Valente [ Upstream commit c8765de0adfcaaf4ffb2d951e07444f00ffa9453 ] To reduce latency for interactive and soft real-time applications, bfq privileges the bfq_queues containing the I/O of these applications. These privileged queues, referred-to as weight-raised queues, get a much higher share of the device throughput w.r.t. non-privileged queues. To preserve this higher share, the I/O of any non-weight-raised queue must be plugged whenever a sync weight-raised queue, while being served, remains temporarily empty. To attain this goal, bfq simply plugs any I/O (from any queue), if a sync weight-raised queue remains empty while in service. Unfortunately, this plugging typically lowers throughput with random I/O, on devices with internal queueing (because it reduces the filling level of the internal queues of the device). This commit addresses this issue by restricting the cases where plugging is performed: if a sync weight-raised queue remains empty while in service, then I/O plugging is performed only if some of the active bfq_queues are *not* weight-raised (which is actually the only circumstance where plugging is needed to preserve the higher share of the throughput of weight-raised queues). This restriction proved able to boost throughput in really many use cases needing only maximum throughput. Signed-off-by: Paolo Valente Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bfq-iosched.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index e65b0da1007b4..93863c6173e66 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3314,7 +3314,12 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq) * whether bfqq is being weight-raised, because * bfq_symmetric_scenario() does not take into account also * weight-raised queues (see comments on - * bfq_weights_tree_add()). + * bfq_weights_tree_add()). In particular, if bfqq is being + * weight-raised, it is important to idle only if there are + * other, non-weight-raised queues that may steal throughput + * to bfqq. Actually, we should be even more precise, and + * differentiate between interactive weight raising and + * soft real-time weight raising. * * As a side note, it is worth considering that the above * device-idling countermeasures may however fail in the @@ -3326,7 +3331,8 @@ static bool bfq_bfqq_may_idle(struct bfq_queue *bfqq) * to let requests be served in the desired order until all * the requests already queued in the device have been served. */ - asymmetric_scenario = bfqq->wr_coeff > 1 || + asymmetric_scenario = (bfqq->wr_coeff > 1 && + bfqd->wr_busy_queues < bfqd->busy_queues) || !bfq_symmetric_scenario(bfqd); /* From patchwork Tue Nov 19 05:18:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179697 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp168376ilf; Mon, 18 Nov 2019 21:49:21 -0800 (PST) X-Google-Smtp-Source: APXvYqyA4L/EWn+PpfSScxrl8BL62c4eD8QVUeLK9kzLJGxW8/jHupLhg/qRTRoJFI+309xJ8Nye X-Received: by 2002:a17:906:4e99:: with SMTP id v25mr32924233eju.106.1574142561041; Mon, 18 Nov 2019 21:49:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142561; cv=none; d=google.com; s=arc-20160816; b=LyO0wi3Hg9IgLGKOUofNgOi+yKcNMyaNLuwi0Tv2ov2GtihjmFJ8GjN5P3ugCuP+Ps exiV2ANh5WIn0JufXfRxRa3VRam+yY8zVpACj/kmlP7rPxyDyxmjV2RCDKbuSnPc0uzh VXPSQSLBHTIbAEI3Mrq3W2/3o3gxmOcBq+oFd6YXPx3ySlIw8PzyIhK3AuxIe+qWzwPT 7446YBqhHWX/ID7k741+ZVsnePPzr1/hr31//NAyK3FsYRNBaOUgVsZGMtHpEsjYGL6M dAtf2+9eSEvpU4gW0JFNIq17YWa2eGTRbaMON9rAZCBQnGZLwiE1juJYLdxzaYYHSdS5 eqhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GPBKKAv1ovJdjppVBsR0zGtFVL0kg7MEuB1mQA5lIis=; b=CUC5GTSos3t4/72N+ltL0L7mRGGPxahU1zW5lwlrZDTSMSE07oBkacp5C5h/GtNp9n v/8ulBIDaUsDRLZGh3CFFVxg73QZ0pAbrdLUUaOjwPtW7yXva7XYXuIBXnclpAUrd9pX sogt4gSOL4qhPRU4XS77yxQXTHBOD65g1nsB1bHaidgeCIpMJNBZ+uLvQqQaB7WxAhxn odxrv7acOuipAJNO3mnu6VhtMZeliKIc0Yhh4l2pcjDEvg2U/WYb2iaQ7fHXe4mJz0WY 7rh/68+9IAWBvVq9mrEFGGcQhuXq5wmukT7HWTViRoG7j0m/tRswxyQkG/ydH9p30c2t GwSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=K9mduQ2A; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w3si13935402edt.196.2019.11.18.21.49.20; Mon, 18 Nov 2019 21:49:21 -0800 (PST) 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=@kernel.org header.s=default header.b=K9mduQ2A; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731029AbfKSFtR (ORCPT + 15 others); Tue, 19 Nov 2019 00:49:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:45952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731467AbfKSFtQ (ORCPT ); Tue, 19 Nov 2019 00:49:16 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D92B208C3; Tue, 19 Nov 2019 05:49:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142555; bh=ZeDtjHcS4F7h4sPEOoNT2gxFQHsLvg4xtMYXjgeG0y0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K9mduQ2AIwCjEa3Ri7A7LPmKrsoVgbRZk2wpkXCj4zHJGxoajBgVHaBz9FJZ2mrKQ zfjdShQKrUjNbg36yFD956QrvsrDg2oteYsg6TpNzX9PeDS9D5wabwQCGjFXupNzvc SRGGhR5BJlyowA/wHI5LQ9XIxnjatQhklvHvunjE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Carlo Caione , Kevin Hilman , linux-amlogic@lists.infradead.org, Rob Herring , Sasha Levin Subject: [PATCH 4.14 120/239] arm64: dts: meson: Fix erroneous SPI bus warnings Date: Tue, 19 Nov 2019 06:18:40 +0100 Message-Id: <20191119051329.617803561@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 68ecb5c1920c5b98b1e717fd2349fba2ee5d4031 ] dtc has new checks for SPI buses. The meson dts files have a node named spi' which causes false positive warnings. As the node is a pinctrl child node, change the node name to be 'spi-pins' to fix the warnings. arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb: Warning (spi_bus_bridge): /soc/periphs@c8834000/pinctrl@4b0/spi: incorrect #address-cells for SPI bus Cc: Carlo Caione Cc: Kevin Hilman Cc: linux-amlogic@lists.infradead.org Signed-off-by: Rob Herring Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index af834cdbba791..250b5c11c0e25 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -413,7 +413,7 @@ }; }; - spi_pins: spi { + spi_pins: spi-pins { mux { groups = "spi_miso", "spi_mosi", diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index fb8d76a17bc5d..3c30579449608 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -310,7 +310,7 @@ }; }; - spi_pins: spi { + spi_pins: spi-pins { mux { groups = "spi_miso", "spi_mosi", From patchwork Tue Nov 19 05:19:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179702 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp170219ilf; Mon, 18 Nov 2019 21:51:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxfLvom0n7D4/Z2BVVznlJwKZP6FqMG6DRt/6CZPHXhwXQUyzZtqRdn6q+tk/lWazTFjF2C X-Received: by 2002:a17:906:198c:: with SMTP id g12mr32064396ejd.247.1574142688732; Mon, 18 Nov 2019 21:51:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142688; cv=none; d=google.com; s=arc-20160816; b=hOW0jqlXZeUZFSfQ2cTPgBPNw9ErAc5KHdldZvXk2yYFnW6XG+XqPMTa7SrrTsDz+Y m4umhiKetpTVY9mbHThuuhg7BV7URMLetWh+M+8oOwdicH1ODmsKpp0Thkl5GvDq+GLY oGmYRtf+b5lAglqJUVGnNUI088nFx6e5gl+LmhK77gWH3CHMJ5p9+rx+hX/RIR1+9zxR c7EN2UrE33IgrtMAPyT4oYeAVVLZTaAiS5aFl+l8jo+iIoFXwdYvUXRGcx82SnowPPjS cNX4pE3ql5rTGNPrBHx5adhS7Qc07kRs1rXgsDdjPprIbvB8OGXEK5bJozz80mk4Y3bs L+NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0xzi70ro8g7DOU0ldDOgAxYWLfN2BuSFX/QKO5fwFeI=; b=SmjY2OcdjTV58c5kRs0ByQYiY+BwyaR1b7I6ghMjQZ/yg3lftA9QZ017QoFyv3rqiV kz1tEwJdIVr07IVsQJEoyIJk6vCFKB5zuUZjyOusUDzkPCPRV1RGvHfLcmZTINNvTjSi Fa31BccRwR4s9kbBtCpU+CdOpiVr3qaO/Zmq1cHT02pR5+vLoCDELIVg1u7Hm4xu975n ehV0ktUE1tEq51llVJT61M9AvKcfiMClLhD1i5mHis8YRxxz9VuRC0FXvO/IEM462J5A /EKWm+5cW/0Icnzvy0vErAPtocLQqs42Z5CeOw9WO1/8+V1/waydliH4N9RXl5RTibmY UI2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RpLdfsOa; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b47si15688403edc.129.2019.11.18.21.51.28; Mon, 18 Nov 2019 21:51:28 -0800 (PST) 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=@kernel.org header.s=default header.b=RpLdfsOa; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731758AbfKSFvX (ORCPT + 15 others); Tue, 19 Nov 2019 00:51:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:48800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731777AbfKSFvW (ORCPT ); Tue, 19 Nov 2019 00:51:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F589208C3; Tue, 19 Nov 2019 05:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142682; bh=faCWoOYAfIbvkx3JZpbhyswh7/Ci/iA7KBk4Qo6abWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RpLdfsOaHhjBngJ90w5RAlNiQZkYaYHBe+2vQwgWDU+gz9nbmY2EP+mJxWZkHkyVW jIYZ/jzTWIxo60XA9FvusOZoY5DN2UNoTOgD1zXSYz8H+hpTReTqlfsmmeCOnifENE twFmTAodOZk8oZgjYpcWZw46toiHoV3xKAZWZyJA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Linus Walleij , Sasha Levin Subject: [PATCH 4.14 163/239] ARM: dts: ste: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:19:23 +0100 Message-Id: <20191119051333.501044561@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 2f967f9e9fa076affb711da1a8389b5d33814fc6 ] SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks. Signed-off-by: Rob Herring Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 4 ++-- arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- arch/arm/boot/dts/ste-snowball.dts | 2 +- arch/arm/boot/dts/ste-u300.dts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 3dc0028e108b3..986767735e249 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -878,7 +878,7 @@ power-domains = <&pm_domains DOMAIN_VAPE>; }; - ssp@80002000 { + spi@80002000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80002000 0x1000>; interrupts = ; @@ -892,7 +892,7 @@ power-domains = <&pm_domains DOMAIN_VAPE>; }; - ssp@80003000 { + spi@80003000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x80003000 0x1000>; interrupts = ; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index 3f14b4df69b4e..94eeb7f1c9478 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -57,7 +57,7 @@ }; }; - ssp@80002000 { + spi@80002000 { /* * On the first generation boards, this SSP/SPI port was connected * to the AB8500. diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index ade1d0d4e5f45..1bf4358f8fa71 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -376,7 +376,7 @@ pinctrl-1 = <&i2c3_sleep_mode>; }; - ssp@80002000 { + spi@80002000 { pinctrl-names = "default"; pinctrl-0 = <&ssp0_snowball_mode>; }; diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index 62ecb6a2fa39e..1bd1aba3322f1 100644 --- a/arch/arm/boot/dts/ste-u300.dts +++ b/arch/arm/boot/dts/ste-u300.dts @@ -442,7 +442,7 @@ dma-names = "rx"; }; - spi: ssp@c0006000 { + spi: spi@c0006000 { compatible = "arm,pl022", "arm,primecell"; reg = <0xc0006000 0x1000>; interrupt-parent = <&vica>; From patchwork Tue Nov 19 05:19:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179715 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp174846ilf; Mon, 18 Nov 2019 21:56:58 -0800 (PST) X-Google-Smtp-Source: APXvYqwqeMjo/z1wKHHQrGUDX1vgikcJPT31n50zX8SlU9cRdQa/x3sTTUtXob0nLCheq9MjA3xi X-Received: by 2002:a17:906:3e90:: with SMTP id a16mr32477026ejj.265.1574143018834; Mon, 18 Nov 2019 21:56:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143018; cv=none; d=google.com; s=arc-20160816; b=xnDGj2vJME7iLp5RoZCeYPXKhkov3EkVe3BINLuh3Os0uXZqG8/tbwHXJklxYSkstC xKvzAPbs+T+i2Ba5EcPdUjJ+J0dgRChpi1wMVDEKjiswYwDf/uNKOvWJ0NYg5UI8ixKW 9MJ1P/ktxenVPYbswvp2U6ACB4/SHBu7RxdfxIRxQfUC096rHnoBKsDw4qZcQEak4XTc 0SGLbLehWqg6lSWzj0gJ9cESYJ8cecvwTuNHiT1ZndOKnJ5vtAGOabaJ843ML3dB44TL tGl04RsNp7JYABvq4l0nIzeLMpQ1n6JZGDYIdog7LsiP2HI5FbPtZbuLnUHbL9lqzzXg 2uSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nQtcLznmf3MiotOB1ruThYzeEb4mJhoCKA2ZQbKsgJA=; b=n5CEHlEuiCz11d1JxRIcmmBR/UJ37kjvs0MU2YOAo8vCng/hl6JrHSFf8iO4of4A4r 0xd/1D2gXODfOUacaaQEAxBx9whdko2hw57nXILPIZp3vt7dK4KkhdiWKCdkcHjwu/og eTrJIcFl9WTYrEqWcQwiXbcdT09YbFPOgaVQyEUX2gwsx+aofoHyIXTJa5yzw1lBE8z2 f/w7t8PPRhFiNT2A72dRotdwLXCnP9LM+R5I6BAavyXqTtkp/hNlLMwyKUn+omQqoTzf 6aqO2XMc3qC+jpcr0nQah8QXAdB/irhrULpDIo9VY+YOGhxROgVFcs70lLyCSGiOoD5m X9WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nO2lpclU; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s17si10720979ejr.267.2019.11.18.21.56.58; Mon, 18 Nov 2019 21:56:58 -0800 (PST) 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=@kernel.org header.s=default header.b=nO2lpclU; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728722AbfKSF45 (ORCPT + 15 others); Tue, 19 Nov 2019 00:56:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:50566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731596AbfKSFwp (ORCPT ); Tue, 19 Nov 2019 00:52:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AB1320862; Tue, 19 Nov 2019 05:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142764; bh=pO5pmzQOyp9GLT9o5dmrVktyAYTGz8KB29rC+2x5vqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nO2lpclUjU0Ro7PbVr66q7d6verzn2/TYlg3SiWwNsZ8ZxVaP2VD86g0v+ormqNnU purFfGGFUv95QqmgXp/k4pVzWYrgOvDYQag8kZ9fE/5brU2hZMTYONS3s1rvNrtruT U/Q/oP+QN/eU7lQIiU9oR0pWOFTIB7ewlC2wTCfI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Suzuki K Poulose , Sasha Levin Subject: [PATCH 4.14 192/239] coresight: perf: Fix per cpu path management Date: Tue, 19 Nov 2019 06:19:52 +0100 Message-Id: <20191119051335.674005579@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose [ Upstream commit 5ecabe4a76e8cdb61fa3e24862d9ca240a1c4ddf ] We create a coresight trace path for each online CPU when we start the event. We rely on the number of online CPUs and then go on to allocate an array matching the "number of online CPUs" for holding the path and then uses normal CPU id as the index to the array. This is problematic as we could have some offline CPUs causing us to access beyond the actual array size (e.g, on a dual SMP system, if CPU0 is offline, CPU1 could be really accessing beyond the array). The solution is to switch to per-cpu array for holding the path. Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- .../hwtracing/coresight/coresight-etm-perf.c | 55 ++++++++++++++----- 1 file changed, 40 insertions(+), 15 deletions(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index 8a0ad77574e73..99cbf5d5d1c1f 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,7 @@ struct etm_event_data { struct work_struct work; cpumask_t mask; void *snk_config; - struct list_head **path; + struct list_head * __percpu *path; }; static DEFINE_PER_CPU(struct perf_output_handle, ctx_handle); @@ -72,6 +73,18 @@ static const struct attribute_group *etm_pmu_attr_groups[] = { NULL, }; +static inline struct list_head ** +etm_event_cpu_path_ptr(struct etm_event_data *data, int cpu) +{ + return per_cpu_ptr(data->path, cpu); +} + +static inline struct list_head * +etm_event_cpu_path(struct etm_event_data *data, int cpu) +{ + return *etm_event_cpu_path_ptr(data, cpu); +} + static void etm_event_read(struct perf_event *event) {} static int etm_addr_filters_alloc(struct perf_event *event) @@ -131,23 +144,26 @@ static void free_event_data(struct work_struct *work) */ if (event_data->snk_config) { cpu = cpumask_first(mask); - sink = coresight_get_sink(event_data->path[cpu]); + sink = coresight_get_sink(etm_event_cpu_path(event_data, cpu)); if (sink_ops(sink)->free_buffer) sink_ops(sink)->free_buffer(event_data->snk_config); } for_each_cpu(cpu, mask) { - if (!(IS_ERR_OR_NULL(event_data->path[cpu]))) - coresight_release_path(event_data->path[cpu]); + struct list_head **ppath; + + ppath = etm_event_cpu_path_ptr(event_data, cpu); + if (!(IS_ERR_OR_NULL(*ppath))) + coresight_release_path(*ppath); + *ppath = NULL; } - kfree(event_data->path); + free_percpu(event_data->path); kfree(event_data); } static void *alloc_event_data(int cpu) { - int size; cpumask_t *mask; struct etm_event_data *event_data; @@ -158,7 +174,6 @@ static void *alloc_event_data(int cpu) /* Make sure nothing disappears under us */ get_online_cpus(); - size = num_online_cpus(); mask = &event_data->mask; if (cpu != -1) @@ -175,8 +190,8 @@ static void *alloc_event_data(int cpu) * unused memory when dealing with single CPU trace scenarios is small * compared to the cost of searching through an optimized array. */ - event_data->path = kcalloc(size, - sizeof(struct list_head *), GFP_KERNEL); + event_data->path = alloc_percpu(struct list_head *); + if (!event_data->path) { kfree(event_data); return NULL; @@ -224,6 +239,7 @@ static void *etm_setup_aux(int event_cpu, void **pages, /* Setup the path for each CPU in a trace session */ for_each_cpu(cpu, mask) { + struct list_head *path; struct coresight_device *csdev; csdev = per_cpu(csdev_src, cpu); @@ -235,9 +251,11 @@ static void *etm_setup_aux(int event_cpu, void **pages, * list of devices from source to sink that can be * referenced later when the path is actually needed. */ - event_data->path[cpu] = coresight_build_path(csdev, sink); - if (IS_ERR(event_data->path[cpu])) + path = coresight_build_path(csdev, sink); + if (IS_ERR(path)) goto err; + + *etm_event_cpu_path_ptr(event_data, cpu) = path; } if (!sink_ops(sink)->alloc_buffer) @@ -266,6 +284,7 @@ static void etm_event_start(struct perf_event *event, int flags) struct etm_event_data *event_data; struct perf_output_handle *handle = this_cpu_ptr(&ctx_handle); struct coresight_device *sink, *csdev = per_cpu(csdev_src, cpu); + struct list_head *path; if (!csdev) goto fail; @@ -278,8 +297,9 @@ static void etm_event_start(struct perf_event *event, int flags) if (!event_data) goto fail; + path = etm_event_cpu_path(event_data, cpu); /* We need a sink, no need to continue without one */ - sink = coresight_get_sink(event_data->path[cpu]); + sink = coresight_get_sink(path); if (WARN_ON_ONCE(!sink || !sink_ops(sink)->set_buffer)) goto fail_end_stop; @@ -289,7 +309,7 @@ static void etm_event_start(struct perf_event *event, int flags) goto fail_end_stop; /* Nothing will happen without a path */ - if (coresight_enable_path(event_data->path[cpu], CS_MODE_PERF)) + if (coresight_enable_path(path, CS_MODE_PERF)) goto fail_end_stop; /* Tell the perf core the event is alive */ @@ -317,6 +337,7 @@ static void etm_event_stop(struct perf_event *event, int mode) struct coresight_device *sink, *csdev = per_cpu(csdev_src, cpu); struct perf_output_handle *handle = this_cpu_ptr(&ctx_handle); struct etm_event_data *event_data = perf_get_aux(handle); + struct list_head *path; if (event->hw.state == PERF_HES_STOPPED) return; @@ -324,7 +345,11 @@ static void etm_event_stop(struct perf_event *event, int mode) if (!csdev) return; - sink = coresight_get_sink(event_data->path[cpu]); + path = etm_event_cpu_path(event_data, cpu); + if (!path) + return; + + sink = coresight_get_sink(path); if (!sink) return; @@ -355,7 +380,7 @@ static void etm_event_stop(struct perf_event *event, int mode) } /* Disabling the path make its elements available to other sessions */ - coresight_disable_path(event_data->path[cpu]); + coresight_disable_path(path); } static int etm_event_add(struct perf_event *event, int mode) From patchwork Tue Nov 19 05:19:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179707 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp171445ilf; Mon, 18 Nov 2019 21:52:59 -0800 (PST) X-Google-Smtp-Source: APXvYqwYvhHe58AuqQQN8AkGDhlSJetOhJkr+CffjpA+OD5y6gn0DdxxTtZUj2CokKfBnc5aO8DS X-Received: by 2002:a17:907:1102:: with SMTP id qu2mr32120947ejb.300.1574142779439; Mon, 18 Nov 2019 21:52:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142779; cv=none; d=google.com; s=arc-20160816; b=o12WjFGe2DylzjUeY3GOwrz2gv71P40ddIScy+P5tqRTrl6LLVoxrmcOKO8+SGd2Az 5vduCC702tQOSKSTGdD/caENrvKbZlecO3ZRUE9G2bxcRiknmQ0TCM3DiombzyDpWNiT Yz5KlVPX1uTuVMrjoA771tPSj8+HvbhjrWNgiL6Ruj7Bj3FKEedVg4zUw4vzUHLOL9lT B3hZQygwZfHyVgChs0e5eNI87/JkC3E7ejAYR7NAedfLSkTqTO6I2i2XiDB73PPSuIfq tG2yq5EhwBEGggqte34wLqUiPQckjDXG0joLkvMF2LJaKM6NxtB/LjcE22ijQIHpMvgR 4y8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tl/tiH9j2/QovkKmzZt6RsVyQePoBeHlLSFbGH28S5o=; b=nClMnGtiZ6wr3efLv57S2unZBzPE20mULyiNe0F+7Zkgq89Jw16w55gWBuJx6+0bLs NWO799LjMPM0eI9PzecwZ92sWti9CD+i0KWUbcer6YoEW2oba7Lw+UXNtubOfy7jgGW7 2avDSsAurYqB361nC0JdObVDkWEGYD3UXAhzuDvCQEHgzjBsbiBFteQdzYvQ+Yu6ZQ/x 4NeilUUJ9rlY3u1jBjL7uVE5uB5xQW+aJI5DxFHZmxkiexVuod7zGvBMv1LBfonJWUvU J0JV4SuflX8n4bZSe+H3Ysvs626YrUU/C50ec2FP5TbEpV2wzLigIPxQE7vkU1tqbiFK qfSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aniEgnHu; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c25si13499695eja.24.2019.11.18.21.52.59; Mon, 18 Nov 2019 21:52:59 -0800 (PST) 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=@kernel.org header.s=default header.b=aniEgnHu; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728493AbfKSFw5 (ORCPT + 15 others); Tue, 19 Nov 2019 00:52:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:50754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731961AbfKSFwy (ORCPT ); Tue, 19 Nov 2019 00:52:54 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5CE5221939; Tue, 19 Nov 2019 05:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142773; bh=oHMUJSdY6GTcK8AEGZQrARA28E+MfxcypOGkikh7IlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aniEgnHukkFHqBb+ibfpEDoZKRrDoARwNv54Pae69dDQVpTp01+v2JxGRKMnuV930 lnxBeslCkow1u5hzgLX6WeisUbddg60bt2Paau/QFQ600fL+aHFlYbc5cwQ/v1OEI5 H6/86w0vGDHQLcTe9AC0ryNe5++xjYih+W4wv8Qo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Mike Leach , Leo Yan , Sasha Levin Subject: [PATCH 4.14 195/239] coresight: tmc: Fix byte-address alignment for RRP Date: Tue, 19 Nov 2019 06:19:55 +0100 Message-Id: <20191119051335.964672784@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Leo Yan [ Upstream commit e7753f3937610633a540f2be81be87531f96ff04 ] >From the comment in the code, it claims the requirement for byte-address alignment for RRP register: 'for 32-bit, 64-bit and 128-bit wide trace memory, the four LSBs must be 0s. For 256-bit wide trace memory, the five LSBs must be 0s'. This isn't consistent with the program, the program sets five LSBs as zeros for 32/64/128-bit wide trace memory and set six LSBs zeros for 256-bit wide trace memory. After checking with the CoreSight Trace Memory Controller technical reference manual (ARM DDI 0461B, section 3.3.4 RAM Read Pointer Register), it proves the comment is right and the program does wrong setting. This patch fixes byte-address alignment for RRP by following correct definition in the technical reference manual. Cc: Mathieu Poirier Cc: Mike Leach Signed-off-by: Leo Yan Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index e2513b7862427..336194d059fed 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -442,10 +442,10 @@ static void tmc_update_etf_buffer(struct coresight_device *csdev, case TMC_MEM_INTF_WIDTH_32BITS: case TMC_MEM_INTF_WIDTH_64BITS: case TMC_MEM_INTF_WIDTH_128BITS: - mask = GENMASK(31, 5); + mask = GENMASK(31, 4); break; case TMC_MEM_INTF_WIDTH_256BITS: - mask = GENMASK(31, 6); + mask = GENMASK(31, 5); break; } From patchwork Tue Nov 19 05:20:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179710 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp172755ilf; Mon, 18 Nov 2019 21:54:35 -0800 (PST) X-Google-Smtp-Source: APXvYqwj7mjvK3Vc4ybXwsKP08zKRWRNhZeGbMYyNJg/l+61SDO8Pyw0wo8uJ2orPI8Er6IINxBb X-Received: by 2002:a17:906:1395:: with SMTP id f21mr31320409ejc.152.1574142875759; Mon, 18 Nov 2019 21:54:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142875; cv=none; d=google.com; s=arc-20160816; b=LtF0MMWFEWqD/z4DsOjvrpLGDe32d1fMswXasi5s35MmbrBtOj7Xxk6HT7YxLdjz20 +a7inb49gqN3Y3N7rD686W7HWgwUVxiGjPH3qgkcNKgTYGtBLVzcAQjbetB80L8zQLQR K1aLI/8CYps6opeQbHhIFA5JA2Zs0hWytJ2QbdYfVLMKfPhOlyXNlObfLyZMbjxjwMjG QshXjJ9KGqfF1EQUhbS2kdROKb6Ge1jYGmByTujigxyPvbfOo7mY/MzeTSYQoSfZ/GbQ ZiLmW3FNLsyMPjRFMogkM3expBrjq2Rbzp57RLDKtuA6RRQdYS4315eyX5e/k2CZCjxy r7yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GqJC9BkDYFNluHUAJMaxfU32MuSOqkCCw3/XrRcMGJc=; b=ON9LNz6cB4SLnhbza4gQSbQkASZYVPvPhHogOBFgr2lnKtezngs24w0nGm79y+7qMh H1Owig4YpWGOjm9uwzSsgIj7MF+ueGXB4B5ka1GANtyG40uvMnngTzi4tZ3oq0LrQIsS Mt++jUe6nXTvZDx/o9pSRVCxjoqM99qmgFfTwnhvQxW5+LKH6CAm83oFCL6b1NEAphNw TbOr11K/eSXIt2YTiQk9psN9OutrYdiwz435sTisuA0LSR9ga9OtzWJjGjIyEbPTG+MF QxtwJugbxcYBphxaYL3oLtxvyyXlXTJXC/3ls3nerQYJ9GcCcPtVR9XejXIyn9nbXuWf bYjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BYvYtZlv; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s10si13875840edh.138.2019.11.18.21.54.35; Mon, 18 Nov 2019 21:54:35 -0800 (PST) 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=@kernel.org header.s=default header.b=BYvYtZlv; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732163AbfKSFyd (ORCPT + 15 others); Tue, 19 Nov 2019 00:54:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:52680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732160AbfKSFyd (ORCPT ); Tue, 19 Nov 2019 00:54:33 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0AFC2208C3; Tue, 19 Nov 2019 05:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142872; bh=s+qDWJiCsCOtUONRrtoz3ETIwaa58Xm2dheg+889mKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BYvYtZlvXWt8n/w/S7Y9WN+swFUTdAu3Mef920w8Hufh2+Q6sIHfPx8zYu9+S+oQ1 Z6AkFapLnDRXzES2436MqguqUD/h19xpi0rIZkrI4O2pdcqEBVrr1U36TSlevDZ0G/ S/2Pqn3nO4IDZxgpx0Ta4pzcMlPGE8jDR6USn+uc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chanho Min , Rob Herring , Arnd Bergmann , Sasha Levin Subject: [PATCH 4.14 230/239] arm64: dts: lg: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:20:30 +0100 Message-Id: <20191119051341.253838456@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 09bae3b64cb580c95329bd8d16f08f0a5cb81ec9 ] SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks. Cc: Chanho Min Signed-off-by: Rob Herring Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/lg/lg1312.dtsi | 4 ++-- arch/arm64/boot/dts/lg/lg1313.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/lg/lg1312.dtsi b/arch/arm64/boot/dts/lg/lg1312.dtsi index 860c8fb107950..4bde7b6f2b113 100644 --- a/arch/arm64/boot/dts/lg/lg1312.dtsi +++ b/arch/arm64/boot/dts/lg/lg1312.dtsi @@ -168,14 +168,14 @@ clock-names = "apb_pclk"; status="disabled"; }; - spi0: ssp@fe800000 { + spi0: spi@fe800000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x0 0xfe800000 0x1000>; interrupts = ; clocks = <&clk_bus>; clock-names = "apb_pclk"; }; - spi1: ssp@fe900000 { + spi1: spi@fe900000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x0 0xfe900000 0x1000>; interrupts = ; diff --git a/arch/arm64/boot/dts/lg/lg1313.dtsi b/arch/arm64/boot/dts/lg/lg1313.dtsi index 1887af654a7db..16ced1ff1ad36 100644 --- a/arch/arm64/boot/dts/lg/lg1313.dtsi +++ b/arch/arm64/boot/dts/lg/lg1313.dtsi @@ -168,14 +168,14 @@ clock-names = "apb_pclk"; status="disabled"; }; - spi0: ssp@fe800000 { + spi0: spi@fe800000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x0 0xfe800000 0x1000>; interrupts = ; clocks = <&clk_bus>; clock-names = "apb_pclk"; }; - spi1: ssp@fe900000 { + spi1: spi@fe900000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x0 0xfe900000 0x1000>; interrupts = ; From patchwork Tue Nov 19 05:20:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 179712 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp173772ilf; Mon, 18 Nov 2019 21:55:41 -0800 (PST) X-Google-Smtp-Source: APXvYqzoiQllRgDsxmVf0ODY04n6e5EPNUTrEamBhQrZGCk4py6E+tgzoW4eD9WljTeOTjOKpt/i X-Received: by 2002:a17:906:e0c5:: with SMTP id gl5mr2959437ejb.119.1574142941656; Mon, 18 Nov 2019 21:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142941; cv=none; d=google.com; s=arc-20160816; b=r8je0FgRSVGKHhWRfDbVMOW4Y5GsCTdNuwOAlC4fZgUyiySCxvDJuC1iNOf5awzlF9 mcdcXsJXKtHt7vaSSVJFAzWQ7OBBEQeHlglAwYx+9w+15VGawoNHtdSJVNtjp1QhVAcW Tn+B+0lLpgG4H0taxtxstVy6Ma17q+3Hzm5G5ucCU6NKcOPRcGvch1JGg0dvgxkhHdPX D8hgNSIETo1xDoGEbLIUgon0NNKSuEaljSvqJcFOQ6bQeQvgQoThsia0/xxSfC0+Huyw wKCk2sVBcOjXKXy36jm+GgEIRR/Bv+a62Es+hFtkHYN0Jg9dbNUWlnhfZbVtY/vs+1u/ 53rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wiRTRD0xBA3W9/VTSsRJSLNU6ExtSRdiDszv4qytJ/s=; b=n+vXDdwpcOxZ0n17735FjuVoH1hTcceVFx6QGKPuIfu5Y/qUPKsCHYRRESLccczw90 KEdaNAurMNp9/2NjHLHbhKDhd8hVm1y3n8uFgReON5r2IPPugiJvsdwYpQ9CLEpHIFwl D7iKy6SSBJJeC4+eTKrdmVcB4HJ157tlqo1T8aGCaGCMZ+yMl/zJfEcPl0B2uFyXlXea ap/IBtirrCt/q35aBgOIF6R4SJN4BRkcl+uPsFrTVaIPRse/QUNpS+L58cWupE0lJATQ XoGmy152oOgkdFylakqH8xDmkeGAkOrjcse+xlCKAk+JNQZ8qKobfQT4X1fCTHKTbxLH ccKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YNec4prQ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ec6si4225410ejb.174.2019.11.18.21.55.41; Mon, 18 Nov 2019 21:55:41 -0800 (PST) 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=@kernel.org header.s=default header.b=YNec4prQ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731360AbfKSFzk (ORCPT + 15 others); Tue, 19 Nov 2019 00:55:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:53212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732213AbfKSFy6 (ORCPT ); Tue, 19 Nov 2019 00:54:58 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6109208C3; Tue, 19 Nov 2019 05:54:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142897; bh=TgMTOV6vcLpQIk4fl+/asFU0iDlVDGF7K2gCTffcTAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YNec4prQ07v/8RHslk2HMe1gRhreaqzQOF6r/spFOEbAszp8zN0k+7viN8d6EuZ8H pWw936fO8l4R48usbmIdAUCFu2WZOweIYWDUkGcoZzwWBVatoxrnqKpMMiy3JCvygn YRcm01GMSwiKkxDM8Y0xllUBeuLUBeg87JkUjKqQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 238/239] net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused Date: Tue, 19 Nov 2019 06:20:38 +0100 Message-Id: <20191119051342.758447783@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 9b97123a584f60a5bca5a2663485768a1f6cd0a4 ] The newly added runtime-pm support causes a harmless warning when CONFIG_PM is disabled: drivers/net/phy/mdio-bcm-unimac.c:330:12: error: 'unimac_mdio_resume' defined but not used [-Werror=unused-function] static int unimac_mdio_resume(struct device *d) drivers/net/phy/mdio-bcm-unimac.c:321:12: error: 'unimac_mdio_suspend' defined but not used [-Werror=unused-function] static int unimac_mdio_suspend(struct device *d) Marking the functions as __maybe_unused is the easiest workaround and avoids adding #ifdef checks. Fixes: b78ac6ecd1b6 ("net: phy: mdio-bcm-unimac: Allow configuring MDIO clock divider") Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/mdio-bcm-unimac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/net/phy/mdio-bcm-unimac.c b/drivers/net/phy/mdio-bcm-unimac.c index f9d98a6e67bc4..52703bbd4d666 100644 --- a/drivers/net/phy/mdio-bcm-unimac.c +++ b/drivers/net/phy/mdio-bcm-unimac.c @@ -316,7 +316,7 @@ static int unimac_mdio_remove(struct platform_device *pdev) return 0; } -static int unimac_mdio_suspend(struct device *d) +static int __maybe_unused unimac_mdio_suspend(struct device *d) { struct unimac_mdio_priv *priv = dev_get_drvdata(d); @@ -325,7 +325,7 @@ static int unimac_mdio_suspend(struct device *d) return 0; } -static int unimac_mdio_resume(struct device *d) +static int __maybe_unused unimac_mdio_resume(struct device *d) { struct unimac_mdio_priv *priv = dev_get_drvdata(d); int ret;