From patchwork Mon Jul 27 14:04:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247186 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4850094ilg; Mon, 27 Jul 2020 07:29:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHN0OSQaMtOJNFiMK3zBVAVESHrMPe/13ffBg5Tu48g47Ny4953pKOjTGR+r/7vCmoSZHW X-Received: by 2002:a05:6402:1a3c:: with SMTP id be28mr22029410edb.140.1595860188906; Mon, 27 Jul 2020 07:29:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860188; cv=none; d=google.com; s=arc-20160816; b=POp5AY7kCYcmcO1xUF8XE+CKlN0DwxtxkjCtZooHmv9Wlf3Gfvjl+3jZxMPz/nrb+g 9wjziBAokB+fQ45dym5nmW/4RC5zTnMhoH7owJxtvgBF9TulkgI48IGuaOuwZxoRgFRc oz2ba31iQ4v+NNEXHqv9aV7n7YI6LIRvVmN3/rdWmfq4W0FK4QYUTtY+1CL0ekssTWRG YHYZsigmsM//VtssOJJIuTAwPFiAeHWpRVzqJM2KCRUcy2jK9oJscTcQknKmy+OVC8Rq dgTPSLes4FsvDaHVb77s0q8SpTtXjBB1QePvQw8Be95xf1Lvt3Tr3ho7A+WHIShJU+Ua oXhg== 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=WcSFL7rmShmyAhB/OVX8c9nRVrN24XRFqKz/jeyVojA=; b=Sc8UmUMcaV2dA09A7YQxmCfrN2lNp1KmRDKXW7ZEVbeqFvuIlrNfrprsnJ+COrWTLa Bk54G5IlYErOjZIeQiPoCXhn2YxQaUP3kEvbv1It0s8ZCrU3h0N7rggmRwwHRZfouH6V Ey6d5UcWWOSMWPzbVa5SFmy9CC24VVvZqFnDMSVpogDYeXTZGrPM21zvpScc+QAGg8z4 UykuyL+XlJnsmq/RLGQR6nY/IB4k/mGxJ/FJS515kJiMLX8d+sF6+mtaLYPWpuId8weQ RW6/D76T3Ty11QL2SpEi+ISMOHwR8q6CyJxRqEm3KoHf5MZdvu65xMh42mfLpk79fn9T GkjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DknD6UfP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lt22si919819ejb.376.2020.07.27.07.29.48; Mon, 27 Jul 2020 07:29:48 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DknD6UfP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732000AbgG0OXB (ORCPT + 15 others); Mon, 27 Jul 2020 10:23:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:52100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731997AbgG0OXA (ORCPT ); Mon, 27 Jul 2020 10:23:00 -0400 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 C18322070A; Mon, 27 Jul 2020 14:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859780; bh=9YDQ//FKRdwgXd+87UsMSe+Y6OxUfMAleBfFYEuz80c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DknD6UfPMITxxEHgQ6DhayQNGXlGsiKy9F3yYOWP18EmjZ0GDfaxAZEOpMhS+pXSu hMpkbjWx+DftUxdIWJ+xDPc1fYZyktd3Hr13E0cFh9EtizcO79NG8QfKPMvDXtNTKy lk5b0z1EqUzDokys4m2hUDLKJe2TR5z5ccU0n1Rw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Vinod Koul , Sasha Levin Subject: [PATCH 5.7 102/179] dmaengine: ti: k3-udma: Fix cleanup code for alloc_chan_resources Date: Mon, 27 Jul 2020 16:04:37 +0200 Message-Id: <20200727134937.621458979@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@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: Peter Ujfalusi [ Upstream commit 5a9377cc7421b59b13c9b90b8dc0aca332a1c958 ] Some of the earlier errors should be sent to the error cleanup path to make sure that the uchan struct is reset, the dma_pool (if allocated) is released and memcpy channel pairs are released in a correct way. Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20200527070612.636-2-peter.ujfalusi@ti.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ti/k3-udma.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) -- 2.25.1 diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 7cab23fe5c73f..35f54a1af29d8 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1773,7 +1773,8 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) dev_err(ud->ddev.dev, "Descriptor pool allocation failed\n"); uc->use_dma_pool = false; - return -ENOMEM; + ret = -ENOMEM; + goto err_cleanup; } } @@ -1793,16 +1794,18 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) ret = udma_get_chan_pair(uc); if (ret) - return ret; + goto err_cleanup; ret = udma_alloc_tx_resources(uc); - if (ret) - return ret; + if (ret) { + udma_put_rchan(uc); + goto err_cleanup; + } ret = udma_alloc_rx_resources(uc); if (ret) { udma_free_tx_resources(uc); - return ret; + goto err_cleanup; } uc->config.src_thread = ud->psil_base + uc->tchan->id; @@ -1820,10 +1823,8 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) uc->id); ret = udma_alloc_tx_resources(uc); - if (ret) { - uc->config.remote_thread_id = -1; - return ret; - } + if (ret) + goto err_cleanup; uc->config.src_thread = ud->psil_base + uc->tchan->id; uc->config.dst_thread = uc->config.remote_thread_id; @@ -1840,10 +1841,8 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) uc->id); ret = udma_alloc_rx_resources(uc); - if (ret) { - uc->config.remote_thread_id = -1; - return ret; - } + if (ret) + goto err_cleanup; uc->config.src_thread = uc->config.remote_thread_id; uc->config.dst_thread = (ud->psil_base + uc->rchan->id) | @@ -1858,7 +1857,9 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) /* Can not happen */ dev_err(uc->ud->dev, "%s: chan%d invalid direction (%u)\n", __func__, uc->id, uc->config.dir); - return -EINVAL; + ret = -EINVAL; + goto err_cleanup; + } /* check if the channel configuration was successful */ @@ -1936,7 +1937,7 @@ err_psi_free: err_res_free: udma_free_tx_resources(uc); udma_free_rx_resources(uc); - +err_cleanup: udma_reset_uchan(uc); if (uc->use_dma_pool) { From patchwork Mon Jul 27 14:04:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247185 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4850031ilg; Mon, 27 Jul 2020 07:29:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6f3jijy6uQ8S/J9x0ewmEWGPYVYvccO/ZEF+tozjDrhmkvm/neeJ2eCsxWHPlplXk1Ezn X-Received: by 2002:a05:6402:7d5:: with SMTP id u21mr4815077edy.235.1595860184176; Mon, 27 Jul 2020 07:29:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860184; cv=none; d=google.com; s=arc-20160816; b=xDrMiZhEJocK52jkUON3wL6zkRZ3M7XtWPi4vyIBo9YmPYSCJUxhjr8pHdn5tmqkc1 ziP/cqGYoIZoO7yPZKaLH9WKCftJqZFZx57VISPdJyJGtPk1D7+0tFgpCW968vehQPoA u56n7/DyiJljTCCKlm7MmvIYSg6dhg2mjOjqo5V7rNxfodRkllPyCEtoX1rYNEpFggBP WOyS36N+i3RMXoZcqYCpy06u+z17iGraOgPc6+atbhNLrVBufS+H38d5wEkCrv7xOOsg nVu2asZT1ADDxTVep0s45ezKPT70a8QE9y2RefguPAesJ4nOZuMfp1KJyNI/jPKzUH9u j7Rg== 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=dofxhU6eQpSwO1n//+4Aerlstpov/g9EQfAdmX30hrw=; b=Wx7ITeBSelkF2Mao7DNPuYw+QgGbNrqSdRln2D3WN9PeD52u6maixalYczumTx8pjZ FjbBoIN3Z77zUZjWqN7ojBmavZIDjJCZJfegaEZ2LWa3AfFMoQzoPyRdvpN0+pVuVoDq ZoMfQEfcev9ekMOIRWWODQD22o52nc+m2HTrEJ5oURWH7sgmaj8zTlt0cHlrb2va8Ky2 98QXIb9TNeEroSECXEcbfy61NuuJbB6yiHYTYjU0Yetrb5dnWTxEK3gGJt2bzAQ/FJQx RXGn0pd/xiTT5/+aSFveWnD7yStI0ymTUqBJFQyLh9EXsFZfHwr6PpYl5F+qRfNggFJT 00iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i9QdEFmX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y26si3484106edr.390.2020.07.27.07.29.44; Mon, 27 Jul 2020 07:29:44 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i9QdEFmX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731130AbgG0OXE (ORCPT + 15 others); Mon, 27 Jul 2020 10:23:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:52140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732004AbgG0OXD (ORCPT ); Mon, 27 Jul 2020 10:23:03 -0400 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 6194D2070A; Mon, 27 Jul 2020 14:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859782; bh=e9V3lPrkqDvI9PpIFRoLbKwiPOAE5nFcLwbfsSfpGZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i9QdEFmXUUaCw6pViwV10r5Ua79rEAQW1nyOgAxHxOfUxcuNImnNa2s4tC+f5g/kt Lxo3JqQwB8vKfsicL7N5Z4fYAToo6BpZkXB9A64NjIOtzJqdKbCUUgMTWigaQsrN5C dA+rZzofdLT+Bk0heXmYXbr1LSebAIzErqI+XpCs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Vinod Koul , Sasha Levin Subject: [PATCH 5.7 103/179] dmaengine: ti: k3-udma: Fix the running channel handling in alloc_chan_resources Date: Mon, 27 Jul 2020 16:04:38 +0200 Message-Id: <20200727134937.668966561@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@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: Peter Ujfalusi [ Upstream commit b5b0180c2f767e90b4a6a885a0a2abaab6e3d48d ] In the unlikely case when the channel is running (RT enabled) during alloc_chan_resources then we should use udma_reset_chan() and not udma_stop() as the later is trying to initiate a teardown on the channel, which is not valid at this point. Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20200527070612.636-3-peter.ujfalusi@ti.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ti/k3-udma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 35f54a1af29d8..b777f1924968f 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1868,7 +1868,7 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) if (udma_is_chan_running(uc)) { dev_warn(ud->dev, "chan%d: is running!\n", uc->id); - udma_stop(uc); + udma_reset_chan(uc, false); if (udma_is_chan_running(uc)) { dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); goto err_res_free; From patchwork Mon Jul 27 14:05:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247184 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4848869ilg; Mon, 27 Jul 2020 07:28:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJya90HHmmPA3pK2UOrQnSObzXX+o3B9IZef0cb+Yh8bp/BvIakTLSxd2BP+CmLh4g0cf+9t X-Received: by 2002:a05:6402:3ca:: with SMTP id t10mr6920228edw.298.1595860105425; Mon, 27 Jul 2020 07:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860105; cv=none; d=google.com; s=arc-20160816; b=hc76Evh0SkDrMbHwu2Q1EEf0BPyM2XGl2HeFsFWkgUo8gGv8hOB+MqFLvUL9RfqRsF sSyOOqt/LfiouOfFmOYu13Ef33cVydTRsQtb5lSMOCQtaV+nch5W5UgBr8ze0jHDuiYe 9OYRESNGpawt7y/s/wbRA7/gFRbbu3tRhx0kIpfJbXK0WKGXdmIrW24p5nRVxuUghQSN wne3E3zZZoxCQOz3tRNMn/itV7geWX8+LLPstG207dI659J+fR9WmVG8BQ0fvg9ye6G4 61idYrzVRoPz/BhEzFdEQEP3a9j/yk78SCHizDfzqa6CQvbONri9n9uA0nvC74f8EGi6 alFA== 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=IE+So64SJGedld+OHyXUmvcHJ/s2utmpXyJBUxCxI/A=; b=Oxq7f4PhySLLczPsQQX+dOac1GbmFPH5sP09ImMxSIZeITrVLM40nVHHXn6S3vj1N/ qLV2b/sflmSEqCkQgrmxQjUh50Ln2umy7crkMnry2u2s1LN1L6Qd9NqDMHt92z/cTk5i e3QeiZkmvQZixHLd+Isiz/lFClNMZ24elm/Uc7qdiWiVNSvMMsZ5xcWjQ4GRcTowqMFi XO9jUk7tGjFRKG8xnXdSlkw25uU1OR08HGIDSVvXzKorUVVQYSuZyvb64D/vhSKU5mLm Q2u6VuYwGPLCkGiDvQBNTMmAB0gIVrNOKfTy7h3CyOwnpQhuwaYUsswcvqSprX0DBG4u el2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=arSpuOji; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p32si6177586edd.55.2020.07.27.07.28.25; Mon, 27 Jul 2020 07:28:25 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=arSpuOji; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732248AbgG0O2Y (ORCPT + 15 others); Mon, 27 Jul 2020 10:28:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:53840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732257AbgG0OYV (ORCPT ); Mon, 27 Jul 2020 10:24:21 -0400 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 AAA682173E; Mon, 27 Jul 2020 14:24:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859861; bh=p7kbBdidlvQ7bLIBBd8hhQHTZoQliGldBUR16LYjEP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=arSpuOjiW10ZrAnsrK8ShmzshalgQTWUBdxpkKA7hALhFl4Cz/kUrt7YGJu9VXrzF sBduNVayFzEuOxipFDHrdrPyMVq6PLESUsPaOoDmV3BjL5lo0iBwRjcPpul4u1GSUd fSRKc2GVV6VE01zeMrqxbXEsyJEpOCUMQeAqSbLE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Thomas Gleixner , Nick Desaulniers , Sasha Levin Subject: [PATCH 5.7 134/179] x86: math-emu: Fix up cmp insn for clang ias Date: Mon, 27 Jul 2020 16:05:09 +0200 Message-Id: <20200727134939.177146438@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@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 81e96851ea32deb2c921c870eecabf335f598aeb ] The clang integrated assembler requires the 'cmp' instruction to have a length prefix here: arch/x86/math-emu/wm_sqrt.S:212:2: error: ambiguous instructions require an explicit suffix (could be 'cmpb', 'cmpw', or 'cmpl') cmp $0xffffffff,-24(%ebp) ^ Make this a 32-bit comparison, which it was clearly meant to be. Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Reviewed-by: Nick Desaulniers Link: https://lkml.kernel.org/r/20200527135352.1198078-1-arnd@arndb.de Signed-off-by: Sasha Levin --- arch/x86/math-emu/wm_sqrt.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 diff --git a/arch/x86/math-emu/wm_sqrt.S b/arch/x86/math-emu/wm_sqrt.S index 3b2b58164ec18..40526dd85137b 100644 --- a/arch/x86/math-emu/wm_sqrt.S +++ b/arch/x86/math-emu/wm_sqrt.S @@ -209,7 +209,7 @@ sqrt_stage_2_finish: #ifdef PARANOID /* It should be possible to get here only if the arg is ffff....ffff */ - cmp $0xffffffff,FPU_fsqrt_arg_1 + cmpl $0xffffffff,FPU_fsqrt_arg_1 jnz sqrt_stage_2_error #endif /* PARANOID */ From patchwork Mon Jul 27 14:05:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247183 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4847579ilg; Mon, 27 Jul 2020 07:26:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoKgobecbwDG/X2hEnnTFthrd7iNTNrjp8M66PNUCQ3Lw+EBoVnkLPzfDIFi4H1lj2vTkk X-Received: by 2002:a17:906:194b:: with SMTP id b11mr21133057eje.28.1595860018084; Mon, 27 Jul 2020 07:26:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860018; cv=none; d=google.com; s=arc-20160816; b=Msidyeeyrgud5sq3dbUpVtV4dMbPL6bhh74F+33xhaPXo7r9/iKSZP2I+8MSZJ1xoU r09Xj17gZU4ap6VNhKXyvdyRwMZtDcZ2mSdXWFnFvJx6WUFRv8Ogy300A9zXG1WjfKp8 V8rhOpckGo5RHKqCntPbywjA3kTw85PkBfVGW7OqO9G/jucHXSXQyM/c6bRYij6cAoo+ SwektQZhxeqwu6eZdxxKa/VWy4eMGlOKS5r/JbeH4qiCAPIxCUfTPIlSvmKG8ENoOAbX cEcEucF5WrpJujLFQnOmjmCNWvv2ffP8VxQZBHSQBNlvIVGDRC7Y1tZxSyJfbQtAbCTN nxnQ== 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=IQ5wqDn6+qx3xH0+lHOnyw6Nlw3d93j5LzNnrsmU0nA=; b=mEdnTAzqjeXC5ijCyUrVFw/dtA2QCqzEsuN7ouxqyOq2WV6HDJZHGErdxOXMbXuXV5 miZKR7hut3ksBGhNQzO4WeE7gtiiFRAGtoZBOqn9f/N20HYi0qlYMZOMWxkbXJ2rDXP6 D94kqaBpmuB4GG08QYDpEnGLZjZZUqArDLgRkr9x1bX8Z0YSdCsSt8VRh2RXXTuvveTR fyKxbTK/LGGdDoJtFENi/WCi2QEGPvM/eLm1asJ3SjUZ14VSr9m3gySOuZezczTnO43y tpr0jskS6FvLHNBKJwMZSDpznvIMNn/Vf2nwql3zcIm7Yu2QO6kf8GHJpFWIoYbWClja 3B6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Y/K4CSfc"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g15si5609658edy.200.2020.07.27.07.26.57; Mon, 27 Jul 2020 07:26:58 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Y/K4CSfc"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732605AbgG0O01 (ORCPT + 15 others); Mon, 27 Jul 2020 10:26:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:56664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732552AbgG0O00 (ORCPT ); Mon, 27 Jul 2020 10:26:26 -0400 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 B7E89207FC; Mon, 27 Jul 2020 14:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859985; bh=DgP8QoXgHkkBMA1H5XydTzU0oPZhdEGeesvrTY8nD+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y/K4CSfcuoRnJKYwrMDj4LgWtF+MQmeQDsO5WNkQ80GYOT0ukPIgBDGKTVUnEKOLb c0NWOyiisPwb2iple7F+K4QRek3XvlALRRgdKAzRsBZW82B9/B0QtQ5zVlZLFflHI0 K8APGgM9A40lOy1/Bfwiy7jBh7L709qzAi0LWNPQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jun Nie , Mike Tipton , Georgi Djakov Subject: [PATCH 5.7 154/179] interconnect: msm8916: Fix buswidth of pcnoc_s nodes Date: Mon, 27 Jul 2020 16:05:29 +0200 Message-Id: <20200727134940.172079666@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@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: Georgi Djakov commit 92d232d176041db5b033dd7b7f7f2cf343f82237 upstream. The buswidth of the pcnoc_s_* nodes is actually not 8, but 4 bytes. Let's fix it. Reported-by: Jun Nie Reviewed-by: Mike Tipton Fixes: 30c8fa3ec61a ("interconnect: qcom: Add MSM8916 interconnect provider driver") Link: https://lore.kernel.org/r/20200709130004.12462-1-georgi.djakov@linaro.org Signed-off-by: Georgi Djakov Cc: stable Link: https://lore.kernel.org/r/20200723083735.5616-3-georgi.djakov@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/interconnect/qcom/msm8916.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/interconnect/qcom/msm8916.c +++ b/drivers/interconnect/qcom/msm8916.c @@ -197,13 +197,13 @@ DEFINE_QNODE(pcnoc_int_0, MSM8916_PNOC_I DEFINE_QNODE(pcnoc_int_1, MSM8916_PNOC_INT_1, 8, -1, -1, MSM8916_PNOC_SNOC_MAS); DEFINE_QNODE(pcnoc_m_0, MSM8916_PNOC_MAS_0, 8, -1, -1, MSM8916_PNOC_INT_0); DEFINE_QNODE(pcnoc_m_1, MSM8916_PNOC_MAS_1, 8, -1, -1, MSM8916_PNOC_SNOC_MAS); -DEFINE_QNODE(pcnoc_s_0, MSM8916_PNOC_SLV_0, 8, -1, -1, MSM8916_SLAVE_CLK_CTL, MSM8916_SLAVE_TLMM, MSM8916_SLAVE_TCSR, MSM8916_SLAVE_SECURITY, MSM8916_SLAVE_MSS); -DEFINE_QNODE(pcnoc_s_1, MSM8916_PNOC_SLV_1, 8, -1, -1, MSM8916_SLAVE_IMEM_CFG, MSM8916_SLAVE_CRYPTO_0_CFG, MSM8916_SLAVE_MSG_RAM, MSM8916_SLAVE_PDM, MSM8916_SLAVE_PRNG); -DEFINE_QNODE(pcnoc_s_2, MSM8916_PNOC_SLV_2, 8, -1, -1, MSM8916_SLAVE_SPDM, MSM8916_SLAVE_BOOT_ROM, MSM8916_SLAVE_BIMC_CFG, MSM8916_SLAVE_PNOC_CFG, MSM8916_SLAVE_PMIC_ARB); -DEFINE_QNODE(pcnoc_s_3, MSM8916_PNOC_SLV_3, 8, -1, -1, MSM8916_SLAVE_MPM, MSM8916_SLAVE_SNOC_CFG, MSM8916_SLAVE_RBCPR_CFG, MSM8916_SLAVE_QDSS_CFG, MSM8916_SLAVE_DEHR_CFG); -DEFINE_QNODE(pcnoc_s_4, MSM8916_PNOC_SLV_4, 8, -1, -1, MSM8916_SLAVE_VENUS_CFG, MSM8916_SLAVE_CAMERA_CFG, MSM8916_SLAVE_DISPLAY_CFG); -DEFINE_QNODE(pcnoc_s_8, MSM8916_PNOC_SLV_8, 8, -1, -1, MSM8916_SLAVE_USB_HS, MSM8916_SLAVE_SDCC_1, MSM8916_SLAVE_BLSP_1); -DEFINE_QNODE(pcnoc_s_9, MSM8916_PNOC_SLV_9, 8, -1, -1, MSM8916_SLAVE_SDCC_2, MSM8916_SLAVE_LPASS, MSM8916_SLAVE_GRAPHICS_3D_CFG); +DEFINE_QNODE(pcnoc_s_0, MSM8916_PNOC_SLV_0, 4, -1, -1, MSM8916_SLAVE_CLK_CTL, MSM8916_SLAVE_TLMM, MSM8916_SLAVE_TCSR, MSM8916_SLAVE_SECURITY, MSM8916_SLAVE_MSS); +DEFINE_QNODE(pcnoc_s_1, MSM8916_PNOC_SLV_1, 4, -1, -1, MSM8916_SLAVE_IMEM_CFG, MSM8916_SLAVE_CRYPTO_0_CFG, MSM8916_SLAVE_MSG_RAM, MSM8916_SLAVE_PDM, MSM8916_SLAVE_PRNG); +DEFINE_QNODE(pcnoc_s_2, MSM8916_PNOC_SLV_2, 4, -1, -1, MSM8916_SLAVE_SPDM, MSM8916_SLAVE_BOOT_ROM, MSM8916_SLAVE_BIMC_CFG, MSM8916_SLAVE_PNOC_CFG, MSM8916_SLAVE_PMIC_ARB); +DEFINE_QNODE(pcnoc_s_3, MSM8916_PNOC_SLV_3, 4, -1, -1, MSM8916_SLAVE_MPM, MSM8916_SLAVE_SNOC_CFG, MSM8916_SLAVE_RBCPR_CFG, MSM8916_SLAVE_QDSS_CFG, MSM8916_SLAVE_DEHR_CFG); +DEFINE_QNODE(pcnoc_s_4, MSM8916_PNOC_SLV_4, 4, -1, -1, MSM8916_SLAVE_VENUS_CFG, MSM8916_SLAVE_CAMERA_CFG, MSM8916_SLAVE_DISPLAY_CFG); +DEFINE_QNODE(pcnoc_s_8, MSM8916_PNOC_SLV_8, 4, -1, -1, MSM8916_SLAVE_USB_HS, MSM8916_SLAVE_SDCC_1, MSM8916_SLAVE_BLSP_1); +DEFINE_QNODE(pcnoc_s_9, MSM8916_PNOC_SLV_9, 4, -1, -1, MSM8916_SLAVE_SDCC_2, MSM8916_SLAVE_LPASS, MSM8916_SLAVE_GRAPHICS_3D_CFG); DEFINE_QNODE(pcnoc_snoc_mas, MSM8916_PNOC_SNOC_MAS, 8, 29, -1, MSM8916_PNOC_SNOC_SLV); DEFINE_QNODE(pcnoc_snoc_slv, MSM8916_PNOC_SNOC_SLV, 8, -1, 45, MSM8916_SNOC_INT_0, MSM8916_SNOC_INT_BIMC, MSM8916_SNOC_INT_1); DEFINE_QNODE(qdss_int, MSM8916_SNOC_QDSS_INT, 8, -1, -1, MSM8916_SNOC_INT_0, MSM8916_SNOC_INT_BIMC);