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

Commit 96576a9e authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by Dave Airlie
Browse files

agp: intel-agp: do not use PCI resources before pci_enable_device() 



IRQ and resource[] may not have correct values until
after PCI hotplug setup occurs at pci_enable_device() time.

The semantic match that finds this problem is as follows:

// <smpl>
@@
identifier x;
identifier request ~= "pci_request.*|pci_resource.*";
@@

(
* x->irq
|
* x->resource
|
* request(x, ...)
)
 ...
*pci_enable_device(x)
// </smpl>

Signed-off-by: default avatarKulikov Vasiliy <segooon@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 46cfc58a

drivers/char/agp/intel-agp.c

+11 −11
Original line number Diff line number Diff line
@@ -908,29 +908,29 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
	dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);



	/*

	* The following fixes the case where the BIOS has "forgotten" to

	* provide an address range for the GART.

	* If the device has not been properly setup, the following will catch

	* the problem and should stop the system from crashing.

	* 20030610 - hamish@zot.org

	*/

	r = &pdev->resource[0];

	if (!r->start && r->end) {

		if (pci_assign_resource(pdev, 0)) {

			dev_err(&pdev->dev, "can't assign resource 0\n");

	if (pci_enable_device(pdev)) {

		dev_err(&pdev->dev, "can't enable PCI device\n");

		agp_put_bridge(bridge);

		return -ENODEV;

	}

	}



	/*

	* If the device has not been properly setup, the following will catch

	* the problem and should stop the system from crashing.

	* The following fixes the case where the BIOS has "forgotten" to

	* provide an address range for the GART.

	* 20030610 - hamish@zot.org

	*/

	if (pci_enable_device(pdev)) {

		dev_err(&pdev->dev, "can't enable PCI device\n");

	r = &pdev->resource[0];

	if (!r->start && r->end) {

		if (pci_assign_resource(pdev, 0)) {

			dev_err(&pdev->dev, "can't assign resource 0\n");

			agp_put_bridge(bridge);

			return -ENODEV;

		}

	}



	/* Fill in the mode register */

	if (cap_ptr) {