Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp654522rdh; Sun, 24 Sep 2023 06:19:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGeZ0Lwrm7aUluV0YPiPgsA3WC80IYfazfmCWrKDcnPhNI+rYERqje7hgj+cpLxvu1Jqhf X-Received: by 2002:a17:902:e80d:b0:1c2:193e:1126 with SMTP id u13-20020a170902e80d00b001c2193e1126mr6032623plg.28.1695561550151; Sun, 24 Sep 2023 06:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695561550; cv=none; d=google.com; s=arc-20160816; b=vJRIpUXlU7Y4DLYYfOTMtHHC85i7W6c578sfLWDZfHXlN4T8oRVzohd/QYO670B5/3 BJWEMsVudcOGg7XIXNSHt3klh3UJm+odttfGCQIZxtQgDcX31Y011XwsIYNjFnHO9Q6W Fn/1nMTW/oAmP1Mpp+NePyCuCp2uymMjUxAp0kLygdsQ2t7EL34Ppa2Af7Po+h1qPGfz IWFKdmOQ64PoDtk1TVy0TwRcbN6fuVeydYYy8g/KnfbGT17LfEXcW+0YmOrG1hiI7/R6 QzSeNZIHYmmvTeVBWlkwGWZ+cnlHli9eKJy+zweSHsO66Xd0HFR46HvPyChK0DC9j6Ds D4rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sOa/MM+CpTXBtCzx5Ex0wmesU5LP/uU2eVWiMh5wZSk=; fh=nvrXiA/G5XCfCX0Sy3a+G0q0yaRdm5437Hs29U/Z0mc=; b=UQsyAizYUqQpPa6QFSiT0gxdQ13o9j3CESH3JAFiEP4DglqYbr42XpY/4uMQiovUaZ RJ8gExcZquXId1kxDkIyNL3q6J/UKoV60kFX2JBHBukesdtHKxfOZchDBK7NEkWj6SkZ MArbzjgP53iV0h0purBwlST5Uyt720nnsFa/R8oYRGiP2GIQZ57qcYeSqox6qiTJRhH5 wHBMQEjYEqDgQpovjRa2o5aBt1FUFDONV5JTcdU8Bagi+tHQh2de9HC1MYZMf8iiGGPn tStEq2witqGogLhxeSTBtXVImFhY7UxigP4pEwEtNj8IyE/L/r6S+LGKp3kTlW0c7u8H vXIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DfeKXIX/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id e1-20020a17090301c100b001c3976e22f5si3764246plh.515.2023.09.24.06.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 06:19:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DfeKXIX/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id D42D68022469; Sun, 24 Sep 2023 06:19:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230167AbjIXNSo (ORCPT + 99 others); Sun, 24 Sep 2023 09:18:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbjIXNS2 (ORCPT ); Sun, 24 Sep 2023 09:18:28 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B6BE1729; Sun, 24 Sep 2023 06:17:18 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15355C433C9; Sun, 24 Sep 2023 13:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695561438; bh=AkESHVaIEK/Q0N156xWN9b9wJHZIeDxy8gc9Dgudzoo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DfeKXIX/TxbigZcVVBWGNMuiOjc1bScZaEOW+u3v1vEJ+WSiJFArA7Id95QrSIeHL lzzNqrJNUv3eN7skJQJW657B3qcMolg8Ao4gU7mmiJMfsWHwbo7619cRPNLQQzRs68 DROWe8PzQs9o6vbf13j396Rc8fnV/3jkYB1Vqkq8w8Yjzxm/mitX1oQyruGQzJvvcR GEbbS55vErLG3gz7VnzFthx0HvqIpKrb0GnkynbS3Cjy3JkuApRauLoFm7XoaJ/mK2 iMF6s3LmKt1voHnWQ7eno6gEPXRjrpOqaYq45X7Lgn/JuAXtgzFGwPtl/mfFCSAC4D FBOujhyhiiA3g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Timmy Tsai , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, mario.limonciello@amd.com, candice.li@amd.com, Hawking.Zhang@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.5 30/41] drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV Date: Sun, 24 Sep 2023 09:15:18 -0400 Message-Id: <20230924131529.1275335-30-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230924131529.1275335-1-sashal@kernel.org> References: <20230924131529.1275335-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.5 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 24 Sep 2023 06:19:08 -0700 (PDT) From: Alex Deucher [ Upstream commit ab43213e7afd08ac68d4282060bacf309e70fd14 ] Needed for HDP flush to work correctly. Reviewed-by: Timmy Tsai Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c b/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c index d5ed9e0e1a5f1..e5b5b0f4940f4 100644 --- a/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c @@ -345,6 +345,9 @@ static void nbio_v4_3_init_registers(struct amdgpu_device *adev) data &= ~RCC_DEV0_EPF2_STRAP2__STRAP_NO_SOFT_RESET_DEV0_F2_MASK; WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF2_STRAP2, data); } + if (amdgpu_sriov_vf(adev)) + adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0, + regBIF_BX_DEV0_EPF0_VF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2; } static u32 nbio_v4_3_get_rom_offset(struct amdgpu_device *adev) -- 2.40.1