From patchwork Wed Jul 5 05:37:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Kudielka X-Patchwork-Id: 115943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1657906vqx; Tue, 4 Jul 2023 23:09:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlF7g7KgkiDoSCYuWqArGE4qYquLi/GxCKJ7UlgJOOIGALxtenG024aWAhg9fl9jT/QLEkOm X-Received: by 2002:a1f:41d7:0:b0:471:cfa1:5065 with SMTP id o206-20020a1f41d7000000b00471cfa15065mr7769460vka.3.1688537366943; Tue, 04 Jul 2023 23:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688537366; cv=none; d=google.com; s=arc-20160816; b=e9aKM6ZKkV8X/G+mUsuWfNFV+/E9On6T/Yz5Xkqwk/m28SvpKlXEM0BnKqk6bDcpWo 0VEodEaUnjtgL5zL32wYL1JQcgHJhl94c7uw0t9LmgiiTpY5gxgLQSH7BY+SPETfPvv8 uSZLY+gN/mgpnZ5Pc66vVqGE18iIlo5ZhLaQenKPiJRNdRR7kAp/e1+nBX6AWnrwfxmx 5O4oWAQLjWHWJ+wFipjpoAJK/16AErH2VcmZ1OVHpqAlhlPfHdcA1hfB4eEaX3Vc2nKY I6jAgPpHAKxMG5YoTSkV5gDwTC+IuWgPVVTOLjPPF8VhT2J486IwILiKYO0noBtXsIpe 0m+g== 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=n+INOy7S615L241gEHhdJ0IOGxGXI6Ocw51fSeMvLPU=; fh=qrqE75gChjR/VYWVQbC5SBaXWVbrqggupHRAp2Y/53A=; b=Aa8vS6WZVBvIgsKG2TsMrVJQkxr8C+7qjx0frhIDWTMhW7qomIrT63GldVs+BQb/Ho iCYzRrwJmlkxhzpPWKmn2TsdQqZOF/71LzWfNyoDS95JhDHBkjUJ/sLXINcN7bWJMQxb iy+YJUaDnczqU1VM2FXJGaxDcFjSKM1MHU6LIweeRpOCEUmN6LYQfpOHxt/tVcDDnXUx GYcwt5OHSXE2lMVDlOB6wguHhYUlD36Vq4CammUdrazdKit/5rhGiq3wxRE0Tv+RDuwp qzfBLGgaTuSZHCykbKdE/SVUVjYrX6ArHqK0KjFV4Lcbt2cdskVhyglA7N1VynTfejoh 97Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Jok061kP; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt7-20020a17090af2c700b00263cdc45e8bsi969712pjb.87.2023.07.04.23.09.11; Tue, 04 Jul 2023 23:09:26 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=Jok061kP; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjGEFhl (ORCPT + 99 others); Wed, 5 Jul 2023 01:37:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjGEFhj (ORCPT ); Wed, 5 Jul 2023 01:37:39 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC9EF1B2; Tue, 4 Jul 2023 22:37:38 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fbc244d39dso84713255e9.3; Tue, 04 Jul 2023 22:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688535457; x=1691127457; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n+INOy7S615L241gEHhdJ0IOGxGXI6Ocw51fSeMvLPU=; b=Jok061kPq1gJXQlu8q+PGUHxn82e5V1QVedzSF4Pk0bS7UTBCxuQLpOs8W3OQv79EJ h2DB2DYMfMZxUAe5Uin16J+kQpp5GbH7lnk+QcLCjI+n7ATTsif8d4F0/ZxBgGFGhRrF mS3UIMpzNoUM+qnubdIPcqQoszosDQEPEe88bMmsyYuvE0s5FyZCUsePFi7Xmj8xO7yv cWbklR35TpyCZDEPUrvLawfkPQjPH9AX2+o4Ztrj1w0avyhyHwv7CzEK+zk/CkXQr5dC 1H1rOnp08MAH2jDVh30ROHsl2gJYz9TN4hjPg7SBDLtdb5XFU5BRsBlOor0OgxbdZ323 3Zcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688535457; x=1691127457; 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=n+INOy7S615L241gEHhdJ0IOGxGXI6Ocw51fSeMvLPU=; b=KBoCJnAJB+J9b/W20ucZQCFdMGutGv1IDuZGQYbIosGR8KIxmmOAN/LnOhlcEOYZhH yVE8VG9FiYMZPJj2jTm802vp2MA8eR+thjay50oDGZTl1oiyioAiem2NGkQ0oc4CaIk0 wYywJ1kWzga9k+ZS653BmEbHY/fqF3XoTG85ZtxIF83XpwO4NdkPLKAvneQGIWHAtlH5 CPn0zmfq9LC97/KcAGsK0vWAghrWMhPY7DgSJdXJmG1mhtt/TimHwYayUaBP9sJvFTzA nAUI57ZvKTnITK1BS3ck7qPAaVzW8Ib/r7h9LvrdzgoSMd4FedWAiNtHVIfa9bHJFn60 rCcw== X-Gm-Message-State: AC+VfDyyOkhabXCMT5aS8xY3NKHjfwLfFF29K6dMDV4yhX/gPQPvPH9x u5wb4NX6sSXM257xF4wcP0c= X-Received: by 2002:a05:600c:252:b0:3fb:b3aa:1c87 with SMTP id 18-20020a05600c025200b003fbb3aa1c87mr19891314wmj.40.1688535457128; Tue, 04 Jul 2023 22:37:37 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:5558:4a0a:1c87:3931]) by smtp.gmail.com with ESMTPSA id f15-20020a7bcd0f000000b003f9bd9e3226sm1049369wmj.7.2023.07.04.22.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 22:37:36 -0700 (PDT) From: Klaus Kudielka To: Thomas Petazzoni Cc: Klaus Kudielka , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Gregory CLEMENT , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net] net: mvneta: fix txq_map in case of txq_number==1 Date: Wed, 5 Jul 2023 07:37:12 +0200 Message-Id: <20230705053712.3914-1-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.40.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1770559758128903590?= X-GMAIL-MSGID: =?utf-8?q?1770559758128903590?= If we boot with mvneta.txq_number=1, the txq_map is set incorrectly: MVNETA_CPU_TXQ_ACCESS(1) refers to TX queue 1, but only TX queue 0 is initialized. Fix this. Fixes: 50bf8cb6fc9c ("net: mvneta: Configure XPS support") Signed-off-by: Klaus Kudielka Reviewed-by: Michal Kubiak --- drivers/net/ethernet/marvell/mvneta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 2cad76d0a50e..4401fad31fb9 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1505,7 +1505,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp) */ if (txq_number == 1) txq_map = (cpu == pp->rxq_def) ? - MVNETA_CPU_TXQ_ACCESS(1) : 0; + MVNETA_CPU_TXQ_ACCESS(0) : 0; } else { txq_map = MVNETA_CPU_TXQ_ACCESS_ALL_MASK; @@ -4295,7 +4295,7 @@ static void mvneta_percpu_elect(struct mvneta_port *pp) */ if (txq_number == 1) txq_map = (cpu == elected_cpu) ? - MVNETA_CPU_TXQ_ACCESS(1) : 0; + MVNETA_CPU_TXQ_ACCESS(0) : 0; else txq_map = mvreg_read(pp, MVNETA_CPU_MAP(cpu)) & MVNETA_CPU_TXQ_ACCESS_ALL_MASK;