From patchwork Fri Mar 27 15:34:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 455468 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 40D531400B6 for ; Sat, 28 Mar 2015 02:35:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932112AbbC0Pet (ORCPT ); Fri, 27 Mar 2015 11:34:49 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:17345 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752912AbbC0Pes (ORCPT ); Fri, 27 Mar 2015 11:34:48 -0400 Received: from tenerife.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.2.347.0; Fri, 27 Mar 2015 16:34:39 +0100 From: Nicolas Ferre To: , CC: , , Boris BREZILLON , Cyrille Pitchen , , , , Nicolas Ferre Subject: [PATCH 2/4] net/macb: add comment in macb_probe_queues Date: Fri, 27 Mar 2015 16:34:10 +0100 Message-ID: <7ea2f13b538a039c66323f798720ead7507e8cb2.1427469791.git.nicolas.ferre@atmel.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As we access the MID register directly, we need to tell why we don't use the macb_is_gem() dedicated function. Signed-off-by: Nicolas Ferre --- drivers/net/ethernet/cadence/macb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index b710768172d9..bc3eab95022f 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2161,9 +2161,13 @@ static void macb_probe_queues(void __iomem *mem, *queue_mask = 0x1; *num_queues = 1; - /* is it macb or gem ? */ + /* is it macb or gem ? + * + * We need to read directly from the hardware here because + * we are early in the probe process and don't have the + * MACB_CAPS_MACB_IS_GEM flag positioned + */ mid = readl_relaxed(mem + MACB_MID); - if (MACB_BFEXT(IDNUM, mid) < 0x2) return;