From patchwork Tue Feb 13 22:39:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 200723 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp859627dyb; Tue, 13 Feb 2024 15:07:56 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXIUsG0/FVCmHjYsWz04mMk/F23XLcWg1KMTiNJA1R4IRRLYUTZ6TrX8ZpUqjDh0hYPGzbWYRDxrJztPeRAoT+aM0+L0Q== X-Google-Smtp-Source: AGHT+IF/Op/z6n8XrXzUxfUXwI497mABwG+2pXTMPtWBvl6syu8Qo35cO6RizXCZS8XQ4bsgCPeJ X-Received: by 2002:a05:6a21:3885:b0:19c:9df2:216 with SMTP id yj5-20020a056a21388500b0019c9df20216mr941727pzb.17.1707865676169; Tue, 13 Feb 2024 15:07:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707865676; cv=pass; d=google.com; s=arc-20160816; b=Msy8M4n+E/8Fyae0l+dkg37PnaqXY/6cCE8aRe03trgVl7dz1m5rjda/CQhTrPIegY wEKWbtqZF/cY/yO08/Jxyv4lMTY5OfxxQvVPXsHnJF3Rg/oO2Pw3A/P2yTUcM/EXares uWjqpyUghyUCjQXc187Err+/ky83C0NMotMmMP4FyT9wSmn4tCVlAFzXxzDs80uVkSOv N+EfOaLmPJyEbtaPHH/0Kmji/7SIcYlVpn60Z9zzgPumK6S4ALE0hPG9gbTLwlQNB/Nf NUpqPyTvHYKLVHhPMuFKyT3hdPEgIGKpe18FtINToxZ1ktdsjWhMpAf60UdQoN87MKdw PgYA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=WuynJYD3Xp/+mml/cq1YcpkhYxewgGFG3LGCjX78mXU=; fh=n2m7X3YzSif4/I6UCgclv+RIapJ7qkD80NeIaBuN6iQ=; b=HqmHg5Iqca4I65PGLpKrJ538c5hEjC1VCAnkVvW7oRXvRTcONJldaMGHfuIXJw2B7a zsVzLRixJ5recVXTHszN2YdxWG38+qYs7Ut6axH7k9AyY7qH4jesm4QuzwR3Mf9d0Xz3 42kAL2mZfR+GjsM4BQKVJ2FJVKhSEV+2Vuom6HgCiz7h9BuCPLAAQnPFEQhqzskertLT pyNEus64woU9gykyyWQs1sA1aq8TyETG7UEHb+roOQQRHyc+qHCI/Q6Z23kkogxdGOvD c4VcGOImU74MWCl2ifb7AfdHbUj4fKjvosPZh609UaD8wDM972xxIFOYj/JwG3dOJu9M 49AA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Yq/gZYhp"; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-64473-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64473-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=2; AJvYcCWQxs4xAaCqIBg+5I1n2BNbMDbVqK4reIPDZNB3QKZb2pxp9gsJPeeX8h/+GbqOjub61FO2dYOsfDlxvLU5N62AbS+wig== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id n8-20020a170902f60800b001db4f0400d5si714516plg.237.2024.02.13.15.07.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 15:07:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64473-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Yq/gZYhp"; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-64473-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64473-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 3E86BB25D4A for ; Tue, 13 Feb 2024 22:40:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5EE80629FE; Tue, 13 Feb 2024 22:39:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Yq/gZYhp" Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 902D9627E4 for ; Tue, 13 Feb 2024 22:39:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707863996; cv=none; b=M2bJXwKw51QvV8fmqsFBUbG2+0O4S3V9cBWDMAKhZE9VhmS6yTNUqZqX9FFAeyQGXwzFqs/SObgjmRgh//xo0pfeuQWHFTD6LNxwn1HAc2klnCpkjiepSL6bVqZErtkHpgAILUH+D8UhSOeDeFLWn/6izaUeJKMZ5W0NQgZp/x8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707863996; c=relaxed/simple; bh=d08dvCKpJiUuiTN0yYybtSwR0TELwLw/HbrdWXQYfhg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=FrLduG/7lJDmiQI84EXaVn5VxWx9sQoddHI7IpCBjTtSz+LQQ+wJQazQQhCNcmFpDuwKFuId3YFE/RK+Xqcvu2yfTej2C9xwCHSDO3MJla1rVzWXDEn4+jd0yaTqYvKwbMXDbvuW36X9ewpfi8RIziUkPewASoZqQB7pjTCx0OE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Yq/gZYhp; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-411dd149beeso2178225e9.2 for ; Tue, 13 Feb 2024 14:39:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707863992; x=1708468792; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WuynJYD3Xp/+mml/cq1YcpkhYxewgGFG3LGCjX78mXU=; b=Yq/gZYhpMb2vdIqWmZxKODdI43aGZG0fFHvPBLOTx2gPC0lDg5pgK+LqgfUI/ejTBg LyVI687rHmKM9ed4OTFqnNyp1CdBHzfYp6gh/lZRETHYDdjcuDYJ+bQzCzMJ+/qxDqgn Mf+psQ4cEJzSQW6YirXo2BmyhmMzJELjYFaS56kotj4eZuRAFPAi7WhB8lg6LPBwUNPN nwyHG5tW6eJQB99UZPBWMoNmROOMKlZCjqXTAb97r0fWHBkqymc/dDfB/51VzbylbHY6 YIhyGz4ltObq0duLenypzqCHsYnRnEq2LvfBEfS7bwijVjyjY5mWr1E1liOF+TxCHbGq nP6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707863992; x=1708468792; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WuynJYD3Xp/+mml/cq1YcpkhYxewgGFG3LGCjX78mXU=; b=mVatTNeqfhQMGw8ocUu3OeWwBkJQjQFnSbUSahyLFnRTBNcc5DKUi/zQIMQBQHAnZE oHfqfWRiJGts7BB3BTC3ej2DMELMDAYT8E/ht2xRWK/ii2uUMJD2Z4DRXHKZlFUJ2izy 36fHdADXXlk1cRtHPev5wc6d8g0SAzUbzEo22Iel8JXlnoFEZWNMgwkjQG1T+amdhE8A aN0ZMGg/QjvBZH1hkKMS6QuKNVSlujDrva/lCv8v9eTLI52uUWh0zI+w4e+CUWvPEsvO HRb34QQvobE/vIJTr7bhOyWS3BsJukmOENJZ6K+oSlqHO1HMuHxq50f6nS4lCJAI49RB iLBQ== X-Forwarded-Encrypted: i=1; AJvYcCXl5ou++Yqckg6aIIhMxHH2Xr9m+sXaWvqBVGXp54WNPRgIeY8ALfpuAGAFS1sgsDryFm9/WwU0j7fxDMunf67zVeGueT+T5A3Kd7qT X-Gm-Message-State: AOJu0YzrU4+5sluhkCclFOFCiykqVCLE7plbsQeJ9EvQv7c8V3zRYi90 CCjbxdaK4gvodo1qHyPyWs8zbLXQV9zs9eh6LPTtrjsfpRB6AmaabUE/pnjOifs= X-Received: by 2002:a05:6000:152:b0:33b:1562:cf4c with SMTP id r18-20020a056000015200b0033b1562cf4cmr444177wrx.14.1707863991725; Tue, 13 Feb 2024 14:39:51 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXr+hBO00mzvvfxEO9hjMx9Smls2h+bP1VjNTj2DM23IxtVMKIaxxeO3ICJX4r/y3qBkudHjThNp8OLLr/Dh3LIGhrAZOb6G6gJRfyquvp+kIfRN+GcYaJs2Ikz0/bzaCtknumC90BP Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id cc5-20020a5d5c05000000b0033b75a1e8cfsm9262191wrb.24.2024.02.13.14.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 14:39:51 -0800 (PST) From: Daniel Lezcano To: rafael@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Lezcano Subject: [PATCH] powercap: dtpm_cpu: Fix error check against freq_qos_add_request() Date: Tue, 13 Feb 2024 23:39:47 +0100 Message-Id: <20240213223948.1865489-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790826959334320889 X-GMAIL-MSGID: 1790826959334320889 The caller of the function freq_qos_add_request() checks again a non zero value but freq_qos_add_request() can return '1' if the request already exists. Therefore, the setup function fails while the QoS request actually did not failed. Fix that by changing the check against a negative value like all the other callers of the function. Fixes: 0e8f68d7f0485 ("Add CPU energy model based support") Signed-off-by: Daniel Lezcano --- drivers/powercap/dtpm_cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c index 9193c3b8edeb..ae7ee611978b 100644 --- a/drivers/powercap/dtpm_cpu.c +++ b/drivers/powercap/dtpm_cpu.c @@ -219,7 +219,7 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent) ret = freq_qos_add_request(&policy->constraints, &dtpm_cpu->qos_req, FREQ_QOS_MAX, pd->table[pd->nr_perf_states - 1].frequency); - if (ret) + if (ret < 0) goto out_dtpm_unregister; cpufreq_cpu_put(policy);