From nobody Tue Sep 16 10:43:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DB6DC4708E for ; Wed, 4 Jan 2023 18:10:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239978AbjADSKY (ORCPT ); Wed, 4 Jan 2023 13:10:24 -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-Google-Smtp-Source: AMrXdXvYXHTT4J8rdsO8OHxvmzKWVWoqYGkz56LHThn+EgM64BjPB9/dMBdn8kX0uEpgjcu+HeSLpw== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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@l= inaro.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/ip= a_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[] =3D { static const struct ipa_mem_data ipa_mem_data =3D { .local_count =3D ARRAY_SIZE(ipa_mem_local_data), .local =3D ipa_mem_local_data, - .imem_addr =3D 0x146a9000, + .imem_addr =3D 0x146a8000, .imem_size =3D 0x00002000, .smem_id =3D 497, .smem_size =3D 0x00009000, --=20 2.34.1