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

Merge branch 'pci/ioport' 

- Make I/O resources depend on CONFIG_HAS_IOPORT so inw() and friends can
  be completely omitted on architectures without I/O port support (Niklas
  Schnelle)

* pci/ioport:
  PCI/sysfs: Make I/O resource depend on HAS_IOPORT
  PCI: Make quirk using inw() depend on HAS_IOPORT
parents 6ab23de2 5da1b588

drivers/pci/pci-sysfs.c

+4 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,7 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, 
			       struct bin_attribute *attr, char *buf,

			       loff_t off, size_t count, bool write)

{

#ifdef CONFIG_HAS_IOPORT

	struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));

	int bar = (unsigned long)attr->private;

	unsigned long port = off;
@@ -1116,6 +1117,9 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, 
		return 4;

	}

	return -EINVAL;

#else

	return -ENXIO;

#endif

}



static ssize_t pci_read_resource_io(struct file *filp, struct kobject *kobj,

drivers/pci/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_d 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC,	PCI_DEVICE_ID_NEC_CBUS_3,	quirk_isa_dma_hangs);

#endif



#ifdef CONFIG_HAS_IOPORT

/*

 * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear

 * for some HT machines to use C4 w/o hanging.
@@ -380,6 +381,7 @@ static void quirk_tigerpoint_bm_sts(struct pci_dev *dev) 
	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk_tigerpoint_bm_sts);

#endif



/* Chipsets where PCI->PCI transfers vanish or hang */

static void quirk_nopcipci(struct pci_dev *dev)