From patchwork Wed Jun 9 22:34:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 456836 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp5721047jae; Wed, 9 Jun 2021 15:35:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyn9zU26/328vFLf5AnANLeFRaCiuoRdv7Fq84Oo2Kdo/SN6i2ZjrINcm1UstHxtpS76IFJ X-Received: by 2002:aa7:c04e:: with SMTP id k14mr1508174edo.157.1623278157789; Wed, 09 Jun 2021 15:35:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623278157; cv=none; d=google.com; s=arc-20160816; b=sPFDAwZRy1a7B8IrnIl6zdqjw9Dgrtqvb6oGbndQN6evSEPKtBNW+6ruD9Hsa+mX4m 1WBZisnFWFHJFlUAFAESfNhhvHtVFWZY1+2/De7OdydDymkBnZhDN0OcDLXW9N5WvEG7 pifXpSaLNcAwcwijJpdEjoocS11qruAE9/m1/ay9gDEvT/3GD/5pvdK5nHyhTkNPS2I8 xgxU7Pi2LGOmK63O20MJTgjSikUU70aS4oZBC7I2nYmvfdau59Q4ySUodE/40CyPyDUr 7IMiayLUvGEiwLhtSbgc+Ktkh5SpcySonXLhBqBuQDwtB5Tqsx5PxTwm2hm3s3zQsKYg RW9g== 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=+3Be2aADV7uPp72IR6w8DJQv7KxaXAQZAy5ctN+CH2I=; b=MTRZvjiga+fSuM0WUDAga+38s0r2j3RnZ+7KFTc/cQwycUdy1S0kqzXPRJ44iUYU/S AIAnYcu7hbYV1PPfFB7a277CAAzL1tpKT+jb2T2mcRyxNXb1G1gV5bmY6NRHa3OzGwkj xKqw5dJh0E4F+5ho6DKnLQ5Aoyj52yBiNKXbjAxReotgLj1WgWUm4B9leDJzrIPKgrdy ME+nZbJ3EwoshTLY5vS09I3bNUt3QzO43dnywubKEU37B3GHz/OzyyV/mBKrJEbvj6yU T17mgTDhQTB3ARLKe0Kpm9jVsIBGtsgvAZlUd+y6nH5ml6s5X+ISOXQA1Vp+osG+gRj7 97ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TXn397a5; 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 l3si910300ejd.313.2021.06.09.15.35.57; Wed, 09 Jun 2021 15:35:57 -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=TXn397a5; 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 S230103AbhFIWhP (ORCPT + 8 others); Wed, 9 Jun 2021 18:37:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229972AbhFIWhO (ORCPT ); Wed, 9 Jun 2021 18:37:14 -0400 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D78F4C061574 for ; Wed, 9 Jun 2021 15:35:07 -0700 (PDT) Received: by mail-il1-x12e.google.com with SMTP id w14so18549264ilv.1 for ; Wed, 09 Jun 2021 15:35:07 -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=+3Be2aADV7uPp72IR6w8DJQv7KxaXAQZAy5ctN+CH2I=; b=TXn397a52FqS+L7I4Ntuv2ciaDVD91K3vP+UR+IcwqhrvxeTGvnpgzwwXrTBRQO9cC diTaTT/wnrPLokSDh3i0Is5LZkUP8TDPCpq1IyrzCFjR74GLALa3X+WmZiWhE9E4ZanJ /71/x+n75SkYmA+Ldd1I+tuBBdlylmMwUdGIyDY3EV5r4ii6LrmbAjEdLmhx7MybAl2y GRBLoIKrKjhBWCcBCaVyXA4K036RGzf6hwxTZzP4xguADk3+jPO5UuU3ITr7VEMNyI73 PbYN8sDoWPwzartr8NPoOIX77BbCPGt1ElMUndBqhPoZThYScyHY0janswYE1ph3iqia V97Q== 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=+3Be2aADV7uPp72IR6w8DJQv7KxaXAQZAy5ctN+CH2I=; b=Bux3ZGg5PeKtpVvgxrfGUK4bem0mdaI+G72xGV4MKcPoMBUDAmd+Q6MDLnHKQ6CCDG ev2ZdKJRW+nDM3KvMaEX+FaeNje544KcAy6USvSJT6ZF5oM9npLURnYW+OgnYFvi8msW x6fsp758A8yVgphgTudUW7muLDMawGSKNaSQ1UvbN1irA7QHIx/fl+BzGQ1r+rgg0nYL CuvnhHjGINKM207oJAYR7YchIM2r/+n+jDP1HcLucKhaFVfcK+zRiD5arRKaZoqNa1Xm c8SnVakpaUMqw2HQ8YEzVRCi0OShKgPy9sEu4pmx9cBAlSD48kZmd4G9bYiaFhhUz1Cj uvWg== X-Gm-Message-State: AOAM530MsDJsRGsyqOS6ermW76IgMyHQ+rjyq9mptu7OY2lajOKu2Jqm EY4wEPHBusmpv+huNPwgbDmu5Q== X-Received: by 2002:a05:6e02:219d:: with SMTP id j29mr670381ila.64.1623278107318; Wed, 09 Jun 2021 15:35:07 -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 c19sm750165ili.62.2021.06.09.15.35.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 15:35:07 -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 01/11] net: ipa: define IPA_MEM_END_MARKER Date: Wed, 9 Jun 2021 17:34:53 -0500 Message-Id: <20210609223503.2649114-2-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210609223503.2649114-1-elder@linaro.org> References: <20210609223503.2649114-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Define a new pseudo memory region identifer that specifies the offset at the end of IPA resident memory. Use it instead of IPA_MEM_UC_EVENT_RING in places where the size of that region was defined to be 0. The size of the IPA_MEM_END_MARKER pseudo region must be zero. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-v4.11.c | 2 +- drivers/net/ipa/ipa_data-v4.2.c | 2 +- drivers/net/ipa/ipa_mem.c | 2 ++ drivers/net/ipa/ipa_mem.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_data-v4.11.c b/drivers/net/ipa/ipa_data-v4.11.c index 05806ceae8b54..e7bdb8b4400e7 100644 --- a/drivers/net/ipa/ipa_data-v4.11.c +++ b/drivers/net/ipa/ipa_data-v4.11.c @@ -325,7 +325,7 @@ static const struct ipa_mem ipa_mem_local_data[] = { .size = 0x100c, .canary_count = 2, }, - [IPA_MEM_UC_EVENT_RING] = { + [IPA_MEM_END_MARKER] = { .offset = 0x3000, .size = 0x0000, .canary_count = 1, diff --git a/drivers/net/ipa/ipa_data-v4.2.c b/drivers/net/ipa/ipa_data-v4.2.c index 8744f19c64011..95f75dbc3c3bc 100644 --- a/drivers/net/ipa/ipa_data-v4.2.c +++ b/drivers/net/ipa/ipa_data-v4.2.c @@ -304,7 +304,7 @@ static const struct ipa_mem ipa_mem_local_data[] = { .size = 0x140c, .canary_count = 0, }, - [IPA_MEM_UC_EVENT_RING] = { + [IPA_MEM_END_MARKER] = { .offset = 0x2000, .size = 0, .canary_count = 1, diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c index 1624125e7459f..e3c43cf6e4412 100644 --- a/drivers/net/ipa/ipa_mem.c +++ b/drivers/net/ipa/ipa_mem.c @@ -120,6 +120,8 @@ static bool ipa_mem_valid(struct ipa *ipa, enum ipa_mem_id mem_id) else if (mem->offset + mem->size > ipa->mem_size) dev_err(dev, "region %u ends beyond memory limit (0x%08x)\n", mem_id, ipa->mem_size); + else if (mem_id == IPA_MEM_END_MARKER && mem->size) + dev_err(dev, "non-zero end marker region size\n"); else return true; diff --git a/drivers/net/ipa/ipa_mem.h b/drivers/net/ipa/ipa_mem.h index a422aec69e5da..5a4f865a45afa 100644 --- a/drivers/net/ipa/ipa_mem.h +++ b/drivers/net/ipa/ipa_mem.h @@ -70,6 +70,7 @@ enum ipa_mem_id { IPA_MEM_STATS_DROP, /* 0 canaries (IPA v4.0 and above) */ IPA_MEM_MODEM, /* 0/2 canaries */ IPA_MEM_UC_EVENT_RING, /* 1 canary */ + IPA_MEM_END_MARKER, /* 1 canary (not a real region) */ IPA_MEM_COUNT, /* Number of regions (not an index) */ };