Message ID | 20230215195352.755744-5-elder@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp389221wrn; Wed, 15 Feb 2023 12:01:10 -0800 (PST) X-Google-Smtp-Source: AK7set8aGJzwx9uHGRw7eRaelB51PN9zn+sFsfG2c6/+o40nsEaYOMRqEQcbErNAoCPg/sa+WYf3 X-Received: by 2002:a17:906:d85:b0:8b1:4507:ef0 with SMTP id m5-20020a1709060d8500b008b145070ef0mr3810842eji.10.1676491270693; Wed, 15 Feb 2023 12:01:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676491270; cv=none; d=google.com; s=arc-20160816; b=iPM6BZ3ZS61Kkivj5r07XOwBwoIcpQn+h5WcuesLpUR7aJxj0oKJCyGIDLhVdhaGxB JxPWbZtfBhMsixyQxkP9zJ6FNVUWw0YXqj4dYO+DXI6kuwTgWA2HcpvCBbeq2+jy4HcY tjH8dsNqmfL7b/szwAI2gyFrmN5+LF6GUT6j6SYlgL4y08om0eeq5Dru9AQC5izWcb1F +yyhYv6ZpqyKBr/Zjt/xgzXLdn5XLy9/zMATZBIsg2xFqk++sUiP2QvpxiFurmQoKKZm TAnwTfpUsWTvNs4YgRcr8wD4hKrxtVAS0DAXupbfk2kB5FYRTVoA+b5oQ197YIIGnR1P x1KA== 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=D8WaJHG8pg5Qs9g9gKSYjrTuSZa/InnmtxH9TDUOPTk=; b=CmyQ5BD3FgBY3H34RdPZY5DAJpm9F0hiuXf28cXeo6yND0PBaKLu9lw2T8oqlRaQkV c5G6RaNgstsWmX+4LOWM5gh6D80Wz/CnEqP5slSiIn3XmFuR7PdUAqVcY1U81JifJ+mX Q0JtqI46PiiLICRSOlBhnXR/BuWfoc2FMwdYNfxdNQAVrsUI626TZ0CBSygIxjSL/Lmv BSmXQ950n6LH/EAVPCWAWx9NCVIOpQT49WVOWx9/hu2hHDsOAevLd+qcO0TQRvFqEeua mvL5XCgAI0HBu7a0XDmv9+FkJovGDUjMlWgUusko3+nNyxVxnd3hanP4Nduy55Iwj1wq UTDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y2yaCElX; 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 uo41-20020a170907cc2900b007309e8d567fsi18752217ejc.145.2023.02.15.12.00.47; Wed, 15 Feb 2023 12:01:10 -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=y2yaCElX; 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 S229853AbjBOTyV (ORCPT <rfc822;hadasmailinglist@gmail.com> + 99 others); Wed, 15 Feb 2023 14:54:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjBOTyM (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 15 Feb 2023 14:54:12 -0500 Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A58223E081 for <linux-kernel@vger.kernel.org>; Wed, 15 Feb 2023 11:54:01 -0800 (PST) Received: by mail-io1-xd31.google.com with SMTP id w3so111995iox.6 for <linux-kernel@vger.kernel.org>; Wed, 15 Feb 2023 11:54:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D8WaJHG8pg5Qs9g9gKSYjrTuSZa/InnmtxH9TDUOPTk=; b=y2yaCElX6ANentqtZ6BaCFm1nQBBaYcVK7z+bHjeq7P0qxn1E5MOkjP+BLwGo4y2Hv +x/XbhdlOguwIaTnsT98eR1sL6ueUU4ynEe4EtbJNx8+AUOgAWQE8+MT/gF/4LS/vzsB Z9StwzmM/41Bj7rbeD5LpQKxczXVlZBGYFtEzU6KFKwQ89BvLBgws9WXx4SHNL71EvQk TuWoPhOud1DtqyA09TLzc95VRPW4apMQsu6Sz2hoSB2kOuhyxk5yWprt4bMkCg1I+hIm KDcAsrrZzIbYi5D/esYRUK8wjKYb3fJJYhkBkia3S9Nb0EsiAMq9b2s+WwNFneY/2Szy G0sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D8WaJHG8pg5Qs9g9gKSYjrTuSZa/InnmtxH9TDUOPTk=; b=mp5ZjxwhM4OGiBl58s7VGTeM+FroO0bwuaCgbggI6ieyONYJPgxgC94hdq5Q6wL5FV A7wTB2uiPSpQrlw2xft4dpG9hmM/i2RNwIPLYxU5u6MPkb7fe/qFRH6rmzfi1rnhMjYO T/h+pGvQ2TwFJ3AO/eu0iVueeSItdXPM1yiL/hm2i6nPrYby5sJin498z7jd0QRUEthU pKGy7BwRlD4tgcGlm5V/OwvgPQnBf4MrI0UHg4oJPGnbx4/R8qyxAfGLQ55ATdMqvLAn QGbXVVYEdRWeQ2WAlFyVtCqMPKblDqi0XiYg4L5jZnk57GqRG/fs59xbwgV0jD/gnJK+ xocg== X-Gm-Message-State: AO0yUKVrMABPkNuoChCO9rbzWJExcvgDEQ0S3chkLS6cuPFXOTF8yWXv Wy1Ioas6zqABT/bjE1D092jcVg== X-Received: by 2002:a6b:e31a:0:b0:741:8544:7cb1 with SMTP id u26-20020a6be31a000000b0074185447cb1mr1691015ioc.14.1676490841066; Wed, 15 Feb 2023 11:54:01 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id n10-20020a5ed90a000000b0073a312aaae5sm6291847iop.36.2023.02.15.11.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 11:54:00 -0800 (PST) From: Alex Elder <elder@linaro.org> To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: 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 4/6] net: ipa: avoid setting an undefined field Date: Wed, 15 Feb 2023 13:53:50 -0600 Message-Id: <20230215195352.755744-5-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230215195352.755744-1-elder@linaro.org> References: <20230215195352.755744-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=unavailable 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757928510883241677?= X-GMAIL-MSGID: =?utf-8?q?1757928510883241677?= |
Series |
net: final GSI register updates
|
|
Commit Message
Alex Elder
Feb. 15, 2023, 7:53 p.m. UTC
The GSI channel protocol field in the CH_C_CNTXT_0 GSI register is
widened starting IPA v5.0, making the CHTYPE_PROTOCOL_MSB field
added in IPA v4.5 unnecessary. Update the code to reflect this.
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/net/ipa/gsi.c | 2 +-
drivers/net/ipa/gsi_reg.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c index 0e6f679f71a8c..88279956194a9 100644 --- a/drivers/net/ipa/gsi.c +++ b/drivers/net/ipa/gsi.c @@ -185,7 +185,7 @@ static u32 ch_c_cntxt_0_type_encode(enum ipa_version version, u32 val; val = reg_encode(reg, CHTYPE_PROTOCOL, type); - if (version < IPA_VERSION_4_5) + if (version < IPA_VERSION_4_5 || version >= IPA_VERSION_5_0) return val; type >>= hweight32(reg_fmask(reg, CHTYPE_PROTOCOL)); diff --git a/drivers/net/ipa/gsi_reg.h b/drivers/net/ipa/gsi_reg.h index a0b7ff0dcdfda..52520cd44c3e1 100644 --- a/drivers/net/ipa/gsi_reg.h +++ b/drivers/net/ipa/gsi_reg.h @@ -101,7 +101,7 @@ enum gsi_reg_ch_c_cntxt_0_field_id { CHTYPE_DIR, CH_EE, CHID, - CHTYPE_PROTOCOL_MSB, /* IPA v4.9+ */ + CHTYPE_PROTOCOL_MSB, /* IPA v4.5-4.11 */ ERINDEX, CHSTATE, ELEMENT_SIZE,