PCI: Unify pcie_link_speed and pci_bus_speed
These enums must not overlap anyway, since we only have a single pci_bus_speed_strings array. Use a single enum, and move it to pci.h. Add 'SPEED' to the pcie names to make it clear what they are. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
f07852d644
commit
536c8cb49e
|
@ -613,7 +613,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
|
|||
int pciehp_get_max_link_speed(struct slot *slot, enum pci_bus_speed *value)
|
||||
{
|
||||
struct controller *ctrl = slot->ctrl;
|
||||
enum pcie_link_speed lnk_speed;
|
||||
enum pci_bus_speed lnk_speed;
|
||||
u32 lnk_cap;
|
||||
int retval = 0;
|
||||
|
||||
|
@ -625,13 +625,13 @@ int pciehp_get_max_link_speed(struct slot *slot, enum pci_bus_speed *value)
|
|||
|
||||
switch (lnk_cap & 0x000F) {
|
||||
case 1:
|
||||
lnk_speed = PCIE_2_5GB;
|
||||
lnk_speed = PCIE_SPEED_2_5GT;
|
||||
break;
|
||||
case 2:
|
||||
lnk_speed = PCIE_5_0GB;
|
||||
lnk_speed = PCIE_SPEED_5_0GT;
|
||||
break;
|
||||
default:
|
||||
lnk_speed = PCIE_LNK_SPEED_UNKNOWN;
|
||||
lnk_speed = PCI_SPEED_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -694,7 +694,7 @@ int pciehp_get_max_lnk_width(struct slot *slot,
|
|||
int pciehp_get_cur_link_speed(struct slot *slot, enum pci_bus_speed *value)
|
||||
{
|
||||
struct controller *ctrl = slot->ctrl;
|
||||
enum pcie_link_speed lnk_speed = PCI_SPEED_UNKNOWN;
|
||||
enum pci_bus_speed lnk_speed = PCI_SPEED_UNKNOWN;
|
||||
int retval = 0;
|
||||
u16 lnk_status;
|
||||
|
||||
|
@ -707,13 +707,13 @@ int pciehp_get_cur_link_speed(struct slot *slot, enum pci_bus_speed *value)
|
|||
|
||||
switch (lnk_status & PCI_EXP_LNKSTA_CLS) {
|
||||
case 1:
|
||||
lnk_speed = PCIE_2_5GB;
|
||||
lnk_speed = PCIE_SPEED_2_5GT;
|
||||
break;
|
||||
case 2:
|
||||
lnk_speed = PCIE_5_0GB;
|
||||
lnk_speed = PCIE_SPEED_5_0GT;
|
||||
break;
|
||||
default:
|
||||
lnk_speed = PCIE_LNK_SPEED_UNKNOWN;
|
||||
lnk_speed = PCI_SPEED_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -187,6 +187,27 @@ enum pci_bus_flags {
|
|||
PCI_BUS_FLAGS_NO_MMRBC = (__force pci_bus_flags_t) 2,
|
||||
};
|
||||
|
||||
/* Based on the PCI Hotplug Spec, but some values are made up by us */
|
||||
enum pci_bus_speed {
|
||||
PCI_SPEED_33MHz = 0x00,
|
||||
PCI_SPEED_66MHz = 0x01,
|
||||
PCI_SPEED_66MHz_PCIX = 0x02,
|
||||
PCI_SPEED_100MHz_PCIX = 0x03,
|
||||
PCI_SPEED_133MHz_PCIX = 0x04,
|
||||
PCI_SPEED_66MHz_PCIX_ECC = 0x05,
|
||||
PCI_SPEED_100MHz_PCIX_ECC = 0x06,
|
||||
PCI_SPEED_133MHz_PCIX_ECC = 0x07,
|
||||
PCI_SPEED_66MHz_PCIX_266 = 0x09,
|
||||
PCI_SPEED_100MHz_PCIX_266 = 0x0a,
|
||||
PCI_SPEED_133MHz_PCIX_266 = 0x0b,
|
||||
PCI_SPEED_66MHz_PCIX_533 = 0x11,
|
||||
PCI_SPEED_100MHz_PCIX_533 = 0x12,
|
||||
PCI_SPEED_133MHz_PCIX_533 = 0x13,
|
||||
PCIE_SPEED_2_5GT = 0x14,
|
||||
PCIE_SPEED_5_0GT = 0x15,
|
||||
PCI_SPEED_UNKNOWN = 0xff,
|
||||
};
|
||||
|
||||
struct pci_cap_saved_state {
|
||||
struct hlist_node next;
|
||||
char cap_nr;
|
||||
|
|
|
@ -28,26 +28,6 @@
|
|||
#ifndef _PCI_HOTPLUG_H
|
||||
#define _PCI_HOTPLUG_H
|
||||
|
||||
|
||||
/* These values come from the PCI Hotplug Spec */
|
||||
enum pci_bus_speed {
|
||||
PCI_SPEED_33MHz = 0x00,
|
||||
PCI_SPEED_66MHz = 0x01,
|
||||
PCI_SPEED_66MHz_PCIX = 0x02,
|
||||
PCI_SPEED_100MHz_PCIX = 0x03,
|
||||
PCI_SPEED_133MHz_PCIX = 0x04,
|
||||
PCI_SPEED_66MHz_PCIX_ECC = 0x05,
|
||||
PCI_SPEED_100MHz_PCIX_ECC = 0x06,
|
||||
PCI_SPEED_133MHz_PCIX_ECC = 0x07,
|
||||
PCI_SPEED_66MHz_PCIX_266 = 0x09,
|
||||
PCI_SPEED_100MHz_PCIX_266 = 0x0a,
|
||||
PCI_SPEED_133MHz_PCIX_266 = 0x0b,
|
||||
PCI_SPEED_66MHz_PCIX_533 = 0x11,
|
||||
PCI_SPEED_100MHz_PCIX_533 = 0x12,
|
||||
PCI_SPEED_133MHz_PCIX_533 = 0x13,
|
||||
PCI_SPEED_UNKNOWN = 0xff,
|
||||
};
|
||||
|
||||
/* These values come from the PCI Express Spec */
|
||||
enum pcie_link_width {
|
||||
PCIE_LNK_WIDTH_RESRV = 0x00,
|
||||
|
@ -61,12 +41,6 @@ enum pcie_link_width {
|
|||
PCIE_LNK_WIDTH_UNKNOWN = 0xFF,
|
||||
};
|
||||
|
||||
enum pcie_link_speed {
|
||||
PCIE_2_5GB = 0x14,
|
||||
PCIE_5_0GB = 0x15,
|
||||
PCIE_LNK_SPEED_UNKNOWN = 0xFF,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct hotplug_slot_ops -the callbacks that the hotplug pci core can use
|
||||
* @owner: The module owner of this structure
|
||||
|
|
Loading…
Reference in a new issue