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

Commit dfc73e7a authored by Sebastian Ott's avatar Sebastian Ott Committed by Bjorn Helgaas
Browse files

PCI: Move Open Firmware devspec attribute to PCI common code 

Move the devspec OF attribute to PCI common code's set of device attributes
since it's not architecture dependent.  As a side effect microblaze and
powerpc no longer need to use pcibios_add_platform_entries().

[bhelgaas: fold in #include for compile error]
Link: https://lkml.kernel.org/r/alpine.LFD.2.11.1404141101500.1529@denkbrett


Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1e358f94

arch/microblaze/pci/pci-common.c

+0 −20
Original line number Diff line number Diff line
@@ -168,26 +168,6 @@ struct pci_controller *pci_find_hose_for_OF_device(struct device_node *node) 
	return NULL;

}



static ssize_t pci_show_devspec(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct pci_dev *pdev;

	struct device_node *np;



	pdev = to_pci_dev(dev);

	np = pci_device_to_OF_node(pdev);

	if (np == NULL || np->full_name == NULL)

		return 0;

	return sprintf(buf, "%s", np->full_name);

}

static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);



/* Add sysfs properties */

int pcibios_add_platform_entries(struct pci_dev *pdev)

{

	return device_create_file(&pdev->dev, &dev_attr_devspec);

}



void pcibios_set_master(struct pci_dev *dev)

{

	/* No special bus mastering setup handling */

arch/powerpc/kernel/pci-common.c

+0 −20
Original line number Diff line number Diff line
@@ -201,26 +201,6 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node) 
	return NULL;

}



static ssize_t pci_show_devspec(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct pci_dev *pdev;

	struct device_node *np;



	pdev = to_pci_dev (dev);

	np = pci_device_to_OF_node(pdev);

	if (np == NULL || np->full_name == NULL)

		return 0;

	return sprintf(buf, "%s", np->full_name);

}

static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);



/* Add sysfs properties */

int pcibios_add_platform_entries(struct pci_dev *pdev)

{

	return device_create_file(&pdev->dev, &dev_attr_devspec);

}



/*

 * Reads the interrupt pin to determine if interrupt is use by card.

 * If the interrupt is used, then gets the interrupt line from the

drivers/pci/pci-sysfs.c

+18 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/slab.h>

#include <linux/vgaarb.h>

#include <linux/pm_runtime.h>

#include <linux/of.h>

#include "pci.h"



static int sysfs_initialized;	/* = 0 */
@@ -416,6 +417,20 @@ static ssize_t d3cold_allowed_show(struct device *dev, 
static DEVICE_ATTR_RW(d3cold_allowed);

#endif



#ifdef CONFIG_OF

static ssize_t devspec_show(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct device_node *np = pci_device_to_OF_node(pdev);



	if (np == NULL || np->full_name == NULL)

		return 0;

	return sprintf(buf, "%s", np->full_name);

}

static DEVICE_ATTR_RO(devspec);

#endif



#ifdef CONFIG_PCI_IOV

static ssize_t sriov_totalvfs_show(struct device *dev,

				   struct device_attribute *attr,
@@ -520,6 +535,9 @@ static struct attribute *pci_dev_attrs[] = { 
	&dev_attr_msi_bus.attr,

#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)

	&dev_attr_d3cold_allowed.attr,

#endif

#ifdef CONFIG_OF

	&dev_attr_devspec.attr,

#endif

	NULL,

};