From patchwork Thu Jun 10 19:23:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 457864 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp751753jae; Thu, 10 Jun 2021 12:23:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwU2OZ2rnMOvqMNsyMMzW0hDXODXLMlZEO65L1blhSYcxk1mw2jjbRKRlGnk+cDTZmt1mXu X-Received: by 2002:a17:906:1814:: with SMTP id v20mr180696eje.152.1623353030510; Thu, 10 Jun 2021 12:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623353030; cv=none; d=google.com; s=arc-20160816; b=DRo7SLV089zEKsQNHH7olBviUMp1bmrhO8/OP2f+9Kgo2DaBXzDNWJ+6IbVQ7EjPnB tKChRv9qXA11AOs2cGZfj7PfJj9s1fCnf7aRxdLsHKbO919dUGDIRCPfLtuqnOr/MtWB FJ4qEHeEiRm7Um6ubemuKIGCb1QOJNCylW+JrjcHj/IaUZFNyrho1Z/WHLv8/c3imK+g B5cQV88AWkefCMoi+7GpOnyLKCAAiyLevXX1bHJWw7GswJrecIKE8MpManbKwfhZCjti hu+cIMWKtw41NPzn8k1AgOEnogzT853kPoQgNpdlmyBAojSjpX3ytE337DkwtrZNAdDr jW+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HL9o9ctxrHknoeR61K9dgQ4l+oTFbtzywLTa0WvXVK4=; b=GKyH+VN9qbBF02W2AE0lJ/NHOpBkRiTFWB5RBVFwA9FkVMievmIbXnoQmIV9DjOuyM GAbieK3xRvRJHHX6etxedLgxyuhbKhHMildfF+6AnZI/I7NRWE2EoEcfiVS9Vi3Akab6 NgWk+mx2zNV9bEQ6GhpfZ/37BzjCUmL4ff5F2Uk4Kcn7/ul8I7q4dbRTj5sIt9vyvu4B 3t9d85SCNzgrMaI6eFeogIKsJQXnV6eBSZWR/G1pMvHDpN4LwPl8ll3wzMpvtmN/pOOh siIzgN4LK//nTA9JL0F8dDYiLkNcqYOwXuPZ6/6e6ALpDTbsQG094jajCghmYxdG6vnU tbhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V3iQh2Cj; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bz20si3523532ejc.486.2021.06.10.12.23.50; Thu, 10 Jun 2021 12:23:50 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V3iQh2Cj; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230460AbhFJTZ3 (ORCPT + 8 others); Thu, 10 Jun 2021 15:25:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbhFJTZP (ORCPT ); Thu, 10 Jun 2021 15:25:15 -0400 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 472ECC0617AD for ; Thu, 10 Jun 2021 12:23:19 -0700 (PDT) Received: by mail-io1-xd2a.google.com with SMTP id k22so28299519ioa.9 for ; Thu, 10 Jun 2021 12:23:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HL9o9ctxrHknoeR61K9dgQ4l+oTFbtzywLTa0WvXVK4=; b=V3iQh2CjsxmYxYGd5hCEgcOBM7sZS0HvKHFoLXi8Cbk1sgvDD71iZ5U8R/rieoh4lT bbA+bywVRsFbXHz5BuIcB444Xa7ujBo9uqopLIwuik90lIfbkrF0dEDzsdBqC+qkEkd/ r46DWGHEM233gdrx6RyoUfrvEyzN+Y+QczU1mhZWGbWBPdWa3fRH5TR8o8XKtWwttekA uabxkM8MjFbeasUqF9n/nxvNb7N+vLGbuA4+d13scN+TpBNy77s2v3p+u8oLBitMTGk5 Vii0MU2S8tKH6VOrZnkqz5W9fUaC3EMNpzP0V+HtVUdDqOfq9NSlEBzFXkYdZtE+H0hl ZwXw== 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=HL9o9ctxrHknoeR61K9dgQ4l+oTFbtzywLTa0WvXVK4=; b=Y64xdQktQOeLZr3Z9GJHm3edQmfR4oXyn4KYaBQ9aMhXt66vZk2Bw3nYqefYQzpMun jFx4brdH8ZidIW/pxuCg5qA9EyFBi9G1DZIKp3KnxoazhQ+Y5EQVVhzkED+QrAZxacld IlReTo8pOlEDS62TUvQkxlT7Wsa34vhXzXwuMyu8NMT1E8i8JMI+I8X4KuZ8hc/Nv/d9 Nbf+T4gsBVuqxbwk9wkNpeiVcwDzxIkrvkcRuwVvTrVNo8Ek4i6x9QbCYGw1WBsFbzDf v565/eWpLjmmbMXG1NEonS+dS3fqIqCsJDUV96sGeYxjNPMbO0ICYTxZgmqcerf5C+cc 6wRQ== X-Gm-Message-State: AOAM531GWjZ1wrEgC59M69X/kS9th6h2DtmnEcyn9pCdcH148vqpKmrw qmmLl/ln6baUwLy0xKkyi0e7ZA== X-Received: by 2002:a05:6638:3885:: with SMTP id b5mr206110jav.68.1623352998699; Thu, 10 Jun 2021 12:23:18 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id w21sm2028684iol.52.2021.06.10.12.23.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 12:23:18 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 6/8] net: ipa: pass memory id to ipa_table_valid_one() Date: Thu, 10 Jun 2021 14:23:06 -0500 Message-Id: <20210610192308.2739540-7-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210610192308.2739540-1-elder@linaro.org> References: <20210610192308.2739540-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stop passing most of the Boolean flags to ipa_table_valid_one(), and just pass a memory region ID to it instead. We still need to indicate whether we're operating on a routing or filter table. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_table.c | 44 +++++++++++++------------------------ 1 file changed, 15 insertions(+), 29 deletions(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c index f7ee75bfba748..679855b1d5495 100644 --- a/drivers/net/ipa/ipa_table.c +++ b/drivers/net/ipa/ipa_table.c @@ -150,29 +150,16 @@ static void ipa_table_validate_build(void) } static bool -ipa_table_valid_one(struct ipa *ipa, bool route, bool ipv6, bool hashed) +ipa_table_valid_one(struct ipa *ipa, enum ipa_mem_id mem_id, bool route) { + const struct ipa_mem *mem = &ipa->mem[mem_id]; struct device *dev = &ipa->pdev->dev; - const struct ipa_mem *mem; u32 size; - if (route) { - if (ipv6) - mem = hashed ? &ipa->mem[IPA_MEM_V6_ROUTE_HASHED] - : &ipa->mem[IPA_MEM_V6_ROUTE]; - else - mem = hashed ? &ipa->mem[IPA_MEM_V4_ROUTE_HASHED] - : &ipa->mem[IPA_MEM_V4_ROUTE]; + if (route) size = IPA_ROUTE_COUNT_MAX * sizeof(__le64); - } else { - if (ipv6) - mem = hashed ? &ipa->mem[IPA_MEM_V6_FILTER_HASHED] - : &ipa->mem[IPA_MEM_V6_FILTER]; - else - mem = hashed ? &ipa->mem[IPA_MEM_V4_FILTER_HASHED] - : &ipa->mem[IPA_MEM_V4_FILTER]; + else size = (1 + IPA_FILTER_COUNT_MAX) * sizeof(__le64); - } if (!ipa_cmd_table_valid(ipa, mem, route, ipv6, hashed)) return false; @@ -185,9 +172,8 @@ ipa_table_valid_one(struct ipa *ipa, bool route, bool ipv6, bool hashed) if (hashed && !mem->size) return true; - dev_err(dev, "IPv%c %s%s table region size 0x%02x, expected 0x%02x\n", - ipv6 ? '6' : '4', hashed ? "hashed " : "", - route ? "route" : "filter", mem->size, size); + dev_err(dev, "%s table region %u size 0x%02x, expected 0x%02x\n", + route ? "route" : "filter", mem_id, mem->size, size); return false; } @@ -195,16 +181,16 @@ ipa_table_valid_one(struct ipa *ipa, bool route, bool ipv6, bool hashed) /* Verify the filter and route table memory regions are the expected size */ bool ipa_table_valid(struct ipa *ipa) { - bool valid = true; + bool valid; - valid = valid && ipa_table_valid_one(ipa, false, false, false); - valid = valid && ipa_table_valid_one(ipa, false, false, true); - valid = valid && ipa_table_valid_one(ipa, false, true, false); - valid = valid && ipa_table_valid_one(ipa, false, true, true); - valid = valid && ipa_table_valid_one(ipa, true, false, false); - valid = valid && ipa_table_valid_one(ipa, true, false, true); - valid = valid && ipa_table_valid_one(ipa, true, true, false); - valid = valid && ipa_table_valid_one(ipa, true, true, true); + valid = ipa_table_valid_one(IPA_MEM_V4_FILTER, false); + valid = valid && ipa_table_valid_one(IPA_MEM_V4_FILTER_HASHED, false); + valid = valid && ipa_table_valid_one(IPA_MEM_V6_FILTER, false); + valid = valid && ipa_table_valid_one(IPA_MEM_V6_FILTER_HASHED, false); + valid = valid && ipa_table_valid_one(IPA_MEM_V4_ROUTE, true); + valid = valid && ipa_table_valid_one(IPA_MEM_V4_ROUTE_HASHED, true); + valid = valid && ipa_table_valid_one(IPA_MEM_V6_ROUTE, true); + valid = valid && ipa_table_valid_one(IPA_MEM_V6_ROUTE_HASHED, true); return valid; }