From patchwork Sun Oct 27 20:59:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 177867 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2539135ill; Sun, 27 Oct 2019 14:18:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKYW2bCEs/uTBkd2hklyIXUJ7ge5r0UMv02NmxhkMS8t5D7kxHCZFhrA9Fv0KMurphjBwD X-Received: by 2002:a50:9993:: with SMTP id m19mr15895218edb.208.1572211094352; Sun, 27 Oct 2019 14:18:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211094; cv=none; d=google.com; s=arc-20160816; b=Bfw46VKMX87foB2/huthW7RYCkkQOLpO92PvGk5H3o6jqehl67gI6LjHBSBDzHonRi Je7jAUx1w4XwWvga4dDsRnfE+guQFqD36ohjyH31Miy38SMuyHQOmxfHwefHuFA1xd8u 6wrlSZFjlS9Jziy8hRaMCZ+RrcaR/8IJ9/n5mQiwmr0I7npY9gDSbHtjbd6Iu+VbCCxL +QQWDeVQeM27QE9233Y9fI5EpTBaNytarrEd3C3HID66AIHFsN+ktlgJ6gmOLw4lLYKu 4qTRWBI+s/VPr/Ij+yGnWM/5Nb6QoJuS/ITKOFnuutQjbYv2PeuG0GI/BRrj0sHXTcCj gQng== 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=Zzbc5iz/mrRovb+YzR1f6YEuFi3Vku1HjXQfibwE0iU=; b=yHWDNWEHw1X1gGltf2pseCC5HpELbfW8gqGYqJF7+vu8xyUCrXT/BLtqlsQXWCY3+A qxuaVfjC0uZzHT9HlhC5VJBEb94nIRg6psGEdv/PMgvmCbbZLYBLkh6iLroGsv0uQo0X z42ksjh4HeCtdoWcGVi+cuq8etzDP/e0GztQtz3eRsp2SE4eS7CoDlUtWc3a1X8/MRoK G2gVwqs/NrKFNgXVJCAv09cvkklVRUVkmjJm+6llBKBat/Bw30rhh8noWWmnI9ataoNd LKJzknACKQS0P4t/BKeFnx1+geupBYXYFcA12ORgbsjckHXEO2Po/5g0QR9kGFD3T3pI SYxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZG1qERYu; 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 ot22si5187123ejb.166.2019.10.27.14.18.14; Sun, 27 Oct 2019 14:18:14 -0700 (PDT) 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=ZG1qERYu; 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 S1731244AbfJ0VSN (ORCPT + 26 others); Sun, 27 Oct 2019 17:18:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:38274 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731224AbfJ0VSJ (ORCPT ); Sun, 27 Oct 2019 17:18:09 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 957832070B; Sun, 27 Oct 2019 21:18:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211089; bh=PEz+A1ZFdffm/td2VnnYZBRiY/aqbuwpzKlPWMlDIFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZG1qERYuwkdQYOfBjxz569MXdu9v0V8Utl+dBo5us1JhxETbqkI5famF6RZh3D+uN uqex3RABHEICtnGo71gv+AFlMNZH9w08M/WWtrmaQV9HCSczxZ86oGr4Rz9X7yLjlK ddoWnHoOhlbPOwXTjaPXhAxGMId6eLzLeH6/hHGY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Tomi Valkeinen , Tony Lindgren , Sasha Levin Subject: [PATCH 5.3 028/197] ARM: dts: am4372: Set memory bandwidth limit for DISPC Date: Sun, 27 Oct 2019 21:59:06 +0100 Message-Id: <20191027203353.247217444@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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: Peter Ujfalusi [ Upstream commit f90ec6cdf674248dcad85bf9af6e064bf472b841 ] Set memory bandwidth limit to filter out resolutions above 720p@60Hz to avoid underflow errors due to the bandwidth needs of higher resolutions. am43xx can not provide enough bandwidth to DISPC to correctly handle 'high' resolutions. Signed-off-by: Peter Ujfalusi Signed-off-by: Tomi Valkeinen Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/boot/dts/am4372.dtsi | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 848e2a8884e2c..14bbc438055fd 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -337,6 +337,8 @@ ti,hwmods = "dss_dispc"; clocks = <&disp_clk>; clock-names = "fck"; + + max-memory-bandwidth = <230000000>; }; rfbi: rfbi@4832a800 { From patchwork Sun Oct 27 21:00:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 177868 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2542499ill; Sun, 27 Oct 2019 14:22:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqzemmRTg19ZEQzEoZ3x+DAXgui66qz9WCgSeyx37PHUZ06lemc/S0Q/YCLH1SDDeBpzvx7E X-Received: by 2002:a17:906:c836:: with SMTP id dd22mr13898524ejb.178.1572211359372; Sun, 27 Oct 2019 14:22:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211359; cv=none; d=google.com; s=arc-20160816; b=LyGeqNShkyvRx3bFQCCUUrY2eHIKvM7RyDiBFW5PVgsRQzD33LK0gpSXv8uzfdfAW6 /vZ8h+SbVzOSL7KircSqRANpcAZKkQwDjJkZXgxSyJQzZK4EeuSSVTO80sv+HYChhFkk cuOn2EFQMrmoblmThN5RMyaMHk+uxewCcpbFdYlB/yksRkwAiTS7N8i3+XAj99QXVH96 /BY5egVuYHh8jF4v9iXVC5x7rdct1t0Ly99mSjnEB7bqAjHdE/GqV7dK5sus84fg2u2s yQye0+qfsiIqS6OnKBVcrqellUeQtZfcS9WHVfbVKmnlUGSSYMx1SWgJKB9e4YYmnS62 hWxA== 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=UhYvEJm2ucGzIrULymEbcvnFSElEFheBuU9YBhIfxto=; b=XpZLLGR9oB79oOr8UIMhrCflmopQMc04cdZ4tKQrKuTPUpLA/cYbOZzxduovtqNUao cDDsb3AJezKRtZd320OfBZiNhsIMF//Jr/sOrQKqsJFh7r5pkMOkAjz/Bi2DjzRAZ/YV C3wgyB2Km3GpMRwiYkClpqEBRipKTDS3pLwp/sKg/9WuFvclarBde11Ltsql4ky/ruZe fMAF/6AUynj5b9Sa78FjvsSD2piX+p2dLRfLLczbkaevotx+rmGfVY53jKtdsWQRByox 0NUPbM0ziiMca6RiySB6egnfcvwz+pp/lUK2FdelD7kj5M5tJWBeb00cfY1cARVp9Dbv lT0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uZpHXYmT; 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 v3si4675493eju.230.2019.10.27.14.22.38; Sun, 27 Oct 2019 14:22:39 -0700 (PDT) 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=uZpHXYmT; 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 S1732189AbfJ0VWh (ORCPT + 26 others); Sun, 27 Oct 2019 17:22:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:43530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732166AbfJ0VWa (ORCPT ); Sun, 27 Oct 2019 17:22:30 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 25EC621726; Sun, 27 Oct 2019 21:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211349; bh=df4Y9A4zKSCoojkUKFKYOB6WZIW3Pesuoio2VX51KR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uZpHXYmTK+ErPw3YKsbzXmYznO4gGIMEJFtz8Cnyt228b2/ELsJntCNewNG2oJeY5 hNCFRTbjSe7pDYcjVgK1FDKue2GUUqyEj3UJN7Aij1RGru+UxtBsDbHtnFilDZwX76 /Ixu8REfAnDm2XSaSr2tKm4EWKPk6FLw2dn52ebg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Garry , "Rafael J. Wysocki" Subject: [PATCH 5.3 119/197] ACPI: CPPC: Set pcc_data[pcc_ss_id] to NULL in acpi_cppc_processor_exit() Date: Sun, 27 Oct 2019 22:00:37 +0100 Message-Id: <20191027203358.152932208@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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: John Garry commit 56a0b978d42f58c7e3ba715cf65af487d427524d upstream. When enabling KASAN and DEBUG_TEST_DRIVER_REMOVE, I find this KASAN warning: [ 20.872057] BUG: KASAN: use-after-free in pcc_data_alloc+0x40/0xb8 [ 20.878226] Read of size 4 at addr ffff00236cdeb684 by task swapper/0/1 [ 20.884826] [ 20.886309] CPU: 19 PID: 1 Comm: swapper/0 Not tainted 5.4.0-rc1-00009-ge7f7df3db5bf-dirty #289 [ 20.894994] Hardware name: Huawei D06 /D06, BIOS Hisilicon D06 UEFI RC0 - V1.16.01 03/15/2019 [ 20.903505] Call trace: [ 20.905942] dump_backtrace+0x0/0x200 [ 20.909593] show_stack+0x14/0x20 [ 20.912899] dump_stack+0xd4/0x130 [ 20.916291] print_address_description.isra.9+0x6c/0x3b8 [ 20.921592] __kasan_report+0x12c/0x23c [ 20.925417] kasan_report+0xc/0x18 [ 20.928808] __asan_load4+0x94/0xb8 [ 20.932286] pcc_data_alloc+0x40/0xb8 [ 20.935938] acpi_cppc_processor_probe+0x4e8/0xb08 [ 20.940717] __acpi_processor_start+0x48/0xb0 [ 20.945062] acpi_processor_start+0x40/0x60 [ 20.949235] really_probe+0x118/0x548 [ 20.952887] driver_probe_device+0x7c/0x148 [ 20.957059] device_driver_attach+0x94/0xa0 [ 20.961231] __driver_attach+0xa4/0x110 [ 20.965055] bus_for_each_dev+0xe8/0x158 [ 20.968966] driver_attach+0x30/0x40 [ 20.972531] bus_add_driver+0x234/0x2f0 [ 20.976356] driver_register+0xbc/0x1d0 [ 20.980182] acpi_processor_driver_init+0x40/0xe4 [ 20.984875] do_one_initcall+0xb4/0x254 [ 20.988700] kernel_init_freeable+0x24c/0x2f8 [ 20.993047] kernel_init+0x10/0x118 [ 20.996524] ret_from_fork+0x10/0x18 [ 21.000087] [ 21.001567] Allocated by task 1: [ 21.004785] save_stack+0x28/0xc8 [ 21.008089] __kasan_kmalloc.isra.9+0xbc/0xd8 [ 21.012435] kasan_kmalloc+0xc/0x18 [ 21.015913] pcc_data_alloc+0x94/0xb8 [ 21.019564] acpi_cppc_processor_probe+0x4e8/0xb08 [ 21.024343] __acpi_processor_start+0x48/0xb0 [ 21.028689] acpi_processor_start+0x40/0x60 [ 21.032860] really_probe+0x118/0x548 [ 21.036512] driver_probe_device+0x7c/0x148 [ 21.040684] device_driver_attach+0x94/0xa0 [ 21.044855] __driver_attach+0xa4/0x110 [ 21.048680] bus_for_each_dev+0xe8/0x158 [ 21.052591] driver_attach+0x30/0x40 [ 21.056155] bus_add_driver+0x234/0x2f0 [ 21.059980] driver_register+0xbc/0x1d0 [ 21.063805] acpi_processor_driver_init+0x40/0xe4 [ 21.068497] do_one_initcall+0xb4/0x254 [ 21.072322] kernel_init_freeable+0x24c/0x2f8 [ 21.076667] kernel_init+0x10/0x118 [ 21.080144] ret_from_fork+0x10/0x18 [ 21.083707] [ 21.085186] Freed by task 1: [ 21.088056] save_stack+0x28/0xc8 [ 21.091360] __kasan_slab_free+0x118/0x180 [ 21.095445] kasan_slab_free+0x10/0x18 [ 21.099183] kfree+0x80/0x268 [ 21.102139] acpi_cppc_processor_exit+0x1a8/0x1b8 [ 21.106832] acpi_processor_stop+0x70/0x80 [ 21.110917] really_probe+0x174/0x548 [ 21.114568] driver_probe_device+0x7c/0x148 [ 21.118740] device_driver_attach+0x94/0xa0 [ 21.122912] __driver_attach+0xa4/0x110 [ 21.126736] bus_for_each_dev+0xe8/0x158 [ 21.130648] driver_attach+0x30/0x40 [ 21.134212] bus_add_driver+0x234/0x2f0 [ 21.0x10/0x18 [ 21.161764] [ 21.163244] The buggy address belongs to the object at ffff00236cdeb600 [ 21.163244] which belongs to the cache kmalloc-256 of size 256 [ 21.175750] The buggy address is located 132 bytes inside of [ 21.175750] 256-byte region [ffff00236cdeb600, ffff00236cdeb700) [ 21.187473] The buggy address belongs to the page: [ 21.192254] page:fffffe008d937a00 refcount:1 mapcount:0 mapping:ffff002370c0fa00 index:0x0 compound_mapcount: 0 [ 21.202331] flags: 0x1ffff00000010200(slab|head) [ 21.206940] raw: 1ffff00000010200 dead000000000100 dead000000000122 ffff002370c0fa00 [ 21.214671] raw: 0000000000000000 00000000802a002a 00000001ffffffff 0000000000000000 [ 21.222400] page dumped because: kasan: bad access detected [ 21.227959] [ 21.229438] Memory state around the buggy address: [ 21.234218] ffff00236cdeb580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 21.241427] ffff00236cdeb600: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 21.248637] >ffff00236cdeb680: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 21.255845] ^ [ 21.259062] ffff00236cdeb700: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 21.266272] ffff00236cdeb780: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 21.273480] ================================================================== It seems that global pcc_data[pcc_ss_id] can be freed in acpi_cppc_processor_exit(), but we may later reference this value, so NULLify it when freed. Also remove the useless setting of data "pcc_channel_acquired", which we're about to free. Fixes: 85b1407bf6d2 ("ACPI / CPPC: Make CPPC ACPI driver aware of PCC subspace IDs") Signed-off-by: John Garry Cc: 4.15+ # 4.15+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/cppc_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -905,8 +905,8 @@ void acpi_cppc_processor_exit(struct acp pcc_data[pcc_ss_id]->refcount--; if (!pcc_data[pcc_ss_id]->refcount) { pcc_mbox_free_channel(pcc_data[pcc_ss_id]->pcc_channel); - pcc_data[pcc_ss_id]->pcc_channel_acquired = 0; kfree(pcc_data[pcc_ss_id]); + pcc_data[pcc_ss_id] = NULL; } } } From patchwork Sun Oct 27 21:01:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 177870 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2543970ill; Sun, 27 Oct 2019 14:24:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUhU7dk47Bl72KeuOt58eZgYbl0KhuaL8dqep89dOcJD3Yau2GsmVzcfKYz1zSl9Fh9Oqv X-Received: by 2002:a50:fc0a:: with SMTP id i10mr16011590edr.94.1572211483654; Sun, 27 Oct 2019 14:24:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211483; cv=none; d=google.com; s=arc-20160816; b=TVpqAP6WJ0xnDrR/f8TaiSDOeBdV5Zoj8o/YVwsoib5z1NQWOgPKBkuLPNhKAOz/vG FlIpg4QwMqAxOvl/fdB6Q7ib8fXCI93fF3Sh1ip5rhJ+L159JZTxP23VXvwuW2jOBpbM F/QOKjPYvOY42Xc8BG448gLM2OeBlxLADUbL8ARAmHnzVP2pgHJcME4fBLF5j5rYoApN uHGvDUmyORbNLMEklAAdz46yrDkdtXlxOGNM3Su2Accovj+dhI1F6B5FJjvfQFsFvl6s gVD1ePYfUkn5qNJpEGJcs+iclpDOOwd07q8ZvzHGW7yGN18qAlQTR2/GPvcnkTAvBwOh r3ng== 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=OXPH+2R4cnX6Mgyg/80yTGSWGBB7VatrqWM3uoyD82E=; b=jSsaMegVIJl6KABFNd6ebKeUtTu3neOOmCUm7UvHGZLd+omx1/sMIHuO7Dgv/mRsuq 0kGFOAIWnv5sqUUO8a77cq+vmOmxKQEeh2/ZPuCUZqA4quRXjG9UrR1QtFMo5RH/iQYT O+XBPPyK3mEQ9Wy7hIDlHBZq7sfn9vSHft11Si8Wa54IHWsEi3Z5mqdV4uyss82eOiSg fbbyVdUSQpXvObf5oEI7Ta12eLZz/uQpuOksh/nOIiR9XPByFLBJccX1i9GEjJllAtTn WcZcGKbGBd0KCu0EZHt7ygs3XbQ+9nkSVmer+WhCtzXAE6OyNUIATmI3iUqhw4nsd4tB dk0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NDDWs4cf; 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 r15si5014787eji.5.2019.10.27.14.24.43; Sun, 27 Oct 2019 14:24:43 -0700 (PDT) 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=NDDWs4cf; 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 S1732570AbfJ0VYm (ORCPT + 26 others); Sun, 27 Oct 2019 17:24:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:46272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732551AbfJ0VYh (ORCPT ); Sun, 27 Oct 2019 17:24:37 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 46F7421726; Sun, 27 Oct 2019 21:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211476; bh=eZoloxqdOk1QAe0B1QKXUmeKMwxEs0Risk93QpxCdxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NDDWs4cfB/oAxFCL1ivWbpOzN8ebQ6LbAhl9bqRqVbnALplVLmHJuEInjUkvvKPv+ hskdKBBuZTnMczxjdkp9e9L2ehibEXX6ifMtsX9MqTsC7QMthKXrZUQ/MpZg6zXeBj wCk2TFuxyMx94nN+8WDyLeTj5QdVmwuHOHd6cdic= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Zyngier , Will Deacon Subject: [PATCH 5.3 164/197] arm64: Avoid Cavium TX2 erratum 219 when switching TTBR Date: Sun, 27 Oct 2019 22:01:22 +0100 Message-Id: <20191027203402.902355511@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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: Marc Zyngier commit 9405447ef79bc93101373e130f72e9e6cbf17dbb upstream. As a PRFM instruction racing against a TTBR update can have undesirable effects on TX2, NOP-out such PRFM on cores that are affected by the TX2-219 erratum. Cc: Signed-off-by: Marc Zyngier Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/cpucaps.h | 3 ++- arch/arm64/kernel/cpu_errata.c | 5 +++++ arch/arm64/kernel/entry.S | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -53,7 +53,8 @@ #define ARM64_HAS_DCPODP 43 #define ARM64_WORKAROUND_1463225 44 #define ARM64_WORKAROUND_CAVIUM_TX2_219_TVM 45 +#define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM 46 -#define ARM64_NCAPS 46 +#define ARM64_NCAPS 47 #endif /* __ASM_CPUCAPS_H */ --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -851,6 +851,11 @@ const struct arm64_cpu_capabilities arm6 .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, .matches = has_cortex_a76_erratum_1463225, }, + { + .desc = "Cavium ThunderX2 erratum 219 (PRFM removal)", + .capability = ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM, + ERRATA_MIDR_RANGE_LIST(tx2_family_cpus), + }, #endif { } --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -1070,7 +1070,9 @@ alternative_insn isb, nop, ARM64_WORKARO #else ldr x30, =vectors #endif +alternative_if_not ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM prfm plil1strm, [x30, #(1b - tramp_vectors)] +alternative_else_nop_endif msr vbar_el1, x30 add x30, x30, #(1b - tramp_vectors) isb From patchwork Sun Oct 27 21:01:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 177873 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2545999ill; Sun, 27 Oct 2019 14:27:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqyJ2MopgjqIuO2gVprdXREIJJifK8X9VXuMFr185yT1fWSBHLBGQGLG1ADGWu+T94+5wHAz X-Received: by 2002:a17:906:6094:: with SMTP id t20mr13862383ejj.316.1572211660079; Sun, 27 Oct 2019 14:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211660; cv=none; d=google.com; s=arc-20160816; b=MEGKKU7Q7kayRV3xvs9GmjdPMLwfSq9u9xVt4cQH3QsmERh3TfE9FjAPzbDivTfEMe 28IrIR0/IKwr/6il9IXis6R57+sckBsdx06+pCzRwli5iI9RmwCXpNCvCBAyPVX7lzbB FkqV9il+uCzFsR9SzD4kmbw4mJMe68fKsT+JTUUmF0po3KZOlFfFUsbc4TWVGolHTwym lpT0m8NlmZZGQI3SJF2qMHmtKkbEvly5gynnLe8tvlLW5WIYKcDtUCjuoOYrU9ozIQzu 412E9JWM/dLP896+WTFJbBZ0j1lwPFe1hhPnxaulwyCk/vCWAXOSdsx0mTVABNHq008q 4xOQ== 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=vc3ODk0s234v6d8PJ6G4C9QcZC/WdsvrPA5/RgeTT/8=; b=URL+q5AifAU8Yq/QavpyV69vPrZ2suFLiPGk3qlVRPt3eUEZDlzPJhtIlLWUqSp5jy 2BJ8yLI8/LE9V7b0EfQFr5mEfZeoSIa6ClkFj5krk+4Hr4pTsQrPm+yu7qK1+ryq5RR6 biUvODd6QhW6CDdzkbhYBWiLWDpZaxEyrbtwBWE/ciy96D34EWUoizNjVL1Sa2jND83C TY2iMkNFQbC5goXaNefBC8Y6fGyWvvKa0NNLpi9Tx8J9x74OVBRT4OCqAPvCRUZOhRg4 2+UtPQmEgYKUWa5jiJUoTYMtRQM1PcIb23JHtidCnl1Xi5mUNyxSKDuv7I9unj864p0g 8vbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="t6n2K/Ve"; 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 p4si5122759ejj.334.2019.10.27.14.27.39; Sun, 27 Oct 2019 14:27:40 -0700 (PDT) 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="t6n2K/Ve"; 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 S1730924AbfJ0VYp (ORCPT + 26 others); Sun, 27 Oct 2019 17:24:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:46338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732563AbfJ0VYk (ORCPT ); Sun, 27 Oct 2019 17:24:40 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 00DEB21726; Sun, 27 Oct 2019 21:24:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211479; bh=qjjUIQQK/K3d1S3afzT05FRefX9ssSgQs8oma/kfAOw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t6n2K/Ve9gd0hErcT7LukVYRyemUDfRgJhI9cvAWLp9/h6yJYCX9X17WSQWXkb5Y5 pKh73LPt+sXL2482cgDf2T/LRfkL8XQNk/NjZtJel1cV+ZjuW8TOFAqtl0lL2bqLy0 h/jMuyjiBMnKo1yno+Qjw5jUt2hSAuW5kO+x2CiA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Zyngier , Will Deacon Subject: [PATCH 5.3 165/197] arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT Date: Sun, 27 Oct 2019 22:01:23 +0100 Message-Id: <20191027203403.176764398@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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: Marc Zyngier commit 93916beb70143c46bf1d2bacf814be3a124b253b upstream. It appears that the only case where we need to apply the TX2_219_TVM mitigation is when the core is in SMT mode. So let's condition the enabling on detecting a CPU whose MPIDR_EL1.Aff0 is non-zero. Cc: Signed-off-by: Marc Zyngier Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/cpu_errata.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -12,6 +12,7 @@ #include #include #include +#include static bool __maybe_unused is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope) @@ -623,6 +624,30 @@ check_branch_predictor(const struct arm6 return (need_wa > 0); } +static const __maybe_unused struct midr_range tx2_family_cpus[] = { + MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN), + MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2), + {}, +}; + +static bool __maybe_unused +needs_tx2_tvm_workaround(const struct arm64_cpu_capabilities *entry, + int scope) +{ + int i; + + if (!is_affected_midr_range_list(entry, scope) || + !is_hyp_mode_available()) + return false; + + for_each_possible_cpu(i) { + if (MPIDR_AFFINITY_LEVEL(cpu_logical_map(i), 0) != 0) + return true; + } + + return false; +} + #ifdef CONFIG_HARDEN_EL2_VECTORS static const struct midr_range arm64_harden_el2_vectors[] = { @@ -857,6 +882,14 @@ const struct arm64_cpu_capabilities arm6 ERRATA_MIDR_RANGE_LIST(tx2_family_cpus), }, #endif +#ifdef CONFIG_CAVIUM_TX2_ERRATUM_219 + { + .desc = "Cavium ThunderX2 erratum 219 (KVM guest sysreg trapping)", + .capability = ARM64_WORKAROUND_CAVIUM_TX2_219_TVM, + ERRATA_MIDR_RANGE_LIST(tx2_family_cpus), + .matches = needs_tx2_tvm_workaround, + }, +#endif { } };