From patchwork Tue Nov 19 05:14:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179633 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp147846ilf; Mon, 18 Nov 2019 21:25:14 -0800 (PST) X-Google-Smtp-Source: APXvYqz+2us1bKVaMYDfSGYIm+cDcbvlxIXjSF0PvCU5bhFLtQuVo2Q30qwz+4KIl0+m+sFo9GE/ X-Received: by 2002:a17:906:6093:: with SMTP id t19mr32014338ejj.50.1574141114498; Mon, 18 Nov 2019 21:25:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141114; cv=none; d=google.com; s=arc-20160816; b=wBJ8gHL81vY2BiT6mPD4RwLrz3EiCbs9UvSIyszRXUNqgaFiTmh0u5nqIbOlOYB8ub a8Kid0e427s0a3iV8HxWmQwAonT8QlPXYeGzpkQpTSaqYGwQDyAGCYcYK2c03ua9YxvG DNPubt5LfeXDX5nAeN6EB68I0rIpI2+cBgT9YhkoZS7StGKej4sZJyD8KbLm8y7QFwAi xUyTzW0jjoDuzCih17A+jW9V5heBeLktgIO31/9Lr3fvkM5TSdPIeE0G0igDg/TII83F az+vMUh4yMjvGQitjrlqm3/fG6Wk0uhH86SY1V4jWm7b50lwn0ZBnOCV4O8rrLypqvbf vuGw== 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=6aGRKjrG7ba/z3b3JVl9nv/fXh5nTfbmr1uHM2aRDxc=; b=ZdNWooFHoyv6tuTbbBQvIPyapJRmHn4WMa9+7JI2mFFEXaEBpEp5dFBJlm0veaKNNL G4HUTTKIMyDeXaVdrjg3o7RXREKnc+2/KVGcSvdLugtiMSShwOHS6GAC5pug3OR22Dk9 JydkTbM1WfFStZan/TVVq932AMy3u+d/vxefj41F21YE3H0+mJtTZCyH+L057DM3Trgq DA/wl8Z1WN9+1lpiWezHBn5ER0NXSSqga0+YRw1mMhysQF1LXcOyT/g7IrYr+y46znwa D+txpM6l+XzVbfIxG7w6xJNcvF8cZmAhKT4rGEAzkm+iRqMDq1ERrugtSfCRBConFNz3 lD1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=O3PCyqyA; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k22si4382439eds.46.2019.11.18.21.25.14; Mon, 18 Nov 2019 21:25:14 -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=O3PCyqyA; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728337AbfKSFZL (ORCPT + 26 others); Tue, 19 Nov 2019 00:25:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:41942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728326AbfKSFZH (ORCPT ); Tue, 19 Nov 2019 00:25:07 -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 65DB121823; Tue, 19 Nov 2019 05:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141106; bh=VKcieq0ARls4eteR5hLrrJ5YCzzxNlWyVtNRCKYMwmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O3PCyqyAYX0wtqn2aEIUXXt+zuATKxXWjzJxDHtcL+8iKSqEqzz0jZL72sOkMNr1U eLiG8gi4YOP63FIInccB2hUWcNq+5EnriekFIZnq50NHBTRQxCk5sOtMMo/GxMa6AB HhKfvFPHjaFASm7+A6HUuM3TxCI4PbDu8HLh6gJA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sasha Levin Subject: [PATCH 4.19 046/422] y2038: make do_gettimeofday() and get_seconds() inline Date: Tue, 19 Nov 2019 06:14:03 +0100 Message-Id: <20191119051402.870151067@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 33e26418193f58d1895f2f968e1953b1caf8deb7 ] get_seconds() and do_gettimeofday() are only used by a few modules now any more (waiting for the respective patches to get accepted), and they are among the last holdouts of code that is not y2038 safe in the core kernel. Move the implementation into the timekeeping32.h header to clean up the core kernel and isolate the old interfaces further. Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- include/linux/timekeeping32.h | 15 +++++++++++++-- kernel/time/time.c | 15 +++++++++------ kernel/time/timekeeping.c | 24 ------------------------ 3 files changed, 22 insertions(+), 32 deletions(-) -- 2.20.1 diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h index 8762c2f45f8bf..479da36be8c82 100644 --- a/include/linux/timekeeping32.h +++ b/include/linux/timekeeping32.h @@ -6,8 +6,19 @@ * over time so we can remove the file here. */ -extern void do_gettimeofday(struct timeval *tv); -unsigned long get_seconds(void); +static inline void do_gettimeofday(struct timeval *tv) +{ + struct timespec64 now; + + ktime_get_real_ts64(&now); + tv->tv_sec = now.tv_sec; + tv->tv_usec = now.tv_nsec/1000; +} + +static inline unsigned long get_seconds(void) +{ + return ktime_get_real_seconds(); +} static inline struct timespec current_kernel_time(void) { diff --git a/kernel/time/time.c b/kernel/time/time.c index be057d6579f13..f7d4fa5ddb9e2 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -144,9 +144,11 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv, struct timezone __user *, tz) { if (likely(tv != NULL)) { - struct timeval ktv; - do_gettimeofday(&ktv); - if (copy_to_user(tv, &ktv, sizeof(ktv))) + struct timespec64 ts; + + ktime_get_real_ts64(&ts); + if (put_user(ts.tv_sec, &tv->tv_sec) || + put_user(ts.tv_nsec / 1000, &tv->tv_usec)) return -EFAULT; } if (unlikely(tz != NULL)) { @@ -227,10 +229,11 @@ COMPAT_SYSCALL_DEFINE2(gettimeofday, struct compat_timeval __user *, tv, struct timezone __user *, tz) { if (tv) { - struct timeval ktv; + struct timespec64 ts; - do_gettimeofday(&ktv); - if (compat_put_timeval(&ktv, tv)) + ktime_get_real_ts64(&ts); + if (put_user(ts.tv_sec, &tv->tv_sec) || + put_user(ts.tv_nsec / 1000, &tv->tv_usec)) return -EFAULT; } if (tz) { diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index c2708e1f0c69f..81ee5b83c9200 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1214,22 +1214,6 @@ int get_device_system_crosststamp(int (*get_time_fn) } EXPORT_SYMBOL_GPL(get_device_system_crosststamp); -/** - * do_gettimeofday - Returns the time of day in a timeval - * @tv: pointer to the timeval to be set - * - * NOTE: Users should be converted to using getnstimeofday() - */ -void do_gettimeofday(struct timeval *tv) -{ - struct timespec64 now; - - getnstimeofday64(&now); - tv->tv_sec = now.tv_sec; - tv->tv_usec = now.tv_nsec/1000; -} -EXPORT_SYMBOL(do_gettimeofday); - /** * do_settimeofday64 - Sets the time of day. * @ts: pointer to the timespec64 variable containing the new time @@ -2177,14 +2161,6 @@ void getboottime64(struct timespec64 *ts) } EXPORT_SYMBOL_GPL(getboottime64); -unsigned long get_seconds(void) -{ - struct timekeeper *tk = &tk_core.timekeeper; - - return tk->xtime_sec; -} -EXPORT_SYMBOL(get_seconds); - void ktime_get_coarse_real_ts64(struct timespec64 *ts) { struct timekeeper *tk = &tk_core.timekeeper; From patchwork Tue Nov 19 05:14:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179634 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp148026ilf; Mon, 18 Nov 2019 21:25:28 -0800 (PST) X-Google-Smtp-Source: APXvYqx3LUxl2/LgeAwUqr4RF337MMMZP4pPx9ZlGECKtCs5Cj1rgq7hJ6NxRy0u55+5tpEFKmnW X-Received: by 2002:a17:906:4dd5:: with SMTP id f21mr31999907ejw.203.1574141128769; Mon, 18 Nov 2019 21:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141128; cv=none; d=google.com; s=arc-20160816; b=Vi+XSD+zD8I8S6YsVI8OvLzPlAe3tfrj1G7B3SjPR+ntAZsMivE4mBlOE0Z5whtmfT arm3Clqj5LcXaBwiFYs/kl4i1Rv104yZ8Og+EL2EuV8A5hpuQbr5TE+Uu+LrO6U1xvSO 1QtKn6zDLqDZosqHjsjO1bgclchn9v2+ke8dTfGO5uqT3Vogfa5qTmhkyGwVMaQDCBTY Iiz7xc29zRFT/O5lqd1JDT0EX35yyUBeMBkqq7Oe4H4JBTh0Jq76/qToCgneTQVl25QE TBKO0juPX9yjYmHP+6QZc9AFsNmf5tsZAlvTEkCSvq5IEWl5aUIb0/Sgj+ZZfQPR2cU6 rhQA== 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=oxi/zbNEgUBDasSNu8cC9qmYgTjgehpKhG3AvFnXbns=; b=STGdTP1vUG6Hzcjbyt3DD0NmKpAaK5gqxlw13JZAiZq0/MpHzgrqvFQExG3MYJiirH 0ugfILjL0W5mSVaVHPBg5jkE3zbo65kIaSDgpRQNW6UVIfV9tsiH2YsblnziPZ2LdwZL ObRW/BSWzilfaT1KnU4ebfFsiq0dpeKRzdcQudnRQ8Ygm9pRIkg8yR6STyW78oWE05ke GC3+6Yw3pSRaqi4CO1C+U2n/7FhzWLN47w4DOgrpNUV9p8VPrnU+dc0eioNCueQvOge5 MTtPcfWRwrr2x3TuWAsmPPzpByJHNF0/19jX7IanvlkFchboHMXSSD/DZ/395fXSgqR4 vKvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=glxXgbDf; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i15si13031944ejz.434.2019.11.18.21.25.28; Mon, 18 Nov 2019 21:25: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=glxXgbDf; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728391AbfKSFZ1 (ORCPT + 26 others); Tue, 19 Nov 2019 00:25:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:42808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728379AbfKSFZY (ORCPT ); Tue, 19 Nov 2019 00:25:24 -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 CAAED21783; Tue, 19 Nov 2019 05:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141124; bh=OqJpgqnNucTIjc1sie5sJ+o2au5E86wgHQZUsNmr+LU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=glxXgbDf1Isc3xtPvRERvWPSZmGjKIugZUedT+1Uk/VNS2Qr0/bKriC85tlVlxZM5 Nv4kWcCdh7eo3BPjt2r6/xj6x2fjKK4FrEyk97n+n+Ac1JY5DgIAeZossB6ApA7Jde P8F1dDecAp3es2yaVoWMCRe+aQcxR+pelu88aNag= 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.19 051/422] remoteproc/davinci: Use %zx for formating size_t Date: Tue, 19 Nov 2019 06:14:08 +0100 Message-Id: <20191119051403.137683234@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 e230bef71be1c..d200334577f68 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c @@ -226,7 +226,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:14:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179636 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp148982ilf; Mon, 18 Nov 2019 21:26:44 -0800 (PST) X-Google-Smtp-Source: APXvYqwaAAT54ohXTDVZ95x5JzyXgkCQvH579UJ8/SpKcMpg4HhAjzLisi4Rk5md2xppt5Nh98hn X-Received: by 2002:a17:906:8697:: with SMTP id g23mr33012605ejx.177.1574141204771; Mon, 18 Nov 2019 21:26:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141204; cv=none; d=google.com; s=arc-20160816; b=IKoywYuXhyd5Zt1zo0dxZo4eW8cY4QHsiWX5DzVtlb14He/8Pj021Byhcrt4knKyqz vdVjzOlTZhbSVRPl4hG8IIFoN3kkfsLj/jdFPvXRhJQTsT7Gmceww7j3qIX7iMw+woEr ZvjIfgC3/q2TAbWTf8cvFYsgW/OIV3yJE0cKMKX6p8RiBMau7KBc81Kt22HXnapiIuzf IGscfNZ9RMA6a7RY1zgRzcvSNIBEy5D/i7vHpxBJ/p93Aek5GADiHCXh7hRepYZid5kB MXXZOnJTKEBAMCSYBLmZDv7iYFR0FzOF5Ok+Lc7sqbCZkbjsHg1wQ5tZmWf9aDadLNPU DYyw== 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=e0Sv6vYQUeq1Iwe4QZCEJSsGoDYCNg02T705gsH3dUo=; b=x0nFkuTkPDFtPoQLgmBkAJUTZLpexQ8NQS01p5Rj0fS+kTqG4a3LgMEHaP+GVOTcoN WU8hXvkG/c4S4qv50G6Jqy52JB47j0ggqiQUsDlEgIQWdiSQ+AOkapnaj25XyjygQOPG dk8CkhXbAhrWDpArFJM1mnWICzgcJJKqsyUnr/2Xc9vrvCWwIcURFv/jGkuSLyNCEfHj ki7onEp6tje9JBO34NDxT0HO5wzYCO6dSoT7CWjMwQH2pXYeTiUvDPT8R5RWk8e6YfLr slcpZoPXIW8nUo/HfL4Vvvnls6Ax87F2XVbvZzJP4bVO3/lVJudqLqSr0lkQ6ePuKH3N 2yeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=s56o69Zi; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i7si14948473eda.375.2019.11.18.21.26.44; Mon, 18 Nov 2019 21:26:44 -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=s56o69Zi; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728599AbfKSF0j (ORCPT + 26 others); Tue, 19 Nov 2019 00:26:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:44728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728583AbfKSF0g (ORCPT ); Tue, 19 Nov 2019 00:26:36 -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 0EB222230F; Tue, 19 Nov 2019 05:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141195; bh=XkpVBslqKuTdE5Rwg3WUgngD4asXjVjBos72JgaNb94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s56o69ZiMR3N62byG1haS/ECq/W9nj8RVQQM+iODjigVhRMzLRr8YJnlPBq1DZVIc qeuSAjo6SwmmM8YP3LK1YEvgO0VK2ywSIPS2/iEFH3E8T6WWNqgbpc0tkUQ6D9l+oE V4gpQ1ki+FfO3EcT9Tf88KuGlqeV4dOUQswJzros= 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.19 077/422] ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks Date: Tue, 19 Nov 2019 06:14:34 +0100 Message-Id: <20191119051404.521809984@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 25bdc9d97a4df..769d60d6c9006 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -312,6 +312,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; @@ -333,6 +334,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; @@ -343,6 +345,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 7989631b39ccf..492e2cd2e559e 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -312,6 +312,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; @@ -333,6 +334,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; @@ -343,6 +345,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:15:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179637 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp150765ilf; Mon, 18 Nov 2019 21:29:05 -0800 (PST) X-Google-Smtp-Source: APXvYqxU5noAFhLXxaHxkEgSl7E9MKRTwRqqWznC1zeN629dkxJD0KwyfoNR+B9YZq+NJSzt7c6g X-Received: by 2002:a17:906:158f:: with SMTP id k15mr20423432ejd.226.1574141345063; Mon, 18 Nov 2019 21:29:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141345; cv=none; d=google.com; s=arc-20160816; b=b3Aoo8hWhrlrcgPN0vmjNVjDjRMZ9wPIaB/HCHMNOPTEhQBdXhudumdP0a3JrsWiC4 jUpPq4iZCgfeqvuxpfaFuaqH4l7/vrL836VYVKt2bREPRytTG7JVkPWmZRBP6zPdVFAH EPXYdsbliCwp4uyb+U5igjxyVgj08RRy6t1nJ5Eh2223JaYVELPozpZZIlYh99oOAt14 hCJsbj9nWBm9zQQXPAxXi+24AgyxpdQAOQCeaxdi/XvpX6wiMCVDAkbf1oNkzYhuBNBs Cz9NpJbLX6oZp4u9rU81AdZ8l+NWeZXmPZFX5OEmruMdF/FvHOUb8S38VVFvQ2+pzrJa FT3Q== 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=CttZYk6S1QuCBE/JJS39QkQhJcIOmIBXdFVCWoOTB0w=; b=q4noCjsObTjYfCfn1uO9wfls9VxZqgxaLXQLb+3/DwJPkOxz1ZGwQ6wvwOjQ01d9hV QYHms2pRMr8NuOF00RUKB6owD3meAH+xwFTHhFulOxKWuVHr0mXJl32yGKn7dj+PzQuj slYwKdxuVI+cIzt/3oNHbCexH9KK6YwfFSVYM3crDPbvx6qLFoIwGgRH1Rb6QaQXUI+p hyY0CRI3UFkrS3SWS5LU5el3kI0RVq1bPU3Vr98fnRmtq17oBps0xK93/lPY9I047sev gPwlMGhxyE46jj1alYQydARIVC001041oLQF8zphOXr95Lzfp5f+7wB/fUDWvYKsQVdB fCyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hgRwhD3t; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e25si16240480ede.335.2019.11.18.21.29.04; Mon, 18 Nov 2019 21:29:05 -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=hgRwhD3t; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728933AbfKSF3C (ORCPT + 26 others); Tue, 19 Nov 2019 00:29:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:47458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728926AbfKSF25 (ORCPT ); Tue, 19 Nov 2019 00:28:57 -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 06734208C3; Tue, 19 Nov 2019 05:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141336; bh=Ne3xpqHDEVTaOIwtvgtj6SoGrIn4XBahTRxtBYOMvZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hgRwhD3tx6o37+01qxGF+3DWCWYalEz0bvLOJFSW8Vxjbo07XEIrjCDL9dWJpUmqD bWNGtXtHln6wECw5m01ZXd/eGkWrSzVkPrLL0zEKKx7OiMM1j4mXjdGt2G+EC1gquQ l7AAiyLKpStUOqFmF93WiR7hZlzBM8Nhe/AhArbA= 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.19 125/422] ARM: dts: exynos: Disable pull control for S5M8767 PMIC Date: Tue, 19 Nov 2019 06:15:22 +0100 Message-Id: <20191119051407.074252868@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Szyprowski [ Upstream commit ef2ecab9af5feae97c47b7f61cdd96f7f49b2c23 ] S5M8767 PMIC interrupt line on Exynos5250-based Arndale board has external pull-up resistors, so disable any pull control for it in in controller node. This fixes support for S5M8767 interrupts and enables operation of wakeup from S5M8767 RTC alarm. Signed-off-by: Marek Szyprowski Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos5250-arndale.dts | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 9c8ab4b7fb2cf..4ab1f1c66c27f 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -170,6 +170,8 @@ reg = <0x66>; interrupt-parent = <&gpx3>; interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&s5m8767_irq>; vinb1-supply = <&main_dc_reg>; vinb2-supply = <&main_dc_reg>; @@ -530,6 +532,13 @@ cap-sd-highspeed; }; +&pinctrl_0 { + s5m8767_irq: s5m8767-irq { + samsung,pins = "gpx3-2"; + samsung,pin-pud = ; + }; +}; + &rtc { status = "okay"; }; From patchwork Tue Nov 19 05:15:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179638 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp151229ilf; Mon, 18 Nov 2019 21:29:41 -0800 (PST) X-Google-Smtp-Source: APXvYqx/MOagt5nOYt3YXn83rfEOzE0hI1Hh0tbbuJVGGMilSHOBEww2tE+vQJ2dX23uiGL81Uk1 X-Received: by 2002:a17:906:230f:: with SMTP id l15mr31636365eja.222.1574141381144; Mon, 18 Nov 2019 21:29:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141381; cv=none; d=google.com; s=arc-20160816; b=042AprHIYq0Za1xJrsIlL4l5YT7XcB0Gr4BeBMNBAnTIqtyQnVTaQ5aT92WeAtgdfO +vmexuyrLoLOmUzIAHBV3+GoJBgGZAblhOICCn6miruMOlOoKaXtkezp8MbZPZqW0rb8 YoA8V8pxmPKsccqe1+rD4XJu+KjSlJvy5hBBj+Oeel6l22RPi3MeDliN06roCvEHGW41 7rUibNutGlpY7FFUmdswSsj8WwyauysOmf6JG2TEJxF5qjb7eDCmzC0X8PNUSu0aNaRb M7PbCRjLZxKOwZ/BI0swoVocfQD7pu/N72HR4xEueDMVQ+NFRsva+yq2u3VQQ1SA9oIA Az+A== 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=Hlg53ybD4Aso4vqhdFymtZRN2NNnf9SvV5E8euUUgM0=; b=i5h3wtDrP3zbHhtI+Um+mY25yYNH18+ipbrzvA7wxm/XNDiwUWWJwgZlYWWIiI8Gwz gTWUVN6LSmdqdwIAG5hJL2XzXbYxrKnnrCnAaW4zPNkNaYRj6AWsYiY6Phd1lb441XVl lVprzC0LcmlfZT032gYkZG7euERfueEGBdDu3cVqD9rlJzd81Sb21RrSwjUw40DHyFHq qH3gQnpMNMsNlO9vX/XHPHT6OkMe4UI9pH1NQYUKNjF8Gw3yT+bE+SJWaM+W5pM9WhLb Q3RYYadnuK8eEnR6LVAozE2UtWqS41roTri3AxxhlnKi1Z37F0NfOpkw58PajcsvYFLd S2tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EIBC02IK; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h6si14597268eda.258.2019.11.18.21.29.40; Mon, 18 Nov 2019 21:29:41 -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=EIBC02IK; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729022AbfKSF3j (ORCPT + 26 others); Tue, 19 Nov 2019 00:29:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:48202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728997AbfKSF3f (ORCPT ); Tue, 19 Nov 2019 00:29:35 -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 7863E21783; Tue, 19 Nov 2019 05:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141375; bh=Bg1NB1Okm9z6Vy/N4uGACFmVAuYujxub6R0M02NRtRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EIBC02IKkVRpgJEVqpRa16qZ3Yp+A96T1Id/Ha3k3meqpdLDVgCeao2D/lNsRMCBo Pm1F2+povMiL1gWKDTC+1tOIV9Mfaao2nR5HB7/b/CSkIqdg0ldTwtfcM/ROJlVRbi Ihxyvwg71aF+FwEoOz6xKR9r8bKIo89WVYHXP3Q4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Sasha Levin Subject: [PATCH 4.19 137/422] of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC Date: Tue, 19 Nov 2019 06:15:34 +0100 Message-Id: <20191119051407.693045459@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit f6707fd6241e483f6fea2caae82d876e422bb11a ] Cache nodes under the cpu node(s) is PowerMac specific according to the comment above, so make the code enforce that. Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/of/base.c b/drivers/of/base.c index 3f21ea6a90dcb..f0dbb7ad88cf6 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2066,7 +2066,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np) /* OF on pmac has nodes instead of properties named "l2-cache" * beneath CPU nodes. */ - if (!strcmp(np->type, "cpu")) + if (IS_ENABLED(CONFIG_PPC_PMAC) && !strcmp(np->type, "cpu")) for_each_child_of_node(np, child) if (!strcmp(child->type, "cache")) return child; From patchwork Tue Nov 19 05:15:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179639 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp151553ilf; Mon, 18 Nov 2019 21:30:04 -0800 (PST) X-Google-Smtp-Source: APXvYqyyVIe0PNuaiuu/oTyOws9p8b4PdkP4qRQfdAmtNob94q0aDRCGfoQdQfX7TY4q7IRY390e X-Received: by 2002:a17:906:4d58:: with SMTP id b24mr31916386ejv.277.1574141403963; Mon, 18 Nov 2019 21:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141403; cv=none; d=google.com; s=arc-20160816; b=Zl6wiFcPBbZ7RrqZ13SZonO7HpkgbNwO27c9DDm4QCrEL/aQcOwJlPqg9KIwIW17a4 bsh8ssRJ/42UK55Bw7ZZEvflVDNaqrMMF9xB/P3JFRyNrjZK56J4sBr8ktlK1yuZ1nUO jbEcc4FvBmiJERza/kw2PdcH9agz1/dH8u/4hZ1k2Y7bTt37skokvlJWEKERbyzB2yp1 0zWdjHTsI9C3DOpJF1JFRX3KLM/r2EezKablMgqQVQNez+v1OfUNKFxNQh4Cu/RPvwY6 MFi/jXQUFhf6brbfLsiGqQ9jyC2uXTPwYrcTuLoRWteZ2/XPPVjLJW1k2/GVr+WKkm/S AmaA== 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=P9yCFgUWoSL6SfSvjr9NgzzVFkKCkMsqkV/KyO/JMH8=; b=UTYWJv21Pkf9LnfLDLALR/mcmJe3OQi+6BjdNKRNnWBb4qN6gXA+lubBw/p46xj6J5 j6JQTO4ncxhxf7p2A2IYzJw3BkNKp5Oe1GDpHCjSXwm5ty5yIes69rYhIXSdvmTeMOs3 qJg1ltHlXyF+Ou/3Vnf7HgqJ8KDHx0Lno7ftGsqPnkOR9xTnfy3pFb1emuiTQxCJZdIr 37nzhByqRNzXGfmWaU49s8PFQGOAqzBiwqjYVELXpc05mth1YoEguclMjLBzS+dLuXNq +IPL1HgjU9jFsaFcejqUpyuCF2Xj33+LC+NVkLE7VVUy6XuELV4fJLGW/LXSsBzZwpAI 3e3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YYVvKnak; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l27si16006539edc.358.2019.11.18.21.30.03; Mon, 18 Nov 2019 21:30:03 -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=YYVvKnak; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727706AbfKSFaB (ORCPT + 26 others); Tue, 19 Nov 2019 00:30:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:48616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729051AbfKSF37 (ORCPT ); Tue, 19 Nov 2019 00:29:59 -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 C1E7921939; Tue, 19 Nov 2019 05:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141398; bh=zgtQn59xKSHLgHf3t2ThmqyQQy/k5Hd9egH/wHnXQc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YYVvKnakNDy3XFDcc9sZLgegLi5njzdovU8Xchh1YKQUZnTCs86OjXXxlO3b3u+59 BarW2ah6hp1+u5fCMxulKdTUKG92w3AHky4Jv4dgBJ232Ggk1Td3jELcOalYw8Xn+u +foTZzAVEANSMdi+yOdEeonjt4EaaSHIRCfzqJK8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Olof Johansson , Sudeep Holla , Sasha Levin Subject: [PATCH 4.19 148/422] firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings Date: Tue, 19 Nov 2019 06:15:45 +0100 Message-Id: <20191119051408.258753348@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sudeep Holla [ Upstream commit ca64b719a1e665ac7449b6a968059176af7365a8 ] Replace all the memcpy() for copying name strings from the firmware with strlcpy() to make sure we are bounded by the source buffer size and we also always have NULL-terminated strings. This is needed to avoid out of bounds accesses if the firmware returns a non-terminated string. Reported-by: Olof Johansson Acked-by: Olof Johansson Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/drivers/firmware/arm_scmi/base.c b/drivers/firmware/arm_scmi/base.c index 9dff33ea6416f..204390297f4bd 100644 --- a/drivers/firmware/arm_scmi/base.c +++ b/drivers/firmware/arm_scmi/base.c @@ -208,7 +208,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, ret = scmi_do_xfer(handle, t); if (!ret) - memcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE); + strlcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE); scmi_xfer_put(handle, t); diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c index e4119eb34986c..30fc04e284312 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -111,7 +111,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, ret = scmi_do_xfer(handle, t); if (!ret) - memcpy(clk->name, attr->name, SCMI_MAX_STR_SIZE); + strlcpy(clk->name, attr->name, SCMI_MAX_STR_SIZE); else clk->name[0] = '\0'; diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c index 64342944d9175..87c99d296ecd3 100644 --- a/drivers/firmware/arm_scmi/perf.c +++ b/drivers/firmware/arm_scmi/perf.c @@ -174,7 +174,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->mult_factor = (dom_info->sustained_freq_khz * 1000) / dom_info->sustained_perf_level; - memcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); + strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); } scmi_xfer_put(handle, t); diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c index cfa033b05aed5..62f3401a1f01e 100644 --- a/drivers/firmware/arm_scmi/power.c +++ b/drivers/firmware/arm_scmi/power.c @@ -106,7 +106,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->state_set_notify = SUPPORTS_STATE_SET_NOTIFY(flags); dom_info->state_set_async = SUPPORTS_STATE_SET_ASYNC(flags); dom_info->state_set_sync = SUPPORTS_STATE_SET_SYNC(flags); - memcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); + strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); } scmi_xfer_put(handle, t); diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c index 27f2092b9882a..b53d5cc9c9f6c 100644 --- a/drivers/firmware/arm_scmi/sensors.c +++ b/drivers/firmware/arm_scmi/sensors.c @@ -140,7 +140,7 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle, s = &si->sensors[desc_index + cnt]; s->id = le32_to_cpu(buf->desc[cnt].id); s->type = SENSOR_TYPE(attrh); - memcpy(s->name, buf->desc[cnt].name, SCMI_MAX_STR_SIZE); + strlcpy(s->name, buf->desc[cnt].name, SCMI_MAX_STR_SIZE); } desc_index += num_returned; From patchwork Tue Nov 19 05:16:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179649 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp155423ilf; Mon, 18 Nov 2019 21:34:01 -0800 (PST) X-Google-Smtp-Source: APXvYqy9avpujfoESG12mcSNX77zkKhsvG8TH4VbVyBtIBPGj4QdXhJ3FjpbWeZajiMWUOx7B7B+ X-Received: by 2002:a17:906:ecad:: with SMTP id qh13mr33135070ejb.25.1574141641203; Mon, 18 Nov 2019 21:34:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141641; cv=none; d=google.com; s=arc-20160816; b=ZHoZ5d43diUW4BlX88Yq8yAosXXMuw31ajQVqWxjjWx3YPeTxkq8foDOK7N7K8zcgf T6XJuWfLz0M2JzFHVXhxi0v0+iADOn5IQP0M8P6quY1h3c0XWyBpCqTqL1vlMp3f0Ih6 zsr++bpD1E8v94WcHoNk5ZIiovgOFU+9kRrPapBJdqgsnCv7CUGdTSYW6Uy+3tr+RvdS 4IZFXw/1+whRm50/P3NIvrhpEeWBnTJiUIdO/+Jj3lKYi/TbTFsGQAhb5301BGrnenKJ 8Uizsz70VIOFYLfWYzLcIRNRnu4pD0D3wYa8xUbXLl6voU+5m/zsPOHseug0DjQCOsoX 9m7A== 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=02i+2T3S/95z6bn3lJ4yjJu/JSQTvjFMEBo54kCcNSU=; b=ciJwO3lh8cgeSQOz6uLhFACybvnvqRdXDEHuj74BZavrZENpAaa4H5hhrJ1LEWuGeT 2T9Z0qo/dukSubxzbZP+MWDFge4BpAGhiOtYGyEtXO1upsYb+p74nGVWBwSXCTUEa4hX fDsVM1ycVaykRde9P6V+5DPm5PfFKjqkrZz0wkQ77phXdwDSlz+udK0iZMNhm4RlBUvD 6v3oh/lnQhW/b78UctiJKidckugmM6aJoOeXZU0u9Gzi3DVS0X8lrpH1nq8TW9741/rs rjPNSl9OQsc0/96AJMi6vXwHox/nLuut+m5p6GRltpDnqvGD45xP7EOIGXkqtaJydjzb 0GSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X7kesEVq; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e10si13192788ejq.413.2019.11.18.21.34.01; Mon, 18 Nov 2019 21:34:01 -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=X7kesEVq; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729599AbfKSFeA (ORCPT + 26 others); Tue, 19 Nov 2019 00:34:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:54582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728843AbfKSFd4 (ORCPT ); Tue, 19 Nov 2019 00:33:56 -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 A00D1206EC; Tue, 19 Nov 2019 05:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141636; bh=tU1uL0kgHbeIfHi2VXruJE3ZdOm5oSbiBE7SyjAQ0hs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X7kesEVqZYerwY76senzfHpws9cTcWPJuhLCCKafRKluQGPAGUmDgW5KKVsmcwLRZ 5Rbtr4R5LdqNTmjR5ePW/+M8V0Dri/JKB7a839JI+ITN66qKIQ/jPVjjltD155l3KH KlDFoLjFS7ftHjpLQbzHzG3Fj5TSMmnYewYjTH8Q= 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.19 188/422] nvmem: core: return error code instead of NULL from nvmem_device_get Date: Tue, 19 Nov 2019 06:16:25 +0100 Message-Id: <20191119051410.688562851@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 d32eba11c000f..30c040786fde2 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -692,7 +692,7 @@ static struct nvmem_device *nvmem_find(const char *name) d = bus_find_device_by_name(&nvmem_bus_type, NULL, name); if (!d) - return NULL; + return ERR_PTR(-ENOENT); return to_nvmem_device(d); } From patchwork Tue Nov 19 05:16:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179650 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp155585ilf; Mon, 18 Nov 2019 21:34:10 -0800 (PST) X-Google-Smtp-Source: APXvYqx278a0bKQ8wtqwlETKpE5svBJ5njvPqDY1Gmlna2nYjgk1Z99Et+dhXfc3JMaxM0imMgbS X-Received: by 2002:a17:906:95c1:: with SMTP id n1mr32064279ejy.158.1574141650346; Mon, 18 Nov 2019 21:34:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141650; cv=none; d=google.com; s=arc-20160816; b=bCs7DXr5iDqGv1fgKGv6G737u9X9xClAjHnvSvmDCyTNom1LKhxJRJHf3UCFtEwdGK NK/ny141Bpy87FbjOWd1T1kucd1CrJCnib0EJcFUCvMrGFRefPrr7MXaUOTUapmVG452 C5w9+imLqxSw6PH7TwGxsvU4eEXqpn1g9mlUtdsnukcAjwsVANi4+zMf2iqQJPUEt/K6 8zMPKAVvRPVqY/LeNrPIjmEge49XEFeZhEiwuOTWV7OOeqsKZkxyopQaqL24oq0i8yNb M57GjUn5JU5vG+bPkJENNxVDxPs43Pa/pEdnlWmsfI/KkqV7YfDtGo6oHJ9jZo2lCt+v 09xg== 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=of/XlO2eL+4VKpUY5OoUUCQRt4LLJfq6DODFAFBfqrQ=; b=C7c15H+EAr4+7f82+RR7gkVZdtOnk85mn0XSWesPWOv9gTgRcwK4ScL60yUxi8Qhev tirp8OqwpQrT1x/e2nuPF7dvR0SQ3jR3kNiKnd1wQdAs6b7XpFsgNP1/+zd57t1B55Gg kZHSRqqo9nViuOQmVWPhZEpg320zRuf6JbPKUqf45eq1hsM0vYDcB7nGyQWi/1bqFRCU gR3ashpVYYinGqGfqvnk64YT6m5R7H3KqFkvZ6KA1MDZjMJLMH40T9ygyQKosvkqNsGw NL8yn5RFRIYbNvfwvChGhva9pwFa2rogbEbJSYHfeg+lwvhtgiUluXiYYQ8QNYO7tirc 1uDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ueyeqbxV; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w12si13171842edu.421.2019.11.18.21.34.10; Mon, 18 Nov 2019 21:34:10 -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=ueyeqbxV; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729609AbfKSFeH (ORCPT + 26 others); Tue, 19 Nov 2019 00:34:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:54710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729129AbfKSFeC (ORCPT ); Tue, 19 Nov 2019 00:34:02 -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 76D57206EC; Tue, 19 Nov 2019 05:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141642; bh=ks2R9c+gJRIhU1kOjJzzbLPw+dP1+cZFyS4+4a0PfI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ueyeqbxVyUMDOcmV/H5yMHIIM6+CW6Qs2b9eyopal0qXpoGpTtfOOPpJcJ3/gk/Eg zxW0844oWoeYmlUXDdARFbkI32fRR0/GGMmcuCN0uPHppVoYHrxvJ/RMQMuNR2D3QI /LqW2sbPsmAEInR5zy6kWXIkGAl5WS0zPFLVy1K8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kbuild test robot , Mark Brown , Sasha Levin Subject: [PATCH 4.19 190/422] ALSA: hda: Fix implicit definition of pci_iomap() on SH Date: Tue, 19 Nov 2019 06:16:27 +0100 Message-Id: <20191119051410.833052144@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit d9b84a15892c02334ac8a5c28865ae54168d9b22 ] Include asm/io.h directly so we've got a definition of pci_iomap(), the current set of includes do this implicitly on most architectures but not on SH. Reported-by: kbuild test robot Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/pci/hda/patch_ca0132.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 3e978b75be9ac..f2cabfdced05c 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "hda_codec.h" #include "hda_local.h" From patchwork Tue Nov 19 05:16:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179641 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp153670ilf; Mon, 18 Nov 2019 21:32:14 -0800 (PST) X-Google-Smtp-Source: APXvYqwiiNeVZKqAQ4Tu5qBdU+R5ccIDJL07z0m3tecSHFAD2z5AwJdnNe/t2wiMpifFT6Svlau2 X-Received: by 2002:a17:906:24d4:: with SMTP id f20mr33394628ejb.182.1574141533851; Mon, 18 Nov 2019 21:32:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141533; cv=none; d=google.com; s=arc-20160816; b=vR8/qa0BOxqHA0vqxNI+wAUP722dYgD6SdPC3dBLZiI2PqJ+9UAgyYn+uMicFwol8U GlbuTWwR5J1xjzS2/++/vqVgUSTb9XKdPMvFS1XgroHoMrw1XLNZNVeHeASuWJOmQ8Ft cn8xJZVIzynsQqpofg+raOiWtGgWCkTZG9P+CdxoAXG7VxRELNvf6Yg2S454MvtCeDjY FfwId/LSomvuxf0UdMtOSDWXE301WVb827RsEqUJS7z+0NzSSh/AsNVMFka288XNfBWF jtErYn8AufEtHmBPwgVkFHKB+qlhQYsTVKIc1S6lMMk3qWV4mwGOxTnSsv8hhAfotS46 yhDA== 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=GtSFdeCXzVeJGjs3lQv0h4jp41Tf+f1Ri84rJrz6Fn4=; b=o3HkJh1sijVtKyHLDEwLSFyZigSOm09aBK6MRgLEWDTrCzyGNsSdBS0ari5VGJPeee mRjoRhcyRF+vR7bG0SAyjuCcK9NHMfKB5i1jQHxf6ZLGXVrjDPsiLGGYSvUXTkmqLpDY T68sPEFn1g8NYb7kXAek/u8XZ2U3DC+wsRMt3PHSZ7QDcgeMa7u9JAnBCBmML31+//fc ncNH/Tzd6BcuwHScKRkquIz9hqAjTpTj8t6j0c2lJx+671NWUf584unuj2VCC5FdXzFe BtnziLMFlsCEaDBGTv8tIaCpGPAFj/WPeYu2OXd9pqOk7lwS502GQf2DKcqet56KlKRQ VUQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=j5mpFpeZ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i18si5882386edt.319.2019.11.18.21.32.12; Mon, 18 Nov 2019 21:32:13 -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=j5mpFpeZ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729362AbfKSFcK (ORCPT + 26 others); Tue, 19 Nov 2019 00:32:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:52292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727532AbfKSFcJ (ORCPT ); Tue, 19 Nov 2019 00:32:09 -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 6770421823; Tue, 19 Nov 2019 05:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141527; bh=KoIC1QyqhyN8DmbL2eUSeFGN3iQb5ME2i+EKkEFOJQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j5mpFpeZwEyyIOotLk5xen3Z6OVPsDs7foLNPIMfh5kJLot433CCYHVjUoNk8imCk i4ffzKaVnlknlNavxRCv6OQOm21QZQxhhfXP3E5iULrnJkkul7wtluYEY4xWFd9Lu5 3g00z89goM6d3N8CX9w6JIoHLWX6jCOCDrg0MxEo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 192/422] media: dvb: fix compat ioctl translation Date: Tue, 19 Nov 2019 06:16:29 +0100 Message-Id: <20191119051410.987106078@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 1ccbeeb888ac33627d91f1ccf0b84ef3bcadef24 ] The VIDEO_GET_EVENT and VIDEO_STILLPICTURE was added back in 2005 but it never worked because the command number is wrong. Using the right command number means we have a better chance of them actually doing the right thing, though clearly nobody has ever tried it successfully. I noticed these while auditing the remaining users of compat_time_t for y2038 bugs. This one is fine in that regard, it just never did anything. Fixes: 6e87abd0b8cb ("[DVB]: Add compat ioctl handling.") Signed-off-by: Arnd Bergmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- fs/compat_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 8f08095ee54e9..3a03f74a8cc4e 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -141,6 +141,7 @@ struct compat_video_event { unsigned int frame_rate; } u; }; +#define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event) static int do_video_get_event(struct file *file, unsigned int cmd, struct compat_video_event __user *up) @@ -152,7 +153,7 @@ static int do_video_get_event(struct file *file, if (kevent == NULL) return -EFAULT; - err = do_ioctl(file, cmd, (unsigned long)kevent); + err = do_ioctl(file, VIDEO_GET_EVENT, (unsigned long)kevent); if (!err) { err = convert_in_user(&kevent->type, &up->type); err |= convert_in_user(&kevent->timestamp, &up->timestamp); @@ -171,6 +172,7 @@ struct compat_video_still_picture { compat_uptr_t iFrame; int32_t size; }; +#define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture) static int do_video_stillpicture(struct file *file, unsigned int cmd, struct compat_video_still_picture __user *up) @@ -193,7 +195,7 @@ static int do_video_stillpicture(struct file *file, if (err) return -EFAULT; - err = do_ioctl(file, cmd, (unsigned long) up_native); + err = do_ioctl(file, VIDEO_STILLPICTURE, (unsigned long) up_native); return err; } @@ -1302,9 +1304,9 @@ static long do_ioctl_trans(unsigned int cmd, return rtc_ioctl(file, cmd, argp); /* dvb */ - case VIDEO_GET_EVENT: + case VIDEO_GET_EVENT32: return do_video_get_event(file, cmd, argp); - case VIDEO_STILLPICTURE: + case VIDEO_STILLPICTURE32: return do_video_stillpicture(file, cmd, argp); } From patchwork Tue Nov 19 05:16:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179644 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp154392ilf; Mon, 18 Nov 2019 21:32:59 -0800 (PST) X-Google-Smtp-Source: APXvYqzXA5n9CBHuqV4irAi4wlpEdEfxDB+bqbMEaBrMWRo+VfppFZtIC9yucQ0gkFfmv7qb1KQo X-Received: by 2002:a17:906:394c:: with SMTP id g12mr31842919eje.233.1574141579560; Mon, 18 Nov 2019 21:32:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141579; cv=none; d=google.com; s=arc-20160816; b=h+5Uf/ZJHsmk6Z6h8DrVriw0qY7/ZKsaRXoPv+Fwo9UtckfCQHHXgS+e2iv3pu3Iso n0tEcto4B773pTdnjnGhs3QIZhCFEGBHObA9Qy3ey4I1tnjeF9hrTtE32cvZOBpx+a84 V2LhL3EYSANgiELq0WcJEzSi9+9dYX/C4NVHX4XBs1gjGo8bzIk5XLuGwp52xmKHr46D nS9iBcDRql0r+i2wFHcsQ4zhoc2X849Z/6pxTGuU8qcKVuFTb++HztGQsbXmf0TtKbmN K103VzuXD9LJcpYrwp/T6uEZBIDUM/twmpGcqTzPXBUINSKV3FWrElh8qwESArLnhgSk S2NQ== 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=ASV3Hlr9DOzOm6oXOSAboVm6lA65/oLsksT5KnGp6S0=; b=o5giJjjr2quKXDuAsg2RdW81Pi6P1MHR5zPEfBVaJzyFXWGr4OOKO44WT863H81Elr DoIBEFs99iPI2hpriA/8yWIVkqPIktgPB+d/LuNv1XQQavFyqR5hfKhfCu5jJY/yM5CF GBC3fqqzNSa5NGsU+XMbqULOpe91UFX7gWV7jMDDC4cS1RMIE0J8vuFMFenN/sYYSFaC p6MssTpwbLd2+Lgo+abzOcyoo27qIDCervMF0UtMRdgReoPc/4vTSJBOayVzobc3hjqT nvfu4JT8qwqupigtj36qJHX7tq8SZNlXsy9IPxxsKRhGNkBcsnO3zG3lZQ7h+EGQDsIc L6iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hEiXGqY3; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3si13041915ejf.345.2019.11.18.21.32.59; Mon, 18 Nov 2019 21:32:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hEiXGqY3; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728730AbfKSFc5 (ORCPT + 26 others); Tue, 19 Nov 2019 00:32:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:53328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727717AbfKSFcz (ORCPT ); Tue, 19 Nov 2019 00:32:55 -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 42A9F21783; Tue, 19 Nov 2019 05:32:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141574; bh=UVs0BQCbS7l7vr5KRG0CBnk8B8+YWO9XidSyUtzdbGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hEiXGqY3qOQA0wrGiRflfQbjYLtWEM6inFY5WCDinad8bNvH6RklwZCAEMpmbD8xs HOUbUn3iDGOrbqiCt/mwMskc0WqDcE2EmF4Ku22KaM2v+OF7fOhsDIRbNoefZmYeFZ YgkRy+x3LPFF0qRhcZ3WNv9BNzA1GBmWvDFBuuBI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Bjorn Andersson , Andy Gross , Sasha Levin Subject: [PATCH 4.19 207/422] soc: qcom: apr: Avoid string overflow Date: Tue, 19 Nov 2019 06:16:44 +0100 Message-Id: <20191119051412.003391715@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Niklas Cassel [ Upstream commit 4fadb26574cb74e5de079dd384f25f44f4fb3ec3 ] 'adev->name' is used as a NUL-terminated string, but using strncpy() with the length equal to the buffer size may result in lack of the termination: In function 'apr_add_device', inlined from 'of_register_apr_devices' at drivers//soc/qcom/apr.c:264:7, inlined from 'apr_probe' at drivers//soc/qcom/apr.c:290:2: drivers//soc/qcom/apr.c:222:3: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation] strncpy(adev->name, np->name, APR_NAME_SIZE); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This changes it to use the safer strscpy() instead. Signed-off-by: Niklas Cassel Reviewed-by: Bjorn Andersson Signed-off-by: Andy Gross Signed-off-by: Sasha Levin --- drivers/soc/qcom/apr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c index 57af8a5373325..ee9197f5aae96 100644 --- a/drivers/soc/qcom/apr.c +++ b/drivers/soc/qcom/apr.c @@ -219,9 +219,9 @@ static int apr_add_device(struct device *dev, struct device_node *np, adev->domain_id = id->domain_id; adev->version = id->svc_version; if (np) - strncpy(adev->name, np->name, APR_NAME_SIZE); + strscpy(adev->name, np->name, APR_NAME_SIZE); else - strncpy(adev->name, id->name, APR_NAME_SIZE); + strscpy(adev->name, id->name, APR_NAME_SIZE); dev_set_name(&adev->dev, "aprsvc:%s:%x:%x", adev->name, id->domain_id, id->svc_id); From patchwork Tue Nov 19 05:16:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179728 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp185611ilf; Mon, 18 Nov 2019 22:07:36 -0800 (PST) X-Google-Smtp-Source: APXvYqwsZ9qLrLtWY3Xu7Ue+1i1SKsR+qV/37CtbM5en1HvVs3fZV678n0jA0ez33jRPWSIYJxZ/ X-Received: by 2002:a17:907:40f2:: with SMTP id no2mr2764897ejb.250.1574143656840; Mon, 18 Nov 2019 22:07:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143656; cv=none; d=google.com; s=arc-20160816; b=RE7d9xMFwDtrIW0zu6L8WNa340FNql3UOMzZPpl1h7l2fd4urkEBJ8I6/8Msb/wGQM mLPZNZV/swPiGQgBiL3EEnmphh1nLycWZ9750erZXSt3V+fuS0EBUmvfpuILVp3FO6m1 s1tITH0rHLLfOZhOZOx1OR8zccvb1pgN8khpjNgqgH5mmDXiLxDILoCcF5bJPkdMhtcD m/SBX1pqMQM2I4FwlA+keBUOBjQ7JqpfpCkypuDwVCtrmv4b0Wjg5HlrvtJjFnXzdDEL iKrmWb478FejP/Pt33vTme0LTvKSbUAhwVZSc74Y1mwse7azf+hpq3DY86DjwNa5q3F8 c9zA== 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=nP0o1ycxMZulTLAITX3NO3o/MHDmAN95V+sZbygl11E=; b=QHVUw/ANiAiHI6GZ60ZCEuNV75y45jfsH/rCHBjcJZBjf4NNMosqOg/ykMUiJko1+r SwKukgO1PtPpqF4yHQ3TOf88DufYiqWTjMjqNYp54EPmpEiYPW6EaJWV3wrZaSvUP8Yz m34rYh2PW1eSMza8QbmxSFMhj9rCIkRh6xb5t68t8Hr3VtquFQpEblvqTiPOyAtp8UYW hyRGCsm8P2W6BqwPl4MR0itfm9wBSrQ2lhkSqeibM5S3HUJVpcroroD/v9piqb08Ch/f +HKxcv1cEYhYNXfNMPyhZHumKSU57mIQppb8JvuBd9917rZ8mVMmmVOZLA9JvMlcEK3q nk1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=F+G1FccH; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w42si15495909edc.440.2019.11.18.22.07.36; Mon, 18 Nov 2019 22:07:36 -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=F+G1FccH; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729497AbfKSFdJ (ORCPT + 26 others); Tue, 19 Nov 2019 00:33:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:53508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729482AbfKSFdE (ORCPT ); Tue, 19 Nov 2019 00:33:04 -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 02D6C21783; Tue, 19 Nov 2019 05:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141583; bh=ZcfI9Io9gL+K+leh9xNl/+x3gDLhi0YCH+sL9MOr5HY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F+G1FccHWR3FPiUx+Oyxyyov+8wsfzSMsvQPy4wXM+rTSy3aTnaxAVxAlRLuD5sn2 Ul7Vu5NsPvzp8zqM+aNrU0bf7qXhDrMgfWdDi+EqzkRo2vqY9R3yH6OmYY7b2uwyoq Gmse9rHsjgOjWOIqhEpXApCd8JsMHaxkbRNjJrmE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ray Jui , Scott Branden , Jon Mason , bcm-kernel-feedback-list@broadcom.com, Rob Herring , Florian Fainelli , Sasha Levin Subject: [PATCH 4.19 210/422] ARM: dts: bcm: Fix SPI bus warnings Date: Tue, 19 Nov 2019 06:16:47 +0100 Message-Id: <20191119051412.201481107@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit ab0b47d2eff413d60b0a1fc0c1f87f87f0d7f375 ] dtc has new checks for SPI buses. Fix the warnings in node names. arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dtb: Warning (spi_bus_bridge): /axi@18000000/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958525er.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958525xmc.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958622hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958625hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm988312hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' Cc: Ray Jui Cc: Scott Branden Cc: Jon Mason Cc: bcm-kernel-feedback-list@broadcom.com Signed-off-by: Rob Herring Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/bcm-hr2.dtsi b/arch/arm/boot/dts/bcm-hr2.dtsi index 3084a7c957339..e4d49731287f6 100644 --- a/arch/arm/boot/dts/bcm-hr2.dtsi +++ b/arch/arm/boot/dts/bcm-hr2.dtsi @@ -216,7 +216,7 @@ reg = <0x33000 0x14>; }; - qspi: qspi@27200 { + qspi: spi@27200 { compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>, diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 09ba850463228..2b219addeb449 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -273,7 +273,7 @@ brcm,nand-has-wp; }; - qspi: qspi@27200 { + qspi: spi@27200 { compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>, From patchwork Tue Nov 19 05:16:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179726 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp185357ilf; Mon, 18 Nov 2019 22:07:20 -0800 (PST) X-Google-Smtp-Source: APXvYqyDMtEWw1NvvN/6PY9t+Syw11l0kEceRKrxEb6hXFOCiJfXUo0srvQcnnU3+q/zM7YxJOq7 X-Received: by 2002:a17:906:a457:: with SMTP id cb23mr32167425ejb.191.1574143640540; Mon, 18 Nov 2019 22:07:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143640; cv=none; d=google.com; s=arc-20160816; b=XyCK83NrlfKa1dzb296bzGgY17yUOis7GgiDJjZxf9XVf9qMi9cop2ELUpgJoFUU3V XiMXpRHh0MpjshFU8bdge7H74zZg/s/ljfjy043pSofGhUU1K1zn1WzFTh5uoDeuE8Dw ZECFBd0/PeoBadkpqWqv8r2Vq08voP3U82tTytVdtBpxq5mFF5Pdn0z6KPpHViF8DKWV ljqmLR8r17xOmuWAGH7oFZM0CQLDTG8SaG9ceVO3SiLVKF/AunPB4wY7AEfzCVDzEZn3 9qPAsiaq7GOKuUyXjGJk23hKmL4P+QB7kyP27Vt+XOMPnNRV57rK66whYhNp2L1UPZAz ejcQ== 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=LU4sXsuH2k0iZVLUt0DLeiFauwHtkCKSv0mA40ASeKI=; b=HH6+Nvxp+j5us6m0SJN3TSU2z+oezQ1UHKXsNgHXDm8GJenijEUYFxvnyalskdc00a GinHLiisHRY7DqySkE5XYihJE9XWNkZUbZmrpjUxiMFPnLJQ+0K7tBjuOooyQzWKh2aT +E32B0I6Ck81V38E8bzYSRFlemEkspZ/sHVkfNwTkLNCnhEuwQOhbx5bajDtgqqBRDGm P2ZptVHqxUM6lp2/WqSQBl17saynUVGr1FaNSo63NtP3JXz8Q8eU9Zdsk9x+wNLlMwDj 1YiRgbpO/zMWJfwOoB2myl0boyNRi5ULKIAEGN1CO9bPhSJhZGl2VvGt/ZxkUvcKfmwh PzQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rJtCI1ij; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f26si13616381ejr.92.2019.11.18.22.07.20; Mon, 18 Nov 2019 22:07:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rJtCI1ij; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729539AbfKSFdb (ORCPT + 26 others); Tue, 19 Nov 2019 00:33:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:53966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729526AbfKSFdY (ORCPT ); Tue, 19 Nov 2019 00:33:24 -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 9CFF221823; Tue, 19 Nov 2019 05:33:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141604; bh=ITiLQa7PhFYebKtxc6Fl3GvTzg0Y6H8CyAE5H5v51fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rJtCI1ij6uWRskH8nMZ157rYNUL1TqqaEvd4WvZ6IFFN02u4SDmrFeKjuuMHjtZ+M K2/HbSlKQ3ZoO3ffWb0VvPjDVuuIoWFkITL357Kq1/SK4m7wRwngw+gQZjUCOwEAoY QCivxQA02qV1NjYKzmYDlX3aui3+SSSla3C2D01o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , Rob Herring , Sasha Levin Subject: [PATCH 4.19 216/422] ARM: dts: sun9i: Fix I2C bus warnings Date: Tue, 19 Nov 2019 06:16:53 +0100 Message-Id: <20191119051412.605588409@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 57a83c5222c1b5e7b3acc72c6e60fce00a38991a ] dtc has new checks for I2C buses. The sun9i-a80 dts file has a node named 'i2c' which causes a false positive warning. As the node is a RSB bus, correct the node name to be 'rsb' to fix the warnings. arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89" arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745" arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89" arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745" Cc: Maxime Ripard Cc: Chen-Yu Tsai Signed-off-by: Rob Herring Signed-off-by: Chen-Yu Tsai Signed-off-by: Sasha Levin --- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 25591d6883ef2..d9532fb1ef650 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi @@ -1196,7 +1196,7 @@ }; }; - r_rsb: i2c@8003400 { + r_rsb: rsb@8003400 { compatible = "allwinner,sun8i-a23-rsb"; reg = <0x08003400 0x400>; interrupts = ; From patchwork Tue Nov 19 05:16:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179647 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp155113ilf; Mon, 18 Nov 2019 21:33:41 -0800 (PST) X-Google-Smtp-Source: APXvYqylJQ/uW8SUQEIWMAlOpCrFnLcs79NrCCBY0i7FpPiUd34yr2xHRzHvncKReF1QHpQIdt6G X-Received: by 2002:a17:906:378d:: with SMTP id n13mr33064757ejc.260.1574141621708; Mon, 18 Nov 2019 21:33:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141621; cv=none; d=google.com; s=arc-20160816; b=YARAO4JnlOf8SCfdbFAF3ulxUoI3TEvn6KuMu0VEHhwRSPoEPw66DGHPoKzPBqYaX9 vbvvG29dhraFkNrm0vKWUzVzH1cdAju3ZgtCI37bg+3bAG4sPfpIhAIKX0y5Jeb5Rb/b lRrO4nc4lEw+OTQ9UM8JXyqxgc+Qhd4nYpQqq6PxDkKxZXvm7X4MKzEjM8vBGxjKQUkh DLbxpFtO33/N6tCD+LMgZXbxxjnhVlnMelaSWQTrlz7jI2KmDmdgDTyhGKDh1ZkMLtYl unpDkCqBvHjsJ+x4n4NN8wzdBz19DuGfZIrYoHiUcsML1CizypbKqsOUcM/U5lx+WJ6T dKzA== 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=KbCNOd9aAzwDQhHhTlDHuLbgPxkaVLqzgPNOMkrZhsc=; b=czTrwmXRBVENsv1EGd8GY/XcDaZKu3Doc8VpkO3hitJ7m+QpkQb+jpBKwGPv7CFduz Ust7MWYspK474H3zBoSAi5PeFi9275ez9e5WeqrbaGFBNvVhs744hYx9yhdDn+VM9EfC bSSYC7p6ZxJTlBIfZNRhUjy4yYuI7a7dXJo0rMUM+xqWn/efmxz2lPKw65SDePYBw4P6 OffSfrZSmZ2aNssjrAsG916yy/omc8Xnh/barqA3K37V5mX4GhRgb2QxyEvMk5FXmf7H hs4QxXzIsbeZgyWmH92Vtzp75zhVaDPyZR3PFzENB5y3E2POaIhCPiKeKAvmyYvQk9I+ hZnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f4bwVFas; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v26si12848125eje.425.2019.11.18.21.33.41; Mon, 18 Nov 2019 21:33:41 -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=f4bwVFas; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729560AbfKSFdj (ORCPT + 26 others); Tue, 19 Nov 2019 00:33:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:54186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728839AbfKSFdh (ORCPT ); Tue, 19 Nov 2019 00:33:37 -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 82CD921783; Tue, 19 Nov 2019 05:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141616; bh=lPL/Fqkv/wk/e+ywuFI15F63eJE2Xvzj5FPReiZlEhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f4bwVFasmPOjxACBKlGWN9dSNsNQuDJB4m2qggYr8rUlkyLU9GIOqjC4XUn7mctTr lh4/PmeQghdg5CP9qnlNtftA7nQ8uhDGwjO5MFspdSLCyHkBZ37au4ARJ7bLnXznpQ JlFQXCVRdLRCVpxtgzgMlSE8xPQzbs3oT5DXSl4c= 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.19 220/422] block, bfq: inject other-queue I/O into seeky idle queues on NCQ flash Date: Tue, 19 Nov 2019 06:16:57 +0100 Message-Id: <20191119051412.882089519@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paolo Valente [ Upstream commit d0edc2473be9d70f999282e1ca7863ad6ae704dc ] The Achilles' heel of BFQ is its failing to reach a high throughput with sync random I/O on flash storage with internal queueing, in case the processes doing I/O have differentiated weights. The cause of this failure is as follows. If at least two processes do sync I/O, and have a different weight from each other, then BFQ plugs I/O dispatching every time one of these processes, while it is being served, remains temporarily without pending I/O requests. This plugging is necessary to guarantee that every process enjoys a bandwidth proportional to its weight; but it empties the internal queue(s) of the drive. And this kills throughput with random I/O. So, if some processes have differentiated weights and do both sync and random I/O, the end result is a throughput collapse. This commit tries to counter this problem by injecting the service of other processes, in a controlled way, while the process in service happens to have no I/O. This injection is performed only if the medium is non rotational and performs internal queueing, and the process in service does random I/O (service injection might be beneficial for sequential I/O too, we'll work on that). As an example of the benefits of this commit, on a PLEXTOR PX-256M5S SSD, and with five processes having differentiated weights and doing sync random 4KB I/O, this commit makes the throughput with bfq grow by 400%, from 25 to 100MB/s. This higher throughput is 10MB/s lower than that reached with none. As some less random I/O is added to the mix, the throughput becomes equal to or higher than that with none. This commit is a very first attempt to recover throughput without losing control, and certainly has many limitations. One is, e.g., that the processes whose service is injected are not chosen so as to distribute the extra bandwidth they receive in accordance to their weights. Thus there might be loss of weighted fairness in some cases. Anyway, this loss concerns extra service, which would not have been received at all without this commit. Other limitations and issues will probably show up with usage. Signed-off-by: Paolo Valente Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bfq-iosched.c | 68 +++++++++++++++++++++++++++++++++++++++++---- block/bfq-iosched.h | 26 +++++++++++++++++ 2 files changed, 88 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index d8d2ac294b0c0..35ddaa820737c 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3195,6 +3195,13 @@ static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd, jiffies + nsecs_to_jiffies(bfqq->bfqd->bfq_slice_idle) + 4); } +static bool bfq_bfqq_injectable(struct bfq_queue *bfqq) +{ + return BFQQ_SEEKY(bfqq) && bfqq->wr_coeff == 1 && + blk_queue_nonrot(bfqq->bfqd->queue) && + bfqq->bfqd->hw_tag; +} + /** * bfq_bfqq_expire - expire a queue. * @bfqd: device owning the queue. @@ -3304,6 +3311,8 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, if (ref == 1) /* bfqq is gone, no more actions on it */ return; + bfqq->injected_service = 0; + /* mark bfqq as waiting a request only if a bic still points to it */ if (!bfq_bfqq_busy(bfqq) && reason != BFQQE_BUDGET_TIMEOUT && @@ -3642,6 +3651,30 @@ static bool bfq_bfqq_must_idle(struct bfq_queue *bfqq) return RB_EMPTY_ROOT(&bfqq->sort_list) && bfq_better_to_idle(bfqq); } +static struct bfq_queue *bfq_choose_bfqq_for_injection(struct bfq_data *bfqd) +{ + struct bfq_queue *bfqq; + + /* + * A linear search; but, with a high probability, very few + * steps are needed to find a candidate queue, i.e., a queue + * with enough budget left for its next request. In fact: + * - BFQ dynamically updates the budget of every queue so as + * to accommodate the expected backlog of the queue; + * - if a queue gets all its requests dispatched as injected + * service, then the queue is removed from the active list + * (and re-added only if it gets new requests, but with + * enough budget for its new backlog). + */ + list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) + if (!RB_EMPTY_ROOT(&bfqq->sort_list) && + bfq_serv_to_charge(bfqq->next_rq, bfqq) <= + bfq_bfqq_budget_left(bfqq)) + return bfqq; + + return NULL; +} + /* * Select a queue for service. If we have a current queue in service, * check whether to continue servicing it, or retrieve and set a new one. @@ -3723,10 +3756,19 @@ check_queue: * No requests pending. However, if the in-service queue is idling * for a new request, or has requests waiting for a completion and * may idle after their completion, then keep it anyway. + * + * Yet, to boost throughput, inject service from other queues if + * possible. */ if (bfq_bfqq_wait_request(bfqq) || (bfqq->dispatched != 0 && bfq_better_to_idle(bfqq))) { - bfqq = NULL; + if (bfq_bfqq_injectable(bfqq) && + bfqq->injected_service * bfqq->inject_coeff < + bfqq->entity.service * 10) + bfqq = bfq_choose_bfqq_for_injection(bfqd); + else + bfqq = NULL; + goto keep_queue; } @@ -3816,6 +3858,14 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, bfq_dispatch_remove(bfqd->queue, rq); + if (bfqq != bfqd->in_service_queue) { + if (likely(bfqd->in_service_queue)) + bfqd->in_service_queue->injected_service += + bfq_serv_to_charge(rq, bfqq); + + goto return_rq; + } + /* * If weight raising has to terminate for bfqq, then next * function causes an immediate update of bfqq's weight, @@ -3834,13 +3884,12 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, * belongs to CLASS_IDLE and other queues are waiting for * service. */ - if (bfqd->busy_queues > 1 && bfq_class_idle(bfqq)) - goto expire; - - return rq; + if (!(bfqd->busy_queues > 1 && bfq_class_idle(bfqq))) + goto return_rq; -expire: bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED); + +return_rq: return rq; } @@ -4246,6 +4295,13 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, bfq_mark_bfqq_has_short_ttime(bfqq); bfq_mark_bfqq_sync(bfqq); bfq_mark_bfqq_just_created(bfqq); + /* + * Aggressively inject a lot of service: up to 90%. + * This coefficient remains constant during bfqq life, + * but this behavior might be changed, after enough + * testing and tuning. + */ + bfqq->inject_coeff = 1; } else bfq_clear_bfqq_sync(bfqq); diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index d5e9e60cb1a5f..a41e9884f2dd2 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -351,6 +351,32 @@ struct bfq_queue { unsigned long split_time; /* time of last split */ unsigned long first_IO_time; /* time of first I/O for this queue */ + + /* max service rate measured so far */ + u32 max_service_rate; + /* + * Ratio between the service received by bfqq while it is in + * service, and the cumulative service (of requests of other + * queues) that may be injected while bfqq is empty but still + * in service. To increase precision, the coefficient is + * measured in tenths of unit. Here are some example of (1) + * ratios, (2) resulting percentages of service injected + * w.r.t. to the total service dispatched while bfqq is in + * service, and (3) corresponding values of the coefficient: + * 1 (50%) -> 10 + * 2 (33%) -> 20 + * 10 (9%) -> 100 + * 9.9 (9%) -> 99 + * 1.5 (40%) -> 15 + * 0.5 (66%) -> 5 + * 0.1 (90%) -> 1 + * + * So, if the coefficient is lower than 10, then + * injected service is more than bfqq service. + */ + unsigned int inject_coeff; + /* amount of service injected in current service slot */ + unsigned int injected_service; }; /** From patchwork Tue Nov 19 05:16:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179725 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp185276ilf; Mon, 18 Nov 2019 22:07:16 -0800 (PST) X-Google-Smtp-Source: APXvYqwWBzqYD3c6Ycaf3AeSCjjIL2/BuEFy8VOOUqbdaeQ3rEWdlmPEFrCe2xNuWDPjwgGReE4Z X-Received: by 2002:a17:906:3393:: with SMTP id v19mr33419758eja.117.1574143636424; Mon, 18 Nov 2019 22:07:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143636; cv=none; d=google.com; s=arc-20160816; b=UDhoOfnSN59qFgqxEiv+ShHmn02hq2i2BCcyiAku8ozahUazJCJozLYbWnH4DoFyG1 hyff3/OvU748KgX0WlEwW6UaL8R2NQ+auxbqzXSUPTBtCr1HmYhZrsQPRNUwqYm6WyiO LOpk5nWMNFy93K/mjZAhQP9NVNuXkIEjf42L3yiluaR3CqqIG5D7BWqVrjvd7dOE79SP u/UFSPrSYjkZ/FwZkU8shShPwyp5c7pv9EuWDiRIevcvO8eUXref6CidslWoa6hYRphd R3eGQefsNgaHWFipxAfHPfq+cte1FMgKfmlyr/TDW6aOr/aWaFxifoFy85RI6ze+NAup 1GuQ== 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=2aEZYcZlVl/9IthbALUfZHZPZRuyVmvJ5YmmsEFoj+w=; b=MKtM6vFBjUfcnY80ajW9htuudck1mSUvNmlSfes8mQmQ4gbNAospIRN4q9VDG8OfDs N8+UwToeWV2xepHJpB2rbB3d7NsxtYxNunzkltuPxM8Sq4Ki5nwEwLytXdAvfNt1uxLE sbHhI3U21oOBvw3AFKZLQTZIYz6LPRlniQEtC6u+TlMdGnP1MNAJDNCl+lxPDSNfrQ1I ADqJ5CfsjsLDUD+//tt5zqiPC4DI90pn59H2cH7sC0HcGtYTEkQQUxzrpzmverllVc13 Q6rYi0sdxBFyLvpcM4lvTfawSH17fjNvJfgIp8CVwK/vRPq6U2p+SsHrI4Q213NT6OWf GOFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1zvrWFeT; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z6si12650427ejx.384.2019.11.18.22.07.15; Mon, 18 Nov 2019 22:07:16 -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=1zvrWFeT; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728953AbfKSGHN (ORCPT + 26 others); Tue, 19 Nov 2019 01:07:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:54326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727963AbfKSFdm (ORCPT ); Tue, 19 Nov 2019 00:33:42 -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 37762222ED; Tue, 19 Nov 2019 05:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141621; bh=g6zAEREEgLTWT7LnJikRiT6qbd4YDdqTAfzWJ67n6H4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1zvrWFeTx4gUPkg4OJ6IImyge7W28hQ2JUhkblvUAteZQfTSJW3QSB2d9L7D5EPjC kR2j0qVs/e6klo92CY/77jRp7opg8++OzrmrxpANMTKvnh8ma+5uL4Y7tEL3P5jI4H IFrtnhDMcds+bAiVKgOu+lJoVP01mGYngNnaaQeg= 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.19 221/422] blok, bfq: do not plug I/O if all queues are weight-raised Date: Tue, 19 Nov 2019 06:16:58 +0100 Message-Id: <20191119051412.950455318@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 35ddaa820737c..66b1ebc21ce4f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3593,7 +3593,12 @@ static bool bfq_better_to_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 @@ -3605,7 +3610,8 @@ static bool bfq_better_to_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:16:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179648 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp155296ilf; Mon, 18 Nov 2019 21:33:52 -0800 (PST) X-Google-Smtp-Source: APXvYqyGhV96qyUIBr5ApWsyLkmWdf5ZIT5yqo+3WV14lETyjeHtKr/CZOEi7YxNmm/N8ElMey3a X-Received: by 2002:a17:906:95c4:: with SMTP id n4mr32020585ejy.39.1574141631959; Mon, 18 Nov 2019 21:33:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141631; cv=none; d=google.com; s=arc-20160816; b=gZTQIhuakh3KuMmDWuDP5MXgO4EWgeorS3neeUEjvyREomxhi6o92rlTIKan5x/d+f eGJuKBbeERpdjovL6l4vCBiTqP6DGS/FjIwMI8G2slv6dyZ4L+NECxJZGdS3DFzL+WNI de+jeI99ZCU159aOO3wjAspYgAawjsJz7FGJRG8AmS802LHMR8q7nyznUus/cozIpRhN 0c5HDG3yGUNhSzerNRKzH/QosPp+HnLM0rIDlt6rdYWAMBlb4b+YGcO9wOoUgqy2hycu POmbcCD+i3QNDnTQm6p28uXOKZCkbPnN8np3uQCXVArLSR9OMLA4OVPkGv/KeJoE6wSQ hFiQ== 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=X9kGHUB2IiBbY2ozTO/NsjbC/UtpG7bOIGhLzLuebhA=; b=UhR650S5+h360BJS8vH8zUK1PlYJtGABPbKzeK018O7mW9wkBVxrjL6p5V7dkirRlR f0eAvyXNfY2n/3o0eOlCJpm7jh1fxPnw06orBnRDe6i3O4WH5JIwOJ5CSKIetw0FhYAw 1sqKSQhbI4Bre5W2Ai3RJh0X8kpdMwKjcFCoY7g+3QjYQEDkSM1T41GVsqGigU+9NmXZ wMkruNJz+n6PaBPiNBm7gM3X1uBhVF0clpzTLd6G2bb+AGTo7jBukwBtLLZebs9xOg00 KT+NQcwzlg9u/BZkYgTVSlwEDcANoQU1uJlgf2Nw9DJji9i/PpQu7BI4ew22W8a1Cjju Pljw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Oa3DaiGd; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e10si13192788ejq.413.2019.11.18.21.33.51; Mon, 18 Nov 2019 21:33:51 -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=Oa3DaiGd; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728848AbfKSFdt (ORCPT + 26 others); Tue, 19 Nov 2019 00:33:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:54356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729564AbfKSFdp (ORCPT ); Tue, 19 Nov 2019 00:33: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 DEC8D21823; Tue, 19 Nov 2019 05:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141624; bh=J8Af5rd+geu2PFA2CWpOAT2ClSBICxyzyklJSlfvkZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oa3DaiGdPjvnZWS+9PPfG7MHIyn0gNtvmeZcZ/ted+FJt+ce1fQULiNf0/1wrvXDh D6o7HBvIrYeMbnA8jTkPjw4d2F0OOD/Fx43UyzWZ7OP4Gz9kiOGRLzAjAAmYVfgstF UhD1QrQb5C1kH8SY2Pzu6TYLuzp3P4+zpUGfxy+w= 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.19 222/422] arm64: dts: meson: Fix erroneous SPI bus warnings Date: Tue, 19 Nov 2019 06:16:59 +0100 Message-Id: <20191119051413.017143708@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 98cbba6809caa..1ade7e486828c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -390,7 +390,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 c87a80e9bcc6a..8f0bb3c44bd6d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -337,7 +337,7 @@ }; }; - spi_pins: spi { + spi_pins: spi-pins { mux { groups = "spi_miso", "spi_mosi", From patchwork Tue Nov 19 05:17:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179655 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp157273ilf; Mon, 18 Nov 2019 21:36:06 -0800 (PST) X-Google-Smtp-Source: APXvYqyAWGvOl4smYxwtF4DHsHVxMyf5MQ/ysmlaXVrKlO4vw1xODEz/h04cY5huLLenN2LBZ0Nn X-Received: by 2002:a17:906:4697:: with SMTP id a23mr32146212ejr.322.1574141766459; Mon, 18 Nov 2019 21:36:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141766; cv=none; d=google.com; s=arc-20160816; b=kjgkfh4/5W34c5dnGIDV/S4KAEUnjvpkvPR7FqMEEoD3V3ATd4o8NM5Ir/TcFd4WEM 2mZ3It+3V1fawyx12o8Up84FmsVzfR8Jcq/L8iLklBEcskoSDsJqOt4b7YvgDDeAW7dA QRjoRzR9MisRIgO/aX2X68chYGXhiey0qNg0XKxBvnsmh+AgPThLyhuhmCCZhNWRspbf zvBu+ctdh/JeoWI8BQjEXvC0FQC+digzFBTmon5XFj8jF45OAng0d5DOKzrkPYnF/dYE G4EI06ZTERYT3ca+drSJdh8fhpuOh09mdcLL9kTjznh3U6fIJ/gf22yGWZs9i7lmlz+5 I7iA== 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=b/o8LljHke2D4NgoFExY6URNW06sIR7o4/fUns/Ty3Y=; b=RFKd76wYZfD8JexSxzv8ClXd8oUEy7D2rtsxBr/m0ly5oPWMw56oVINwcPlZPQEqSy tIxaQ9kO58C5Y7EHGVY7wGhM9GMjQ0g/v4tyF/j81S55dIR2OV6/9dFlAtmqiZe7/7Ei vten46WHUyKj7ixWTBtCQD9NEwcNRGwsh33tPQTy1vSR0BavoIlMJ0rNWCUKlCT3CpMO Jceu4SSck+qnvAP1t/8IWNxaDl4vUsFT5suLZHM3tusIokA+SYMUvcjAio22gQtOEXuP I1aRVkCkjNGm8xqQ96SROUkMdXLUlR7NYw7DZ5RIIV5lQTFlzRTxFykPmjkxdypCj9yu E7WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=En0wh7od; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o28si15050087edc.353.2019.11.18.21.36.06; Mon, 18 Nov 2019 21:36:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=En0wh7od; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729910AbfKSFgD (ORCPT + 26 others); Tue, 19 Nov 2019 00:36:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:57060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729095AbfKSFgA (ORCPT ); Tue, 19 Nov 2019 00:36:00 -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 393CB20672; Tue, 19 Nov 2019 05:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141759; bh=hF3+0/awYwGTiTMznroF4fqR9vXqdkxIXXDkxWqji8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=En0wh7odoUIxKO5TgjNH+TqDQeg6JAbE2ODAh3XNbIkMAvXfW+On2FGULtE2+Gtrr 3Y3UyM4dg1qP0xnygfwYftbyToML4Ny818egLeyB5in4imbGGgtlTJC8jB3r6Ru42x VOfMZM21WN4P7ad5nT/C4CpGOP26mYMO4PrlUGHI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiko Stuebner , linux-rockchip@lists.infradead.org, Rob Herring , Sasha Levin Subject: [PATCH 4.19 231/422] arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou Date: Tue, 19 Nov 2019 06:17:08 +0100 Message-Id: <20191119051414.015045393@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 501500e65fa96f899230d66153fefd780f08dd34 ] dtc has new checks for I2C buses. Fix the warnings in unit-addresses. arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dtb: Warning (i2c_bus_reg): /i2c@ff3d0000/codec@0a: I2C bus unit address format error, expected "a" Cc: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org Signed-off-by: Rob Herring Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 8ce4a79d9360f..1e6a71066c163 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -131,7 +131,7 @@ status = "okay"; clock-frequency = <400000>; - sgtl5000: codec@0a { + sgtl5000: codec@a { compatible = "fsl,sgtl5000"; reg = <0x0a>; clocks = <&sgtl5000_clk>; From patchwork Tue Nov 19 05:17:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179651 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp156066ilf; Mon, 18 Nov 2019 21:34:42 -0800 (PST) X-Google-Smtp-Source: APXvYqyT+6NW7pmQ4qcq1I+P2V4IxCW4/qU+jQIFI4ftpTGp/ZN0q4Zr/D4zpAknjcZBkU7FGf8b X-Received: by 2002:a17:906:1805:: with SMTP id v5mr33093714eje.45.1574141682214; Mon, 18 Nov 2019 21:34:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141682; cv=none; d=google.com; s=arc-20160816; b=WuVwbHFryMCzmBVLdGAg4jaYQPjvE+oRqo+SRHa/7mpSg/teFkjntLxHYhuLHF6XYG r7K4szDLZH+BjpMCPhkRhFF0ECR1b2qe0xjZdtcx3CjKtiAlSDJrq9okkq+d6n/CDQAQ 9D2Mt+ch+FEs6+ZWpxf58z7cvGG9MQT54EbNYL7p5Bm+X+XTDfIDSPkXN8m3MrbPttOC /JT6KWxfUCS2oEXtgjuPIkQMQHhAt8rCQoDAIQtJmFOjiuXr3asIjaHotkv7DHYsNVxD gdFNa2s9A62WN/Io4yOdeWMvErCzfisone0W0J2gjSC9ddjnzBNIdxRdkKCoa2ZjC2B6 kKKQ== 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=ZPZd78U3RDAyfwyyz6qYKK/Y1ffqftWJConvxJy20nU=; b=BcC4MwH45NjuF1/EEutJl1XNN3gpFjjIceAgl1mDy8W63t57LppiqQR9723cb4xMp/ XIKSNZ1+xHu4kYdm8imZrBt7mEqlO7nFBuuEuJvr57VnBb5rPq2R6UeTCIsZcrRKw/TW 7rYJxywHjvdfrKD5LWZJSlNKxN5SlPdF296Rvd0eh/JZ7Z0o31k0I4QWrOZmkfN0gbX8 W6cgZA9zguHsrFXhgI5LgZOMA1En/8u0JJoSyMSaLhis8AOlxlxMyrQiEzvG8jHH8ijo 3fCAyGvMO/Qj1GUEjZPfXKvn3znm7m8ibYpQ/wiocCGTcUCw3ZdYbQqAUVwxB4wumNux zDFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ks2QrNsQ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n20si2677439ejk.351.2019.11.18.21.34.41; Mon, 18 Nov 2019 21:34:42 -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=Ks2QrNsQ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728060AbfKSFej (ORCPT + 26 others); Tue, 19 Nov 2019 00:34:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:55326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728393AbfKSFeg (ORCPT ); Tue, 19 Nov 2019 00:34:36 -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 CC128214DE; Tue, 19 Nov 2019 05:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141675; bh=RHlaMWsk/Gruwmgw+Oi5SSkGWnNFBDQD7HA7XGA8KwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ks2QrNsQQezwVLJE/NgxKj4gqF9RfBOVgC7aPKv4kxXDDSBU6WGD9S03SHegegXyS 0UuDgr6qBAMBz3MgV8pFnrn19dmpC4OakiRCFSqZEQXCbtM+TsXssuKBAWlfOoOGFC S3eoCWXfv1VZbTt/BB7SOaIp73FJojtGLwJ6id4A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Simek , Rob Herring , Sasha Levin Subject: [PATCH 4.19 243/422] ARM: dts: xilinx: Fix I2C and SPI bus warnings Date: Tue, 19 Nov 2019 06:17:20 +0100 Message-Id: <20191119051414.758196086@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit f5054ceed420b1f38d37920a4c65446fcc5d6b90 ] dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@52: I2C bus unit address format error, expected "34" arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@53: I2C bus unit address format error, expected "35" arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@54: I2C bus unit address format error, expected "36" arch/arm/boot/dts/zynq-zc770-xm013.dtb: Warning (spi_bus_reg): /amba/spi@e0006000/eeprom@0: SPI bus unit address format error, expected "2" arch/arm/boot/dts/zynq-zc770-xm010.dtb: Warning (spi_bus_reg): /amba/spi@e0007000/flash@0: SPI bus unit address format error, expected "1" Cc: Michal Simek Signed-off-by: Rob Herring Signed-off-by: Michal Simek Signed-off-by: Sasha Levin --- arch/arm/boot/dts/zynq-zc702.dts | 12 ++++++------ arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index cc5a3dc2b4a08..27cd6cb52f1ba 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -174,17 +174,17 @@ #address-cells = <1>; #size-cells = <0>; reg = <7>; - hwmon@52 { + hwmon@34 { compatible = "ti,ucd9248"; - reg = <52>; + reg = <0x34>; }; - hwmon@53 { + hwmon@35 { compatible = "ti,ucd9248"; - reg = <53>; + reg = <0x35>; }; - hwmon@54 { + hwmon@36 { compatible = "ti,ucd9248"; - reg = <54>; + reg = <0x36>; }; }; }; diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts index 0e1bfdd3421ff..0dd352289a45e 100644 --- a/arch/arm/boot/dts/zynq-zc770-xm010.dts +++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts @@ -68,7 +68,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - flash@0 { + flash@1 { compatible = "sst25wf080", "jedec,spi-nor"; reg = <1>; spi-max-frequency = <1000000>; diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts index 651913f1afa2a..4ae2c85df3a00 100644 --- a/arch/arm/boot/dts/zynq-zc770-xm013.dts +++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts @@ -62,7 +62,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - eeprom: eeprom@0 { + eeprom: eeprom@2 { at25,byte-len = <8192>; at25,addr-mode = <2>; at25,page-size = <32>; From patchwork Tue Nov 19 05:17:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179662 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp159232ilf; Mon, 18 Nov 2019 21:38:23 -0800 (PST) X-Google-Smtp-Source: APXvYqxfhbd6qp32w9Dcx0r5sDmBMWVpxb7U3gsLT3NIngTJlAMi3ExvxrZLZ3h5fbdfYtvbrShD X-Received: by 2002:a17:906:5c06:: with SMTP id e6mr29424269ejq.195.1574141903141; Mon, 18 Nov 2019 21:38:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141903; cv=none; d=google.com; s=arc-20160816; b=C51Kn4yKnokWulzVWy+0F9KDOBD3ESizYLYGqiK8+mHAhZWIQNa+TEG+8UTdmP6HVs jyjlxuSlQWylbSfYZ1+pxuKxSxDyCuuTmrRQg3NM5mtpPyUjlIuqbR/DFHeISWmTRkqP E+pdKxm8rXKWZ3W8Y2A2GVAKGCcAqLAhq63I3HinZnkyCH0yGgKie+l8fuwA+vkTjlbY MRaWwFoeAEpJIIaeEQ66jiq1gzbrK7UBOo+YkuaoBsNzR/u3783LWQ3YOnUUNYHEcBNA exJSl69hBC/GVnPeipJSIwVgM0ZCxxlEzr1+YiRTVSsEbZFvUzI4YN2N0Y3ZiqJunmYF 6fqw== 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=oo4PIZZmfOn/qvyY/F7PU3t/bk1vu2Y8t2PtFq1PsL0=; b=aN3zSB0w2dKfveGq3LKNgCkB71iWYcwMvMk43iTEn2TTawly3Nin461UpC4L0RK7ZC csAG993gFVrF2xH4UGrsz002KVadVAE+Jbyd3jvYeCgqBiDmpYxBbTlnx5dIdhgTQfDN WygSgPnZWOLejARnC7jaQdJon8iundjf94jYjFba+1ZxRN9FCWLvDMcsj5sxiKgD1tlN j09qRwEqlDejRrDGkxhAPSVALX978JXgmGGWsY/FY5KLasxr7IjSQZ9AKUcNMU07ujis /LzjvVrGbgfp45wC2hLTH0aL7/93xC09HugD+iGelfMPkTvZ/fNFk2dnnaswBRXduhDX 5icw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="zxP/rfP/"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b10si13946663eds.63.2019.11.18.21.38.22; Mon, 18 Nov 2019 21:38:23 -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="zxP/rfP/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730178AbfKSFiT (ORCPT + 26 others); Tue, 19 Nov 2019 00:38:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:60206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730161AbfKSFiQ (ORCPT ); Tue, 19 Nov 2019 00:38: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 54118208C3; Tue, 19 Nov 2019 05:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141894; bh=AKjBnir9TlDMJlToyX9ECF1OlXxD7fOPgHiw+Fyj1nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zxP/rfP/5dQIbNrPg8YObEk+K2Y5wZr1Gym/+FfX2Qk6SKEKKRX2S95Q0Tlkj0cep s6GIaX5eainVjb6UaQ3KIFGCFOEwb3T4lZpqzXdWTVpRJ5fNFsXdAgAuBdu60qbfvr vobrVuI2K4GLayc3d3Ycf1dQd6b7ejq0soY0a3xA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Herring , Nicolas Ferre , Alexandre Belloni , Sasha Levin Subject: [PATCH 4.19 267/422] ARM: dts: atmel: Fix I2C and SPI bus warnings Date: Tue, 19 Nov 2019 06:17:44 +0100 Message-Id: <20191119051416.290164667@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit c890ecdbe93d482512a911b299bfb009780a29c2 ] dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/eeprom@87: I2C bus unit address format error, expected "57" arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/ft5426@56: I2C bus unit address format error, expected "38" arch/arm/boot/dts/at91-vinco.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f8024000/rtc@64: I2C bus unit address format error, expected "32" arch/arm/boot/dts/at91sam9260ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" arch/arm/boot/dts/at91sam9g20ek_2mmc.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" arch/arm/boot/dts/at91sam9g20ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" arch/arm/boot/dts/at91sam9261ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/tsc2046@0: SPI bus unit address format error, expected "2" Signed-off-by: Rob Herring Acked-by: Nicolas Ferre Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 4 ++-- arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 4 ++-- arch/arm/boot/dts/at91-vinco.dts | 2 +- arch/arm/boot/dts/at91sam9260ek.dts | 2 +- arch/arm/boot/dts/at91sam9261ek.dts | 2 +- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi index bb86f17ed5ed1..21876da7c4425 100644 --- a/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi +++ b/arch/arm/boot/dts/at91-dvk_su60_somc.dtsi @@ -70,9 +70,9 @@ &i2c1 { status = "okay"; - eeprom@87 { + eeprom@57 { compatible = "giantec,gt24c32a", "atmel,24c32"; - reg = <87>; + reg = <0x57>; pagesize = <32>; }; }; diff --git a/arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi b/arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi index 4b9176dc5d029..df0f0cc575c18 100644 --- a/arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi +++ b/arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi @@ -59,9 +59,9 @@ &i2c1 { status = "okay"; - ft5426@56 { + ft5426@38 { compatible = "focaltech,ft5426", "edt,edt-ft5406"; - reg = <56>; + reg = <0x38>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcd_ctp_int>; diff --git a/arch/arm/boot/dts/at91-vinco.dts b/arch/arm/boot/dts/at91-vinco.dts index 1be9889a2b3a1..430277291e025 100644 --- a/arch/arm/boot/dts/at91-vinco.dts +++ b/arch/arm/boot/dts/at91-vinco.dts @@ -128,7 +128,7 @@ i2c2: i2c@f8024000 { status = "okay"; - rtc1: rtc@64 { + rtc1: rtc@32 { compatible = "epson,rx8900"; reg = <0x32>; }; diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sam9260ek.dts index d2b865f602932..07d1b571e6017 100644 --- a/arch/arm/boot/dts/at91sam9260ek.dts +++ b/arch/arm/boot/dts/at91sam9260ek.dts @@ -127,7 +127,7 @@ spi0: spi@fffc8000 { cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; - mtd_dataflash@0 { + mtd_dataflash@1 { compatible = "atmel,at45", "atmel,dataflash"; spi-max-frequency = <50000000>; reg = <1>; diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts index a29fc04940762..a57f2d435dcae 100644 --- a/arch/arm/boot/dts/at91sam9261ek.dts +++ b/arch/arm/boot/dts/at91sam9261ek.dts @@ -160,7 +160,7 @@ spi-max-frequency = <15000000>; }; - tsc2046@0 { + tsc2046@2 { reg = <2>; compatible = "ti,ads7843"; interrupts-extended = <&pioC 2 IRQ_TYPE_EDGE_BOTH>; diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index 71df3adfc7ca1..ec1f17ab6753b 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -109,7 +109,7 @@ spi0: spi@fffc8000 { cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; - mtd_dataflash@0 { + mtd_dataflash@1 { compatible = "atmel,at45", "atmel,dataflash"; spi-max-frequency = <50000000>; reg = <1>; From patchwork Tue Nov 19 05:17:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179656 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp157502ilf; Mon, 18 Nov 2019 21:36:21 -0800 (PST) X-Google-Smtp-Source: APXvYqzjOzLREWdUt1FSP6xiRYTE5UGme+s1/DSPAg1dD2nNBZ90ecmpax+BuPskkFqN7YfYxLtL X-Received: by 2002:a17:906:1c4d:: with SMTP id l13mr31888003ejg.308.1574141781125; Mon, 18 Nov 2019 21:36:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141781; cv=none; d=google.com; s=arc-20160816; b=a/Ohj7UJQ0MVz0dgVyWfSxlKhMjFgsfgUpFfcJ6Bzsn92uenXJIjs4Ii+SPNFP0HZi l43wn4T/xur/Wa0I61ShBLJpV+WWex7UL1d6lnV+IGJDXzd/l1f6u/6qzSlebc4dsxXX e4qvDftCLoWKlQfPOT/lBR+Ji8UnkOfCxeSytHHPiYiBaZYJxR1kF/8B4NzFiSitSOjI bPJXNl3TKDFwLH5WWGuuTslnMx6qxxtmblxWjU8dLmV4POFA2jtAGpyxA7L1JOZ/WnHh HbFdOV0hKaktTydPlUpRQh8cqLQNXIx0KbMWFSC8x4OVwyFRAMEl+yu0rX8P+XTy4Ryi PePw== 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=T/f5swdpHA27rdZfs/XRev1PYC1hkoBx1lwqcXYTddM=; b=ZcxibHTuL6TRjX7KsMUzHd2K57TxIBz+2UC7u65LcZZvYD2UARU1+X5CMkF76rThIc LFHaSdb55FJk0AqOBcaIefovvlxbC+Q6WKFIcJyY7t4vjzyQpNrRk4hs4q6mmCn5Vzj4 Yk1TGzZDAu1Macyq8Z6Mk2spkgxdQJZeSRe8JObWwNJinhZSuQWRiPQ3qfbSmwFwc+DC c1Xox7ViS9z7V9ggaxcJgqmIsmhj9yn9PGls6FPWpDyl8t/Z5B75/WV7KwHh36lhSvdu k3GvCU6WO8abCIsdC5/2IL7MhA58mBqLzQsry4vgKWYEsgiwFSDzgQjhn47vQh7pXuM5 6KNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="kYDdGyr/"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j21si12647248ejd.265.2019.11.18.21.36.20; Mon, 18 Nov 2019 21:36:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="kYDdGyr/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729932AbfKSFgP (ORCPT + 26 others); Tue, 19 Nov 2019 00:36:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:57362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728721AbfKSFgN (ORCPT ); Tue, 19 Nov 2019 00:36: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 F28B120672; Tue, 19 Nov 2019 05:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141771; bh=VHiTryP+MU+PLdWreCOV2vP2vxJ3anEvXl6BhTjOKbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kYDdGyr/+NZ+3R8azNnnZS6Sgq8T7Ne4J4Jqyqre0ZzdvCAfPMwY01AccgLOn4/K1 IrJsSv75YXnfbY5UBhORVmk3+8oSRjtWo0y1feM7Dkp+Sd1a9ryKelIXERzPqhUw2Y 03nsUkKMmDmRuu5XEj06H/8/4VlBCoUhYQ6q0LeM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Viresh Kumar , Sasha Levin Subject: [PATCH 4.19 268/422] OPP: Protect dev_list with opp_table lock Date: Tue, 19 Nov 2019 06:17:45 +0100 Message-Id: <20191119051416.355082371@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Viresh Kumar [ Upstream commit 3d2556992a878a2210d3be498416aee39e0c32aa ] The dev_list needs to be protected with a lock, else we may have simultaneous access (addition/removal) to it and that would be racy. Extend scope of the opp_table lock to protect dev_list as well. Tested-by: Niklas Cassel Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/opp/core.c | 21 +++++++++++++++++++-- drivers/opp/cpu.c | 2 ++ drivers/opp/opp.h | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/opp/core.c b/drivers/opp/core.c index f3433bf47b100..14d4ef5943741 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -48,9 +48,14 @@ static struct opp_device *_find_opp_dev(const struct device *dev, static struct opp_table *_find_opp_table_unlocked(struct device *dev) { struct opp_table *opp_table; + bool found; list_for_each_entry(opp_table, &opp_tables, node) { - if (_find_opp_dev(dev, opp_table)) { + mutex_lock(&opp_table->lock); + found = !!_find_opp_dev(dev, opp_table); + mutex_unlock(&opp_table->lock); + + if (found) { _get_opp_table_kref(opp_table); return opp_table; @@ -766,6 +771,8 @@ struct opp_device *_add_opp_dev(const struct device *dev, /* Initialize opp-dev */ opp_dev->dev = dev; + + mutex_lock(&opp_table->lock); list_add(&opp_dev->node, &opp_table->dev_list); /* Create debugfs entries for the opp_table */ @@ -773,6 +780,7 @@ struct opp_device *_add_opp_dev(const struct device *dev, if (ret) dev_err(dev, "%s: Failed to register opp debugfs (%d)\n", __func__, ret); + mutex_unlock(&opp_table->lock); return opp_dev; } @@ -791,6 +799,7 @@ static struct opp_table *_allocate_opp_table(struct device *dev) if (!opp_table) return NULL; + mutex_init(&opp_table->lock); INIT_LIST_HEAD(&opp_table->dev_list); opp_dev = _add_opp_dev(dev, opp_table); @@ -812,7 +821,6 @@ static struct opp_table *_allocate_opp_table(struct device *dev) BLOCKING_INIT_NOTIFIER_HEAD(&opp_table->head); INIT_LIST_HEAD(&opp_table->opp_list); - mutex_init(&opp_table->lock); kref_init(&opp_table->kref); /* Secure the device table modification */ @@ -854,6 +862,10 @@ static void _opp_table_kref_release(struct kref *kref) if (!IS_ERR(opp_table->clk)) clk_put(opp_table->clk); + /* + * No need to take opp_table->lock here as we are guaranteed that no + * references to the OPP table are taken at this point. + */ opp_dev = list_first_entry(&opp_table->dev_list, struct opp_device, node); @@ -1719,6 +1731,9 @@ void _dev_pm_opp_remove_table(struct opp_table *opp_table, struct device *dev, { struct dev_pm_opp *opp, *tmp; + /* Protect dev_list */ + mutex_lock(&opp_table->lock); + /* Find if opp_table manages a single device */ if (list_is_singular(&opp_table->dev_list)) { /* Free static OPPs */ @@ -1736,6 +1751,8 @@ void _dev_pm_opp_remove_table(struct opp_table *opp_table, struct device *dev, } else { _remove_opp_dev(_find_opp_dev(dev, opp_table), opp_table); } + + mutex_unlock(&opp_table->lock); } void _dev_pm_opp_find_and_remove_table(struct device *dev, bool remove_all) diff --git a/drivers/opp/cpu.c b/drivers/opp/cpu.c index 0c09107094350..2868a022a0407 100644 --- a/drivers/opp/cpu.c +++ b/drivers/opp/cpu.c @@ -222,8 +222,10 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask) cpumask_clear(cpumask); if (opp_table->shared_opp == OPP_TABLE_ACCESS_SHARED) { + mutex_lock(&opp_table->lock); list_for_each_entry(opp_dev, &opp_table->dev_list, node) cpumask_set_cpu(opp_dev->dev->id, cpumask); + mutex_unlock(&opp_table->lock); } else { cpumask_set_cpu(cpu_dev->id, cpumask); } diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 7c540fd063b2d..e0866b1c1f1b2 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -126,7 +126,7 @@ enum opp_table_access { * @dev_list: list of devices that share these OPPs * @opp_list: table of opps * @kref: for reference count of the table. - * @lock: mutex protecting the opp_list. + * @lock: mutex protecting the opp_list and dev_list. * @np: struct device_node pointer for opp's DT node. * @clock_latency_ns_max: Max clock latency in nanoseconds. * @shared_opp: OPP is shared between multiple devices. From patchwork Tue Nov 19 05:17:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179657 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp157969ilf; Mon, 18 Nov 2019 21:36:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwxxuhwlGajUTdV2UnVf1/4SXCw6Q4+KQnu7QR8mOTRMfCIIZKydv3/YL6wOsP7QLLPtrVl X-Received: by 2002:a17:906:1249:: with SMTP id u9mr32941393eja.253.1574141816437; Mon, 18 Nov 2019 21:36:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141816; cv=none; d=google.com; s=arc-20160816; b=NItfjBJSEd1GqGdQwCZDRE7IdVOdzvm0F9NDnMrfX78NrjX3mIP1Kqw/ai/lG5kwL/ M74LsFFlzmb0CLb/ipiN8Tixz6STYg09+5Ry9jwDaxFq+Mu08t7Mfyd15SJpTLvc0y+v AubjrRP0bNx+qZPsnEumWv09U3YKSRThXXKZDXa9bvEubp4ttkkearJdjawoIchnxZkf vqRcFaHAyfeLtYasKVjFc4InsUzQQlox29XZhKvKSYU1xc0n0123Z2m8x1U2AR9p6dWP AiYrfRevxV6e4mPGiEEonhby3MXkZaF/LXE1yw//O9q8jwDT8WkN9eZbjc7JktOAdgYL YhQg== 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=9XUNrvYiFufh2RjQUB3IKHaXdgIRzEl5io4egFgP5B4=; b=e/BbbaSFoWP2gCdiIHFG6pJdcAfRvUqbRgx8ShTySL89bB677e9IQ34rYv8Emb2rRZ DRVNre1NkdWDbo5MUKzzsumFewtSUOxXXN4ro4S8QKVFYc0qODyEkwt46iaBPtGYkE2+ 2U0MhI68sJgt+YmDObWhIG6p9Ke0VuCq2d7JQl7qc9n1c4xONHPXJIHmmk7iGY/WiMOf MTpcLBYigvX77L9Abo90SkvmTzM9Hdffzo7DFQcfilmU30nBjGS2/pV9SGRuWpaNjvaa +GhHQqEa56csPnZYGruqmF1FiciSMR24esGf0ZqKoYLWF31pD8Eh/K4sje2wqZgFVxoz 7EVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HhC7XmxE; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mh20si12645445ejb.268.2019.11.18.21.36.56; Mon, 18 Nov 2019 21:36:56 -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=HhC7XmxE; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730012AbfKSFgw (ORCPT + 26 others); Tue, 19 Nov 2019 00:36:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:58168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729524AbfKSFgo (ORCPT ); Tue, 19 Nov 2019 00:36:44 -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 99F6420862; Tue, 19 Nov 2019 05:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141804; bh=HJKuEjihpRVj7ywHu4OgY4KZpDHLxi5jwLvtGXQc/Vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HhC7XmxEoqrJwol2Bzfi4TZr2LgUi577uRV7xc3HB+5YkjAIdnOl1ivw0qwiqON95 RY1nLeNZ1ntRCN5+3Qv2AVtpec4Kh9Kdv8Q4MHZJqcex3HM0uY5bOS2LRBXxQsyeDB hkeGxIPQisK75ChHBwfTW3BMqLPWezFnCbm4sBQs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Frank Rowand , Rob Herring , Sasha Levin Subject: [PATCH 4.19 269/422] of/unittest: Fix I2C bus unit-address error Date: Tue, 19 Nov 2019 06:17:46 +0100 Message-Id: <20191119051416.418643578@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 62287dce5d0ee207b6a09a0a1abd06b61cee1094 ] dtc has new checks for I2C buses. Fix the warnings in unit-addresses in the unittests. drivers/of/unittest-data/testcases.dtb: Warning (i2c_bus_reg): /testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest14/i2c@0/test-mux-dev: I2C bus unit address format error, expected "20" drivers/of/unittest-data/overlay_15.dtb: Warning (i2c_bus_reg): /fragment@0/__overlay__/test-unittest15/i2c@0/test-mux-dev: I2C bus unit address format error, expected "20" Cc: Frank Rowand Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/of/unittest-data/overlay_15.dts | 4 ++-- drivers/of/unittest-data/tests-overlay.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/drivers/of/unittest-data/overlay_15.dts b/drivers/of/unittest-data/overlay_15.dts index b98f2514df4b3..5728490474f6b 100644 --- a/drivers/of/unittest-data/overlay_15.dts +++ b/drivers/of/unittest-data/overlay_15.dts @@ -20,8 +20,8 @@ #size-cells = <0>; reg = <0>; - test-mux-dev { - reg = <32>; + test-mux-dev@20 { + reg = <0x20>; compatible = "unittest-i2c-dev"; status = "okay"; }; diff --git a/drivers/of/unittest-data/tests-overlay.dtsi b/drivers/of/unittest-data/tests-overlay.dtsi index 25cf397b8f6b6..4ea024d908ee2 100644 --- a/drivers/of/unittest-data/tests-overlay.dtsi +++ b/drivers/of/unittest-data/tests-overlay.dtsi @@ -103,8 +103,8 @@ #size-cells = <0>; reg = <0>; - test-mux-dev { - reg = <32>; + test-mux-dev@20 { + reg = <0x20>; compatible = "unittest-i2c-dev"; status = "okay"; }; From patchwork Tue Nov 19 05:17:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179723 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp183174ilf; Mon, 18 Nov 2019 22:05:09 -0800 (PST) X-Google-Smtp-Source: APXvYqxpSepn6UC3RXi5PXXBg0x9qhKiaoFX+BRd+zwC6y8wc7O7bgYlxYntJsQzHHwGslLC80qf X-Received: by 2002:a17:906:7708:: with SMTP id q8mr19639388ejm.33.1574143509357; Mon, 18 Nov 2019 22:05:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143509; cv=none; d=google.com; s=arc-20160816; b=T2ayMkGvtk5LNf7rCjAsEFBRgqsJxiIBFp7dEa31EO1RUunegQWK5K852FjqLtK0qq 7UUMEkBcQmTu+gRbyfHgYdM9B2AiKOPLa3QChBVOvvqzOeVRPa4u1RCOPhp7QE5W/PkR 4X5Jk6LGuGFY1vQh7Lrq+ijoty/zoG3EfG9IuFfJXN6VvIU+pNnm8RKZR8mbevKdXkEk PKXFYIUWyk/mZEFb9/Tjo2C5QBdmiSp3G0vw/8MU9JLYsyr/TqUoC2m38NyIlp+6GLza lO1IznOLSeTTz4oYxWapkTikW9iDi9UkI7KBsuc/7k9C3M6ZXcmtxZyVcYSfA5C02z1C MNbg== 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=rRjuQbXmpvuHTli/y1cC6dikMzTlrDz/TTdoYCxbaRQ=; b=Z5oZQLD0vDLEly77WEItDTHXKc+EW+HVzCY01WH6A8vNuCDZEl9GzN4DpUC3sqnBGd 8Y9jyXaIulo9nRO6jCl33Aw64ssQdCXrSq6YthIIGOtMAHFTlgtQpKzLH6dd91l4q3qQ IwI6a/OfdF94FBTifJHqolaSCW22phJXcJsY55qcQPiBc1CfquOfo5KqEL3L+Cpx0gcR x9WFQFemhODFvomtq6BUbdKaRaubD1qLLG8phGfMNf+4m0F3/s1NHI81pmxy9/EAJcUF Fh7Fgv2q8neBSHQaMXKr4bTjQqabUqqkUnc4iUqc97iy8DgXE04e/VxuiBsshJi6cCks wNgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=N3A6S7+F; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6si13987576edg.76.2019.11.18.22.05.08; Mon, 18 Nov 2019 22:05:09 -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=N3A6S7+F; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730067AbfKSFhS (ORCPT + 26 others); Tue, 19 Nov 2019 00:37:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:59008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727121AbfKSFhQ (ORCPT ); Tue, 19 Nov 2019 00:37: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 8A274214DE; Tue, 19 Nov 2019 05:37:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141836; bh=tXpvznd+oBOZN2eCbwim3PFiLXJbR9UB2tAzNx1l3vY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N3A6S7+F8kv0/5jvnMOSUbMNIED0b+Ia6fS/jUgXuBISeRnpst9+/GTJQ+xZDMF8B Ls3lcRANN07DC4DS8VLHRkT4mhipqKDN7NO5AbW/E/XZEqUGySI/aF1q85YagIqfay N9IgHoZ0/daN2YOY++lsl8gNMpaW6oDLsCI6Vww4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Rob Herring , Sasha Levin Subject: [PATCH 4.19 270/422] libfdt: Ensure INT_MAX is defined in libfdt_env.h Date: Tue, 19 Nov 2019 06:17:47 +0100 Message-Id: <20191119051416.483788543@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 53dd9dce6979bc54d64a3a09a2fb20187a025be7 ] The next update of libfdt has a new dependency on INT_MAX. Update the instances of libfdt_env.h in the kernel to either include the necessary header with the definition or define it locally. Cc: Russell King Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linux-arm-kernel@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- arch/arm/boot/compressed/libfdt_env.h | 2 ++ arch/powerpc/boot/libfdt_env.h | 2 ++ include/linux/libfdt_env.h | 1 + 3 files changed, 5 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h index 07437816e0986..b36c0289a308e 100644 --- a/arch/arm/boot/compressed/libfdt_env.h +++ b/arch/arm/boot/compressed/libfdt_env.h @@ -6,6 +6,8 @@ #include #include +#define INT_MAX ((int)(~0U>>1)) + typedef __be16 fdt16_t; typedef __be32 fdt32_t; typedef __be64 fdt64_t; diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h index 2a0c8b1bf1479..2abc8e83b95e9 100644 --- a/arch/powerpc/boot/libfdt_env.h +++ b/arch/powerpc/boot/libfdt_env.h @@ -5,6 +5,8 @@ #include #include +#define INT_MAX ((int)(~0U>>1)) + #include "of.h" typedef unsigned long uintptr_t; diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index c6ac1fe7ec68a..edb0f0c309044 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -2,6 +2,7 @@ #ifndef LIBFDT_ENV_H #define LIBFDT_ENV_H +#include /* For INT_MAX */ #include #include From patchwork Tue Nov 19 05:18:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179724 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp183451ilf; Mon, 18 Nov 2019 22:05:25 -0800 (PST) X-Google-Smtp-Source: APXvYqxE3zd0fnnmou9WCZznZw7rDO//oRrlDQjCMSnVuf4FR/blGxWO2UkXbSFeEhDXKRWIF+K6 X-Received: by 2002:a17:906:698b:: with SMTP id i11mr31805623ejr.97.1574143524989; Mon, 18 Nov 2019 22:05:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143524; cv=none; d=google.com; s=arc-20160816; b=f/HZ9H34EhbwJ32HWiZrFnSWvZ7qgw6x4HY5VVbLuzjGXAMkR5ojd12ns/nVncxByB gv8nFf6ReKv3wOJZHQ/x0kj5LYGijfJywuvdPUQO4sLO0es8Q2aYfusAdU5YCJzR8HKD Lfb7x6sme6G+pNPa0SSj6zxdz0Afar2IKbSWxDnC0488Z0ECfPy7nBe97FfshFxDCFqI 80Z+PUynn8rKSsLGulsEPHtyLCzp9iFtGsvNxxrj0mr/K5gEoAM27ICt6kC4V4axILsP i/TWXww+WKw9kPsLho3mwzrlMsol1Wkj0O1XsZGZSk0ExiFfd8jVcsjufLfZxVqeDXaQ pQQw== 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=QHgIoyyb7S14PcA4VWagcgVFrcUh/0DE7tlaqstVPh8=; b=MQsmr5QNm/m+iCMHQUOJYB9Kr77Y2LrxETckye1/3P0GIiPR01M6atr6HCPM2Or9u4 GsDzLWYrI7v5MBc9p8rhqf9K8YW6XcbHnTa9BoJZ75yVvzQB5rG+TyI1ClZddmOtCXwN RcUCgJT7KRobLiJowuwJfEsFP4qznsi8nrN+kmWjsH1fdVoqOJHfwklzG3M4s4T36Dts mOskf2+M5iGvqgBVAw1Td7cU2FVGt744in6wfqJPuHIgk7IO+rw8yG5FarofmwdnWWDg rlbkPEM7RncljHiMC+mRxb/MBxJgit6b+z6Rbpr8vOn3vFUb8Nan2UosKJplzTry9ELX DtNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LVlnRRYT; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si12936942ejz.12.2019.11.18.22.05.24; Mon, 18 Nov 2019 22:05:24 -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=LVlnRRYT; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730003AbfKSFgv (ORCPT + 26 others); Tue, 19 Nov 2019 00:36:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:58262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729018AbfKSFgr (ORCPT ); Tue, 19 Nov 2019 00:36:47 -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 47893206EC; Tue, 19 Nov 2019 05:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141806; bh=1WDmaeQnzHdPuKnUb+DOjRMz6dZ0mYdB0EDJCkGbeH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LVlnRRYTehan28yD6I88C3EDkxN8A4kpzVMRkLzBgPs/UO0Q2QeRy8KmSpzfMO3vl tIKumO+bCvNKNUmRxtHE2MpXVy/DcpZx+b8SFNTB9Vr6rPBDVl+GYs1QGSIkPwV/4V ebN0Hsofu1dtcgU0jXPRbswGob8G8tmXXyGG72mA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Poulain , Peter Chen , Sasha Levin Subject: [PATCH 4.19 287/422] usb: chipidea: Fix otg event handler Date: Tue, 19 Nov 2019 06:18:04 +0100 Message-Id: <20191119051417.584670547@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Loic Poulain [ Upstream commit 59739131e0ca06db7560f9073fff2fb83f6bc2a5 ] At OTG work running time, it's possible that several events need to be addressed (e.g. ID and VBUS events). The current implementation handles only one event at a time which leads to ignoring the other one. Fix it. Signed-off-by: Loic Poulain Signed-off-by: Peter Chen Signed-off-by: Sasha Levin --- drivers/usb/chipidea/otg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c index db4ceffcf2a61..f25d4827fd49c 100644 --- a/drivers/usb/chipidea/otg.c +++ b/drivers/usb/chipidea/otg.c @@ -203,14 +203,17 @@ static void ci_otg_work(struct work_struct *work) } pm_runtime_get_sync(ci->dev); + if (ci->id_event) { ci->id_event = false; ci_handle_id_switch(ci); - } else if (ci->b_sess_valid_event) { + } + + if (ci->b_sess_valid_event) { ci->b_sess_valid_event = false; ci_handle_vbus_change(ci); - } else - dev_err(ci->dev, "unexpected event occurs at %s\n", __func__); + } + pm_runtime_put_sync(ci->dev); enable_irq(ci->irq); From patchwork Tue Nov 19 05:18:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179658 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp158337ilf; Mon, 18 Nov 2019 21:37:22 -0800 (PST) X-Google-Smtp-Source: APXvYqxC3r+I47dXPPb1RSbl7XpsVm/a+mQnOd5F8OjNPOigfGxjtFbD9ccGaxPXNt8/UEWhu0wV X-Received: by 2002:a17:906:2615:: with SMTP id h21mr32632184ejc.212.1574141842539; Mon, 18 Nov 2019 21:37:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141842; cv=none; d=google.com; s=arc-20160816; b=kiJZJs9WhcaSg9FZIBSUgRt2u/nEuAcR3CPTUeDZLs54IHtNMU5hFeIBmQ66uWmlKP tAcLS0eJmwlhhoSBUxjb8LY0H3iIRq88Y1d8d7frTjyDpIQ33fPk1SryHHNnyB298sdn 1Vmylk3+ETRBp2+7XhJj9ZXf99fOLibnGnVBeY7CgXqSW3hTwjvv0jYShqfWqZBslBIR gryUbPYkv1WZJxob4YjaPsE0GjLjH7K1aji+S5A/2qd2aQdtQdirpqml4MvduHLu1I/5 ZQX55iOQTD2pTAH/YXEDXQlAaNcXwjU10pBVhelDglcYGg+DEqCju8kPM4FCivC1Eo+b oXGA== 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=5LhnykrKd4/2kcH/uJTSJVXfpfxjNmkpRkkOXDQIZes=; b=gAqopWpwQq3860jpjy1pLWZ+ggQPX29yW2Pp+q0YphRJ0VPStj4c2g5KpSEvHTaYMP 1/FTt0vtyxEeckhTSnc6S+25rUJfG4liUt52twvMYT7re+5mlbfX13lVDx6XCwFmRdTH DhvUxZTmSjio1hf1fpkcGAdR9HxYmQF7kjpra/3wu5JeNNulR8LEfYtku0W6pdiU9T9m Kn/R7lw2xU7FQolluipj2pV1eWC7laok2NVPbPUDhYDw31Wuo9DNyKTk1Gl6PCATv4Jy lo1SYd93cnP8yrUmKf1FaRYoepkbmWAjO8UXouSwX48REZ5nq/JQ5yqEOLCHlqp0l15G 3E0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dvQKEFJx; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d20si13083669ejk.173.2019.11.18.21.37.22; Mon, 18 Nov 2019 21:37:22 -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=dvQKEFJx; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729452AbfKSFhT (ORCPT + 26 others); Tue, 19 Nov 2019 00:37:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:58942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727137AbfKSFhN (ORCPT ); Tue, 19 Nov 2019 00:37: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 E492221823; Tue, 19 Nov 2019 05:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141833; bh=VHqwNr/2MI7GULDENmCysXqgEJ5Gz68MXJ5DolXPSlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dvQKEFJxYricu7D1larYF6UuD0qcjc1yHzVqO7SllOlh3tsPoYdPaVIjua7qOwQtM 0NiLHmMqBpX9w2TSZdBBXud6+t5S/3gzL+leHTGOrivdnmnS62U2EI4xKPNyw5ZjPg 9s72HrrN5YPu/l8Pq5SZr8AdymGusLQF5LhxL+KU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Grygorii Strashko , Tony Lindgren , Sasha Levin Subject: [PATCH 4.19 296/422] ARM: dts: am335x-evm: fix number of cpsw Date: Tue, 19 Nov 2019 06:18:13 +0100 Message-Id: <20191119051418.171853121@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Grygorii Strashko [ Upstream commit dcbf6b18d81bcdc51390ca1b258c17e2e13b7d0c ] am335x-evm has only one CPSW external port physically wired, but DT defines 2 ext. ports. As result, PHY connection failure reported for the second ext. port. Update DT to reflect am335x-evm board HW configuration, and, while here, switch to use phy-handle instead of phy_id. Signed-off-by: Grygorii Strashko Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/am335x-evm.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 20bbb899b3b76..cc59e42c91342 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -731,6 +731,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -738,15 +739,14 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; status = "okay"; -}; -&cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; - phy-mode = "rgmii-txid"; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; }; -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; +&cpsw_emac0 { + phy-handle = <ðphy0>; phy-mode = "rgmii-txid"; }; From patchwork Tue Nov 19 05:18:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179659 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp158391ilf; Mon, 18 Nov 2019 21:37:26 -0800 (PST) X-Google-Smtp-Source: APXvYqy1RVRbiSdzlDIdaGbL3HmFGCkiWI6Zub9O8casXYfuj7WbQJ7clrYF0IiohN5VD4QQKLRJ X-Received: by 2002:a17:906:344c:: with SMTP id d12mr31070347ejb.227.1574141846150; Mon, 18 Nov 2019 21:37:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141846; cv=none; d=google.com; s=arc-20160816; b=h+cCxVnrVjlqTy0/8iT+8OmI4AcPzhQCZFY5L61s2Ff4XAfFO6j6o4X3O/OiZ4gRmO 9yM2CkbhCMaFEeUGcQe4OiCMS3cS8jJV74Ot0speJrP0IqatptCiCxsaM/L8nT7sFuRD HXVzdGhGdsS3neMz6RjYPnfNgBIWgwfjuV0nh0T3zp9/9e01dEE5ehabJIsaMGjsEr0H f6QlLmZ9q8m80NCuGLbj0pMwZAKRJWxZhQtNJY0qggBfNG74B7zht6USzSOoaFZIcyG7 psDnPDPwLKWeLO32kedhVhU8LL3r+mMq7JTZUukUq3J7urXN1aB75k+YJkshMpEpQ2f1 XtZA== 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=VYySAVJDowTP7DPFGDIa0EyfEUTkUrODpNKBsdkCBWw=; b=uw7ExVFgxOrc5TAwZ6ODbC/9yJelEVxQkshMzX/Sw1DUv+Ud+IMehJERmaD9BgThDu g5ovW0rVpOJ9psKIrPYA6RBsoEPEonE7r8tS4RVBixH7j1V7vJVzAbXBdL7uMw12rv3k 5uFPdO3lHh4XSikep5enu7ONm51PnFLFlRVttS6j+vOSI8UNsDO6dP6LIYLQ4Wod4z// O9SOA5+/k5ZpbQf+JxqDqhLjRZB3YwbVJKCgUoW1yk1POJfUlpohUscqEyAjpLhQGe3d imr+fbfZk/PXBm6WLmmBl/GxEZte/gEoQnxGy29XAYIctdJ+GsgshOLm2/VyDa2bxuFj /NjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zMwwd84M; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10si12019359ejr.129.2019.11.18.21.37.25; Mon, 18 Nov 2019 21:37:26 -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=zMwwd84M; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730080AbfKSFhX (ORCPT + 26 others); Tue, 19 Nov 2019 00:37:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:59048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730076AbfKSFhU (ORCPT ); Tue, 19 Nov 2019 00:37:20 -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 CC53D21823; Tue, 19 Nov 2019 05:37:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141839; bh=S8irZjjcVwZbHUEYCPydOOO1jUtQJw/MSB50Tu1i7fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zMwwd84MX/F4gpy9UxWpGjbH4Poqekxuh3kiUTiFgimffTqti/zX6f0sogMchmFt3 8znbZ60hAei970raoPETQCMWirrmihwxkni0ZHa52rZJRsTyTNvGbgmj2C62u43Ijd Tc5ki4UAnkANHkYu22tlDb7oifLo6o5TMW7G/QzQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , Santosh Shilimkar , linux-omap@vger.kernel.org, Rob Herring , Sasha Levin Subject: [PATCH 4.19 297/422] ARM: dts: ti: Fix SPI and I2C bus warnings Date: Tue, 19 Nov 2019 06:18:14 +0100 Message-Id: <20191119051418.235430410@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit cc893871f092be9ac1184a78f9ae1e76b85d5317 ] dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. arch/arm/boot/dts/am437x-idk-evm.dtb: Warning (spi_bus_bridge): /ocp@44000000/qspi@47900000: node name for SPI buses should be 'spi' arch/arm/boot/dts/am437x-sk-evm.dtb: Warning (spi_bus_bridge): /ocp@44000000/qspi@47900000: node name for SPI buses should be 'spi' arch/arm/boot/dts/am43x-epos-evm.dtb: Warning (spi_bus_bridge): /ocp@44000000/qspi@47900000: node name for SPI buses should be 'spi' arch/arm/boot/dts/omap3-n9.dtb: Warning (i2c_bus_reg): /ocp@68000000/i2c@48060000/ak8975@0f: I2C bus unit address format error, expected "f" arch/arm/boot/dts/am335x-osd3358-sm-red.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/pressure@78: I2C bus unit address format error, expected "76" arch/arm/boot/dts/am335x-boneblack.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/tda19988: I2C bus unit address format error, expected "70" arch/arm/boot/dts/am335x-boneblack-wireless.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/tda19988: I2C bus unit address format error, expected "70" arch/arm/boot/dts/am335x-sancloud-bbe.dtb: Warning (i2c_bus_reg): /ocp/i2c@44e0b000/tda19988: I2C bus unit address format error, expected "70" arch/arm/boot/dts/am571x-idk.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/am572x-idk.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/am574x-idk.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/am57xx-cl-som-am57x.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/am57xx-sbc-am57x.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/dra72-evm.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/dra72-evm-revc.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/dra76-evm.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/dra7-evm.dtb: Warning (spi_bus_bridge): /ocp/qspi@4b300000: node name for SPI buses should be 'spi' arch/arm/boot/dts/am335x-pdu001.dtb: Warning (spi_bus_reg): /ocp/spi@481a0000/cfaf240320a032t: SPI bus unit address format error, expected "0" arch/arm/boot/dts/keystone-k2g-evm.dtb: Warning (spi_bus_bridge): /soc@0/qspi@2940000: node name for SPI buses should be 'spi' arch/arm/boot/dts/keystone-k2g-ice.dtb: Warning (spi_bus_bridge): /soc@0/qspi@2940000: node name for SPI buses should be 'spi' Cc: "Benoît Cousson" Cc: Tony Lindgren Cc: Santosh Shilimkar Cc: linux-omap@vger.kernel.org Signed-off-by: Rob Herring [tony@atomide.com: fixed mode to 644 for am335x-osd3358-sm-red.dts while at it] Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/am335x-boneblack-common.dtsi | 2 +- arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 2 +- arch/arm/boot/dts/am335x-pdu001.dts | 2 +- arch/arm/boot/dts/am4372.dtsi | 2 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- arch/arm/boot/dts/dra7.dtsi | 2 +- arch/arm/boot/dts/keystone-k2g.dtsi | 2 +- arch/arm/boot/dts/omap2.dtsi | 4 ++-- arch/arm/boot/dts/omap2430.dtsi | 2 +- arch/arm/boot/dts/omap3-n9.dts | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi index 325daae40278a..21bc1173fa6b9 100644 --- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi +++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi @@ -88,7 +88,7 @@ }; &i2c0 { - tda19988: tda19988 { + tda19988: tda19988@70 { compatible = "nxp,tda998x"; reg = <0x70>; diff --git a/arch/arm/boot/dts/am335x-osd3358-sm-red.dts b/arch/arm/boot/dts/am335x-osd3358-sm-red.dts index 4d969013f99a6..d9e92671055bd 100644 --- a/arch/arm/boot/dts/am335x-osd3358-sm-red.dts +++ b/arch/arm/boot/dts/am335x-osd3358-sm-red.dts @@ -161,7 +161,7 @@ invensense,key = [4e cc 7e eb f6 1e 35 22 00 34 0d 65 32 e9 94 89];*/ }; - bmp280: pressure@78 { + bmp280: pressure@76 { compatible = "bosch,bmp280"; reg = <0x76>; }; diff --git a/arch/arm/boot/dts/am335x-pdu001.dts b/arch/arm/boot/dts/am335x-pdu001.dts index 1ad530a39a957..34fb63ef420f5 100644 --- a/arch/arm/boot/dts/am335x-pdu001.dts +++ b/arch/arm/boot/dts/am335x-pdu001.dts @@ -373,7 +373,7 @@ ti,pindir-d0-out-d1-in; status = "okay"; - cfaf240320a032t { + display-controller@0 { compatible = "orisetech,otm3225a"; reg = <0>; spi-max-frequency = <1000000>; diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index cf1e4f747242f..09e58fb810d95 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -1101,7 +1101,7 @@ }; }; - qspi: qspi@47900000 { + qspi: spi@47900000 { compatible = "ti,am4372-qspi"; reg = <0x47900000 0x100>, <0x30000000 0x4000000>; diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 203266f884807..52ae8eef60fc3 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -518,7 +518,7 @@ }; /* touch controller */ - ads7846@0 { + touchscreen@1 { pinctrl-names = "default"; pinctrl-0 = <&ads7846_pins>; diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 2cb45ddd2ae3b..9136b3cf9a2ce 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1369,7 +1369,7 @@ status = "disabled"; }; - qspi: qspi@4b300000 { + qspi: spi@4b300000 { compatible = "ti,dra7xxx-qspi"; reg = <0x4b300000 0x100>, <0x5c000000 0x4000000>; diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi index 738b44cf2b0bb..1c833105d6c54 100644 --- a/arch/arm/boot/dts/keystone-k2g.dtsi +++ b/arch/arm/boot/dts/keystone-k2g.dtsi @@ -416,7 +416,7 @@ clock-names = "fck", "mmchsdb_fck"; }; - qspi: qspi@2940000 { + qspi: spi@2940000 { compatible = "ti,k2g-qspi", "cdns,qspi-nor"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi index f1d6de8b3c193..000bf16de6517 100644 --- a/arch/arm/boot/dts/omap2.dtsi +++ b/arch/arm/boot/dts/omap2.dtsi @@ -114,7 +114,7 @@ dma-names = "tx", "rx"; }; - mcspi1: mcspi@48098000 { + mcspi1: spi@48098000 { compatible = "ti,omap2-mcspi"; ti,hwmods = "mcspi1"; reg = <0x48098000 0x100>; @@ -125,7 +125,7 @@ "tx2", "rx2", "tx3", "rx3"; }; - mcspi2: mcspi@4809a000 { + mcspi2: spi@4809a000 { compatible = "ti,omap2-mcspi"; ti,hwmods = "mcspi2"; reg = <0x4809a000 0x100>; diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi index 84635eeb99cd4..7f57af2f10acb 100644 --- a/arch/arm/boot/dts/omap2430.dtsi +++ b/arch/arm/boot/dts/omap2430.dtsi @@ -285,7 +285,7 @@ ti,timer-alwon; }; - mcspi3: mcspi@480b8000 { + mcspi3: spi@480b8000 { compatible = "ti,omap2-mcspi"; ti,hwmods = "mcspi3"; reg = <0x480b8000 0x100>; diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts index ded5fcf084eb7..1f91646b89516 100644 --- a/arch/arm/boot/dts/omap3-n9.dts +++ b/arch/arm/boot/dts/omap3-n9.dts @@ -40,7 +40,7 @@ }; &i2c3 { - ak8975@0f { + ak8975@f { compatible = "asahi-kasei,ak8975"; reg = <0x0f>; }; From patchwork Tue Nov 19 05:18:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179722 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp183010ilf; Mon, 18 Nov 2019 22:04:58 -0800 (PST) X-Google-Smtp-Source: APXvYqw5ChFvHqjZNEVkKfCusyDAwDmEvFuk8KwgsrO0WeL+s9CwZCgfJXHvxwSmjp6pqit0F2KS X-Received: by 2002:a17:906:344c:: with SMTP id d12mr31223915ejb.227.1574143498481; Mon, 18 Nov 2019 22:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143498; cv=none; d=google.com; s=arc-20160816; b=or3DW12hZjZdP5LsVMIOXZdiixYJNFodil1PM6p83/qmNeYCmMvd0Y/05i8RkFpr6v SLEBuu1TudsNBgKi6WI93D5MvEjyZMjKKafAf2QKsXlwXfSFbjlnxs2kQRd8vAe6eHy9 PPjoE4m0AXUhr6TDYy/+ziJl90gccKHgKSX+UKtaWSA3tob45sT7oYk+yXJk4G/A/zem Wa22ZlpC9uGO+6mYHdBtVS2PhDpiD0xsj4OP1jxW9EiuuW/1xCUJQefD1d9FRG3DNscv fl71Of4qZLO/7Q7ca5OQ9UMIewntyd54xuSgiNg2yzTVxxHlLpamWK2i6iwdRpC/KWI/ VBnw== 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=0c6EIYZyaU+HO0HM9UcfkPWDzgNeyGbJqIivB7bFU+8=; b=SiF+pSt7/kcMD3PlyYZ1jhNwMYXbLDUiE+wNoZo82DmDYfJ33uqpPCqz9IO0DZdT0Y FDFcPSRsH+JPyhH9GGB9FWL1Yd41F+L9HFcT6MPsQ8XRg9GVCHNQqRsnkZO+JKvkxbXi H7AxBDP8/K40+CVs2EXqiDkCyVvplYp0LbpjFazZP/SYc+OFSJRKmhpCCq8B3GJEkvot XiUshGJRFlT2KD3QlYXdkZIsmc1+MCtf6R1kngWjv9mnyIkW0dJ3svHtR4+06c1BxHaZ 2f2lydj3kNUccIpl9Sm6nB9bvVYhJ5jtX8LqSqDh5sMFStVxsd1Xp2aqTJuzWWLTZfnf hccQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rhzauzkD; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nw21si10479048ejb.222.2019.11.18.22.04.57; Mon, 18 Nov 2019 22:04:58 -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=rhzauzkD; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727795AbfKSFhf (ORCPT + 26 others); Tue, 19 Nov 2019 00:37:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:59370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729163AbfKSFhb (ORCPT ); Tue, 19 Nov 2019 00:37:31 -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 8302821783; Tue, 19 Nov 2019 05:37:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141851; bh=5UlIQR2DCq+pOvDPurmJbhIK5FNedXV0/VZEjZx8hAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhzauzkDPLi8fSoKziZfusqjjZBX1+Xq0tgdqf1zJC8vkZ3l9oXTY2wqZXNcyZYTJ ZgS5IFI1nyyrmppjwIoFdjUs4bSnIWMSY9EH+sPTygBcMPgM+aAGdpVf2ddrTiOYT0 1bXsZy4i2NsmeCj5wOkQj26Ql8dNaMHVU7TCpXho= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sasha Levin Subject: [PATCH 4.19 301/422] ARM: dts: ux500: Fix LCDA clock line muxing Date: Tue, 19 Nov 2019 06:18:18 +0100 Message-Id: <20191119051418.506508118@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Walleij [ Upstream commit ecde29569e3484e1d0a032bf4074449bce4d4a03 ] The "lcdaclk_b_1" group is muxed with the function "lcd" but needs a separate entry to be muxed in with "lcda" rather than "lcd". Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi index 5c5cea232743d..1ec193b0c5065 100644 --- a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi +++ b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi @@ -607,16 +607,20 @@ mcde { lcd_default_mode: lcd_default { - default_mux { + default_mux1 { /* Mux in VSI0 and all the data lines */ function = "lcd"; groups = "lcdvsi0_a_1", /* VSI0 for LCD */ "lcd_d0_d7_a_1", /* Data lines */ "lcd_d8_d11_a_1", /* TV-out */ - "lcdaclk_b_1", /* Clock line for TV-out */ "lcdvsi1_a_1"; /* VSI1 for HDMI */ }; + default_mux2 { + function = "lcda"; + groups = + "lcdaclk_b_1"; /* Clock line for TV-out */ + }; default_cfg1 { pins = "GPIO68_E1", /* VSI0 */ From patchwork Tue Nov 19 05:18:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179660 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp158582ilf; Mon, 18 Nov 2019 21:37:39 -0800 (PST) X-Google-Smtp-Source: APXvYqzmPiusDRbNsohvoEcnfgmoxNugBCKhVSFzGTxJDyQ5ETS6zJbt/0UMulB+KrmsMyPR0+hw X-Received: by 2002:a17:906:f756:: with SMTP id jp22mr31620475ejb.234.1574141859184; Mon, 18 Nov 2019 21:37:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141859; cv=none; d=google.com; s=arc-20160816; b=Khry0coepb3kZWkU4Afarubzx5WBOqWMyg83JOpiiwKUIijKrczRkVccKG1Oha3a3O GBmtXERIpU1QKuPZBTLAB1ynyB88sCvS9GrXKJACfl1H7Sq4yPbrtv7N2vkUrfV8EP9c 5JopyY9YE2C81KtEvUBAw+LkdLDQIzrPj2LtA2Ob04qHeY4yYc4Q1cdxk3L+e9I6QRKR a9uKLCPHUvjRDums9P4e9+ApFJZ/5T5H9ag3yIMfv1ZiuKOC0jE0BGXmLbF2wgiR8DOu u5XECwWVkYu2dSKsszms3CanwGFViLRhqwgnRd9R5t3SrUv7S+cd31tt4CVZ9C1acTEr OQuQ== 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=lQkull6ByMgvwULhso+QdrOR0qjFHTs/XMdlZ7j3O4c=; b=Li32o8RVwui/nzZRlM47roZN9tXCPKHOOjGWhTrX1brJtt/XSx4/zTF3wjRxW9rRpY NnV1R1QY2wtQIoQAKTKy1Vj+Ma/aR/v9FOGtVTqkNP9zEdvqOjeMm6f0jPbsxUowpO7A PtdeMFzg8Sq8fTrN+vh78d55rnvU1SRmAxLgU39MbBrGS3p5slELmaa3TYUSSqFWBXj7 Tql2OrDUul7CCX3qxs1XYphRfMl59lqqoNmcTZ+zPMnFSTE6LOVB2BI6vFcmc0sPsnHz zRSD82KTo8EpnDoTzcyeBMXM7GNT+jJL//FxWymLOxaYtdVt0rhvZiVLaD4ZZVjmBTnm 4dUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uYrfZdQo; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o10si16960954edj.316.2019.11.18.21.37.38; Mon, 18 Nov 2019 21:37: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=uYrfZdQo; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730103AbfKSFhg (ORCPT + 26 others); Tue, 19 Nov 2019 00:37:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:59432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726132AbfKSFhe (ORCPT ); Tue, 19 Nov 2019 00:37:34 -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 2AF77206EC; Tue, 19 Nov 2019 05:37:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141853; bh=XPxPE1qZQJ1Y0fI2f8ZMRJh22vddh15YP8MIS/si918=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uYrfZdQoqll2G8172zl/IxLH3633bTDs6bCJNpFnahzG5f+q/fjhfQMNcf00XDLIh QyLK6EK1bPSPebmq7NlnD9Ac6EKv5WxkiKUzQwuuaUPQRkLu8uni/1gQ241qEeaFIM /QIuaAU8Ypr/X65Z+cq/PgOTk4ouBvXJETAz5qaI= 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.19 302/422] ARM: dts: ste: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:18:19 +0100 Message-Id: <20191119051418.571417897@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 b0b94d0530985..603890461ae0f 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:18:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179670 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp159962ilf; Mon, 18 Nov 2019 21:39:14 -0800 (PST) X-Google-Smtp-Source: APXvYqygrT5WoCthBImoCqzR6JhqnklZp1IUsloWgiuylMnVWrzKPh1ln0XfbZz+yRc3RlyyWm1W X-Received: by 2002:a17:906:70e:: with SMTP id y14mr32235613ejb.70.1574141954428; Mon, 18 Nov 2019 21:39:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141954; cv=none; d=google.com; s=arc-20160816; b=Hj9pD8fCJH4Hs1MNNQlG0Xfn1q48tadKJApVi+CdgaB9ECj156qDP3xrgvNZSV7E04 Rv7THtV2KJI7xFDljEkNNPwWZajbr6ubz2VGpxak7sYs34XNF6kEnDLDAYdal8Slv7UD K5/YVqG09P65LszCBjy6oGfC8jScNPbDO4iZSgp9pcU1U1tkdDYMtfBm6bgxZOWhChJJ sIq4js56KJLPi99Sr018PiUVit6YP9S5oiMrnaCzz29WkvKauoWOe1b+tQpvLdXmjWKa 1qCJUc6I3EM1QdHpUia9UFSgYSlJcypdH4VkUlqXSBbnRj7xpogk/coPfUCrr8wkFCOF wD5A== 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=fLGsomiQfK9WCyyUSjZ2sdCfYr7LTzQ77S4pqls5FZM=; b=wGZuj+Bmc4SoK4mv5maiAwH0ZYgp31BdFgE1x93I7u4bEZDGOgy3P629HV5uynKWYK o2QeaPwrTiZZ3fvFVZEYwXNW3Mc/pxw/m1BuZPJMD6Tr/x8+XUnN5JJECLaCSpcAu7rZ a1H8JxLj7k5r7A8WBfBhcUvyBYX7l1kbjkjaiUxRAJom700gQ9ApwdDu8Morr1M99wuA Eek02d1LT3uZam/Hkr287SfN+kxybHK0OzaFp9HzwGjQg1Y276nBlavpCHIh+OvunbvR fVPFsGKTjOUu+TPyhAILPF9vBjy/IGuvrAGIQa+wm0CtV/d+V9D/N0h/VPZH3UuKbi8l ccPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="GYFKn/5Y"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b18si14938776edc.390.2019.11.18.21.39.14; Mon, 18 Nov 2019 21:39:14 -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="GYFKn/5Y"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730245AbfKSFjK (ORCPT + 26 others); Tue, 19 Nov 2019 00:39:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:33106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729113AbfKSFjF (ORCPT ); Tue, 19 Nov 2019 00:39:05 -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 7ED90206EC; Tue, 19 Nov 2019 05:39:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141945; bh=NMPNEBM0ZqzblQuub571ZXHEph2ZQyjpjHS66QSs94U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYFKn/5YlOFXEcvTY8xIB0WDy9n8fon/VAyazlZFtj0v+WaJheplbYni4blrkbQIU uNeTeOeK79PHhLb7BWHGcDcHiTG7U/WQYhDlQ38cqY3WNhzFiG72guNe27ydpv1SvS RStg8p+QZDvV/wVzaOaXFpaLef4zENJhSlr741vs= 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.19 334/422] ARM: dts: exynos: Correct audio subsystem parent clock on Peach Chromebooks Date: Tue, 19 Nov 2019 06:18:51 +0100 Message-Id: <20191119051420.660741996@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Szyprowski [ Upstream commit ff1e37c6809daab75f7b2dea1efe69330e8eb65b ] The proper parent clock for audio subsystem for Exynos5420 and Exynos5800 SoCs is CLK_MAU_EPLL. This fixes following warning: clk: failed to reparent mout_audss to fout_epll: -22 Fixes: ed7d1307077e: ARM: dts: exynos: Enable HDMI audio support on Peach Pit Fixes: bae0f445c1e7: ARM: dts: exynos: Enable HDMI audio support on Peach Pi Signed-off-by: Marek Szyprowski Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 769d60d6c9006..9eb48cabcca45 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -153,7 +153,7 @@ &clock_audss { assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>; - assigned-clock-parents = <&clock CLK_FOUT_EPLL>; + assigned-clock-parents = <&clock CLK_MAU_EPLL>; }; &cpu0 { diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 492e2cd2e559e..4398f2d1fe881 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -153,7 +153,7 @@ &clock_audss { assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>; - assigned-clock-parents = <&clock CLK_FOUT_EPLL>; + assigned-clock-parents = <&clock CLK_MAU_EPLL>; }; &cpu0 { From patchwork Tue Nov 19 05:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179721 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp181555ilf; Mon, 18 Nov 2019 22:03:44 -0800 (PST) X-Google-Smtp-Source: APXvYqzCUdFxtV4G6B5CJilLQd0i+KXZrqQZ7e6bHS1OrZ/9+rKE+HPf9WYIZz7iwyNTcdFEmRH+ X-Received: by 2002:a17:906:411:: with SMTP id d17mr32183893eja.299.1574143424493; Mon, 18 Nov 2019 22:03:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143424; cv=none; d=google.com; s=arc-20160816; b=dYrj34yK+cAq/TvvIKtdE+IcQ5/Wvvs10TYw+gzRwpJoNhuWRaFdbwbRsjl5Zac9wu b6U1K12VRgGncU43F5nUlQuQWSeXQHuBoiqhzRXX8EhxhZkZPtWyT+8+NbV+gVLXIfTd dEDraRRdp7Q1FYWy8c+PtHELPWgXJhZw9DhXwoxAb71pR7jkOIkQPo9bUiIuBSOtqT6s dPN0XjIIBtiplLxaoSKlhYw/fhOpRmM7T5pO+MDfnk+mU64AEkA26K9NCn2La19Pk8VR LF0Lc2uHtePBMBSg+e9AWQro2sA+it/RbXWXO650q7eDOv2x2tI0wf+lBAT96aPJy4se wOOg== 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=iS705d7nR8MDAqh46+IM7iP612AEHVYxXaMRWCFfxnM=; b=cboqPsO7mbmEtOlGQvryh7dYamapQ5TeSpPNnYY1PGWhuZN50zA0cG4hjR0CDR14YH PRDVonLYtXBV0h6uzx9nZbhAxhvgtucncJsk5p9p2M8ZFH1cSwdZUjPznB9ADKApvuzh QG4dghnNRa8lxJSJsoD3RvOTvwyKdG4FNh2qOFR0POX1vqvNsFiJre0kjcEOlQXiuS+c i/mJShzFGa7DxcwXI5aVbW6rYRoAl6jAzWAbeyyTx50/6KynyygNkNv2lYswTxwThzeu TheCfykn3tB4JCl1WXDvbdLNSTED2XUMBFJ5o/6ULkMym+Hr8vI6t0itgbufGHiYjtkr 7nTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=j8yXsJDl; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t12si13087332ejr.6.2019.11.18.22.03.44; Mon, 18 Nov 2019 22:03:44 -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=j8yXsJDl; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729366AbfKSFjp (ORCPT + 26 others); Tue, 19 Nov 2019 00:39:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:33760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728329AbfKSFjm (ORCPT ); Tue, 19 Nov 2019 00:39:42 -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 B9FE7208C3; Tue, 19 Nov 2019 05:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141980; bh=Y+QVWnNnofIfKEsSwHOQQRLh8sUpAcQANW9LqVyxVs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j8yXsJDlLEvCfUJ3yvUnORiYVpmv009jHcvLk+83IIfnggXjdWEksV//V7H3mTAPI 4tGiLLncnJ4WpkjwdO0R3oAacBbiLhQcDEq4OsBUAanTH8/Mo/ixq4ed4zMK5clFUr FUZCiIGYG++6rGitL/oBnGg3Vfh6i4eVi+vO4j2o= 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.19 345/422] coresight: Fix handling of sinks Date: Tue, 19 Nov 2019 06:19:02 +0100 Message-Id: <20191119051421.369859388@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose [ Upstream commit c71369de02b285d9da526a526d8f2affc7b17c59 ] The coresight components could be operated either in sysfs mode or in perf mode. For some of the components, the mode of operation doesn't matter as they simply relay the data to the next component in the trace path. But for sinks, they need to be able to provide the trace data back to the user. Thus we need to make sure that "mode" is handled appropriately. e.g, the sysfs mode could have multiple sources driving the trace data, while perf mode doesn't allow sharing the sink. The coresight_enable_sink() however doesn't really allow this check to trigger as it skips the "enable_sink" callback if the component is already enabled, irrespective of the mode. This could cause mixing of data from different modes or even same mode (in perf), if the sources are different. Also, if we fail to enable the sink while enabling a path (where sink is the first component enabled), we could end up in disabling the components in the "entire" path which were not enabled in this trial, causing disruptions in the existing trace paths. 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 --- drivers/hwtracing/coresight/coresight.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 3e07fd335f8cf..c0dabbddc1e49 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -132,12 +132,14 @@ static int coresight_enable_sink(struct coresight_device *csdev, u32 mode) { int ret; - if (!csdev->enable) { - if (sink_ops(csdev)->enable) { - ret = sink_ops(csdev)->enable(csdev, mode); - if (ret) - return ret; - } + /* + * We need to make sure the "new" session is compatible with the + * existing "mode" of operation. + */ + if (sink_ops(csdev)->enable) { + ret = sink_ops(csdev)->enable(csdev, mode); + if (ret) + return ret; csdev->enable = true; } @@ -339,8 +341,14 @@ int coresight_enable_path(struct list_head *path, u32 mode) switch (type) { case CORESIGHT_DEV_TYPE_SINK: ret = coresight_enable_sink(csdev, mode); + /* + * Sink is the first component turned on. If we + * failed to enable the sink, there are no components + * that need disabling. Disabling the path here + * would mean we could disrupt an existing session. + */ if (ret) - goto err; + goto out; break; case CORESIGHT_DEV_TYPE_SOURCE: /* sources are enabled from either sysFS or Perf */ From patchwork Tue Nov 19 05:19:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179671 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp160400ilf; Mon, 18 Nov 2019 21:39:51 -0800 (PST) X-Google-Smtp-Source: APXvYqy8ZJJ9Y/vA0HoNysFQnyWBDjFAxdcWa9m3vkVtPN1nw+AfBmYJe1NpcTVVdZBuyMc/kDhp X-Received: by 2002:a17:906:52c4:: with SMTP id w4mr30949429ejn.99.1574141991769; Mon, 18 Nov 2019 21:39:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141991; cv=none; d=google.com; s=arc-20160816; b=kxEU68/ORR99/u9+qfK6GxKjHS69RG/I4kGliIHFZXWDEc1/jMd+q16RJIMM6B3KEY aOvTdu3nOOxE7QwlmpsqPvmo8hdxp24i1ThFkXKOBjZfE2JfAnF+4gfC5M32OB6TzjyT 6DiGqwYjPRLpIfz/qYFj35LONcFKY9MgHvie6SHGXzPKfxxyIMu7FURTJNxtRCjzF+he 6B6KWQcMBYFDXFn4+UGPCiMefDn886x+h6t3P6RB3r+DDlBN/VJAlh7D0HO8MJPK3zfO Ru66K8mZE5IWMGrn6xfCruYlB9Of/Vx1syLmHHf5h6Yzq9zo5+yTLRHM3/3YIEK0QYcq hK9A== 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=2Qe0GqDq3aOIZOzOFlXL8uwvbE35X5Y6OGV5u/InO4o=; b=gCUjGpaPGScwMfsCie1D7+0XwkLLJciZp8nGwOc9gnwVBq1UE9FQvDJ6FsiqtjVZKs HhzMdhMxBrzsUNtr3x48Oat/sN/aI60cqknzQlWHnCM01bco6zgSlMl5L0O53xXRx1Cp KK1fWzMbpBbnQdewUOAPyP+va3t2k4lQ6aYxDzyUKIEV/AyCZv4MXBiBIXh8U8Navr0t FgYohlq0jThIVnQFughyk4xrUU+RI0qxKuPDt+HVh0e7TrVhAcoWIhi34zFy0NNfsT+W zJAKSFG4yM/nm1IwaXDiNOO/TCX0IQlucoBQGUlJN2tQ/bQgSn0hXNeNLEFVkMl7Mxp5 aJPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nN2W9AfG; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si12773053ejn.250.2019.11.18.21.39.51; Mon, 18 Nov 2019 21:39:51 -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=nN2W9AfG; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729552AbfKSFjr (ORCPT + 26 others); Tue, 19 Nov 2019 00:39:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:33818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729934AbfKSFjn (ORCPT ); Tue, 19 Nov 2019 00:39:43 -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 7292F218BA; Tue, 19 Nov 2019 05:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141983; bh=isimNGV8EFFjgRGHPfCqxbiGejExCGEYIzUjW3Qx7LU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nN2W9AfG2QtYKndHW5+LUO8dWln75PAoY7fH6lX28ylcAZPeS2KAm6UP9ZTJhZ/7y rkkWkaO5lfFspatJV/Jjfeh3uuJyLkFgSnd8D6KTglWQn/6X/NKkBRLcZ7rHI/eNxH mBmfFSFGiMcO6n+JkS2DFdYkukHl9vq7cS+H1WaU= 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.19 346/422] coresight: perf: Fix per cpu path management Date: Tue, 19 Nov 2019 06:19:03 +0100 Message-Id: <20191119051421.434014178@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 0f5e03e4df22c..4b53d55788a07 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,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); @@ -61,6 +62,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) @@ -120,23 +133,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; @@ -147,7 +163,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) @@ -164,8 +179,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; @@ -213,6 +228,7 @@ static void *etm_setup_aux(struct perf_event *event, 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); @@ -224,9 +240,11 @@ static void *etm_setup_aux(struct perf_event *event, 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) @@ -255,6 +273,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; @@ -267,8 +286,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; @@ -278,7 +298,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 */ @@ -306,6 +326,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; @@ -313,7 +334,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; @@ -344,7 +369,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:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179673 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp160462ilf; Mon, 18 Nov 2019 21:39:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwhg8jd8xWmbxyHY4Mg2Ygao+Gig5wu0lAhTgM3tYbyIC6RmMXfWGcrYVJkPl4oBlRKoTsi X-Received: by 2002:a17:906:52c4:: with SMTP id w4mr30949819ejn.99.1574141996167; Mon, 18 Nov 2019 21:39:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141996; cv=none; d=google.com; s=arc-20160816; b=AF/t8N0ZYKt/NdFuepJUOhibFOtiie1jBKth7rcB8PWh1DFb3DaqCc5Xv6hmNyplnD 04k2UBmXJzXO4jNb3sTOWFzD8K83kc16ZZa/YbDIePXvrCSIGjLkrwJDuwN5xIbJipWs cARuUArTInEANtkt/+QRSboTvq+J+NnwUWuASqPHanG+jruv/yDdwMX/YNXkrM9nqrBL cwD9W4/En6oC6XpdFi0t3HiHFsmrHo5O+Ogq+LuyxjNx6tDcoMtSMUUliY9TNcast0Hl xOa94T7V5iwakr82wTKNFI4HxGJWx0NZQAE7QrrnvqVOVgV3Z0/qAudq8K36gtt5mm1r wdQg== 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=98CtDxdf7IHNPYkRNFxaQrO+3m0k8YdUOwJpQhunvpg=; b=UxwHHVyt0whKtCc4vFS+IR+lpw4r2xefDGqPINAX7GnIN4iFB2Vo+gfLS72aaSLNmU ChmaA52R8BWSJNlbBx+s+Qi5TRKoc9kics3SG4beLdV/kQ5DPmfZj2f1Y64+2AsFMIp1 xhGCUgQBK0G0V2vZPTPOb/V57Q4tc6IUl+HjRbdGDIuGby+y/AJjBxqtOlChNHQYF7X0 j5h7fOZCYJrHjYHO57rVuCP0+hzWuUJgLhWSK2JlJ/D0g2HU2vCjaqh6N4dI+XVFLrE0 GmFY28LQRepIy/zoJsmxoCrnKJFfl7WGPq/jkmdCENHdDFBkFTc1ILlyLImKJZMuDQTQ iR8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f2AqO7p8; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h23si14132320ede.355.2019.11.18.21.39.55; Mon, 18 Nov 2019 21:39:56 -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=f2AqO7p8; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729473AbfKSFjx (ORCPT + 26 others); Tue, 19 Nov 2019 00:39:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:33846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730005AbfKSFjq (ORCPT ); Tue, 19 Nov 2019 00:39:46 -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 9C8722071A; Tue, 19 Nov 2019 05:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141986; bh=QJxa5nK1H1nKWLhJmsQHhMbrd/v7Of9YYRk/3G1Mo8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f2AqO7p8tIEMhSZdy+wsFXEHzJwO+ILZ1XppSHOPaT/+RQcE/iyDGQ9LILz1zSCg7 okiBXbUg01ME/t8od1vjvQueDEhu3CkBrElUq0weZWFF9FboTR2GJOxDBApSosAPSv 8YXd9S6BjcQZ4ZQlHfV4iiNmuk63jIs6/u/feLNk= 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.19 347/422] coresight: perf: Disable trace path upon source error Date: Tue, 19 Nov 2019 06:19:04 +0100 Message-Id: <20191119051421.497738470@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose [ Upstream commit 4f8ef21007531c3d7cb5b826e7b2c8999b65ecae ] We enable the trace path, before activating the source. If we fail to enable the source, we must disable the path to make sure it is available for another session. 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 --- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index 4b53d55788a07..c3c6452015142 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -306,11 +306,13 @@ static void etm_event_start(struct perf_event *event, int flags) /* Finally enable the tracer */ if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF)) - goto fail_end_stop; + goto fail_disable_path; out: return; +fail_disable_path: + coresight_disable_path(path); fail_end_stop: perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); perf_aux_output_end(handle, 0); From patchwork Tue Nov 19 05:19:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179674 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp160547ilf; Mon, 18 Nov 2019 21:40:04 -0800 (PST) X-Google-Smtp-Source: APXvYqwK35PqVp9JiWqRTcknQCYOk4dkHrw38bRbd9bbiOHKDvtVGCZlbC++l0TyKa90WoQRI+hX X-Received: by 2002:a17:907:216e:: with SMTP id rl14mr32466560ejb.291.1574142004235; Mon, 18 Nov 2019 21:40:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142004; cv=none; d=google.com; s=arc-20160816; b=yxKw6xGa+mdynH5jB4mDpTpMaoIMA4tSn66ffYtT0oeenn/zg03rBiGNhOLaAU5cRO h5cgqvJhyI/91cayaBpZlTEea512L+kKMLMWhrUl95ufsGk8ZNF4fJVclt1605iidoVb cGCvMPHUHOZEHANZUXkX2STF1EVxirFT+J6S4/8jrimg3BKJ9hkqllJkwR4VfoXN/XmW /lCM6/luCSnOtiVPKCbd7izK12OTdjYlj2SaUGbZi/rXWAjQA2xVRbEX2W7Tr5tA4Gt9 fawlFw0QR19FaVbcNqCP94au6/d/hsnAAtcrswdajHKxcWVF3WyVjDERYWTz8rYkPFX4 O8Vw== 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=HfyQRznqH2PRqMc6GjslCpP6ekKcnUgnRi/tEo+9F1o=; b=fvG2dyH5Oclu/YXFuXcRCGJoiTDQ9a9A4XgvkF8TJ4V+AQaJMdMkqqJWW/eT5WwZqd kF1s+nghOvsFLEHrEP8llkJujSOBdlEq68vXvp3+fIaOa8Z0rv4zshMQX9vJFVjwhHEf CtECbR5MjlFnSR/yejsTb1fRjtSZnKEc/0lqKpYdPk8/mjelnnwfXpJbpyem9Cvul3dN 5Bf59763P7JbL8t+2bPVGRstZ5Fpqa66KkDw6rK+CKX8qcGLpf4/aLmMSDLLZ3fFqsvM YK0cKxvP10gUyI8mlyKmBkK1Sq/9F8c3CwEhqqN8LZL3VPDZAuGLqB/LUyUola1N6CC4 y5xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1BScpzgQ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b28si16247177edn.230.2019.11.18.21.40.04; Mon, 18 Nov 2019 21:40:04 -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=1BScpzgQ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730345AbfKSFkA (ORCPT + 26 others); Tue, 19 Nov 2019 00:40:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:34030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730047AbfKSFj6 (ORCPT ); Tue, 19 Nov 2019 00:39: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 310B321783; Tue, 19 Nov 2019 05:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141997; bh=gi0fFzVngAvPuitwbmsk2jTMbC43FgfYPfful1aETBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1BScpzgQ7Hn6NiPYUobT4V0wmSpWSyuJfX5v3UDbVzGVWrNuw8EnPLp5z+FF7GK8B Y1oQ5T0EWPcDSvnFDvDQSzL4zPvG2aQSoTEeaUWmNN1JQTolzgt+yJprxX5rV+hk6C AN0OEBcLZF629I37kYuPzQpMTgmVF7LOL7xtZDH4= 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.19 350/422] coresight: tmc: Fix byte-address alignment for RRP Date: Tue, 19 Nov 2019 06:19:07 +0100 Message-Id: <20191119051421.693240152@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 0549249f4b398..e31061308e19e 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -438,10 +438,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:19:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179675 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp160552ilf; Mon, 18 Nov 2019 21:40:04 -0800 (PST) X-Google-Smtp-Source: APXvYqyLqfbK/xm8ZYQqeisSjtrQ3a4m0cgR4d8Blr8rfzaMbe40choooC5zhRvpOG4KUvZaGMLt X-Received: by 2002:a17:906:2518:: with SMTP id i24mr32673488ejb.4.1574142004655; Mon, 18 Nov 2019 21:40:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142004; cv=none; d=google.com; s=arc-20160816; b=xEgYNFssY4f3AHm1H+h9icHWzhoKH8ez2bTiN90K7JLDD0GxmjtfD9ui1LFs/o3PF7 U4hQThIcoKvR90nWBSM4bNKUIYazlCgMkTUbHdA0tQGsgWxfSz6d/vW58ezS/y890r8T KuLBFJuNFEG0sVUcXkmjxgGS8n4vObMjgmOdHJhjy6qmWZbUHYxQhRARb7Kdalb1xVCQ 8rgNEEzOSnOv6H0jXQHfyTR6cBb2NbT0IKFr0pwoFz3EejZkNHjadkjSb5MSZ/eqt7Ku UOyOkTH4n5PHb3FSN0e5orqbEVWsRn3hgepCSHBZlf0YBKTsjbaZjUaPqzC6CH3Jpulv YM6Q== 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=6bteJadvD5H1WuxKSIaui2Z3v8MPGNRWZyTE/Q4LtsE=; b=zJXXJJfNonZvymhm7Isu9usih37FExw3ZMqtwbCIa4OEkCMWfcpIt06zh58ekgRn61 o9iNsSw1vgLhdBr7pwtvUQzjM4g1OjAl2SZhEvl+v+Fvoo7p9cQFLpoGFDZbJQBMT05b 4kQwTbuknRd99q3nF3hQYDEjmvYxdfGbXcg65/2YI/WOYjoxbSqKKR3qxkmJpyL4JkOT umQwlBaCQO09tzUB490ejNVdpefXbz/a7hHD9rsmmnF4jfmwibptKpeM0uAeKi2svzn+ +kRxkpNFsNpU3wQTDFefQsfsvKf5VoT4HBBEp57+HKedpeL+gwlcjiIc76/egiKjEp/N bKSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=A8d3vyVD; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b28si16247177edn.230.2019.11.18.21.40.04; Mon, 18 Nov 2019 21:40:04 -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=A8d3vyVD; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729693AbfKSFkC (ORCPT + 26 others); Tue, 19 Nov 2019 00:40:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:34090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728541AbfKSFkB (ORCPT ); Tue, 19 Nov 2019 00:40:01 -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 D9ED2222ED; Tue, 19 Nov 2019 05:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142000; bh=Si7KddTlpBoJb+HqiYLW4wmn16wkQOtypJpyIXeDOJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A8d3vyVDXWOU3wrteFjzbTVaBViyTIL86YfsL7bvwXkih9q3h7V3/mmTovaYSFrHt rnDnNlMDrACPmt8s7H4E+RbNnyntxlQ/XGNDvCNAEuSS4PaW9Bb1nTkZ/BddTqX9cd 8hXtBI0ANkgxJgzzicBjNSlR0Q6wFbF4OJKNSLv8= 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.19 351/422] coresight: dynamic-replicator: Handle multiple connections Date: Tue, 19 Nov 2019 06:19:08 +0100 Message-Id: <20191119051421.760506688@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose [ Upstream commit 30af4fb619e5126cb3152072e687b377fc9398d6 ] When a replicator port is enabled, we block the traffic on the other port and route all traffic to the new enabled port. If there are two active trace sessions each targeting the two different paths from the replicator, the second session will disable the first session and route all the data to the second path. ETR / e.g, replicator \ ETB If CPU0 is operated in sysfs mode to ETR and CPU1 is operated in perf mode to ETB, depending on the order in which the replicator is enabled one device is blocked. Ideally we need trace-id for the session to make the right choice. That implies we need a trace-id allocation logic for the coresight subsystem and use that to route the traffic. The short term solution is to only manage the "target port" and leave the other port untouched. That leaves both the paths unaffected, except that some unwanted traffic may be pushed to the paths (if the Trace-IDs are not far enough), which is still fine and can be filtered out while processing rather than silently blocking the data. 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 --- .../coresight/coresight-dynamic-replicator.c | 64 ++++++++++++++----- 1 file changed, 47 insertions(+), 17 deletions(-) -- 2.20.1 diff --git a/drivers/hwtracing/coresight/coresight-dynamic-replicator.c b/drivers/hwtracing/coresight/coresight-dynamic-replicator.c index f6d0571ab9dd5..d31f1d8758b24 100644 --- a/drivers/hwtracing/coresight/coresight-dynamic-replicator.c +++ b/drivers/hwtracing/coresight/coresight-dynamic-replicator.c @@ -34,26 +34,42 @@ struct replicator_state { struct coresight_device *csdev; }; +/* + * replicator_reset : Reset the replicator configuration to sane values. + */ +static void replicator_reset(struct replicator_state *drvdata) +{ + CS_UNLOCK(drvdata->base); + + writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER0); + writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER1); + + CS_LOCK(drvdata->base); +} + static int replicator_enable(struct coresight_device *csdev, int inport, int outport) { + u32 reg; struct replicator_state *drvdata = dev_get_drvdata(csdev->dev.parent); + switch (outport) { + case 0: + reg = REPLICATOR_IDFILTER0; + break; + case 1: + reg = REPLICATOR_IDFILTER1; + break; + default: + WARN_ON(1); + return -EINVAL; + } + CS_UNLOCK(drvdata->base); - /* - * Ensure that the other port is disabled - * 0x00 - passing through the replicator unimpeded - * 0xff - disable (or impede) the flow of ATB data - */ - if (outport == 0) { - writel_relaxed(0x00, drvdata->base + REPLICATOR_IDFILTER0); - writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER1); - } else { - writel_relaxed(0x00, drvdata->base + REPLICATOR_IDFILTER1); - writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER0); - } + /* Ensure that the outport is enabled. */ + writel_relaxed(0x00, drvdata->base + reg); CS_LOCK(drvdata->base); dev_info(drvdata->dev, "REPLICATOR enabled\n"); @@ -63,15 +79,25 @@ static int replicator_enable(struct coresight_device *csdev, int inport, static void replicator_disable(struct coresight_device *csdev, int inport, int outport) { + u32 reg; struct replicator_state *drvdata = dev_get_drvdata(csdev->dev.parent); + switch (outport) { + case 0: + reg = REPLICATOR_IDFILTER0; + break; + case 1: + reg = REPLICATOR_IDFILTER1; + break; + default: + WARN_ON(1); + return; + } + CS_UNLOCK(drvdata->base); /* disable the flow of ATB data through port */ - if (outport == 0) - writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER0); - else - writel_relaxed(0xff, drvdata->base + REPLICATOR_IDFILTER1); + writel_relaxed(0xff, drvdata->base + reg); CS_LOCK(drvdata->base); @@ -156,7 +182,11 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id) desc.groups = replicator_groups; drvdata->csdev = coresight_register(&desc); - return PTR_ERR_OR_ZERO(drvdata->csdev); + if (!IS_ERR(drvdata->csdev)) { + replicator_reset(drvdata); + return 0; + } + return PTR_ERR(drvdata->csdev); } #ifdef CONFIG_PM From patchwork Tue Nov 19 05:19:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179679 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp162711ilf; Mon, 18 Nov 2019 21:42:29 -0800 (PST) X-Google-Smtp-Source: APXvYqyBXA20yp8KPY2FuYB9/kTkWAl2mKVCEYgrZRVVAFSzbFOUq5lbOuY9dd0lJYJMX2KsNULk X-Received: by 2002:a17:906:7750:: with SMTP id o16mr32725731ejn.224.1574142149013; Mon, 18 Nov 2019 21:42:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142149; cv=none; d=google.com; s=arc-20160816; b=hBvJt/AWNcxBFTCVsQtA1LUddPzDM7oEMxP4hxguNlYFAWY8tss6IIhGz92xYBWg6U WbX2J4jpCle5HW/mIiuDqXJbF90EWsB9fD5zF3+A0kScaoJ6px4jyLen+bcy7dHC/NSS Hcc8sNudUOPZ1edWhk47IRB9oWPfRCGNX10u0xFRgrc9rFO+sDGTSR6T7TzpFrZzbVVs 9iZWRWAUvLGcEGR9jsQ0orRXEg8+KWjAPg+YZvHBecGQY0J5Aw4f27NTwiOPAAK9aiLm PLQV2ZPcXAlaz5dZZNDNn3pcmhnydbH3J/pK8AgDAuug2RjDcx2nFfIIHsKvwNloEgXQ EJUw== 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=12xLvnVwNVsksRX9Eug65HJX9vjKa+1gOsHBMAp7JZs=; b=FQkaYdpUNl/wPxkamFo76zZWLK43zPDy7KEOGfuGvnkF9V/flB0Zht69BlpPj1yIe0 zjW6WbleXN3tg7ID9IvN6CbkJwJ6rqoCtlezKdDHeTWGVHpPjfJS7r9u0ynYPtQAe6cp FfkiWEnM1yrYCl88e8G181FAz1p8hYATcTH7i+nMBbPkz1RRsanRsfo68amcd4xqCPbU MGGz2mH6VhZxhV2LzW8lOaoI/DrcXcv9QMyRWRpOAxjLKLk0B0pGoIWxEbEIeA09+UCv PxzQYMTDwDXgvpZyWOBXLrh7lLhaQE4Jq0HJ3QpRUqdIU8Xbvji1VVS99fjnJTuG2hMm IlzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WMikNVdh; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o14si13970210edt.219.2019.11.18.21.42.28; Mon, 18 Nov 2019 21:42:29 -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=WMikNVdh; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730636AbfKSFm1 (ORCPT + 26 others); Tue, 19 Nov 2019 00:42:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:37130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729307AbfKSFmY (ORCPT ); Tue, 19 Nov 2019 00:42:24 -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 CF00121939; Tue, 19 Nov 2019 05:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142144; bh=X7NG4wmYTuoVYks3yIU/4gmZJ3ruY5WnIP5G6l/juW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WMikNVdhCpzDoNLDwRl6OdFN8aRs6bz4EYYfFVgDoFN+Y5dUgvwNDS7FfT43CnU+1 MSYKdflRiN461SuIQhj+/5AkiQu91EK0Qx3UKp+iY/gGZ7FihamuyCh/D+QwItb9k+ +j0s+5wYXtdcYN2atrLN3wrx5xw7TiCJpJNjAeuI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.19 353/422] slimbus: ngd: return proper error code instead of zero Date: Tue, 19 Nov 2019 06:19:10 +0100 Message-Id: <20191119051421.892624663@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 9652e6aa62a1836494ebb8dbd402587c083b568c ] It looks like there is a typo in probe return. Fix it. Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/qcom-ngd-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index a9abde2f4088b..e587be9064e74 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1393,7 +1393,7 @@ wq_err: if (ctrl->mwq) destroy_workqueue(ctrl->mwq); - return 0; + return ret; } static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) From patchwork Tue Nov 19 05:19:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179677 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp161052ilf; Mon, 18 Nov 2019 21:40:34 -0800 (PST) X-Google-Smtp-Source: APXvYqyXNK4F9A/DnD6VP/aDf3+WsHsCMVK1KOcnf1m904waJ0raPzf6KsxjkO3yXYWYiUpo65An X-Received: by 2002:a17:906:90b:: with SMTP id i11mr18392450ejd.109.1574142029250; Mon, 18 Nov 2019 21:40:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142029; cv=none; d=google.com; s=arc-20160816; b=PPB19AOJ0ZjnHDgzxlUKtZbjXq9c9rE9j7eiXoxA2Q0aNLECwIJSDs+A9UlgBof3pc Sc+m51oBQSMa/f6PktA41QTTItWcbAZpBd6m1GA6azifw9bD9RqHHdGyM58cp1KHwLSJ SFjm/N1HGlDeT0QDiG8/U/4+/7HmixksL5Cy1AGA+vuo09dUyHqd7PmU8T+FhVon1c0/ SCPKt3pcPI056j62UrfoOfPB55xnQ3vFCi1suTZCrp8qRXubB8fxh019YiYHz1HdvoxK XerxROMxGU4d1xesfIgOBI6Pc7fcJ09Fe9frfk/0ZKJcDepLFHD5oZ4tDXcZGkf1jlbx MXmQ== 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=O28kOt5fEkxaqVnD5AqAXZhw21kB5vR1b/c4w2qqKWY=; b=Gdn3pHR4hY8Uzd4BMHbv6QcoCnZX4xX3VXXfJvLLDH9k8yPfD3b8W5myganADwIi7M 2mrZuQjRMq71fxQOlakKM6idUs7MRh2yWK/duGoDlqPrWUWXUcDkkntArMCnviuglDrQ QLNj0K4om9haxNomQc1w72zLdCqOa9WcLqK6Z0Id0yCdaKt412S4W7h+z0VWi0yRVBss 3taykbL54QhNBl2/asIUY57bobN+20R8HAa2zIt6j1ZZ2HKZEgwZ0v0Ds45nny5LJbyk 0qwiMbNsTFI2z9uXvgR3U4IjdCCtcEJFcPNiiHRyFhCv4ncv5k8Qf5mZk6xRX88+eDp8 a8ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bGjgvlP0; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f6si15397733edl.442.2019.11.18.21.40.28; Mon, 18 Nov 2019 21:40:29 -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=bGjgvlP0; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730401AbfKSFk0 (ORCPT + 26 others); Tue, 19 Nov 2019 00:40:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:34562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730393AbfKSFkX (ORCPT ); Tue, 19 Nov 2019 00:40:23 -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 815ED21783; Tue, 19 Nov 2019 05:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142022; bh=oNMpK4uCT6FqDAbQaOrbyYV5qSgpW9C8QAqC4iyX9LQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bGjgvlP0caNDgRTbOwhp6a6Ejz0BDtwAslkdAAzFd7AR3Kq2czry2CVk8EiNkUSB9 /9M/f5FbvXv57jsMzNy6t3cO++BjB9hPhWFsECXPWssU/xDiKJo3nYCPbXDux2k4ZO IJ+Tk9ttcc4A6ebVznivXhepU6tri2snFh+SyfVs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.19 354/422] silmbus: ngd: register controller after power up. Date: Tue, 19 Nov 2019 06:19:11 +0100 Message-Id: <20191119051421.958702318@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 94fe5f2b45c4108885e4b71f6b181068632ec904 ] Register slimbus controller only after finishing powerup sequnce so that we do not endup in situation where core starts sending transactions before the controller is ready. Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/qcom-ngd-ctrl.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index e587be9064e74..d72f8eed2e8b7 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1234,8 +1234,17 @@ static int qcom_slim_ngd_enable(struct qcom_slim_ngd_ctrl *ctrl, bool enable) pm_runtime_resume(ctrl->dev); pm_runtime_mark_last_busy(ctrl->dev); pm_runtime_put(ctrl->dev); + + ret = slim_register_controller(&ctrl->ctrl); + if (ret) { + dev_err(ctrl->dev, "error adding slim controller\n"); + return ret; + } + + dev_info(ctrl->dev, "SLIM controller Registered\n"); } else { qcom_slim_qmi_exit(ctrl); + slim_unregister_controller(&ctrl->ctrl); } return 0; @@ -1360,11 +1369,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) int ret; ctrl->ctrl.dev = dev; - ret = slim_register_controller(&ctrl->ctrl); - if (ret) { - dev_err(dev, "error adding slim controller\n"); - return ret; - } pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND); @@ -1374,7 +1378,7 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) ret = qcom_slim_ngd_qmi_svc_event_init(ctrl); if (ret) { dev_err(&pdev->dev, "QMI service registration failed:%d", ret); - goto err; + return ret; } INIT_WORK(&ctrl->m_work, qcom_slim_ngd_master_worker); @@ -1386,8 +1390,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) } return 0; -err: - slim_unregister_controller(&ctrl->ctrl); wq_err: qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); if (ctrl->mwq) @@ -1460,7 +1462,7 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev) struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev); pm_runtime_disable(&pdev->dev); - slim_unregister_controller(&ctrl->ctrl); + qcom_slim_ngd_enable(ctrl, false); qcom_slim_ngd_exit_dma(ctrl); qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); if (ctrl->mwq) From patchwork Tue Nov 19 05:19:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179683 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp163393ilf; Mon, 18 Nov 2019 21:43:18 -0800 (PST) X-Google-Smtp-Source: APXvYqyJuKrAFOHrbICC6w4jFnGak+O6jOxTx/bNe5a5/7XMUWKwArR6XrX1AoM84dOAGMNh2HJE X-Received: by 2002:a17:906:2518:: with SMTP id i24mr32676867ejb.4.1574142037267; Mon, 18 Nov 2019 21:40:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142037; cv=none; d=google.com; s=arc-20160816; b=XyoEwwT5cEeV23pv4iAIgZ2DtmU4bUepyz+XKjmoSaGEN/xi0ziz53tuRzj0X4HKJT 5WLu6Dhx2IYKWNYRWh3IuVf4XTG6TAF/gDG9J+OzBZD9QmySQP+NnHFuSxnCUs7lw2p4 wa1hEz3irn4JvCTIjO/OYlN4FhWbfyTjfe42FDlDXXz/VHfdIpinnXfhLVcgwgBJCRJY VzTagH9KPh/J/r+h4cnzHlndqfnE50JXSza53LsoMkP5mmBi7zjlEHtZsttJ2/9Z4RJZ q/t+F3gTLvfiMUfwyE8IxlfMBFcxVfZVZXDAZzFDKzDBlYJij0zHKVtj8cov74kCFBCT s78Q== 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=7jdKcE12Fas/xbytKZcOHZPepk0MAjJNBoOqZyvxKpY=; b=D28RyKw//8lALumd280oLI+/a+4IJn/0sKWFw6xJYnXCGpUqS9SUl1olw/R5EhyViR soLm7kw0Lq308V7F9YsMcB697N6RvzorRMr6YS0hDQH/dbTVkHk0DJ5yEaf8Y+tYU9d1 +N5ev/Rhbz5b6IGev/2TFNCzLeSYb9iJXBor0JRWmoOsjBvrszTg7XESvd7FvP+fr1Va 14jDhUjxE6OxxNdkcDTSTe5s9KNAGrPLPGCUrbbakIfLnZmXL4Tm8NQTOOLSS89Z8A52 gVBn+fo/VK/hVgrJ8kn7Zh5gsN/u/SZDxAJbcfpIwZVwYN3Bi0BHr7szhr9rSSjmZUa8 4+EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="jgxMuX/6"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n4si13649967edy.53.2019.11.18.21.40.36; Mon, 18 Nov 2019 21:40:37 -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="jgxMuX/6"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730422AbfKSFkf (ORCPT + 26 others); Tue, 19 Nov 2019 00:40:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:34712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729961AbfKSFkb (ORCPT ); Tue, 19 Nov 2019 00:40:31 -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 A7D39218BA; Tue, 19 Nov 2019 05:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142030; bh=ruwTrmd0clXQGGZZmo8V50xrv053nKh84sC0o73hv7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jgxMuX/6s0zSoSwL9FpFHwVb+RaL6n+eIDpt6Dqm4vv77QoQXRBGVBlepfMpJastP 8Huj+LrqA4uJNgk2D3X4zODSbyOMWLKC2VTVYfbOrFN+ybXY96R5DB3eLEHCM3/2FM hk0N6AdnBe9nzYxiQQwVW9saLCxenT6rRRPBlTPo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo , Li Yang , Rob Herring , Sasha Levin Subject: [PATCH 4.19 365/422] arm64: dts: fsl: Fix I2C and SPI bus warnings Date: Tue, 19 Nov 2019 06:19:22 +0100 Message-Id: <20191119051422.667755226@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit b739c177e1aeab532f355493439a1901b85be38c ] dtc has new checks for I2C and SPI buses. Fix the SPI bus node names and warnings in unit-addresses. arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@57: I2C bus unit address format error, expected "53" arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: Warning (i2c_bus_reg): /soc/i2c@2180000/eeprom@56: I2C bus unit address format error, expected "52" Cc: Shawn Guo Cc: Li Yang Signed-off-by: Rob Herring Acked-by: Li Yang Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++--- arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 ++-- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 ++-- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi index 68ac78c4564dc..5da732f82fa0c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi @@ -337,7 +337,7 @@ status = "disabled"; }; - dspi: dspi@2100000 { + dspi: spi@2100000 { compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi index 7881e3d81a9ab..b9c0f2de8f12c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -284,7 +284,7 @@ interrupts = <0 43 0x4>; }; - qspi: quadspi@1550000 { + qspi: spi@1550000 { compatible = "fsl,ls1043a-qspi", "fsl,ls1021a-qspi"; #address-cells = <1>; #size-cells = <0>; @@ -382,7 +382,7 @@ ranges = <0x0 0x5 0x00000000 0x8000000>; }; - dspi0: dspi@2100000 { + dspi0: spi@2100000 { compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; @@ -395,7 +395,7 @@ status = "disabled"; }; - dspi1: dspi@2110000 { + dspi1: spi@2110000 { compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts index 440e111651d53..a59b48203688a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts @@ -57,12 +57,12 @@ reg = <0x4c>; }; - eeprom@56 { + eeprom@52 { compatible = "atmel,24c512"; reg = <0x52>; }; - eeprom@57 { + eeprom@53 { compatible = "atmel,24c512"; reg = <0x53>; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi index ef83786b8b905..de6af453a6e16 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -202,7 +202,7 @@ interrupts = ; }; - qspi: quadspi@1550000 { + qspi: spi@1550000 { compatible = "fsl,ls1021a-qspi"; #address-cells = <1>; #size-cells = <0>; @@ -361,7 +361,7 @@ #thermal-sensor-cells = <1>; }; - dspi: dspi@2100000 { + dspi: spi@2100000 { compatible = "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index 8cb78dd996728..ebe0cd4bf2b7e 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -469,7 +469,7 @@ mmu-masters = <&fsl_mc 0x300 0>; }; - dspi: dspi@2100000 { + dspi: spi@2100000 { status = "disabled"; compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi"; #address-cells = <1>; @@ -595,7 +595,7 @@ 3 0 0x5 0x20000000 0x00010000>; }; - qspi: quadspi@20c0000 { + qspi: spi@20c0000 { status = "disabled"; compatible = "fsl,ls2080a-qspi", "fsl,ls1021a-qspi"; #address-cells = <1>; From patchwork Tue Nov 19 05:19:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179678 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp161842ilf; Mon, 18 Nov 2019 21:41:27 -0800 (PST) X-Google-Smtp-Source: APXvYqyWEFyonIGh3p9fmVFmqpW+LtJL2yp0cxDszqosc2QqShd2aEeQDvtNS7GHAFIreBnaLtlI X-Received: by 2002:a17:906:2444:: with SMTP id a4mr29757071ejb.134.1574142086175; Mon, 18 Nov 2019 21:41:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142086; cv=none; d=google.com; s=arc-20160816; b=nU9KU6ggbNQE5d5NeJ1LKVIqhS0EXky9Dk4nKB+ChKZzw4lXb2El/rszLoXyMaOdlB fVxf10eu2nw/xRHVgjJmAOq/niHYYhPwntpZHQL2AepnfA08Cd/RUivf0xTUFqDRN565 9xUG2SSngkhzE34PU0fa9cOwcJ6pgLIXob5PymrsScLRPGMhbr5yHcrCLtPZpF9F4+Ha PsbX0yc/AaTOi4LyPiNfuFWDW/0HOi4J6VsDJ8ktN8XLfKIK1gUMwVgK1CZWqg4Kk5r7 DoMYRE1RCzfzrkq+CoCUTZBFlEwfxTcQvBceEmRxoQo4+TrK8aRpetbbzzw08Lsf5k19 KL3A== 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=VxQOjCc9NbghQ+SDlIN+YO13bay1VQlrNhDaIbGuA0E=; b=f3VFyno8+jumfQKBnNGM/sPzTKg0Ff7uuuBYq5kp32L9OyLK48qrd0pWVN8+Ung1TN tirJZFpaMzx1mb08rMF+2UyypMNXi55gNb2/L2zEnDuaRjhzRQgCY376WYfWabJH5qkL YU9N5NW4dEiuhhrMmnRE7he2H1rJUfe132ljJV7yzINfixzmcUk1p0rErVEZzlogfeiA hDYd3z3KulqUR37KL4A4aDbwNWowBOW87bXa/8FRX5BbtlodoNefRht5OMAWy9eEUO8w a8mBA+J5zlYbKPTs7U3aKDTfl81eDcnYogHL0tdt85Yvaa9Kok6SOQTZW111nHQrDPBb Twpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XuL6+aSW; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c25si13487228eja.24.2019.11.18.21.41.24; Mon, 18 Nov 2019 21:41:26 -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=XuL6+aSW; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730517AbfKSFlV (ORCPT + 26 others); Tue, 19 Nov 2019 00:41:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:35712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729946AbfKSFlR (ORCPT ); Tue, 19 Nov 2019 00:41:17 -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 6285821783; Tue, 19 Nov 2019 05:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142076; bh=xscJ7EClHwitBaxZMa5jBEldDG3fG8cJaiC13LZuq10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XuL6+aSW1++/cMN4rn0S8rVfX9G77aay8qLXKGcnWdqqzh9tv/KMN73zjHxaZuUl8 +41qiEzIBd/L49IUvQIx/77B4VLJqC160fhKWi+TmSOYFwmLrUIhADMm0c6RVu7jeG uu2m5ICPoU4bc8hk9LDQwYWWFWzgW1phjuiF+4x4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.19 380/422] RDMA: Fix dependencies for rdma_user_mmap_io Date: Tue, 19 Nov 2019 06:19:37 +0100 Message-Id: <20191119051423.687303372@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 46bdf777685677c1cc6b3da9220aace9da690731 ] The mlx4 driver produces a link error when it is configured as built-in while CONFIG_INFINIBAND_USER_ACCESS is set to =m: drivers/infiniband/hw/mlx4/main.o: In function `mlx4_ib_mmap': main.c:(.text+0x1af4): undefined reference to `rdma_user_mmap_io' The same function is called from mlx5, which already has a dependency to ensure we can call it, and from hns, which appears to suffer from the same problem. This adds the same dependency that mlx5 uses to the other two. Fixes: 6745d356ab39 ("RDMA/hns: Use rdma_user_mmap_io") Fixes: c282da4109e4 ("RDMA/mlx4: Use rdma_user_mmap_io") Signed-off-by: Arnd Bergmann Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hns/Kconfig | 1 + drivers/infiniband/hw/mlx4/Kconfig | 1 + 2 files changed, 2 insertions(+) -- 2.20.1 diff --git a/drivers/infiniband/hw/hns/Kconfig b/drivers/infiniband/hw/hns/Kconfig index fddb5fdf92de8..21c2100b2ea98 100644 --- a/drivers/infiniband/hw/hns/Kconfig +++ b/drivers/infiniband/hw/hns/Kconfig @@ -1,6 +1,7 @@ config INFINIBAND_HNS tristate "HNS RoCE Driver" depends on NET_VENDOR_HISILICON + depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS depends on ARM64 || (COMPILE_TEST && 64BIT) ---help--- This is a RoCE/RDMA driver for the Hisilicon RoCE engine. The engine diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig index db4aa13ebae0c..d1de3285fd885 100644 --- a/drivers/infiniband/hw/mlx4/Kconfig +++ b/drivers/infiniband/hw/mlx4/Kconfig @@ -1,6 +1,7 @@ config MLX4_INFINIBAND tristate "Mellanox ConnectX HCA support" depends on NETDEVICES && ETHERNET && PCI && INET + depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS depends on MAY_USE_DEVLINK select NET_VENDOR_MELLANOX select MLX4_CORE From patchwork Tue Nov 19 05:19:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179720 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp180547ilf; Mon, 18 Nov 2019 22:02:51 -0800 (PST) X-Google-Smtp-Source: APXvYqz7EhAaxNjk2/MWAQcCI4O2ArzNVwa3y8VkOk5CKRL2JOS7moCj6MvvYQzxkBf9g1KVxnqh X-Received: by 2002:a5d:61c6:: with SMTP id q6mr3807998wrv.13.1574143371089; Mon, 18 Nov 2019 22:02:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143371; cv=none; d=google.com; s=arc-20160816; b=dJ0Ffs6/9w+2roCPXBUTmwKetSOQktKwIXROmczm0nNspTcyMF4AiCCIy7DdUMEVLP HiByNIrqlwbXqFGD1kIvLzpIeYyqSKDFpuIq5NigBVvJBG6llBPBnpLsxcf+nuzmxc30 25xXd1rztTHSsWJ2OndHpmwLLni/KW/nygwKVjyl302bSiiLAD4nfFbx8M03Y8ohXXmp ngLmxn7I10hUsSKEtHNno+m5kRaU1eseUZkKYyNrAbleV3/No+nlzkoH9SEihpONNslI mMHDZr78VK2TcaSoN0utpRZl8ghHUeaB+Ba38p89zPbsqiqDYI0adWqMle0LN8UvJyKG 8a7Q== 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=1qse+gydN0hbRi1n8c8Tahd1P+B79AxayQwntiHKktI=; b=f+XqQSsusgpY4ODD7w5mfZAz+g3IKFwQQUFyTUU2iWRP/ySTQa+loW9YxelDvVeQvJ yFy3au1cp2vG0FeTyg6GGjnjMztokPfHTpBihrNkz0samIRCxBlDnMT+0Kb5N/kd4hZa 43QA6mRZab7FD+mVQEbsFJYmednvJVo4PVIciaURFgxKiKTNTGcbQwiNyZChWZ4E/IC0 kx83gTPP9kpPOlurA/Z5/S9nwoslrPknMlM92SO7Aj1cKPYmMwOgtX4vZGHRWUYxWkmr cgkmn9udmS01h59iErTKJ9xPq8g5tRkta6tImkWlDAPoE0U4xX8Q02PnKhh8/ybLQPCY p50g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=n2f3A6cw; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d47si16512922ede.139.2019.11.18.22.02.50; Mon, 18 Nov 2019 22:02:51 -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=n2f3A6cw; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730531AbfKSFl1 (ORCPT + 26 others); Tue, 19 Nov 2019 00:41:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:35838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730504AbfKSFlY (ORCPT ); Tue, 19 Nov 2019 00:41:24 -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 5A185208C3; Tue, 19 Nov 2019 05:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142082; bh=LC0TPsH+HUPj01rsBWyN/9j4+EIjXpxXbLbHZ65ebpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n2f3A6cwGfsve74b0gvZdhFdPjru8hCYMSqhWqeBD0YWm22Gc2WtiQg0IuaC5xAcT e1m4CNMoZYAxkoXAuwn9KrqcignzLErv2iNb+4ag1lR3rxP0yvM71tEIJx27roiODF Pu+L15fFkrKhFYAO4rYjsKS6LRnjK9VRtzdcIWrw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Rob Herring , Sasha Levin Subject: [PATCH 4.19 382/422] ARM: dts: realview: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:19:39 +0100 Message-Id: <20191119051423.821026860@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 016add12977bcc30f77d7e48fc9a3a024cb46645 ] SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks. Cc: Linus Walleij Signed-off-by: Rob Herring Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +- arch/arm/boot/dts/versatile-ab.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/arm-realview-eb.dtsi b/arch/arm/boot/dts/arm-realview-eb.dtsi index a917cf8825ca8..0e4c7c4c8c093 100644 --- a/arch/arm/boot/dts/arm-realview-eb.dtsi +++ b/arch/arm/boot/dts/arm-realview-eb.dtsi @@ -371,7 +371,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp: ssp@1000d000 { + ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>; diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts index f935b72d3d964..f2a1d25eb6cf3 100644 --- a/arch/arm/boot/dts/arm-realview-pb1176.dts +++ b/arch/arm/boot/dts/arm-realview-pb1176.dts @@ -380,7 +380,7 @@ clock-names = "apb_pclk"; }; - pb1176_ssp: ssp@1010b000 { + pb1176_ssp: spi@1010b000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1010b000 0x1000>; interrupt-parent = <&intc_dc1176>; diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts index 36203288de426..7f9cbdf33a510 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -523,7 +523,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp@1000d000 { + spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; interrupt-parent = <&intc_pb11mp>; diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi index 10868ba3277f5..a5676697ff3b7 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -362,7 +362,7 @@ clock-names = "uartclk", "apb_pclk"; }; - ssp: ssp@1000d000 { + ssp: spi@1000d000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x1000d000 0x1000>; clocks = <&sspclk>, <&pclk>; diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts index 5f61d36090270..6f4f60ba5429c 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -373,7 +373,7 @@ clock-names = "apb_pclk"; }; - ssp@101f4000 { + spi@101f4000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x101f4000 0x1000>; interrupts = <11>; From patchwork Tue Nov 19 05:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179719 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp180021ilf; Mon, 18 Nov 2019 22:02:26 -0800 (PST) X-Google-Smtp-Source: APXvYqx8Ifb7fLqULmBXfC99G69MGuGFt/6uTL6XjG2b5G+2qQqostz8Dbofiwhgucqb0017y2b7 X-Received: by 2002:a5d:4982:: with SMTP id r2mr20050964wrq.254.1574143346033; Mon, 18 Nov 2019 22:02:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143346; cv=none; d=google.com; s=arc-20160816; b=TceMObtqqDs+vE95bNxn1tzy8tohT+PBs/ARUMnLe6KBXSgOsFUILxyqZG/hyXuLVK hfrH/C6fiBE1YU1yw5a2MwqJ1/xvW2QlBzEEEhsHceeVTTN3S7TKsXAmyRqgi7pSmynA K+RMEtzoIWH0aTnzkSM0j+o5pPo8ooJeUutabD6d7WNu6dlXj0xpXj1fBFniE1zIsU0h W+3/N4qOXb0HmFgsRYYCz9G6JSYBzjIbOoxlvOYUvGtP74rDVM5Nr1NNohgACMVJ58cS 6Q0U1/3lWo8FL0P7447nu1/LtmQQYlpZQIvkHpAAXUSkHpFZtquw6/HWiv1TgKLDfb77 hGXg== 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=PLqgMb+kDJHFCdjO9ZoNM5E/Q0nkhvcjjzQAY3LOQw0=; b=l71xtdLBdBphHMdQeBb5Qp+QUyVKyGlIrNcp1QsIqUjLK2L6OakmkR/arRUzP+ZDbU 7wt/+dEFswC/1wfRfgVdbwJ1zLHscfDNFkWAr26bBVIx4fUr8EwV/gazmdINmxWCBkPT 8CdJGgqOyugmeae6ECfFLgA+Xc8J3GzQekLTT1RO5GsHQaqlLepNysgLGG/V/q4IHzIh qPGswNRuo4rNJRyGI6uIfYKgwm9WGOKA9P855K9OBCJZPC6vQ9KdBOlDFU8s3Q7/JXjM qDyx545MlWU9SuFtt7bGk3Um+j8Gwdr1+001cPfTBgzuu8n0Mc2j7Xp51Kk/7YPyq876 W1hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iqBQTLo4; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o28si15086655edc.353.2019.11.18.22.02.24; Mon, 18 Nov 2019 22:02:26 -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=iqBQTLo4; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729367AbfKSGCW (ORCPT + 26 others); Tue, 19 Nov 2019 01:02:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:37356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730647AbfKSFmf (ORCPT ); Tue, 19 Nov 2019 00:42:35 -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 3BA9021783; Tue, 19 Nov 2019 05:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142154; bh=kiO9wqUjASzmMINbaT3sESNlTQfAAWLNzXtu9pP1MHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iqBQTLo46YZdLd2+a1oeU5S/BnHkNJ/fDiVgcHkWwzlP54lyg4kIQ1sGkBfGGLKjo fNKuGIN6esr+b0r9v0nYeVzPXEI7voWv9a1+1FZKTDG9yyiE7ldYqStUrwROkjpl39 1LBC2QljR5KG+aH5iDysovAFtW2pjDGVycTWTftI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brijesh Singh , Suravee Suthikulpanit , Tom Lendacky , Rob Herring , Arnd Bergmann , Sasha Levin Subject: [PATCH 4.19 408/422] arm64: dts: amd: Fix SPI bus warnings Date: Tue, 19 Nov 2019 06:20:05 +0100 Message-Id: <20191119051425.623376535@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit e9f0878c4b2004ac19581274c1ae4c61ae3ca70e ] dtc has new checks for SPI buses. Fix the warnings in node names. arch/arm64/boot/dts/amd/amd-overdrive.dtb: Warning (spi_bus_bridge): /smb/ssp@e1030000: node name for SPI buses should be 'spi' arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dtb: Warning (spi_bus_bridge): /smb/ssp@e1030000: node name for SPI buses should be 'spi' arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dtb: Warning (spi_bus_bridge): /smb/ssp@e1030000: node name for SPI buses should be 'spi' Cc: Brijesh Singh Cc: Suravee Suthikulpanit Cc: Tom Lendacky Signed-off-by: Rob Herring Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi index 125f4deb52fe9..b664e7af74eb3 100644 --- a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi +++ b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi @@ -107,7 +107,7 @@ clock-names = "uartclk", "apb_pclk"; }; - spi0: ssp@e1020000 { + spi0: spi@e1020000 { status = "disabled"; compatible = "arm,pl022", "arm,primecell"; reg = <0 0xe1020000 0 0x1000>; @@ -117,7 +117,7 @@ clock-names = "apb_pclk"; }; - spi1: ssp@e1030000 { + spi1: spi@e1030000 { status = "disabled"; compatible = "arm,pl022", "arm,primecell"; reg = <0 0xe1030000 0 0x1000>; From patchwork Tue Nov 19 05:20:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179680 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp162975ilf; Mon, 18 Nov 2019 21:42:45 -0800 (PST) X-Google-Smtp-Source: APXvYqyuCbiDuqBTC9FaWon7rRmtOf4HQe5m3nrqTipzaO7bMg042LUHydnAQFG2EmUZGMCu99tW X-Received: by 2002:a17:906:258a:: with SMTP id m10mr11017978ejb.304.1574142165203; Mon, 18 Nov 2019 21:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142165; cv=none; d=google.com; s=arc-20160816; b=E0fdM68BgR1bDlZZvZnfDYgB4XcGFC7uBqk7Xr3iezOYjFhuDGlUEFHJyMvz8RZCkh FQmn615UbatWMzeHCUmf57YYlJJpfsVSdItkRuh7ABuBGLMPECgjGEHVkkukK6UhApLw 9xd5GKlnM/WZJTGbCXR226mDYHbkGXmJEFaoEZDKFkGxUlNh0PGqL79qQ3tV06UhBPlB IF5UkVXM8H7sJS3YrIF9Q03+zEPfYqlaxAOqd1YKblFFZechw/1kiThggsrpUTeFZB66 VSk2qdvCmkTHTVULKKsgGHQT1Uw6XXXNkdn9ked8fJNZU65XzHluTpQfxEJf2PavPgl4 K3Tw== 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=XOx8VMMaJhgfLgWfQS17CWIDGnnsh5tNXbIeKLx0sCnRs2+6MumlC9qBAncos5CQ1o DkG/gSeoSH8HwAFAEBY5mIekddpP/CB6DRvSq1zdM0eRp1FmabFyQTqirEqYmqm2E3Sz GpRc/Z2Fk6ICcDy8FKM2z/2Obh+dN95+29XeRon+nuc+kbdqw/xYBBO30RvWrBE3OyrN 6G9Rf71ZZD95mR7aeI/MHidb4zd9zFgyq/l+eVU/2eLnQORrVIdM4AyGTtQM4gvXL5FH WGz5Xx1Ug5Jk9G4eFxCi3W4wdFy+8+gPmG5idOlch+nfalra9VaslDssQLjbZqhWChyY DypA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=auywH5jV; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ob19si13920887ejb.56.2019.11.18.21.42.44; Mon, 18 Nov 2019 21:42:45 -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=auywH5jV; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730231AbfKSFml (ORCPT + 26 others); Tue, 19 Nov 2019 00:42:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:37386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728116AbfKSFmi (ORCPT ); Tue, 19 Nov 2019 00:42: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 E0B64218BA; Tue, 19 Nov 2019 05:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142157; bh=s+qDWJiCsCOtUONRrtoz3ETIwaa58Xm2dheg+889mKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=auywH5jV5F1vUqvXi/06Rd17RbtEzmwdfrOVDrFg6F27tPkCXk4l7gipTzpz5efUQ 7dGLpMkx5uBeEqs5pnYMzXIulaKQzX96j+0zHYaCPRqq3HXpQ+n7JdgQP9cuEpTPAC mNPM8VEdRXDcEl2QrTVZtiOdjuRZnBcYn4DhR61A= 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.19 409/422] arm64: dts: lg: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:20:06 +0100 Message-Id: <20191119051425.689282584@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179681 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp163004ilf; Mon, 18 Nov 2019 21:42:48 -0800 (PST) X-Google-Smtp-Source: APXvYqz0GAsmG3T740sugZzL5iRKB/FkNm6bcRpvDzSlxJZXGJRP+0U/qAXH09Ogbg0IOCbF1tFx X-Received: by 2002:a17:906:d96e:: with SMTP id rp14mr31750767ejb.14.1574142168021; Mon, 18 Nov 2019 21:42:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142168; cv=none; d=google.com; s=arc-20160816; b=LxOzpn7eRCskrUyiQDSAhx2aUOLL56TH2qplG21MIkegxUpV+nMRuGlD0JIHDi+x0L glwSX4U17Li0JMLaKSicOjt2EbE6zfg4ue3rSK9HV9vhXOZF1OmG9EB8er0Gr27ITiyF pXcElj75S52oLVkxvqN7Gw/ZTLwUayMTcQ+i5nH3f3Xg3kFJeE4T2kUK23/ICyWl0heZ W7lGRdLeK8mQtUmEZPgWU22msBIyYz67FoNF5KLTA5bEfLi+dsGDb4jva9DsrXrA856M XkyUWbzpO6SKrwucuYgh7Xcbm63V2Ag7h5Afd6rDx2rSgNfAzkI+rchIHJ+s0d8zK1L0 qJ9A== 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=ErcGWfokqrJTouwg0cYvyG9LC3vcU0DL5OIu+GSVTeM=; b=qiH3dMTy7+8eIPC+CLu4g7pOBhWEigwsg7esKNT+Prj0ldw9NUZbK3vyg4yVU5bc6W 0LMup7GlTXtMCyIk6asavBMup1RVltQL8jCf6/FiFDv5yFIXZhDSMzhbYwzpspzeWZ+t dPRVAK4suuCKHwri9xmz9a7xg+vgVAdTgxXu+FAhpX5FutctE49Ef47ceJiiVgRyr0c3 ql/qBAALAnUvnP+RYsxuxMj858hPVI78ATMRLrl3QpNyhLR51r2+vtHfMJrZbF6/xK8+ d67OAwTkcRCRp8yTiEY0Gm9KnJCHXB9xS74GC1JX2aW5jRboLxV5XS7sx6SLQcwnYiHI kj3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eDfkvn7t; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mj3si12675207ejb.381.2019.11.18.21.42.47; Mon, 18 Nov 2019 21:42:48 -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=eDfkvn7t; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730398AbfKSFmo (ORCPT + 26 others); Tue, 19 Nov 2019 00:42:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:37454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730655AbfKSFml (ORCPT ); Tue, 19 Nov 2019 00:42: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 8901821783; Tue, 19 Nov 2019 05:42:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142160; bh=jIFlpl/wQMGI9GNYRcwXiD1YCvrHp52FADOVP/p53Gc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eDfkvn7tMg0UTCMOUBGKLNYuKViADZVYt8KSH46zHP43oKjNzb8BBbps1E3eTVyWI qNViAonQjA0K2wRM7u2O8c4d5mZ+05Dj6VEm+AHXpY/xvF5ic0lwdzoVzuWGpkts7O iJEQqehy8JA4Byki4yN57fHP5yoALyz8k0mSGnTQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Zapolskiy , Sylvain Lemieux , Rob Herring , Arnd Bergmann , Sasha Levin Subject: [PATCH 4.19 410/422] ARM: dts: lpc32xx: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:20:07 +0100 Message-Id: <20191119051425.756500522@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 11236ef582b8d66290bb3b3710e03ca1d85d8ad8 ] SPI controller nodes should be named 'spi' rather than 'ssp'. Fixing the name enables dtc SPI bus checks. Cc: Vladimir Zapolskiy Cc: Sylvain Lemieux Signed-off-by: Rob Herring Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/boot/dts/lpc32xx.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index 4981741377f3a..ed0d6fb20122a 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi @@ -179,7 +179,7 @@ * ssp0 and spi1 are shared pins; * enable one in your board dts, as needed. */ - ssp0: ssp@20084000 { + ssp0: spi@20084000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x20084000 0x1000>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH>; @@ -199,7 +199,7 @@ * ssp1 and spi2 are shared pins; * enable one in your board dts, as needed. */ - ssp1: ssp@2008c000 { + ssp1: spi@2008c000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x2008c000 0x1000>; interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; From patchwork Tue Nov 19 05:20:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179682 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp163382ilf; Mon, 18 Nov 2019 21:43:17 -0800 (PST) X-Google-Smtp-Source: APXvYqyVQFjIafgAk0VKVXr5bCit3Mw/iXTkighXb13yJj8c1v06RSGDsfI8NTZGESTQrerUiJ1P X-Received: by 2002:a17:906:5959:: with SMTP id g25mr31836267ejr.248.1574142197370; Mon, 18 Nov 2019 21:43:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142197; cv=none; d=google.com; s=arc-20160816; b=uMruDDEvSviifb4EXrVeXKWpzvQd7585fhYNx78rweqKZqR7PygkUeibAEmZ9wHNJx iMj+h2FiNk/2geLyWS5Bh7kThoS2OL35Y9f9YsQGsgAW1ojEPcRDEiXi1spbd0ahAqRQ gPrTLEVlOWG8LN6ozKp1oKtrBNoOxnVpM2SFtM+AGxFPGdHRrw8K42zRc7sBf6n8hMUK ov2+0/chobmxaXZhxD/OZcQHw6oIy9A5qLut5pJSQKoejA8S91IYBMOq5yRvv6/zXNwY j5OMiP6Y3QpXAd4mBPyJz94gR3Lte4U8mYKiz2lNBjGuVfROztV8uh2lcduEImGidmeb n/NA== 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=5UZzJCxXW65XerNjOVYoXWEa9XHMMxhjEVVPcVAPdRk=; b=tLpAQgADYKGUW1j4iXwI7OF9WEIXgHY2CryYHGLmX4k0v1PpObor6C9GIB3l+aju4C uFjaOIWupzsUeuJdwH+SSHntPAJ2RPL7fYNfmW2Ertt7HacxSYDHwt3wmeKxgiIsJnDn DHipUVWx0x1ArGFQ40zUfxBmjHxCY83ybnqCUnNgowDexf+BSLWl/RnGu9h08xNpSiFs u/OG5UKDCxlfJlse811JGRF7q4gWZgIUbtqo3fJ7BTTFSxg3+7/CuuO4VNIVbVCtiQwz FVzdTnoCbKFxz/tYyNiYGKHOaLiUSl2kCCXEZtb5m8pSUpCNbzN5/7GKgjbon4ko5v3c KP+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hrt6b5X5; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i20si14164733edq.275.2019.11.18.21.43.17; Mon, 18 Nov 2019 21:43:17 -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=hrt6b5X5; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730112AbfKSFnO (ORCPT + 26 others); Tue, 19 Nov 2019 00:43:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:37934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730477AbfKSFnJ (ORCPT ); Tue, 19 Nov 2019 00:43:09 -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 D3F6021783; Tue, 19 Nov 2019 05:43:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142188; bh=H7Djb+n3qjxbE2dVJgW6kUOuIo0sOoojYsnEGEwGFNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hrt6b5X5bLf8QEOHXkhqIgWg3gkYInukgtxbShITANVUjqkS6+K1rADunt62MErpB AsPxeXS99ThsXO6McXUEz5nv2DkBJ0FlsGny2FctMditcy/6wfOd3oCCBTsqH0UIL/ Qf8T6zM4KT9bZ/vjTnGtItZSnxrRm04z++N6JciY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rui Miguel Silva , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 419/422] media: ov2680: fix null dereference at power on Date: Tue, 19 Nov 2019 06:20:16 +0100 Message-Id: <20191119051426.345896171@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rui Miguel Silva [ Upstream commit c45fbdf24c61a7b7a37f1b3bbd46f054637a3627 ] Swapping the order between v4l2 subdevice registration and checking chip id in b7a417628abf ("media: ov2680: don't register the v4l2 subdevice before checking chip ID") makes the mode restore to use the sensor controls before they are set, so move the mode restore call to s_power after the handler setup for controls is done. This remove also the need for the error code path in power on function. Fixes: b7a417628abf ("media: ov2680: don't register the v4l2 subdevice before checking chip ID") Signed-off-by: Rui Miguel Silva Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov2680.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c index 3ccd584568fb5..d8798fb714ba8 100644 --- a/drivers/media/i2c/ov2680.c +++ b/drivers/media/i2c/ov2680.c @@ -568,10 +568,6 @@ static int ov2680_power_on(struct ov2680_dev *sensor) if (ret < 0) return ret; - ret = ov2680_mode_restore(sensor); - if (ret < 0) - goto disable; - sensor->is_enabled = true; /* Set clock lane into LP-11 state */ @@ -580,12 +576,6 @@ static int ov2680_power_on(struct ov2680_dev *sensor) ov2680_stream_disable(sensor); return 0; - -disable: - dev_err(dev, "failed to enable sensor: %d\n", ret); - ov2680_power_off(sensor); - - return ret; } static int ov2680_s_power(struct v4l2_subdev *sd, int on) @@ -606,6 +596,8 @@ static int ov2680_s_power(struct v4l2_subdev *sd, int on) ret = v4l2_ctrl_handler_setup(&sensor->ctrls.handler); if (ret < 0) return ret; + + ret = ov2680_mode_restore(sensor); } return ret; From patchwork Tue Nov 19 05:20:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 179684 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp163512ilf; Mon, 18 Nov 2019 21:43:27 -0800 (PST) X-Google-Smtp-Source: APXvYqxI17F1YuWs0qAGzvxJVWm05CzmBIp1a2NVopRJ63L7MmtdwkbDLldJVINzofNgA//kzN9c X-Received: by 2002:a17:906:7399:: with SMTP id f25mr33027139ejl.176.1574142207259; Mon, 18 Nov 2019 21:43:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142207; cv=none; d=google.com; s=arc-20160816; b=i0DFwVWCpxRJW/ckEszJC6Qnoo5OAN9bJHLymmpX7HveC58BMpfSrL+XOOZ+AUWxfZ OWDewpXzSP+JNxsO3bcV4n8WClwVYy2O2lR/k1JCeBhnfmLGLq22+/cKbBtZxfLdQ4Uq Q7YpDPBC2ZOCZr9fV2LcFQ5uOOwKJn3bCgVwdgQDPsmGR60LgY6Z0ITMy8DsDfGihfdE rohUVNTMg3SiwxDVIMX6a0vfNyEh9JjWsNqQ312aVCsdTtBpMfYJR2RqcD5jUxfFyzTP CNmr91k/uzt6rT/yodQuhnVFbCdlmbmP70UtgeoUc41WvgtYDpRYB6orT6IvrJ8by0tW dnNA== 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=Ob+xOl7b5fFfdh/XARmdtEl1nRaUrgwdrgCt/SOukjs=; b=wbWFozlRCAe2ut2AUXpfwUOvLarN7y7ecbMyCOLcYxHsIEllL9hmoOC5Og+A8aFTtM BpIQqVmR/SLEwvootlDde/CWpvCmzQTLioB6DuSqmUuzzK6ItBu+UejzFhUExYPCM4jU P5HaCnUBbHwObr01U/muq024qHDBMZEqbjBRiAQ0BHXYP6Oey1Uy9OVowNfC8NvweDuP dN5451xpox3ZBJKxpQsfLq2B1beVI4+mKHB9f7gcnhqnGrU/iJWgCBnhhJTqBAR0XD2Q Bah62CxDOZPNwthL1wIEBqefZuKitVGSC5XodazTjN/LuB1SXnUsbxT/amdDkEMuI3Ue Qlrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JLyXBPpp; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rv7si185345ejb.378.2019.11.18.21.43.27; Mon, 18 Nov 2019 21:43:27 -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=JLyXBPpp; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730735AbfKSFnX (ORCPT + 26 others); Tue, 19 Nov 2019 00:43:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:38104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730707AbfKSFnO (ORCPT ); Tue, 19 Nov 2019 00:43:14 -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 B759B21783; Tue, 19 Nov 2019 05:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142194; bh=YoOdhLDsccXJu821EOv0qP752hFVRTq/feQk1vt7ELE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JLyXBPpp0QSE4BAJQY+Ya+frIKK+qy4JRgaUj4kblayiX1ycykXSLIAy0MiYIukEV uQDucJ7wjHSL4pdjlNrQVNG+FdKqbQ/plEJGtWrN8CkRAGbGxgayaCwT57e2vkjY+D X5fv2OWVrlQlko10baWZw9s2sLol4lo/Otl73L4w= 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.19 421/422] net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused Date: Tue, 19 Nov 2019 06:20:18 +0100 Message-Id: <20191119051426.475173994@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 80b9583eaa952..df75efa96a7d9 100644 --- a/drivers/net/phy/mdio-bcm-unimac.c +++ b/drivers/net/phy/mdio-bcm-unimac.c @@ -318,7 +318,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); @@ -327,7 +327,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;