From patchwork Wed Jan 4 18:10:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 39056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5288501wrt; Wed, 4 Jan 2023 10:23:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXtLPs9OR1iJUtYv2KCtMsBgTzc3sB+d7fe807oskxGihhzHHeH/6Rqn4aSSqkpH5H7h1zJa X-Received: by 2002:a17:902:bd87:b0:189:9a71:10a5 with SMTP id q7-20020a170902bd8700b001899a7110a5mr60851888pls.5.1672856612906; Wed, 04 Jan 2023 10:23:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672856612; cv=none; d=google.com; s=arc-20160816; b=00w7Z2+Zc9eDD5HoOuOSMDfxNksIxG6PFg1kxdBeaBY75PjEK7U+UZuJY+iVfhS3HL bMuHJ1+Fp5ejp47d/1SG2sNVhwr87kGOjXq3jX1JMiouZRIPpOYqSn0kvP8R0+j8TSAZ Xm6s3ZD8YXphJFeOO4KNtyyGAap2DF2e4FrYsxbq710mHx5YLYAmqrTtQ+i3l9Lr8uFd dzfwCesbVPVmjh4v/Nm3TrHWMlJyHrzovhynsniJypYj4kyZNCQvw0W0gB9uhXFJ5u1z 5pt+l3BPTGAIWnlfhXdOtjxXFvNavE08ix02bqvrbUJ4O3fR2aGylDXib7HPK8JfTjS1 5oKw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=8FAYOoZlV85IsIHNRYn6JbF3crw7qgzdxYaheW3nilA=; b=XLQItS1hzYswPIQoBkxk0HI9aXpVcrAq4e+vz+1EskriAaHBKR2TLzpuOsm7SU+5Oz esk9mEO55SqxZu3OWCSsVras38GjzDgO24X3s/pNljpxSFXP76NedCt/ZJmpin5PNie2 v2qzXmezwN580QOdRHGJEia9BGhFtRzwmRpGm6I8JDE0htIjow1ogh6kCVvVAgloqaZu LwVCc9GhmxBpp6QfMdTdxLhGkj0VM4qzzPplf9H29V4yt0AOy2vNot0zI10CjY7tJPa7 pcVrxAy5fAc4NCO8U/sJ4rwp/7fTwNU9INc+Rdzes24MCVEtZrggvRp/0thwoYqZ82Ks IW9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=urwDLjqo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ij17-20020a170902ab5100b00192cb9c331asi8560618plb.65.2023.01.04.10.23.20; Wed, 04 Jan 2023 10:23:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=urwDLjqo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S239935AbjADSKX (ORCPT + 99 others); Wed, 4 Jan 2023 13:10:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239580AbjADSKW (ORCPT ); Wed, 4 Jan 2023 13:10:22 -0500 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E65E01C406 for ; Wed, 4 Jan 2023 10:10:20 -0800 (PST) Received: by mail-il1-x132.google.com with SMTP id a9so7524310ilk.6 for ; Wed, 04 Jan 2023 10:10:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8FAYOoZlV85IsIHNRYn6JbF3crw7qgzdxYaheW3nilA=; b=urwDLjqo6Ai8B7JnKOiLTbBm5ymoqcBrHSbzmF0Hr7Y99Y6jEcPwNJi9PQtbSow7BN Dx2jl/ooHqN4ybnadVwEyk4FM+lHQ0/xHLPmDoTuBbPCffv8a3aFx97uTg6mTzYrjo9c uyxGcR8Amk7RiXp3Kk9cAYxZsDK5QjUlFW2gJvAU3dmiNiH7u6wSs58kW+srX8MsMeK8 Xz4NdTr74rvmxjUBfKUvKItmzheRgjTyzhMYS2sHfwtF3bRiXFcmN0Rv+4nGgm/VBsQA 6dQ0AwFMiVGvQ0j0QGTWjpIH2d1yXMl+08sHQP+ljYyEEHI21XjMDfAraLi0ONA89hkB 5QMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8FAYOoZlV85IsIHNRYn6JbF3crw7qgzdxYaheW3nilA=; b=B+PlXJT0HmN3QBo94rV6PQP9p/YOIQVOgZ24rgthto2HtZBGXUJwx8SWSc6F6I/t9U 9ynfqaoPC7tNzyLlaPqr/ZHUIHsBJ0F/Yf+k+/NJ9aXkBJQ462D5p5HuQoW+RxOMOupm /z9PJbr0P5huYjS+lEQuIxkCwBFqmuvcommGNGKVOMLtWWOaPGA4cF0xFiP9HkTmIhTY tvE4asYoQrSjO9rjXJSFpbY0XDLjkR6Cy5PsPT3YqEYBGbUWV2uNoCVoqXesrGS4kPAB drA4kXmXfy7DtnEdJkeXVwFmgwep3bvGLOC1NvXfXEy3xYGxRuB9oIJtbf5zz5xN2geC NheQ== X-Gm-Message-State: AFqh2kq0RAEPaTb9VEyd7sziXAYSB4q9GQd8klV0t779WR/lz6cGLMaa qCT4VX4dcjvok2dhTUBs19Enxg== X-Received: by 2002:a05:6e02:96b:b0:30d:7aaf:894d with SMTP id q11-20020a056e02096b00b0030d7aaf894dmr635268ilt.22.1672855820283; Wed, 04 Jan 2023 10:10:20 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id e14-20020a02860e000000b003712c881d67sm11113553jai.164.2023.01.04.10.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 10:10:19 -0800 (PST) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: luca.weiss@fairphone.com, konrad.dybcio@linaro.org, caleb.connolly@linaro.org, mka@chromium.org, evgreen@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: ipa: correct IPA v4.7 IMEM offset Date: Wed, 4 Jan 2023 12:10:17 -0600 Message-Id: <20230104181017.2880916-1-elder@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754117295962041308?= X-GMAIL-MSGID: =?utf-8?q?1754117295962041308?= Commit b310de784bacd ("net: ipa: add IPA v4.7 support") was merged despite an unresolved comment made by Konrad Dybcio. Konrad observed that the IMEM region specified for IPA v4.7 did not match that used downstream for the SM7225 SoC. In "lagoon.dtsi" present in a Sony Xperia source tree, a ipa_smmu_ap node was defined with a "qcom,additional-mapping" property that defined the IPA IMEM area starting at offset 0x146a8000 (not 0x146a9000 that was committed). The IPA v4.7 target system used for testing uses the SM7225 SoC, so we'll adhere what the downstream code specifies is the address of the IMEM region used for IPA. Link: https://lore.kernel.org/linux-arm-msm/20221208211529.757669-1-elder@linaro.org Tested-by: Luca Weiss Signed-off-by: Alex Elder Reviewed-by: Konrad Dybcio --- Note: This fixes a commit that first landed in v6.2-rc1. drivers/net/ipa/data/ipa_data-v4.7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ipa/data/ipa_data-v4.7.c b/drivers/net/ipa/data/ipa_data-v4.7.c index 7552c400961eb..b83390c486158 100644 --- a/drivers/net/ipa/data/ipa_data-v4.7.c +++ b/drivers/net/ipa/data/ipa_data-v4.7.c @@ -357,7 +357,7 @@ static const struct ipa_mem ipa_mem_local_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 = 0x146a9000, + .imem_addr = 0x146a8000, .imem_size = 0x00002000, .smem_id = 497, .smem_size = 0x00009000,