From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: [PATCH 2/2] drm: replace Target Link Speed magic numbers with PCI_EXP_LNKCTL2 definitions Date: Mon, 11 Nov 2019 13:29:32 -0600 Message-ID: <20191111192932.36048-3-helgaas@kernel.org> References: <20191111192932.36048-1-helgaas@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20191111192932.36048-1-helgaas@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Zhou , David Airlie , Daniel Vetter Cc: Frederick Lawler , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ilia Mirkin , linux-pci@vger.kernel.org, Bjorn Helgaas List-Id: amd-gfx.lists.freedesktop.org From: Bjorn Helgaas Replace hard-coded magic numbers with the descript PCI_EXP_LNKCTL2 definitions. No functional change intended. Signed-off-by: Bjorn Helgaas Reviewed-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++---- drivers/gpu/drm/amd/amdgpu/si.c | 8 ++++---- drivers/gpu/drm/radeon/cik.c | 8 ++++---- drivers/gpu/drm/radeon/si.c | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c index e4a595cdd4c1..3067bb874032 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik.c +++ b/drivers/gpu/drm/amd/amdgpu/cik.c @@ -1527,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); diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index cf543410a424..d5c83d82063b 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -1762,13 +1762,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); diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 95ffa0bff2d8..a280442c81aa 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -9647,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); diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 69993d34d1e9..529e70a42019 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -7230,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); -- 2.24.0.rc1.363.gb1bccd3e3d-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9588C43331 for ; Mon, 11 Nov 2019 19:30:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA43E21E6F for ; Mon, 11 Nov 2019 19:30:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA43E21E6F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 06E116E2A8; Mon, 11 Nov 2019 19:30:08 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3955A6E293; Mon, 11 Nov 2019 19:30:06 +0000 (UTC) Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B3CA621E6F; Mon, 11 Nov 2019 19:30:05 +0000 (UTC) From: Bjorn Helgaas To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Zhou , David Airlie , Daniel Vetter Subject: [PATCH 2/2] drm: replace Target Link Speed magic numbers with PCI_EXP_LNKCTL2 definitions Date: Mon, 11 Nov 2019 13:29:32 -0600 Message-Id: <20191111192932.36048-3-helgaas@kernel.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191111192932.36048-1-helgaas@kernel.org> References: <20191111192932.36048-1-helgaas@kernel.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573500606; bh=s6vN2gztyPnVL0ZfK6FlvDDglneenMZ9wnAvmSRIS7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vr86xYOW630eigCpwelKLTDYNr9rFZGS2edjSgFdYW9w0JtjC2RgTy4L13R2rzvY9 0ir24c8alb9DzKQ/GkUoYnW1U6r9Y8sU11QwwQQAnO1505hJ3KbPPP6AWPv8HLer3+ ZbEs1aCXfDhK4gNaavPU3TdLypCOLTvN5z//CPIg= X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frederick Lawler , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Bjorn Helgaas , Ilia Mirkin Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Message-ID: <20191111192932.qb1VmDJKVi_-FWPTO3Uk8mDYN7rdjLSkUIBsB92sERM@z> RnJvbTogQmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KClJlcGxhY2UgaGFyZC1j b2RlZCBtYWdpYyBudW1iZXJzIHdpdGggdGhlIGRlc2NyaXB0IFBDSV9FWFBfTE5LQ1RMMgpkZWZp bml0aW9ucy4gIE5vIGZ1bmN0aW9uYWwgY2hhbmdlIGludGVuZGVkLgoKU2lnbmVkLW9mZi1ieTog Qmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KUmV2aWV3ZWQtYnk6IEFsZXggRGV1 Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9jaWsuYyB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Np LmMgIHwgOCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9jaWsuYyAgICAgfCA4ICsr KystLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMgICAgICB8IDggKysrKy0tLS0KIDQg ZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9jaWsuYwppbmRleCBlNGE1OTVjZGQ0YzEuLjMwNjdiYjg3NDAzMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvY2lrLmMKQEAgLTE1MjcsMTMgKzE1MjcsMTMgQEAgc3RhdGljIHZvaWQg Y2lrX3BjaWVfZ2VuM19lbmFibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJV1JFRzMy X1BDSUUoaXhQQ0lFX0xDX1NQRUVEX0NOVEwsIHNwZWVkX2NudGwpOwogCiAJcGNpX3JlYWRfY29u ZmlnX3dvcmQoYWRldi0+cGRldiwgZ3B1X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgJnRtcDE2KTsK LQl0bXAxNiAmPSB+MHhmOworCXRtcDE2ICY9IH5QQ0lfRVhQX0xOS0NUTDJfVExTOwogCWlmIChh ZGV2LT5wbS5wY2llX2dlbl9tYXNrICYgQ0FJTF9QQ0lFX0xJTktfU1BFRURfU1VQUE9SVF9HRU4z KQotCQl0bXAxNiB8PSAzOyAvKiBnZW4zICovCisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9U TFNfOF8wR1Q7IC8qIGdlbjMgKi8KIAllbHNlIGlmIChhZGV2LT5wbS5wY2llX2dlbl9tYXNrICYg Q0FJTF9QQ0lFX0xJTktfU1BFRURfU1VQUE9SVF9HRU4yKQotCQl0bXAxNiB8PSAyOyAvKiBnZW4y ICovCisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9UTFNfNV8wR1Q7IC8qIGdlbjIgKi8KIAll bHNlCi0JCXRtcDE2IHw9IDE7IC8qIGdlbjEgKi8KKwkJdG1wMTYgfD0gUENJX0VYUF9MTktDVEwy X1RMU18yXzVHVDsgLyogZ2VuMSAqLwogCXBjaV93cml0ZV9jb25maWdfd29yZChhZGV2LT5wZGV2 LCBncHVfcG9zICsgUENJX0VYUF9MTktDVEwyLCB0bXAxNik7CiAKIAlzcGVlZF9jbnRsID0gUlJF RzMyX1BDSUUoaXhQQ0lFX0xDX1NQRUVEX0NOVEwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NpLmMKaW5k ZXggY2Y1NDM0MTBhNDI0Li5kNWM4M2Q4MjA2M2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L3NpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2kuYwpA QCAtMTc2MiwxMyArMTc2MiwxMyBAQCBzdGF0aWMgdm9pZCBzaV9wY2llX2dlbjNfZW5hYmxlKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCVdSRUczMl9QQ0lFX1BPUlQoUENJRV9MQ19TUEVF RF9DTlRMLCBzcGVlZF9jbnRsKTsKIAogCXBjaV9yZWFkX2NvbmZpZ193b3JkKGFkZXYtPnBkZXYs IGdwdV9wb3MgKyBQQ0lfRVhQX0xOS0NUTDIsICZ0bXAxNik7Ci0JdG1wMTYgJj0gfjB4ZjsKKwl0 bXAxNiAmPSB+UENJX0VYUF9MTktDVEwyX1RMUzsKIAlpZiAoYWRldi0+cG0ucGNpZV9nZW5fbWFz ayAmIENBSUxfUENJRV9MSU5LX1NQRUVEX1NVUFBPUlRfR0VOMykKLQkJdG1wMTYgfD0gMzsKKwkJ dG1wMTYgfD0gUENJX0VYUF9MTktDVEwyX1RMU184XzBHVDsgLyogZ2VuMyAqLwogCWVsc2UgaWYg KGFkZXYtPnBtLnBjaWVfZ2VuX21hc2sgJiBDQUlMX1BDSUVfTElOS19TUEVFRF9TVVBQT1JUX0dF TjIpCi0JCXRtcDE2IHw9IDI7CisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9UTFNfNV8wR1Q7 IC8qIGdlbjIgKi8KIAllbHNlCi0JCXRtcDE2IHw9IDE7CisJCXRtcDE2IHw9IFBDSV9FWFBfTE5L Q1RMMl9UTFNfMl81R1Q7IC8qIGdlbjEgKi8KIAlwY2lfd3JpdGVfY29uZmlnX3dvcmQoYWRldi0+ cGRldiwgZ3B1X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgdG1wMTYpOwogCiAJc3BlZWRfY250bCA9 IFJSRUczMl9QQ0lFX1BPUlQoUENJRV9MQ19TUEVFRF9DTlRMKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vY2lrLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2Npay5jCmlu ZGV4IDk1ZmZhMGJmZjJkOC4uYTI4MDQ0MmM4MWFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL2Npay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vY2lrLmMKQEAgLTk2 NDcsMTMgKzk2NDcsMTMgQEAgc3RhdGljIHZvaWQgY2lrX3BjaWVfZ2VuM19lbmFibGUoc3RydWN0 IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJV1JFRzMyX1BDSUVfUE9SVChQQ0lFX0xDX1NQRUVEX0NO VEwsIHNwZWVkX2NudGwpOwogCiAJcGNpX3JlYWRfY29uZmlnX3dvcmQocmRldi0+cGRldiwgZ3B1 X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgJnRtcDE2KTsKLQl0bXAxNiAmPSB+MHhmOworCXRtcDE2 ICY9IH5QQ0lfRVhQX0xOS0NUTDJfVExTOwogCWlmIChzcGVlZF9jYXAgPT0gUENJRV9TUEVFRF84 XzBHVCkKLQkJdG1wMTYgfD0gMzsgLyogZ2VuMyAqLworCQl0bXAxNiB8PSBQQ0lfRVhQX0xOS0NU TDJfVExTXzhfMEdUOyAvKiBnZW4zICovCiAJZWxzZSBpZiAoc3BlZWRfY2FwID09IFBDSUVfU1BF RURfNV8wR1QpCi0JCXRtcDE2IHw9IDI7IC8qIGdlbjIgKi8KKwkJdG1wMTYgfD0gUENJX0VYUF9M TktDVEwyX1RMU181XzBHVDsgLyogZ2VuMiAqLwogCWVsc2UKLQkJdG1wMTYgfD0gMTsgLyogZ2Vu MSAqLworCQl0bXAxNiB8PSBQQ0lfRVhQX0xOS0NUTDJfVExTXzJfNUdUOyAvKiBnZW4xICovCiAJ cGNpX3dyaXRlX2NvbmZpZ193b3JkKHJkZXYtPnBkZXYsIGdwdV9wb3MgKyBQQ0lfRVhQX0xOS0NU TDIsIHRtcDE2KTsKIAogCXNwZWVkX2NudGwgPSBSUkVHMzJfUENJRV9QT1JUKFBDSUVfTENfU1BF RURfQ05UTCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMgYi9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMKaW5kZXggNjk5OTNkMzRkMWU5Li41MjllNzBhNDIwMTkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2kuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3NpLmMKQEAgLTcyMzAsMTMgKzcyMzAsMTMgQEAgc3RhdGljIHZvaWQgc2lf cGNpZV9nZW4zX2VuYWJsZShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAlXUkVHMzJfUENJ RV9QT1JUKFBDSUVfTENfU1BFRURfQ05UTCwgc3BlZWRfY250bCk7CiAKIAlwY2lfcmVhZF9jb25m aWdfd29yZChyZGV2LT5wZGV2LCBncHVfcG9zICsgUENJX0VYUF9MTktDVEwyLCAmdG1wMTYpOwot CXRtcDE2ICY9IH4weGY7CisJdG1wMTYgJj0gflBDSV9FWFBfTE5LQ1RMMl9UTFM7CiAJaWYgKHNw ZWVkX2NhcCA9PSBQQ0lFX1NQRUVEXzhfMEdUKQotCQl0bXAxNiB8PSAzOyAvKiBnZW4zICovCisJ CXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9UTFNfOF8wR1Q7IC8qIGdlbjMgKi8KIAllbHNlIGlm IChzcGVlZF9jYXAgPT0gUENJRV9TUEVFRF81XzBHVCkKLQkJdG1wMTYgfD0gMjsgLyogZ2VuMiAq LworCQl0bXAxNiB8PSBQQ0lfRVhQX0xOS0NUTDJfVExTXzVfMEdUOyAvKiBnZW4yICovCiAJZWxz ZQotCQl0bXAxNiB8PSAxOyAvKiBnZW4xICovCisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9U TFNfMl81R1Q7IC8qIGdlbjEgKi8KIAlwY2lfd3JpdGVfY29uZmlnX3dvcmQocmRldi0+cGRldiwg Z3B1X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgdG1wMTYpOwogCiAJc3BlZWRfY250bCA9IFJSRUcz Ml9QQ0lFX1BPUlQoUENJRV9MQ19TUEVFRF9DTlRMKTsKLS0gCjIuMjQuMC5yYzEuMzYzLmdiMWJj Y2QzZTNkLWdvb2cKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93364C17441 for ; Mon, 11 Nov 2019 19:30:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 76547222CA for ; Mon, 11 Nov 2019 19:30:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76547222CA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E0F86E293; Mon, 11 Nov 2019 19:30:10 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3955A6E293; Mon, 11 Nov 2019 19:30:06 +0000 (UTC) Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B3CA621E6F; Mon, 11 Nov 2019 19:30:05 +0000 (UTC) From: Bjorn Helgaas To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Zhou , David Airlie , Daniel Vetter Subject: [PATCH 2/2] drm: replace Target Link Speed magic numbers with PCI_EXP_LNKCTL2 definitions Date: Mon, 11 Nov 2019 13:29:32 -0600 Message-Id: <20191111192932.36048-3-helgaas@kernel.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191111192932.36048-1-helgaas@kernel.org> References: <20191111192932.36048-1-helgaas@kernel.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573500606; bh=s6vN2gztyPnVL0ZfK6FlvDDglneenMZ9wnAvmSRIS7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vr86xYOW630eigCpwelKLTDYNr9rFZGS2edjSgFdYW9w0JtjC2RgTy4L13R2rzvY9 0ir24c8alb9DzKQ/GkUoYnW1U6r9Y8sU11QwwQQAnO1505hJ3KbPPP6AWPv8HLer3+ ZbEs1aCXfDhK4gNaavPU3TdLypCOLTvN5z//CPIg= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frederick Lawler , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Bjorn Helgaas Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191111192932.8vZgduYEF1gqSmoqg9W9stlINj_HHl8wgRYShcqfH4A@z> RnJvbTogQmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KClJlcGxhY2UgaGFyZC1j b2RlZCBtYWdpYyBudW1iZXJzIHdpdGggdGhlIGRlc2NyaXB0IFBDSV9FWFBfTE5LQ1RMMgpkZWZp bml0aW9ucy4gIE5vIGZ1bmN0aW9uYWwgY2hhbmdlIGludGVuZGVkLgoKU2lnbmVkLW9mZi1ieTog Qmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KUmV2aWV3ZWQtYnk6IEFsZXggRGV1 Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9jaWsuYyB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Np LmMgIHwgOCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9jaWsuYyAgICAgfCA4ICsr KystLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMgICAgICB8IDggKysrKy0tLS0KIDQg ZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9jaWsuYwppbmRleCBlNGE1OTVjZGQ0YzEuLjMwNjdiYjg3NDAzMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvY2lrLmMKQEAgLTE1MjcsMTMgKzE1MjcsMTMgQEAgc3RhdGljIHZvaWQg Y2lrX3BjaWVfZ2VuM19lbmFibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJV1JFRzMy X1BDSUUoaXhQQ0lFX0xDX1NQRUVEX0NOVEwsIHNwZWVkX2NudGwpOwogCiAJcGNpX3JlYWRfY29u ZmlnX3dvcmQoYWRldi0+cGRldiwgZ3B1X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgJnRtcDE2KTsK LQl0bXAxNiAmPSB+MHhmOworCXRtcDE2ICY9IH5QQ0lfRVhQX0xOS0NUTDJfVExTOwogCWlmIChh ZGV2LT5wbS5wY2llX2dlbl9tYXNrICYgQ0FJTF9QQ0lFX0xJTktfU1BFRURfU1VQUE9SVF9HRU4z KQotCQl0bXAxNiB8PSAzOyAvKiBnZW4zICovCisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9U TFNfOF8wR1Q7IC8qIGdlbjMgKi8KIAllbHNlIGlmIChhZGV2LT5wbS5wY2llX2dlbl9tYXNrICYg Q0FJTF9QQ0lFX0xJTktfU1BFRURfU1VQUE9SVF9HRU4yKQotCQl0bXAxNiB8PSAyOyAvKiBnZW4y ICovCisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9UTFNfNV8wR1Q7IC8qIGdlbjIgKi8KIAll bHNlCi0JCXRtcDE2IHw9IDE7IC8qIGdlbjEgKi8KKwkJdG1wMTYgfD0gUENJX0VYUF9MTktDVEwy X1RMU18yXzVHVDsgLyogZ2VuMSAqLwogCXBjaV93cml0ZV9jb25maWdfd29yZChhZGV2LT5wZGV2 LCBncHVfcG9zICsgUENJX0VYUF9MTktDVEwyLCB0bXAxNik7CiAKIAlzcGVlZF9jbnRsID0gUlJF RzMyX1BDSUUoaXhQQ0lFX0xDX1NQRUVEX0NOVEwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NpLmMKaW5k ZXggY2Y1NDM0MTBhNDI0Li5kNWM4M2Q4MjA2M2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L3NpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2kuYwpA QCAtMTc2MiwxMyArMTc2MiwxMyBAQCBzdGF0aWMgdm9pZCBzaV9wY2llX2dlbjNfZW5hYmxlKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCVdSRUczMl9QQ0lFX1BPUlQoUENJRV9MQ19TUEVF RF9DTlRMLCBzcGVlZF9jbnRsKTsKIAogCXBjaV9yZWFkX2NvbmZpZ193b3JkKGFkZXYtPnBkZXYs IGdwdV9wb3MgKyBQQ0lfRVhQX0xOS0NUTDIsICZ0bXAxNik7Ci0JdG1wMTYgJj0gfjB4ZjsKKwl0 bXAxNiAmPSB+UENJX0VYUF9MTktDVEwyX1RMUzsKIAlpZiAoYWRldi0+cG0ucGNpZV9nZW5fbWFz ayAmIENBSUxfUENJRV9MSU5LX1NQRUVEX1NVUFBPUlRfR0VOMykKLQkJdG1wMTYgfD0gMzsKKwkJ dG1wMTYgfD0gUENJX0VYUF9MTktDVEwyX1RMU184XzBHVDsgLyogZ2VuMyAqLwogCWVsc2UgaWYg KGFkZXYtPnBtLnBjaWVfZ2VuX21hc2sgJiBDQUlMX1BDSUVfTElOS19TUEVFRF9TVVBQT1JUX0dF TjIpCi0JCXRtcDE2IHw9IDI7CisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9UTFNfNV8wR1Q7 IC8qIGdlbjIgKi8KIAllbHNlCi0JCXRtcDE2IHw9IDE7CisJCXRtcDE2IHw9IFBDSV9FWFBfTE5L Q1RMMl9UTFNfMl81R1Q7IC8qIGdlbjEgKi8KIAlwY2lfd3JpdGVfY29uZmlnX3dvcmQoYWRldi0+ cGRldiwgZ3B1X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgdG1wMTYpOwogCiAJc3BlZWRfY250bCA9 IFJSRUczMl9QQ0lFX1BPUlQoUENJRV9MQ19TUEVFRF9DTlRMKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vY2lrLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2Npay5jCmlu ZGV4IDk1ZmZhMGJmZjJkOC4uYTI4MDQ0MmM4MWFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL2Npay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vY2lrLmMKQEAgLTk2 NDcsMTMgKzk2NDcsMTMgQEAgc3RhdGljIHZvaWQgY2lrX3BjaWVfZ2VuM19lbmFibGUoc3RydWN0 IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJV1JFRzMyX1BDSUVfUE9SVChQQ0lFX0xDX1NQRUVEX0NO VEwsIHNwZWVkX2NudGwpOwogCiAJcGNpX3JlYWRfY29uZmlnX3dvcmQocmRldi0+cGRldiwgZ3B1 X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgJnRtcDE2KTsKLQl0bXAxNiAmPSB+MHhmOworCXRtcDE2 ICY9IH5QQ0lfRVhQX0xOS0NUTDJfVExTOwogCWlmIChzcGVlZF9jYXAgPT0gUENJRV9TUEVFRF84 XzBHVCkKLQkJdG1wMTYgfD0gMzsgLyogZ2VuMyAqLworCQl0bXAxNiB8PSBQQ0lfRVhQX0xOS0NU TDJfVExTXzhfMEdUOyAvKiBnZW4zICovCiAJZWxzZSBpZiAoc3BlZWRfY2FwID09IFBDSUVfU1BF RURfNV8wR1QpCi0JCXRtcDE2IHw9IDI7IC8qIGdlbjIgKi8KKwkJdG1wMTYgfD0gUENJX0VYUF9M TktDVEwyX1RMU181XzBHVDsgLyogZ2VuMiAqLwogCWVsc2UKLQkJdG1wMTYgfD0gMTsgLyogZ2Vu MSAqLworCQl0bXAxNiB8PSBQQ0lfRVhQX0xOS0NUTDJfVExTXzJfNUdUOyAvKiBnZW4xICovCiAJ cGNpX3dyaXRlX2NvbmZpZ193b3JkKHJkZXYtPnBkZXYsIGdwdV9wb3MgKyBQQ0lfRVhQX0xOS0NU TDIsIHRtcDE2KTsKIAogCXNwZWVkX2NudGwgPSBSUkVHMzJfUENJRV9QT1JUKFBDSUVfTENfU1BF RURfQ05UTCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMgYi9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMKaW5kZXggNjk5OTNkMzRkMWU5Li41MjllNzBhNDIwMTkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2kuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3NpLmMKQEAgLTcyMzAsMTMgKzcyMzAsMTMgQEAgc3RhdGljIHZvaWQgc2lf cGNpZV9nZW4zX2VuYWJsZShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAlXUkVHMzJfUENJ RV9QT1JUKFBDSUVfTENfU1BFRURfQ05UTCwgc3BlZWRfY250bCk7CiAKIAlwY2lfcmVhZF9jb25m aWdfd29yZChyZGV2LT5wZGV2LCBncHVfcG9zICsgUENJX0VYUF9MTktDVEwyLCAmdG1wMTYpOwot CXRtcDE2ICY9IH4weGY7CisJdG1wMTYgJj0gflBDSV9FWFBfTE5LQ1RMMl9UTFM7CiAJaWYgKHNw ZWVkX2NhcCA9PSBQQ0lFX1NQRUVEXzhfMEdUKQotCQl0bXAxNiB8PSAzOyAvKiBnZW4zICovCisJ CXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9UTFNfOF8wR1Q7IC8qIGdlbjMgKi8KIAllbHNlIGlm IChzcGVlZF9jYXAgPT0gUENJRV9TUEVFRF81XzBHVCkKLQkJdG1wMTYgfD0gMjsgLyogZ2VuMiAq LworCQl0bXAxNiB8PSBQQ0lfRVhQX0xOS0NUTDJfVExTXzVfMEdUOyAvKiBnZW4yICovCiAJZWxz ZQotCQl0bXAxNiB8PSAxOyAvKiBnZW4xICovCisJCXRtcDE2IHw9IFBDSV9FWFBfTE5LQ1RMMl9U TFNfMl81R1Q7IC8qIGdlbjEgKi8KIAlwY2lfd3JpdGVfY29uZmlnX3dvcmQocmRldi0+cGRldiwg Z3B1X3BvcyArIFBDSV9FWFBfTE5LQ1RMMiwgdG1wMTYpOwogCiAJc3BlZWRfY250bCA9IFJSRUcz Ml9QQ0lFX1BPUlQoUENJRV9MQ19TUEVFRF9DTlRMKTsKLS0gCjIuMjQuMC5yYzEuMzYzLmdiMWJj Y2QzZTNkLWdvb2cKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bA==