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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 BF14CC43381 for ; Thu, 28 Feb 2019 15:25:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B7F520C01 for ; Thu, 28 Feb 2019 15:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551367545; bh=PLagiQe7k14T8vKSg65U3wFzS/VDCFNuNLdpQTW7bwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wga34Lt7k3ERLwulxDti8MKV2Owgn/lSXQ8HKdBUBGHxGk+I9ABrSzv5ybfhg8Iai 1+WTDeUZJWes+BWJvjuBQ/pZ4fv8QdDnJ1m4f5rFVk78YDFbd2bSEnF3O0oBslhG+5 vrpT5k2dBLp248FtS1re3wtGSzWwP8cbTy+LjUUU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388561AbfB1PZn (ORCPT ); Thu, 28 Feb 2019 10:25:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:45178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388105AbfB1PLx (ORCPT ); Thu, 28 Feb 2019 10:11:53 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 74077218AE; Thu, 28 Feb 2019 15:11:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551366713; bh=PLagiQe7k14T8vKSg65U3wFzS/VDCFNuNLdpQTW7bwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UqEJPw6exBa2P1PqZEiYrAe9A4GpopaJeVQjL3jWMc1x+VN+W29gBt1DdjhER250R 2IdL7wmdtWcktMwbgH0TvFchsLMrz/4p5aXxIhSunujuIpfxRkigYrrg4GNIt9ohAJ gCKRCDTmwwKaXxSEg2v1XwajHB2znXwDH55nWDqg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 25/64] drm/radeon: check if device is root before getting pci speed caps Date: Thu, 28 Feb 2019 10:10:26 -0500 Message-Id: <20190228151105.11277-25-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190228151105.11277-1-sashal@kernel.org> References: <20190228151105.11277-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher [ Upstream commit afeff4c16edaa6275b903f82b0561406259aa3a3 ] Check if the device is root rather before attempting to see what speeds the pcie port supports. Fixes a crash with pci passthrough in a VM. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=109366 Reviewed-by: Evan Quan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/ci_dpm.c | 5 +++-- drivers/gpu/drm/radeon/si_dpm.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index d587779a80b4d..a97294ac96d59 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -5676,7 +5676,7 @@ int ci_dpm_init(struct radeon_device *rdev) u16 data_offset, size; u8 frev, crev; struct ci_power_info *pi; - enum pci_bus_speed speed_cap; + enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN; struct pci_dev *root = rdev->pdev->bus->self; int ret; @@ -5685,7 +5685,8 @@ int ci_dpm_init(struct radeon_device *rdev) return -ENOMEM; rdev->pm.dpm.priv = pi; - speed_cap = pcie_get_speed_cap(root); + if (!pci_is_root_bus(rdev->pdev->bus)) + speed_cap = pcie_get_speed_cap(root); if (speed_cap == PCI_SPEED_UNKNOWN) { pi->sys_pcie_mask = 0; } else { diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 8fb60b3af0158..0a785ef0ab660 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -6899,7 +6899,7 @@ int si_dpm_init(struct radeon_device *rdev) struct ni_power_info *ni_pi; struct si_power_info *si_pi; struct atom_clock_dividers dividers; - enum pci_bus_speed speed_cap; + enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN; struct pci_dev *root = rdev->pdev->bus->self; int ret; @@ -6911,7 +6911,8 @@ int si_dpm_init(struct radeon_device *rdev) eg_pi = &ni_pi->eg; pi = &eg_pi->rv7xx; - speed_cap = pcie_get_speed_cap(root); + if (!pci_is_root_bus(rdev->pdev->bus)) + speed_cap = pcie_get_speed_cap(root); if (speed_cap == PCI_SPEED_UNKNOWN) { si_pi->sys_pcie_mask = 0; } else { -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 25/64] drm/radeon: check if device is root before getting pci speed caps Date: Thu, 28 Feb 2019 10:10:26 -0500 Message-ID: <20190228151105.11277-25-sashal@kernel.org> References: <20190228151105.11277-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190228151105.11277-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Alex Deucher , Sasha Levin , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgoKWyBVcHN0cmVh bSBjb21taXQgYWZlZmY0YzE2ZWRhYTYyNzViOTAzZjgyYjA1NjE0MDYyNTlhYTNhMyBdCgpDaGVj ayBpZiB0aGUgZGV2aWNlIGlzIHJvb3QgcmF0aGVyIGJlZm9yZSBhdHRlbXB0aW5nIHRvIHNlZSB3 aGF0CnNwZWVkcyB0aGUgcGNpZSBwb3J0IHN1cHBvcnRzLiAgRml4ZXMgYSBjcmFzaCB3aXRoIHBj aSBwYXNzdGhyb3VnaAppbiBhIFZNLgoKQnVnOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDkzNjYKUmV2aWV3ZWQtYnk6IEV2YW4gUXVhbiA8ZXZhbi5xdWFu QGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJA YW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vY2lfZHBtLmMgfCA1ICsrKy0tCiBkcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3NpX2RwbS5jIHwgNSArKystLQogMiBmaWxlcyBjaGFuZ2VkLCA2IGluc2Vy dGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9jaV9kcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vY2lfZHBtLmMKaW5kZXggZDU4 Nzc3OWE4MGI0ZC4uYTk3Mjk0YWM5NmQ1OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9jaV9kcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2NpX2RwbS5jCkBAIC01 Njc2LDcgKzU2NzYsNyBAQCBpbnQgY2lfZHBtX2luaXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJk ZXYpCiAJdTE2IGRhdGFfb2Zmc2V0LCBzaXplOwogCXU4IGZyZXYsIGNyZXY7CiAJc3RydWN0IGNp X3Bvd2VyX2luZm8gKnBpOwotCWVudW0gcGNpX2J1c19zcGVlZCBzcGVlZF9jYXA7CisJZW51bSBw Y2lfYnVzX3NwZWVkIHNwZWVkX2NhcCA9IFBDSV9TUEVFRF9VTktOT1dOOwogCXN0cnVjdCBwY2lf ZGV2ICpyb290ID0gcmRldi0+cGRldi0+YnVzLT5zZWxmOwogCWludCByZXQ7CiAKQEAgLTU2ODUs NyArNTY4NSw4IEBAIGludCBjaV9kcG1faW5pdChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikK IAkJcmV0dXJuIC1FTk9NRU07CiAJcmRldi0+cG0uZHBtLnByaXYgPSBwaTsKIAotCXNwZWVkX2Nh cCA9IHBjaWVfZ2V0X3NwZWVkX2NhcChyb290KTsKKwlpZiAoIXBjaV9pc19yb290X2J1cyhyZGV2 LT5wZGV2LT5idXMpKQorCQlzcGVlZF9jYXAgPSBwY2llX2dldF9zcGVlZF9jYXAocm9vdCk7CiAJ aWYgKHNwZWVkX2NhcCA9PSBQQ0lfU1BFRURfVU5LTk9XTikgewogCQlwaS0+c3lzX3BjaWVfbWFz ayA9IDA7CiAJfSBlbHNlIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2lf ZHBtLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3NpX2RwbS5jCmluZGV4IDhmYjYwYjNhZjAx NTguLjBhNzg1ZWYwYWI2NjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2lf ZHBtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9zaV9kcG0uYwpAQCAtNjg5OSw3ICs2 ODk5LDcgQEAgaW50IHNpX2RwbV9pbml0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCXN0 cnVjdCBuaV9wb3dlcl9pbmZvICpuaV9waTsKIAlzdHJ1Y3Qgc2lfcG93ZXJfaW5mbyAqc2lfcGk7 CiAJc3RydWN0IGF0b21fY2xvY2tfZGl2aWRlcnMgZGl2aWRlcnM7Ci0JZW51bSBwY2lfYnVzX3Nw ZWVkIHNwZWVkX2NhcDsKKwllbnVtIHBjaV9idXNfc3BlZWQgc3BlZWRfY2FwID0gUENJX1NQRUVE X1VOS05PV047CiAJc3RydWN0IHBjaV9kZXYgKnJvb3QgPSByZGV2LT5wZGV2LT5idXMtPnNlbGY7 CiAJaW50IHJldDsKIApAQCAtNjkxMSw3ICs2OTExLDggQEAgaW50IHNpX2RwbV9pbml0KHN0cnVj dCByYWRlb25fZGV2aWNlICpyZGV2KQogCWVnX3BpID0gJm5pX3BpLT5lZzsKIAlwaSA9ICZlZ19w aS0+cnY3eHg7CiAKLQlzcGVlZF9jYXAgPSBwY2llX2dldF9zcGVlZF9jYXAocm9vdCk7CisJaWYg KCFwY2lfaXNfcm9vdF9idXMocmRldi0+cGRldi0+YnVzKSkKKwkJc3BlZWRfY2FwID0gcGNpZV9n ZXRfc3BlZWRfY2FwKHJvb3QpOwogCWlmIChzcGVlZF9jYXAgPT0gUENJX1NQRUVEX1VOS05PV04p IHsKIAkJc2lfcGktPnN5c19wY2llX21hc2sgPSAwOwogCX0gZWxzZSB7Ci0tIAoyLjE5LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFp bGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA==