Hi Eric,
On Tue, Apr 28, 2015 at 8:07 AM, Eric Snowberg <eric.snowberg@xxxxxxxxxx> wrote:
> Add PCI slot numbers within sysfs for sun4v hardware. Larger
> sun4v systems contain nested PCI bridges and slots further
> down on these bridges were not being populated within sysfs.
> Also add AHCI style PCI slot numbers within sysfs for sun4v
You mean ACPI, right?
> hardware since the OF 'slot-names' information is not available
> on all sun4v platforms.
That doesn't seem to match the actual code, which appears to skip to
the next device if it can't find the "physical-slot#" OF property: I
don't see how the code can fall back to any other method of
determining the slot number.
> Signed-off-by: Eric Snowberg <eric.snowberg@xxxxxxxxxx>
> ---
> arch/sparc/kernel/pci.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 files changed, 37 insertions(+), 0 deletions(-)
>
> diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
> index 6f7251f..3a5c402 100644
> --- a/arch/sparc/kernel/pci.c
> +++ b/arch/sparc/kernel/pci.c
> @@ -1002,6 +1002,38 @@ static int __init pcibios_init(void)
> subsys_initcall(pcibios_init);
>
> #ifdef CONFIG_SYSFS
> +
> +#define SLOT_NAME_SIZE 11 /* Max decimal digits + null in u32 */
> +
> +static void pci_sun4v_bus_slot_names(struct pci_bus *pbus)
> +{
> + struct pci_dev *pdev;
> + struct pci_bus *bus;
> +
> + list_for_each_entry(pdev, &pbus->devices, bus_list) {
> + char name[SLOT_NAME_SIZE];
> + struct pci_slot *pci_slot;
> + const u32 *slot_num;
> + int len;
> +
> + slot_num = of_get_property(pdev->dev.of_node,
> + "physical-slot#", &len);
> +
> + if (slot_num == NULL || len != 4)
> + continue;
> +
> + snprintf(name, sizeof(name), "%u", slot_num[0]);
> + pci_slot = pci_create_slot(pbus, slot_num[0], name, NULL);
> +
> + if (IS_ERR(pci_slot))
> + pr_err("PCI: pci_create_slot returned %ld.\n",
> + PTR_ERR(pci_slot));
> + }
> +
> + list_for_each_entry(bus, &pbus->children, node)
> + pci_sun4v_bus_slot_names(bus);
> +}
> +
> static void pci_bus_slot_names(struct device_node *node, struct pci_bus *bus)
> {
> const struct pci_slot_names {
> @@ -1054,6 +1086,11 @@ static int __init of_pci_slot_init(void)
> while ((pbus = pci_find_next_bus(pbus)) != NULL) {
> struct device_node *node;
>
> + if (tlb_type == hypervisor) {
> + pci_sun4v_bus_slot_names(pbus);
> + continue;
Are you sure that unconditionally continuing to the next bus is the
right thing to do here?
Where is the slot name set if we can't find the "physical-slot#"
property for a device?
> + }
> +
> if (pbus->self) {
> /* PCI->PCI bridge */
> node = pbus->self->dev.of_node;
Thanks,
--
Julian Calaby
Email: julian.calaby@xxxxxxxxx
Profile: http://www.google.com/profiles/julian.calaby/
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
