From patchwork Mon Nov 11 16:36:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 179097 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp6576082ocf; Mon, 11 Nov 2019 08:36:31 -0800 (PST) X-Google-Smtp-Source: APXvYqzQV7D3OqWG8ojNiV7b5yH0DEG7p7JNPQfVjq387jCEdH8a+H9J6bECfRw2Q2BzC5s5ErFT X-Received: by 2002:a50:890c:: with SMTP id e12mr27982385ede.277.1573490191548; Mon, 11 Nov 2019 08:36:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573490191; cv=none; d=google.com; s=arc-20160816; b=GxZ/HVirW7HOsRoioEdR1Uy34dDLsV6whaE75S89FdG93TC4uZLXxoCa/LV/c2u1ez NgIJSSifnWhNl0fWOyeYAQKGEjlUZdhadSdaD10dBelXFZYWVmn68MITp4tsc7Hm7/lN kQKj9LJe3ZBv9QeosM+AAUWYibY3QGVco7XrgVXYFBDAozrML/RRFdVcEa2H9qs1yyhI uFCirTh+3uStGigkyEnyo7YtMP9CwgxR6Gn+2q7nbg+wiBZMsZMOLQvTmoeMNYz/rDPL twba+JhltB8+ORCaNITmIBX2d9mxP7ozklo+8TXzxA2Cx6qqfezGlckILsc6RgHlOMVs yAhA== 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; bh=wYHpl1fajUcHwu5/4+qJwciIIu5y2f2ALCk8A/mPeIQ=; b=iCozGfwczmxi+jfLZsAAX84952zwgr718b5KcDBh8Qc1X2yBs1m0zmmFOZ61lnFduE gVASzeY6dgGHJNypmbE8VlYnl06WidH/Ccbz27tgUlGmA92CTWb++YLX1RDoMBYOKHvY W2DdE3q4Z0sauZehoVIbnOuZ2Q4UDyG3T335wQKrcvzZv33n/+cKf8PWNuGhcPuYD04+ 0WhzscK6d+48oCaWqyksIZEZq+2LIHLVMw/x8kjhcLJtmHXj7UEzzU9ohWdFGMTYe5a9 In0F+6mgSgQJxaqiDPEobsxM+BCwtDtJhI+bwB/CyK00l+yNkp8LXpwlMtAmywiz3eKg OMtg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 24si10686412eje.293.2019.11.11.08.36.31; Mon, 11 Nov 2019 08:36:31 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726951AbfKKQgZ (ORCPT + 26 others); Mon, 11 Nov 2019 11:36:25 -0500 Received: from foss.arm.com ([217.140.110.172]:47794 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726857AbfKKQgZ (ORCPT ); Mon, 11 Nov 2019 11:36:25 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 65D5831B; Mon, 11 Nov 2019 08:36:24 -0800 (PST) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 97E9E3F534; Mon, 11 Nov 2019 08:36:23 -0800 (PST) From: Sudeep Holla To: linux-kernel@vger.kernel.org Cc: Sudeep Holla , linux-arm-kernel@lists.infradead.org, hulkci@huawei.com, zhengyongjun3@huawei.com Subject: [PATCH] firmware: arm_scmi: Fix doorbell ring logic for !CONFIG_64BIT Date: Mon, 11 Nov 2019 16:36:17 +0000 Message-Id: <20191111163617.7305-1-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191110103010.117132-1-zhengyongjun3@huawei.com> References: <20191110103010.117132-1-zhengyongjun3@huawei.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The logic to ring the scmi performance fastchannel ignores the value read from the doorbell register in case of !CONFIG_64BIT. This bug also shows up as warning with '-Wunused-but-set-variable' gcc flag: drivers/firmware/arm_scmi/perf.c: In function scmi_perf_fc_ring_db: drivers/firmware/arm_scmi/perf.c:323:7: warning: variable val set but not used [-Wunused-but-set-variable] Fix the same by aligning the logic with CONFIG_64BIT as used in the macro SCMI_PERF_FC_RING_DB(). Fixes: 823839571d76 ("firmware: arm_scmi: Make use SCMI v2.0 fastchannel for performance protocol") Reported-by: Hulk Robot Reported-by: Zheng Yongjun Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Hi Zheng, Thanks for the bug report, but the fix is incorrect as discussed. This is proper fix, let me know if this fixes the gcc warning you found. Regards, Sudeep -- 2.17.1 diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c index 4a8012e3cb8c..601af4edad5e 100644 --- a/drivers/firmware/arm_scmi/perf.c +++ b/drivers/firmware/arm_scmi/perf.c @@ -323,7 +323,7 @@ static void scmi_perf_fc_ring_db(struct scmi_fc_db_info *db) if (db->mask) val = ioread64_hi_lo(db->addr) & db->mask; - iowrite64_hi_lo(db->set, db->addr); + iowrite64_hi_lo(db->set | val, db->addr); } #endif }