From patchwork Fri Mar 6 17:29:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 447369 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 EAD6514016B for ; Sat, 7 Mar 2015 04:29:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751838AbbCFR3Y (ORCPT ); Fri, 6 Mar 2015 12:29:24 -0500 Received: from mail-qc0-f180.google.com ([209.85.216.180]:39643 "EHLO mail-qc0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753715AbbCFR3W (ORCPT ); Fri, 6 Mar 2015 12:29:22 -0500 Received: by qcvs11 with SMTP id s11so18122887qcv.6 for ; Fri, 06 Mar 2015 09:29:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=md30ouCp6/J1zXzHVA09CVS/ME39ilfbTq88WajO0VY=; b=c496AfC04RfRBYYPcTLRBlGYzz3ErDtz8G0xzlMihZ7TtEmlY2zf6FQtgWNjvnXAiH RsiZ4QUqLkAGe4x4QqeBITXNMybooFS9KsOKUD8Ba/TU+aNMA4CnJW0ov/gmrbp1ycQG m7nSTt2h1utcd53f6W9Eu2ITw+H2/Wpz2p3vqjp3BcqN6ezFlwhZ4VSBFijAfjMrNAqG ctKgHRfeBdb7rsQbNQfXIe/YGE56NLU1PdSWpMpIp8Od0QpHaELfYdWmHlbiOd0Q+3yO XFRnZT44cEa0E2wUqyPUt27n3Up5X0M2JcrpykFroq/BKYFJ9iWQrl00HbgI9EHmLLnq idng== X-Gm-Message-State: ALoCoQmvi1TTySCxX38x+iFg5NTe7D1CcGBIlZpANPoiBA3eZ0hCOwOpHgad85xMiY7UyF1j0uMC X-Received: by 10.140.195.5 with SMTP id q5mr21306656qha.58.1425662962096; Fri, 06 Mar 2015 09:29:22 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by mx.google.com with ESMTPSA id a77sm4000312qkh.42.2015.03.06.09.29.19 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 06 Mar 2015 09:29:20 -0800 (PST) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Cc: Punnaiah Choudary Kalluri , Nicolas Ferre , netdev@vger.kernel.org Subject: [PATCH v2 1/2] net: macb: Include multi queue support for xilinx ZynqMP ethernet version Date: Fri, 6 Mar 2015 18:29:11 +0100 Message-Id: <299bfd8acf19df0b4407f98caf5130c1823cf8ad.1425662901.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Punnaiah Choudary Kalluri Include multi queue support for the ethernet IP version in xilinx ZynqMP SoC. Signed-off-by: Punnaiah Choudary Kalluri Signed-off-by: Michal Simek Acked-by: Nicolas Ferre --- Changes in v2: - Rebase on net-next - Add Nilocas ACK drivers/net/ethernet/cadence/macb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 1fe8b946243a..0436aefa49e4 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2211,7 +2211,7 @@ static void macb_probe_queues(void __iomem *mem, /* is it macb or gem ? */ mid = readl_relaxed(mem + MACB_MID); - if (MACB_BFEXT(IDNUM, mid) != 0x2) + if (MACB_BFEXT(IDNUM, mid) < 0x2) return; /* bit 0 is never set but queue 0 always exists */