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

Commit 30723cbf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/resource' into next 

* pci/resource: (26 commits)
  Revert "[PATCH] Insert GART region into resource map"
  PCI: Log IDE resource quirk in dmesg
  PCI: Change pci_bus_alloc_resource() type_mask to unsigned long
  PCI: Check all IORESOURCE_TYPE_BITS in pci_bus_alloc_from_region()
  resources: Set type in __request_region()
  PCI: Don't check resource_size() in pci_bus_alloc_resource()
  s390/PCI: Use generic pci_enable_resources()
  tile PCI RC: Use default pcibios_enable_device()
  sparc/PCI: Use default pcibios_enable_device() (Leon only)
  sh/PCI: Use default pcibios_enable_device()
  microblaze/PCI: Use default pcibios_enable_device()
  alpha/PCI: Use default pcibios_enable_device()
  PCI: Add "weak" generic pcibios_enable_device() implementation
  PCI: Don't enable decoding if BAR hasn't been assigned an address
  PCI: Mark 64-bit resource as IORESOURCE_UNSET if we only support 32-bit
  PCI: Don't try to claim IORESOURCE_UNSET resources
  PCI: Check IORESOURCE_UNSET before updating BAR
  PCI: Don't clear IORESOURCE_UNSET when updating BAR
  PCI: Mark resources as IORESOURCE_UNSET if we can't assign them
  PCI: Remove pci_find_parent_resource() use for allocation
  ...
parents 91b4adc9 f2e6027b

arch/alpha/kernel/pci.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -254,12 +254,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
	}

	}

}

}





int

pcibios_enable_device(struct pci_dev *dev, int mask)

{

	return pci_enable_resources(dev, mask);

}



/*

/*

 *  If we set up a device for bus mastering, we need to check the latency

 *  If we set up a device for bus mastering, we need to check the latency

 *  timer as certain firmware forgets to set it properly, as seen

 *  timer as certain firmware forgets to set it properly, as seen

arch/microblaze/pci/pci-common.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -1294,11 +1294,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus) 
}

}

EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);

EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);





int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	return pci_enable_resources(dev, mask);

}



static void pcibios_setup_phb_resources(struct pci_controller *hose,

static void pcibios_setup_phb_resources(struct pci_controller *hose,

					struct list_head *resources)

					struct list_head *resources)

{

{

arch/s390/pci/pci.c

+1 −15
Original line number Original line Diff line number Diff line
@@ -686,27 +686,13 @@ int pcibios_add_device(struct pci_dev *pdev) 
int pcibios_enable_device(struct pci_dev *pdev, int mask)

int pcibios_enable_device(struct pci_dev *pdev, int mask)

{

{

	struct zpci_dev *zdev = get_zdev(pdev);

	struct zpci_dev *zdev = get_zdev(pdev);

	struct resource *res;

	u16 cmd;

	int i;





	zdev->pdev = pdev;

	zdev->pdev = pdev;

	zpci_debug_init_device(zdev);

	zpci_debug_init_device(zdev);

	zpci_fmb_enable_device(zdev);

	zpci_fmb_enable_device(zdev);

	zpci_map_resources(zdev);

	zpci_map_resources(zdev);





	pci_read_config_word(pdev, PCI_COMMAND, &cmd);

	return pci_enable_resources(pdev, mask);

	for (i = 0; i < PCI_BAR_COUNT; i++) {

		res = &pdev->resource[i];



		if (res->flags & IORESOURCE_IO)

			return -EINVAL;



		if (res->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}

	pci_write_config_word(pdev, PCI_COMMAND, cmd);

	return 0;

}

}





void pcibios_disable_device(struct pci_dev *pdev)

void pcibios_disable_device(struct pci_dev *pdev)

arch/sh/drivers/pci/pci.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -186,11 +186,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, 
	return start;

	return start;

}

}





int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	return pci_enable_resources(dev, mask);

}



static void __init

static void __init

pcibios_bus_report_status_early(struct pci_channel *hose,

pcibios_bus_report_status_early(struct pci_channel *hose,

				int top_bus, int current_bus,

				int top_bus, int current_bus,

arch/sparc/kernel/leon_pci.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -99,11 +99,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, 
	return res->start;

	return res->start;

}

}





int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	return pci_enable_resources(dev, mask);

}



/* in/out routines taken from pcic.c

/* in/out routines taken from pcic.c

 *

 *

 * This probably belongs here rather than ioport.c because

 * This probably belongs here rather than ioport.c because