From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B0A3C433E0 for ; Tue, 9 Jun 2020 00:32:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22CA3206C3 for ; Tue, 9 Jun 2020 00:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591662725; bh=5xfvrXfgGzAoI+QrpARM+doyiSzu3Hq1ghxRMgHX12I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ajWe6hXcLx36D9Wxm5TLPIfT9lMgH32DjIktLnlkc0kiz1H70WfaiaWDSTKPyEjX0 uxtG6W45GxbAtxhAiCcuR8Dx9Y6IG5w3mrcgZZzrQBbKSauq1p6ii/hgpMrjr9MWb/ HVkODD93mI/KzvkCCad52M796j0Pmha9/pnTEz8U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730018AbgFHXPX (ORCPT ); Mon, 8 Jun 2020 19:15:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:36238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728561AbgFHXPV (ORCPT ); Mon, 8 Jun 2020 19:15:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 756BD20774; Mon, 8 Jun 2020 23:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658121; bh=5xfvrXfgGzAoI+QrpARM+doyiSzu3Hq1ghxRMgHX12I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FPL2qmpcq13FQwScbyJCY6LXUpPfKKjJU3/ZQN/oOHBPl2/pjjkZ8rAAKF1UtXWKG 2gI1SuJigWmptD6FWyh1MKbwytOGWiU4A+h/kcssdyWTDUe9Lds7pwJ2LIOUEREA99 Ot9dJqbsmjrYeiLrFXLNz5e39/gyFiXiF5uJE6Iw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Murzin , Dijil Mohan , Vinod Koul , Greg Kroah-Hartman , dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 158/606] dmaengine: dmatest: Restore default for channel Date: Mon, 8 Jun 2020 19:04:43 -0400 Message-Id: <20200608231211.3363633-158-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org From: Vladimir Murzin commit 6b41030fdc79086db5d673c5ed7169f3ee8c13b9 upstream. In case of dmatest is built-in and no channel was configured test doesn't run with: dmatest: Could not start test, no channels configured Even though description to "channel" parameter claims that default is any. Add default channel back as it used to be rather than reject test with no channel configuration. Fixes: d53513d5dc285d9a95a534fc41c5c08af6b60eac ("dmaengine: dmatest: Add support for multi channel testing) Reported-by: Dijil Mohan Signed-off-by: Vladimir Murzin Link: https://lore.kernel.org/r/20200429071522.58148-1-vladimir.murzin@arm.com Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/dma/dmatest.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 364dd34799d4..0425984db118 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -1166,10 +1166,11 @@ static int dmatest_run_set(const char *val, const struct kernel_param *kp) mutex_unlock(&info->lock); return ret; } else if (dmatest_run) { - if (is_threaded_test_pending(info)) - start_threaded_tests(info); - else - pr_info("Could not start test, no channels configured\n"); + if (!is_threaded_test_pending(info)) { + pr_info("No channels configured, continue with any\n"); + add_threaded_test(info); + } + start_threaded_tests(info); } else { stop_threaded_test(info); } -- 2.25.1