From patchwork Mon Nov 11 18:27:58 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: 179114 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7046546ilf; Mon, 11 Nov 2019 10:52:45 -0800 (PST) X-Google-Smtp-Source: APXvYqyug4ZvvWyw2G4bDjpW0UQc0jy5masitVzuebIi6jrhSclcPAnVBwS9R7JOUw50rulojNym X-Received: by 2002:a17:906:4e99:: with SMTP id v25mr12851531eju.106.1573498365768; Mon, 11 Nov 2019 10:52:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573498365; cv=none; d=google.com; s=arc-20160816; b=KeGf6m2OkNTxfxidL1wfPZ1jRohF9rnlG2s7XbooX/SOigQ0teZP4NXCn/TbpTIN1I 9n541dk3DyPL8ZLGZTmgx+QywppGx3GbCuso3Kq1JEnqUZ58mHgGvp6Ho25QDUQpMcIR SIi60PQGi2w5P8a9lIPhxg0CJoW+4wBG/ri5om0fnLVIf8YHY5CTjG8keLLvspK4Cd5O lnh0SoQNLLW1sA9HagW+Bjmi8EK3VN+DTmO1gmC+gKec2W/Z2qDwCPuHxpkTLM/BLbym z6cbmcrg+Zoxny+X0SgN8q9GnLwAu98H/Had7yqsHJ4wjbmDkRNqhbVWs/1/0mNSd3bi D8Pg== 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=5PJFRPbsdzWQvL5c/uej9NU8sG+9wv1SxrMDAjhhAYY=; b=dDZrEcZJJ6QlRevjAB+pq/Ow5I3XRk+lyTzXWGIQQ0oocoam87OGHBQlI9SqEC3gdy NuwRBas+vvGHZcEJ0l7MHJU5tUAbWJDRnPRKIcsVAxYdfmH6Vva2tGynEhl1q4jS8FSm 5qLbU0gAY1NZVCytroadHgiNOXrSS7sbjg4hvKVX4nhfKXmF9KvIAwzlGGeuMTQoE9hj 0qyaUzPctYpLgFAJQ3xREjNiH+19jCnSmuUOxF+gcqhiLes7SmigCxwBrsJSkC3Zi6po Y1crCu6wsBwF7TpZaq/h75fiXvnsyiHmOK7flRiuZjZziVRacQG7oGPVvDygtIgfoLsM prUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IDzXOJNz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m12si5729435ejr.306.2019.11.11.10.52.45; Mon, 11 Nov 2019 10:52:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IDzXOJNz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727341AbfKKSwn (ORCPT + 14 others); Mon, 11 Nov 2019 13:52:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:47060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729650AbfKKSwm (ORCPT ); Mon, 11 Nov 2019 13:52:42 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A0829214E0; Mon, 11 Nov 2019 18:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498360; bh=tY0oOqPs5y4Z3QzaxhFPBAKTG3CHb+oGU/zS+s/xIZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IDzXOJNz9DfJIXQzHNOeAmvu3f3xKM4BnjPDCwY2+KzOvoq58UBxDhStzKwt3JpNk w2WYM9whr433IMApbL5QVcE4j4n2aWN6V0RCrUtwNQSIIQ9mVDjDbU4SGxTbUgiAhA eCPUES4JZPkyi79syrubUJgVKBDlXbOE7DWS2jlE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhenfang Wang , Baolin Wang , Vinod Koul , Sasha Levin Subject: [PATCH 5.3 096/193] dmaengine: sprd: Fix the possible memory leak issue Date: Mon, 11 Nov 2019 19:27:58 +0100 Message-Id: <20191111181508.229679609@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Baolin Wang [ Upstream commit ec1ac309596a7bdf206743b092748205f6cd5720 ] If we terminate the channel to free all descriptors associated with this channel, we will leak the memory of current descriptor if the current descriptor is not completed, since it had been deteled from the desc_issued list and have not been added into the desc_completed list. Thus we should check if current descriptor is completed or not, when freeing the descriptors associated with one channel, if not, we should free it to avoid this issue. Fixes: 9b3b8171f7f4 ("dmaengine: sprd: Add Spreadtrum DMA driver") Reported-by: Zhenfang Wang Tested-by: Zhenfang Wang Signed-off-by: Baolin Wang Link: https://lore.kernel.org/r/170dbbc6d5366b6fa974ce2d366652e23a334251.1570609788.git.baolin.wang@linaro.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/sprd-dma.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 2.20.1 diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index a4a91f233121a..8546ad0347208 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -212,6 +212,7 @@ struct sprd_dma_dev { struct sprd_dma_chn channels[0]; }; +static void sprd_dma_free_desc(struct virt_dma_desc *vd); static bool sprd_dma_filter_fn(struct dma_chan *chan, void *param); static struct of_dma_filter_info sprd_dma_info = { .filter_fn = sprd_dma_filter_fn, @@ -613,12 +614,19 @@ static int sprd_dma_alloc_chan_resources(struct dma_chan *chan) static void sprd_dma_free_chan_resources(struct dma_chan *chan) { struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); + struct virt_dma_desc *cur_vd = NULL; unsigned long flags; spin_lock_irqsave(&schan->vc.lock, flags); + if (schan->cur_desc) + cur_vd = &schan->cur_desc->vd; + sprd_dma_stop(schan); spin_unlock_irqrestore(&schan->vc.lock, flags); + if (cur_vd) + sprd_dma_free_desc(cur_vd); + vchan_free_chan_resources(&schan->vc); pm_runtime_put(chan->device->dev); } @@ -1031,15 +1039,22 @@ static int sprd_dma_resume(struct dma_chan *chan) static int sprd_dma_terminate_all(struct dma_chan *chan) { struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); + struct virt_dma_desc *cur_vd = NULL; unsigned long flags; LIST_HEAD(head); spin_lock_irqsave(&schan->vc.lock, flags); + if (schan->cur_desc) + cur_vd = &schan->cur_desc->vd; + sprd_dma_stop(schan); vchan_get_all_descriptors(&schan->vc, &head); spin_unlock_irqrestore(&schan->vc.lock, flags); + if (cur_vd) + sprd_dma_free_desc(cur_vd); + vchan_dma_desc_free_list(&schan->vc, &head); return 0; } From patchwork Mon Nov 11 18:28:39 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: 179115 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7048834ilf; Mon, 11 Nov 2019 10:55:04 -0800 (PST) X-Google-Smtp-Source: APXvYqzNLIegbPN3uBIa7RRUjx0Jp2CiEOCxugZVp+PQ3l91f1uUlkRSaPR7aElf8WzYFeSTl58p X-Received: by 2002:aa7:db55:: with SMTP id n21mr3494312edt.113.1573498504086; Mon, 11 Nov 2019 10:55:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573498504; cv=none; d=google.com; s=arc-20160816; b=pJyFI/+Yqtu2xrrhAdW9zyGGrEjpzu7XY5ivjm+NhOAZapXz4nBHqDMvX0kmgbQvxo atInzPM2pBw9lp01d+dpjDSpUaRFPlgRztH3r7IJOiuk2ns7sRWJkJsSupoRENZOo5tk nvFjRxUswtg4xZkLDmxSyxODEM2DhnSd87s8i9ymZ5wDinV8c9qzk2TORYtU/dsVipjA y97Puiet2I/URTWXPzjmdHqh7Vz7JwHMv244pzSs6IFi7x3N9MII9ftTIbNd17vZClYu KX1qHkoU2h57fYiJlBx4hdQXtNXpXjDR+bT6aZITMvmvvF24cPzsWeiX94h3LUVtQPpP 8pDw== 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=9Jbf+aPAolhhL53rM2SHM2dbNxMvJa5ieJ9ebF6EcYg=; b=mSdR/mlKchDLQz31hIv+Zc/Y8ZWUVIAKIQkBzG6lQNO2ew+CLTvzOljHKuTSFVyXpW +ujUHkb6IbDjnMMnRiLJZHPZujQnEkehGGHSNMfWb8rcpDEITf3kThFGM0vjxJ7CPRDm jiVdnsVMeK5wXJvqzum1JV8lP3gtFayZm7eQvqOFd8ghznUVbro8QZiS56OOJp1N7b6N RZtk27zFadVsqLy1Fwe6r38evEh1UVO+Gg+oH5CpffXn0AkCm264C669+M41CGPEpv26 FlijgwKSuxOuw1vv4rfSdWqVJ2BRDUNmQso/raVBFLka9+luL/89AT7BajHQ9elm3hRr R0+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yEXypkrD; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e48si11863820ede.207.2019.11.11.10.55.03; Mon, 11 Nov 2019 10:55:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yEXypkrD; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728866AbfKKSzC (ORCPT + 14 others); Mon, 11 Nov 2019 13:55:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:51590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729864AbfKKSzB (ORCPT ); Mon, 11 Nov 2019 13:55:01 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2FD8720818; Mon, 11 Nov 2019 18:54:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498500; bh=oa7+ObusdG651tsz+lRNsmIw5Rwdto7V/xiHEg4SlIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yEXypkrDngJUknxQghkYciV3VofDAlfQa7HcKd7oGBSNA0IOZMuu+SNMm1tlSVlYi fngP8+DheGYNJPevcUOs9LkCtsd5suSmdzblerQzQC6oLukciM6q8lpi9Aw2czno1b PChPIujWMqAh+FUaralnd5E2IpMvIvDBc7KfvF2E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Neil Armstrong , Arnd Bergmann , Felipe Balbi , Sasha Levin Subject: [PATCH 5.3 137/193] usb: dwc3: select CONFIG_REGMAP_MMIO Date: Mon, 11 Nov 2019 19:28:39 +0100 Message-Id: <20191111181511.282245835@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit a51bab592fbbef10f0e42a8aed86adfbf6a68fa7 ] After many randconfig builds, one configuration caused a link error with dwc3-meson-g12a lacking the regmap-mmio code: drivers/usb/dwc3/dwc3-meson-g12a.o: In function `dwc3_meson_g12a_probe': dwc3-meson-g12a.c:(.text+0x9f): undefined reference to `__devm_regmap_init_mmio_clk' Add the select statement that we have for all other users of that dependency. Fixes: c99993376f72 ("usb: dwc3: Add Amlogic G12A DWC3 glue") Acked-by: Neil Armstrong Signed-off-by: Arnd Bergmann Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc3/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 89abc6078703f..556a876c78962 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -102,6 +102,7 @@ config USB_DWC3_MESON_G12A depends on ARCH_MESON || COMPILE_TEST default USB_DWC3 select USB_ROLE_SWITCH + select REGMAP_MMIO help Support USB2/3 functionality in Amlogic G12A platforms. Say 'Y' or 'M' if you have one such device. From patchwork Mon Nov 11 18:29:20 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: 179117 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7051342ilf; Mon, 11 Nov 2019 10:57:27 -0800 (PST) X-Google-Smtp-Source: APXvYqyCq8dGoMsCHk3sMP5E5wLYakAZe6twiAnXv9j9qSmYo0VctYdE3NhMjjDO6vYlcG3xRoSB X-Received: by 2002:a17:906:3ec8:: with SMTP id d8mr24515776ejj.55.1573498647743; Mon, 11 Nov 2019 10:57:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573498647; cv=none; d=google.com; s=arc-20160816; b=kpBhmH+cTBBGWYmcncoM0QlQFP9RIRjUMnYNsqrKCJDSU2etU/RWRbWrPTuU5m/5SF /bY4kG/N76FN31xhY2LV0sYPri+n3l6SmLuK4kdNh2liwcmGkny9Jit/HZN+ojB1FIRF 3XA7phaXdUQdpvmJ+g3WSS0eHygTMr9eOqbwBudoJr61iezJ2K+cGjuOZj4F+h356ICc EA++CFP0hjRJ/FJddk8YQqyVb/7kYjJ1oTybsvFwh50m1J7FtU6U/0l7THc8osZCrhKq vWivEN4NWr0p7iwJikimlbx7vSlWSDrDIL6p1roFFwV0m742Q2BbWb4nJPLXlhXyXPGQ DZpA== 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=IIuDYXfGHCgj3yAC8P9Xv9dPIH9KPEnkLjjjtQ+HTWE=; b=AVeB5B7pr51P7iKfvsvREKZEiGnVAajA3ojCORuPdQQ9DCYYO57TRXxMvVKQTdp6rU SnE/oiLoKX52k38Lkhc/w+JqOB226VFiyFo+MOXjQ77kVAe/VVthU5NFLhnISUuV4PMZ lvNTly6xllapAmUrJYCTjzznLLnZvmobaE++1JkEriSLUpyBZD7us/0sq6c2suM9ykrR 7ekfIodUWT31AQbhJxgTSL6xd8a0HE/aLvzMK+BVNW23kbNzTQvkEDVzbNxABVsKkcxb U7mJC9dgjsoGWTpSAUkyCJgU3MJo5WpEAR9G4wFweVm4jrd8H4oRsTkKArs7hRKFlUPS KL1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c3DByFK5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ny24si9542322ejb.317.2019.11.11.10.57.27; Mon, 11 Nov 2019 10:57:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c3DByFK5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730834AbfKKS50 (ORCPT + 14 others); Mon, 11 Nov 2019 13:57:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:56722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730824AbfKKS5W (ORCPT ); Mon, 11 Nov 2019 13:57:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E683B2184C; Mon, 11 Nov 2019 18:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498641; bh=DM4dbc8qci9+aEw015cRNaVM6ammj5FoIyYGEmVmkZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c3DByFK5KvcAX9czNGD4A6QQKPtTTVKHkjQhYBsUkb/QvoSxy1H100gBuUCwxG02Y BCe2tfcDWNjLL1TfBlFS/sxpy85KNFpTBXz7yzmBggLWfoTYZDUfXuumHDccoB0X2t pOrQ9Bh6gIp6vDMbAwIoyYQJcPG65dXPZeQmH3Ik= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Andersson , Will Deacon , Sasha Levin Subject: [PATCH 5.3 178/193] arm64: cpufeature: Enable Qualcomm Falkor errata 1009 for Kryo Date: Mon, 11 Nov 2019 19:29:20 +0100 Message-Id: <20191111181514.236855312@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 36c602dcdd872e9f9b91aae5266b6d7d72b69b96 ] The Kryo cores share errata 1009 with Falkor, so add their model definitions and enable it for them as well. Signed-off-by: Bjorn Andersson [will: Update entry in silicon-errata.rst] Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- Documentation/arm64/silicon-errata.rst | 2 +- arch/arm64/kernel/cpu_errata.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index 6e52d334bc555..47feda6c15bcc 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -124,7 +124,7 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 | +----------------+-----------------+-----------------+-----------------------------+ -| Qualcomm Tech. | Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 | +| Qualcomm Tech. | Kryo/Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 | +----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | QDF2400 ITS | E0065 | QCOM_QDF2400_ERRATUM_0065 | +----------------+-----------------+-----------------+-----------------------------+ diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 1e0b9ae9bf7e2..4465be78ee466 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -659,17 +659,23 @@ static const struct midr_range arm64_harden_el2_vectors[] = { #endif #ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI - -static const struct midr_range arm64_repeat_tlbi_cpus[] = { +static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = { #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009 - MIDR_RANGE(MIDR_QCOM_FALKOR_V1, 0, 0, 0, 0), + { + ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0) + }, + { + .midr_range.model = MIDR_QCOM_KRYO, + .matches = is_kryo_midr, + }, #endif #ifdef CONFIG_ARM64_ERRATUM_1286807 - MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0), + { + ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0), + }, #endif {}, }; - #endif #ifdef CONFIG_CAVIUM_ERRATUM_27456 @@ -825,7 +831,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "Qualcomm erratum 1009, ARM erratum 1286807", .capability = ARM64_WORKAROUND_REPEAT_TLBI, - ERRATA_MIDR_RANGE_LIST(arm64_repeat_tlbi_cpus), + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, + .matches = cpucap_multi_entry_cap_matches, + .match_list = arm64_repeat_tlbi_list, }, #endif #ifdef CONFIG_ARM64_ERRATUM_858921