Commit 10ff5bbf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Constify struct bin_attribute for sysfs, VPD, P2PDMA, and the IBM ACPI
  hotplug driver (Thomas Weißschuh)

- Update PCI_EXP_LNKCAP_SLS comment (Lukas Wunner)

- Drop superfluous pm_wakeup.h include (Wolfram Sang)

- Remove redundant PCI_VSEC_HDR and PCI_VSEC_HDR_LEN_SHIFT (Dongdong Zhang)

- Correct documentation of the 'config_acs=' kernel parameter (Akihiko
  Odaki)

* pci/misc:
  Documentation: Fix pci=config_acs= example
  PCI: Remove redundant PCI_VSEC_HDR and PCI_VSEC_HDR_LEN_SHIFT
  PCI: Don't include 'pm_wakeup.h' directly
  PCI: Update code comment on PCI_EXP_LNKCAP_SLS for PCIe r3.0
  PCI/ACPI: Constify 'struct bin_attribute'
  PCI/P2PDMA: Constify 'struct bin_attribute'
  PCI/VPD: Constify 'struct bin_attribute'
  PCI/sysfs: Constify 'struct bin_attribute'
parents 4d3bf4e8 b388face

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -4673,7 +4673,7 @@ 
				  '1' – force enabled

				  'x' – unchanged

				For example,

				  pci=config_acs=10x

				  pci=config_acs=10x@pci:0:0

				would configure all devices that support

				ACS to enable P2P Request Redirect, disable

				Translation Blocking, and leave Source

drivers/pci/hotplug/acpiphp_ibm.c

+3 −3
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status); 
static void ibm_handle_events(acpi_handle handle, u32 event, void *context);

static int ibm_get_table_from_acpi(char **bufp);

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

				   struct bin_attribute *bin_attr,

				   const struct bin_attribute *bin_attr,

				   char *buffer, loff_t pos, size_t size);

static acpi_status __init ibm_find_acpi_device(acpi_handle handle,

		u32 lvl, void *context, void **rv);
@@ -98,7 +98,7 @@ static struct bin_attribute ibm_apci_table_attr __ro_after_init = { 
		    .name = "apci_table",

		    .mode = S_IRUGO,

	    },

	    .read = ibm_read_apci_table,

	    .read_new = ibm_read_apci_table,

	    .write = NULL,

};

static struct acpiphp_attention_info ibm_attention_info =
@@ -353,7 +353,7 @@ static int ibm_get_table_from_acpi(char **bufp) 
 * our solution is to only allow reading the table in all at once.

 */

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

				   struct bin_attribute *bin_attr,

				   const struct bin_attribute *bin_attr,

				   char *buffer, loff_t pos, size_t size)

{

	int bytes_read = -EINVAL;

drivers/pci/p2pdma.c

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj, 
	return ret;

}



static struct bin_attribute p2pmem_alloc_attr = {

static const struct bin_attribute p2pmem_alloc_attr = {

	.attr = { .name = "allocate", .mode = 0660 },

	.mmap = p2pmem_alloc_mmap,

	/*
@@ -180,14 +180,14 @@ static struct attribute *p2pmem_attrs[] = { 
	NULL,

};



static struct bin_attribute *p2pmem_bin_attrs[] = {

static const struct bin_attribute *const p2pmem_bin_attrs[] = {

	&p2pmem_alloc_attr,

	NULL,

};



static const struct attribute_group p2pmem_group = {

	.attrs = p2pmem_attrs,

	.bin_attrs = p2pmem_bin_attrs,

	.bin_attrs_new = p2pmem_bin_attrs,

	.name = "p2pmem",

};

drivers/pci/pci-sysfs.c

+21 −21
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static ssize_t boot_vga_show(struct device *dev, struct device_attribute *attr, 
static DEVICE_ATTR_RO(boot_vga);



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

			       struct bin_attribute *bin_attr, char *buf,

			       const struct bin_attribute *bin_attr, char *buf,

			       loff_t off, size_t count)

{

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));
@@ -770,7 +770,7 @@ static ssize_t pci_read_config(struct file *filp, struct kobject *kobj, 
}



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

				struct bin_attribute *bin_attr, char *buf,

				const struct bin_attribute *bin_attr, char *buf,

				loff_t off, size_t count)

{

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));
@@ -838,9 +838,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj, 


	return count;

}

static BIN_ATTR(config, 0644, pci_read_config, pci_write_config, 0);

static const BIN_ATTR(config, 0644, pci_read_config, pci_write_config, 0);



static struct bin_attribute *pci_dev_config_attrs[] = {

static const struct bin_attribute *const pci_dev_config_attrs[] = {

	&bin_attr_config,

	NULL,

};
@@ -857,7 +857,7 @@ static size_t pci_dev_config_attr_bin_size(struct kobject *kobj, 
}



static const struct attribute_group pci_dev_config_attr_group = {

	.bin_attrs = pci_dev_config_attrs,

	.bin_attrs_new = pci_dev_config_attrs,

	.bin_size = pci_dev_config_attr_bin_size,

};
@@ -888,8 +888,8 @@ pci_llseek_resource(struct file *filep, 
 * callback routine (pci_legacy_read).

 */

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

				  struct bin_attribute *bin_attr, char *buf,

				  loff_t off, size_t count)

				  const struct bin_attribute *bin_attr,

				  char *buf, loff_t off, size_t count)

{

	struct pci_bus *bus = to_pci_bus(kobj_to_dev(kobj));
@@ -913,8 +913,8 @@ static ssize_t pci_read_legacy_io(struct file *filp, struct kobject *kobj, 
 * callback routine (pci_legacy_write).

 */

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

				   struct bin_attribute *bin_attr, char *buf,

				   loff_t off, size_t count)

				   const struct bin_attribute *bin_attr,

				   char *buf, loff_t off, size_t count)

{

	struct pci_bus *bus = to_pci_bus(kobj_to_dev(kobj));
@@ -1004,8 +1004,8 @@ void pci_create_legacy_files(struct pci_bus *b) 
	b->legacy_io->attr.name = "legacy_io";

	b->legacy_io->size = 0xffff;

	b->legacy_io->attr.mode = 0600;

	b->legacy_io->read = pci_read_legacy_io;

	b->legacy_io->write = pci_write_legacy_io;

	b->legacy_io->read_new = pci_read_legacy_io;

	b->legacy_io->write_new = pci_write_legacy_io;

	/* See pci_create_attr() for motivation */

	b->legacy_io->llseek = pci_llseek_resource;

	b->legacy_io->mmap = pci_mmap_legacy_io;
@@ -1100,7 +1100,7 @@ static int pci_mmap_resource_wc(struct file *filp, struct kobject *kobj, 
}



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

			       struct bin_attribute *attr, char *buf,

			       const struct bin_attribute *attr, char *buf,

			       loff_t off, size_t count, bool write)

{

#ifdef CONFIG_HAS_IOPORT
@@ -1143,14 +1143,14 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, 
}



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

				    struct bin_attribute *attr, char *buf,

				    const struct bin_attribute *attr, char *buf,

				    loff_t off, size_t count)

{

	return pci_resource_io(filp, kobj, attr, buf, off, count, false);

}



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

				     struct bin_attribute *attr, char *buf,

				     const struct bin_attribute *attr, char *buf,

				     loff_t off, size_t count)

{

	int ret;
@@ -1211,8 +1211,8 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) 
	} else {

		sprintf(res_attr_name, "resource%d", num);

		if (pci_resource_flags(pdev, num) & IORESOURCE_IO) {

			res_attr->read = pci_read_resource_io;

			res_attr->write = pci_write_resource_io;

			res_attr->read_new = pci_read_resource_io;

			res_attr->write_new = pci_write_resource_io;

			if (arch_can_pci_mmap_io())

				res_attr->mmap = pci_mmap_resource_uc;

		} else {
@@ -1293,7 +1293,7 @@ void __weak pci_remove_resource_files(struct pci_dev *dev) { return; } 
 * writing anything except 0 enables it

 */

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

			     struct bin_attribute *bin_attr, char *buf,

			     const struct bin_attribute *bin_attr, char *buf,

			     loff_t off, size_t count)

{

	struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));
@@ -1319,7 +1319,7 @@ static ssize_t pci_write_rom(struct file *filp, struct kobject *kobj, 
 * device corresponding to @kobj.

 */

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

			    struct bin_attribute *bin_attr, char *buf,

			    const struct bin_attribute *bin_attr, char *buf,

			    loff_t off, size_t count)

{

	struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));
@@ -1345,9 +1345,9 @@ static ssize_t pci_read_rom(struct file *filp, struct kobject *kobj, 


	return count;

}

static BIN_ATTR(rom, 0600, pci_read_rom, pci_write_rom, 0);

static const BIN_ATTR(rom, 0600, pci_read_rom, pci_write_rom, 0);



static struct bin_attribute *pci_dev_rom_attrs[] = {

static const struct bin_attribute *const pci_dev_rom_attrs[] = {

	&bin_attr_rom,

	NULL,

};
@@ -1373,7 +1373,7 @@ static size_t pci_dev_rom_attr_bin_size(struct kobject *kobj, 
}



static const struct attribute_group pci_dev_rom_attr_group = {

	.bin_attrs = pci_dev_rom_attrs,

	.bin_attrs_new = pci_dev_rom_attrs,

	.is_bin_visible = pci_dev_rom_attr_is_visible,

	.bin_size = pci_dev_rom_attr_bin_size,

};

drivers/pci/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/string.h>

#include <linux/log2.h>

#include <linux/logic_pio.h>

#include <linux/pm_wakeup.h>

#include <linux/device.h>

#include <linux/pm_runtime.h>

#include <linux/pci_hotplug.h>