From patchwork Thu May 21 06:04:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 189065 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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 B8BF0C433E1 for ; Thu, 21 May 2020 06:04:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9845F20829 for ; Thu, 21 May 2020 06:04:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="DkXKFqyf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728148AbgEUGEc (ORCPT ); Thu, 21 May 2020 02:04:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728144AbgEUGEa (ORCPT ); Thu, 21 May 2020 02:04:30 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2277C08C5C0 for ; Wed, 20 May 2020 23:04:30 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id r10so2674450pgv.8 for ; Wed, 20 May 2020 23:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BrczHrPxmDimhB0/0NhkdkJAAqMI1FXR2cfHE8LPPuw=; b=DkXKFqyffhopz4NwbPl/fCxYBCpjpkQxwbDhRe0RUw/0i3pGXZNj5k9ckrmZ6QPsFQ V9rj/yOL43qEhl9wMacg4mtbJoXeNHfw9/bOHy2t6JwOqWI4WIcYNTWFX4XiNPblmCCW Tv5wCnrNEk90bcB8j30HJ/LC1oKhJUUlhuV+4= 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:mime-version:content-transfer-encoding; bh=BrczHrPxmDimhB0/0NhkdkJAAqMI1FXR2cfHE8LPPuw=; b=GENfQxvYlkp6TznKLQPGJLfuqObmX3b3l0zLp4ThrEbe8Ntav9x8QkbOxKMNStXXQu 9heVwv61waYpCPfmtcRMv6qclZD5y48JNNN9SN0yYgEep1zEOZhdFHXA/+zBy4k1HryW 5xLCueodcKYKAcvx1FSkIHtz1Bw3b0CC2Dj8WCFuSYUUodYiSyWuxYRCINNFUVJ9Hj8y 7B7QXtfCbhnV+z3KQ4RSBGfqL+qTYe/zkfeYWTQLV1sTLdHvAJvcSC66NaViVmsEmXlC uCUUtSH/P4AYqniXeBR166TCI8GSroGzO/WRLgQu2V8AgmrqEM7PM7Damt3/heiz94oJ 74Xw== X-Gm-Message-State: AOAM531HCzh2L5AN408SD40o5yK+xszpBLknaFvoyskJi2M4MOjdyKUP gBekWvfuyJsnLROVKfL4SM6nhA== X-Google-Smtp-Source: ABdhPJzHcQpJ2Uhf5/nuD8OHTpeaxu6Fxj7Zae/4TDavTQ4WzKGzxsX8Csvylbok0M8FpG1epS82KQ== X-Received: by 2002:a62:ddd6:: with SMTP id w205mr7790955pff.291.1590041070323; Wed, 20 May 2020 23:04:30 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:fa53:7765:582b:82b9]) by smtp.gmail.com with ESMTPSA id k18sm3590146pfg.217.2020.05.20.23.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2020 23:04:29 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Maulik Shah , Douglas Anderson Subject: [PATCHv3/RESEND 2/3] soc: qcom: rpmh-rsc: Loop over fewer bits in irq handler Date: Wed, 20 May 2020 23:04:24 -0700 Message-Id: <20200521060425.24285-3-swboyd@chromium.org> X-Mailer: git-send-email 2.26.2.761.g0e0b3e54be-goog In-Reply-To: <20200521060425.24285-1-swboyd@chromium.org> References: <20200521060425.24285-1-swboyd@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org readl() returns a u32, and BITS_PER_LONG is different on 32-bit vs. 64-bit architectures. Let's loop over the possible bits set in that type instead of looping over more bits than we ever may need to. Cc: Maulik Shah Reviewed-by: Douglas Anderson Reviewed-by: Bjorn Andersson Signed-off-by: Stephen Boyd --- drivers/soc/qcom/rpmh-rsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index 60fc56987659..ce725d4ff097 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -383,7 +383,7 @@ static irqreturn_t tcs_tx_done(int irq, void *p) irq_status = readl_relaxed(drv->tcs_base + RSC_DRV_IRQ_STATUS); - for_each_set_bit(i, &irq_status, BITS_PER_LONG) { + for_each_set_bit(i, &irq_status, BITS_PER_TYPE(u32)) { req = get_req_from_tcs(drv, i); if (!req) { WARN_ON(1); From patchwork Thu May 21 06:04:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 189064 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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, 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 10D60C433DF for ; Thu, 21 May 2020 06:04:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E40002070A for ; Thu, 21 May 2020 06:04:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="d46jY1Wi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727115AbgEUGEl (ORCPT ); Thu, 21 May 2020 02:04:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728154AbgEUGEc (ORCPT ); Thu, 21 May 2020 02:04:32 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9FF7C061A0F for ; Wed, 20 May 2020 23:04:31 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id b190so2827645pfg.6 for ; Wed, 20 May 2020 23:04:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sLzO6AaZGCnFvcbXowTQDfE+AbORO1+b/Wmhk6/yp2A=; b=d46jY1WiNtT+TTR21OXzy5EmRyieh4DSvvJyo4Pt9onu1LVvN5WX7HqqGHlVtCkYiM qpTUN6CWnGDj/SSaJU9fR9nH1q/oXTrWJ5pDLU48kVqqgxIrvWSp2QHDecMw2dMXOpvm mdUOyOiOa2uvTJ7Dd3pD3CR4rAxxOLpxPPcMI= 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:mime-version:content-transfer-encoding; bh=sLzO6AaZGCnFvcbXowTQDfE+AbORO1+b/Wmhk6/yp2A=; b=Pha8iaCsop2kE9mFNHfiqi7Zq+AX2JQQqLnPMf1YnIWKzEBb/CZmLyLBMN0AWl4XDV f923m8HO9JNYojIpLCZM3cK0i6xDE4aB/CejsG5nY8vXAHiVYAiOqg19LG3jOW7RA54g DLpb1bGmZOsrsZE7kOCmIdyGWIwXvkSIV9GvnF6fI+6pHrkqRsRAbYHBf/extDqzp8B7 sXYwKhr5b1oiNX15vk88wKFgtW5f3D7m6E+24nyj1OW4MxSHbGILyGlDs79jJaAuOl8d ebGU+n+xDXrPFqN3vxfKJ+Zo5L/XnyuUOawKL20E7mSrTlMj16K51KBtqrdMNcq3q/gO tr2w== X-Gm-Message-State: AOAM530LGkEUauOnxlq7R+cbYWfJi1hwG0bzjTtEk6FnPDP/76zHIS13 Zz6LzZxLBhy5WfTt6PnSDjxhNg== X-Google-Smtp-Source: ABdhPJwf9qox/9THRWrVH/q8CLC1R6TYC7rokcoVy4IkUl256gHyoo6tmtWgxWBt79QrqAYoEf1Fhg== X-Received: by 2002:aa7:9297:: with SMTP id j23mr7693039pfa.15.1590041071392; Wed, 20 May 2020 23:04:31 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:fa53:7765:582b:82b9]) by smtp.gmail.com with ESMTPSA id k18sm3590146pfg.217.2020.05.20.23.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2020 23:04:30 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Maulik Shah , Douglas Anderson Subject: [PATCHv3/RESEND 3/3] soc: qcom: rpmh-rsc: Fold WARN_ON() into if condition Date: Wed, 20 May 2020 23:04:25 -0700 Message-Id: <20200521060425.24285-4-swboyd@chromium.org> X-Mailer: git-send-email 2.26.2.761.g0e0b3e54be-goog In-Reply-To: <20200521060425.24285-1-swboyd@chromium.org> References: <20200521060425.24285-1-swboyd@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move the WARN_ON() into the if condition so the compiler can see that the branch is unlikely() and possibly optimize it better. Cc: Maulik Shah Reviewed-by: Douglas Anderson Reviewed-by: Bjorn Andersson Signed-off-by: Stephen Boyd --- drivers/soc/qcom/rpmh-rsc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index ce725d4ff097..8381bd012de4 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -385,10 +385,8 @@ static irqreturn_t tcs_tx_done(int irq, void *p) for_each_set_bit(i, &irq_status, BITS_PER_TYPE(u32)) { req = get_req_from_tcs(drv, i); - if (!req) { - WARN_ON(1); + if (WARN_ON(!req)) goto skip; - } err = 0; for (j = 0; j < req->num_cmds; j++) {