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

Commit aee9684a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

  - add macros for PCIe Link Control 2 register (Frederick Lawler)

  - replace IB/hfi1 custom macros with PCI core versions (Frederick Lawler)

  - remove dead microblaze and xtensa code (Bjorn Helgaas)

  - use dev_printk() when possible in xtensa and mips (Bjorn Helgaas)

* pci/misc:
  MIPS: PCI: Use dev_printk() when possible
  xtensa/PCI: Use dev_printk() when possible
  xtensa/PCI: Make variables static
  xtensa/PCI: Remove dead code
  microblaze/PCI: Remove pcibios_claim_one_bus() dead code
  microblaze/PCI: Remove pcibios_finish_adding_to_bus() dead code
  IB/hfi1: Replace custom hfi1 macros with PCIe macros
  PCI: Add PCI_EXP_LNKCTL2_TLS* macros
parents f64c1464 77edfac4

arch/microblaze/include/asm/pci.h

+0 −4
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, 
 */

#define PCI_DMA_BUS_IS_PHYS     (1)



extern void pcibios_claim_one_bus(struct pci_bus *b);



extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);



extern void pcibios_resource_survey(void);



struct file;

arch/microblaze/pci/pci-common.c

+0 −61
Original line number Diff line number Diff line
@@ -915,67 +915,6 @@ void __init pcibios_resource_survey(void) 
	pci_assign_unassigned_resources();

}



/* This is used by the PCI hotplug driver to allocate resource

 * of newly plugged busses. We can try to consolidate with the

 * rest of the code later, for now, keep it as-is as our main

 * resource allocation function doesn't deal with sub-trees yet.

 */

void pcibios_claim_one_bus(struct pci_bus *bus)

{

	struct pci_dev *dev;

	struct pci_bus *child_bus;



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

		int i;



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

			struct resource *r = &dev->resource[i];



			if (r->parent || !r->start || !r->flags)

				continue;



			pr_debug("PCI: Claiming %s: ", pci_name(dev));

			pr_debug("Resource %d: %016llx..%016llx [%x]\n",

				 i, (unsigned long long)r->start,

				 (unsigned long long)r->end,

				 (unsigned int)r->flags);



			if (pci_claim_resource(dev, i) == 0)

				continue;



			pci_claim_bridge_resource(dev, i);

		}

	}



	list_for_each_entry(child_bus, &bus->children, node)

		pcibios_claim_one_bus(child_bus);

}

EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);





/* pcibios_finish_adding_to_bus

 *

 * This is to be called by the hotplug code after devices have been

 * added to a bus, this include calling it for a PHB that is just

 * being added

 */

void pcibios_finish_adding_to_bus(struct pci_bus *bus)

{

	pr_debug("PCI: Finishing adding to hotplug bus %04x:%02x\n",

		 pci_domain_nr(bus), bus->number);



	/* Allocate bus and devices resources */

	pcibios_allocate_bus_resources(bus);

	pcibios_claim_one_bus(bus);



	/* Add new devices to global lists.  Register in proc, sysfs. */

	pci_bus_add_devices(bus);



	/* Fixup EEH */

	/* eeh_add_device_tree_late(bus); */

}

EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);



static void pcibios_setup_phb_resources(struct pci_controller *hose,

					struct list_head *resources)

{

arch/mips/pci/pci-legacy.c

+3 −5
Original line number Diff line number Diff line
@@ -263,9 +263,8 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) 
				(!(r->flags & IORESOURCE_ROM_ENABLE)))

			continue;

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

			printk(KERN_ERR "PCI: Device %s not available "

			       "because of resource collisions\n",

			       pci_name(dev));

			pci_err(dev,

				"can't enable device: resource collisions\n");

			return -EINVAL;

		}

		if (r->flags & IORESOURCE_IO)
@@ -274,8 +273,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) 
			cmd |= PCI_COMMAND_MEMORY;

	}

	if (cmd != old_cmd) {

		printk("PCI: Enabling device %s (%04x -> %04x)\n",

		       pci_name(dev), old_cmd, cmd);

		pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

arch/xtensa/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


#define pcibios_assign_all_busses()	0



extern struct pci_controller* pcibios_alloc_controller(void);



/* Assume some values. (We should revise them, if necessary) */



#define PCIBIOS_MIN_IO		0x2000

arch/xtensa/kernel/pci.c

+4 −65
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
 * pci_bus_add_device

 */



struct pci_controller* pci_ctrl_head;

struct pci_controller** pci_ctrl_tail = &pci_ctrl_head;

static struct pci_controller *pci_ctrl_head;

static struct pci_controller **pci_ctrl_tail = &pci_ctrl_head;



static int pci_bus_count;
@@ -80,50 +80,6 @@ pcibios_align_resource(void *data, const struct resource *res, 
	return start;

}



int

pcibios_enable_resources(struct pci_dev *dev, int mask)

{

	u16 cmd, old_cmd;

	int idx;

	struct resource *r;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	old_cmd = cmd;

	for(idx=0; idx<6; idx++) {

		r = &dev->resource[idx];

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

			pr_err("PCI: Device %s not available because "

			       "of resource collisions\n", pci_name(dev));

			return -EINVAL;

		}

		if (r->flags & IORESOURCE_IO)

			cmd |= PCI_COMMAND_IO;

		if (r->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}

	if (dev->resource[PCI_ROM_RESOURCE].start)

		cmd |= PCI_COMMAND_MEMORY;

	if (cmd != old_cmd) {

		pr_info("PCI: Enabling device %s (%04x -> %04x)\n",

			pci_name(dev), old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

}



struct pci_controller * __init pcibios_alloc_controller(void)

{

	struct pci_controller *pci_ctrl;



	pci_ctrl = (struct pci_controller *)alloc_bootmem(sizeof(*pci_ctrl));

	memset(pci_ctrl, 0, sizeof(struct pci_controller));



	*pci_ctrl_tail = pci_ctrl;

	pci_ctrl_tail = &pci_ctrl->next;



	return pci_ctrl;

}



static void __init pci_controller_apertures(struct pci_controller *pci_ctrl,

					    struct list_head *resources)

{
@@ -223,8 +179,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	for (idx=0; idx<6; idx++) {

		r = &dev->resource[idx];

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

			pr_err("PCI: Device %s not available because "

			       "of resource collisions\n", pci_name(dev));

			pci_err(dev, "can't enable device: resource collisions\n");

			return -EINVAL;

		}

		if (r->flags & IORESOURCE_IO)
@@ -233,29 +188,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
			cmd |= PCI_COMMAND_MEMORY;

	}

	if (cmd != old_cmd) {

		pr_info("PCI: Enabling device %s (%04x -> %04x)\n",

			pci_name(dev), old_cmd, cmd);

		pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}



	return 0;

}



#ifdef CONFIG_PROC_FS



/*

 * Return the index of the PCI controller for device pdev.

 */



int

pci_controller_num(struct pci_dev *dev)

{

	struct pci_controller *pci_ctrl = (struct pci_controller*) dev->sysdata;

	return pci_ctrl->index;

}



#endif /* CONFIG_PROC_FS */



/*

 * Platform support for /proc/bus/pci/X/Y mmap()s.

 *  -- paulus.