From patchwork Tue Dec 3 22:31:11 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: 180748 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2152741ile; Tue, 3 Dec 2019 14:46:58 -0800 (PST) X-Google-Smtp-Source: APXvYqy+LQqzqjOL2EFzHHeCzaztqi1oEcBbUwPAuz99YVLogrkrb15IUwvVmDGR1CeE3z1ezxe4 X-Received: by 2002:aca:60c1:: with SMTP id u184mr320265oib.75.1575413218527; Tue, 03 Dec 2019 14:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413218; cv=none; d=google.com; s=arc-20160816; b=mqMMNKGphcKuMwkgqCLhhp2bOlOr1/+c6AojDSID393uFBOIdCrcG5/s5TcbCw+cp0 PhY6ZHMv5cOwCxHP4ToR0H04kZOxfd986/Sos83esSnX78rRtQhz+MN4Nigg3dHMBJ2v 4eKLEkZeec5JFkoXHGOqRSOP5WVjbc/yF0jYeHPlU8xQvXIy0F9LsLbhO15vimnhGdNL v1nAq9OXX+l3dDqHAAnEBmlJMjeibauld4LKI1ooq3OF0mVHslYUB9SoYxxCWNqJW6ut tk1itDthG4Wd1bbx+K1z6MF8H2rYXzpId5KmoGGKevf+4jCOm0m0dnLu4IPC3/IlbQju Rozg== 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=+cvpA14HddYoVLghS762PGcRIyNxb3sMuCIwasVsX5U=; b=aFDrd9H0GXvCwdyH2l13rkYw9jmqQ2SrKZz8GPpyyv+j+Yy89MjLu6NMEL49qYclqh BAXNhHOT1bb5xh+3YDe0NnX+JRRD2O4Xrpim3fUzUGtcI8w/uDmfxu0Gq/cq+bQ/U2Yx 3Gs3xbjOb8yp47UruTcYcRZ/ZqzvRgA0ngAYbFSb4C3S/xTkqeoXdktNthybKnXZ4Ymz Whl/DYBxmIczMZO4KHBHnH4McPQHS+XFOXRTD8XPYBl6FoVk2GKs9VDHSuhGpth2KTTZ HwrqOeekUC8Ie2VbIkspXBQP8ZZLim7uSkidirp0UbsC6AowozEyaF/0dNYOkIhnFOUi B/Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ONQFrvRd; 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 t142si2236239oih.242.2019.12.03.14.46.58; Tue, 03 Dec 2019 14:46:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ONQFrvRd; 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 S1728984AbfLCWq5 (ORCPT + 27 others); Tue, 3 Dec 2019 17:46:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:36848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728928AbfLCWqy (ORCPT ); Tue, 3 Dec 2019 17:46:54 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0CED32084B; Tue, 3 Dec 2019 22:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413213; bh=IILRwKX5JU4fvX0qq9X62rY/7UubGIGOWqV7gSA4zR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ONQFrvRd4Zy5KtsF/DqUzUJpoyzq70O+22vXyQkOiKxCKx8DsBWNNCRjei1qFa8PN LqT20j/r+5rTmYpp434V8Jb1xRXTafc7MIXjb2k20NLfKsZ4nzfCjNWRkVsSzOxT9p FMnXgwWNzYMVpyAGpeCTwqdKI30otPLnrbKFmquc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kishon Vijay Abraham I , Philipp Zabel , Sasha Levin Subject: [PATCH 4.19 005/321] reset: Fix memory leak in reset_control_array_put() Date: Tue, 3 Dec 2019 23:31:11 +0100 Message-Id: <20191203223427.401475019@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Kishon Vijay Abraham I [ Upstream commit 532f9cd6ee994ed10403e856ca27501428048597 ] Memory allocated for 'struct reset_control_array' in of_reset_control_array_get() is never freed in reset_control_array_put() resulting in kmemleak showing the following backtrace. backtrace: [<00000000c5f17595>] __kmalloc+0x1b0/0x2b0 [<00000000bd499e13>] of_reset_control_array_get+0xa4/0x180 [<000000004cc02754>] 0xffff800008c669e4 [<0000000050a83b24>] platform_drv_probe+0x50/0xa0 [<00000000d3a0b0bc>] really_probe+0x108/0x348 [<000000005aa458ac>] driver_probe_device+0x58/0x100 [<000000008853626c>] device_driver_attach+0x6c/0x90 [<0000000085308d19>] __driver_attach+0x84/0xc8 [<00000000080d35f2>] bus_for_each_dev+0x74/0xc8 [<00000000dd7f015b>] driver_attach+0x20/0x28 [<00000000923ba6e6>] bus_add_driver+0x148/0x1f0 [<0000000061473b66>] driver_register+0x60/0x110 [<00000000c5bec167>] __platform_driver_register+0x40/0x48 [<000000007c764b4f>] 0xffff800008c6c020 [<0000000047ec2e8c>] do_one_initcall+0x5c/0x1b0 [<0000000093d4b50d>] do_init_module+0x54/0x1d0 Fixes: 17c82e206d2a ("reset: Add APIs to manage array of resets") Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Philipp Zabel Signed-off-by: Sasha Levin --- drivers/reset/core.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/drivers/reset/core.c b/drivers/reset/core.c index d1887c0ed5d3f..f7bf20493f23e 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -607,6 +607,7 @@ static void reset_control_array_put(struct reset_control_array *resets) for (i = 0; i < resets->num_rstcs; i++) __reset_control_put_internal(resets->rstc[i]); mutex_unlock(&reset_list_mutex); + kfree(resets); } /** From patchwork Tue Dec 3 22:31:15 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: 180749 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2152963ile; Tue, 3 Dec 2019 14:47:10 -0800 (PST) X-Google-Smtp-Source: APXvYqxWSei2Iw1bkClaMkKbY7WO6ISFWbPWIvWlNiycAoLhUFyi6rx8yR7UlNsPxR5YdmEjw3Yz X-Received: by 2002:a9d:7612:: with SMTP id k18mr233272otl.44.1575413230693; Tue, 03 Dec 2019 14:47:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413230; cv=none; d=google.com; s=arc-20160816; b=RZBdeVgfE37Vq1hKF5/TrLjOvSfZ5sNoS4fWNnzkYVK/FcD7EEYlTGtcqMqRIFt+qY 7Ek0k1Hb1niHDkZx+xVSr+fhiwKOiE70D2MJ45U3Wp9zHwanqB4ziNUvDvPiRy/gES7W NNF4AcfH+YBL3P5dy3Vh7Sp0zNJTIDK6Y22Kiw9bQSakdzNkE+TRhq6czi1iyiKljRbZ qxF5TReV4BQwXxB9SjsTtskTKVwMJVl/6k7etlNI9w4T1/xAExYBjnePmbzuPHqq0lql g+/NsuBTo80Vhn3IpNTH/luaMpX0lnTvtAu6XCGs6Lx46ZsXX74VulrqCLrkXx+3tSxy N4GQ== 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=DoxIoK0gcAggquiiUQWLru7YGdfyvqKgGShVGa/M1Ak=; b=Du/3NARJLcsLt8+E0ktjQa46DGfOL2sbftUIEk+9jC129RCpLWggoR3wnGv9t5FVO9 NoggtvWSyKREA9CaBQ4SAJPEy8QDDFk9QalYnwZ4nyqfdzf+uXVxThajjHpUII3HblgH 6UaXTFalOu4MRgDZHcgMrVEIp+0EDobwrqNVCOFbo3LSedC39QKcQb65jg/qoQSBQIfD T3shFBqsZbSytoJC+aWhDE6t0T4F+NE9cCoEBon4XYe3DmvcQuYXBHSsfnicQsdEh4Un 0EmbiuDimypTQLpjOwtqWcRrLEWGkKNKqAkxq73WLn0C6Dhlsw+zsoki22hYndOlK3UI 1LVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1o5r/nwf"; 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 v19si2171699otn.313.2019.12.03.14.47.10; Tue, 03 Dec 2019 14:47: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="1o5r/nwf"; 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 S1729011AbfLCWrJ (ORCPT + 27 others); Tue, 3 Dec 2019 17:47:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:37108 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728366AbfLCWrF (ORCPT ); Tue, 3 Dec 2019 17:47: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 9B7E820848; Tue, 3 Dec 2019 22:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413224; bh=4ZcsvoMK3RPGa38JXaoPa51rrnxfLzp8nAkqbLym/nk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1o5r/nwfVHoFLuzBVtLW5H3K3jCIk3Du4JRU8SjK00u3JiC1JteMv9hl/eiRqM1sH 6h5IRrVZ87gWdhLSkFCq2Df9XhBvgZOnD6QjzfXE7oD/NX2NFaKaY/Y443IFxhmM/2 jeETSKszlpCpxwHU6RXfmWVx3QSjj9L1taGXWcfw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Reported-by: Marian Mihailescu" , Marek Szyprowski , Sylwester Nawrocki , Sasha Levin Subject: [PATCH 4.19 009/321] clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume Date: Tue, 3 Dec 2019 23:31:15 +0100 Message-Id: <20191203223427.605281159@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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 e9323b664ce29547d996195e8a6129a351c39108 ] Properly save and restore all top PLL related configuration registers during suspend/resume cycle. So far driver only handled EPLL and RPLL clocks, all other were reset to default values after suspend/resume cycle. This caused for example lower G3D (MALI Panfrost) performance after system resume, even if performance governor has been selected. Reported-by: Reported-by: Marian Mihailescu Fixes: 773424326b51 ("clk: samsung: exynos5420: add more registers to restore list") Signed-off-by: Marek Szyprowski Signed-off-by: Sylwester Nawrocki Signed-off-by: Sasha Levin --- drivers/clk/samsung/clk-exynos5420.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.20.1 diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c index ce30862617a6e..d5af937212992 100644 --- a/drivers/clk/samsung/clk-exynos5420.c +++ b/drivers/clk/samsung/clk-exynos5420.c @@ -171,12 +171,18 @@ static const unsigned long exynos5x_clk_regs[] __initconst = { GATE_BUS_CPU, GATE_SCLK_CPU, CLKOUT_CMU_CPU, + CPLL_CON0, + DPLL_CON0, EPLL_CON0, EPLL_CON1, EPLL_CON2, RPLL_CON0, RPLL_CON1, RPLL_CON2, + IPLL_CON0, + SPLL_CON0, + VPLL_CON0, + MPLL_CON0, SRC_TOP0, SRC_TOP1, SRC_TOP2, From patchwork Tue Dec 3 22:31:57 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: 180750 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2153134ile; Tue, 3 Dec 2019 14:47:20 -0800 (PST) X-Google-Smtp-Source: APXvYqwsNtpSpUZfEHG2vhIethYafs5a2+XK8JpVNm4xuckpGoaO7guTUwm/dtNBjsfYYa3xZJYH X-Received: by 2002:a05:6808:3c5:: with SMTP id o5mr11004oie.142.1575413240402; Tue, 03 Dec 2019 14:47:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413240; cv=none; d=google.com; s=arc-20160816; b=Rv7VePY9GyMssv3N2/zi9JmNj7LWFDuazvE59M2MS6dRYzP6G33m310ygSJHoi1GpY OOF0NY3ORh5+Bt8YWnmu7gUtETxwn/RcGKUFMNGS3rBG7mieUraskkNPMaBhv+5/jiBd wyOHH1vGQiYobboPPtINl7Rl5qw/oXAW5NNCVKor5usIIOPm67hCxl8Mshz0Lm7rzdiO q4mwts/7u9E9jBy/yEBm1ITp2+dn3AdJB7TpgaD7TxsuMe2n/LRGwGMXNK3Xz/DPMY9L MNIJXK2GrWgecqk9rpALxgGfCWhM1CecgJng/SkFVRs330KHt09Asd0MBT0OqRylHsqP AR+Q== 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=usC9QY10WBBAU0643ziDo3loevkWUFOnugZmyiWqlsY=; b=zvo76DwNrirqCDQe6dg0Fp80so4v2pv2uSX6R8WsT7bZZSjb8HT320MZT2ce/wRmQU KfVf3lE1YH7MBwb+zlPMJQ67UXpF9meP8ZTcWJfmy9wTKNvwmPK1LfDMesUitXOsKT5p xlrrGnMHbALb/Z6V6a+eF2BZfd9WNM7/Owg8KYgIAOCnjrqOlFW2JAFigMWuhPBy4Tgv HkaYPU9Yp33rGogHQtZe7ot5rWzZCiMullJ9YJuEKEsswa24LjcHtWg74s5hew9vxrNb xuXLrdRiAiRhKld4886KZoXdDvIV8yAtouNKJbAqj74hUmdjyiCkBgoYL2oVXFyiVTEf oT6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jh5WenqY; 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 v1si2292960otq.141.2019.12.03.14.47.19; Tue, 03 Dec 2019 14:47:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jh5WenqY; 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 S1729031AbfLCWrR (ORCPT + 27 others); Tue, 3 Dec 2019 17:47:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:37378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729284AbfLCWrP (ORCPT ); Tue, 3 Dec 2019 17:47:15 -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 BBA842084B; Tue, 3 Dec 2019 22:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413234; bh=qxxjYPnh4PQsTATEX/9F4QwWxNBeIk0vs4XPtZpHA2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jh5WenqYfk6PzSORCcFjFpHfMkxz++upRbcxiI3xBFXBjwOjVoBaLKdtA+2YpvMp8 53E+8hr/our4Cho14CqC4tAP41JibMJutTx85aMx5ujjZWehMYsY7TSp3Nf9IQhmb0 OwKgP42wk4YBQFCrYrwTXoxALa0K+jTgjxOeoDfk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sasha Levin Subject: [PATCH 4.19 051/321] ARM: dts: Fix up SQ201 flash access Date: Tue, 3 Dec 2019 23:31:57 +0100 Message-Id: <20191203223429.817549855@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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 d88b11ef91b15d0af9c0676cbf4f441a0dff0c56 ] This sets the partition information on the SQ201 to be read out from the RedBoot partition table, removes the static partition table and sets our boot options to mount root from /dev/mtdblock2 where the squashfs+JFFS2 resides. Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/gemini-sq201.dts | 37 ++++-------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts index 3787cf3763c41..e9e4a8a02600b 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -20,7 +20,7 @@ }; chosen { - bootargs = "console=ttyS0,115200n8"; + bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait"; stdout-path = &uart0; }; @@ -138,37 +138,10 @@ /* 16MB of flash */ reg = <0x30000000 0x01000000>; - partition@0 { - label = "RedBoot"; - reg = <0x00000000 0x00120000>; - read-only; - }; - partition@120000 { - label = "Kernel"; - reg = <0x00120000 0x00200000>; - }; - partition@320000 { - label = "Ramdisk"; - reg = <0x00320000 0x00600000>; - }; - partition@920000 { - label = "Application"; - reg = <0x00920000 0x00600000>; - }; - partition@f20000 { - label = "VCTL"; - reg = <0x00f20000 0x00020000>; - read-only; - }; - partition@f40000 { - label = "CurConf"; - reg = <0x00f40000 0x000a0000>; - read-only; - }; - partition@fe0000 { - label = "FIS directory"; - reg = <0x00fe0000 0x00020000>; - read-only; + partitions { + compatible = "redboot-fis"; + /* Eraseblock at 0xfe0000 */ + fis-index-block = <0x1fc>; }; }; From patchwork Tue Dec 3 22:32:23 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: 180768 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2172426ile; Tue, 3 Dec 2019 15:06:39 -0800 (PST) X-Google-Smtp-Source: APXvYqx2Xvu7PHcl/lnsjPumi9toySbsffqR3FRtgNg/uxToSqkKFoHl644OaZDk8N64fCxgjKOc X-Received: by 2002:a9d:6315:: with SMTP id q21mr259540otk.15.1575414399728; Tue, 03 Dec 2019 15:06:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575414399; cv=none; d=google.com; s=arc-20160816; b=YheAcc0rk7/s85GlTcbCzP7lcdNfRqw8dVJfHr4Y+ZnfYZgy3sqLqa/m6F4LlWiBAp nBiYvsTJd6pUyViGEuwtr1YiCS+K5v5hFAS6Kg9tBvb03XN+ZHGZxcdSWjx0C5+Q3E/f VPtPpxoKKBbnJh9XYElDnOiEa2K94WT1z2UME3AQK03oTmwTOwFCM1UlrQrcJm/cXtL/ IC+wtabGCm+eB7i4mRYZ4wtDPFcvAvvDhDTAlg+0RLzR9wou0JRgBY6plKfUz8q7+oq4 Lb+2I7IzNj/kMa6DW1dBQnVCh0efaAYNj3lY0iaSrf4u/gfnkO03tyTBd8rQ5GSrWnCM GwTg== 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=qBsoLE6H/hP5XTo8iytyyMCtc0xAwGFEngH6mdlWWzA=; b=JRuoY7ZZE6eRcTNOhTYzSF4KR1A2IRrmlaWgTGnv58c3TKJYG4f/Gj4toEm2n4Nl9c qwQV2/WDtPqMQBT/sbgSgkInNeLZHwMTJx00L3g4yFW0Lc8xt85gKYg7QM+6hUWPdmfE LpyMO17pnSx5YTfbhCLasd/ciJDMf8N6YnOUlPmiQSa+Axu3rf+2X/XhFUNDCV22t/Vy UvJIfinin+jqCa1k+uPrEQynaEZWdrFaQpQ7mucsdfEILR2dcekD0Gs/v27Vv2JRnEz6 N4IbV2cnT4apPeyDPFu+QEHsEF2f247IcjTQR0QLapJ0vYOYq+ecxMGE4hwc/9/ki8/O I7+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xVnuhXVW; 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 i185si1763533oia.187.2019.12.03.15.06.39; Tue, 03 Dec 2019 15:06:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xVnuhXVW; 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 S1729449AbfLCWsb (ORCPT + 27 others); Tue, 3 Dec 2019 17:48:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:39134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729317AbfLCWs2 (ORCPT ); Tue, 3 Dec 2019 17:48:28 -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 3526820862; Tue, 3 Dec 2019 22:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413307; bh=MqOdMBcFN7cKpxoPq7s5s29VjuTXuCthvZFz0pCPqiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xVnuhXVWZfmQ7YneRNSsKvFjG9SGzV2N2VF9tCs6KbPohVzkh7eFeTVOdSfqy4DDB 16t7c0RPHGyVtOVkZf/bpNb0pgTqw7y6GtdnlLssfw6Kdocv8Sj1ZT4mQ1/2Pi/Qop umZ8XFE5rENHQR+JqLshkg0AYlC/eT7r8zJTVAfA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , "kernelci.org bot" , Kevin Hilman , Will Deacon , Sasha Levin Subject: [PATCH 4.19 077/321] arm64: preempt: Fix big-endian when checking preempt count in assembly Date: Tue, 3 Dec 2019 23:32:23 +0100 Message-Id: <20191203223431.166680020@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Will Deacon [ Upstream commit 7faa313f05cad184e8b17750f0cbe5216ac6debb ] Commit 396244692232 ("arm64: preempt: Provide our own implementation of asm/preempt.h") extended the preempt count field in struct thread_info to 64 bits, so that it consists of a 32-bit count plus a 32-bit flag indicating whether or not the current task needs rescheduling. Whilst the asm-offsets definition of TSK_TI_PREEMPT was updated to point to this new field, the assembly usage was left untouched meaning that a 32-bit load from TSK_TI_PREEMPT on a big-endian machine actually returns the reschedule flag instead of the count. Whilst we could fix this by pointing TSK_TI_PREEMPT at the count field, we're actually better off reworking the two assembly users so that they operate on the whole 64-bit value in favour of inspecting the thread flags separately in order to determine whether a reschedule is needed. Acked-by: Ard Biesheuvel Reported-by: "kernelci.org bot" Tested-by: Kevin Hilman Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/assembler.h | 8 +++----- arch/arm64/kernel/entry.S | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 5a97ac8531682..0c100506a29aa 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -683,11 +683,9 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU .macro if_will_cond_yield_neon #ifdef CONFIG_PREEMPT get_thread_info x0 - ldr w1, [x0, #TSK_TI_PREEMPT] - ldr x0, [x0, #TSK_TI_FLAGS] - cmp w1, #PREEMPT_DISABLE_OFFSET - csel x0, x0, xzr, eq - tbnz x0, #TIF_NEED_RESCHED, .Lyield_\@ // needs rescheduling? + ldr x0, [x0, #TSK_TI_PREEMPT] + sub x0, x0, #PREEMPT_DISABLE_OFFSET + cbz x0, .Lyield_\@ /* fall through to endif_yield_neon */ .subsection 1 .Lyield_\@ : diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 5f800384cb9a8..bb68323530458 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -622,10 +622,8 @@ el1_irq: irq_handler #ifdef CONFIG_PREEMPT - ldr w24, [tsk, #TSK_TI_PREEMPT] // get preempt count - cbnz w24, 1f // preempt count != 0 - ldr x0, [tsk, #TSK_TI_FLAGS] // get flags - tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling? + ldr x24, [tsk, #TSK_TI_PREEMPT] // get preempt count + cbnz x24, 1f // preempt count != 0 bl el1_preempt 1: #endif From patchwork Tue Dec 3 22:32: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: 180753 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2155099ile; Tue, 3 Dec 2019 14:49:35 -0800 (PST) X-Google-Smtp-Source: APXvYqwbTPlLR9d+CDH8+bfrYrvE1DYHuE97Ej4b8CsggqNXaf8G75jxRsU5rK/xQ/p6/BOXT3Tc X-Received: by 2002:a9d:2266:: with SMTP id o93mr193893ota.215.1575413375867; Tue, 03 Dec 2019 14:49:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413375; cv=none; d=google.com; s=arc-20160816; b=hXpY+nSntkAwTrJ480Njqr5ng/sqEuXEI0+5YTzOqQFDdFVgju8WUX0Jm5QMCHyJ1a 0juZQ4m4OoQYJM5ju97GHKUNpyVtzm/EpRqDFeFNNYppNNjYd98zKfZkhdyCJ13fb/9X ZRIucJbDPIK9psTucr+CAoqRrtDQ9wqySynlcjZEUZpOXBl0swGthCKitq44XhW5T8IN 7o1afS2T7qMQUOtnoil4LALD9bVhJC8MutUBaUeTo/9UVgYxKhQlsLVoJmZdY8PgsyGy TCITBV3LvwmYZ4FySjWjG1TAI3UQWbT1NPQSCMbq00FwcsyD4D2mzlWsQjCcomMH+nbO LVOQ== 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=pgOUEPOVLtDsPwHEWcZSGU5Af8tY3Qlchvb6KJSZvgk=; b=bzI4E/DLIXLXH+IfDS6my49OsHP88vWsP+32kAkYBWyifJwQYOb/Eun2COcLejlRze 6bZzWob3seTMsURgFB5Dv9XMfXcrLGGxRmRnBXP0Hhy3q2kqOve1cURfoOJMNC/8XtnV 0AxBlRIA+dYxKWvgVhxyZzGo5THu4U0+TNXnE9k1IoVcMYOhbg6CgW6j861eIr0AaEhJ 4hFe59t5Ki05/RIj/5B0C2ayvbe1t39ZuN73SyTOFUMMHI142ItDxRz2/UfPaGXqMtQm Ak/pMo25DRgiAKyTUjC5Ke0tsPlSPCeaEKmLvFkA4D8sT3xcwXdf4MJ+7nLSFJzukYdB m2ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ifcKgwam; 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 h9si2098427otb.49.2019.12.03.14.49.35; Tue, 03 Dec 2019 14:49:35 -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=ifcKgwam; 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 S1729620AbfLCWte (ORCPT + 27 others); Tue, 3 Dec 2019 17:49:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:40558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728727AbfLCWt3 (ORCPT ); Tue, 3 Dec 2019 17:49:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C9E3B20848; Tue, 3 Dec 2019 22:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413368; bh=x5uTloVlZUSZDG2pEyfA9m9Mh/alz08Ac7RdDVqdQwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ifcKgwamYJNzRAIuBjbIQweLGtvVZojKjecNdT+pqbH7IC5hvrzhu353x80+H/EIw 3/vfuUwJNVO69duZU78ZxH6MIhyLaWun7HkT7OZgP1C+3QaT4K+M9aWvAF0yH/wPGe k7xSrfjlfF8ndwlrIg9JZCEXKK2gb4itwrAbBn+g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Michal Simek , Sasha Levin Subject: [PATCH 4.19 102/321] microblaze: adjust the help to the real behavior Date: Tue, 3 Dec 2019 23:32:48 +0100 Message-Id: <20191203223432.461334672@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Masahiro Yamada [ Upstream commit bafcc61d998c1ca18f556d92a0e95335ac68c7da ] "make ARCH=microblaze help" mentions simpleImage.
.unstrip, but it is not a real Make target. It does not work because Makefile assumes "system.unstrip" is the name of DT. $ make ARCH=microblaze CROSS_COMPILE=microblaze-linux- simpleImage.system.unstrip [ snip ] make[1]: *** No rule to make target 'arch/microblaze/boot/dts/system.unstrip.dtb', needed by 'arch/microblaze/boot/dts/system.dtb'. Stop. make: *** [Makefile;1060: arch/microblaze/boot/dts] Error 2 make: *** Waiting for unfinished jobs.... simpleImage.
works like a phony target that generates multiple images. Reflect the real behavior. I removed the DT directory path information because it is already explained a few lines below. While I am here, I deleted the redundant *_defconfig explanation. The top-level Makefile caters to list available defconfig files: mmu_defconfig - Build for mmu nommu_defconfig - Build for nommu Signed-off-by: Masahiro Yamada Signed-off-by: Michal Simek Signed-off-by: Sasha Levin --- arch/microblaze/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 4f3ab57072652..eecf37276521c 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -91,11 +91,11 @@ define archhelp echo '* linux.bin - Create raw binary' echo ' linux.bin.gz - Create compressed raw binary' echo ' linux.bin.ub - Create U-Boot wrapped raw binary' - echo ' simpleImage.
- ELF image with $(arch)/boot/dts/
.dts linked in' - echo ' - stripped elf with fdt blob' - echo ' simpleImage.
.unstrip - full ELF image with fdt blob' - echo ' *_defconfig - Select default config from arch/microblaze/configs' - echo '' + echo ' simpleImage.
- Create the following images with
.dtb linked in' + echo ' simpleImage.
: raw image' + echo ' simpleImage.
.ub : raw image with U-Boot header' + echo ' simpleImage.
.unstrip: ELF (identical to vmlinux)' + echo ' simpleImage.
.strip : stripped ELF' echo ' Targets with
embed a device tree blob inside the image' echo ' These targets support board with firmware that does not' echo ' support passing a device tree directly. Replace
with the' From patchwork Tue Dec 3 22:32:49 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: 180754 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2155120ile; Tue, 3 Dec 2019 14:49:37 -0800 (PST) X-Google-Smtp-Source: APXvYqzDDnFabyayBmEZxxRPa58YznYJsWcwteKndJRXQSS76l6AoaqGyFrhPpk6eaK7J49fuwbU X-Received: by 2002:aca:889:: with SMTP id 131mr8394oii.3.1575413376994; Tue, 03 Dec 2019 14:49:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413376; cv=none; d=google.com; s=arc-20160816; b=0z9WWB/JlgZRA6u2FFCIv5iRtQOE6NWw10A/iaFPdy1esZm/OnDtbfr0+gAc/2eDK2 fbLx5lYO7iye2LbNtsNyg75DKXVBiDmnnOhmqpdIUGlBTF/8Y773l9lrnXi9K0IuDoUE GQ6McdXrhnhUKDyLJkCvJNzd1W6laF4jL2zQoEkXkltkVTB7MOFMY4PRmsei4DoX5c/+ TjzhK4qE3hl6dzM8I5ORMOJtga8x8WxLoNkJnG8pynbJfeZ+ADBVFhItQ0Uucsv8yYQo aLIsW/v22F/ob/ajlAYUrFn5bchmE/uTOwW5QGxfC7qJAKZpD+016NChMOlR2Je4yQaz lPoA== 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=hSbRDjYOGxuPKNh2c44UKyh9bXORRwTM2vZqvbXCILs=; b=cDOmQhWQ7RFAE2EOLyLy/E0T3/uXdsEca2kWTcjARApN36l0knRRQp7zVu8VRhh23z PoFjXyd0S0tXSQ6FL6G8E4G7W4F+naum1+kKzcktRyWee8M2mt6B4vtzvTblElR9YQSj FPOnEl1RrTwSBSQ3GRCtzFAiHdCZTaIGlcYsSA8I1oB1Nj7RHeRLBNptv00hljGyK40K eWvuhScZeNUUBdPCxb4AmHj+5V02ElZo+6nCG7yeQGeLcbU+TdfQmfHn1rWi0AaFQki4 jBikHADtuvxFhFZm+zORvbNxvzm4Sz4IL6UODFYzhsd96LM77TuyErzMBIUBzb49mAmX yn+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Kkg8MwD7; 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 h9si2098427otb.49.2019.12.03.14.49.36; Tue, 03 Dec 2019 14:49:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Kkg8MwD7; 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 S1729631AbfLCWtf (ORCPT + 27 others); Tue, 3 Dec 2019 17:49:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:40680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729598AbfLCWte (ORCPT ); Tue, 3 Dec 2019 17:49:34 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DB8CF20803; Tue, 3 Dec 2019 22:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413373; bh=tpMQY/rlyyIn86UBKd1SsiMcQ20Ssq/d3UGoJf6TAsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kkg8MwD7kVidVVUinWEr2sKHAf1clEzQ6vTLqoDsBfxKyywxcM0HtU329xs+iLDzY ZHlwBJ1Pqv/njy0nvO+j1+Tx47zhV9E8WbcQbPBwR5YOKUjwXpdO4sSbOuU/yWsaRO XOkI/V4wK/+duT352fZTSvNMmWTZ5VCL51s+nfvE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Michal Simek , Sasha Levin Subject: [PATCH 4.19 103/321] microblaze: move "... is ready" messages to arch/microblaze/Makefile Date: Tue, 3 Dec 2019 23:32:49 +0100 Message-Id: <20191203223432.512769633@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Masahiro Yamada [ Upstream commit 2e14f94cf4bc2f15ca5362e81ca3a987c79e3062 ] To prepare for more fixes, move this to arch/microblaze/Makefile. Otherwise, the same "... is ready" would be printed multiple times. Signed-off-by: Masahiro Yamada Signed-off-by: Michal Simek Signed-off-by: Sasha Levin --- arch/microblaze/Makefile | 2 ++ arch/microblaze/boot/Makefile | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index eecf37276521c..b9808ddaf985f 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -83,9 +83,11 @@ archclean: linux.bin linux.bin.gz linux.bin.ub: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' simpleImage.%: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp echo '* linux.bin - Create raw binary' diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index 600e5a198bd2a..96eefdca0d9b3 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile @@ -9,15 +9,12 @@ OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary $(obj)/linux.bin: vmlinux FORCE $(call if_changed,objcopy) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE $(call if_changed,uimage) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE $(call if_changed,gzip) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) @@ -35,6 +32,5 @@ $(obj)/simpleImage.%: vmlinux FORCE $(call if_changed,objcopy) $(call if_changed,uimage) $(call if_changed,strip,.strip) - @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')' clean-files += simpleImage.*.unstrip linux.bin.ub From patchwork Tue Dec 3 22:32:50 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: 180755 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2155166ile; Tue, 3 Dec 2019 14:49:39 -0800 (PST) X-Google-Smtp-Source: APXvYqw9XDOwC1oJ+IBa1UNpH08QAZ0rS01Q7INR96zdgVgWDhSIQBxFWhWDOpzdHPIZfVasWGzm X-Received: by 2002:a9d:22a8:: with SMTP id y37mr180869ota.359.1575413379892; Tue, 03 Dec 2019 14:49:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413379; cv=none; d=google.com; s=arc-20160816; b=higduXR/2ow32un7zEUoM6h3Tv8WusOB3BUM+MF8ocyBOzdEdD2el/h20mKMMt3Cyh umtGNO9ABueOCCdhevvwFu4iFhig5aD2fgRlvchxMytEgRUaZrLOS9P1Ay8xCLcTFmUP 2Tr0pba3nMfQsxHrFPdIsDiTzMpqrGps1F3Npbho9JjfAySikDDeA396QRfjd889ySxL Hs9vsTyLaOR4zAGURwxvt4eV9xeOpuTfcELgx52av05LIgIoA7vFYrp+1Z9xAY4RVeO2 AZdZc78Z0XvCv3++ZyCZyh7hLQp1EkPS3heKdnNSZG5QIMZcsA9cfaTdsAnf8LeuCVcp w5nA== 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=RdQXFox+WdioE5vGr6+unl7pl9mPLvNCc28P/8bv8U8=; b=vdm2b4mSg8mb6zCGODrv+j1RaxJ6LGgCiRw2JYzk0vxcImGAhGxKWwbUnl3TcgLNLB ZK6Y+vrRabzQ5FMDWMJD6WZFtX6XCWm7UZOEkB3ZDi7WftAGycjSqxFxG7pghy6BTfy4 llfrXP3Y2ExxDJPjp321fcV9sJ+8GKKynYQSM3/hmhNmQYxE13i6mjaU5y/yYz66blF5 Fl14NaLalLm1iqwNAhDK+thKgiv+7Wa8sZ4lHR5JCGBjoh73F8BUe+opvMlXM4ucm/eK pfZOKlqm9xZ5eAh7EZ8JfRFaGz0OpW2YlcwkHgPs1YFiMTbnPAwSeJsYekKEdmL7AK9H 9AJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dh2nCtq3; 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 h9si2098427otb.49.2019.12.03.14.49.39; Tue, 03 Dec 2019 14:49:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dh2nCtq3; 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 S1729638AbfLCWti (ORCPT + 27 others); Tue, 3 Dec 2019 17:49:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:40754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729392AbfLCWth (ORCPT ); Tue, 3 Dec 2019 17:49: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 0F5EC20803; Tue, 3 Dec 2019 22:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413376; bh=IJ+0jeSZb9ortcdzj9j4dxSaRyrGAGfxWZNhRfCNZIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dh2nCtq3NxkcF2T+P8bBJ3pskQphlxfTiHfPSa2H06pvBIUjw0Fb3da2Bpadzcd4g rtQhDfqGIuHFrJsKYT1xFRWEbdPqt1XAsFhz5b2MX/VrYYgKdVtu1aBPxQFtkCndyS b6iPwwvInXhrKpSKIob8ZyiU8bU+SEeUp1Iz4Xww= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Michal Simek , Sasha Levin Subject: [PATCH 4.19 104/321] microblaze: fix multiple bugs in arch/microblaze/boot/Makefile Date: Tue, 3 Dec 2019 23:32:50 +0100 Message-Id: <20191203223432.564066598@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Masahiro Yamada [ Upstream commit 4722a3e6b716d9d4594c3cf3856b03bbd24a59a8 ] This commit fixes some build issues. The first issue is the breakage of linux.bin.ub target since commit ece97f3a5fb5 ("microblaze: Fix simpleImage format generation") because the addition of UIMAGE_{IN,OUT} affected it. make ARCH=microblaze CROSS_COMPILE=microblaze-linux- linux.bin.ub [ snip ] OBJCOPY arch/microblaze/boot/linux.bin UIMAGE arch/microblaze/boot/linux.bin.ub.ub /usr/bin/mkimage: Can't open arch/microblaze/boot/linux.bin.ub: No such file or directory make[1]: *** [arch/microblaze/boot/Makefile;14: arch/microblaze/boot/linux.bin.ub] Error 1 make: *** [arch/microblaze/Makefile;83: linux.bin.ub] Error 2 The second issue is the use of the "if_changed" multiple times for the same target. As commit 92a4728608a8 ("x86/boot: Fix if_changed build flip/flop bug") pointed out, this never works properly. Moreover, generating multiple images as a side-effect is confusing. Let's split the build recipe for each image. simpleImage.
*.unstrip is just a copy of vmlinux. simpleImage.
and simpleImage.
.ub are created in the same way as linux.bin and linux.bin.ub, respectively. I kept simpleImage.* recipes independent of linux.bin.* ones to not change the behavior. Lastly, this commit fixes "make ARCH=microblaze clean". Previously, it only cleaned up the unstrip image. Now, all the simpleImage files are cleaned. Signed-off-by: Masahiro Yamada Signed-off-by: Michal Simek Signed-off-by: Sasha Levin --- arch/microblaze/Makefile | 2 +- arch/microblaze/boot/Makefile | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index b9808ddaf985f..548bac6c60f8c 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -86,7 +86,7 @@ linux.bin linux.bin.gz linux.bin.ub: vmlinux @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' simpleImage.%: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot) $(addprefix $(boot)/$@., ub unstrip strip) @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile index 96eefdca0d9b3..cff570a719461 100644 --- a/arch/microblaze/boot/Makefile +++ b/arch/microblaze/boot/Makefile @@ -3,7 +3,7 @@ # arch/microblaze/boot/Makefile # -targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.% +targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.* OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary @@ -16,21 +16,20 @@ $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE $(call if_changed,gzip) -quiet_cmd_cp = CP $< $@$2 - cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) - quiet_cmd_strip = STRIP $< $@$2 cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \ -K _fdt_start $< -o $@$2 UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR) -UIMAGE_IN = $@ -UIMAGE_OUT = $@.ub -$(obj)/simpleImage.%: vmlinux FORCE - $(call if_changed,cp,.unstrip) +$(obj)/simpleImage.$(DTB): vmlinux FORCE $(call if_changed,objcopy) + +$(obj)/simpleImage.$(DTB).ub: $(obj)/simpleImage.$(DTB) FORCE $(call if_changed,uimage) - $(call if_changed,strip,.strip) -clean-files += simpleImage.*.unstrip linux.bin.ub +$(obj)/simpleImage.$(DTB).unstrip: vmlinux FORCE + $(call if_changed,shipped) + +$(obj)/simpleImage.$(DTB).strip: vmlinux FORCE + $(call if_changed,strip) From patchwork Tue Dec 3 22:33:00 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: 180766 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2171269ile; Tue, 3 Dec 2019 15:05:44 -0800 (PST) X-Google-Smtp-Source: APXvYqzgahFFjzKFgUYT+d95WR1BtXK58T93qDmRruiTCiJ1Debi8aJiGCFty00FLIC2T/pLTU7f X-Received: by 2002:aca:411:: with SMTP id 17mr65039oie.5.1575414344483; Tue, 03 Dec 2019 15:05:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575414344; cv=none; d=google.com; s=arc-20160816; b=cSmb7y3IU5S7PRzRNnEL6HqbBRyTPuKCZW7ejXt9iyKD/OHCaMymplWypO0JZjfxZm J5xRnaUY59Rv6W6TbYSp82wEBMHyT5/RKDMVyQypcry3OAbXXaN/Qraz0c9EaLlRxFWi 5fXibwWLSHKQus8iPGZSznnY8zzFo93j2z/X6tAg2/J7oeksgnw1Kc9CIrDsKdIZ0k22 eUEgZ2QIaex5vEVeGOTMk2yaQfsY7CQcC8Km83zSgIMQq0AIsoYUh3SkwMgTVYPrRY8L D9+ZFLrH66S8DxJfi0/f7trb11b13uxJO7WXYIUgddUCYpMkr45iWr+NpoBYu37EMBm3 +gcw== 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=+rWYb/JufKEbYQsxUY45toexBwt0N6koxDEfblsGx/M=; b=TaKpYnmkpMVGjZEkWqR6kUuKJI4FwUznGZY+NBWIJ+CPRvnIIceB8mnn0Km2J3RABw ambyGs6Gzfy5tN0ZAiH5/WSyVCzDMBBPpyNLFQDM8r0DEeobQP8rrl8CeVVzfw2m8uZw jrRtIud6ZU8zyXNQdkMVgz7X8299Qwbn9vV84NddXEF2faS10mrd6hsNAPh4PPJpNTj+ hofdehUPLMgJ7TQDoZFY0z+9d+AU/hCn0MAllmvkzBSTUgs+yCQT7tDU8vTrCb9OxuXg IEC+VlTP8re+MRucwOdHNG3o3PXiEBkW4Za/pwbKgY2iDL2qtq4B12ZLiGgYq2aS4PJq GB2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zliteuTc; 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 l1si2179165otn.98.2019.12.03.15.05.44; Tue, 03 Dec 2019 15:05:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zliteuTc; 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 S1730088AbfLCXFm (ORCPT + 27 others); Tue, 3 Dec 2019 18:05:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:41512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729697AbfLCWuF (ORCPT ); Tue, 3 Dec 2019 17:50: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 DFA222084B; Tue, 3 Dec 2019 22:50:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413405; bh=pXd5XbYFAKM+vKsxh5u0AOvnhFw4ZOeWx/jVfX3EWbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zliteuTc3MpKgSRn6pBGAhoiWQC5FXhyd9Pbg5tLp8hwNfU9h5cvcIvVAXQgNYgy0 Ph5L8h+rE63VWTAHuhmwhsm2WC0ev9emCqbva3ynLKdyLD6Earl4PnZfA0qVJgP8us 5lEAgCkz/7zt4It8h47R4ViTKDxm0jMGFw3NovOQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerome Brunet , Ulf Hansson , Sasha Levin Subject: [PATCH 4.19 114/321] mmc: meson-gx: make sure the descriptor is stopped on errors Date: Tue, 3 Dec 2019 23:33:00 +0100 Message-Id: <20191203223433.080279238@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Jerome Brunet [ Upstream commit 18f92bc02f1739b5c4d5b70009fbb7eada45bca3 ] On errors, if we don't stop the descriptor chain, it may continue to run and raise IRQ after we have called mmc_request_done(). This is bad because we won't be able to get cmd anymore and properly deal with the IRQ. This patch makes sure the descriptor chain is stopped before calling mmc_request_done() Fixes: 79ed05e329c3 ("mmc: meson-gx: add support for descriptor chain mode") Signed-off-by: Jerome Brunet Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/meson-gx-mmc.c | 73 ++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index ddd98cdd33bcd..72f34a58928ca 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -90,9 +91,11 @@ #define CFG_CLK_ALWAYS_ON BIT(18) #define CFG_CHK_DS BIT(20) #define CFG_AUTO_CLK BIT(23) +#define CFG_ERR_ABORT BIT(27) #define SD_EMMC_STATUS 0x48 #define STATUS_BUSY BIT(31) +#define STATUS_DESC_BUSY BIT(30) #define STATUS_DATI GENMASK(23, 16) #define SD_EMMC_IRQ_EN 0x4c @@ -930,6 +933,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) cmd_cfg |= FIELD_PREP(CMD_CFG_CMD_INDEX_MASK, cmd->opcode); cmd_cfg |= CMD_CFG_OWNER; /* owned by CPU */ + cmd_cfg |= CMD_CFG_ERROR; /* stop in case of error */ meson_mmc_set_response_bits(cmd, &cmd_cfg); @@ -1024,6 +1028,17 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) u32 irq_en, status, raw_status; irqreturn_t ret = IRQ_NONE; + irq_en = readl(host->regs + SD_EMMC_IRQ_EN); + raw_status = readl(host->regs + SD_EMMC_STATUS); + status = raw_status & irq_en; + + if (!status) { + dev_dbg(host->dev, + "Unexpected IRQ! irq_en 0x%08x - status 0x%08x\n", + irq_en, raw_status); + return IRQ_NONE; + } + if (WARN_ON(!host) || WARN_ON(!host->cmd)) return IRQ_NONE; @@ -1031,22 +1046,18 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) cmd = host->cmd; data = cmd->data; - irq_en = readl(host->regs + SD_EMMC_IRQ_EN); - raw_status = readl(host->regs + SD_EMMC_STATUS); - status = raw_status & irq_en; - cmd->error = 0; if (status & IRQ_CRC_ERR) { dev_dbg(host->dev, "CRC Error - status 0x%08x\n", status); cmd->error = -EILSEQ; - ret = IRQ_HANDLED; + ret = IRQ_WAKE_THREAD; goto out; } if (status & IRQ_TIMEOUTS) { dev_dbg(host->dev, "Timeout - status 0x%08x\n", status); cmd->error = -ETIMEDOUT; - ret = IRQ_HANDLED; + ret = IRQ_WAKE_THREAD; goto out; } @@ -1071,17 +1082,49 @@ out: /* ack all enabled interrupts */ writel(irq_en, host->regs + SD_EMMC_STATUS); + if (cmd->error) { + /* Stop desc in case of errors */ + u32 start = readl(host->regs + SD_EMMC_START); + + start &= ~START_DESC_BUSY; + writel(start, host->regs + SD_EMMC_START); + } + if (ret == IRQ_HANDLED) meson_mmc_request_done(host->mmc, cmd->mrq); - else if (ret == IRQ_NONE) - dev_warn(host->dev, - "Unexpected IRQ! status=0x%08x, irq_en=0x%08x\n", - raw_status, irq_en); spin_unlock(&host->lock); return ret; } +static int meson_mmc_wait_desc_stop(struct meson_host *host) +{ + int loop; + u32 status; + + /* + * It may sometimes take a while for it to actually halt. Here, we + * are giving it 5ms to comply + * + * If we don't confirm the descriptor is stopped, it might raise new + * IRQs after we have called mmc_request_done() which is bad. + */ + for (loop = 50; loop; loop--) { + status = readl(host->regs + SD_EMMC_STATUS); + if (status & (STATUS_BUSY | STATUS_DESC_BUSY)) + udelay(100); + else + break; + } + + if (status & (STATUS_BUSY | STATUS_DESC_BUSY)) { + dev_err(host->dev, "Timed out waiting for host to stop\n"); + return -ETIMEDOUT; + } + + return 0; +} + static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) { struct meson_host *host = dev_id; @@ -1092,6 +1135,13 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) if (WARN_ON(!cmd)) return IRQ_NONE; + if (cmd->error) { + meson_mmc_wait_desc_stop(host); + meson_mmc_request_done(host->mmc, cmd->mrq); + + return IRQ_HANDLED; + } + data = cmd->data; if (meson_mmc_bounce_buf_read(data)) { xfer_bytes = data->blksz * data->blocks; @@ -1132,6 +1182,9 @@ static void meson_mmc_cfg_init(struct meson_host *host) cfg |= FIELD_PREP(CFG_RC_CC_MASK, ilog2(SD_EMMC_CFG_CMD_GAP)); cfg |= FIELD_PREP(CFG_BLK_LEN_MASK, ilog2(SD_EMMC_CFG_BLK_SIZE)); + /* abort chain on R/W errors */ + cfg |= CFG_ERR_ABORT; + writel(cfg, host->regs + SD_EMMC_CFG); } From patchwork Tue Dec 3 22:33:02 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: 180765 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2170973ile; Tue, 3 Dec 2019 15:05:30 -0800 (PST) X-Google-Smtp-Source: APXvYqzH01o6ohbdmTMKz7ZkCzx0iyxSa+maeLDRb90kqXTs3Eba8X70djQ7I6uapkhKV4l4U54B X-Received: by 2002:a9d:5388:: with SMTP id w8mr251320otg.368.1575414330355; Tue, 03 Dec 2019 15:05:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575414330; cv=none; d=google.com; s=arc-20160816; b=I6y60lorlg+kWqvSNkZcqcuVyESttQ0vk6cnozmbttgbAlKqfv/LcFrjU67/n2/LJr vRCcWZRCMUoQOEhahwIhFZXd2D9p42oFh1XrzhE3nIUZ/KsoGv1XXrKUJh/Cz/wmaMiY 5wqHkegLfbWL4bT5z66VR8d7u4jrlyerziNk34tvq5qA+Zp46QXTJe4KCgqU30y3gVHr XBtyvslWt9Y8wcyCAYKtknhLhd+vRnG/ef1z82BQWapgR5B8rGHcnpQlAnI7JeJSYpiE jpgRRSMH2OQ6DCfWd1T6SqY/FEFTMZPUwG0+gkdxu4Irw17CgUaiiOVDw9Xaro2vKDII G2og== 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=vjMvLM+M4+ncS7sNu+b7al4QjfK/jf5Qc90em9tyGjo=; b=fajNlLRAga8K8rqjV8fR0PjWnQauMUPOeynlnO7FaGr4hl8JkVPI2H8qrnmv2qd0sA nkS82WhEZDG9JZbzwLOOSxfB082f/216ExiZShfmCkM3mDO8Ifhy9Woh6oPlNWMX0ZpO WxZlsuZNUCLtqPLoFB+bW/PoHsJZGW8X5uHVC698mamhUTEew8tbPUvf2Jp5/PK2ffwn KWrrJe352pV4rFGkNQdoc0veAWMKDZk8XBXlb9aXoZ+vP1TcK+3a/+10XwbagTUNOHJU ephT5ILdYsNE04KIGlB1gvZybQxXw63J83EcXdpBa3ymHUfEQWjUSnwLnYcIsqcM0b7P 41dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E5ATwxt3; 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 y186si2320417oia.108.2019.12.03.15.05.30; Tue, 03 Dec 2019 15:05: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=E5ATwxt3; 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 S1727953AbfLCWuQ (ORCPT + 27 others); Tue, 3 Dec 2019 17:50:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:41662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729709AbfLCWuL (ORCPT ); Tue, 3 Dec 2019 17:50: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 F04BC20656; Tue, 3 Dec 2019 22:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413410; bh=ifwruHAoHqHKLv+HjbF5JGJp7pgttRgm2PgncmfAWrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5ATwxt3U9nExAcPozaFCfeUjqBfr1MlMKqF2Opy+j/yozm+8FGDwYm1aZtSCifEu 5G349eM9TcEZXwwUEs/zh8oxM009Bvyof+aWl5WWPifQJ3I0JSzeujOH1ucCOZ3oGY Cbkwbo0DVrFFSpI/fI///NoVWOoxvE5OtCC474Eo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Ladislav Michl , Peter Ujfalusi , Roger Quadros , Tony Lindgren , Alan Stern , Sasha Levin Subject: [PATCH 4.19 116/321] usb: ehci-omap: Fix deferred probe for phy handling Date: Tue, 3 Dec 2019 23:33:02 +0100 Message-Id: <20191203223433.182056324@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Roger Quadros [ Upstream commit 8dc7623bf608495b6e6743e805807c7840673573 ] PHY model is being used on omap5 platforms even if port mode is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required or not based on PHY mode. If PHY is provided in device tree, it must be required. So, if devm_usb_get_phy_by_phandle() gives us an error code other than -ENODEV (no PHY) then error out. This fixes USB Ethernet on omap5-uevm if PHY happens to probe after EHCI thus causing a -EPROBE_DEFER. Cc: Johan Hovold Cc: Ladislav Michl Reported-by: Peter Ujfalusi Signed-off-by: Roger Quadros Tested-by: Peter Ujfalusi Acked-by: Tony Lindgren Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/ehci-omap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 7e4c13346a1ee..7d20296cbe9f9 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -159,11 +159,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) /* get the PHY device */ phy = devm_usb_get_phy_by_phandle(dev, "phys", i); if (IS_ERR(phy)) { - /* Don't bail out if PHY is not absolutely necessary */ - if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) + ret = PTR_ERR(phy); + if (ret == -ENODEV) { /* no PHY */ + phy = NULL; continue; + } - ret = PTR_ERR(phy); if (ret != -EPROBE_DEFER) dev_err(dev, "Can't get PHY for port %d: %d\n", i, ret); From patchwork Tue Dec 3 22:33: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: 180762 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2168855ile; Tue, 3 Dec 2019 15:03:52 -0800 (PST) X-Google-Smtp-Source: APXvYqzhcHqUrDzhjo/szoqdojLq+/nTUGOmRxThWTeVQGm4b65BqQmFS0fmprDuA//7RAO9fJy3 X-Received: by 2002:a9d:7a4b:: with SMTP id z11mr292578otm.46.1575414231225; Tue, 03 Dec 2019 15:03:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575414231; cv=none; d=google.com; s=arc-20160816; b=hgWydrTzuJftOOc+OKvrEs1IEDuCtt8PNTJyMOKTiS8hcM2Ln6Wp7khOFQyyGTaiOT 4VTUze/okiLLV2A/sZ/CJmH9DYsgWe19+P7/8NcFi+rCIo7zOSlOLjVPImx16h2yCPLd n5N6LeA3ewJvNOk1be3eeWmrkYErWPuKLtAeUjX4yN35YTujqY4uMNm2o2BN3sNTbiLp rcYXISh05c9nL+6Y0wOg3CuDa7+MlBX4Rx/IEFMgn1A78JIiflm733+LcXUFQEP9ToQf uhKz5ZLkMiWMicEtbkPFKVDkYxps1MPk9xtqWj7KxXThXn+v9PlTZHnvjm3cITdpaVGB jgJA== 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=B85ZYLWkDD/rvvV35Uf8SPLGzVaRaQ71P/rKVQ/soIw=; b=UnooG/HU+8/C5/WZ7nnHtGY720nZ8Sk9be4Hr7Kac0HaooEME+fMx9+1PCsFx9FB9B z3xkK/c8gabZjWsuxsA5fTdBDeQ+Wh7o4dwaHuwQhyddF5rx6M19hy7mPHwGMNSbBBCl I9CPF4qZDd4925fOvPozZcIdmcD5ovQipCARyM0bDw7V1A5jDJSO9A6skLsFzVc2vmW4 rRMpUyqo/r5cfmcurmxmMRt9RciYvYjYpkf3+0a5Pa2fDqelJYtenMpLoWRk7G3iCTBd 7k4iurwsQaUa2sUq+OLEhpyW8TPxGkv5DWn3KX5Mqr6rv/jr4TLHqlg01SAB4o2OGKg2 z0IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=itUQo19b; 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 v25si1215568oth.136.2019.12.03.15.03.50; Tue, 03 Dec 2019 15:03: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=itUQo19b; 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 S1730417AbfLCXDt (ORCPT + 27 others); Tue, 3 Dec 2019 18:03:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:45280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729811AbfLCWwc (ORCPT ); Tue, 3 Dec 2019 17:52:32 -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 D5E6720865; Tue, 3 Dec 2019 22:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413552; bh=5NqZWv/lrf+4gV1AJubypYGwHZ9tJ+dRz9dCQ+jRxVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=itUQo19btgEPs4TlaeL5KmDBZkU+6FUn3xlqA3G5buf82zG56iZEA1v6z5zNWK/Sg 70omz4nAi9S37E1gkSFE+7M+LcuCX5E1Dh9kV8+r4h1Bv4lfu7BnMzLUkstLDzSerk gyblJnOPUj9NFjlshn40tjK8dhtqKrvsX3gpjJTc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ladislav Michl , Janusz Krzysztofik , Stephen Rothwell , Tony Lindgren , Linus Walleij , Sasha Levin Subject: [PATCH 4.19 131/321] memory: omap-gpmc: Get the header of the enum Date: Tue, 3 Dec 2019 23:33:17 +0100 Message-Id: <20191203223433.967451527@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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 a0752e9c3097b2c4fccd618802938e0951038dfa ] Commit 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()") started to pass an enum gpiod_flags but this file is not including the header file that defines that enum and the compiler spits: drivers/memory/omap-gpmc.c: In function 'gpmc_probe_generic_child': drivers/memory/omap-gpmc.c:2174:9: error: type of formal parameter 4 is incomplete 0); ^ Cc: Ladislav Michl Cc: Janusz Krzysztofik Reported-by: Stephen Rothwell Fixes: 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()") Acked-by: Tony Lindgren Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/memory/omap-gpmc.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index c215287e80cf3..1c6a7c16e0c17 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -21,6 +21,7 @@ #include #include #include +#include /* GPIO descriptor enum */ #include #include #include From patchwork Tue Dec 3 22:36:11 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: 180761 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2163429ile; Tue, 3 Dec 2019 14:59:32 -0800 (PST) X-Google-Smtp-Source: APXvYqzWRSaEs/R+j613Vak8OIQD+dXqVlYFZMazSjDJg/VmMbqfeRaAPmVWhGlz7TNcRSc4oNVf X-Received: by 2002:a05:6808:996:: with SMTP id a22mr39495oic.146.1575413971900; Tue, 03 Dec 2019 14:59:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413971; cv=none; d=google.com; s=arc-20160816; b=Q+QhgD+siC7lZ4/eSseQQ6/GdqBulFbh3qqWx0uYHgyyIxAmIKjfOJo3MVnRwBUTOM iH5N2vKbMn034KMKX5RRctu1Fh9bZX1avyUBdJOV/nEDLO71L0oxj0kDvgy0WTW1xCAc yJT8B7hFEQFgyqqSUx9sKea17Bx/LFOlYsF3m0Jc4uzXxt+JtkGEDlQIfgHJ+DsO2536 5KJAnETMFCypYX5DVoUZUCDBxU4LNkq1oh187us0TvsXDoAXsej+FobfGb5H6TpASdLL pF6bV6505DQbb1tGZOvwskIMECAT5Tbp4qFacwtp4AB5rFgSGqJ5dKCOdzPOyevGHseA dxiA== 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=nxk44Ed3cxcn+nr9qLObQkFtmVbofUsX1+oF2VicHdI=; b=ZahavN8d6bHoPf7cMcBVCUVYb62H2PszO7/vYmGUO7+Rupf9wSljHLDnilsP2ftRGP Ze6fVbSdvsrH1/mEyKM+iZ1dquaJ491WPkXk91ifOes9zCNIR0riX4uHwYTLavkZuq8R srSYzca3R/bXNodyoJwWXNKKspgmNHoHkE7Me4Yjqag9oYXo1ISSVy4hcjvn1UWnC4xO BRdt+DglP4YLpyjkpmvbTiYylkI4H1vgrUkWUGjP1/c5lByBFxiR+z6uh2fri+NViQ07 vXl8tPytQs1LOtFy2BJmGhnJyQCh9I5hi7Tiv/MeALU8t1mGl9P09jVPk/4l9FFIh+fn t15w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EV0Ufkmh; 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 p5si2309907oto.116.2019.12.03.14.59.31; Tue, 03 Dec 2019 14:59: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=EV0Ufkmh; 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 S1730427AbfLCW7a (ORCPT + 27 others); Tue, 3 Dec 2019 17:59:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:55938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730463AbfLCW7T (ORCPT ); Tue, 3 Dec 2019 17:59:19 -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 450BD2053B; Tue, 3 Dec 2019 22:59:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413958; bh=Yt7MeVL/h89vHQ3EdAWoNy1Iz3N+bvLPZVujGOMb+sU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EV0UfkmhmcVA+OSXbhMj8+ybDUaMFS2LkN9dmorHdBsm5GZQ/S0sJvfKbJPjpDM6d 6rmv74G8ZxdETPTamQFnzmURrynHv3kEayYBvBmcAarRK29q+621niWK3q1o8HcsIG ee8NiCSO8NJJ+onN1Hj+1GqgrVqHeEHthOf6AqUU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lionel Debieve , Herbert Xu , Mathieu Poirier Subject: [PATCH 4.19 305/321] crypto: stm32/hash - Fix hmac issue more than 256 bytes Date: Tue, 3 Dec 2019 23:36:11 +0100 Message-Id: <20191203223443.014386583@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Lionel Debieve commit 0acabecebc912b3ba06289e4ef40476acc499a37 upstream. Correct condition for the second hmac loop. Key must be only set in the first loop. Initial condition was wrong, HMAC_KEY flag was not properly checked. Signed-off-by: Lionel Debieve Signed-off-by: Herbert Xu Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/stm32/stm32-hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/crypto/stm32/stm32-hash.c +++ b/drivers/crypto/stm32/stm32-hash.c @@ -365,7 +365,7 @@ static int stm32_hash_xmit_cpu(struct st return -ETIMEDOUT; if ((hdev->flags & HASH_FLAGS_HMAC) && - (hdev->flags & ~HASH_FLAGS_HMAC_KEY)) { + (!(hdev->flags & HASH_FLAGS_HMAC_KEY))) { hdev->flags |= HASH_FLAGS_HMAC_KEY; stm32_hash_write_key(hdev); if (stm32_hash_wait_busy(hdev)) From patchwork Tue Dec 3 22:36:14 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: 180759 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2162625ile; Tue, 3 Dec 2019 14:58:31 -0800 (PST) X-Google-Smtp-Source: APXvYqw6wuErICtYid0TKd5fC5kPSDLC4LlEvVnzWCSup5KAx5SvT/Ivelbj+ZsZGY+3Ysg47ktt X-Received: by 2002:a9d:1a5:: with SMTP id e34mr233061ote.105.1575413911616; Tue, 03 Dec 2019 14:58:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575413911; cv=none; d=google.com; s=arc-20160816; b=hYLAIvbBU/VUfLcK8n/+NlODSkA9/wiTqaWBRysoBoKTWdFweC8e/vAJTIJdr5jYQA kmKiSCGjrGz4MOkxM7f3cqLtgZY64Eekg2idyymHbeEAEsss4AH3hX2UEHM1hJPiK8bn 96RjDV0vl/Ka1m0FY/NPtQL5+rPylawLYrZzvp9PDFQY1VKbs4DXL+8rNLsBtBeJIxSz M979+Ghe9KSx4Tbj0R1CA+B0RKBTx8LO3Ek8Lw+tSEyDkobhiiQWs2uDbWxWTlUWiR+5 bFKYJ8FDn2Lu+QhcbVXk2xs+9KfRz7vDnr3zElg6kMz2Jv0HGqFocQUnfuPcSpg285Vg jP0Q== 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=dAkUjq6mOHrHPTAXeF2rIj6korVmWwqByjUiduPYYdA=; b=YlQ2uAiXrBRXwHHYoA4PZ4dxH8n813qaEUBqrbHdfB2EM6JDgiJM9M3mxsfnwsVaAV 9kVgp60eB23ijdRhidZSe195UHkZlhbcQ3ljudiYNfIg9QN+WjpKFrxvTpWyMUclGVz3 LnZWmSZHChQp0Yb0nXYWQZkYGU0O3U8vP/Z1j9XBgLGawGWfQvlWUA0lspvqCiAysdjv WM2/qz64lfk4tnKaDO1q6kouVhV2W1jIX9BIAYtgr/aYaIbJZ+00p2mh0uTSBfv4+dr0 vGOEKEzLN7fSlJwNMdyLniUG75mzQXyyhaHdOmWDcgY8ulLlDjSGJfAa6/8zafP5X/PR KMhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="bK/l6evG"; 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 o8si2380643oti.47.2019.12.03.14.58.31; Tue, 03 Dec 2019 14:58: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="bK/l6evG"; 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 S1730089AbfLCW6a (ORCPT + 27 others); Tue, 3 Dec 2019 17:58:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:54804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730121AbfLCW6Z (ORCPT ); Tue, 3 Dec 2019 17:58:25 -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 904F820863; Tue, 3 Dec 2019 22:58:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413905; bh=lBGsPdVqWRIlpSzE9JQT9JoBoAkeI+DuX9UVhFt3syA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bK/l6evGiv5mfJT/elkVJvKpUJcKTcPjvabb4sR2lErXC/Yo31aAcr7bn59GwE19v CGZCCPk5PqROHHz9aICKeX1WTRKm7BH3zqjcFXx9NCqiZ1Ie+d2OaJCpjEcHDP1Ct3 ItcSQX9lp6P6tDeU8exgzDhdMpgNHcB/CFwlgL9E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lionel Debieve , Herbert Xu , Mathieu Poirier Subject: [PATCH 4.19 308/321] hwrng: stm32 - fix unbalanced pm_runtime_enable Date: Tue, 3 Dec 2019 23:36:14 +0100 Message-Id: <20191203223443.169670189@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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: Lionel Debieve commit af0d4442dd6813de6e77309063beb064fa8e89ae upstream. No remove function implemented yet in the driver. Without remove function, the pm_runtime implementation complains when removing and probing again the driver. Signed-off-by: Lionel Debieve Signed-off-by: Herbert Xu Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman --- drivers/char/hw_random/stm32-rng.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/drivers/char/hw_random/stm32-rng.c +++ b/drivers/char/hw_random/stm32-rng.c @@ -169,6 +169,13 @@ static int stm32_rng_probe(struct platfo return devm_hwrng_register(dev, &priv->rng); } +static int stm32_rng_remove(struct platform_device *ofdev) +{ + pm_runtime_disable(&ofdev->dev); + + return 0; +} + #ifdef CONFIG_PM static int stm32_rng_runtime_suspend(struct device *dev) { @@ -210,6 +217,7 @@ static struct platform_driver stm32_rng_ .of_match_table = stm32_rng_match, }, .probe = stm32_rng_probe, + .remove = stm32_rng_remove, }; module_platform_driver(stm32_rng_driver);