Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3834507d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

sky2: set VPD size 



Read configuration register during probe and use it to size the
available VPD. Move existing code using same register slightly
earlier in probe handling.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4c2abe2

drivers/net/sky2.c

+29 −12
Original line number Diff line number Diff line
@@ -4356,6 +4356,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, 
	struct net_device *dev;

	struct sky2_hw *hw;

	int err, using_dac = 0, wol_default;

	u32 reg;

	char buf1[16];



	err = pci_enable_device(pdev);
@@ -4389,6 +4390,34 @@ static int __devinit sky2_probe(struct pci_dev *pdev, 
		}

	}



	/* Get configuration information

	 * Note: only regular PCI config access once to test for HW issues

	 *       other PCI access through shared memory for speed and to

	 *	 avoid MMCONFIG problems.

	 */

	err = pci_read_config_dword(pdev, PCI_DEV_REG2, &reg);

	if (err) {

		dev_err(&pdev->dev, "PCI read config failed\n");

		goto err_out_free_regions;

	}



	/* size of available VPD, only impact 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

	/* The sk98lin vendor driver uses hardware byte swapping but

	 * this driver uses software swapping.

	 */

	reg &= ~PCI_REV_DESC;

	err = pci_write_config_dword(pdev,PCI_DEV_REG2, reg);

	if (err) {

		dev_err(&pdev->dev, "PCI write config failed\n");

		goto err_out_free_regions;

	}

#endif



	wol_default = device_may_wakeup(&pdev->dev) ? WAKE_MAGIC : 0;



	err = -ENOMEM;
@@ -4406,18 +4435,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev, 
		goto err_out_free_hw;

	}



#ifdef __BIG_ENDIAN

	/* The sk98lin vendor driver uses hardware byte swapping but

	 * this driver uses software swapping.

	 */

	{

		u32 reg;

		reg = sky2_pci_read32(hw, PCI_DEV_REG2);

		reg &= ~PCI_REV_DESC;

		sky2_pci_write32(hw, PCI_DEV_REG2, reg);

	}

#endif



	/* ring for status responses */

	hw->st_le = pci_alloc_consistent(pdev, STATUS_LE_BYTES, &hw->st_dma);

	if (!hw->st_le)