aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAamir Bohra <aamir.bohra@intel.com>2017-09-22 19:07:21 +0530
committerMartin Roth <martinroth@google.com>2017-10-13 15:21:48 +0000
commit2188f57a806feb7b25816d70919f12e5e2ba84b3 (patch)
treea24b2c92ff1821c0b988f5f6dffe66a3a78190b7
parentc8374e32920d2bffbd5fe7b65621fe0b90cfb19e (diff)
src/device: Update LTR configuration scheme
This patch moves out LTR programming under L1 substate to pchexp_tune_device function, as substate programming and LTR programming are independent. LTR programming scheme is updated to scan through entire tree and enable LTR mechanism on pci device if LTR mechanism is supported by device. BRANCH=none BUG=b:66722364 TEST=Verify LTR is configured for end point devices and max snoop latency gets configured. Change-Id: I6be99c3b590c1457adf88bc1b40f128fcade3fbe Signed-off-by: Aamir Bohra <aamir.bohra@intel.com> Reviewed-on: https://review.coreboot.org/21868 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/device/pciexp_device.c55
-rw-r--r--src/include/device/pci_def.h6
2 files changed, 50 insertions, 11 deletions
diff --git a/src/device/pciexp_device.c b/src/device/pciexp_device.c
index 40c3f8c5ee..a1772047bb 100644
--- a/src/device/pciexp_device.c
+++ b/src/device/pciexp_device.c
@@ -149,16 +149,55 @@ static void pciexp_config_max_latency(device_t root, device_t dev)
root->ops->ops_pci->set_L1_ss_latency(dev, cap + 4);
}
-static void pciexp_enable_ltr(device_t dev)
+static bool pciexp_is_ltr_supported(device_t dev, unsigned int cap)
+{
+ unsigned int val;
+
+ val = pci_read_config16(dev, cap + PCI_EXP_DEV_CAP2_OFFSET);
+
+ if (val & LTR_MECHANISM_SUPPORT)
+ return true;
+
+ return false;
+}
+
+static void pciexp_configure_ltr(device_t dev)
{
unsigned int cap;
+
cap = pci_find_capability(dev, PCI_CAP_ID_PCIE);
- if(!cap) {
+
+ /*
+ * Check if capibility pointer is valid and
+ * device supports LTR mechanism.
+ */
+ if (!cap || !pciexp_is_ltr_supported(dev, cap)) {
printk(BIOS_INFO, "Failed to enable LTR for dev = %s\n",
- dev_path(dev));
+ dev_path(dev));
return;
}
- pci_update_config32(dev, cap + 0x28, ~(1 << 10), 1 << 10);
+
+ cap += PCI_EXP_DEV_CTL_STS2_CAP_OFFSET;
+
+ /* Enable LTR for device */
+ pci_update_config32(dev, cap, ~LTR_MECHANISM_EN, LTR_MECHANISM_EN);
+
+ /* Configure Max Snoop Latency */
+ pciexp_config_max_latency(dev->bus->dev, dev);
+}
+
+static void pciexp_enable_ltr(device_t dev)
+{
+ struct bus *bus;
+ device_t child;
+
+ for (bus = dev->link_list ; bus ; bus = bus->next) {
+ for (child = bus->children; child; child = child->sibling) {
+ pciexp_configure_ltr(child);
+ if (child->ops && child->ops->scan_bus)
+ pciexp_enable_ltr(child);
+ }
+ }
}
static unsigned char pciexp_L1_substate_cal(device_t dev, unsigned int endp_cap,
@@ -232,8 +271,6 @@ static void pciexp_L1_substate_commit(device_t root, device_t dev,
printk(BIOS_INFO, "Power On Value = 0x%x, Power On Scale = 0x%x\n",
endp_power_on_value, power_on_scale);
- pciexp_enable_ltr(root);
-
pci_update_config32(root, root_cap + 0x08, ~0xff00,
(comm_mode_rst_time << 8));
@@ -255,10 +292,6 @@ static void pciexp_L1_substate_commit(device_t root, device_t dev,
pci_update_config32(dev_t, end_cap + 0x08, ~0x1f,
L1SubStateSupport);
-
- pciexp_enable_ltr(dev_t);
-
- pciexp_config_max_latency(root, dev_t);
}
}
@@ -400,7 +433,6 @@ void pciexp_scan_bus(struct bus *bus, unsigned int min_devfn,
unsigned int max_devfn)
{
device_t child;
-
pci_scan_bus(bus, min_devfn, max_devfn);
for (child = bus->children; child; child = child->sibling) {
@@ -415,6 +447,7 @@ void pciexp_scan_bus(struct bus *bus, unsigned int min_devfn,
void pciexp_scan_bridge(device_t dev)
{
do_pci_scan_bridge(dev, pciexp_scan_bus);
+ pciexp_enable_ltr(dev);
}
/** Default device operations for PCI Express bridges */
diff --git a/src/include/device/pci_def.h b/src/include/device/pci_def.h
index 1674ee1e49..60d913204a 100644
--- a/src/include/device/pci_def.h
+++ b/src/include/device/pci_def.h
@@ -373,6 +373,12 @@
#define PCI_EXP_DEVCAP 4 /* Device capabilities */
#define PCI_EXP_DEVCAP_PAYLOAD 0x07 /* Max_Payload_Size */
#define PCI_EXP_DEVCAP_PHANTOM 0x18 /* Phantom functions */
+#define PCI_EXP_DEV_CAP2_OFFSET 0x24 /* Device Capabilities 2 offset */
+/* LTR mechanism supported.Bit 11 of Device Cap 2 Register */
+#define LTR_MECHANISM_SUPPORT (1 << 11)
+#define PCI_EXP_DEV_CTL_STS2_CAP_OFFSET 0x28 /* Device Control 2 offset */
+/* LTR mechanism enable. Bit 10 of Device Control 2 Register */
+#define LTR_MECHANISM_EN (1 << 10)
#define PCI_EXP_DEVCAP_EXT_TAG 0x20 /* Extended tags */
#define PCI_EXP_DEVCAP_L0S 0x1c0 /* L0s Acceptable Latency */
#define PCI_EXP_DEVCAP_L1 0xe00 /* L1 Acceptable Latency */