On Tue, Apr 13, 2021 at 11:04 PM Kenneth Feng <kenneth.feng@xxxxxxx> wrote:
>
> enable ASPM on navi1x and vega series
Please split this patch into two, one for vega and one for navi1x.
With that fixed, the series is:
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
>
> Signed-off-by: Kenneth Feng <kenneth.feng@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 128 +++++++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 125 ++++++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/nv.c | 10 +-
> drivers/gpu/drm/amd/amdgpu/soc15.c | 7 +-
> 4 files changed, 259 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
> index 83ea063388fd..0d2d629e2d6a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
> @@ -31,6 +31,28 @@
> #include "vega10_enum.h"
> #include <uapi/linux/kfd_ioctl.h>
>
> +#define smnPCIE_LC_CNTL 0x11140280
> +#define smnPCIE_LC_CNTL3 0x111402d4
> +#define smnPCIE_LC_CNTL6 0x111402ec
> +#define smnPCIE_LC_CNTL7 0x111402f0
> +#define smnNBIF_MGCG_CTRL_LCLK 0x1013a05c
> +#define NBIF_MGCG_CTRL_LCLK__NBIF_MGCG_REG_DIS_LCLK_MASK 0x00001000L
> +#define RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER_MASK 0x0000FFFFL
> +#define RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER_MASK 0xFFFF0000L
> +#define smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL 0x10123530
> +#define smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2 0x1014008c
> +#define smnBIF_CFG_DEV0_EPF0_PCIE_LTR_CAP 0x10140324
> +#define smnPSWUSP0_PCIE_LC_CNTL2 0x111402c4
> +#define smnRCC_BIF_STRAP2 0x10123488
> +#define smnRCC_BIF_STRAP3 0x1012348c
> +#define smnRCC_BIF_STRAP5 0x10123494
> +#define BIF_CFG_DEV0_EPF0_DEVICE_CNTL2__LTR_EN_MASK 0x0400L
> +#define RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER_MASK 0x0000FFFFL
> +#define RCC_BIF_STRAP2__STRAP_LTR_IN_ASPML1_DIS_MASK 0x00004000L
> +#define RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER__SHIFT 0x0
> +#define RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER__SHIFT 0x10
> +#define RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER__SHIFT 0x0
> +
> static void nbio_v6_1_remap_hdp_registers(struct amdgpu_device *adev)
> {
> WREG32_SOC15(NBIO, 0, mmREMAP_HDP_MEM_FLUSH_CNTL,
> @@ -256,6 +278,111 @@ static void nbio_v6_1_init_registers(struct amdgpu_device *adev)
> WREG32_PCIE(smnPCIE_CI_CNTL, data);
> }
>
> +static void nbio_v6_1_program_ltr(struct amdgpu_device *adev)
> +{
> + uint32_t def, data;
> +
> + WREG32_PCIE(smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL, 0x75EB);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP2);
> + data &= ~RCC_BIF_STRAP2__STRAP_LTR_IN_ASPML1_DIS_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP2, data);
> +
> + def = data = RREG32_PCIE(smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL);
> + data &= ~EP_PCIE_TX_LTR_CNTL__LTR_PRIV_MSG_DIS_IN_PM_NON_D0_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL, data);
> +
> + def = data = RREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2);
> + data |= BIF_CFG_DEV0_EPF0_DEVICE_CNTL2__LTR_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2, data);
> +}
> +
> +static void nbio_v6_1_program_aspm(struct amdgpu_device *adev)
> +{
> + uint32_t def, data;
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL);
> + data &= ~PCIE_LC_CNTL__LC_L1_INACTIVITY_MASK;
> + data &= ~PCIE_LC_CNTL__LC_L0S_INACTIVITY_MASK;
> + data |= PCIE_LC_CNTL__LC_PMI_TO_L1_DIS_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL7);
> + data |= PCIE_LC_CNTL7__LC_NBIF_ASPM_INPUT_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL7, data);
> +
> + def = data = RREG32_PCIE(smnNBIF_MGCG_CTRL_LCLK);
> + data |= NBIF_MGCG_CTRL_LCLK__NBIF_MGCG_REG_DIS_LCLK_MASK;
> + if (def != data)
> + WREG32_PCIE(smnNBIF_MGCG_CTRL_LCLK, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL3);
> + data |= PCIE_LC_CNTL3__LC_DSC_DONT_ENTER_L23_AFTER_PME_ACK_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL3, data);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP3);
> + data &= ~RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER_MASK;
> + data &= ~RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP3, data);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP5);
> + data &= ~RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP5, data);
> +
> + def = data = RREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2);
> + data &= ~BIF_CFG_DEV0_EPF0_DEVICE_CNTL2__LTR_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2, data);
> +
> + WREG32_PCIE(smnBIF_CFG_DEV0_EPF0_PCIE_LTR_CAP, 0x10011001);
> +
> + def = data = RREG32_PCIE(smnPSWUSP0_PCIE_LC_CNTL2);
> + data |= PSWUSP0_PCIE_LC_CNTL2__LC_ALLOW_PDWN_IN_L1_MASK |
> + PSWUSP0_PCIE_LC_CNTL2__LC_ALLOW_PDWN_IN_L23_MASK;
> + data &= ~PSWUSP0_PCIE_LC_CNTL2__LC_RCV_L0_TO_RCV_L0S_DIS_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPSWUSP0_PCIE_LC_CNTL2, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL6);
> + data |= PCIE_LC_CNTL6__LC_L1_POWERDOWN_MASK |
> + PCIE_LC_CNTL6__LC_RX_L0S_STANDBY_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL6, data);
> +
> + nbio_v6_1_program_ltr(adev);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP3);
> + data |= 0x5DE0 << RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER__SHIFT;
> + data |= 0x0010 << RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER__SHIFT;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP3, data);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP5);
> + data |= 0x0010 << RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER__SHIFT;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP5, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL);
> + data &= ~PCIE_LC_CNTL__LC_L0S_INACTIVITY_MASK;
> + data |= 0x9 << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
> + data |= 0x1 << PCIE_LC_CNTL__LC_PMI_TO_L1_DIS__SHIFT;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL3);
> + data &= ~PCIE_LC_CNTL3__LC_DSC_DONT_ENTER_L23_AFTER_PME_ACK_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL3, data);
> +}
> +
> const struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
> .get_hdp_flush_req_offset = nbio_v6_1_get_hdp_flush_req_offset,
> .get_hdp_flush_done_offset = nbio_v6_1_get_hdp_flush_done_offset,
> @@ -274,4 +401,5 @@ const struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
> .ih_control = nbio_v6_1_ih_control,
> .init_registers = nbio_v6_1_init_registers,
> .remap_hdp_registers = nbio_v6_1_remap_hdp_registers,
> + .program_aspm = nbio_v6_1_program_aspm,
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> index af44aad78171..cef929746739 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> @@ -31,7 +31,26 @@
> #include "ivsrcid/nbio/irqsrcs_nbif_7_4.h"
> #include <uapi/linux/kfd_ioctl.h>
>
> +#define smnPCIE_LC_CNTL 0x11140280
> +#define smnPCIE_LC_CNTL3 0x111402d4
> +#define smnPCIE_LC_CNTL6 0x111402ec
> +#define smnPCIE_LC_CNTL7 0x111402f0
> #define smnNBIF_MGCG_CTRL_LCLK 0x1013a21c
> +#define smnRCC_BIF_STRAP3 0x1012348c
> +#define RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER_MASK 0x0000FFFFL
> +#define RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER_MASK 0xFFFF0000L
> +#define smnRCC_BIF_STRAP5 0x10123494
> +#define RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER_MASK 0x0000FFFFL
> +#define smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2 0x1014008c
> +#define BIF_CFG_DEV0_EPF0_DEVICE_CNTL2__LTR_EN_MASK 0x0400L
> +#define smnBIF_CFG_DEV0_EPF0_PCIE_LTR_CAP 0x10140324
> +#define smnPSWUSP0_PCIE_LC_CNTL2 0x111402c4
> +#define smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL 0x10123538
> +#define smnRCC_BIF_STRAP2 0x10123488
> +#define RCC_BIF_STRAP2__STRAP_LTR_IN_ASPML1_DIS_MASK 0x00004000L
> +#define RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER__SHIFT 0x0
> +#define RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER__SHIFT 0x10
> +#define RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER__SHIFT 0x0
>
> /*
> * These are nbio v7_4_1 registers mask. Temporarily define these here since
> @@ -567,6 +586,111 @@ const struct amdgpu_nbio_ras_funcs nbio_v7_4_ras_funcs = {
> .ras_fini = amdgpu_nbio_ras_fini,
> };
>
> +static void nbio_v7_4_program_ltr(struct amdgpu_device *adev)
> +{
> + uint32_t def, data;
> +
> + WREG32_PCIE(smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL, 0x75EB);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP2);
> + data &= ~RCC_BIF_STRAP2__STRAP_LTR_IN_ASPML1_DIS_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP2, data);
> +
> + def = data = RREG32_PCIE(smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL);
> + data &= ~EP_PCIE_TX_LTR_CNTL__LTR_PRIV_MSG_DIS_IN_PM_NON_D0_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_EP_DEV0_0_EP_PCIE_TX_LTR_CNTL, data);
> +
> + def = data = RREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2);
> + data |= BIF_CFG_DEV0_EPF0_DEVICE_CNTL2__LTR_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2, data);
> +}
> +
> +static void nbio_v7_4_program_aspm(struct amdgpu_device *adev)
> +{
> + uint32_t def, data;
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL);
> + data &= ~PCIE_LC_CNTL__LC_L1_INACTIVITY_MASK;
> + data &= ~PCIE_LC_CNTL__LC_L0S_INACTIVITY_MASK;
> + data |= PCIE_LC_CNTL__LC_PMI_TO_L1_DIS_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL7);
> + data |= PCIE_LC_CNTL7__LC_NBIF_ASPM_INPUT_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL7, data);
> +
> + def = data = RREG32_PCIE(smnNBIF_MGCG_CTRL_LCLK);
> + data |= NBIF_MGCG_CTRL_LCLK__NBIF_MGCG_REG_DIS_LCLK_MASK;
> + if (def != data)
> + WREG32_PCIE(smnNBIF_MGCG_CTRL_LCLK, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL3);
> + data |= PCIE_LC_CNTL3__LC_DSC_DONT_ENTER_L23_AFTER_PME_ACK_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL3, data);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP3);
> + data &= ~RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER_MASK;
> + data &= ~RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP3, data);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP5);
> + data &= ~RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER_MASK;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP5, data);
> +
> + def = data = RREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2);
> + data &= ~BIF_CFG_DEV0_EPF0_DEVICE_CNTL2__LTR_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnBIF_CFG_DEV0_EPF0_DEVICE_CNTL2, data);
> +
> + WREG32_PCIE(smnBIF_CFG_DEV0_EPF0_PCIE_LTR_CAP, 0x10011001);
> +
> + def = data = RREG32_PCIE(smnPSWUSP0_PCIE_LC_CNTL2);
> + data |= PSWUSP0_PCIE_LC_CNTL2__LC_ALLOW_PDWN_IN_L1_MASK |
> + PSWUSP0_PCIE_LC_CNTL2__LC_ALLOW_PDWN_IN_L23_MASK;
> + data &= ~PSWUSP0_PCIE_LC_CNTL2__LC_RCV_L0_TO_RCV_L0S_DIS_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPSWUSP0_PCIE_LC_CNTL2, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL6);
> + data |= PCIE_LC_CNTL6__LC_L1_POWERDOWN_MASK |
> + PCIE_LC_CNTL6__LC_RX_L0S_STANDBY_EN_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL6, data);
> +
> + nbio_v7_4_program_ltr(adev);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP3);
> + data |= 0x5DE0 << RCC_BIF_STRAP3__STRAP_VLINK_ASPM_IDLE_TIMER__SHIFT;
> + data |= 0x0010 << RCC_BIF_STRAP3__STRAP_VLINK_PM_L1_ENTRY_TIMER__SHIFT;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP3, data);
> +
> + def = data = RREG32_PCIE(smnRCC_BIF_STRAP5);
> + data |= 0x0010 << RCC_BIF_STRAP5__STRAP_VLINK_LDN_ENTRY_TIMER__SHIFT;
> + if (def != data)
> + WREG32_PCIE(smnRCC_BIF_STRAP5, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL);
> + data &= ~PCIE_LC_CNTL__LC_L0S_INACTIVITY_MASK;
> + data |= 0x9 << PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT;
> + data |= 0x1 << PCIE_LC_CNTL__LC_PMI_TO_L1_DIS__SHIFT;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL, data);
> +
> + def = data = RREG32_PCIE(smnPCIE_LC_CNTL3);
> + data &= ~PCIE_LC_CNTL3__LC_DSC_DONT_ENTER_L23_AFTER_PME_ACK_MASK;
> + if (def != data)
> + WREG32_PCIE(smnPCIE_LC_CNTL3, data);
> +}
> +
> const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
> .get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset,
> .get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
> @@ -587,4 +711,5 @@ const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
> .ih_control = nbio_v7_4_ih_control,
> .init_registers = nbio_v7_4_init_registers,
> .remap_hdp_registers = nbio_v7_4_remap_hdp_registers,
> + .program_aspm = nbio_v7_4_program_aspm,
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 46d4bbabce75..d54af7f8801b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -601,8 +601,7 @@ static void nv_program_aspm(struct amdgpu_device *adev)
> if (amdgpu_aspm != 1)
> return;
>
> - if ((adev->asic_type >= CHIP_SIENNA_CICHLID) &&
> - !(adev->flags & AMD_IS_APU) &&
> + if (!(adev->flags & AMD_IS_APU) &&
> (adev->nbio.funcs->program_aspm))
> adev->nbio.funcs->program_aspm(adev);
>
> @@ -934,12 +933,7 @@ static int nv_update_umd_stable_pstate(struct amdgpu_device *adev,
> if (adev->gfx.funcs->update_perfmon_mgcg)
> adev->gfx.funcs->update_perfmon_mgcg(adev, !enter);
>
> - /*
> - * The ASPM function is not fully enabled and verified on
> - * Navi yet. Temporarily skip this until ASPM enabled.
> - */
> - if ((adev->asic_type >= CHIP_SIENNA_CICHLID) &&
> - !(adev->flags & AMD_IS_APU) &&
> + if (!(adev->flags & AMD_IS_APU) &&
> (adev->nbio.funcs->enable_aspm))
> adev->nbio.funcs->enable_aspm(adev, !enter);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 5c5eb3aed1b3..d80e12b80c7e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -816,11 +816,12 @@ static void soc15_pcie_gen3_enable(struct amdgpu_device *adev)
>
> static void soc15_program_aspm(struct amdgpu_device *adev)
> {
> -
> - if (amdgpu_aspm == 0)
> + if (amdgpu_aspm != 1)
> return;
>
> - /* todo */
> + if (!(adev->flags & AMD_IS_APU) &&
> + (adev->nbio.funcs->program_aspm))
> + adev->nbio.funcs->program_aspm(adev);
> }
>
> static void soc15_enable_doorbell_aperture(struct amdgpu_device *adev,
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
