Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp42610ybn; Tue, 24 Sep 2019 17:54:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxhMIsplj2MP42EUY+7kHNSKvVpWc+BiwRg+9fJs50FtlrZfuzeIj5hzq4MLvLhgoyC6BCM X-Received: by 2002:a1c:7519:: with SMTP id o25mr3759589wmc.16.1569372858645; Tue, 24 Sep 2019 17:54:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569372858; cv=none; d=google.com; s=arc-20160816; b=UqChOQeXI6bcxtfmR1Bf5GtQbLxF499SXgG1kGCktc0VCjjO9E1/m1uciXrzAWFwfO 61XLEoDd3v6UHfxONIsAbt7tFLBuT7pNosxB2JIwb1BW4CwWwrogYKdwmnFfvznPmbZ4 FHL0x8lz2qyMc2+ywIZe9Qn1L8bq8LdshMhCF/u/DGLOP8L3bx7Xj2XcVQ8vJ0M0dk8l tdYdrrcmgsFic+4eRl5S7d1L3hqKQW896jnmic9K8k9CFGsFV+Df54jPnl/3BiI3Sj8b TnnJyJ4RxEmV8ypi8uH1mX4VCQwv4A/jJ/auG03218gA14GouBlmT6doC20iftnqz/2L AYcg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SHCyQQGP/5S1HiT/99i9RtYArkU2yaKbzie3fFgoCdc=; b=0SPfAxPy6BLRHURJ294LsRijLiIecUue6P8AI0wIVkyn1VK48ReHpgh4BYfqE/kFc7 VwaruXTvKKq6thl/U3IAIgGLooXgmVDSmGoItnUfyXDyxp/R+QDeHGOdCN94e6FTS/Df mxL38deBbCAZ7pjala5Ub4Kf9SFXJZU52gIgi4iJditI3ltUIIeBL3uWyPV8d1aoFQcv SA9ldUv2yI+0ccXt1MDhNWNpzt3REoqeMUy5CzZ6EqPn4AedJjAQG97EW7ooEcFQVcuW K24/9e5db79KHjcPhy0lHAa8adiS1j5aBFWfu0vKjbv+o0bloH5Y+nOXZyHzl86L2Yqr VoJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="wXx/I+Pz"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g8si2205169eda.105.2019.09.24.17.53.26; Tue, 24 Sep 2019 17:54:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="wXx/I+Pz"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439273AbfIVTiT (ORCPT + 99 others); Sun, 22 Sep 2019 15:38:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:41234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389327AbfIVSpd (ORCPT ); Sun, 22 Sep 2019 14:45:33 -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 41CC721907; Sun, 22 Sep 2019 18:45:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177933; bh=9YTmjz6JzHxwcmKGl0VJUGsFdEfzvM/9GRS2tB2FdWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wXx/I+Pzd1I3UMD1EXv3xtw2AVHodeg/5y3S2GEX+8JKzBjysfZLBplAPwQY0DQ8k IE2A8bLGBsfhX17946OsOZNbYf8NsTBjYP+zZHcQU6CYrDLeTKd5efrHRaMRSiDBT6 Z1BiHpl22JYrtbZ4mhzQm6PrcQ3aztf9g5C/khEw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Neil Armstrong , Kevin Hilman , Martin Blumenstingl , Sasha Levin , linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 5.3 043/203] soc: amlogic: meson-clk-measure: protect measure with a mutex Date: Sun, 22 Sep 2019 14:41:09 -0400 Message-Id: <20190922184350.30563-43-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Neil Armstrong [ Upstream commit 3a760d986568b67d1f8411dab64608075817b90d ] In order to protect clock measuring when multiple process asks for a measure, protect the main measure function with mutexes. Reviewed-by: Kevin Hilman Reviewed-by: Martin Blumenstingl Signed-off-by: Neil Armstrong Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- drivers/soc/amlogic/meson-clk-measure.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c index 19d4cbc93a17a..c470e24f1dfa6 100644 --- a/drivers/soc/amlogic/meson-clk-measure.c +++ b/drivers/soc/amlogic/meson-clk-measure.c @@ -11,6 +11,8 @@ #include #include +static DEFINE_MUTEX(measure_lock); + #define MSR_CLK_DUTY 0x0 #define MSR_CLK_REG0 0x4 #define MSR_CLK_REG1 0x8 @@ -360,6 +362,10 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id, unsigned int val; int ret; + ret = mutex_lock_interruptible(&measure_lock); + if (ret) + return ret; + regmap_write(priv->regmap, MSR_CLK_REG0, 0); /* Set measurement duration */ @@ -377,8 +383,10 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id, ret = regmap_read_poll_timeout(priv->regmap, MSR_CLK_REG0, val, !(val & MSR_BUSY), 10, 10000); - if (ret) + if (ret) { + mutex_unlock(&measure_lock); return ret; + } /* Disable */ regmap_update_bits(priv->regmap, MSR_CLK_REG0, MSR_ENABLE, 0); @@ -386,6 +394,8 @@ static int meson_measure_id(struct meson_msr_id *clk_msr_id, /* Get the value in multiple of gate time counts */ regmap_read(priv->regmap, MSR_CLK_REG2, &val); + mutex_unlock(&measure_lock); + if (val >= MSR_VAL_MASK) return -EINVAL; -- 2.20.1