Commit 412ee7cd authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Add dummy pci_irqd_intx_xlate() for CONFIG_PCI=n build
  PCI: Add wrappers for dev_printk()
  PCI: Remove unnecessary messages for memory allocation failures
  PCI: Add #defines for Completion Timeout Disable feature
  hinic: Replace PCI pool old API
  net: e100: Replace PCI pool old API
  block: DAC960: Replace PCI pool old API
  MAINTAINERS: Include more PCI files
  PCI: Remove unneeded kallsyms include
  powerpc/pci: Unroll two pass loop when scanning bridges
  powerpc/pci: Use for_each_pci_bridge() helper
parents 85d24b3f 80db6f08

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -10552,8 +10552,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git 
S:	Supported

F:	Documentation/devicetree/bindings/pci/

F:	Documentation/PCI/

F:	drivers/acpi/pci*

F:	drivers/pci/

F:	include/asm-generic/pci*

F:	include/linux/pci*

F:	include/uapi/linux/pci*

F:	lib/pci*

F:	arch/x86/pci/

F:	arch/x86/kernel/quirks.c

arch/powerpc/kernel/pci-hotplug.c

+12 −8
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ EXPORT_SYMBOL_GPL(pci_hp_remove_devices); 
 */

void pci_hp_add_devices(struct pci_bus *bus)

{

	int slotno, mode, pass, max;

	int slotno, mode, max;

	struct pci_dev *dev;

	struct pci_controller *phb;

	struct device_node *dn = pci_bus_to_OF_node(bus);
@@ -133,13 +133,17 @@ void pci_hp_add_devices(struct pci_bus *bus) 
		pci_scan_slot(bus, PCI_DEVFN(slotno, 0));

		pcibios_setup_bus_devices(bus);

		max = bus->busn_res.start;

		for (pass = 0; pass < 2; pass++) {

			list_for_each_entry(dev, &bus->devices, bus_list) {

				if (pci_is_bridge(dev))

					max = pci_scan_bridge(bus, dev,

							      max, pass);

			}

		}

		/*

		 * Scan bridges that are already configured. We don't touch

		 * them unless they are misconfigured (which will be done in

		 * the second scan below).

		 */

		for_each_pci_bridge(dev, bus)

			max = pci_scan_bridge(bus, dev, max, 0);



		/* Scan bridges that need to be reconfigured */

		for_each_pci_bridge(dev, bus)

			max = pci_scan_bridge(bus, dev, max, 1);

	}

	pcibios_finish_adding_to_bus(bus);

}

arch/powerpc/kernel/pci_of_scan.c

+2 −5
Original line number Diff line number Diff line
@@ -369,12 +369,9 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus, 
	pcibios_setup_bus_devices(bus);



	/* Now scan child busses */

	list_for_each_entry(dev, &bus->devices, bus_list) {

		if (pci_is_bridge(dev)) {

	for_each_pci_bridge(dev, bus)

		of_scan_pci_bridge(dev);

}

	}

}



/**

 * of_scan_bus - given a PCI bus node, setup bus and scan for child devices

arch/powerpc/platforms/powernv/eeh-powernv.c

+3 −3
Original line number Diff line number Diff line
@@ -1654,14 +1654,14 @@ static int pnv_eeh_restore_vf_config(struct pci_dn *pdn) 
		eeh_ops->write_config(pdn, edev->pcie_cap + PCI_EXP_DEVCTL,

				      2, devctl);



		/* Disable Completion Timeout */

		/* Disable Completion Timeout if possible */

		eeh_ops->read_config(pdn, edev->pcie_cap + PCI_EXP_DEVCAP2,

				     4, &cap2);

		if (cap2 & 0x10) {

		if (cap2 & PCI_EXP_DEVCAP2_COMP_TMOUT_DIS) {

			eeh_ops->read_config(pdn,

					     edev->pcie_cap + PCI_EXP_DEVCTL2,

					     4, &cap2);

			cap2 |= 0x10;

			cap2 |= PCI_EXP_DEVCTL2_COMP_TMOUT_DIS;

			eeh_ops->write_config(pdn,

					      edev->pcie_cap + PCI_EXP_DEVCTL2,

					      4, cap2);

drivers/block/DAC960.c

+18 −20
Original line number Diff line number Diff line
@@ -268,17 +268,17 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) 
  void *AllocationPointer = NULL;

  void *ScatterGatherCPU = NULL;

  dma_addr_t ScatterGatherDMA;

  struct pci_pool *ScatterGatherPool;

  struct dma_pool *ScatterGatherPool;

  void *RequestSenseCPU = NULL;

  dma_addr_t RequestSenseDMA;

  struct pci_pool *RequestSensePool = NULL;

  struct dma_pool *RequestSensePool = NULL;



  if (Controller->FirmwareType == DAC960_V1_Controller)

    {

      CommandAllocationLength = offsetof(DAC960_Command_T, V1.EndMarker);

      CommandAllocationGroupSize = DAC960_V1_CommandAllocationGroupSize;

      ScatterGatherPool = pci_pool_create("DAC960_V1_ScatterGather",

		Controller->PCIDevice,

      ScatterGatherPool = dma_pool_create("DAC960_V1_ScatterGather",

		&Controller->PCIDevice->dev,

	DAC960_V1_ScatterGatherLimit * sizeof(DAC960_V1_ScatterGatherSegment_T),

	sizeof(DAC960_V1_ScatterGatherSegment_T), 0);

      if (ScatterGatherPool == NULL)
@@ -290,18 +290,18 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) 
    {

      CommandAllocationLength = offsetof(DAC960_Command_T, V2.EndMarker);

      CommandAllocationGroupSize = DAC960_V2_CommandAllocationGroupSize;

      ScatterGatherPool = pci_pool_create("DAC960_V2_ScatterGather",

		Controller->PCIDevice,

      ScatterGatherPool = dma_pool_create("DAC960_V2_ScatterGather",

		&Controller->PCIDevice->dev,

	DAC960_V2_ScatterGatherLimit * sizeof(DAC960_V2_ScatterGatherSegment_T),

	sizeof(DAC960_V2_ScatterGatherSegment_T), 0);

      if (ScatterGatherPool == NULL)

	    return DAC960_Failure(Controller,

			"AUXILIARY STRUCTURE CREATION (SG)");

      RequestSensePool = pci_pool_create("DAC960_V2_RequestSense",

		Controller->PCIDevice, sizeof(DAC960_SCSI_RequestSense_T),

      RequestSensePool = dma_pool_create("DAC960_V2_RequestSense",

		&Controller->PCIDevice->dev, sizeof(DAC960_SCSI_RequestSense_T),

		sizeof(int), 0);

      if (RequestSensePool == NULL) {

	    pci_pool_destroy(ScatterGatherPool);

	    dma_pool_destroy(ScatterGatherPool);

	    return DAC960_Failure(Controller,

			"AUXILIARY STRUCTURE CREATION (SG)");

      }
@@ -335,16 +335,16 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) 
      Command->Next = Controller->FreeCommands;

      Controller->FreeCommands = Command;

      Controller->Commands[CommandIdentifier-1] = Command;

      ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC,

      ScatterGatherCPU = dma_pool_alloc(ScatterGatherPool, GFP_ATOMIC,

							&ScatterGatherDMA);

      if (ScatterGatherCPU == NULL)

	  return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION");



      if (RequestSensePool != NULL) {

  	  RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC,

	  RequestSenseCPU = dma_pool_alloc(RequestSensePool, GFP_ATOMIC,

						&RequestSenseDMA);

  	  if (RequestSenseCPU == NULL) {

                pci_pool_free(ScatterGatherPool, ScatterGatherCPU,

                dma_pool_free(ScatterGatherPool, ScatterGatherCPU,

                                ScatterGatherDMA);

    		return DAC960_Failure(Controller,

					"AUXILIARY STRUCTURE CREATION");
@@ -379,8 +379,8 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) 
static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller)

{

  int i;

  struct pci_pool *ScatterGatherPool = Controller->ScatterGatherPool;

  struct pci_pool *RequestSensePool = NULL;

  struct dma_pool *ScatterGatherPool = Controller->ScatterGatherPool;

  struct dma_pool *RequestSensePool = NULL;

  void *ScatterGatherCPU;

  dma_addr_t ScatterGatherDMA;

  void *RequestSenseCPU;
@@ -411,9 +411,9 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) 
	  RequestSenseDMA = Command->V2.RequestSenseDMA;

      }

      if (ScatterGatherCPU != NULL)

          pci_pool_free(ScatterGatherPool, ScatterGatherCPU, ScatterGatherDMA);

          dma_pool_free(ScatterGatherPool, ScatterGatherCPU, ScatterGatherDMA);

      if (RequestSenseCPU != NULL)

          pci_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA);

          dma_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA);



      if ((Command->CommandIdentifier

	   % Controller->CommandAllocationGroupSize) == 1) {
@@ -437,13 +437,11 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) 
      Controller->CurrentStatusBuffer = NULL;

    }



  if (ScatterGatherPool != NULL)

  	pci_pool_destroy(ScatterGatherPool);

  dma_pool_destroy(ScatterGatherPool);

  if (Controller->FirmwareType == DAC960_V1_Controller)

  	return;



  if (RequestSensePool != NULL)

	pci_pool_destroy(RequestSensePool);

  dma_pool_destroy(RequestSensePool);



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

	kfree(Controller->V2.LogicalDeviceInformation[i]);