From patchwork Fri Nov 15 22:33:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179542 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13127245ilf; Fri, 15 Nov 2019 14:35:00 -0800 (PST) X-Google-Smtp-Source: APXvYqyvpb2iY0BS3tAc51pzT/cZ02TdVCNhcfX/wEMgxpaljCzgN/ZMBRHzbXYXxaS6gcU9ZHQZ X-Received: by 2002:a17:906:25c5:: with SMTP id n5mr4346376ejb.126.1573857300642; Fri, 15 Nov 2019 14:35:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857300; cv=none; d=google.com; s=arc-20160816; b=h1n09Gci2du7rJa2z/jL/lVK8gtX1voBT6BqZEka7gRnPxBa4z/K3b5so2her58n5p S9IoUZigciX53d9qYzvBHD7MoIUCdEXd7SeS4YEoRF2xcgV5HAMjqTx+AWtefKHqPZe2 qaivw1GV7v78s6p3KTk15/6xnK5tI/XzZkWLuTZBdtg2feNEESRQplF2tD2biYkMZsoX exx3lpx0Gh+1TYubCftVgrMX6LFRbEWnfSEszcMhvxDEmlmxrdvr8o9kiI0kwxJlue5i uxYelj43a3Rash3aSafZLVKXmu9c2EZ4djEq42nJRYQTz+ixNF0KHvzLWvR6400MwzOr aqlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=CfdEn/VOoyCYVCEhBtRjG/LrGez0kXMzdfAuimisWqo=; b=iSYaXdO3+N5ENZ2QEequD3c3+czMOTq8FfivR2Df8cnJO8n+O5hfMual2j2QOqqRre RA+F21gbinUYs/44N9Q/vEtk0zr8guI6fUgVhBxvUd9PfJ3P2yawQQLKVd0bi3pLjUIS ahwZ8OnMevAjdYIvdz24s67Hq6B1FimH97VPxx/GtPgPG/tdkNk1LUDBM2QSk326dnCN 85+8NJ6IyeU4UMa/7NeMg3obPXtPU43xIsUWfdSvfjeEMMBlL9FZIYnBHU7CFu1w/Pco BprFKxpD/dTOs7A2CgA1G3EElWw2XGCAgmw968vbt8hJOMuttesmXUvRzf7WDNwc5OkE AxPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BmJCSnph; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l24si6701150edw.352.2019.11.15.14.35.00; Fri, 15 Nov 2019 14:35:00 -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=@linaro.org header.s=google header.b=BmJCSnph; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727217AbfKOWeG (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:06 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:39456 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727199AbfKOWeC (ORCPT ); Fri, 15 Nov 2019 17:34:02 -0500 Received: by mail-pl1-f196.google.com with SMTP id o9so5624457plk.6 for ; Fri, 15 Nov 2019 14:34:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CfdEn/VOoyCYVCEhBtRjG/LrGez0kXMzdfAuimisWqo=; b=BmJCSnphEJxB/SJaEZ55rWx8UacuDIrgu3GGuKP9hxL0m0pDhN7q9J+QXmeNHU3a9S KcLpI35v0bQ7VN2vpFI89zIEmufoawp/UX+aj0AEhPZY1Ca6qiVHFhjEj/1Q6qpfeLYh gjoYQxSbf630RaEl3OM/6BIGdyMcJhAgPgaITE7CHkkMSKWyVALpX3aHE/rIyZ+534CU kKKAtB/FXySeSR4aPKIGgqnJPLZz5ZmoX7PLhvXCyZfRhjY/WwB2qknR22z51CDufEry KwJioKJ8hKDwJTr64gk0X3402S8pXsOhEqAEl6DeZUZcNxfDi9jgwWcFrfWjMc4Hltu1 UKjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CfdEn/VOoyCYVCEhBtRjG/LrGez0kXMzdfAuimisWqo=; b=ch/mVw/pO7JVp0RXzY5dhL4Ozr2cgirrraeWGKvNxIJzbQ6HJeRJq35M1WDChzNR3M ys64hwZVl+sAQkZbav6Zb5fFbkQM/urWEVYofWBexAcmgOG1+xez+55Dh+MMVkEpFERB EKyv8iQ3HCKoaKNlg8SJ98GtULaRW/dcLab8RpI30VSIm8E9TbMya5NsHzNpxSAYGP55 Hr9i51ZWmRGVZWxpZjuA+eNvDvvNGVcTSmXhpegqhm2JII9UK9OsNC9oiOppu9ppJHvo jWd/f6aWSenvRr7JRsrdi1ne/GeEPIpOCzHCEOR5p3K5C0HQLEE87+6TYSf3xQyd0Xgq i98w== X-Gm-Message-State: APjAAAUqAKAD5u0DUKehqw47sH4yZZDpB+4CGnhFDc0NXS9OLNhLDaMK YeivSlznKfsGexedZv9Sj6qgRWGqyrQ= X-Received: by 2002:a17:90a:ca04:: with SMTP id x4mr23087371pjt.103.1573857241601; Fri, 15 Nov 2019 14:34:01 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:01 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 05/20] media: stm32-dcmi: fix DMA corruption when stopping streaming Date: Fri, 15 Nov 2019 15:33:41 -0700 Message-Id: <20191115223356.27675-5-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hugues Fruchet commit b3ce6f6ff3c260ee53b0f2236e5fd950d46957da upstream Avoid call of dmaengine_terminate_all() between dmaengine_prep_slave_single() and dmaengine_submit() by locking the whole DMA submission sequence. Signed-off-by: Hugues Fruchet Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- drivers/media/platform/stm32/stm32-dcmi.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -- 2.17.1 diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c index 1d9c028e52cb..d86944109cbf 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -164,6 +164,9 @@ struct stm32_dcmi { int errors_count; int overrun_count; int buffers_count; + + /* Ensure DMA operations atomicity */ + struct mutex dma_lock; }; static inline struct stm32_dcmi *notifier_to_dcmi(struct v4l2_async_notifier *n) @@ -314,6 +317,13 @@ static int dcmi_start_dma(struct stm32_dcmi *dcmi, return ret; } + /* + * Avoid call of dmaengine_terminate_all() between + * dmaengine_prep_slave_single() and dmaengine_submit() + * by locking the whole DMA submission sequence + */ + mutex_lock(&dcmi->dma_lock); + /* Prepare a DMA transaction */ desc = dmaengine_prep_slave_single(dcmi->dma_chan, buf->paddr, buf->size, @@ -322,6 +332,7 @@ static int dcmi_start_dma(struct stm32_dcmi *dcmi, if (!desc) { dev_err(dcmi->dev, "%s: DMA dmaengine_prep_slave_single failed for buffer phy=%pad size=%zu\n", __func__, &buf->paddr, buf->size); + mutex_unlock(&dcmi->dma_lock); return -EINVAL; } @@ -333,9 +344,12 @@ static int dcmi_start_dma(struct stm32_dcmi *dcmi, dcmi->dma_cookie = dmaengine_submit(desc); if (dma_submit_error(dcmi->dma_cookie)) { dev_err(dcmi->dev, "%s: DMA submission failed\n", __func__); + mutex_unlock(&dcmi->dma_lock); return -ENXIO; } + mutex_unlock(&dcmi->dma_lock); + dma_async_issue_pending(dcmi->dma_chan); return 0; @@ -717,7 +731,9 @@ static void dcmi_stop_streaming(struct vb2_queue *vq) spin_unlock_irq(&dcmi->irqlock); /* Stop all pending DMA operations */ + mutex_lock(&dcmi->dma_lock); dmaengine_terminate_all(dcmi->dma_chan); + mutex_unlock(&dcmi->dma_lock); pm_runtime_put(dcmi->dev); @@ -1719,6 +1735,7 @@ static int dcmi_probe(struct platform_device *pdev) spin_lock_init(&dcmi->irqlock); mutex_init(&dcmi->lock); + mutex_init(&dcmi->dma_lock); init_completion(&dcmi->complete); INIT_LIST_HEAD(&dcmi->buffers); From patchwork Fri Nov 15 22:33:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179543 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13127287ilf; Fri, 15 Nov 2019 14:35:03 -0800 (PST) X-Google-Smtp-Source: APXvYqzPfgst8SyQW894DrIFYg50zKt5qScUMcsuWqqk+6SrnYDr/VggPIYGx6bOsWtnz4Zd9stW X-Received: by 2002:a17:906:b25a:: with SMTP id ce26mr4471375ejb.13.1573857302932; Fri, 15 Nov 2019 14:35:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857302; cv=none; d=google.com; s=arc-20160816; b=EjwZCra3WRcJWDyjEPTjcnqEJUnSaf9RwRtuwHAKBDOgcy72d0jQrrDzmteaOAHvvT Qm+rJp8S3H3E0MGwPifD95PmTyI4UXFGC1+GkGSLy48xnMDFyroQnm/+vGJugMPu1iT7 MsnaY2GVscF1tBxqpN9NeJboUTHU4ZHm2W5GMhaINbmIiDvbHHmuxOFHpC+77WB8MGBO CuzcDhY2WYkakpnIU0Q4pggg4ytVB8YzmiqqqcMbha/lFLkKo6w1ivOL5yqU8wBGPkzG jyOZ2KYOIMnbcOwcpIOIba6lLzRqCwAKbHXK23qbiRe3tTxZ+vnwBClyXHAHBoIzns++ LVJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=I8DYLlgbe7crhAhNbwNPqGy2McaZWO3AECdzJYJCCco=; b=NCy97Vvvpth3OCC854yVUQYcfUmy5zdlTFVyboyk0KGi2lPzj6ZslL1Z7lRyH1wVOB DZE3GjoyVUSNrNkVJPGg0adPLWbLhJKERNZeissV++fu6BH/rTAeEQj3d2nWHOUg/yZx MEwF9nOf3LgUjVKfyVn4OB+tVqiHRAULVXt14vLsHqT8cUFgsIR60IYiA09bnnes6miI WW/nHkkAHtZRfZLrRAjebXGYr8fLfqWhClKwzL59D6abnynxLvcN3RfjSe8knoIJ3xXB sR+0d50CVIBD4/R7YwVAypKMdP8TjIxshIcK/p+z5gHWIFwVDPqmobtJHe1XGItte7lq S9rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uq0Rvs0K; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l24si6701150edw.352.2019.11.15.14.35.02; Fri, 15 Nov 2019 14:35:02 -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=@linaro.org header.s=google header.b=uq0Rvs0K; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727586AbfKOWfB (ORCPT + 15 others); Fri, 15 Nov 2019 17:35:01 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:37233 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727229AbfKOWeF (ORCPT ); Fri, 15 Nov 2019 17:34:05 -0500 Received: by mail-pg1-f196.google.com with SMTP id z24so6639382pgu.4 for ; Fri, 15 Nov 2019 14:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I8DYLlgbe7crhAhNbwNPqGy2McaZWO3AECdzJYJCCco=; b=uq0Rvs0KPR5i9HtlAfbqJ09ftst7366sxovqlgQSCdSMlx7zsOEFlsXzxIZ/RFJepW +xNmN50KWjZEmZ4ahwYGYncO2oNSlvlk9+bSZ0uJj5KwnzYGnYwwpJh3Z0U0CVVPUgeF WBek2r2DnpcVe5urx/INF76BoO8wqFwuN86lGWJuCvpErfOgoUCoWWPI37s5pI2Uuw9X OEj1WNleT7NOb7K1+oFm34vXUlCdixUaNsyhZrrKKyzZ34tRHBi5jpoqITPilNH4uc3A cG9Aay+Ra1kWvl+WOeF5ifVv++jVQtvf2AnAcuQ92MtUnevyPsRG5Pf0brxRmVhP9TbT u6bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=I8DYLlgbe7crhAhNbwNPqGy2McaZWO3AECdzJYJCCco=; b=WV7WXdgGSCrXxlIw41GvWGuyB4u36P41J4TkeAStFlPupksrSIiyHoVtcvLSS5cSLm jjwtvCR+RdJolabUdw0n9yEvovd6sH+GcBrZSsl/e4cubv6ZaUDAds/Mm+g2Prf3FrLv 4lFlb8WS0zK28HlLiQBG1P6dhbFqylSYQSOrHps0Abz1M7BH8DQh/E3cmHb99zPcRHMF iPkUqEs6SB1NqI1ZQ1YQ8jWYJ340UVC918pUu4/R7HzPGZq/URkg5EeAVDTxraBbkLmk 4HyeMPDcseu/B6dg6BkvBTbZXTncgkvK+7lyGHsxtJVXLW0vmi11UK9FEj15d13SAN18 VBrg== X-Gm-Message-State: APjAAAUuSSwC/e40nkFXALMAs9qv/Oq9pHK20rP4roPdVbn7tdeWOde9 TYPufPWZ+vGYTXIN5dZHLVHlnX2niE8= X-Received: by 2002:a63:2e01:: with SMTP id u1mr19770443pgu.25.1573857243342; Fri, 15 Nov 2019 14:34:03 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:02 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 07/20] hwrng: stm32 - fix unbalanced pm_runtime_enable Date: Fri, 15 Nov 2019 15:33:43 -0700 Message-Id: <20191115223356.27675-7-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- drivers/char/hw_random/stm32-rng.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.17.1 diff --git a/drivers/char/hw_random/stm32-rng.c b/drivers/char/hw_random/stm32-rng.c index 042860d97b15..37b338a76ba4 100644 --- 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 platform_device *ofdev) 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_driver = { .of_match_table = stm32_rng_match, }, .probe = stm32_rng_probe, + .remove = stm32_rng_remove, }; module_platform_driver(stm32_rng_driver); From patchwork Fri Nov 15 22:33:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179541 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13127171ilf; Fri, 15 Nov 2019 14:34:56 -0800 (PST) X-Google-Smtp-Source: APXvYqyxg+oNON6Rg/13ueCXHZiiXCGYChr+PwtLypAIaogEPl1OfoM4kbBH1DFvCFwfNSS0/YVT X-Received: by 2002:a17:906:230f:: with SMTP id l15mr4368115eja.222.1573857296461; Fri, 15 Nov 2019 14:34:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857296; cv=none; d=google.com; s=arc-20160816; b=Egs5kJjwpDaY6Oph5QQthNJNAJxhbi0JWRiSUVTmmYZ7v+xBH8EK6o2WDYRC/oCIUi E1EaNSo6QaM5awyjoZ1EP927ImDwYYCn1QF5Bf5jJ+g65yK1ndBycv+5zLdcHcKGivUo kvhEoZS2FYhwY+cQ+6AFrdfeIrAXcVeD9IBjk3r4qx/jJ+L+s558FFTiofaLf8KEJ14g 7h32fQ+nwuXefDLNL2p5iRDmeppmA1vExhXI9gEc3B8whijAQggbYtesKUO2IOLgmceM iK0ZqpOgsrLr5ioLbxrYmcQjFj0hmwCBY4VghTBL3f8jEAsDdjsSIoeg/XDb/yYxR+Lm j96g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=JeAIVfldLUVTvSXCSoIJcdwhrHS7EelSGWycmLvcpHo=; b=Gk7yWSqCN/+Z9gFRFzIiY2ajQxBwm9zp4dVVH/4nl/BNw/n/mv2ypKnqSTafzHYzZv POEROgBBoXOJzWTbezoA56qi18MFyILoZoehecKEpGvY+sPaK0qCbaRUOmmALopNinuZ Zuos/VlgAX1UUJQbp6X24xm2a79Nwz6BAjRH0Vb9c+l7I3P6pZLOVGiQbjc1z3T9fefB EaRTl/OyFhNQDyaXismVcOvSMUMXx9UKmnzktkccbK8Zzxv0lUdw2wZDjuapsVmsCtc9 EoxODFRCO7NPy3WdjTk6dTQv7TzTEkHqfFYkjEdnzypQn1Gm8GOIx1AHJZkD3ifrA3fp sXUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tD6THbMU; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h3si3757303ejc.136.2019.11.15.14.34.56; Fri, 15 Nov 2019 14:34:56 -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=@linaro.org header.s=google header.b=tD6THbMU; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727276AbfKOWey (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:54 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34372 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727262AbfKOWeH (ORCPT ); Fri, 15 Nov 2019 17:34:07 -0500 Received: by mail-pf1-f195.google.com with SMTP id n13so7346843pff.1 for ; Fri, 15 Nov 2019 14:34:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JeAIVfldLUVTvSXCSoIJcdwhrHS7EelSGWycmLvcpHo=; b=tD6THbMUpRjMLKRy7mjdFZRPWf6FlQ9n8BkmlAuG3KvMrw6+4glewlNU998SaSVKF8 K1uXfh+VqFX7pN5G1dMZ+PDt3sdSRJUjziV9sIlmfI6iD8wG/dc3DBFAZQvyjct+zTae JDTIYU6eMfFwrytgreUfC0TJi6nwhYOUbr1NUKRqk7A/JJCsETttQq2N/aTbs7oVKz/B 5ePF67K4RWaW231sXOBynfpzKnZ6ZoDkZIG30ycvhJ8hI5uGb0Ulrf+yNIWs61bJjyiw PC/6KEg/oqocsQ5/U1x6oZnJpoTwp0Y67DPWOBkJQ5DYuPj8gJIctO4Awi8svthRg6rH TAlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JeAIVfldLUVTvSXCSoIJcdwhrHS7EelSGWycmLvcpHo=; b=Le7QGFnje4k3z39JJnBS7tacyuIJwz6VUeoCwCntiUcZ12vIRREjWtcL9GqsxjhIgU U4CbU1LkE8eTfVWnybPtjefZxgNsVqjWKMvMgtNnJqVIJ2VJWWgvgjlxVCxgAVcvJkS5 3h5pc3N66a93KY7t4hz7qPlQW/cZxWqYYQ4T8Z5eAVMd8O4TpnOqBwNQzNqIN1dT5xtQ bcTVSRohWq3xR/d/YTSitw1aIZkQzLRnYOJFIUItjp/rYvNb2KRD+NIGgem3Z9IIvfIu pNDvsui2mtNz7EYHkprovDVM8dKbxWSUMurqsHAMR7AuEwccBngkjriJWhG7l2bbUcSA NgxA== X-Gm-Message-State: APjAAAV7nyeHNK5dPN6yX9EyCglCxNaBM387Jk3ts1MB1+9nUcdfo9xC Ad5zQ820RIumjEvcniqY1FLzy4alWGA= X-Received: by 2002:a63:6c4:: with SMTP id 187mr19457722pgg.421.1573857246083; Fri, 15 Nov 2019 14:34:06 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:05 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 10/20] clk: stm32mp1: fix mcu divider table Date: Fri, 15 Nov 2019 15:33:46 -0700 Message-Id: <20191115223356.27675-10-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gabriel Fernandez commit 140fc4e406fac420b978a0ef2ee1fe3c641a6ae4 upstream index 8: ck_mcu is divided by 256 (not 512) Fixes: e51d297e9a92 ("clk: stm32mp1: add Sub System clocks") Signed-off-by: Gabriel Fernandez Signed-off-by: Stephen Boyd Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- drivers/clk/clk-stm32mp1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/clk/clk-stm32mp1.c b/drivers/clk/clk-stm32mp1.c index d602ae72eb81..851fb4e9ac44 100644 --- a/drivers/clk/clk-stm32mp1.c +++ b/drivers/clk/clk-stm32mp1.c @@ -269,7 +269,7 @@ static const struct clk_div_table axi_div_table[] = { static const struct clk_div_table mcu_div_table[] = { { 0, 1 }, { 1, 2 }, { 2, 4 }, { 3, 8 }, { 4, 16 }, { 5, 32 }, { 6, 64 }, { 7, 128 }, - { 8, 512 }, { 9, 512 }, { 10, 512}, { 11, 512 }, + { 8, 256 }, { 9, 512 }, { 10, 512}, { 11, 512 }, { 12, 512 }, { 13, 512 }, { 14, 512}, { 15, 512 }, { 0 }, }; From patchwork Fri Nov 15 22:33:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179537 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13126947ilf; Fri, 15 Nov 2019 14:34:41 -0800 (PST) X-Google-Smtp-Source: APXvYqx8zABDvgQbpQJTG/GYZJ2IgmwM42RkcoQQVnZ1EZw2vfXTFrjcbMxdN+V14LnC8MvC7LYb X-Received: by 2002:a17:906:344c:: with SMTP id d12mr4242262ejb.227.1573857281525; Fri, 15 Nov 2019 14:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857281; cv=none; d=google.com; s=arc-20160816; b=PETXxhArWeQPxzmnn0ERCFlXWkWdqMfs0Y9WCKo4iKE6JAVmvmtAwVMXM41e+kyvl9 xsxaETFevF3y4qRfigOr03TynjGOPHDIVfzBKBOAsDxqF6edkmVxAVXxBH4bi4nMCsov Suou4PencGm/zwktewkFjCvTh7T+QRDPaVUEipwxupOWdq3w0wqQerxhqRbuWnluXpCM kTuPPB/kcUxeYQ+ZK4WS/gNUiNeUSAOMkZ45BU9Og2D/S0Ratx2FpLJDbuKXtfECyy5l +oqhz4ix60XKeus2chJYEr+FlcmfWKLmKNuRl4V4JXTNxzE7LscUAt/HTKP9UjJXANHd f3rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=SMtnKN7Gs980aMHU7BQIQVC2axVHuGxWT+FltL2atao=; b=ur6pDEE3UyzqKw0yUwWosWeeXIku8hvFGCmtZFaHush8RYRpukVn+KpZVGKo+kitl+ H7rCYlKkrfEeucjKeOwaBCD6m164hDjKI2VLZ2tG42nI/sq9tjNTTFQoQRqlZEbW1uX8 SgdhqGMk9uOeAGfKdygY6U72pjuw+E3YLXAqo2f3sBKW1BQ9dSdp2ZpmMcG0w99blC0x gi86EK7HkYWVJUAeUBcSP3CRAw/BHWdwlRuCpCmy3zETMIjCYWxuBUUloh2kfVHcVSSF +m6PSFiG/64JGHKdvY+Pxv62uVrhPcmyU7ewyGq4csNMXdOzL7VsjxZaml9L/Q23pOy0 +eAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wCXxmzT0; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nw21si3992007ejb.222.2019.11.15.14.34.41; Fri, 15 Nov 2019 14:34:41 -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=@linaro.org header.s=google header.b=wCXxmzT0; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727343AbfKOWeJ (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:09 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:35386 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727324AbfKOWeI (ORCPT ); Fri, 15 Nov 2019 17:34:08 -0500 Received: by mail-pl1-f193.google.com with SMTP id s10so5638543plp.2 for ; Fri, 15 Nov 2019 14:34:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SMtnKN7Gs980aMHU7BQIQVC2axVHuGxWT+FltL2atao=; b=wCXxmzT0A12PK75MA7nI5jP3tzVW7exsIlZfw+O4eheNL+D7AfmnLUW8+DHy3zzCoT imMdV2IXvTuA9H87PHWJW7BZ1JaN+ZUEYeS1ckOpd7oZ3DKkU8RpBCqa2RgFFtzBhNZU ubWEC8OF8SNb4i33w0ag7PZ9+KXkkiLBpSiR8p8JVqGpc8do+Et/ECFqhKV6FcfSU3Nh BWJl4PpK/32Mi9tIt4EMVAKhaOdIDWTuc68utfJ+H1UFMvl17WpD2yq4hpv84JrGpbIR eT68K8VM6j8kNRxR3gmZWlZI61FuWTkCKyr4/74coj9MYpZ8Iqm7O94Yr4jv9UntJTk8 OazQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SMtnKN7Gs980aMHU7BQIQVC2axVHuGxWT+FltL2atao=; b=HEblF3YA7eCfa8kKGo4a+8gD/0dBLmUXc5mLYPHR1TjX0KLiV47Izh1Sd+rr7cDAgU fiprAhEGFMqglcCz1WkRATAlaE1sVNvBkkZE/+qKjhijGMui7PigCLiRSFtoaVMqGluu BYWbeSSS3V9GW4gCcBE0n4T2OueKZAlGcEc2B8fBTPgNNvFns7hdqF0K0FjQ8ooYtFHz kIgKm13DVf2G8yQiRYxuADLOzwif/bpJSeCTelE0w1xl6gA/2Hz20LHBrRlr4LQGUisM Zjx/JMsDS09d30tWssQ6m8E8M3WowSFk74imXRbO3Az2w35ATGatv89nNG2Dnv1lA0K8 6u2A== X-Gm-Message-State: APjAAAVsg3hkCM5JehrNO56dpmvdlXtXZAtwEQ7+Wu7U3sdpXsDpzCJz uHgmhJUZw9mEEN6hDE0s/nFhWYobKRM= X-Received: by 2002:a17:90a:7781:: with SMTP id v1mr22961176pjk.93.1573857247779; Fri, 15 Nov 2019 14:34:07 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:07 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 12/20] clk: stm32mp1: parent clocks update Date: Fri, 15 Nov 2019 15:33:48 -0700 Message-Id: <20191115223356.27675-12-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gabriel Fernandez commit 749c9e553e1f063eb132a78d80225532cbfedb80 upstream Fixes parent clock for axi, fdcan, sai and adc12 clocks. Fixes: e51d297e9a92 ("clk: stm32mp1: add Sub System clocks") Signed-off-by: Gabriel Fernandez Signed-off-by: Stephen Boyd Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- drivers/clk/clk-stm32mp1.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/clk/clk-stm32mp1.c b/drivers/clk/clk-stm32mp1.c index 8e25ed62f67b..bf3b6a4c78d0 100644 --- a/drivers/clk/clk-stm32mp1.c +++ b/drivers/clk/clk-stm32mp1.c @@ -121,7 +121,7 @@ static const char * const cpu_src[] = { }; static const char * const axi_src[] = { - "ck_hsi", "ck_hse", "pll2_p", "pll3_p" + "ck_hsi", "ck_hse", "pll2_p" }; static const char * const per_src[] = { @@ -225,19 +225,19 @@ static const char * const usart6_src[] = { }; static const char * const fdcan_src[] = { - "ck_hse", "pll3_q", "pll4_q" + "ck_hse", "pll3_q", "pll4_q", "pll4_r" }; static const char * const sai_src[] = { - "pll4_q", "pll3_q", "i2s_ckin", "ck_per" + "pll4_q", "pll3_q", "i2s_ckin", "ck_per", "pll3_r" }; static const char * const sai2_src[] = { - "pll4_q", "pll3_q", "i2s_ckin", "ck_per", "spdif_ck_symb" + "pll4_q", "pll3_q", "i2s_ckin", "ck_per", "spdif_ck_symb", "pll3_r" }; static const char * const adc12_src[] = { - "pll4_q", "ck_per" + "pll4_r", "ck_per", "pll3_q" }; static const char * const dsi_src[] = { From patchwork Fri Nov 15 22:33:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179531 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13126511ilf; Fri, 15 Nov 2019 14:34:16 -0800 (PST) X-Google-Smtp-Source: APXvYqytM0I8mqoq27IPPysFjYRtlKc24AcmwNgrzVxvqcPq/lZ4go2xSRkhHtgPfarUtWxBo/e/ X-Received: by 2002:a17:906:fad4:: with SMTP id lu20mr4515506ejb.9.1573857256793; Fri, 15 Nov 2019 14:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857256; cv=none; d=google.com; s=arc-20160816; b=N4PKT7POdXYz2tyJhzqzXl85dEpMUGMv4R59r+jYIVa9fw1GAVOUr1v8p6UoUoCEc4 Vjq7LhgDiOSozPQgNcKFxXm1SX+wrlLua1ZP1pnraL8ZG6XynQeZeIim2wcPNUsjYSRS 78wkACo1Drnlim7NCp4d82cfHKt5hgrfE8evGLLuXbnBr5A/SCdqoDFyqtzhqcojW57z 2aY5t7quDq5ffvG71FjPTjk4tLpeMQinFqUXHDSLE7J6ohfkSCoOTOXLYdIrzSNpgmku tm2ZglW8Fm4aj4RN9w664ZMPzj2maxb+W14VvJIxzRti41rRzkE4z47YFKy0r/vhCZ7d Ga3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=4OAg+K/MSQ8LDMB5QZGzBoNYfURH+sTBMSUExg9URq0=; b=sPdj0LP5celhnRICd9bOKgdp6MJzrtdGDLbpf4fsl8IMplJk+Qki3mDGk34tSPTxRZ mM4ZmRrf7L45h8S2FXrH93QVQVbKiRs/5dBP/FCxTNTQQgJc4qBD/jBhTjbUxRB0z/+1 XOTvbhrkyorqrJXKKy68KEAeNnyLOkojhhXZsPe3v/B4iWAyAF4U5o4B2aIrMKbn38/y 92JwK6+GROwbontRznb5enEK9PMC5YAxMg4mapBvs8h6A53X8vCad9qVdKPItLdRRN/l au3pXLkqDEVx3YKDKJJVVDRiaELyASqlyvh0p6UbvA1HxNiidhfrFOOyNO2Fy3XOusYd fhkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WeIJk6lI; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gq14si6458339ejb.190.2019.11.15.14.34.16; Fri, 15 Nov 2019 14:34:16 -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=@linaro.org header.s=google header.b=WeIJk6lI; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727384AbfKOWeL (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:11 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:44130 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727354AbfKOWeL (ORCPT ); Fri, 15 Nov 2019 17:34:11 -0500 Received: by mail-pg1-f196.google.com with SMTP id f19so6611849pgk.11 for ; Fri, 15 Nov 2019 14:34:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4OAg+K/MSQ8LDMB5QZGzBoNYfURH+sTBMSUExg9URq0=; b=WeIJk6lIxyCTX4RCndZxDj9cy9KCsTub6pTQq4mdaj3dFRpi65OWFqCZRA44CBtrxD wyRa0X0CmZhRMy5Zc5o6LHi1MH3tbcQL0cv6gNCqqSz1J3XAMtx2zhJ2JtE+s68O47NN zHR5m5wI7wETwcEBKNsfebJLtuRqn3mfOO7V8dd30qDbuXTHtB4c9BgZjgnwNq49NE0s sHN1LPoBsVxzNYQxP/EzcPTZ08HKWeXQ0I/7fV81CBePfnFtSebCvvcctt33pVFHmB1t 3cJcol2P9GoSGYES+I95jsL41GuvG8R4/j9nrA8bdohfjWKd0oseIzbWJkGjljUdRMSA KFlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4OAg+K/MSQ8LDMB5QZGzBoNYfURH+sTBMSUExg9URq0=; b=WDZLI/64w+aCs+DeuqwrpBLSCg//8t6NM1RF3t2EJdUtw8dUV0gD1DlptboflC4/LK dSHGKc4hC29iVTQcud3WJoBZpZSCMrsoj7fneV2ftIndgdXRsspkpd9uR3WsSMBWgkfY sDBp/+saoRYcoreWUPWp5e92o6nDXoOKxOHY4CcgwreB+1UOVXsDHUxgeZhgNBId0PQA 88BJTiKIYcyrGSLtbiyLqE9LAFZtTbwa7gtFs5+4HAKRIqcrZE4MxpcBxPu2xFE38lht tZTMIDo1qgWkwomfSIP1QmsrKo6BmkDd+AfkxQXtRxzHoWFJdX4nRbDxqFfx4cSDzToW vYSQ== X-Gm-Message-State: APjAAAXUe+bzUKPzqstQqfD09TGb2DfAn7TNxMKpKnriMnSsf2yrRkYL W0kLaQbwbvL+nW6dulybAvBUnRpRycM= X-Received: by 2002:a62:1e42:: with SMTP id e63mr7219946pfe.25.1573857248667; Fri, 15 Nov 2019 14:34:08 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:08 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 13/20] mailbox: mailbox-test: fix null pointer if no mmio Date: Fri, 15 Nov 2019 15:33:49 -0700 Message-Id: <20191115223356.27675-13-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Fabien Dessenne commit 6899b4f7c99c72968e58e502f96084f74f6e5e86 upstream Fix null pointer issue if resource_size is called with no ioresource. Signed-off-by: Ludovic Barre Signed-off-by: Fabien Dessenne Signed-off-by: Jassi Brar Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- drivers/mailbox/mailbox-test.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c index 58bfafc34bc4..129b3656c453 100644 --- a/drivers/mailbox/mailbox-test.c +++ b/drivers/mailbox/mailbox-test.c @@ -363,22 +363,24 @@ static int mbox_test_probe(struct platform_device *pdev) /* It's okay for MMIO to be NULL */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - size = resource_size(res); tdev->tx_mmio = devm_ioremap_resource(&pdev->dev, res); - if (PTR_ERR(tdev->tx_mmio) == -EBUSY) + if (PTR_ERR(tdev->tx_mmio) == -EBUSY) { /* if reserved area in SRAM, try just ioremap */ + size = resource_size(res); tdev->tx_mmio = devm_ioremap(&pdev->dev, res->start, size); - else if (IS_ERR(tdev->tx_mmio)) + } else if (IS_ERR(tdev->tx_mmio)) { tdev->tx_mmio = NULL; + } /* If specified, second reg entry is Rx MMIO */ res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - size = resource_size(res); tdev->rx_mmio = devm_ioremap_resource(&pdev->dev, res); - if (PTR_ERR(tdev->rx_mmio) == -EBUSY) + if (PTR_ERR(tdev->rx_mmio) == -EBUSY) { + size = resource_size(res); tdev->rx_mmio = devm_ioremap(&pdev->dev, res->start, size); - else if (IS_ERR(tdev->rx_mmio)) + } else if (IS_ERR(tdev->rx_mmio)) { tdev->rx_mmio = tdev->tx_mmio; + } tdev->tx_channel = mbox_test_request_channel(pdev, "tx"); tdev->rx_channel = mbox_test_request_channel(pdev, "rx"); From patchwork Fri Nov 15 22:33:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179530 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13126506ilf; Fri, 15 Nov 2019 14:34:16 -0800 (PST) X-Google-Smtp-Source: APXvYqx1zN6KS2KG/sC2wi34JSs0D8QdzZL1clK2EXMuwHjJjtWr/TCNrxNVhzJJXgliDmBW8ORN X-Received: by 2002:a17:906:af62:: with SMTP id os2mr4542174ejb.105.1573857256346; Fri, 15 Nov 2019 14:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857256; cv=none; d=google.com; s=arc-20160816; b=HoAcGlNxKfmWqakzT1jBdDLEZDRfJzPx3xp+p5v/ItvyHEl/HtrInbaHmxdvwLdmV2 +etvLrbX/vdCHQ2l+dKn8lkyJAu9gTD+yrGrqYdx9RRjqxLbk9IXqGw7WzASvN5auctt JD149sxcJcQDIE9I7fdciB8UzLELfEpinnfujqt5gLyM0+eFc22C016DNd5GbcKRPO1O XLkmcSKiCj8YA9APp4cAE/LN2in8RxJjYoDV104VH89EcXe2Q8dVDYemCaW27q6PPJ9A 8s3emJbYOelF/WUKrBlnjHqoXeUcFFW8J7ybnywCmSoHd9C/6WoV0qlCZWQ/hYMtUQq7 AKOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=f67vg1P6cp56FC+gFomHmc7P3PWgRttseTI8GzuDMDw=; b=Fjm8NaCMK6N85k1bqwwgO8H+lNloh2LSKgcH2HtumPHZ2sI0J5EkwStPJNw+ZGt3rb WXmr5u+K502NNVat4vtk9pRuqIv7KprbtpKU6fLoIO9U7Bxm1VAvfaxPnMXyuum7sMFe 8Kc28HnaWHPttSe4ofw2+qjQRWjAAmy/sJm7X6Y9TNQQfK6moTSRHReqxzcW3f/Tzlba Y+oA5CVos4zmRMp2xnjf9klASMxuQMkf7Z50RWfyN3lJg6MfUHJL5X0E9EZsw0vgPYRA WlLeNk9b/DLYwWykFzjFMQF7a3xkSUm5zc4azkk5/M1hGMruVUSR+THVm9Np2oAjKwAN O4cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xA6/rKgN"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gq14si6458339ejb.190.2019.11.15.14.34.16; Fri, 15 Nov 2019 14:34:16 -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=@linaro.org header.s=google header.b="xA6/rKgN"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727388AbfKOWeM (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:12 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:46101 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727372AbfKOWeL (ORCPT ); Fri, 15 Nov 2019 17:34:11 -0500 Received: by mail-pl1-f196.google.com with SMTP id l4so5611586plt.13 for ; Fri, 15 Nov 2019 14:34:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f67vg1P6cp56FC+gFomHmc7P3PWgRttseTI8GzuDMDw=; b=xA6/rKgNfSpMNx7U2CIf58R0lskOLg3y9hYciTIt8ZD92F0abPfnJuNWvlOArEOELy Eg1q0mG7cr3zITCHPC3sYPPWPZpvKqTpZpqj0CiwzgBAHOv+44QxulLsvWlnsWu4gd8H iEOqm1GqavhvEBS16eTYSVDgdfFhUlNs4E2uzERBdCZlfSInyLMACfvujQG9qO/qlK0o Uxl2r/sRt1TU1QCCi/KATL4JehE2IfKdKDi6Uc6qegftMBClBcB7jv9K0QwVPVRGR5/u 9OJPcNqlrci4gxNVVvGbQUOYbTYXj8dLUk0yvBsQPmQBCW0m6Up7CMw0HPCnXfY/E4wQ KWAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=f67vg1P6cp56FC+gFomHmc7P3PWgRttseTI8GzuDMDw=; b=AQlTSmir2mMTOws0Y6rKUgT4CXUBeHHQXKEW+JLjoL/CPQTQukxTXCIRaGRlylbS18 wANk52u23NGdEYPyv3Frw9XCDqtOtA551tzzRfgLuZetS+2j8ZRoWcd1NuG4nbp9XTV4 36eI8f5rGmtKY50SejekRVq5hznFUDYNKNnq39qdBiGSNtsHQHOXjq5tP+oN9BJua8HQ hJDeYLEEFMKQFwpKbVLpjDZDwdvVNwdLUHUcnpZaFV+TTfW7gin2omILX8dMb1Yx7Azr SCtmFWwpR69zOdLVIfDweL7PnYskud4T6hXQZ3BUTW7002RzAdNu1mGnqGVesW6y8eAD 9fTQ== X-Gm-Message-State: APjAAAUg/Xy3QqpuGdQTkelVmgcyNPxha0AgdoIaCLKjverNtBAbDXgy LsGTdpJaWuDBACJsBOf3ZYWOXqPAuVQ= X-Received: by 2002:a17:902:ff14:: with SMTP id f20mr17167605plj.225.1573857250463; Fri, 15 Nov 2019 14:34:10 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:09 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 15/20] ASoC: stm32: i2s: fix dma configuration Date: Fri, 15 Nov 2019 15:33:51 -0700 Message-Id: <20191115223356.27675-15-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Olivier Moysan commit 1ac2bd16448997d9ec01922423486e1e85535eda upstream DMA configuration is not balanced on start/stop. Move DMA configuration to trigger callback. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- sound/soc/stm/stm32_i2s.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 6d0bf78d114d..449bb7049a28 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -488,7 +488,7 @@ static int stm32_i2s_configure(struct snd_soc_dai *cpu_dai, { struct stm32_i2s_data *i2s = snd_soc_dai_get_drvdata(cpu_dai); int format = params_width(params); - u32 cfgr, cfgr_mask, cfg1, cfg1_mask; + u32 cfgr, cfgr_mask, cfg1; unsigned int fthlv; int ret; @@ -529,15 +529,11 @@ static int stm32_i2s_configure(struct snd_soc_dai *cpu_dai, if (ret < 0) return ret; - cfg1 = I2S_CFG1_RXDMAEN | I2S_CFG1_TXDMAEN; - cfg1_mask = cfg1; - fthlv = STM32_I2S_FIFO_SIZE * I2S_FIFO_TH_ONE_QUARTER / 4; - cfg1 |= I2S_CFG1_FTHVL_SET(fthlv - 1); - cfg1_mask |= I2S_CFG1_FTHVL_MASK; + cfg1 = I2S_CFG1_FTHVL_SET(fthlv - 1); return regmap_update_bits(i2s->regmap, STM32_I2S_CFG1_REG, - cfg1_mask, cfg1); + I2S_CFG1_FTHVL_MASK, cfg1); } static int stm32_i2s_startup(struct snd_pcm_substream *substream, @@ -589,6 +585,10 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd, /* Enable i2s */ dev_dbg(cpu_dai->dev, "start I2S\n"); + cfg1_mask = I2S_CFG1_RXDMAEN | I2S_CFG1_TXDMAEN; + regmap_update_bits(i2s->regmap, STM32_I2S_CFG1_REG, + cfg1_mask, cfg1_mask); + ret = regmap_update_bits(i2s->regmap, STM32_I2S_CR1_REG, I2S_CR1_SPE, I2S_CR1_SPE); if (ret < 0) { From patchwork Fri Nov 15 22:33:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179532 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13126521ilf; Fri, 15 Nov 2019 14:34:17 -0800 (PST) X-Google-Smtp-Source: APXvYqzjP+crAPmhkn6s9cCjyFKHu2AvLuD4loxaZnpLr09ZFCYTleG7eDuoS3ajewZKRMzFI3RY X-Received: by 2002:a17:906:5959:: with SMTP id g25mr4348986ejr.248.1573857257168; Fri, 15 Nov 2019 14:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857257; cv=none; d=google.com; s=arc-20160816; b=diRuxV1WU9BdYzd8MRtcdgyTs/cGTAT6NHOFwLLom5rLu/I5vUKSnNf4ahfadwVtfE G+/QzzlPp6Tp3sEAs0VnNOQeJ0wIy32MLnXdV5GDRrhijAqHL9DhJLGYlF7XV4nx1SUw XX84ppbGOKAKf3G3E3sDg9Nwx3VB8WPZNTp3qdEINeblOsLQZBpbgmPC37Q+gUxxglh+ i/2t/6bpOm6v5xgyGUV5lOvb/7Asj+Sw9q0Vx/8oIa8Set23RLL+jPAL9iCyy83Jk8Af /zxIUENd97gn1+RseAIk1Rd6gOEyWt1WZ5itxhgQlbDyogAmeMkLGpPxgUBmAJHYFXpn W8YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=0FzUVopNzASq04/LVv5rKzD9cgfLq5ObIrBYoMo9qvk=; b=nWkaKp8E6J6g0Hu1EMnl6EmbPSKCuyXI9UaMWt+pPPzwxWP08+LKLsYrej4TywKlXt dsYwpLvVdvB/ylYRZfJ6QBYWTakaj7e2ovHlYss7bTRe89+lJoeB6ZUnoHisq74IS7ht Yle6t7FA2sCWZn53TpI/s6DG+SVjZKNT0DL3exfXpbi0nozQsYQFAHLFC2WgExI+nF2T 0LvBsYIA0fYEKU1Pr3gbNyBlqKoFVO6XZ1d2dqW/emR4yMspMRKlPVdyluAP60GR0/Lt EkLcAFmP/9HDL9YisB8kqo2LBacZd6bLO0IzVdgjEYj9GxLWIb48q57W2wG/f/i4kOob F4hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lUnyeeCJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gq14si6458339ejb.190.2019.11.15.14.34.16; Fri, 15 Nov 2019 14:34:17 -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=@linaro.org header.s=google header.b=lUnyeeCJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727404AbfKOWeN (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:13 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35528 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727389AbfKOWeM (ORCPT ); Fri, 15 Nov 2019 17:34:12 -0500 Received: by mail-pg1-f196.google.com with SMTP id k32so918086pgl.2 for ; Fri, 15 Nov 2019 14:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0FzUVopNzASq04/LVv5rKzD9cgfLq5ObIrBYoMo9qvk=; b=lUnyeeCJ4IPMz/XNH2z+dyXgbsLnZDQySzkmpacsxLxrXVqQl5YYPtMDCr/HHxKjVR hU7Y+LuaiVCYaAjIOQjWN7XE8ySh88tskiNLwFDvEcME9WjRgKWKI31q/MYW4ijhkG95 iB/cXtsbnEgCUngeVPLDAl6BX33rNqrbYi6fcdGtnxKTNTBQFt/aemX3uKRsgXeS0agk m5dsnfapvZLJb77v9GDsdm0umUO3c/oDvqDF0UXRKla1EvNzWUNN+FQGF9bj+EE7X21B IdzvJlAJMLMIe18u6ncmei3dFZe6zL8vc2bVx70r1wV15uwQTsYgUDsMuE3R/50EMWIJ uu2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0FzUVopNzASq04/LVv5rKzD9cgfLq5ObIrBYoMo9qvk=; b=EjzA60yPe6PbTRWaqVFCIyeRWr7fCGjA7vIl28y+h5NM+LWxJXvBo2Z2xjbItyv03b Y/G+tJzQWcZDTbcWabzoIi8xL2oBri3Z9fMY3E4EbFYC8tdmfJL0rbQZgfPIM22S2Xb3 7Lc/6tQskvYh55tLv8cESeVkjDYmpcOjHCOeyDJmbCr+HurS1L1urytJ8KwlG8wwTASr 04eB9YnlZ1PUhDOeSTdwLrYT8v7kQPoe55p9h6KQAw0Ew6YYsapv/EZh94wpK+VuYAnh xvsV0B1z+ORXtAtmGf4boVX6BkqLMMe0efjrXQWYcd+CIwRmbiRNX4LHZQS2aKC2v9OD jPXw== X-Gm-Message-State: APjAAAXLdPsWV6t8siUNX6+IpPFsR473yisf6r6EBicAAF3gZTzbKZ2I A19exM3fqEN3ZmuYm3rpssS3adcA7b0= X-Received: by 2002:aa7:843d:: with SMTP id q29mr20193053pfn.156.1573857251386; Fri, 15 Nov 2019 14:34:11 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:10 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 16/20] ASoC: stm32: i2s: fix 16 bit format support Date: Fri, 15 Nov 2019 15:33:52 -0700 Message-Id: <20191115223356.27675-16-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Olivier Moysan commit 0c4c68d6fa1bae74d450e50823c24fcc3cd0b171 upstream I2S supports 16 bits data in 32 channel length. However the expected driver behavior, is to set channel length to 16 bits when data format is 16 bits. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- sound/soc/stm/stm32_i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 449bb7049a28..004d83091505 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -501,7 +501,7 @@ static int stm32_i2s_configure(struct snd_soc_dai *cpu_dai, switch (format) { case 16: cfgr = I2S_CGFR_DATLEN_SET(I2S_I2SMOD_DATLEN_16); - cfgr_mask = I2S_CGFR_DATLEN_MASK; + cfgr_mask = I2S_CGFR_DATLEN_MASK | I2S_CGFR_CHLEN; break; case 32: cfgr = I2S_CGFR_DATLEN_SET(I2S_I2SMOD_DATLEN_32) | From patchwork Fri Nov 15 22:33:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179534 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13126529ilf; Fri, 15 Nov 2019 14:34:17 -0800 (PST) X-Google-Smtp-Source: APXvYqy+fPKIRT7zb7vNPjcVyoKjxLPLQgHSsDoeYLYVHJjuIeFKz3860CeSlIHNn+Ss+PwyDV7k X-Received: by 2002:a17:906:c41:: with SMTP id t1mr4402851ejf.282.1573857257560; Fri, 15 Nov 2019 14:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857257; cv=none; d=google.com; s=arc-20160816; b=Xkp2thiGtHsMc4g7ZmiQhVHC3sM3A0nvjcQ/Z2l/IYtMzyjl3iu8ThKBPJq8YfkX0C CYXxMxYDAxTuDxk2SnbyJCdJzSm5rBQl0Y8cT0WFhg7+mDvPlRkyWSI4TBz448r88WB2 f35+GpMyCwzoxSA05ofhJHGco7pf5P0jI998e7lduJ4b61w7LfEV8xn9xO0IKh3L4qZS uSWbec+Bgo3P48/+v8Lvz/OzQXa8qmAHYFyFHhsvZWoxy/Kldts/VWpmgAjUkRdLQkpx XywemtxCL5YWfwfRpOxZmIQqizFUSePLu4aJ++HBrgpxRTzZrKknDMAl81mx6lcMINW+ PzVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=K6EZMz28tei+A3Fv/t1+BOEFoAHrbvWtLCwNz1ul25g=; b=LlPfBtZvFBUyvO8Vl3gPYFMH8kfp7s2uL60TTbeNiDREpTcs7118QKPGDxB29Bv3Gm EQAKWexxkfWq68/rBXYlE4YGwtGoL5cD+/3xEY+QBFWYOwGeoif/NSPnX9rZhfjZ9pga Xk7/Tq36oj/OOsY9pOwv0y9NJM+dHD+yMxweEhMpFIbKudXT6kCPmmRqy1bwx0IA6o4W lxP24lp1uEFSFX8Li65DMZtUzVJi6FdpwG2vKZZpr6GgG+wjhp//2Q9/k45fa4E5sF7l pEpPnLO/aupOiBDj2ZM8tUdux9ECXVeLPJrFamWAC5R2sFXB4mT2r8razpKt1Zsgi6uH PvDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K+EFQOwv; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gq14si6458339ejb.190.2019.11.15.14.34.17; Fri, 15 Nov 2019 14:34:17 -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=@linaro.org header.s=google header.b=K+EFQOwv; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727420AbfKOWeP (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:15 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:40386 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727406AbfKOWeO (ORCPT ); Fri, 15 Nov 2019 17:34:14 -0500 Received: by mail-pf1-f196.google.com with SMTP id r4so7330267pfl.7 for ; Fri, 15 Nov 2019 14:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K6EZMz28tei+A3Fv/t1+BOEFoAHrbvWtLCwNz1ul25g=; b=K+EFQOwvuF5Ea8JFTFkHmNjxaOLY3h/RqojbKXq9i/HQlhlztvlHNcN78FEt9TXC6o gSUamhTirK9XvaurkQpqxAGX9vGVxHMdQiaEQWdY4pU3qEj4HzoubKBVTea2SyfoaOJK BPCTKzxPUfEL6BWFoVxIfRmwHA4tUCwpDJ2n4SjysulPcZeL7QSTvBqV9U6sa5+BoRxN ByG3lYAWlD6MNyS7zATy/bbUyGMR05gPdPv2GsQzG7CJCDbPYpfG/4kCkSVGAS68F2K6 gbCm66gHeb8hSy4KH2drGGvctHA7MuK4Ym++2SmPIVbJl9j9cJZ4kkEEVL0bmc7yyJmw rdUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K6EZMz28tei+A3Fv/t1+BOEFoAHrbvWtLCwNz1ul25g=; b=MScaxir+eN1s66nMwFPntzVyhDjFWdkfiPi5da3iPPZp1f0BToF6pBa8EeoI00eg8F KeuqAgFyaJCMSlV6hWcTpP/o3jUvVNgAzYDVNIezyWyqYOM2tLPMnWhumJxR1BReVoYB i0F0zZFFjFvyyn0Vpay6u28xCtuezOAAavYIFLuhmjypmEbamYV07WwLtfcjmsR+R60R OvjNzrs89BahR/pSTXa7sJAZPTtVCgkec7slM/nAymbBJh6g7BUvgm2uOpS8fRVMgoDA i3hWy207SQpDw7ZRYzFWIHK+DIK5fJWLYlMcIKxzlwFMCxIOkX5CR7iND+iJQQ3rWypj PM+Q== X-Gm-Message-State: APjAAAX6su7YzWaCq0VOhZ1UFJLw4dSLP5W70En30+1dh0A0i7fpbYIN D2s3Y8HDGE6J1EAV2cqX3NIeAtjbmpM= X-Received: by 2002:a62:447:: with SMTP id 68mr20154481pfe.70.1573857252596; Fri, 15 Nov 2019 14:34:12 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:11 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 17/20] ASoC: stm32: i2s: fix IRQ clearing Date: Fri, 15 Nov 2019 15:33:53 -0700 Message-Id: <20191115223356.27675-17-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Olivier Moysan commit 8ba3c5215d69c09f5c39783ff3b78347769822ad upstream Because of regmap cache, interrupts may not be cleared as expected. Declare IFCR register as write only and make writings to IFCR register unconditional. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- sound/soc/stm/stm32_i2s.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 004d83091505..aa2b1196171a 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -246,8 +246,8 @@ static irqreturn_t stm32_i2s_isr(int irq, void *devid) return IRQ_NONE; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, flags); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, flags); if (flags & I2S_SR_OVR) { dev_dbg(&pdev->dev, "Overrun\n"); @@ -276,7 +276,6 @@ static bool stm32_i2s_readable_reg(struct device *dev, unsigned int reg) case STM32_I2S_CFG2_REG: case STM32_I2S_IER_REG: case STM32_I2S_SR_REG: - case STM32_I2S_IFCR_REG: case STM32_I2S_TXDR_REG: case STM32_I2S_RXDR_REG: case STM32_I2S_CGFR_REG: @@ -547,8 +546,8 @@ static int stm32_i2s_startup(struct snd_pcm_substream *substream, i2s->refcount++; spin_unlock(&i2s->lock_fd); - return regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + return regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); } static int stm32_i2s_hw_params(struct snd_pcm_substream *substream, @@ -603,8 +602,8 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return ret; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); if (playback_flg) { ier = I2S_IER_UDRIE; From patchwork Fri Nov 15 22:33:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179533 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13126589ilf; Fri, 15 Nov 2019 14:34:20 -0800 (PST) X-Google-Smtp-Source: APXvYqzAhPZDHfC58lRi6NjXTedjsd144hwFrOKOf40i9pnLt0c2b7E5uW/l4OOk/qXFoJ5QsKgs X-Received: by 2002:a17:906:49d1:: with SMTP id w17mr4454842ejv.101.1573857260692; Fri, 15 Nov 2019 14:34:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857260; cv=none; d=google.com; s=arc-20160816; b=hL6zxVG9B6SOEAd9amB922vOFYkUCbRyMULL5esXJYxVpi+YlR8K8zXFhrWYFQBKBC F9MT4li/umb4OifOSN7JwBFM5DFtMaZmsmzmHSIxCqusNEltb2nA/gpKWA8LJYirqSUo WVMY+eaxwEKqtplSJrykY6mdCPEZohl/xf9a7s45/dGjcJ6DpB/gU3ls30HHidh3TpCP X9Py9eCjj+uhu/92awdgU4PXxKPHq3YM7mZVsW1jESM4WfuzaQs+Xf7JIY0Ex4kn5wAy LxYyXdTiUSUoDz0WuYCHUGZis/mjretRVkKwXCgRVzHhmNv3M0JWgyqDIGIwNqSeAKe6 luDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=FlA/WYoLeRABK4x8leOELB1KpW2VXeE/7KRkjFeheIs=; b=reWT83hopnJD0HOA84qEDD5i/LLKmufym7uxzvS4LbnoGTQ0Ta5FpqQ+P1pnG0lj/V r4k3MfibCG2zunZIaZuMeAVk+3U1VFw8jkb8pETrj61DjZsN4GrH2rNp8SfrHvWDKQvB 0uzxy7Epk7Xp8bjs2N96kgY8Ty59t9WkzjdViDlcbeOrNElsFVMr80JWJkOBTOXdF/YX IEZuqal8FTalX1QcemOOYcoe6+Yy0LMY6qTDWYcLPEgdJQ6oJeY2F1Lm9PmkAH3QPsdz f5lw/lSve8thcppfgMNGN0t11SGYBWwmIaLOE+D2+FAzjmFi38VdYPOmvQjw7EZ7EEBs poiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EuCYF29X; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z31si7981710ede.236.2019.11.15.14.34.20; Fri, 15 Nov 2019 14:34:20 -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=@linaro.org header.s=google header.b=EuCYF29X; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727474AbfKOWeS (ORCPT + 15 others); Fri, 15 Nov 2019 17:34:18 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:40557 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727452AbfKOWeS (ORCPT ); Fri, 15 Nov 2019 17:34:18 -0500 Received: by mail-pl1-f196.google.com with SMTP id e3so5627228plt.7 for ; Fri, 15 Nov 2019 14:34:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FlA/WYoLeRABK4x8leOELB1KpW2VXeE/7KRkjFeheIs=; b=EuCYF29XK/mB/F3BxjT3sWX6z88YjtNqs+w5TNJQP6w08JiRou935ewYfWNAW/g3Eg FYlTO4DtoNdOTwlSxUFfeQtM32HB8UD4XiO9OLyVfO071D1lvVGMwJJWMxV7DW959l9H 3cEwLuybSJy5RgNBVbsk3HFrKrWbg+s5SFLxWWx6v5gjbraobv8BFodgs84RA1TUiybx 8wvlY+DBrzz7i+IYZ/fG8vjyNWly48fh5ZQWjCLhzQuBoYMt+ckcnb/GiIKLPGqHmTMR H6s2ATHNqRlbPvsQBZJwh0jEIKkumM1yU/gS+DXe538ozDU9zHQll5wun9QYpe4w15+l ifVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FlA/WYoLeRABK4x8leOELB1KpW2VXeE/7KRkjFeheIs=; b=V6bnBjNb2K0wCHcXhNLmWZL6KaG4NHkwvpVZ+IvveIbefmJCyWfM20/INm6UKSP7/T rlKRHthYl8euhK1MgCuF5jJ69nCF7HwsFhhgYo2U4iiYZn3WxCjVm8YNWI92wL12IjZF gRW5Dpa18hrhDN+fg0GxIHTM+bT/wZkOnbbajqxc8Ee2d1JQ/1li9fgi7ygv/6ggKNlk bVIxdE+PP4d/mA7Dd+5lQXzl5rjWEtgqavWJR8stqmUp6ataDrAmo/3rL3mqO/MXdsbd K/je7wEKY9Qgz8KrODhIcb6piAdjoJ/ZSlNRIRYGzi44ubK8cgEB4W/Jjn0mr9SdEbge z7Fw== X-Gm-Message-State: APjAAAWCnTHsQmKCNBBKgyl1ijx0Vsw/32rEn/TVTJ+nOGkQO5R9oEXR PDxJjhCd5Ha+woVK6vcEEu45Z7zINbM= X-Received: by 2002:a17:90a:2385:: with SMTP id g5mr22958192pje.117.1573857255728; Fri, 15 Nov 2019 14:34:15 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:15 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 20/20] dmaengine: stm32-dma: check whether length is aligned on FIFO threshold Date: Fri, 15 Nov 2019 15:33:56 -0700 Message-Id: <20191115223356.27675-20-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pierre-Yves MORDRET commit cc832dc8e32785a730ba07c3a357e17c201a5df8 upstream When a period length is not multiple of FIFO some data may be stuck within FIFO. Burst/FIFO Threshold/Period or buffer length check has to be hardened In any case DMA will grant any request from client but will degraded any parameters whether awkward. Signed-off-by: Pierre-Yves MORDRET Signed-off-by: Vinod Koul Cc: stable # 4.19+ Signed-off-by: Mathieu Poirier --- drivers/dma/stm32-dma.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) -- 2.17.1 diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index 379e8d534e61..4903a408fc14 100644 --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -308,20 +308,12 @@ static bool stm32_dma_fifo_threshold_is_allowed(u32 burst, u32 threshold, static bool stm32_dma_is_burst_possible(u32 buf_len, u32 threshold) { - switch (threshold) { - case STM32_DMA_FIFO_THRESHOLD_FULL: - if (buf_len >= STM32_DMA_MAX_BURST) - return true; - else - return false; - case STM32_DMA_FIFO_THRESHOLD_HALFFULL: - if (buf_len >= STM32_DMA_MAX_BURST / 2) - return true; - else - return false; - default: - return false; - } + /* + * Buffer or period length has to be aligned on FIFO depth. + * Otherwise bytes may be stuck within FIFO at buffer or period + * length. + */ + return ((buf_len % ((threshold + 1) * 4)) == 0); } static u32 stm32_dma_get_best_burst(u32 buf_len, u32 max_burst, u32 threshold,