Series is: Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
On Thu, Feb 17, 2022 at 12:44 AM Mario Limonciello <mario.limoncie...@amd.com> wrote: > > Evaluating `pcie_aspm_enabled` as part of driver probe has the implication > that if one PCIe bridge with an AMD GPU connected doesn't support ASPM > then none of them do. This is an invalid assumption as the PCIe core will > configure ASPM for individual PCIe bridges. > > Create a new helper function that can be called by individual dGPUs to > react to the `amdgpu_aspm` module parameter without having negative results > for other dGPUs on the PCIe bus. > > Suggested-by: Lijo Lazar <lijo.la...@amd.com> > Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +++++++++++++++++++ > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 --- > drivers/gpu/drm/amd/amdgpu/cik.c | 2 +- > drivers/gpu/drm/amd/amdgpu/nv.c | 2 +- > drivers/gpu/drm/amd/amdgpu/si.c | 2 +- > drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +- > drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- > .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- > 9 files changed, 32 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 3a126dce8a2f..f0a34aa4af78 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -1297,6 +1297,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device > *adev, > void amdgpu_device_pci_config_reset(struct amdgpu_device *adev); > int amdgpu_device_pci_reset(struct amdgpu_device *adev); > bool amdgpu_device_need_post(struct amdgpu_device *adev); > +bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev); > > void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes, > u64 num_vis_bytes); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 4667c992a4cc..283d7a7a5249 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1318,6 +1318,31 @@ bool amdgpu_device_need_post(struct amdgpu_device > *adev) > return true; > } > > +/** > + * amdgpu_device_should_use_aspm - check if the device should program ASPM > + * > + * @adev: amdgpu_device pointer > + * > + * Confirm whether the module parameter and pcie bridge agree that ASPM > should > + * be set for this device. > + * > + * Returns true if it should be used or false if not. > + */ > +bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev) > +{ > + switch (amdgpu_aspm) { > + case -1: > + break; > + case 0: > + return false; > + case 1: > + return true; > + default: > + return false; > + } > + return pcie_aspm_enabled(adev->pdev); > +} > + > /* if we get transitioned to only one device, take VGA back */ > /** > * amdgpu_device_vga_set_decode - enable/disable vga decode > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index d2548fab51c5..5acd0473ed01 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -2008,9 +2008,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, > return -ENODEV; > } > > - if (amdgpu_aspm == -1 && !pcie_aspm_enabled(pdev)) > - amdgpu_aspm = 0; > - > if (amdgpu_virtual_display || > amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK)) > supports_atomic = true; > diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c > b/drivers/gpu/drm/amd/amdgpu/cik.c > index f10ce740a29c..de6d10390ab2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik.c > @@ -1719,7 +1719,7 @@ static void cik_program_aspm(struct amdgpu_device *adev) > bool disable_l0s = false, disable_l1 = false, disable_plloff_in_l1 = > false; > bool disable_clkreq = false; > > - if (amdgpu_aspm == 0) > + if (!amdgpu_device_should_use_aspm(adev)) > return; > > if (pci_is_root_bus(adev->pdev->bus)) > diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c > index 8a5642f2daa6..ebed9c84db04 100644 > --- a/drivers/gpu/drm/amd/amdgpu/nv.c > +++ b/drivers/gpu/drm/amd/amdgpu/nv.c > @@ -520,7 +520,7 @@ static void nv_pcie_gen3_enable(struct amdgpu_device > *adev) > > static void nv_program_aspm(struct amdgpu_device *adev) > { > - if (!amdgpu_aspm) > + if (!amdgpu_device_should_use_aspm(adev)) > return; > > if (!(adev->flags & AMD_IS_APU) && > diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c > index e6d2f74a7976..7f99e130acd0 100644 > --- a/drivers/gpu/drm/amd/amdgpu/si.c > +++ b/drivers/gpu/drm/amd/amdgpu/si.c > @@ -2453,7 +2453,7 @@ static void si_program_aspm(struct amdgpu_device *adev) > bool disable_l0s = false, disable_l1 = false, disable_plloff_in_l1 = > false; > bool disable_clkreq = false; > > - if (amdgpu_aspm == 0) > + if (!amdgpu_device_should_use_aspm(adev)) > return; > > if (adev->flags & AMD_IS_APU) > diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c > b/drivers/gpu/drm/amd/amdgpu/soc15.c > index 99a88f4d8050..fe21397323b0 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc15.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c > @@ -670,7 +670,7 @@ static void soc15_pcie_gen3_enable(struct amdgpu_device > *adev) > > static void soc15_program_aspm(struct amdgpu_device *adev) > { > - if (!amdgpu_aspm) > + if (!amdgpu_device_should_use_aspm(adev)) > return; > > if (!(adev->flags & AMD_IS_APU) && > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c > index 6645ebbd2696..039b90cdc3bc 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -1140,7 +1140,7 @@ static void vi_program_aspm(struct amdgpu_device *adev) > bool bL1SS = false; > bool bClkReqSupport = true; > > - if (!amdgpu_aspm) > + if (!amdgpu_device_should_use_aspm(adev)) > return; > > if (adev->flags & AMD_IS_APU || > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > index 4f0bc1841283..d9d634ce9575 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > @@ -348,7 +348,7 @@ sienna_cichlid_get_allowed_feature_mask(struct > smu_context *smu, > if (smu->dc_controlled_by_gpio) > *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_ACDC_BIT); > > - if (amdgpu_aspm) > + if (amdgpu_device_should_use_aspm(adev)) > *(uint64_t *)feature_mask |= > FEATURE_MASK(FEATURE_DS_LCLK_BIT); > > return 0; > -- > 2.25.1 >