From patchwork Fri Mar 19 15:24:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 404800 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1472071jai; Fri, 19 Mar 2021 08:25:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDmULUwvFG6j7RBAv25HIFMVDFJSQemWZppzb06QqJTFPn1dCLBpcReSZFXTORe4ykDnaT X-Received: by 2002:a17:906:cecc:: with SMTP id si12mr4991366ejb.461.1616167529411; Fri, 19 Mar 2021 08:25:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616167529; cv=none; d=google.com; s=arc-20160816; b=kzWS0Ubi8iYinWHJosbYZR76/xqmSDgs5pRYy3rWhC1KQYSQhkEjaosfV7Eap4xDmP ewOk6cEL6wzxn3BhhnpdW1BmpcT3vzv/tMLhbmOiwCTz0khtH2SV4J4ZbjA3vuGRXCSK 0aBbnzXDgHR1LtHWl57oWY1r5McQz6ZJPvGJVs6zLkVttcdPMmQhKA3p9WM1mcgcvOAD EnERAti3g3d/zao/u7h9jx8VMl4APfEtXd+QQD7wPNR6BqqejSt+9V224TIAAUj6Gd4k VC7Deon9T/QMelxKm3mYs+yuzDaJkFwd8mAUqRyAg2aaITq/u6dw2zBZcqvh1hrdvHit LLrA== 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=zmHxdK3XCfKcg/e1EYSJiFRbbaJwpxSQMNrnpC/NWjI=; b=S7MUQ1+ZxlyYjdk944CYaht5Yc1mfs0GDgTkBtItWFDm8bEc7tkOE4f141a+eC8Kad VX/hnWB2CMnf8tu5U/+z1RIk13+xBYKY9wRaSKGV6rKFZBtIhJNb2lVwFBfzXsw96xDd vfzeB1mzVnzku//nzXDiz+anLFvmufeiDj4k9EVGFPAayFP/nOYmc+4LarCKAE+4O7M+ B2PbkMfNhAyMzYJvARKhmKjyC35a5K8/pZmkDYFyT1bpZi7kzwCnm/HP01rHUY/I7RJe VNazbRDAZPcuzDBoKomhv7/u4suyZzojAlWF3FiY9GlpXvyaiE1nfRo7WBTmqZ+0i2Ju BpkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NmltFTe+; 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 p12si4267648edq.288.2021.03.19.08.25.29; Fri, 19 Mar 2021 08:25:29 -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=NmltFTe+; 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 S230518AbhCSPY7 (ORCPT + 8 others); Fri, 19 Mar 2021 11:24:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230314AbhCSPY1 (ORCPT ); Fri, 19 Mar 2021 11:24:27 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E26A1C061761 for ; Fri, 19 Mar 2021 08:24:26 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id z136so6490826iof.10 for ; Fri, 19 Mar 2021 08:24:26 -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=zmHxdK3XCfKcg/e1EYSJiFRbbaJwpxSQMNrnpC/NWjI=; b=NmltFTe+5/KkMVI2XO70QRX8FQHizwSbYiQDlXpP4tyobqToVixLzlCBjfDwZwf/zP sNRfo45JdHir9STTgenjNcnTEAncgT+UV97V4Vj/2YDSBxxANaF2GJE0b3aeThKk3s9A c0UkXp7S/Q9xRh3U7SxCpKdaFe3htRei+Bpk7VFOrh0yuT/SyJXARdOybD5Vs4ISBqNu cIR5QCjTcFUYxTvEg+Sxd4uvtLqcfIjBpIuzD7Z53JwSBHpg8vl5+R/GIkPggYLZwZCV i/FC+BWYddgYrJi0mY66JyVrHiOBcps8Y9Fp0JE7cTNWrbYVkPe+M+vr5m37zcOhRy/x qXIQ== 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=zmHxdK3XCfKcg/e1EYSJiFRbbaJwpxSQMNrnpC/NWjI=; b=ShYWGC0IPbG4tEsCmkHO75e8BRDYIc22zlYWLcsfT0Z01vJD0ofSGkS50DTjkUZN18 jV62y7g/p0Qkbm66X/THXYyM/swT7wlVSzntib6tphB402oEn9QqJms1wC4VZNITz6pl rKcjdnUXRW51erFhPRipw2UZc/pmDu1O1QU/kCxLTPyqvMojfpFtKZ/ioyhn4/iffk+P RjuSnoR14TvAg+AOeZGt2J3YHa2kM137+e3jGHE0Mx5W6jcMmA+7hye7bNQhrtLdnDX3 mPWfiedEDuOU80fzf+G+EWR0dcpX4y67PzJrYSwx57jrNN+QjQrw4SHAjqHxO3WmRGBU ig9Q== X-Gm-Message-State: AOAM533mzi+XW3fE6rY27h3tczszQ66uUpG6UaKxbJ119ju8y/5WU2v/ gwZbnB1vCSvmyZvJ97MD2QqTyA== X-Received: by 2002:a6b:7c4a:: with SMTP id b10mr3205560ioq.170.1616167466320; Fri, 19 Mar 2021 08:24:26 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id b5sm2686887ioq.7.2021.03.19.08.24.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 08:24:26 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/5] net: ipa: make all configuration data constant Date: Fri, 19 Mar 2021 10:24:18 -0500 Message-Id: <20210319152422.1803714-2-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319152422.1803714-1-elder@linaro.org> References: <20210319152422.1803714-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org All of the platform configuration data should be constant, but that isn't the case for the memory regions, interconnects, and clocks. Fix this. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-sc7180.c | 6 +++--- drivers/net/ipa/ipa_data-sdm845.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c index 997b51ceb7d76..01681be402262 100644 --- a/drivers/net/ipa/ipa_data-sc7180.c +++ b/drivers/net/ipa/ipa_data-sc7180.c @@ -300,7 +300,7 @@ static const struct ipa_mem ipa_mem_local_data[] = { }, }; -static struct ipa_mem_data ipa_mem_data = { +static const struct ipa_mem_data ipa_mem_data = { .local_count = ARRAY_SIZE(ipa_mem_local_data), .local = ipa_mem_local_data, .imem_addr = 0x146a8000, @@ -310,7 +310,7 @@ static struct ipa_mem_data ipa_mem_data = { }; /* Interconnect bandwidths are in 1000 byte/second units */ -static struct ipa_interconnect_data ipa_interconnect_data[] = { +static const struct ipa_interconnect_data ipa_interconnect_data[] = { { .name = "memory", .peak_bandwidth = 465000, /* 465 MBps */ @@ -329,7 +329,7 @@ static struct ipa_interconnect_data ipa_interconnect_data[] = { }, }; -static struct ipa_clock_data ipa_clock_data = { +static const struct ipa_clock_data ipa_clock_data = { .core_clock_rate = 100 * 1000 * 1000, /* Hz */ .interconnect_count = ARRAY_SIZE(ipa_interconnect_data), .interconnect_data = ipa_interconnect_data, diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c index 88c9c3562ab79..401861e3c0aa4 100644 --- a/drivers/net/ipa/ipa_data-sdm845.c +++ b/drivers/net/ipa/ipa_data-sdm845.c @@ -320,7 +320,7 @@ static const struct ipa_mem ipa_mem_local_data[] = { }, }; -static struct ipa_mem_data ipa_mem_data = { +static const struct ipa_mem_data ipa_mem_data = { .local_count = ARRAY_SIZE(ipa_mem_local_data), .local = ipa_mem_local_data, .imem_addr = 0x146bd000, @@ -330,7 +330,7 @@ static struct ipa_mem_data ipa_mem_data = { }; /* Interconnect bandwidths are in 1000 byte/second units */ -static struct ipa_interconnect_data ipa_interconnect_data[] = { +static const struct ipa_interconnect_data ipa_interconnect_data[] = { { .name = "memory", .peak_bandwidth = 600000, /* 600 MBps */ @@ -349,7 +349,7 @@ static struct ipa_interconnect_data ipa_interconnect_data[] = { }, }; -static struct ipa_clock_data ipa_clock_data = { +static const struct ipa_clock_data ipa_clock_data = { .core_clock_rate = 75 * 1000 * 1000, /* Hz */ .interconnect_count = ARRAY_SIZE(ipa_interconnect_data), .interconnect_data = ipa_interconnect_data, From patchwork Fri Mar 19 15:24:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 404802 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1472084jai; Fri, 19 Mar 2021 08:25:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnWoUXMMtECr4aH5egJ2dIjutWtC7llOsIDIGqzl30WfbkZjmExRSXBQKGOeb+JkS/1kV6 X-Received: by 2002:a17:906:e16:: with SMTP id l22mr4916960eji.173.1616167531213; Fri, 19 Mar 2021 08:25:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616167531; cv=none; d=google.com; s=arc-20160816; b=kSqRE9OmxAwRT+NXjEFNXPu74qpBrjnyOTxMkT40zN64CZ3dNvy6309nn8mGPrGqe+ jH9eEhKl2aBqY6xfWJcASVMHa1cxt/74PmmfPawGZvj+yaed88PnMGNOIYw73DHYVY6o yIrYHMmzCPW83ku5Egyp3lm86UH76Ga+bSZNe1i/DcO3fDrzbZO8Ox+SjPajOh5sHWYo o63lIiUimM/3fhiaiSU4jt/AekKpNnjuiz5A/K30IDWtNT2a0ylAHlIzUNQe5eTG4F1v vOoDJ3NI79GVb1wez+5WW7wtW3HGrdwf9cmGTnVkBeurlZV5Bw537YMHCWpemntcrepK WfRA== 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=lrZt1rPIG/1PTEGAYJ/63IjjGn/k/PqO4YrjyvU7aqg=; b=QyRKYKIuM6JiJE/XFQvDS7QWiGMSUOubCw+JkYMucQXVod/Jzh/4R6AViqgESb0y15 6t1OHZfB5o30v49iwrekPMBUnLsoFFM1kkKEuKco0yBknyzrqZkkp93tEHHAPbYgtXf9 7tCbMFupQzL6IGGGSHctkOScMl2bFWoBSoNSDjW6naaAls2eHqyDpwONDD/S0KaPKzNx RELUjHk2VH3vGFMuppDhrnusyJtCx43HcziLuzzlrTOQxofS8W2rUjLHq0JkrzOBgTrl 1N5IrHScNFroxmpK0Ek7DI+GIlvumzSnUhin0Kj2BYCxfqP57+rVlZgZXS0jtuPzZTFg /YiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ej5GA0ij; 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 p12si4267648edq.288.2021.03.19.08.25.31; Fri, 19 Mar 2021 08:25:31 -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=Ej5GA0ij; 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 S231157AbhCSPZC (ORCPT + 8 others); Fri, 19 Mar 2021 11:25:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230336AbhCSPY2 (ORCPT ); Fri, 19 Mar 2021 11:24:28 -0400 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C53DC061763 for ; Fri, 19 Mar 2021 08:24:27 -0700 (PDT) Received: by mail-io1-xd32.google.com with SMTP id z136so6490872iof.10 for ; Fri, 19 Mar 2021 08:24:27 -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=lrZt1rPIG/1PTEGAYJ/63IjjGn/k/PqO4YrjyvU7aqg=; b=Ej5GA0ijTsiI6X+7rlIVpylEJdpykUhABDdvsKDbgOw+DM+5hQrqqZEaSVFy4Kk9SA dt9u/sK2vep4GTNtlnPnQ7kyWHiVN9EWZgg+TiTqXIAS0fo08rgc5q/YpkLnVFAa7Hl6 8Z8Yttc8zCM1Fj4rl8SLBTSGFJO/ic0YlbyVC2r2hP49/rrs6QdT8tS/kAAYyj+6bIeg 84aUhfBhGA6+CD4032GroxTq4hBqeDb0IoH//nKxU//Lz6plF+w4vGKFtQVuvNi1/QNb 7nE4NZzkm2sPznufUfzDEnz0Mf6FmfcGyjvbL42RqLuzLkphj6vQdrEjm3+qtowMraRC oDdQ== 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=lrZt1rPIG/1PTEGAYJ/63IjjGn/k/PqO4YrjyvU7aqg=; b=PRNZ4Rqc1BHbNQrLnNNOcH6D+EkpJ2WSSs7XqyxIdCR0TzZNeJllSvY+uGSWAFCi2t g8I59hL2p0uB8MP1VX3H76OPFb7wdEUSzXWi3yY4mXgLxNUNSRe3FejejpMBohT9Vpt2 PH3gJzdwxxLwnylk1Jsr8AQ+DHv35krEeF4i+mQwlEA4VeKl78RBBuckTVTUuGPTH9OZ b7pRMpFxjwrZdAmrJ0OX5MnUFu7KpJ8HJDgzywsfCwHTRVAnRcOJG1dd/ZQYa6XQWWRH 0tMN9k+WKupWtXlOlH4bNjkHziYml/WYlYyuHDmz2+uYW/LPqPf45bDxiobMJ5srezto VlMg== X-Gm-Message-State: AOAM531QaDcZEvIOPN7hnkSWQo8ndA1GuJwGIer+9oiOECsRbITnlW9b nTfoCXZ26tQfDIcpRdgYqJ9zWw== X-Received: by 2002:a05:6602:2110:: with SMTP id x16mr3307225iox.16.1616167467078; Fri, 19 Mar 2021 08:24:27 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id b5sm2686887ioq.7.2021.03.19.08.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 08:24:26 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/5] net: ipa: fix canary count for SC7180 UC_INFO region Date: Fri, 19 Mar 2021 10:24:19 -0500 Message-Id: <20210319152422.1803714-3-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319152422.1803714-1-elder@linaro.org> References: <20210319152422.1803714-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There should be no canary values written before the beginning of the UC_INFO memory region. This was correct for SDM845, but somehow was committed with the wrong value for SC7180. This bug seems to cause no harm, so we'll just correct it without back-porting. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-sc7180.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c index 01681be402262..434869508a215 100644 --- a/drivers/net/ipa/ipa_data-sc7180.c +++ b/drivers/net/ipa/ipa_data-sc7180.c @@ -206,7 +206,7 @@ static const struct ipa_mem ipa_mem_local_data[] = { [IPA_MEM_UC_INFO] = { .offset = 0x0080, .size = 0x0200, - .canary_count = 2, + .canary_count = 0, }, [IPA_MEM_V4_FILTER_HASHED] = { .offset = 0x0288, From patchwork Fri Mar 19 15:24:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 404801 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1472076jai; Fri, 19 Mar 2021 08:25:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnxUecf8tP5BLlT1N02SpJ69Fr5SWVGa5uZV+mzmooJHshNT1oPl1akmCR/urDeLJHrjo2 X-Received: by 2002:a17:906:dfcc:: with SMTP id jt12mr5010789ejc.31.1616167529847; Fri, 19 Mar 2021 08:25:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616167529; cv=none; d=google.com; s=arc-20160816; b=lciXjs19X5kzxV2ceniIl2rLf4b219ZedIRZHIP9ypcqmIevB9IayCM1KFPx1mzMId NzjzwrKx5gSxe9QuQ4Z4z25b/zriP4p+MEonHQ+MBY2NWO4tXiDpmiCzEVqKWKColpDD 48tM1ZBoqlVgrMMYMW4G8IFdV+CMx0OTrtTMcCC8sbhVusyfMow+Ozr8a9U9A6OJdS8I 1IYjwka9by7O0cuvyOyDdUYfdEV8hLy8R2kHtmrf5aiDlTRhl9JsSpXKJ8001FlyCpAi Au/2z56uOruUsqd/mk+6bZU0GfHKo9xuqn7Bj5FzeZgAe8LVSAST3EMARF+LaSZExqfw SqYA== 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=xYJYAGuBVG/7ONB/rhM70GnjEOT6BjXV95pgDrJwDp0=; b=A7OBDMLfbRZ1uE4ZNKZZ4W8v85DEAl5yKV6Z5WqCXOFua4Jfi7pR2LtWV92W9x2JCB pwYrp7L5nGOxxE2n2fHo/MbrZdcW5c+iytgiQQT+plLnu+WvCsjhGbx8JHrNIu2W0pIS nRhEKeEsTsLhq1/Oq5o4VG0wqfx5WNDRr0WH1kEwJvLIQIDCVG6SV32yG3kz0COwXfhr p2GjZosEWbF1Af4IzJk+/SbTPyywtzjBDniNP/T4oD4SJhDzyo1676N8SrjeQj+YwAQ9 KNVaPtA7wFpXB7CPWgGIoqtKcq1/zJ9H2pMQYFxGRHxG7UVBAm/NoBmP6bB9rYhFT0KH ZpdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lwt6uFD2; 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 p12si4267648edq.288.2021.03.19.08.25.29; Fri, 19 Mar 2021 08:25:29 -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=lwt6uFD2; 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 S231140AbhCSPZA (ORCPT + 8 others); Fri, 19 Mar 2021 11:25:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230355AbhCSPY2 (ORCPT ); Fri, 19 Mar 2021 11:24:28 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 623D3C061764 for ; Fri, 19 Mar 2021 08:24:28 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id n21so6496139ioa.7 for ; Fri, 19 Mar 2021 08:24:28 -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=xYJYAGuBVG/7ONB/rhM70GnjEOT6BjXV95pgDrJwDp0=; b=lwt6uFD2dhgNKH5eJUw9QYEi5qXXTX9eGZz2cL5IeA7P9KG7SBeiAvijqhOUkBs1e+ Mr+iVKGxnVjqTNrmM8wzGec3O10M0yh5n+S0ld0CD+gVTGyk3PygKScxe8bj2hb6Uj8m AaDqsaYZHrVRfFvoDYiPJJnutcrRDoyS5Vj2bnNL4o4o/BZfSSa7+sICzM7vVoTBV3yq YW/jNZnvr/SepcxzkAftyy//sRVXTsNngqIaUZEigGMjxwR7VyMg1Wbhp3b9W2phwo6W aTm3T5wWdAsY4fWgt/HvbZmv5hQfnfJZAz62T8RpJrr26qmPIC4gW68Z/tpxw3ad6DfQ iM/A== 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=xYJYAGuBVG/7ONB/rhM70GnjEOT6BjXV95pgDrJwDp0=; b=XU3nV46PD8xst75LBzBRiqZ0fuV7Bh1Ino9M+T8ZuLRYN3BR+xw+0G/FOZzTNIevyL xkv/dz9nHRthW9EhoFcgPeMf9BvnAquDK5ugnX1Tn8FBRquC/b01S08omiI2bXUL70g2 JeJRA2WeWKst9GD0+SBUQv2KIYPWE5tgHL+bjqat63EFCwnte77yAOC2/4xrOtbUT3/R 9H5IuQ2/iFR1oDZlLUarkVb4C8aukIYtpi41HPS2xCbpZAsqLI5V3+Yik+uLJwnWpwe2 1/sszCu0R21KFx2YmhkJdbw+glz37qC8krCWyfhEKcMpMeICt70Uxavk5AmHnC2SPvqg BfOw== X-Gm-Message-State: AOAM531JxJzkX8NPE9x16eIeJDI6v5p3VX8jvwjUS6YtCNRf60v4Gjgn GULwo1/FbsaW95e4OAc9ZMc3Uw== X-Received: by 2002:a02:c8d4:: with SMTP id q20mr1824171jao.90.1616167467914; Fri, 19 Mar 2021 08:24:27 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id b5sm2686887ioq.7.2021.03.19.08.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 08:24:27 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 3/5] net: ipa: don't define empty memory regions Date: Fri, 19 Mar 2021 10:24:20 -0500 Message-Id: <20210319152422.1803714-4-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319152422.1803714-1-elder@linaro.org> References: <20210319152422.1803714-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The AP_HEADER memory region for both the SDM845 and SC7180 SoCs has zero size, and has no canaries. Defining an offset for such a zero-length region is not meaningful, so it's better not to define it at all. The size of this region is used in the code, but its value will still be zero because the memory regions are defined in statically initialized memory. For the SC7180, the STATS_DROP memory region has a zero size and no canaries as well. These regions are the only place where a zero-sized region is defined despite having no canaries. Remove them. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-sc7180.c | 10 ---------- drivers/net/ipa/ipa_data-sdm845.c | 5 ----- 2 files changed, 15 deletions(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c index 434869508a215..0bdb60f6755c4 100644 --- a/drivers/net/ipa/ipa_data-sc7180.c +++ b/drivers/net/ipa/ipa_data-sc7180.c @@ -253,11 +253,6 @@ static const struct ipa_mem ipa_mem_local_data[] = { .size = 0x0140, .canary_count = 2, }, - [IPA_MEM_AP_HEADER] = { - .offset = 0x05e8, - .size = 0x0000, - .canary_count = 0, - }, [IPA_MEM_MODEM_PROC_CTX] = { .offset = 0x05f0, .size = 0x0200, @@ -283,11 +278,6 @@ static const struct ipa_mem ipa_mem_local_data[] = { .size = 0x0140, .canary_count = 0, }, - [IPA_MEM_STATS_DROP] = { - .offset = 0x0bf0, - .size = 0, - .canary_count = 0, - }, [IPA_MEM_MODEM] = { .offset = 0x0bf0, .size = 0x140c, diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c index 401861e3c0aa4..8cae9325eb08e 100644 --- a/drivers/net/ipa/ipa_data-sdm845.c +++ b/drivers/net/ipa/ipa_data-sdm845.c @@ -293,11 +293,6 @@ static const struct ipa_mem ipa_mem_local_data[] = { .size = 0x0140, .canary_count = 2, }, - [IPA_MEM_AP_HEADER] = { - .offset = 0x07c8, - .size = 0x0000, - .canary_count = 0, - }, [IPA_MEM_MODEM_PROC_CTX] = { .offset = 0x07d0, .size = 0x0200, From patchwork Fri Mar 19 15:24:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 404803 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1472090jai; Fri, 19 Mar 2021 08:25:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpfPN5eF9b0ZTtX2Mne0geyO/bcEXfumeMYploKwZxaBoAem+WX7R8X5q4bTdqVU5Q4LRV X-Received: by 2002:a17:906:1792:: with SMTP id t18mr5012800eje.378.1616167531598; Fri, 19 Mar 2021 08:25:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616167531; cv=none; d=google.com; s=arc-20160816; b=UwyDC1biGigwy/pj4U+Uwh6a5k5ym/4cWM/jjO2XgfmWXr0g9vHlBoaFX/VYkvnyDV QoBrSaF0tZmoXjLD1d/uACKuZRt1HQZSV/tqbJBtYtLThYZIfkxgaVcuEMNW3zbMK05v 2XIy48XrAFwPKO8TviANem4BXZZtMIoR/po+Y6r3kA/cHd6SqoLTG8tzyWtz9ycfVIf5 M4ts6OqGtGop9RnVLwUc+oS4lqeIB/MtQuo6Noz0ga4UXRpSH9JA3Ojsch/43F1lcMHp huw6TYkMciw8Te7zQh9X1wUiJdpnpjSyvJ328Dd2QZV08EmPDvmFB+zP98dA4wXKskTT PyXw== 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=yEgGy53zxqbYoAAHRBLHP4wOELYTResxqXghESvaYfE=; b=CuW4NNY2b0oP/SkMwAgpmXAotdZZA63wd6EDAMil+ITGk+2ojDIfOYjDcyM0VzFNh8 bV7CEWadyDdif0ZPE0yjaagx+bi53O1TNc3bFzkpcimqLBqluH/fDGTt70eS3EuuABWj t6wPG066Zz+gQ+idOISlI21CEJ4M8h7BXRmcUWX+GZ+CQCm7+4Eizk6kTCvNw7KCR0o5 4CJQmB2pjG3kH6sXRi2ATp7t9SvYTVEx30UHStfjCF8Z5TuXId1wBjKVFTaGcCsvMCr7 ViQvxCNm6ATTbpFHMNEMwixnIhiBc0ZE/yvLWpw3XdDzm9gIJi0jhWGTVVQ0bv9tyhOx u3+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l6c+Cgha; 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 p12si4267648edq.288.2021.03.19.08.25.31; Fri, 19 Mar 2021 08:25:31 -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=l6c+Cgha; 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 S231195AbhCSPZE (ORCPT + 8 others); Fri, 19 Mar 2021 11:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230486AbhCSPY3 (ORCPT ); Fri, 19 Mar 2021 11:24:29 -0400 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 320BAC06175F for ; Fri, 19 Mar 2021 08:24:29 -0700 (PDT) Received: by mail-io1-xd2b.google.com with SMTP id z136so6490955iof.10 for ; Fri, 19 Mar 2021 08:24:29 -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=yEgGy53zxqbYoAAHRBLHP4wOELYTResxqXghESvaYfE=; b=l6c+CghayM6ncc//tyYD/YdI6iFgGh6PlOn9KNkBjEgf26U4ya8uxCrs+mQ73Fhaqi 8YTi9whlGk4LPxDf/hGW0IV0eZSSMME8jophN4C3cvEi0k5xOYdVoOmtseuWPfGKG47/ NIsh8sSOtpGQ7r3iQc01d3RW+3LS8iNcNFn6V0JICoLfXMbQDgq/8El/4LM1L+t7jEre Tlt70YzEEsR6RonIROOWQov0EV8JJ8AGy3HaUiaxuQQObrAC2yV9DUYoYPGunrOIPaLn lFgpgrU/bSDfUBWzQxcgVyY9esyArX4jjEDt4Zv15h/KWmhaV1m831a8eh04xIzebkRS SGkA== 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=yEgGy53zxqbYoAAHRBLHP4wOELYTResxqXghESvaYfE=; b=M2hYxxlGjM0lEvXvwotlLcNG2+znjT6y992a+rzEECzTayql+Fhkm80stBLuNrZFoA hrxTn6LnrrWXbLjqSc8ynuCrclLwO8eoeSRCrw4MsSYOXCnn+B5OPqiWCJfO3Jg96P21 hFMEQ/0Shul6Pzk1r7p2rBc8Bdf1Ejgc0YfqRi1imXWYgjgkggvg99wOkDA5dKDBGxOZ uqhPtGxq6u5TK7385PO5NQS+ZHQ+RonpkjvEiOVe5ZlQT3tnoQbhqrh443/0qVnxbRsN 4lBppT9lQA33WL6MiF0QqsSpYLj9210n0Yy4W5PjFdqxIBCxgNa2peTlgnOLExaZUfWG 8PKw== X-Gm-Message-State: AOAM531+g3mg6kl0ZAQByaGp+TXAsyoEMZFO1V8wkgmbrZe4Oq8AOqZU pv1S/wwHTx4EUIWd4ubuxPe0Xw== X-Received: by 2002:a6b:500c:: with SMTP id e12mr3039005iob.190.1616167468648; Fri, 19 Mar 2021 08:24:28 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id b5sm2686887ioq.7.2021.03.19.08.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 08:24:28 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 4/5] net: ipa: define some new memory regions Date: Fri, 19 Mar 2021 10:24:21 -0500 Message-Id: <20210319152422.1803714-5-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319152422.1803714-1-elder@linaro.org> References: <20210319152422.1803714-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There are several memory regions that are defined starting with IPA v4.0, but which were not used for the SC7180 SoC (IPA v4.2). Even though they're not used (yet), define them so they are ready to be used for SoCs when they become supported. There are two QUOTA statistics memory regions, one for the modem and one for the AP. Define distinct names for these regions, and get rid of the definition of IPA_MEM_STATS_QUOTA. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-sc7180.c | 2 +- drivers/net/ipa/ipa_mem.h | 10 +++++++++- drivers/net/ipa/ipa_qmi.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c index 0bdb60f6755c4..f65abc19ae9d7 100644 --- a/drivers/net/ipa/ipa_data-sc7180.c +++ b/drivers/net/ipa/ipa_data-sc7180.c @@ -268,7 +268,7 @@ static const struct ipa_mem ipa_mem_local_data[] = { .size = 0x0050, .canary_count = 2, }, - [IPA_MEM_STATS_QUOTA] = { + [IPA_MEM_STATS_QUOTA_MODEM] = { .offset = 0x0a50, .size = 0x0060, .canary_count = 2, diff --git a/drivers/net/ipa/ipa_mem.h b/drivers/net/ipa/ipa_mem.h index f99180f84f0dd..f82e8939622bb 100644 --- a/drivers/net/ipa/ipa_mem.h +++ b/drivers/net/ipa/ipa_mem.h @@ -28,6 +28,7 @@ struct ipa_mem_data; * The set of memory regions is defined in configuration data. They are * subject to these constraints: * - a zero offset and zero size represents and undefined region + * - a region's size does not include space for its "canary" values * - a region's offset is defined to be *past* all "canary" values * - offset must be large enough to account for all canaries * - a region's size may be zero, but may still have canaries @@ -56,9 +57,16 @@ enum ipa_mem_id { IPA_MEM_AP_HEADER, /* 0 canaries */ IPA_MEM_MODEM_PROC_CTX, /* 2 canaries */ IPA_MEM_AP_PROC_CTX, /* 0 canaries */ + IPA_MEM_NAT_TABLE, /* 4 canaries (IPA v4.5 and above) */ IPA_MEM_PDN_CONFIG, /* 2 canaries (IPA v4.0 and above) */ - IPA_MEM_STATS_QUOTA, /* 2 canaries (IPA v4.0 and above) */ + IPA_MEM_STATS_QUOTA_MODEM, /* 2 canaries (IPA v4.0 and above) */ + IPA_MEM_STATS_QUOTA_AP, /* 0 canaries (IPA v4.0 and above) */ IPA_MEM_STATS_TETHERING, /* 0 canaries (IPA v4.0 and above) */ + IPA_MEM_STATS_V4_FILTER, /* 0 canaries (IPA v4.0-v4.2) */ + IPA_MEM_STATS_V6_FILTER, /* 0 canaries (IPA v4.0-v4.2) */ + IPA_MEM_STATS_V4_ROUTE, /* 0 canaries (IPA v4.0-v4.2) */ + IPA_MEM_STATS_V6_ROUTE, /* 0 canaries (IPA v4.0-v4.2) */ + IPA_MEM_STATS_FILTER_ROUTE, /* 0 canaries (IPA v4.5 and above) */ IPA_MEM_STATS_DROP, /* 0 canaries (IPA v4.0 and above) */ IPA_MEM_MODEM, /* 0 canaries */ IPA_MEM_UC_EVENT_RING, /* 1 canary */ diff --git a/drivers/net/ipa/ipa_qmi.c b/drivers/net/ipa/ipa_qmi.c index 2fc64483f2753..af8666b89b375 100644 --- a/drivers/net/ipa/ipa_qmi.c +++ b/drivers/net/ipa/ipa_qmi.c @@ -378,7 +378,7 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi) /* None of the stats fields are valid (IPA v4.0 and above) */ if (ipa->version != IPA_VERSION_3_5_1) { - mem = &ipa->mem[IPA_MEM_STATS_QUOTA]; + mem = &ipa->mem[IPA_MEM_STATS_QUOTA_MODEM]; if (mem->size) { req.hw_stats_quota_base_addr_valid = 1; req.hw_stats_quota_base_addr = From patchwork Fri Mar 19 15:24:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 404804 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1472106jai; Fri, 19 Mar 2021 08:25:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1F1kBAA2d5I9+GFXgbvXW6tyTYEVd3XscJ3Glx7wkSAluyN66c5HWiql6rRWLs1cZ3T5w X-Received: by 2002:a05:6402:6ca:: with SMTP id n10mr10277141edy.312.1616167532448; Fri, 19 Mar 2021 08:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616167532; cv=none; d=google.com; s=arc-20160816; b=iSyfyGq2bIdSm2Eeo3UyrvBAzC4FAquEqkSZb0VSw3rZmTI7QVg3YS7XkL0nqfjl7D snY6J2sdB9NCyWU9WW1iNDtWj8LAdEsCa5aQAX0XaRl0DZpW7guhQ1V/Iib+AhgojiAK z+bsZ8gNIbrx3NLJsOYrb2LSdA1JNvLWoQfkCghL4EorP9YEvqgxUnG/hh8N6JeAkqBl ozPKaaQ30eyc8EnOrCNa6Iam7l243ZkZjMWmmbptSWMox4C0kFmaT6YgxUS+rnfKeTI+ yhIIz+cJXbfeHZrlrV15uaHnlWixBwVIhMjoRiyb5rPmLe6fZa6j7KdNf6HLbQJoCQmr vgBg== 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=AkAIkwKnHKlHjriaSzDP0d59Qoo4Ts3Lr/GHkUvhrrE=; b=oXzczX+C6UnfQXjsMs6w7FT0c4KbqiabJIiSWaQHAasjTVd2hNZ0egyPD1Tni5ufMo O69RanLIJt5DwxRCAs69WviQ9LJnO8Q8Z6/kbK3AoIFRtNEgcFNoDIq0cHRS6JvPguT2 FCjY5q1ilbViQzRy9w2mp6erpgAzoOORBUsHTE/SriiehCuOC8JUw00X6/u2Xv4GJ1P7 uMh9NaILf4d5E1Yg8q9MFTHk+D4sh91LTMuhxI0TB7TM5ojjEMbDPgSEwrwfXKW3DCdc uG1kifEdDRP0xA8x0t4Ejc2SNYvAqb90JqbLWAx5eK6KQu3T4v4imxb8MUqy6Z5DpRUY ULzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GM0LzDP9; 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 p12si4267648edq.288.2021.03.19.08.25.32; Fri, 19 Mar 2021 08:25:32 -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=GM0LzDP9; 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 S230272AbhCSPZF (ORCPT + 8 others); Fri, 19 Mar 2021 11:25:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbhCSPYa (ORCPT ); Fri, 19 Mar 2021 11:24:30 -0400 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3A4BC06174A for ; Fri, 19 Mar 2021 08:24:29 -0700 (PDT) Received: by mail-io1-xd2d.google.com with SMTP id v26so6481239iox.11 for ; Fri, 19 Mar 2021 08:24:29 -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=AkAIkwKnHKlHjriaSzDP0d59Qoo4Ts3Lr/GHkUvhrrE=; b=GM0LzDP98p/0+cCI2Hy4w6dKNVA0yX++upe3JaTimCZF2EBhxNO7pRoRpuz+dvjxIw rcIO6L6ihpCA/ArOmTIQZP9edaAf1pKFvY1uXRjwRxtGsUnVC9LTH/tZ30a7xnl7sKe3 jmFxIojYi/KdxFUxRe9chnldEEwLTNVnycyVh0xLCf4d4lwq5Sk3eYjoBijzTDP7CmOA ZsDKU3hL8SWAbJzWCdAMKQXa9aHr2cEWKrWBunS8aKILxrVSThsJOdJEifAfvO8PlgZf vzpibmcfQ7PklzuiEGs4GrSAIHmx81dxrwLr9a16x5n+ckNw4iljVdUwuodxmjwNi5+9 I3ZA== 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=AkAIkwKnHKlHjriaSzDP0d59Qoo4Ts3Lr/GHkUvhrrE=; b=Gef2/HJ3fdhjHjqONpaiwa+arG1XJh5wrvnlwxehlcmbHsEuyd0phl8M4NYqW4BkJu ehosBB0/6gO/pcxE3TFUEj7BFWszj+I0ohLKAodEpWFW7yN0FAXYxoxsZUz7cjuSTOVY oa4Wh6w9ejTMRbpm42E8aNi8xFLELOVE72OTLxFl/uhYDiU4zHzlXcPEOHdlaJW5MaL6 7HyEEOu1ODLx6qbLBzOcNcIkq0BX+kmLCiWjK9/YQs7Bp9ZCSsp2kEjAvgt4YDMV0v6H JjtEdRGhJxjGgB9ToL8aejhUFpSQyoaMsJRP3mOu0CYehjs8zUxifu5rUbMVnflLyLAI yICQ== X-Gm-Message-State: AOAM533+RitDwl8F/Rmn9/KcUJr0wuogjm6E2s7AtBXMNL3RxMdx50NG C8M4waLY7vGAr7JUWB0gKcWjvg== X-Received: by 2002:a05:6602:2f0c:: with SMTP id q12mr3131098iow.82.1616167469400; Fri, 19 Mar 2021 08:24:29 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id b5sm2686887ioq.7.2021.03.19.08.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 08:24:29 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/5] net: ipa: define QSB limits in configuration data Date: Fri, 19 Mar 2021 10:24:22 -0500 Message-Id: <20210319152422.1803714-6-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319152422.1803714-1-elder@linaro.org> References: <20210319152422.1803714-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Define the maximum number of reads and writes to configure for the QSB masters used for IPA in configuration data. We don't use these values yet; the next commit takes care of that. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-sc7180.c | 10 ++++++++++ drivers/net/ipa/ipa_data-sdm845.c | 14 ++++++++++++++ drivers/net/ipa/ipa_data.h | 24 ++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 2 deletions(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c index f65abc19ae9d7..216f790b22b66 100644 --- a/drivers/net/ipa/ipa_data-sc7180.c +++ b/drivers/net/ipa/ipa_data-sc7180.c @@ -9,6 +9,14 @@ #include "ipa_endpoint.h" #include "ipa_mem.h" +/* QSB configuration for the SC7180 SoC. */ +static const struct ipa_qsb_data ipa_qsb_data[] = { + [IPA_QSB_MASTER_DDR] = { + .max_writes = 8, + .max_reads = 12, + }, +}; + /* Endpoint configuration for the SC7180 SoC. */ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { [IPA_ENDPOINT_AP_COMMAND_TX] = { @@ -328,6 +336,8 @@ static const struct ipa_clock_data ipa_clock_data = { /* Configuration data for the SC7180 SoC. */ const struct ipa_data ipa_data_sc7180 = { .version = IPA_VERSION_4_2, + .qsb_count = ARRAY_SIZE(ipa_qsb_data), + .qsb_data = ipa_qsb_data, .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), .endpoint_data = ipa_gsi_endpoint_data, .resource_data = &ipa_resource_data, diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c index 8cae9325eb08e..d9659fd22322a 100644 --- a/drivers/net/ipa/ipa_data-sdm845.c +++ b/drivers/net/ipa/ipa_data-sdm845.c @@ -11,6 +11,18 @@ #include "ipa_endpoint.h" #include "ipa_mem.h" +/* QSB configuration for the SDM845 SoC. */ +static const struct ipa_qsb_data ipa_qsb_data[] = { + [IPA_QSB_MASTER_DDR] = { + .max_writes = 8, + .max_reads = 8, + }, + [IPA_QSB_MASTER_PCIE] = { + .max_writes = 4, + .max_reads = 12, + }, +}; + /* Endpoint configuration for the SDM845 SoC. */ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { [IPA_ENDPOINT_AP_COMMAND_TX] = { @@ -353,6 +365,8 @@ static const struct ipa_clock_data ipa_clock_data = { /* Configuration data for the SDM845 SoC. */ const struct ipa_data ipa_data_sdm845 = { .version = IPA_VERSION_3_5_1, + .qsb_count = ARRAY_SIZE(ipa_qsb_data), + .qsb_data = ipa_qsb_data, .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), .endpoint_data = ipa_gsi_endpoint_data, .resource_data = &ipa_resource_data, diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h index b476fc373f7fe..d50cd5ae7714f 100644 --- a/drivers/net/ipa/ipa_data.h +++ b/drivers/net/ipa/ipa_data.h @@ -49,6 +49,22 @@ #define IPA_RESOURCE_GROUP_SRC_MAX 5 #define IPA_RESOURCE_GROUP_DST_MAX 5 +/** enum ipa_qsb_master_id - array index for IPA QSB configuration data */ +enum ipa_qsb_master_id { + IPA_QSB_MASTER_DDR, + IPA_QSB_MASTER_PCIE, +}; + +/** + * struct ipa_qsb_data - Qualcomm System Bus configuration data + * @max_writes: Maximum outstanding write requests for this master + * @max_reads: Maximum outstanding read requests for this master + */ +struct ipa_qsb_data { + u8 max_writes; + u8 max_reads; +}; + /** * struct gsi_channel_data - GSI channel configuration data * @tre_count: number of TREs in the channel ring @@ -285,14 +301,18 @@ struct ipa_clock_data { /** * struct ipa_data - combined IPA/GSI configuration data * @version: IPA hardware version - * @endpoint_count: number of entries in endpoint_data array + * @qsb_count: number of entries in the qsb_data array + * @qsb_data: Qualcomm System Bus configuration data + * @endpoint_count: number of entries in the endpoint_data array * @endpoint_data: IPA endpoint/GSI channel data * @resource_data: IPA resource configuration data - * @mem_count: number of entries in mem_data array + * @mem_count: number of entries in the mem_data array * @mem_data: IPA-local shared memory region data */ struct ipa_data { enum ipa_version version; + u32 qsb_count; /* # entries in qsb_data[] */ + const struct ipa_qsb_data *qsb_data; u32 endpoint_count; /* # entries in endpoint_data[] */ const struct ipa_gsi_endpoint_data *endpoint_data; const struct ipa_resource_data *resource_data;