diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2013-08-02 16:12:49 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2013-08-06 12:55:28 -0400 |
commit | a3c4f2fb26974b5134861af8f7593040ae61a1f4 (patch) | |
tree | 78b2667d31072cda4521967f623cf3eea1a88edf /arch/tile | |
parent | 90d9dd66957a744831146dbb1a9e4f96a9106100 (diff) |
tile PCI RC: gentler warning for missing plug-in PCI
Besides using pr_info() to print the linkdown status for a plug-in
slot, add extra indication that this is expected if the slot is empty.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile')
-rw-r--r-- | arch/tile/include/hv/drv_trio_intf.h | 5 | ||||
-rw-r--r-- | arch/tile/kernel/pci_gx.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/arch/tile/include/hv/drv_trio_intf.h b/arch/tile/include/hv/drv_trio_intf.h index ef9f3f52ee27..ec643a02b4c5 100644 --- a/arch/tile/include/hv/drv_trio_intf.h +++ b/arch/tile/include/hv/drv_trio_intf.h | |||
@@ -64,8 +64,9 @@ struct pcie_port_property | |||
64 | * will not consider it an error if the link comes up as a x8 link. */ | 64 | * will not consider it an error if the link comes up as a x8 link. */ |
65 | uint8_t allow_x8: 1; | 65 | uint8_t allow_x8: 1; |
66 | 66 | ||
67 | /** Reserved. */ | 67 | /** If true, this link is connected to a device which may or may not |
68 | uint8_t reserved: 1; | 68 | * be present. */ |
69 | uint8_t removable: 1; | ||
69 | 70 | ||
70 | }; | 71 | }; |
71 | 72 | ||
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index e0d666483e13..bf8c69de2792 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c | |||
@@ -729,8 +729,14 @@ int __init pcibios_init(void) | |||
729 | __gxio_mmio_read(trio_context->mmio_base_mac + | 729 | __gxio_mmio_read(trio_context->mmio_base_mac + |
730 | reg_offset); | 730 | reg_offset); |
731 | if (!port_status.dl_up) { | 731 | if (!port_status.dl_up) { |
732 | pr_err("PCI: link is down, MAC %d on TRIO %d\n", | 732 | if (pcie_ports[trio_index][mac].removable) { |
733 | mac, trio_index); | 733 | pr_info("PCI: link is down, MAC %d on TRIO %d\n", |
734 | mac, trio_index); | ||
735 | pr_info("This is expected if no PCIe card" | ||
736 | " is connected to this link\n"); | ||
737 | } else | ||
738 | pr_err("PCI: link is down, MAC %d on TRIO %d\n", | ||
739 | mac, trio_index); | ||
734 | continue; | 740 | continue; |
735 | } | 741 | } |
736 | 742 | ||