Received: by 10.223.185.116 with SMTP id b49csp4172202wrg; Mon, 26 Feb 2018 12:30:56 -0800 (PST) X-Google-Smtp-Source: AH8x2258n/wubeME4WIYSEqn9XPq1v8G+LDgiBbB0YE6QnOb3RynR5TjVdFeQm0r9S4Or5qBlb7C X-Received: by 10.98.200.80 with SMTP id z77mr11536275pff.85.1519677056512; Mon, 26 Feb 2018 12:30:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677056; cv=none; d=google.com; s=arc-20160816; b=K34PQkXNeXRgnfFnqLRwwRlWqxp6XUJm4usuJYJvENXy9i9G2SHTJRph7skNLWCLbr XT1q63uz5fm3tQRSF2GTPOU5kB6GqzyFOwvBz6AsFCT+vqQvAFk0XWlqbdjYAHgqN7Qf yON9GVFqUNqR63UrTDVUA/0/KGNkzqRflMmDSa1+i15XXeWIHQDErwKEj2qRPbWf7Np7 CX40zpMAf0NtaaP2mc7vI+8DYtB1yy5tYSUlKSVvgVqfJsDqrnCCkbn/ucaSEAJzsaT3 2LEuDTgtRfhSiSpsSvK9qAJTskUQTorVOw2t8hCym+FOwmkG1Zc0dkWGSUDqn9CjIKB5 PlIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=WeTwzZr25idPxkvhSwY5j4k0jeU35BJztQHnsu6zWR8=; b=z9NtUYfiSkQ+KKmyYaZSRrtzM8CnjLGxCk17PJDdN0BXvHALY3BJ9YzDBslIDDpIot 1TrwVMdIb5FTLiseQCXhpSZPrbWizwArVEp5zLs7BIQfotHlo6+pOeFMjRwtPmwv8UGO HX2PXntoWliMJ1QDvAOOjtB3Rr+lNQuYLvXJ8M9FX6jmMeNM0J02GKY6Cjr+l6N87pxA 791vDGDO+vBUZ4oGGOSSPC9Fy7S55JOICxu2a8Gwu1kLWWFbB38vtA/PGF0IdnXzD49Q 2oniyEKdFsUXZZdcHTLhUrxVq5JYu4yqWpw7KgBk1zcCsQqTJlUlQDIoXpGHpovn4+aY i8yg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i1-v6si3537043pld.260.2018.02.26.12.30.40; Mon, 26 Feb 2018 12:30:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932124AbeBZU2v (ORCPT + 99 others); Mon, 26 Feb 2018 15:28:51 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37350 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753567AbeBZU2s (ORCPT ); Mon, 26 Feb 2018 15:28:48 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E50E8E75; Mon, 26 Feb 2018 20:28:47 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiangliang Yu , Alex Deucher Subject: [PATCH 4.15 59/64] drm/amdgpu: only check mmBIF_IOV_FUNC_IDENTIFIER on tonga/fiji Date: Mon, 26 Feb 2018 21:22:36 +0100 Message-Id: <20180226202155.971692043@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit 57ad33a307bf85cafda3a77c03a555c9f9ee4139 upstream. We only support SR-IOV on tonga/fiji. Don't check this register on other VI parts. Fixes: 048765ad5af7c89 (amdgpu: fix asic initialization for virtualized environments (v2)) Reviewed-by: Xiangliang Yu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/vi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -449,14 +449,19 @@ static bool vi_read_bios_from_rom(struct static void vi_detect_hw_virtualization(struct amdgpu_device *adev) { - uint32_t reg = RREG32(mmBIF_IOV_FUNC_IDENTIFIER); - /* bit0: 0 means pf and 1 means vf */ - /* bit31: 0 means disable IOV and 1 means enable */ - if (reg & 1) - adev->virt.caps |= AMDGPU_SRIOV_CAPS_IS_VF; + uint32_t reg = 0; - if (reg & 0x80000000) - adev->virt.caps |= AMDGPU_SRIOV_CAPS_ENABLE_IOV; + if (adev->asic_type == CHIP_TONGA || + adev->asic_type == CHIP_FIJI) { + reg = RREG32(mmBIF_IOV_FUNC_IDENTIFIER); + /* bit0: 0 means pf and 1 means vf */ + /* bit31: 0 means disable IOV and 1 means enable */ + if (reg & 1) + adev->virt.caps |= AMDGPU_SRIOV_CAPS_IS_VF; + + if (reg & 0x80000000) + adev->virt.caps |= AMDGPU_SRIOV_CAPS_ENABLE_IOV; + } if (reg == 0) { if (is_virtual_machine()) /* passthrough mode exclus sr-iov mode */