thunderbolt: Convert PCIe adapter register names to follow the USB4 spec

Now that USB4 spec has names for these PCIe adapter registers we can use
them instead. This makes it easier to match certain register to the spec.

No functional changes.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 9c2e739c79f31ecae20391af7b712b90a3047a64..7d05c858423be3231d8f5245e3bdae4c8d2af391 100644 (file)
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -803,10 +803,11 @@ bool tb_pci_port_is_enabled(struct tb_port *port)
 {
        u32 data;
 
-       if (tb_port_read(port, &data, TB_CFG_PORT, port->cap_adap, 1))
+       if (tb_port_read(port, &data, TB_CFG_PORT,
+                        port->cap_adap + ADP_PCIE_CS_0, 1))
                return false;
 
-       return !!(data & TB_PCI_EN);
+       return !!(data & ADP_PCIE_CS_0_PE);
 }
 
 /**
@@ -816,10 +817,11 @@ bool tb_pci_port_is_enabled(struct tb_port *port)
  */
 int tb_pci_port_enable(struct tb_port *port, bool enable)
 {
-       u32 word = enable ? TB_PCI_EN : 0x0;
+       u32 word = enable ? ADP_PCIE_CS_0_PE : 0x0;
        if (!port->cap_adap)
                return -ENXIO;
-       return tb_port_write(port, &word, TB_CFG_PORT, port->cap_adap, 1);
+       return tb_port_write(port, &word, TB_CFG_PORT,
+                            port->cap_adap + ADP_PCIE_CS_0, 1);
 }
 
 /**

diff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h
index d0858db9f9049a194589f1672a3507c3547627fa..4be9df35452714d4cbed79f95e77c14f8c8ea510 100644 (file)
--- a/drivers/thunderbolt/tb_regs.h
+++ b/drivers/thunderbolt/tb_regs.h
@@ -241,8 +241,8 @@ struct tb_regs_port_header {
 #define TB_DP_REMOTE_CAP               0x5
 
 /* PCIe adapter registers */
-
-#define TB_PCI_EN                      BIT(31)
+#define ADP_PCIE_CS_0                          0x00
+#define ADP_PCIE_CS_0_PE                       BIT(31)
 
 /* Hop register from TB_CFG_HOPS. 8 byte per entry. */
 struct tb_regs_hop {