From patchwork Fri Feb 12 14:34:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 381833 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp2984542jah; Fri, 12 Feb 2021 06:36:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwEmaB7HyaRktKWWs3w6gqZzM2TQGJPfCVYWwVXwr5zhMJrf6Yc4Zb3T1E9DmjnRMD7SBPo X-Received: by 2002:a17:906:63c2:: with SMTP id u2mr3299679ejk.346.1613140595983; Fri, 12 Feb 2021 06:36:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613140595; cv=none; d=google.com; s=arc-20160816; b=bdIHPkittTxrWYTSkqC9d4ShH0bzCT4SmA8StO5HADSjedH7FguKX40OGDmSRUYY3N VtDdyjwr4D4WHUf2ynj0dchHcFmND0pTJQkR1OL5IwHRFxAmx/tx7laNQXlToTNosgg7 Q6m5bT19CZ/vWm14clCnmLxrkPM0y/4g6xwx1khg/P0u71V1aoHYc48bBpkJvhlCPEzl DC3IC1/1GutRGgfKo1Ff/a8ahY5FJTczcO7omesjfXzbptMPyI3bp77YOEjmPpIS3FLR pkU1VHuiqx/uZKkEbcPU4zj0wbrdp9SDQ6X/aeMS949T6rM7j2rf5qUx8lvw21wzMCR3 YHbw== 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=NzF0Z/WT0Iww7BykRJiaFbQQuxI8ckW46WWDqtEbJzw=; b=n8LcNwStQep3HYVxA3tJ/bIIlL+tv/tjTZm3f10M7+iKM9QZRxpy7rtvF5JfER5As0 6mtDlIrzVVrsXB+akcuyogNCzV/kK+s3j/Ry3fCIMPzhChJ/U+BwfhWHtyAfnBSSsHsD ElaGm/j2HQh8LWgLJ+KRpz3ksHpQBs96VQe1p5wOb8Wz12Bi0TJstsaehXqUGnr80WGi a1Ync4qMl3Uo82ra/ECaQmmp0+ojV/cHf65G7Opq5CouFS1rRwoVVXxU4Lzi9vebeRw+ uGTYr+CPz9Jl0HDFbUXEajn9666seV66a3noW6HY0w6J2vIdAVNp/k5mtpFDpUkBVrV3 ru9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gCEH7M3L; 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 q21si6164613edt.445.2021.02.12.06.36.35; Fri, 12 Feb 2021 06:36:35 -0800 (PST) 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=gCEH7M3L; 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 S231604AbhBLOgO (ORCPT + 9 others); Fri, 12 Feb 2021 09:36:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231317AbhBLOfh (ORCPT ); Fri, 12 Feb 2021 09:35:37 -0500 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BA33C06178C for ; Fri, 12 Feb 2021 06:34:10 -0800 (PST) Received: by mail-il1-x133.google.com with SMTP id z18so8298418ile.9 for ; Fri, 12 Feb 2021 06:34:10 -0800 (PST) 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=NzF0Z/WT0Iww7BykRJiaFbQQuxI8ckW46WWDqtEbJzw=; b=gCEH7M3Lg1UCLH9mgtLugfV1AZ8Bjq88W4HRCIwDOaZnqZ3hK0UcGrSxVVJlFfv9Z0 IMAlAsZ8dqCp3Wh+kW4tAW/ycPdrMgmSV9uahXitKHYMqHDUD1MTABk0ieJcPxSdg0AU GXVjpvLX6aJOGOHy3HbHf4Ef+1XLcFepKaDjmMaviJpL6wQ+PQq0OW8ZYu/IIiO9o6ff /zHCgG4XhbcCmCT7QgAyHZvrGGX4SHEGQfDT/BTIVwu3gJ6ojNU8Kb/Tt13lWE+co6Ba Acxfv6V8DU8x8VsQhNW1oP1vWxLkuZ0/wbj9QTAilzxsGRA+JQr4/4Tphf1cC73ZG7Qw G/3g== 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=NzF0Z/WT0Iww7BykRJiaFbQQuxI8ckW46WWDqtEbJzw=; b=TwylMZQxPrgsncY3YZJZ+6gRNKUm1riqY3ABoSD0HIEaMm+e+QYPVXPk7qXlUmaaDC hYmGzdjQKpXes7njXD63fehY9BeQ3C+1rLorX4n6Wb/BASq2r3dJH58AeBL6aHVOY9dU 09ooHxWV7hbePqUnCU3CqLmhUjXqOh3EvFzNsscTchtr4vmNjQD1elK/qq78QBAJRXJq DAkJPPkH3vwMUmAdKLEokiSl9qBlecyMcuDYZErWYCsXkPg8gNyTLr/rJMyunACwLrzb qHCQdulk/5AVL3Y9Jv7BKS8lpu4JfFQJWfWtmc7nvJU5bHufkp1I94jBr7tPQ1p2mHbE KBHA== X-Gm-Message-State: AOAM531kN6RybtSowULLNQyL6GOTEgPbV4DTSiM4xMybmOFUsFstEY/c 1SmXq1/xVbhQeDSCmS8SAmPSgA== X-Received: by 2002:a92:cd8a:: with SMTP id r10mr2531644ilb.110.1613140449627; Fri, 12 Feb 2021 06:34:09 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id j12sm4387878ila.75.2021.02.12.06.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Feb 2021 06:34:09 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: elder@kernel.org, evgreen@chromium.org, bjorn.andersson@linaro.org, cpratapa@codeaurora.org, subashab@codeaurora.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 net-next 3/5] net: ipa: fix register write command validation Date: Fri, 12 Feb 2021 08:34:00 -0600 Message-Id: <20210212143402.2691-4-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210212143402.2691-1-elder@linaro.org> References: <20210212143402.2691-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In ipa_cmd_register_write_valid() we verify that values we will supply to a REGISTER_WRITE IPA immediate command will fit in the fields that need to hold them. This patch fixes some issues in that function and ipa_cmd_register_write_offset_valid(). The dev_err() call in ipa_cmd_register_write_offset_valid() has some printf format errors: - The name of the register (corresponding to the string format specifier) was not supplied. - The IPA base offset and offset need to be supplied separately to match the other format specifiers. Also make the ~0 constant used there to compute the maximum supported offset value explicitly unsigned. There are two other issues in ipa_cmd_register_write_valid(): - There's no need to check the hash flush register for platforms (like IPA v4.2) that do not support hashed tables - The highest possible endpoint number, whose status register offset is computed, is COUNT - 1, not COUNT. Fix these problems, and add some additional commentary. Signed-off-by: Alex Elder --- v2: - Update copyright. drivers/net/ipa/ipa_cmd.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/drivers/net/ipa/ipa_cmd.c b/drivers/net/ipa/ipa_cmd.c index 97b50fee60089..fd8bf6468d313 100644 --- a/drivers/net/ipa/ipa_cmd.c +++ b/drivers/net/ipa/ipa_cmd.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. - * Copyright (C) 2019-2020 Linaro Ltd. + * Copyright (C) 2019-2021 Linaro Ltd. */ #include @@ -244,11 +244,15 @@ static bool ipa_cmd_register_write_offset_valid(struct ipa *ipa, if (ipa->version != IPA_VERSION_3_5_1) bit_count += hweight32(REGISTER_WRITE_FLAGS_OFFSET_HIGH_FMASK); BUILD_BUG_ON(bit_count > 32); - offset_max = ~0 >> (32 - bit_count); + offset_max = ~0U >> (32 - bit_count); + /* Make sure the offset can be represented by the field(s) + * that holds it. Also make sure the offset is not outside + * the overall IPA memory range. + */ if (offset > offset_max || ipa->mem_offset > offset_max - offset) { dev_err(dev, "%s offset too large 0x%04x + 0x%04x > 0x%04x)\n", - ipa->mem_offset + offset, offset_max); + name, ipa->mem_offset, offset, offset_max); return false; } @@ -261,12 +265,24 @@ static bool ipa_cmd_register_write_valid(struct ipa *ipa) const char *name; u32 offset; - offset = ipa_reg_filt_rout_hash_flush_offset(ipa->version); - name = "filter/route hash flush"; - if (!ipa_cmd_register_write_offset_valid(ipa, name, offset)) - return false; + /* If hashed tables are supported, ensure the hash flush register + * offset will fit in a register write IPA immediate command. + */ + if (ipa->version != IPA_VERSION_4_2) { + offset = ipa_reg_filt_rout_hash_flush_offset(ipa->version); + name = "filter/route hash flush"; + if (!ipa_cmd_register_write_offset_valid(ipa, name, offset)) + return false; + } - offset = IPA_REG_ENDP_STATUS_N_OFFSET(IPA_ENDPOINT_COUNT); + /* Each endpoint can have a status endpoint associated with it, + * and this is recorded in an endpoint register. If the modem + * crashes, we reset the status endpoint for all modem endpoints + * using a register write IPA immediate command. Make sure the + * worst case (highest endpoint number) offset of that endpoint + * fits in the register write command field(s) that must hold it. + */ + offset = IPA_REG_ENDP_STATUS_N_OFFSET(IPA_ENDPOINT_COUNT - 1); name = "maximal endpoint status"; if (!ipa_cmd_register_write_offset_valid(ipa, name, offset)) return false;