From patchwork Thu Sep 25 16:48:58 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 1549 X-Patchwork-Delegate: jgarzik@pobox.com 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 3EFB8DE159 for ; Fri, 26 Sep 2008 02:56:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755051AbYIYQ4o (ORCPT ); Thu, 25 Sep 2008 12:56:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754955AbYIYQ4o (ORCPT ); Thu, 25 Sep 2008 12:56:44 -0400 Received: from suva.vyatta.com ([76.74.103.44]:33946 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753964AbYIYQ4n (ORCPT ); Thu, 25 Sep 2008 12:56:43 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id m8PGsuq9008080; Thu, 25 Sep 2008 09:54:56 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id m8PGstvc008079; Thu, 25 Sep 2008 09:54:55 -0700 Message-Id: <20080925165223.716650288@vyatta.com> References: <20080925164851.694359776@vyatta.com> User-Agent: quilt/0.46-1 Date: Thu, 25 Sep 2008 09:48:58 -0700 From: Stephen Hemminger To: Jeff Garzik , Jesse Barnes Cc: netdev@vger.kernel.org, linux-pci@vger.kernel.org, Ben Hutchings , Ivan Vecera Subject: [PATCH 7/9] skge: set VPD size Content-Disposition: inline; filename=skge-vpd-size.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Read configuration register during probe and use it to size the available VPD. Signed-off-by: Stephen Hemminger --- a/drivers/net/skge.c 2008-09-09 10:08:36.000000000 -0700 +++ b/drivers/net/skge.c 2008-09-09 11:19:31.000000000 -0700 @@ -3884,6 +3884,7 @@ static int __devinit skge_probe(struct p struct net_device *dev, *dev1; struct skge_hw *hw; int err, using_dac = 0; + u32 reg; err = pci_enable_device(pdev); if (err) { @@ -3912,15 +3913,17 @@ static int __devinit skge_probe(struct p goto err_out_free_regions; } + pci_read_config_dword(pdev, PCI_DEV_REG2, ®); + + /* set size of available VPD, only impacts sysfs */ + err = pci_vpd_truncate(pdev, 1ul << (((reg & PCI_VPD_ROM_SZ) >> 14) + 8)); + if (err) + dev_warn(&pdev->dev, "Can't set VPD size\n"); + #ifdef __BIG_ENDIAN /* byte swap descriptors in hardware */ - { - u32 reg; - - pci_read_config_dword(pdev, PCI_DEV_REG2, ®); - reg |= PCI_REV_DESC; - pci_write_config_dword(pdev, PCI_DEV_REG2, reg); - } + reg |= PCI_REV_DESC; + pci_write_config_dword(pdev, PCI_DEV_REG2, reg); #endif err = -ENOMEM;