From patchwork Tue Mar 28 13:57:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 744287 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vssv43z4Sz9s7M for ; Wed, 29 Mar 2017 00:58:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kJIu1Xgm"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755739AbdC1N6L (ORCPT ); Tue, 28 Mar 2017 09:58:11 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35921 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755667AbdC1N6I (ORCPT ); Tue, 28 Mar 2017 09:58:08 -0400 Received: by mail-lf0-f67.google.com with SMTP id n78so10593273lfi.3 for ; Tue, 28 Mar 2017 06:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hloSCL5pqkvbwDYhYfwYUJ9donlCgV8XENzr2ApIdpk=; b=kJIu1Xgmo6BJR82CwPRlI8qX0mXOqZBalyByk/CAoOZtOOEdt1VzV5FttN0RX+FmY9 /2ZeUtFyQzpvN7wK+KM4CzXmY+gLByEn0zvhbp12IZvPHfCn/aHYaXWgC6eCE/4fjaQp tsGZKE9wXKPmgj7/CWXOldYcojH2o1O1PFW3ASdKzfggXjT4/bxckJTiu3lrtCM/wrPJ /zShbgFZSRFaUHw/KIKWj+6riKyYL/NCbN1BqfxwufXYstFHkHM6IgXJJzxOvytSq55Q JOEfZ8lTy+gyX6fBcxeKapZGfYSWgWrXkIGDjT6hOj7uhraw76VopSavuzdHClN1xKYd tYJw== 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; bh=hloSCL5pqkvbwDYhYfwYUJ9donlCgV8XENzr2ApIdpk=; b=lmM6jrl2t1eKWqWtfGZAf04EHGmwqISGtWVlRHhb+6O0ezVAnXw74Er9ACQ/mKm5Ls 1mjJ9s3wTnoPryBM171A4/Jyg2+sB8GmIHtXMsdcwszsQdhEJmd/kfBvV782sna9pwDQ THX0kuq/Un+b5yHV8toQMMWyoy/KgiFE3968rpX9tZ1SJbVKFi58PWffDTQ5flVpexOh 2rJ1OpY/xnnlHL5WG5SBz72mZbx3ZIQX7vehK6eJdCZ4dYc5mnMfNzbIXE7ShsauWytw lFxbH10XXSYfDXFzSI2r2wlRbytQza7EZ6PxDpggu8n2PFF2EaGP/YbQtX5jmxXDUFoE 4ZUQ== X-Gm-Message-State: AFeK/H2HGjTvB04mcvF8J1m4/nIhfGL3jL9/AUfa58SfkHk9lJ+Qq+v2CEIJ/A7VXVMgMw== X-Received: by 10.28.105.92 with SMTP id e89mr13679703wmc.93.1490709428760; Tue, 28 Mar 2017 06:57:08 -0700 (PDT) Received: from localhost (port-17979.pppoe.wtnet.de. [46.59.131.215]) by smtp.gmail.com with ESMTPSA id w12sm5001171wra.21.2017.03.28.06.57.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Mar 2017 06:57:08 -0700 (PDT) From: Thierry Reding To: Niklas Cassel Cc: Joao Pinto , David Miller , clabbe.montjoie@gmail.com, peppe.cavallaro@st.com, alexandre.torgue@st.com, sergei.shtylyov@cogentembedded.com, f.fainelli@gmail.com, netdev@vger.kernel.org Subject: [PATCH 2/3] net: stmmac: Always use the number of configured TX queues Date: Tue, 28 Mar 2017 15:57:05 +0200 Message-Id: <20170328135706.7605-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170328135706.7605-1-thierry.reding@gmail.com> References: <71d841cd-b07b-2635-c2cf-f7af5f5ed2c9@axis.com> <20170328135706.7605-1-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thierry Reding Even if hardware supports multiple queues, software can choose to only use a subset of them. Make sure we never try to access uninitialized queues. Signed-off-by: Thierry Reding --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 106ace3781b3..ec5bba85c529 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3423,7 +3423,7 @@ static int stmmac_poll(struct napi_struct *napi, int budget) struct stmmac_rx_queue *rx_q = container_of(napi, struct stmmac_rx_queue, napi); struct stmmac_priv *priv = rx_q->priv_data; - u32 tx_count = priv->dma_cap.number_tx_queues; + u32 tx_count = priv->plat->tx_queues_to_use; u32 chan = rx_q->queue_index; u32 work_done = 0; u32 queue = 0;