From patchwork Tue Nov 19 05:17:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179685 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp164703ilf; Mon, 18 Nov 2019 21:44:52 -0800 (PST) X-Google-Smtp-Source: APXvYqzreLzPeJN8Eq+Vz58D9zMDrgT5aoTC78lV2Edu72otkmdd2BVCz9Z6LgFAAUPG3q4p6zfh X-Received: by 2002:a17:906:4bd7:: with SMTP id x23mr32064535ejv.245.1574142292003; Mon, 18 Nov 2019 21:44:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142291; cv=none; d=google.com; s=arc-20160816; b=utv+WVHoW0CfQPLSFBBHlQL94lSoxUMzEWFvwImGidHGe+EX5DYb4TiX5iAMtlccUy 0Sw7bQJaKWb9PmkT+o2u0SgZGn5loB/nNs1YkLSppKVcvXtC+eMp02wQvO67Snze0nez 1+2PbCkNzJ+1puq8irohQqo/mCBdwz9gG4fxuBrR9zeqBAehyKWLjQIOf0F/SlVlhb4y 6rig2PeY3FfWbALUac9cRB2RmUnFZjsm2rWV4uflfkLey4jPkA5nqcUaibG634MVtOM6 GuwEM5qcO4qt8moe2lnke8sE8+ncp+rBRNwEdDFtLMyWHDsuwy47KCsmLpJxpugy2djy yY3w== 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=rIhR2GAPwdNywvGH3b6KXy9wlRyQMmT0MAsWA5oNoUk=; b=UZ7+3UKuPRCcTsU8ltKUU/ErW9sweWV7JR17OmCkMT1gIdxsSM+NgWHfoKDkelWvNk zfvX7G85uzEsFTEw+v3rsT3t5iBCLzTTmAwAqPPktB8GXScQushANPdsRH1ObmLjAdgk jQ4Yg3JD9+f/Jqzeb2b9xnHz3aiXhDWErneE6YKOlnwbnmJ5+qoj4R42wznLPgcS7Pwx JzgCN2QpxmLoHilyjrV/PqFRHRYqTEa+w9dYxKj7cMy9/FHGBeeCVJlEFgmtcoBDm8V5 GikYCk6l12FncuQcJZO78zYSv1IKzgygxcA3IAEjYzZf4mmQLKaCz8Q2YICPs9tnuczz fDPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=N+xDokeP; 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 r1si14062435edm.57.2019.11.18.21.44.51; Mon, 18 Nov 2019 21:44: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=N+xDokeP; 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 S1730885AbfKSFos (ORCPT + 26 others); Tue, 19 Nov 2019 00:44:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:40218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730389AbfKSFop (ORCPT ); Tue, 19 Nov 2019 00:44: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 13DB721783; Tue, 19 Nov 2019 05:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142285; bh=IMTxs0Vg3w+Hwrt3XgNErfmtrm2IarEi/exW/jkwuQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N+xDokePfH3mNKRFI3uo4SvdTpu+9PChnXsxocEAAdaNbnm4m1AfevJgIwNrLlKsY bo80nKZiZXMhTPNTqoy1+1xbxqL1Fzg41dfEDV7LCvj4H+5jA5Qcqu9vJoIh7NUSkW 9nfK8iLYoGdwJXHWfbjGYwwpYL2ssx3pR5U19GgA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , Jens Wiklander , Sasha Levin Subject: [PATCH 4.14 029/239] tee: optee: take DT status property into account Date: Tue, 19 Nov 2019 06:17:09 +0100 Message-Id: <20191119051303.264037709@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit db878f76b9ff7487da9bb0f686153f81829f1230 ] DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver. Signed-off-by: Ard Biesheuvel Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- drivers/tee/optee/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index edb6e4e9ef3ac..ca79c2ba2ef2a 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -590,7 +590,7 @@ static int __init optee_driver_init(void) return -ENODEV; np = of_find_matching_node(fw_np, optee_match); - if (!np) + if (!np || !of_device_is_available(np)) return -ENODEV; optee = optee_probe(np); From patchwork Tue Nov 19 05:17:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179716 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp177231ilf; Mon, 18 Nov 2019 21:59:54 -0800 (PST) X-Google-Smtp-Source: APXvYqxodvNt0wk2/YI2JwYtySaS5yeFQDNmCe+uY5OyDsGWb21P9OdgPQSZ38AlIZgbWRcHomsD X-Received: by 2002:a17:906:da1d:: with SMTP id fi29mr33039103ejb.26.1574143194585; Mon, 18 Nov 2019 21:59:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574143194; cv=none; d=google.com; s=arc-20160816; b=YiBM/qC2xS7UeLcwqxnK21i55NupJ6Y+Ks85G7jt4qk3bAJDMU3HyizKwEVov09gbq WIUiXUSlokbafWFSDS49gRKz1/wgM9XrlcUWtxHMeMDv7tdqAlYqaX8ZbuhG6tQSLoOm U5ANVDkpQ8x0hEG1PHy8PGaUGwoXgDQVgjtdSa70der4aEbCldy7hI+uUieF/mImjv+k iraWukkyWkUwTFxIIu9Fku3dgD//kNXOCVnd/lECLYllmfsttuC8kgzDKLaIWBusfI7+ z+uaoAGEQv2OHIzfa0zcRpYo4qZG7dizIT5t7bmqEMdEHdFf9swbU0hxqmTEBRqPjvUq odZA== 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=aXl096MifK11Umryouwlt5zVv9Ni3FGZUEmWCZ0Uwqw=; b=yhAp3cMH2wjR+loqPeIx72xj+Lhl/aeSwHmn7fl83nYwsUd3aHOxDaNn2rsPIMOAgH 11C4eV6keVCuxpcwkOdzPIe3ER1Cb/849AKHk3pJA2338J4iCbriB58E+07f68/Uwnx6 MJpwlq4kRbj4ATPBhZAf/uiUjA61Wfqj2L9Sn79bOYz0r0JVmuTow0OoiVu2G58/HsWj T06LVjQpM7KTM5zHjG2FdWymQG/8m6HUfvymzuboC+jC3DYt91ArdTSyPFS4v9A69XJX IElIFgZWfCoYDa/Lfew/FeSKEcuhEUna8Ozx7Uc7DGc81UZcwDFub1oC0TTtyGo7IWyp 55Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LjLYWwyk; 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 q8si13349237ejt.321.2019.11.18.21.59.54; Mon, 18 Nov 2019 21:59:54 -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=LjLYWwyk; 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 S1728485AbfKSF7w (ORCPT + 26 others); Tue, 19 Nov 2019 00:59:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:42898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729040AbfKSFqn (ORCPT ); Tue, 19 Nov 2019 00:46: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 7AC192071B; Tue, 19 Nov 2019 05:46:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142403; bh=HTtoqZyvVxPeVVf9GFCb236etSkJ8xztU8o8/+LFI4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LjLYWwyknv/MIho5PcScBtv/tyPbEG6W7A4+P4Kz7OZ1kDvePhRzPgSoCCSC+eiZE ch1dekdZ7D2o5DUA0eHw01woFJHr3Py5fKK0cJnr77HoKC3rmKLLhju6FOA+yPO3N8 wE/fTqadpghIOIc66d2E9TzAHifSoa5OErZ0AGLc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.14 068/239] ARM: dts: exynos: Disable pull control for S5M8767 PMIC Date: Tue, 19 Nov 2019 06:17:48 +0100 Message-Id: <20191119051312.605119413@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 18a7f396ac5f7..abd1705635f9b 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -169,6 +169,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>; @@ -544,6 +546,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:17:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179690 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp166576ilf; Mon, 18 Nov 2019 21:47:08 -0800 (PST) X-Google-Smtp-Source: APXvYqya/D3Wknvhl30fpSChI1KMq4hSVZmwNw2+xB6Idv4M6k+MaRMz+Nv24tjyI/3IPj5Nk3GS X-Received: by 2002:a17:906:22c9:: with SMTP id q9mr31989172eja.198.1574142428789; Mon, 18 Nov 2019 21:47:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142428; cv=none; d=google.com; s=arc-20160816; b=hn5d5oV5QAIKcK+Hhr6fAcvF9zpCZjbqtK5DYU+xvEjNo7tEpYf23hZYK9MDSBYkuF aOqD4bhjjMrbMcOQDdBb3RrWb0LY84AfQWAHEIogMgW/PbOXvOrM/AUGHeDqooUyqrom I1DNVpVuG5MuDX8aUpNeBZHC0KKGF8kSAvJ4oNSXZzlBfVB9+25Osh74in74sa+4frhB pU7lJ7QAWS3uweB6NUTZxamoTkBhkJRp4a/ERYHFKv3BoGeyG1hKcOg09DzdI/dtiXkZ KtpM2ELuq3z+gfESZuFkmLzuXxXbel8xz6Hzm/MG/Fb3iXhow6+SmVZ7G+ki4yWynqLX usYQ== 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=hZ+/kUwoYTD9VyI2BUofrWGJomw07n+AOHx2qbnfKp4=; b=pwBwjEd9uGFEFVJUVZkvorlK0Y7OHyrqm/FmUIYbBmkHxaGuDRi8BDWeZuW13zcz6V JXQnUvjv9jU0x9sk4zUi9u4oeEhzW1bOZaH8gwteZbUfGVcO+thO2lhUeMDclC8vw2PP S4Ijh9br+ORKpk+GDIT3ypokrL36koK8G0OmJ5pPGHnLdKjNxBkL2DjvUftN6w+7O4UY 7EkHtFv+kFtP5HlEncLMiXzPhE+FYsUecAbpc/oDvoqFVVzIAf9xC4IZLsEGykkuhd6V mHyySh85c4djIYjf1wbTqPDJZmgnfNK5r0hbUOJ78E/KhvRjr8DfxtQZZQOBjaFtAN5G 9bIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LGeZGNWp; 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 d36si13699601ede.44.2019.11.18.21.47.08; Mon, 18 Nov 2019 21:47:08 -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=LGeZGNWp; 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 S1731200AbfKSFrG (ORCPT + 26 others); Tue, 19 Nov 2019 00:47:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:43342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731195AbfKSFrE (ORCPT ); Tue, 19 Nov 2019 00:47: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 C3493222F2; Tue, 19 Nov 2019 05:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142423; bh=J3QJJyB1MLGclnznM8gAQWis/pWXjNNKzkTmxtMWMpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LGeZGNWp46A22ND3rlglY8Q6Zq659ksh3COh8JHRIbm+/DSyA61Vu1Wion+Mo4RNi XKScuqN8jqWjJOURqJuac1yyrPWTU+8n4VjMqDhiDcgOip9QRutIQPp/wBzu1AB1Cs r+vGX0GaymkGKomcbMRMCJ+O26HhZkIUPS/mBvs0= 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.14 075/239] of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC Date: Tue, 19 Nov 2019 06:17:55 +0100 Message-Id: <20191119051313.975899868@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 ce8a6e0c9b6a9..41b254be02954 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1837,7 +1837,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:18:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179693 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp167882ilf; Mon, 18 Nov 2019 21:48:43 -0800 (PST) X-Google-Smtp-Source: APXvYqwK6iIF1MI884C1yHfAvCuySsUiapELASmNuJDHp5dMO449KUeg0DuqejKQXG8yNS3Y9uhI X-Received: by 2002:a17:906:f91:: with SMTP id q17mr2381440ejj.302.1574142523632; Mon, 18 Nov 2019 21:48:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142523; cv=none; d=google.com; s=arc-20160816; b=T1xJAO1yXSBcbvsi5zKR1cTo8Z7pBSri/RiXGyH1sLGsiXJmzCguuaMjmBzp88h3D5 cOBJlB3+i7xgLmHkONSzTe6E/+2f71JvzsY4Cp1m9ccrZd2OhthYP1fEoqY5KkYjJnQh t8R7RrpbmFUzyhT/eWXXgmCvXEmV3B39REzOFo71PZKZD9r0wiTpUYNV4+t0UItFVVSq pbjyOUZkyR2hZh8i5cCGvTqRcLh6KR6B7KHrAoV8kh3B1CfEPNoFr7T1ii/7lPKo0zHu 8jzw1hPgw2B0tS8cE5ujJSW47HyXqIltUwzCo166wF4XVBcB/VsRXvpSg1wNZzlGvNBr tWYQ== 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=Kwt1dgASAWNWu32sF1iayuXoQmFkoDddC1Zpkby0fog=; b=G9wrWRywICIFb9ls9PUPZzi6bDmcpioFPAULL4N8879ImXa0kmgqTKZIoKU3FvUGoZ HZgAWIxBro41pijRj2oMgOxD7Ts/rWRWb6GpadKighNSnIhdid/OidvEKqFbqQES/wxp hKZrFKkB5DBNg44+USpmCJtW7WCJTX+dzOU+5dvOB+6qkpHYGFLM69ZtTcjE5pZ/03C6 d8ZlIb1AS+ofqDIDIocWuTnTvc083LdeTZ4uevhNj6M8vC1rNllAT5JopWXl09owb2yh 4a3SH9IL+0CIhRvHjR+lJDAn8Tn+oOY++w7LdYTfuLCG3/wuFq+m/iSvhGeg6LPaCVC4 a8GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Jf6Zjsgx; 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 w7si14950835edj.96.2019.11.18.21.48.43; Mon, 18 Nov 2019 21:48:43 -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=Jf6Zjsgx; 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 S1731403AbfKSFsk (ORCPT + 26 others); Tue, 19 Nov 2019 00:48:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:45230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727805AbfKSFsh (ORCPT ); Tue, 19 Nov 2019 00:48: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 BD69B218BA; Tue, 19 Nov 2019 05:48:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142517; bh=oA0SjtyPdBmFx777on6n0gmKh9e4CxtsuhtGwP5lMsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jf6ZjsgxQJ4b0HZtDjegAsuE1l5L0ae4oYPOYetb/PgJll9GLkghoUhVvnHnSFaX5 wc2b1IZNz85KkdM3bVp4BCsM2Vyy4QVFWFo4KSsrPN3SwltLO6+KA12xBgY1y4UCer MWxRtEo2fONuPw41ZrQL+C/83CvBQEJx756AMoGo= 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.14 108/239] media: dvb: fix compat ioctl translation Date: Tue, 19 Nov 2019 06:18:28 +0100 Message-Id: <20191119051327.014243236@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 ea52b98b39fa1..033e8e6aabb77 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -161,6 +161,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) @@ -172,7 +173,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); @@ -191,6 +192,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) @@ -213,7 +215,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; } @@ -1476,9 +1478,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); case VIDEO_SET_SPU_PALETTE: return do_video_set_spu_palette(file, cmd, argp); From patchwork Tue Nov 19 05:18:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179695 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp168169ilf; Mon, 18 Nov 2019 21:49:06 -0800 (PST) X-Google-Smtp-Source: APXvYqxBVWS7TzWOMp3xVxBIvQflxCc9wGShYP8i20nX1+kySkAofFc59CHNVhcr/UxSRZsSD1bR X-Received: by 2002:a17:906:8054:: with SMTP id x20mr32014986ejw.68.1574142546261; Mon, 18 Nov 2019 21:49:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142546; cv=none; d=google.com; s=arc-20160816; b=XymrIhYL5B8uATzt1UkN1kHcYgVwUYJOg2C97wNunFq5prYl6lBqBwHvD8Rtqoo9zr 0WNawBe92mH1iU9Ht4mdZGLRgX/AtOQeqRycMntesnyrlAkYk6TOL434w3nZQvOxIibQ OwGzJRHG9e9axixsqEL5aLQFxhxkmmpJxdb3djAjWQy2b953ZWMLAaCCcOb+jNvqk34E au6+hO9BMMw19zwE6XBrn6mphskM39PW5mrPG6OC8X0s/NLpwk4zsezjg7P5WSLWqBj8 bzo6iTEQ7OCik8CiVFWOmMwV+cqFVKGO2XOOjarSzTu7rW2565UcwzJaH1n+P9tMawb+ Dtng== 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=4SfYdpMAZA5tF67MBl8gD3vnW3UrMxqN6p0evxCoDm8=; b=pLS2C5N5Sch27wNAP34wuSxmyd+iG8tfUNJQb66DcAKaOms3jCFxuB3s47QQXFG5lp dypJwqntst/tCzLy7sfEUXpR02e8CUIJBQeyLHMEwGnVGkMb6cP+wMuf1iLhMDhlCCg6 aWE/8GDGulJ1l5kSvdMbkQZb9dAScL8klfxcaCRzkaL3ZijMopo6DIpaYmYyXHCMJVu1 EBEfYy6SxrJPKY3z53T4JcFuCamO8dXKYPnTcu3T50MThV5oaG4WdQLx4hMVeCxAeObz CfJqoRbQm54Zut85fRidyQqF9NVT5w7QdfEWJYoeSxjZlugIZiByG5LvAaQxVsIxLmNl U2og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UMRCAfJb; 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 c25si12980715ejm.224.2019.11.18.21.49.06; Mon, 18 Nov 2019 21:49: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=UMRCAfJb; 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 S1731436AbfKSFtD (ORCPT + 26 others); Tue, 19 Nov 2019 00:49:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:45576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731424AbfKSFs6 (ORCPT ); Tue, 19 Nov 2019 00:48: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 7CAD320862; Tue, 19 Nov 2019 05:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142538; bh=fTe/6jv6vp2P2ZrGxFtNky6NeEAfIueFoy7sJP/UR2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UMRCAfJbeR52VIJi9GXGRhulBK0q/D5p6NiR7p6Qf6BjfjaqEpzssxbq28YHEZ+Cp W25hIjUIlqeIm0v/0oli0lhI2ybsS4kZvECZt4RzFzULnl9t9C7qj50kgLBNcEYp/8 5RJtYeEUmBW2RixX6yP8WIX0tscWNfI2UaAmrQQM= 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.14 114/239] soc: qcom: wcnss_ctrl: Avoid string overflow Date: Tue, 19 Nov 2019 06:18:34 +0100 Message-Id: <20191119051328.514908397@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Niklas Cassel [ Upstream commit 4c96ed170d658d8826d94edec8ac93ee777981a2 ] 'chinfo.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: drivers//soc/qcom/wcnss_ctrl.c: In function 'qcom_wcnss_open_channel': drivers//soc/qcom/wcnss_ctrl.c:284:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation] strncpy(chinfo.name, name, sizeof(chinfo.name)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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/wcnss_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c index df3ccb30bc2dd..373400dd816d6 100644 --- a/drivers/soc/qcom/wcnss_ctrl.c +++ b/drivers/soc/qcom/wcnss_ctrl.c @@ -281,7 +281,7 @@ struct rpmsg_endpoint *qcom_wcnss_open_channel(void *wcnss, const char *name, rp struct rpmsg_channel_info chinfo; struct wcnss_ctrl *_wcnss = wcnss; - strncpy(chinfo.name, name, sizeof(chinfo.name)); + strscpy(chinfo.name, name, sizeof(chinfo.name)); chinfo.src = RPMSG_ADDR_ANY; chinfo.dst = RPMSG_ADDR_ANY; From patchwork Tue Nov 19 05:18:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179699 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp169777ilf; Mon, 18 Nov 2019 21:50:59 -0800 (PST) X-Google-Smtp-Source: APXvYqyHjP9KrUMec4G5v5nu/QyjAKXfAvh4RhBTqV72JzWzyahsYtCSqaRiS2lphMs5rc682a1Q X-Received: by 2002:a17:906:cca:: with SMTP id l10mr32424428ejh.161.1574142659729; Mon, 18 Nov 2019 21:50:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142659; cv=none; d=google.com; s=arc-20160816; b=qr2fj0ioRYX/ITp+C/i9ftECAPBXrBsbwrDPbF9F81DEi4C3j9ScCIk6ABpWxhdumK 5wUok8Z5NuqPy+hoCSeMMIMZPOpNB9MEpYUUEBE9HANQE1/92TXhPWSNmbg06cj28qtx 3csh6PxOgnX6soDAtbEo3R2LqB7u+qoxoUirKD+Z3a8GFirTy2Yer1dNAB7rwFmUXJHm Xt55gGwW8h/UcV37OVtLRWQtGHREZwjSsY8hvI889dqg3D6TMbzQNj3LAHYUUjD0s+BL J985atAk2Skf2kFO28V/0XtzX09R/d4RIyWVtqvILJwgb+soiCJMWZFxl8GvDpBRj+3K Dd1w== 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=SmYrwWUwzJg0mVZZZpdHNloHB61UnujGK3DfbIeuZmc=; b=WvJ7Pj93PkfeOjy5ohhl1xXVKODudLYL8F8VbEQH4MZSeSQ6pOP8eltpWUalcyz/x+ jwxeYo2XA7AnU0J4Xv9oHV8uxkt7KEfYS/u9JhZOv5MpGo73rLIaEYJr2r9XHdHJ7bJg 45UXpLF3Wpf7KErVobjGDjaGsKviIJS1t1mTqPygyrnXYqLi1JYA6qvfwZ2dFn77SBwp LRAkaG9/A2iOA9ckRDGlC5oFcwQkNq1CUHLK00LwNvAr329ajyI8VT0mQbyHb35zHcnH ksdf1sWEiGERjCxPZsLey/5YJvxZimCJpaOfokEidCl287fxvwSRqKtDTFskdBJrizW2 aqMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WGh+PI6l; 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 by4si13470416edb.87.2019.11.18.21.50.59; Mon, 18 Nov 2019 21:50: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=WGh+PI6l; 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 S1731704AbfKSFu5 (ORCPT + 26 others); Tue, 19 Nov 2019 00:50:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:48154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731693AbfKSFux (ORCPT ); Tue, 19 Nov 2019 00:50:53 -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 3E33A20862; Tue, 19 Nov 2019 05:50:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142652; bh=F0f1DFQic3UsgOCXhcyyXPEfDgitzNZkVWAjT/PbzZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WGh+PI6lCV3mqCjsmoByJ/PxeTVrSrKzZ1muIOtQ576rsaSCa/IgjRQKY5vh6Hd1e XP1F1pFrrgaMRpHFFrIJWNBNcu2cXCct3rG9cBQodI9Vc9PQ6VEaY4GlVXH0Qwo8iD JMn82u5I3XaNAt5SVtQCnsN9p2b0h6GsGCVXGGD0= 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.14 127/239] ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 Date: Tue, 19 Nov 2019 06:18:47 +0100 Message-Id: <20191119051330.458418476@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 131c3eb428ccd5f0c784b9edb4f72ec296a045d2 ] dtc has new checks for SPI buses. The rk3036 dts file has 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/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus 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/arm/boot/dts/rk3036.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 5c0a76493d22a..03cf0c84ac0aa 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -750,7 +750,7 @@ /* no rts / cts for uart2 */ }; - spi { + spi-pins { spi_txd:spi-txd { rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>; }; From patchwork Tue Nov 19 05:18:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179703 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp170565ilf; Mon, 18 Nov 2019 21:51:56 -0800 (PST) X-Google-Smtp-Source: APXvYqyoUR9EL/t7miWfcTaBFlBN63CV0dIEPiTSJeewSSTl/wMyCmyCAfcHMfBuo4vsUYzKLEXH X-Received: by 2002:a17:906:3458:: with SMTP id d24mr33092393ejb.271.1574142716603; Mon, 18 Nov 2019 21:51:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142716; cv=none; d=google.com; s=arc-20160816; b=KpG/sEYJ1Tlu+77RCZ1XZl8PflnLUIEUY42z19OrEt1avLGMWZfI4veSZlcThWKbxp i/ACav12Ym15blepD6SIS9dwBstVdxBQ/FSdVTkrkxR29ikP/zSaS/dwJ7xugGGY7pjx UvBdjCtQsOIlSwi6KUbR89B7VSYUBfv5Pjt+Uq2Pn0IZLNMHa+EiNU8fMWDNP6Yi7f4P CV53UokME00n0sikTD8+NcRLR31uyknklhGSbffhegVc0p5mcYD++VBFuZig9/E8CKOT PKlg8ORkByf1sASp8mxbkisngQ82enJuJ3/1blhEsqjDyWBqkylCRPZ48egBd97GSjcz 9wyQ== 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=PMnyfYzWxavqUaXMI55HgiVn0aAX76G4VtrJc1JaOAQ=; b=SEoNmvX03C+VYIyzO7VtvzZpkuQEIT31jYvrzDQ92dVjs3z1vNhPFL9eFht90Q1Wju ym7L2E8hl/7/HNpnmQeL6Aqob/WiaywtPM3sIPNquHfMBei/giqQlasTdssFQX0PPKMv nIKMzS4nE4U/Ot2TOEckLjp4qiMLCh71dwN1kMW5yA62kjfY8bRsseaVnkMhmCxtoBWm s+4WNXjNjS9Up7Uff7poaiVE0pj8zy30aln0D/viB67UAQ7xnr8vyVZIaIHXVjpF/Pyc ynrHVS/YFBqZeqh5yHQbTwqKdbriTh+Z54WixR7JCqVppKEXeR5IoWHIfpc/PQeb/6FO wi2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zAfVgNF8; 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 w25si14228158edl.418.2019.11.18.21.51.56; Mon, 18 Nov 2019 21:51: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=zAfVgNF8; 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 S1731856AbfKSFvz (ORCPT + 26 others); Tue, 19 Nov 2019 00:51:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:49434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731438AbfKSFvw (ORCPT ); Tue, 19 Nov 2019 00:51:52 -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 D6E9C214D9; Tue, 19 Nov 2019 05:51:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142711; bh=srycieWXSGszwVJ8ASQMK8t1Lxk8Er2ie0ADMyYiDBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zAfVgNF8HM2Wp0mPxugTYcJwrxLw6NR4whZ2q09z4BiOw4oaz3LyvJy0WeRTj996N IEQSL5K28PYu3moN8jot+yuMni1AgNLAvYmE9MmYqDpvWoFU15AzMlxyRY/ifAeMhC zoDDZ8rhPHweKTcMK0Ye/rwgl4EmtvcWk7iFc3hI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.14 133/239] serial: samsung: Enable baud clock for UART reset procedure in resume Date: Tue, 19 Nov 2019 06:18:53 +0100 Message-Id: <20191119051330.835278270@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Szyprowski [ Upstream commit 1ff3652bc7111df26b5807037f624be294cf69d5 ] Ensure that the baud clock is also enabled for UART register writes in driver resume. On Exynos5433 SoC this is needed to avoid external abort issue. Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/samsung.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.20.1 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index f4b8e4e17a868..808373d4e37a6 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1922,7 +1922,11 @@ static int s3c24xx_serial_resume(struct device *dev) if (port) { clk_prepare_enable(ourport->clk); + if (!IS_ERR(ourport->baudclk)) + clk_prepare_enable(ourport->baudclk); s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port)); + if (!IS_ERR(ourport->baudclk)) + clk_disable_unprepare(ourport->baudclk); clk_disable_unprepare(ourport->clk); uart_resume_port(&s3c24xx_uart_drv, port); @@ -1945,7 +1949,11 @@ static int s3c24xx_serial_resume_noirq(struct device *dev) if (rx_enabled(port)) uintm &= ~S3C64XX_UINTM_RXD_MSK; clk_prepare_enable(ourport->clk); + if (!IS_ERR(ourport->baudclk)) + clk_prepare_enable(ourport->baudclk); wr_regl(port, S3C64XX_UINTM, uintm); + if (!IS_ERR(ourport->baudclk)) + clk_disable_unprepare(ourport->baudclk); clk_disable_unprepare(ourport->clk); } } 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: Greg Kroah-Hartman X-Patchwork-Id: 179698 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp169373ilf; Mon, 18 Nov 2019 21:50:31 -0800 (PST) X-Google-Smtp-Source: APXvYqxwbnPaGETZZoGRFhEAVIhEpG6MNSdfC+9J4Q/E0lhbiCGWcu+3A4pxnmN1M8nRLeF18RNX X-Received: by 2002:a17:906:2e81:: with SMTP id o1mr32189254eji.284.1574142630121; Mon, 18 Nov 2019 21:50:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142630; cv=none; d=google.com; s=arc-20160816; b=bqPSMqW3k8AqHKAOOXQKLZF1Zz3gjY3bakf1lvDLTyY50o9TbxsBBts5/X08rj9zZ0 UsOG4CUe67522PxtsZG1PUuB0zQTUp9zFW/6OTY9x1nlfSRCJiEc7Vm6bKGkB5ksuqKF aMMuNldkgeFP/aZsmjlh3SaG6K5uzjsLcsR7lm/U5YyZWzJiWs4wHJxEbBA5JGIoyFHo usc1Rl09MxVkmC4A4a/DV6w0+5TsyRxPvdJTo7hvyumUhMYwc+P+JYYQcrqI7Ilo30S0 bw6C6PhrN+VD2MKWccfBeKG/moxIMxYrP/MTKb0XhV18y+KVbze3KGn8Cbc41z/hOVRF SpnQ== 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=O20zWLghK5fBjdBX9/BDdLUg9iReA+4X5nlUhZ2Y1Ss=; b=GDKoG2lVlLKqY0M0vVx/NxU0tYhierTsnXmMxf5nbqJ3IoXtavTCIUBF019byYEw9n LJbB2e3KPeK7SdrBDBtuTu/3UUfurCYehNmB2I5dWJ5Ykxh5abHHXXBLosoIagZgSGZr erXhUWz/lihZD069cuY9QsIrofIZqdXkxhJTOrgmpodRZjSplksiF9M28CESucIvZRdy w5klzwRIW85cHTDnQDl+0LkL20m1Oydtt3kppn2JSHDBKGDTJsaGboJeTYIp/I8+dP3E hmhwjzDVRcmXo0066wnDoX95wjX1KVUDInytTYyORj0ZO6PwcTHncrOOt8IH8LGOYG7/ lEAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vLCMPMXs; 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 gu7si13277786ejb.405.2019.11.18.21.50.29; Mon, 18 Nov 2019 21:50:30 -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=vLCMPMXs; 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 S1731629AbfKSFu2 (ORCPT + 26 others); Tue, 19 Nov 2019 00:50:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:47450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731611AbfKSFuY (ORCPT ); Tue, 19 Nov 2019 00:50: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 4782B21783; Tue, 19 Nov 2019 05:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142624; bh=eCG85q6t7YJoJKlRi9ND0119j3qWg7j8OP8APe9k2Zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vLCMPMXskpmsffM4DNq/HbWmvPZLoOv8AMtu3EzHTjBvG4ZIIOHciL6e53nqdC9xd EqDarZEiPZc7/geayIrjJbPrcILj2MpjL6Z/cEqDHCMVFurmSWdEcrJkhX9bIC1rzX so7S3NAmVwEaz2p8sOjvvPMQ/M7T63weHwWrW+fs= 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.14 144/239] OPP: Protect dev_list with opp_table lock Date: Tue, 19 Nov 2019 06:19:04 +0100 Message-Id: <20191119051332.034700923@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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/base/power/opp/core.c | 21 +++++++++++++++++++-- drivers/base/power/opp/cpu.c | 2 ++ drivers/base/power/opp/opp.h | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index d5e7e8cc4f221..8100c87691497 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -49,9 +49,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; @@ -711,6 +716,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 */ @@ -718,6 +725,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; } @@ -736,6 +744,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); @@ -757,7 +766,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 */ @@ -799,6 +807,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); @@ -1702,6 +1714,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 */ @@ -1712,6 +1727,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/base/power/opp/cpu.c b/drivers/base/power/opp/cpu.c index 2d87bc1adf38b..66e406bd4d628 100644 --- a/drivers/base/power/opp/cpu.c +++ b/drivers/base/power/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/base/power/opp/opp.h b/drivers/base/power/opp/opp.h index 166eef9905995..0a206c6b90868 100644 --- a/drivers/base/power/opp/opp.h +++ b/drivers/base/power/opp/opp.h @@ -124,7 +124,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:19:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179704 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp170987ilf; Mon, 18 Nov 2019 21:52:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyVip4cGut4n9AOxLZHCZyjRs8lWRMSFdZJ7Yzb7tof/6isD12yb1nIKgkzQzA3jHbBF8Vr X-Received: by 2002:a17:906:9458:: with SMTP id z24mr31758496ejx.289.1574142631316; Mon, 18 Nov 2019 21:50:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142631; cv=none; d=google.com; s=arc-20160816; b=XoqDHUqrT4TIiYKHBpmfFCfAsMUYorlsbLBmnM8SCH7VgL7QsfNIbUi7VJCRLY2Y+G 6b2k15HsDgoNvndDyD+1Ek3ux/3Y3JShrO2AJ44xhoCZ7ko/maUgVkXUPDmEKe3Q7+RD xBKzrRC/0jHk1GtCZxkczf1Iud2jDc1rfDl2KJIJxgV7VhFL3NlpNNlXDFS1X1B6wIof w0xAjesTy76Xeiv08eFrEzK2r8Vvjs6QsAqGhs1dBt/H+QlFaFFoOFzs2C2j7LytA4vs 18vxl2AIH1WPDUJd0G+Px3u1nit5cFFcjco67cJ3n9uvIxdd95slkt4BppUBn/DCwNc/ QvCg== 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=tTwWRw1dq+LZsnrq2UbfTGhx4RyacB/iCXYxSZbasTI=; b=rIiwnaWq1hiSGJXWFOzgpaROcU2oLVnlA38efYln3se5unxW7BAJwkVr02CyMQfcIs CP++mMjUjkl6uh5KRUKjKhgun5SkGvaO/vL5yw9qi5HGOVeNf1QHj/Xe5+vrxP6YIwBi D7uGnnR3PPyBvsx5N4po/kqrS7/fos2TRyRzOwKRxZ1enrJ+ouZF3j4+umE3Qdtz6Uhk hs2+c/Gtt+I7eFXx5Jt22Z/0V3K7jfxE9HgKXE+k/rxAyctW8MnmlX6FEjiYLd6C5lDu gHtmziTarOmb/SE0HK4Wr080i68GS/CcgGPzzsMOJ3hfJkS8qxexmrWwA2dWTv6vdaz7 QJ3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BuQc1BM1; 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 gu7si13277786ejb.405.2019.11.18.21.50.31; Mon, 18 Nov 2019 21:50:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BuQc1BM1; 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 S1731636AbfKSFua (ORCPT + 26 others); Tue, 19 Nov 2019 00:50:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:47476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731626AbfKSFu1 (ORCPT ); Tue, 19 Nov 2019 00:50:27 -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 8136B214D9; Tue, 19 Nov 2019 05:50:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142627; bh=yd/2s7NgD5N/H4tCXDGVVAgmUhkj7AtVXMSL9P/ctck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BuQc1BM1I8/yu19XBJ4e9NwFPz2Etwu7iOf0sPt/oW+xKZ90hVBnV48nUzW8kFmin 0c7SRzTHRoeAUFP646uukjTgWH4xjRlKu/FBdzwEn4bdSVfN22y1NLL/VPj2ZgqbJK 1IxppL7+D6W6jWYWeM6NZmNh48EoG560b5Eoi3uI= 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.14 145/239] libfdt: Ensure INT_MAX is defined in libfdt_env.h Date: Tue, 19 Nov 2019 06:19:05 +0100 Message-Id: <20191119051332.226062838@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 f52c31b1f48fa..39155d3b2cefa 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 u32 uint32_t; diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index 14997285e53d3..1aa707ab19bbf 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:19:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179700 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp169915ilf; Mon, 18 Nov 2019 21:51:10 -0800 (PST) X-Google-Smtp-Source: APXvYqwFZCG5tMS5S77pk8WQqmxx5Mid5Q2SyrbLNpv7Wa54YnQuJHH5K7VwUfbvXZELZnp75dXk X-Received: by 2002:a17:906:4e48:: with SMTP id g8mr31858700ejw.67.1574142670484; Mon, 18 Nov 2019 21:51:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142670; cv=none; d=google.com; s=arc-20160816; b=ivuGZcjbR05+ZRAHyW2rEM3ATKR/OqFP8ZlExCEih6dpYev0opJlA72GMzsSOx0tO8 M5nDajOJgImge5IdFcekgPAT1vN8zYPNsgeSdGxdd9URcnJZ8AeqLTHzQuT01PBG83Fs M/NTWTi2fESCUHqCJ5qojRZGvjM7U0vqZTupZmQOjx37MbFJC/1Ov/InGs5l7RnVqFV9 mxlevOBiSAagsB1DvYwLr+Uzg5dID6q8hbMjUFE7fGlvriYMlxdhBuoCVhHC/ajXNMO6 riMEJDOD4qBKGcv7Btqmr7uykHlfdpg+Lgk/eL6sO+p1rZuGXw7sxLQ52WId+RvJY5CX +U1Q== 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=Jk7w5NByQfJUAU2soLPLrSDBTYyzk0c7obVC3VfqYtE=; b=t3X2048lKbB7zADIN+2jksS9Cf5qxEjJPpv5KrYOmRuyL+hHWtECymFDPeKTPYtvHB MsXXGmpa3+h7n+luUKDjraV7R38xFrCAWj9D1zi3PJBsPMY+zx9us7r7DIl66KuImhQu vM8sO8s6m/JkqKj47yNpSb373d3pFIOe+G79lH+Y2ydwJ0YcTwJJ5cpi+Y4knDz2ScCO 2w17y9zQeXd1TcgSqAuxtUYE+U/szDEWdjgXj2ZwzeEzZ8ak5EbJmksrjuJPD/tzWul4 qMj4S3FrArL5RcXFQsZ2rIkw46LjFDP7ZeeJakuLAcHsNw3Ccbr2J0+9vExIMRnpC8Ap rAog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DmS7kFm1; 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 nq5si12820881ejb.161.2019.11.18.21.51.10; Mon, 18 Nov 2019 21:51: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=DmS7kFm1; 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 S1731739AbfKSFvH (ORCPT + 26 others); Tue, 19 Nov 2019 00:51:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:48428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731725AbfKSFvF (ORCPT ); Tue, 19 Nov 2019 00:51: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 147D521939; Tue, 19 Nov 2019 05:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142664; bh=HhY6aRuiU+JFIVbArd6TnC9cOXQnnSAEu6elwhYbO2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DmS7kFm1SKzwcCBlO4HklHSGFhPZWYS9snLX4gTzsq++eeIQ/X4Kc8w5cWXI8UOsq ligElru7JYGNSHXquLgukgXocCtr8bnQC5pJJPUz6+xTWg2uJ9VukbKq0nX7cGnFp5 nbzp73py2jMJiAR4mQc98MstAzn9SIlEd78WarNg= 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.14 157/239] usb: chipidea: Fix otg event handler Date: Tue, 19 Nov 2019 06:19:17 +0100 Message-Id: <20191119051333.133155502@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 10236fe715228..8bf4032226ed5 100644 --- a/drivers/usb/chipidea/otg.c +++ b/drivers/usb/chipidea/otg.c @@ -206,14 +206,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:19:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179708 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp171555ilf; Mon, 18 Nov 2019 21:53:09 -0800 (PST) X-Google-Smtp-Source: APXvYqyflGS454ISHa3lIyzzyutbk7dJxRCGk0AM8oFrpN2cRiASx+b0Jt876UVhMvAXH0OtQrMI X-Received: by 2002:a17:906:e8f:: with SMTP id p15mr32762199ejf.113.1574142676743; Mon, 18 Nov 2019 21:51:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142676; cv=none; d=google.com; s=arc-20160816; b=PTSRCsSKE4KrN4WYsGmJgaudgayYrpNwWu3uf4FfaV4ITpBrbqWtLVCNL/A9HNpwOi 5ZoRC2JJK1FhtSRFHqSKItPPGLT4g9CFEBpLRp+HBxisc4jvLRTzIIl2stMKSHxHmyQ3 qLETUhFkI7EZldLdUWDIOg5xn4xQtVmkpBCDq6Oo78Mqdjg5aafxrDCl9t24CpNuSGWE b5xS9RWBf/NznR5/FF5OTfm4Wa05vpM3z0oWz1JzNUxe1LRbJtwwe3AYXn7pjYxC7VLl fZ2NnlE/N6GDEr8ZpazTuL1ZfcospSOEklMa5AEc/gatbS2FBAn4IP9oxiN409tLDIhJ 65Bg== 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=r3oyrnNC0f8RY4ZOo6C5s4ypsWZKrPDOIQzNM7r4CE8=; b=ZPcToJwAJlNOOt4IKz7//w9IpMmCcQSppHxPMcf8f5ABGfs1/saqWCaWuJDI3k+lOU GuZgj2lxCFTiburZ2KqIiCUeN4zdpWMK7+FLVxC5nb9dLz9UfWCcjI3w6tDX53A444U0 15RCTS0u4iTE2xpUykp21ueShtTxbkVnjuMzHyp+rItEAfCs0RXwFSv+QHkDvJ7wmnLd dBWvE6iTL2yDWirn8qk7eg8891OG5Pi6POR8iHiw/zvbuuwN6D5GZoA/toBzPEwCUrw4 RjcnHql4KJEEUd+pGSKA7ypIrot43lrcRk0s0EezhasZCCMKCdrV+Q9nKrDrD870eJIR PRXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QWLCsn2O; 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 g27si13525615ejc.219.2019.11.18.21.51.15; Mon, 18 Nov 2019 21:51: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=QWLCsn2O; 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 S1731752AbfKSFvM (ORCPT + 26 others); Tue, 19 Nov 2019 00:51:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:48530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731151AbfKSFvL (ORCPT ); Tue, 19 Nov 2019 00:51:11 -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 DEB18208C3; Tue, 19 Nov 2019 05:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142670; bh=q4tBSuVCw5ZqWJJuSnB2wXUj3FJfplMx+MeJUnBneKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QWLCsn2Ow2A03p8zvpZtuJ0z8o/R5O12B4FMI3CDapMdR3qVnhJphg/trM8WOHv0Q MuvqqhWpki/T6jdbX3aunBRPNv7xwMMO7LWTU3DIqBghSMxb3xceKkyZitrBDDrPWE fOyBaYNqKk+B+VO5ixbEbfOAAtd2HUkH8mHwoZmU= 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.14 159/239] ARM: dts: am335x-evm: fix number of cpsw Date: Tue, 19 Nov 2019 06:19:19 +0100 Message-Id: <20191119051333.264951714@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 478434ebff92d..27ff3e689e96e 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -724,6 +724,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -731,15 +732,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:19:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179701 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp170178ilf; Mon, 18 Nov 2019 21:51:26 -0800 (PST) X-Google-Smtp-Source: APXvYqxK6OKDTN2rAJ0D6B1O6/jFkyvp18+LLaqzPi/6bb44Kmn8w1fqN8x6ctfoFmb+BClmd+fz X-Received: by 2002:a17:906:709:: with SMTP id y9mr31382544ejb.321.1574142686112; Mon, 18 Nov 2019 21:51:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142686; cv=none; d=google.com; s=arc-20160816; b=nKtGx7OC/unPFGPRRxiJh0Fwe1IMPg1pG99oGewZs55QBsYFD2YIcf3n/EbnaVJbaP WrWPD8tEttCCmvxq3oZu7k9j5NHqxcRdP50fSAUXioY/+HwnUkQnGfR39rDOJIVEzQwy 6bf3o8LxKxuzW9l8FLP4Sl5YY/5RTQl4CAHRd+9UddBC3f3ykbxbtAxtLiH5ACwCYg59 8PQKYIVorpKqtFbSQri76hlB6LUWzy5NhhNYDvaIwE4VR3l4Zm+5t4FojIANcsy26Mzu IyzQRzdRq56PMhza4QAKdJXxXMktBvoC83AqRplpXvBHAQKn70YXegsk4p2xvivU5OYv Pv4w== 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=cYXp3R4zokoPjj9+OYNtPSLlpqT2w/Jh6xdGEbX3SkFZd1yspulZH9QtVC/lqENxaL Lrjnacfs4/61dWK+GA1iTuHpDzDsC9A+PuFT6xBqkp35r+A95WfL/VcPGaBgW5uUd+FQ Ho8xG7y1snbfDSeE3b/VLrfmOa+kwlDrOf8rL58bj4MvRwNq4QhO9hgMOAkqPJFRFZB8 dU2TeAJOABcQR8Ad4iUE0KJ8iPc6OMlI32DWZXDCOG+VuIUYTQEaYnvir8p4rt1ZAv2q cy0L8TpE1/MJixJFsmIGqLBivYBzKpehfWg8oGol0WQPjrn4XS58vBr8kLyg8DcjFn7y nhSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EVt3mhv6; 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 b47si15688403edc.129.2019.11.18.21.51.25; Mon, 18 Nov 2019 21:51: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=EVt3mhv6; 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 S1731781AbfKSFvX (ORCPT + 26 others); Tue, 19 Nov 2019 00:51:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:48734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731758AbfKSFvU (ORCPT ); Tue, 19 Nov 2019 00:51: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 E2487208C3; Tue, 19 Nov 2019 05:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142679; bh=5UlIQR2DCq+pOvDPurmJbhIK5FNedXV0/VZEjZx8hAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EVt3mhv689n+7tQmB5qZpxCPLL903GoFggVl35nfd3DqhSfbRyLoBn0M6Mfmj/fA3 etNsGpaKSTDIrAgtn1+uF9gUW8PSP2T6+kvP2+IzZv9fiRefjQm56X1qQLp3dhIspC VyC1oIq4UpTWCEBwaDmg4tzgvtdLt9AA7wjz0KcM= 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.14 162/239] ARM: dts: ux500: Fix LCDA clock line muxing Date: Tue, 19 Nov 2019 06:19:22 +0100 Message-Id: <20191119051333.435722076@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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:19:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179709 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp172399ilf; Mon, 18 Nov 2019 21:54:11 -0800 (PST) X-Google-Smtp-Source: APXvYqxPuC5YDHUdarJ0ko5BSIM94ht4EhUnDKE7gXp8K/6j6pFQ/uKjinv39D44gRNWsCgzYE0C X-Received: by 2002:a17:906:3710:: with SMTP id d16mr13041413ejc.132.1574142702852; Mon, 18 Nov 2019 21:51:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142702; cv=none; d=google.com; s=arc-20160816; b=KEb0O2Rs0SizaXbR7h/FHu7TRmR3xhNuA/UAensG2fc4uTpyBi0Wb46FHdG6nd+utC pLrPIvNhzons/k/wgkXtSgLpz8YnoEHg4IbL3WIY9lmSaADvET7+KXPxdR9xvNvwAjxE 3SKgyrH1m3Z6L86oMs8y2gRmW74VTzLRbpuBPjKRVabYBHm+9GPGX2NqoAyBxNWZ8+ux c9Yxa5yne7YgQh1DiXDrAmWNTbvso3KCOoP7+/HkAkccP0O206yE4nwpzHXEjKQVxdV+ f7urVXumh2YheQbLQyQqHTyD1616mI5gjjbX2jnsHH9EN7o36DA/lCl1cnHYIX6g1jI/ cVCg== 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=huIyFdRXiXZo9ShC8bCrJEWCFideWYQ5ClWa7haHm6s=; b=IxR2R/41w7/ViUI1yv1L5hzEBd4vRaW8PO4dRiVNYo63z82lDOGwtsy5yEBpCjbRdJ uCuxRJc71LJlLxYRgK+72MDMrhOEU9dyxufSNPO4p3dvqdeEsoXAyG26t6ne6zkg6l3F 1r5YqDiTJ82AZxLuWaT9BFG5JTk2xnKfQ3e6OOmesTMOEAeLCd5NrwhvmtG1RC/Ijrbs ij5xlRL6tADoTwL8o6FVSpyukC9+XsoP4rYn/CD5wbWekrmR0qMmi7Rk01X9jYzRVrJv sIvlyOkwWE6wH3ukV2ebg9V/7sZmLTrF4arkwboh2GwTb+xvW8hMgGc6bNLbziZCzfm/ B1zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FR1p3Byw; 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 j9si15340282edf.35.2019.11.18.21.51.42; Mon, 18 Nov 2019 21:51: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=FR1p3Byw; 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 S1731826AbfKSFvk (ORCPT + 26 others); Tue, 19 Nov 2019 00:51:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:49094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731816AbfKSFvi (ORCPT ); Tue, 19 Nov 2019 00:51: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 7C5E2208C3; Tue, 19 Nov 2019 05:51:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142697; bh=CiWs7HHikm8Jl6O3S8E4plgF2fWYCecAL5qC1fbENDg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FR1p3BywctsKINrQDhFNSrUvcC8e7pI3maUNe1tHk0mkiyDOyMfoe+zqa+h7r58Xz 4kn9udm99+8tQmineLj0wiyedfP358UjT1ARupctc65j5P6EUPfJJAOAg36/UkNwwQ gY7nr/wlcmMwLNj89bSNpMltjyUf94yks6tM4dwI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Rob Herring , Sasha Levin Subject: [PATCH 4.14 167/239] ARM: dts: marvell: Fix SPI and I2C bus warnings Date: Tue, 19 Nov 2019 06:19:27 +0100 Message-Id: <20191119051333.757991706@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit cf680cc5251487b9a39919c3cda31a108af19cf8 ] dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses. arch/arm/boot/dts/dove-cubox.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" arch/arm/boot/dts/dove-cubox-es.dtb: Warning (i2c_bus_reg): /i2c-mux/i2c@0/clock-generator: I2C bus unit address format error, expected "60" arch/arm/boot/dts/dove-cubox.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-cubox-es.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-dove-db.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@10600: node name for SPI buses should be 'spi' arch/arm/boot/dts/dove-sbc-a510.dtb: Warning (spi_bus_bridge): /mbus/internal-regs/spi-ctrl@14600: node name for SPI buses should be 'spi' arch/arm/boot/dts/orion5x-kuroboxpro.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lschl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lsgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" arch/arm/boot/dts/orion5x-linkstation-lswtgl.dtb: Warning (i2c_bus_reg): /soc/internal-regs/i2c@11000/rtc: I2C bus unit address format error, expected "32" Cc: Jason Cooper Cc: Andrew Lunn Cc: Sebastian Hesselbarth Cc: Gregory Clement Signed-off-by: Rob Herring Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- arch/arm/boot/dts/dove-cubox.dts | 2 +- arch/arm/boot/dts/dove.dtsi | 6 +++--- arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index 580e3cbcfbf7c..3e1584e787aec 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -87,7 +87,7 @@ status = "okay"; clock-frequency = <100000>; - si5351: clock-generator { + si5351: clock-generator@60 { compatible = "silabs,si5351a-msop"; reg = <0x60>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index f4a07bb7c3a29..c78471b05ab46 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -155,7 +155,7 @@ 0xffffe000 MBUS_ID(0x03, 0x01) 0 0x0000800 /* CESA SRAM 2k */ 0xfffff000 MBUS_ID(0x0d, 0x00) 0 0x0000800>; /* PMU SRAM 2k */ - spi0: spi-ctrl@10600 { + spi0: spi@10600 { compatible = "marvell,orion-spi"; #address-cells = <1>; #size-cells = <0>; @@ -168,7 +168,7 @@ status = "disabled"; }; - i2c: i2c-ctrl@11000 { + i2c: i2c@11000 { compatible = "marvell,mv64xxx-i2c"; reg = <0x11000 0x20>; #address-cells = <1>; @@ -218,7 +218,7 @@ status = "disabled"; }; - spi1: spi-ctrl@14600 { + spi1: spi@14600 { compatible = "marvell,orion-spi"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/orion5x-linkstation.dtsi b/arch/arm/boot/dts/orion5x-linkstation.dtsi index e9991c83d7b70..117d71546ed0f 100644 --- a/arch/arm/boot/dts/orion5x-linkstation.dtsi +++ b/arch/arm/boot/dts/orion5x-linkstation.dtsi @@ -156,7 +156,7 @@ &i2c { status = "okay"; - rtc { + rtc@32 { compatible = "ricoh,rs5c372a"; reg = <0x32>; }; From patchwork Tue Nov 19 05:19:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179705 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp171333ilf; Mon, 18 Nov 2019 21:52:50 -0800 (PST) X-Google-Smtp-Source: APXvYqwVHjkBCGTBQoroctgE1klMaClkrGoh8jgk4ftxDrUEXWMku3fJ6Gdjr6k1L3Qa0AyWFINe X-Received: by 2002:a17:906:2508:: with SMTP id i8mr2935452ejb.323.1574142769724; Mon, 18 Nov 2019 21:52:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142769; cv=none; d=google.com; s=arc-20160816; b=awn3O00uLyX6yN6CRzrF78s4tE2uV4PTmZrQprJTg4YbuQ6C1fjLbPVPVw+nyJRP1q Vi6vL1vTtUxk3yqvO/BCQSVsdcLy+21N1OjnGVqjKvSXv6En7BPczXyU2v5CO7tlHwSl T6c5IQ/ZUcFOGMea2ZgCpNStRPw12Ze31kobom7poumVM6Cx1QTx3j+Lg2Nk9ACL8XbL gT4TCOcFR/PlH9ZSSFr5D7E2oryIoqhxg5pafN/+OuWOkq94JD3XbzD/+p+CYvh8lsBf WjlZdd56vK5FQkiR8DA1F4lvvn5KdNUD4RymJVQR3sYbK1ApnM75ZNbSvh3UT48Pb1eb 8MbA== 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=EvGSaG5EWSG5vAEy04hLPeqUE+xgwnUH6+ln9iIoc84=; b=cTqQ7da51ktV3biRXAEeYD5OhpdPHfF8wt4ItZdBKexSrByEsjyi0+FFjH07Al448T JmJac3tgvgvcxMTk/aITe47rEQewW4NZx2JNlMjB3oIlxDhi+5u2wr0GgQafXocyjxIq qrTRroAGWHFQKnGEhvwmvWNaQciejs91m1hoK8W8GMuyF/uBeso4Krc6/N7x1Clv+5PG j8yPrWtJlbX9W75DNn/+euVgMvBJmDAKNgNdF8hutn+NVdhPNp70pJRa9migekIoP9+f 39tMFZVhVlzDzjCIdqa0Qig30k+QRFxcyyVGm2nurmVNMnOmQJzKQQAU0wiRvZSBXlP0 yyjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="EhNpAR/t"; 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 k26si13058899eja.58.2019.11.18.21.52.49; Mon, 18 Nov 2019 21:52:49 -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="EhNpAR/t"; 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 S1731947AbfKSFwq (ORCPT + 26 others); Tue, 19 Nov 2019 00:52:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:50516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731006AbfKSFwn (ORCPT ); Tue, 19 Nov 2019 00:52: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 5DCE620721; Tue, 19 Nov 2019 05:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142761; bh=cj5u95BnEoI4lNCshidUefaPX9ljRH1R6f9BmPwhev4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EhNpAR/tFnLXSMXYn4Ahhg8jr5cGJSjVOizRfW6uflPHuFvWt4ex0i/dx3co79eZN 5XD0nwHjt4pkjk2UTjdInE6cjUc+GtKhWI0HkZZmHTyBbCHWsKSp3/J9X1rIPxVETs PICLHXwEeXM+t99+h89ex9/SK8wXdu9+2F1GbjMw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Suzuki K Poulose , Sasha Levin Subject: [PATCH 4.14 191/239] coresight: Fix handling of sinks Date: Tue, 19 Nov 2019 06:19:51 +0100 Message-Id: <20191119051335.581613698@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 e571e4010dff0..366c1d493af35 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -140,12 +140,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; } @@ -347,8 +349,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:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179706 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp171390ilf; Mon, 18 Nov 2019 21:52:55 -0800 (PST) X-Google-Smtp-Source: APXvYqwZmpr775HMqFtiMFhy/de4KjDPx5WsRsfzw4mStJnfB3ECtYzMOVudW0U7Jy7ETIcXKCZ1 X-Received: by 2002:a17:906:d210:: with SMTP id w16mr32545999ejz.86.1574142775436; Mon, 18 Nov 2019 21:52:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142775; cv=none; d=google.com; s=arc-20160816; b=vUehGCuRMoKvcVgKdE1WZzzoEYGH012tzjo9DElWXdhd4P1LR2gz8c8VxGXJqWu3BV QLtyjXE408cTXMFZiTfYrH7WDL4f9aHt5n6CQli2XZ/LGc4C11B3h81R1yqFyawTm/Ym HK4R0xVBM+/a63Kkdnz/gUc556lhA0ZqzSHIOSgutpl/wo1bGvgu3/24g6LiEF1ezrTO qBofwihu03Yh94TZN5awrpHzTa2Nq0IUT+4TEYp7Rlfb9DnYpHjoza4yDDtAw6JzJlDe 7zajrBb0Joi06s3TddYpmD6z7wHSI0k1YOqQLY74HBCx5RGx896EK1Mi5VhpeMjQLLkk Y6tg== 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=876XxU+Jjcpp5gf/rJMXREzt7qE/PfPPxNU94GuCpR0=; b=mHx0BzkpVjks+G6Q0Ui+kjYMqIqc340BvpiH9yooW1kLmOKMKRzJnDwHIFSrqIZXot 2WeNsmfQPjW671m5F/H05KecIuf3jy8Gc5HIOS3vDVSvqKTBu333riSXHrT1pok0FTBN SsK4I6BYrxY5ktw1coSlkIbwi0p4nMEKPOUCDt3Hek2fE5FUaqG5desEWX+Cl8w+TxAx R47KnlKN6Gkfx0po2e0Bl1U2eGTFTjMB/ri7hssKOMsrpkBOkuVLzGJV/JsyHmcv5YUQ nJm0r3DvAoabVf1zH/ElC36ookuMNfVnvxHipxYcJaOAwUQDQpg+RnaVqEOop2Zh7x5E R4TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0hPq5tpG; 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 f2si13403345ejd.369.2019.11.18.21.52.55; Mon, 18 Nov 2019 21:52:55 -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=0hPq5tpG; 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 S1731958AbfKSFww (ORCPT + 26 others); Tue, 19 Nov 2019 00:52:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:50598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731290AbfKSFws (ORCPT ); Tue, 19 Nov 2019 00:52:48 -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 5D03520721; Tue, 19 Nov 2019 05:52:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142767; bh=v1U9l228jWqtWhwzn9ffmWZreUwxYYHeC5kYUpJ+idU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0hPq5tpGOZGW5uE30QL0tIlLcOMFeqLIrireI/abJX1d3znQMOtlkJjkv0dP9gtWg U2nMmDPgz592zY7aKAX0vIRQwAULTvS/YMnpExZXRZm6hzZuGqtamj5sMR5drvVYiy K/cPhWvdeiROKIOOoHAg1QuPeqMnDXge1TlqicYs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Suzuki K Poulose , Sasha Levin Subject: [PATCH 4.14 193/239] coresight: perf: Disable trace path upon source error Date: Tue, 19 Nov 2019 06:19:53 +0100 Message-Id: <20191119051335.791779034@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 99cbf5d5d1c1f..69349b93e8741 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -317,11 +317,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:20:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179714 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp174289ilf; Mon, 18 Nov 2019 21:56:17 -0800 (PST) X-Google-Smtp-Source: APXvYqx8h+HHnef9mr5R0Zd18JEI+uhI5cEWyHUJKQ3rEqIr44AxPOuj8H3DcL8ksbZHrVjGdoZm X-Received: by 2002:a17:906:b80f:: with SMTP id dv15mr33349705ejb.188.1574142977576; Mon, 18 Nov 2019 21:56:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142977; cv=none; d=google.com; s=arc-20160816; b=q8qIDGk9OQYz6F3M5AbC3MTeGDhDvnvSC/0WkniGDoiQnKY3NBOGCdScsaVl1TEJj7 mm/0tgsUqzz2rFhEk8Sjfnv1+WnAlJMepWHz/6QY5PWmRlNdkybgCSoC72dpGwMMCwDC 446AcuGSPVLk17g1S2nkkrsjDOhmXUhmlWBTm5iSjP2WGOJU1WP/m9VqSdQpS4FjIPEk gjLwXQmV32Jh92w85loQZcjd/zh2TEaWx5qYUwd6RIJoCjXKctJArAhjfQbVQOYoInOX xRB1LbQLJd4S4H1qus/h5D4Sx+TjW03XFaJzAFcywUYMf333w0EQfyN/BLG0Z4wJPSkU 5/Qg== 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=YBEHWrx4iYLtpIRqOeo64rvkSYHnvnuXaPOkj/gS33M=; b=i/KUmaRKP9KEAUQ/DZ0lpcY9/lXUvSAMnpTBkvc9kY0gvwoZH25sGh/di4/zxDhoQ2 8MXj/UTtRwL7PfpsU50jz9dzAppgLBmCeWcoTtgwnrxH9MetWJStEAQsfjUOh1kIoS9W vl5ML9dA/IppJaqECH2gO4etcJF0D1Zyu4HFhDtthy8K606GiP2E1MR8Bbal0yOvzSdf bfop6IP25HOsJJSKxBLlN6nUI+nxCLCPmZ8NwDkTg0rw2haqby1sJN2prVlkly2wJul0 bQZTBaFGpKuKAe1v7t3BVdejC1pK8VBicCGl5STa5fRt+GkAzTUesGdcjQCeDsY7EHL2 T0/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UW0nXiSB; 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 si11si13263931ejb.71.2019.11.18.21.56.17; Mon, 18 Nov 2019 21:56: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=UW0nXiSB; 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 S1732064AbfKSFxr (ORCPT + 26 others); Tue, 19 Nov 2019 00:53:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:51700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727237AbfKSFxo (ORCPT ); Tue, 19 Nov 2019 00:53: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 D7E4C21783; Tue, 19 Nov 2019 05:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142823; bh=BpnwpGuXXtlyoebxNxuNBkJRbnnyc53jKXJmL7lQueM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UW0nXiSB63F0V4iJuBoZCpGvyiIlGP5k6O52KBhI6oS9oe2wZtHmfCCi8QSlfBGWq UpcdUTAmzFB70dosSOzJUHbiHcHgibFHL2kaDknc008IYJOEKP8B3NkOPfTEBaCDLL 8HcA3EoXzs/bqtEPmzL72vIpTQtPJGKJJqwtQQwQ= 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.14 210/239] ARM: dts: realview: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:20:10 +0100 Message-Id: <20191119051337.959920534@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 e2e9599596e25..05379b6c1c13b 100644 --- a/arch/arm/boot/dts/arm-realview-eb.dtsi +++ b/arch/arm/boot/dts/arm-realview-eb.dtsi @@ -334,7 +334,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 c789564f28033..c1fd5615ddfe3 100644 --- a/arch/arm/boot/dts/arm-realview-pb1176.dts +++ b/arch/arm/boot/dts/arm-realview-pb1176.dts @@ -343,7 +343,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 3944765ac4b06..e306f1cceb4ec 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -480,7 +480,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 aeb49c4bd773f..2bf3958b2e6b9 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -318,7 +318,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 4a51612996bc2..a9000d22b2c00 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -304,7 +304,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:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179713 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp173969ilf; Mon, 18 Nov 2019 21:55:56 -0800 (PST) X-Google-Smtp-Source: APXvYqz6Qja3Fjc58yGYdCw0ouOQ3i99HsXCDpCMmKzed+cH7/uDsTi+KS1uRgHSRIqi43xd9ddx X-Received: by 2002:a17:906:344c:: with SMTP id d12mr31172730ejb.227.1574142956174; Mon, 18 Nov 2019 21:55:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142956; cv=none; d=google.com; s=arc-20160816; b=lqAxLFXQQsgcQaEO7L+FUWrfLlskAYPTe9NfOA9rr//8Sgvswx9bEotRutwngATIKg Sc0HSpAmO6R6Tp66GFOTU5Dch1xnFAtvTkyQ9xcs9R9lJb+8eY5UOqUhSXDypguYNmFB 2vhJCK1dRZnMHxjM0qWhWOzCnYeasxvF8wHdU47s4cuh/+YFsuXqXORsZrWSb2ph5hw9 NWQ7V30+UIv1/8hYU2FO01vG6g5MJggPEcOwB2IsPeVj9zYCcvOeU8Q4UdUzfGYw+8sk CRI38NB4x1A/YVpuDUH+xjFfgIAM8h66vH49OdA3rWTY4ceSeb8/lKj4G+yGvJ/ahhh4 ywkQ== 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=X5FWSkLIn4jHyUZYe0xCNnqNjQ+07y2HJhtOqTFZBnNJNmgFAalz5G+ecnTxQDbv/B zgA75YxjdfSK1jrKApzsRmPbM+6Z6SrNE1rIc3TO6eHT1K8acbQtrXjvhdbbGOzcZo98 o10Nph8slvjzIz5fxOKctyEZBVWuzl5IH77TmBqQJHS1AUzCPQOn1c+Al34geXHfwlpD 304pVyB6r0/7TGhWEbo9oX9jcW2gmIlvylVLpgpVZaCMWS8niLDIo5Mo+phIbBBOYW+k hqVr5QSI1wtwP8U2w3eHA5aCFbJ1+76N7qvcM63bpsLvEbDZPhAz6F1CIVLXqYf5Yl00 4gGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qZO5rlO3; 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 p29si16574540eda.104.2019.11.18.21.55.55; Mon, 18 Nov 2019 21:55: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=qZO5rlO3; 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 S1732162AbfKSFyd (ORCPT + 26 others); Tue, 19 Nov 2019 00:54:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:52626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732150AbfKSFya (ORCPT ); Tue, 19 Nov 2019 00:54:30 -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 6173221783; Tue, 19 Nov 2019 05:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142869; bh=kiO9wqUjASzmMINbaT3sESNlTQfAAWLNzXtu9pP1MHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qZO5rlO3U+JA4BbkkdmxBN12OreBpAITLcQRoqWXxwLX4amlFMMX8JBT1Kpuz8FAa 2p4jzdC+XcSBJL4Z2pKTdHM7AI6vZS9lr5ozGZ22/U/4A5xwgrwdFwFjnNb130H5Yc hu39RJGxUYQb21Na7lx2nSIgn/v7mcloRIY6rB5A= 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.14 229/239] arm64: dts: amd: Fix SPI bus warnings Date: Tue, 19 Nov 2019 06:20:29 +0100 Message-Id: <20191119051341.035728139@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179711 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp172870ilf; Mon, 18 Nov 2019 21:54:43 -0800 (PST) X-Google-Smtp-Source: APXvYqxNpD1jH+ralG1VMxXT0v1nyGLw4q5H4Ys7228dVe/UXS3p3KNYipjeF+gYGzuKonH+W+Z9 X-Received: by 2002:a17:906:9458:: with SMTP id z24mr31781164ejx.289.1574142883193; Mon, 18 Nov 2019 21:54:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142883; cv=none; d=google.com; s=arc-20160816; b=0UsfJYZAbbnEJtByW57qxjSG9IQNNO1KIrr/v5uNQFZTimcoNHMlnokTHU97s2ESdQ 8KEkICPSZCP4DFWsuaeSATH2ZRNK+JXKq2iy7/mJhIvd/JGsE3P7J84WuQf2pBQzKYen Xzu81SmYbIIroURJyR3U5GJ5DjXyRB9r9UNBJGKICou1MwE4+OMlIAC67W/nC/FvTmdx Ol4yN78v1yxLD4Jjj7dzL7V01F9+Q4+gYrMUycEO3qW4Eyki0pKDCe7rrqMawUjoKxAz 5wmp2hGY0+dCJO73SBRhBB/bl8msm8/hnWS77+WIqXHOLYazSA+4IXuj9Dp7L0JAgLE6 +GeA== 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=nNgLyLnBz6SGZ41v29dxE31DFk4U82fSbm8LPkmSo0M=; b=uQ06aXtz4lguup0xPtTbBKIDGVO/aATcASZDnlThLpSgPstIw9YMo+3Ny5iFVKfN/d VuhUTUSiDFuYw6EMW9FL8TiQtvxNT7EqD53XIUlDErTZwVWmMpm7LSi6/PxWx65uzSov qUxTcxOSLIs7o4lCjONt9gt0oFf7nyvIa1qru6eKlrYNFtluMJuG87dtZ1y9cRl8QDmX Cxlv2KUjPydII0mIPLskzAU28fTs5MgHhug0iaSapiSVAub8vuzBfQ0q2/UM7kF2pN4x D4PtTNgxeIfPkl0uggl1e1PPvHqRYtUmclJIOCxt3NyAcwtJdwWpguLV9QPxkEamREcL NB5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=U6RyDnSB; 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 z10si13274631ejr.262.2019.11.18.21.54.42; Mon, 18 Nov 2019 21:54:43 -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=U6RyDnSB; 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 S1732183AbfKSFyk (ORCPT + 26 others); Tue, 19 Nov 2019 00:54:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:52794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729381AbfKSFyi (ORCPT ); Tue, 19 Nov 2019 00:54: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 612652084D; Tue, 19 Nov 2019 05:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142877; bh=ToBINYNxZf0/G8tKbyJuc5TqDI6FpJiRLAhYijE7A3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U6RyDnSBK3V5yBpTFOPWVocySqAdB8Wc4Pb3Kn49TuuCEQDIRB4myDVSipMRSLILa Ylzf4Qmm73KU+yahKP9oHSaJ7iVg1mpCV5Rdxq7gwECXfD3FOM7V1KutLCG96BhMVa MDqpUVPKPzLGq350m8D8W/hnwvYDGQqf+k6eH3Zo= 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.14 231/239] ARM: dts: lpc32xx: Fix SPI controller node names Date: Tue, 19 Nov 2019 06:20:31 +0100 Message-Id: <20191119051341.567802594@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: 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 f22a33a018199..d077bd2b9583e 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>;