From patchwork Tue Oct 21 16:35:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 401601 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 10810140077 for ; Wed, 22 Oct 2014 03:50:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932721AbaJUQuB (ORCPT ); Tue, 21 Oct 2014 12:50:01 -0400 Received: from mga11.intel.com ([192.55.52.93]:24314 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932304AbaJUQuA (ORCPT ); Tue, 21 Oct 2014 12:50:00 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 21 Oct 2014 09:41:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="403569682" Received: from smile.fi.intel.com (HELO smile) ([10.237.72.173]) by FMSMGA003.fm.intel.com with ESMTP; 21 Oct 2014 09:27:57 -0700 Received: from andy by smile with local (Exim 4.84) (envelope-from ) id 1XgcPG-0004Hk-2E; Tue, 21 Oct 2014 19:35:34 +0300 From: Andy Shevchenko To: Giuseppe Cavallaro , netdev@vger.kernel.org, Kweh Hock Leong , "David S. Miller" , Vince Bridgers Cc: Andy Shevchenko Subject: [PATCH 4/5] stmmac: pci: set default filter bins Date: Tue, 21 Oct 2014 19:35:32 +0300 Message-Id: <1413909333-16380-5-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1413909333-16380-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1413909333-16380-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The commit 3b57de958e2a bring a support for different amount of filter bins, but didn't update PCI driver accordingly. This patch append default values when device is enumerated via PCI bus. Fixes: 3b57de958e2a (net: stmmac: Support devicetree configs for mcast and ucast filter entries) Signed-off-by: Andy Shevchenko --- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index c16f74b..22cb5ff 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -67,6 +67,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev, int ret = 0; struct stmmac_priv *priv = NULL; int pci_bar = 0; + struct plat_stmmacenet_data *plat = &plat_dat; /* Enable pci device */ ret = pcim_enable_device(pdev); @@ -83,7 +84,13 @@ static int stmmac_pci_probe(struct pci_dev *pdev, stmmac_default_data(); - priv = stmmac_dvr_probe(&pdev->dev, &plat_dat, + /* Set default value for multicast hash bins */ + plat->multicast_filter_bins = HASH_TABLE_SIZE; + + /* Set default value for unicast filter entries */ + plat->unicast_filter_entries = 1; + + priv = stmmac_dvr_probe(&pdev->dev, plat, pcim_iomap_table(pdev)[pci_bar]); if (IS_ERR(priv)) { dev_err(&pdev->dev, "%s: main driver probe failed\n", __func__);