PCI: Prefer pcie_capability_read_word()
Subsystems (3)
v2 cover PCI: Prefer pcie_capability_read_word()
From: Bjorn Helgaas <[email protected]>
Use pcie_capability_read_word() and similar instead of using pci_read_config_word() directly. Add #defines to replace some magic numbers. Fix typos in use of Transmit Margin field.
These are currently on my pci/misc branch for v5.5. Let me know if you see any issues.
Bjorn Helgaas (5):
PCI: Add #defines for Enter Compliance, Transmit Margin drm/amdgpu: Correct Transmit Margin masks drm/amdgpu: Replace numbers with PCI_EXP_LNKCTL2 definitions drm/radeon: Correct Transmit Margin masks drm/radeon: Replace numbers with PCI_EXP_LNKCTL2 definitions
Frederick Lawler (2):
drm/amdgpu: Prefer pcie_capability_read_word()
drm/radeon: Prefer pcie_capability_read_word()
drivers/gpu/drm/amd/amdgpu/cik.c | 95 +++++++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/si.c | 97 ++++++++++++++++++++------------ drivers/gpu/drm/radeon/cik.c | 94 +++++++++++++++++++------------ drivers/gpu/drm/radeon/si.c | 97 ++++++++++++++++++++------------ include/uapi/linux/pci_regs.h | 2 + 5 files changed, 243 insertions(+), 142 deletions(-)
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
PATCH v2 1/7 PCI: Add #defines for Enter Compliance, Transmit Margin
From: Bjorn Helgaas <[email protected]>
Add definitions for the Enter Compliance and Transmit Margin fields of the PCIe Link Control 2 register.
--- include/uapi/linux/pci_regs.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/pci_regs.h +2 -0
@@ -673,6 +673,8 @@#define PCI_EXP_LNKCTL2_TLS_8_0GT 0x0003/* Supported Speed 8GT/s */ #define PCI_EXP_LNKCTL2_TLS_16_0GT 0x0004/* Supported Speed 16GT/s */ #define PCI_EXP_LNKCTL2_TLS_32_0GT 0x0005/* Supported Speed 32GT/s */ +#define PCI_EXP_LNKCTL2_ENTER_COMP 0x0010/* Enter Compliance */ +#define PCI_EXP_LNKCTL2_TX_MARGIN 0x0380/* Transmit Margin */ #define PCI_EXP_LNKSTA2 50/* Link Status 2 */ #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 52/* v2 endpoints with link end here */ #define PCI_EXP_SLTCAP2 52/* Slot Capabilities 2 */
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
PATCH v2 2/7 drm/amdgpu: Correct Transmit Margin masks
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Previously we masked PCIe Link Control 2 register values with "7 << 9", which was apparently intended to be the Transmit Margin field, but instead was the high order bit of Transmit Margin, the Enter Modified Compliance bit, and the Compliance SOS bit.
Correct the mask to "7 << 7", which is the Transmit Margin field.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/si.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -4
@@ -1498,13 +1498,13 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)/* linkctl2 */ pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE (ixPCIE_LC_CNTL4);
drivers/gpu/drm/amd/amdgpu/si.c +4 -4
@@ -1737,13 +1737,13 @@ static void si_pcie_gen3_enable(struct amdgpu_device *adev)pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL , tmp16);pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 );
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
PATCH v2 3/7 drm/amdgpu: Replace numbers with PCI_EXP_LNKCTL2 definitions
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Replace hard-coded magic numbers with the descriptive PCI_EXP_LNKCTL2 definitions. No functional change intended.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 22 ++++++++++++++-------- drivers/gpu/drm/amd/amdgpu/si.c | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +14 -8
@@ -1498,13 +1498,19 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)/* linkctl2 */ pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (bridge_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (gpu_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE (ixPCIE_LC_CNTL4);
@@ -1521,13 +1527,13 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)WREG32_PCIE (ixPCIE_LC_SPEED_CNTL, speed_cntl);pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~0xf ; + tmp16 &= ~PCI_EXP_LNKCTL2_TLS ;if (adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3 ) - tmp16 |=3 ;/* gen3 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_8_0GT ;/* gen3 */ else if (adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 ) - tmp16 |=2 ;/* gen2 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_5_0GT ;/* gen2 */ else - tmp16 |=1 ;/* gen1 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_2_5GT ;/* gen1 */ pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); speed_cntl =RREG32_PCIE (ixPCIE_LC_SPEED_CNTL);
drivers/gpu/drm/amd/amdgpu/si.c +14 -8
@@ -1737,13 +1737,19 @@ static void si_pcie_gen3_enable(struct amdgpu_device *adev)pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL , tmp16);pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (bridge_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (gpu_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 );
@@ -1758,13 +1764,13 @@ static void si_pcie_gen3_enable(struct amdgpu_device *adev)WREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL , speed_cntl);pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~0xf ; + tmp16 &= ~PCI_EXP_LNKCTL2_TLS ;if (adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3 ) - tmp16 |=3 ; + tmp16 |=PCI_EXP_LNKCTL2_TLS_8_0GT ;/* gen3 */ else if (adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 ) - tmp16 |=2 ; + tmp16 |=PCI_EXP_LNKCTL2_TLS_5_0GT ;/* gen2 */ else - tmp16 |=1 ; + tmp16 |=PCI_EXP_LNKCTL2_TLS_2_5GT ;/* gen1 */ pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); speed_cntl =RREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL );
Signature · 6 lines
2.24.0.432.g9d3f5f5b63-goog _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 4/7 drm/amdgpu: Prefer pcie_capability_read_word()
In reply to Bjorn HelgaasFrom: Frederick Lawler <[email protected]>
Commit 8c0d3a02c130 ("PCI: Add accessors for PCI Express Capability") added accessors for the PCI Express Capability so that drivers didn't need to be aware of differences between v1 and v2 of the PCI Express Capability.
Replace pci_read_config_word() and pci_write_config_word() calls with pcie_capability_read_word() and pcie_capability_write_word().
--- drivers/gpu/drm/amd/amdgpu/cik.c | 71 ++++++++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/si.c | 71 ++++++++++++++++++++------------ 2 files changed, 90 insertions(+), 52 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +45 -26
@@ -1384,7 +1384,6 @@ static int cik_set_vce_clocks(struct amdgpu_device *adev, u32 evclk, u32 ecclk)static void cik_pcie_gen3_enable (struct amdgpu_device *adev) {struct pci_dev *root = adev->pdev->bus->self; -int bridge_pos, gpu_pos;u32 speed_cntl, current_data_rate;int i;u16 tmp16;
@@ -1419,12 +1418,7 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)DRM_INFO ("enabling PCIE gen 2 link speeds, disable with amdgpu.pcie_gen2=0\n" ); } - bridge_pos =pci_pcie_cap (root); -if (!bridge_pos) -return ; - - gpu_pos =pci_pcie_cap (adev->pdev); -if (!gpu_pos) +if (!pci_is_pcie (root) || !pci_is_pcie (adev->pdev))return ;if (adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3 ) {
@@ -1434,14 +1428,17 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL , &bridge_cfg); -pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL , &gpu_cfg); +pcie_capability_read_word (root,PCI_EXP_LNKCTL , + &bridge_cfg); +pcie_capability_read_word (adev->pdev,PCI_EXP_LNKCTL , + &gpu_cfg); tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (adev->pdev,PCI_EXP_LNKCTL , + tmp16); tmp =RREG32_PCIE (ixPCIE_LC_STATUS1); max_lw = (tmp & PCIE_LC_STATUS1__LC_DETECTED_LINK_WIDTH_MASK) >>
@@ -1465,15 +1462,23 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)for (i =0 ; i <10 ; i++) {/* check status */ -pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_DEVSTA , &tmp16); +pcie_capability_read_word (adev->pdev, +PCI_EXP_DEVSTA , + &tmp16);if (tmp16 &PCI_EXP_DEVSTA_TRPND )break ; -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL , &bridge_cfg); -pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL , &gpu_cfg); +pcie_capability_read_word (root,PCI_EXP_LNKCTL , + &bridge_cfg); +pcie_capability_read_word (adev->pdev, +PCI_EXP_LNKCTL , + &gpu_cfg); -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &bridge_cfg2); -pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &gpu_cfg2); +pcie_capability_read_word (root,PCI_EXP_LNKCTL2 , + &bridge_cfg2); +pcie_capability_read_word (adev->pdev, +PCI_EXP_LNKCTL2 , + &gpu_cfg2); tmp =RREG32_PCIE (ixPCIE_LC_CNTL4); tmp |=PCIE_LC_CNTL4__LC_SET_QUIESCE_MASK ;
@@ -1486,32 +1491,45 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)msleep (100 );/* linkctl */ -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL , &tmp16); +pcie_capability_read_word (root,PCI_EXP_LNKCTL , + &tmp16); tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (root,PCI_EXP_LNKCTL , + tmp16); -pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL , &tmp16); +pcie_capability_read_word (adev->pdev, +PCI_EXP_LNKCTL , + &tmp16); tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (adev->pdev, +PCI_EXP_LNKCTL , + tmp16);/* linkctl2 */ -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); +pcie_capability_read_word (root,PCI_EXP_LNKCTL2 , + &tmp16); tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN ); tmp16 |= (bridge_cfg2 & (PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN )); -pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16); +pcie_capability_write_word (root, +PCI_EXP_LNKCTL2 , + tmp16); -pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); +pcie_capability_read_word (adev->pdev, +PCI_EXP_LNKCTL2 , + &tmp16); tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN ); tmp16 |= (gpu_cfg2 & (PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN )); -pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); +pcie_capability_write_word (adev->pdev, +PCI_EXP_LNKCTL2 , + tmp16); tmp =RREG32_PCIE (ixPCIE_LC_CNTL4); tmp &= ~PCIE_LC_CNTL4__LC_SET_QUIESCE_MASK ;
@@ -1526,15 +1544,16 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev) speed_cntl &= ~PCIE_LC_SPEED_CNTL__LC_FORCE_DIS_SW_SPEED_CHANGE_MASK ;WREG32_PCIE (ixPCIE_LC_SPEED_CNTL, speed_cntl); -pci_read_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); +pcie_capability_read_word (adev->pdev,PCI_EXP_LNKCTL2 , &tmp16); tmp16 &= ~PCI_EXP_LNKCTL2_TLS ; +if (adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3 ) tmp16 |=PCI_EXP_LNKCTL2_TLS_8_0GT ;/* gen3 */ else if (adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 ) tmp16 |=PCI_EXP_LNKCTL2_TLS_5_0GT ;/* gen2 */ else tmp16 |=PCI_EXP_LNKCTL2_TLS_2_5GT ;/* gen1 */ -pci_write_config_word (adev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); +pcie_capability_write_word (adev->pdev,PCI_EXP_LNKCTL2 , tmp16); speed_cntl =RREG32_PCIE (ixPCIE_LC_SPEED_CNTL); speed_cntl |=PCIE_LC_SPEED_CNTL__LC_INITIATE_LINK_SPEED_CHANGE_MASK ;
drivers/gpu/drm/amd/amdgpu/si.c +45 -26
139 lines not on this page · raw message
Signature · 6 lines
2.24.0.432.g9d3f5f5b63-goog _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 5/7 drm/radeon: Correct Transmit Margin masks
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Previously we masked PCIe Link Control 2 register values with "7 << 9", which was apparently intended to be the Transmit Margin field, but instead was the high order bit of Transmit Margin, the Enter Modified Compliance bit, and the Compliance SOS bit.
Correct the mask to "7 << 7", which is the Transmit Margin field.
--- drivers/gpu/drm/radeon/cik.c | 8 ++++---- drivers/gpu/drm/radeon/si.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/cik.c +4 -4
@@ -9619,13 +9619,13 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)/* linkctl2 */ pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 );
drivers/gpu/drm/radeon/si.c +4 -4
@@ -7202,13 +7202,13 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)/* linkctl2 */ pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<9 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<9 ))); + tmp16 &= ~((1 <<4 ) | (7 <<7 )); + tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 )));pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 );
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
PATCH v2 6/7 drm/radeon: Replace numbers with PCI_EXP_LNKCTL2 definitions
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Replace hard-coded magic numbers with the descriptive PCI_EXP_LNKCTL2 definitions. No functional change intended.
--- drivers/gpu/drm/radeon/cik.c | 22 ++++++++++++++-------- drivers/gpu/drm/radeon/si.c | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/cik.c +14 -8
@@ -9619,13 +9619,19 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)/* linkctl2 */ pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (bridge_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (gpu_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 );
@@ -9641,13 +9647,13 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)WREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL , speed_cntl);pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~0xf ; + tmp16 &= ~PCI_EXP_LNKCTL2_TLS ;if (speed_cap ==PCIE_SPEED_8_0GT ) - tmp16 |=3 ;/* gen3 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_8_0GT ;/* gen3 */ else if (speed_cap ==PCIE_SPEED_5_0GT ) - tmp16 |=2 ;/* gen2 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_5_0GT ;/* gen2 */ else - tmp16 |=1 ;/* gen1 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_2_5GT ;/* gen1 */ pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); speed_cntl =RREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL );
drivers/gpu/drm/radeon/si.c +14 -8
@@ -7202,13 +7202,19 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)/* linkctl2 */ pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (bridge_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (bridge_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16);pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~((1 <<4 ) | (7 <<7 )); - tmp16 |= (gpu_cfg2 & ((1 <<4 ) | (7 <<7 ))); + tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ); + tmp16 |= (gpu_cfg2 & + (PCI_EXP_LNKCTL2_ENTER_COMP | +PCI_EXP_LNKCTL2_TX_MARGIN ));pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 );
@@ -7224,13 +7230,13 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)WREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL , speed_cntl);pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); - tmp16 &= ~0xf ; + tmp16 &= ~PCI_EXP_LNKCTL2_TLS ;if (speed_cap ==PCIE_SPEED_8_0GT ) - tmp16 |=3 ;/* gen3 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_8_0GT ;/* gen3 */ else if (speed_cap ==PCIE_SPEED_5_0GT ) - tmp16 |=2 ;/* gen2 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_5_0GT ;/* gen2 */ else - tmp16 |=1 ;/* gen1 */ + tmp16 |=PCI_EXP_LNKCTL2_TLS_2_5GT ;/* gen1 */ pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); speed_cntl =RREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL );
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
PATCH v2 7/7 drm/radeon: Prefer pcie_capability_read_word()
In reply to Bjorn HelgaasFrom: Frederick Lawler <[email protected]>
Commit 8c0d3a02c130 ("PCI: Add accessors for PCI Express Capability") added accessors for the PCI Express Capability so that drivers didn't need to be aware of differences between v1 and v2 of the PCI Express Capability.
Replace pci_read_config_word() and pci_write_config_word() calls with pcie_capability_read_word() and pcie_capability_write_word().
--- drivers/gpu/drm/radeon/cik.c | 70 +++++++++++++++++++++------------- drivers/gpu/drm/radeon/si.c | 73 +++++++++++++++++++++++------------- 2 files changed, 90 insertions(+), 53 deletions(-)
drivers/gpu/drm/radeon/cik.c +44 -26
@@ -9504,7 +9504,6 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev) {struct pci_dev *root = rdev->pdev->bus->self;enum pci_bus_speed speed_cap; -int bridge_pos, gpu_pos;u32 speed_cntl, current_data_rate;int i;u16 tmp16;
@@ -9546,12 +9545,7 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)DRM_INFO ("enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0\n" ); } - bridge_pos =pci_pcie_cap (root); -if (!bridge_pos) -return ; - - gpu_pos =pci_pcie_cap (rdev->pdev); -if (!gpu_pos) +if (!pci_is_pcie (root) || !pci_is_pcie (rdev->pdev))return ;if (speed_cap ==PCIE_SPEED_8_0GT ) {
@@ -9561,14 +9555,17 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL , &bridge_cfg); -pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL , &gpu_cfg); +pcie_capability_read_word (root,PCI_EXP_LNKCTL , + &bridge_cfg); +pcie_capability_read_word (rdev->pdev,PCI_EXP_LNKCTL , + &gpu_cfg); tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (rdev->pdev,PCI_EXP_LNKCTL , + tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_STATUS1 ); max_lw = (tmp &LC_DETECTED_LINK_WIDTH_MASK ) >>LC_DETECTED_LINK_WIDTH_SHIFT ;
@@ -9586,15 +9583,23 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)for (i =0 ; i <10 ; i++) {/* check status */ -pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_DEVSTA , &tmp16); +pcie_capability_read_word (rdev->pdev, +PCI_EXP_DEVSTA , + &tmp16);if (tmp16 &PCI_EXP_DEVSTA_TRPND )break ; -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL , &bridge_cfg); -pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL , &gpu_cfg); +pcie_capability_read_word (root,PCI_EXP_LNKCTL , + &bridge_cfg); +pcie_capability_read_word (rdev->pdev, +PCI_EXP_LNKCTL , + &gpu_cfg); -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &bridge_cfg2); -pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &gpu_cfg2); +pcie_capability_read_word (root,PCI_EXP_LNKCTL2 , + &bridge_cfg2); +pcie_capability_read_word (rdev->pdev, +PCI_EXP_LNKCTL2 , + &gpu_cfg2); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 ); tmp |=LC_SET_QUIESCE ;
@@ -9607,32 +9612,45 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)msleep (100 );/* linkctl */ -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL , &tmp16); +pcie_capability_read_word (root,PCI_EXP_LNKCTL , + &tmp16); tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (root,PCI_EXP_LNKCTL , + tmp16); -pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL , &tmp16); +pcie_capability_read_word (rdev->pdev, +PCI_EXP_LNKCTL , + &tmp16); tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL , tmp16); +pcie_capability_write_word (rdev->pdev, +PCI_EXP_LNKCTL , + tmp16);/* linkctl2 */ -pci_read_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , &tmp16); +pcie_capability_read_word (root,PCI_EXP_LNKCTL2 , + &tmp16); tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN ); tmp16 |= (bridge_cfg2 & (PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN )); -pci_write_config_word (root, bridge_pos +PCI_EXP_LNKCTL2 , tmp16); +pcie_capability_write_word (root, +PCI_EXP_LNKCTL2 , + tmp16); -pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); +pcie_capability_read_word (rdev->pdev, +PCI_EXP_LNKCTL2 , + &tmp16); tmp16 &= ~(PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN ); tmp16 |= (gpu_cfg2 & (PCI_EXP_LNKCTL2_ENTER_COMP |PCI_EXP_LNKCTL2_TX_MARGIN )); -pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); +pcie_capability_write_word (rdev->pdev, +PCI_EXP_LNKCTL2 , + tmp16); tmp =RREG32_PCIE_PORT (PCIE_LC_CNTL4 ); tmp &= ~LC_SET_QUIESCE ;
@@ -9646,7 +9664,7 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev) speed_cntl &= ~LC_FORCE_DIS_SW_SPEED_CHANGE ;WREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL , speed_cntl); -pci_read_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , &tmp16); +pcie_capability_read_word (rdev->pdev,PCI_EXP_LNKCTL2 , &tmp16); tmp16 &= ~PCI_EXP_LNKCTL2_TLS ;if (speed_cap ==PCIE_SPEED_8_0GT ) tmp16 |=PCI_EXP_LNKCTL2_TLS_8_0GT ;/* gen3 */
@@ -9654,7 +9672,7 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev) tmp16 |=PCI_EXP_LNKCTL2_TLS_5_0GT ;/* gen2 */ else tmp16 |= PCI_EXP_LNKCTL2_TLS_2_5GT; /* gen1 */ -pci_write_config_word (rdev->pdev, gpu_pos +PCI_EXP_LNKCTL2 , tmp16); +pcie_capability_write_word (rdev->pdev,PCI_EXP_LNKCTL2 , tmp16); speed_cntl =RREG32_PCIE_PORT (PCIE_LC_SPEED_CNTL ); speed_cntl |=LC_INITIATE_LINK_SPEED_CHANGE ;
drivers/gpu/drm/radeon/si.c +46 -27
147 lines not on this page · raw message
Signature · 6 lines
2.24.0.432.g9d3f5f5b63-goog _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 13 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Bjorn Helgaas
Sent: Thursday, November 21, 2019 9:02 AM
To: [email protected]
Cc: Zhou, David(ChunMing) <[email protected]>; Frederick Lawler <[email protected]>; Dave Airlie <[email protected]>; linux- [email protected]; [email protected]; Bjorn Helgaas <[email protected]>; [email protected]; Daniel Vetter <[email protected]>; Alex Deucher <[email protected]>; Koenig, Christian <[email protected]>
Subject: [PATCH v2 0/7] PCI: Preferpcie_capability_read_word()
Quoted 9 lines
From: Bjorn Helgaas <[email protected]>
Use
pcie_capability_read_word()and similar instead of usingpci_read_config_word()directly. Add #defines to replace some magic numbers. Fix typos in use of Transmit Margin field.These are currently on my pci/misc branch for v5.5. Let me know if you see any issues.
Series is:
Quoted 26 lines
Bjorn Helgaas (5):
PCI: Add #defines for Enter Compliance, Transmit Margin drm/amdgpu: Correct Transmit Margin masks drm/amdgpu: Replace numbers withPCI_EXP_LNKCTL2definitions drm/radeon: Correct Transmit Margin masks drm/radeon: Replace numbers withPCI_EXP_LNKCTL2definitionsFrederick Lawler (2):
drm/amdgpu: Preferpcie_capability_read_word()
drm/radeon: Preferpcie_capability_read_word()drivers/gpu/drm/amd/amdgpu/cik.c | 95 +++++++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/si.c | 97 ++++++++++++++++++++------------ drivers/gpu/drm/radeon/cik.c | 94 +++++++++++++++++++------------ drivers/gpu/drm/radeon/si.c | 97 ++++++++++++++++++++------------ include/uapi/linux/pci_regs.h | 2 + 5 files changed, 243 insertions(+), 142 deletions(-)--
2.24.0.432.g9d3f5f5b63-goog_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx