From patchwork Mon Aug 15 18:20:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Cox X-Patchwork-Id: 1666558 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=G22OGV4y; dkim-atps=neutral Received: from legolas.ozlabs.org (legolas.ozlabs.org [150.107.73.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M62gH4qQRz9sGG for ; Tue, 16 Aug 2022 04:22:03 +1000 (AEST) Received: by legolas.ozlabs.org (Postfix) id 4M62gH0vVYz1yf9; Tue, 16 Aug 2022 04:22:03 +1000 (AEST) Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=G22OGV4y; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M62gF45mSz1ygR for ; Tue, 16 Aug 2022 04:22:01 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oNeim-0003rC-C8; Mon, 15 Aug 2022 18:21:52 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oNeil-0003qw-6U for kernel-team@lists.ubuntu.com; Mon, 15 Aug 2022 18:21:51 +0000 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E2B983F11A for ; Mon, 15 Aug 2022 18:21:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660587710; bh=xiqiCg2pEd4krjCp0aItDaCg9lIWgDAeYRc81T0Fjtg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G22OGV4yoWy41qHmvadHE3H34XlgPQT/6saClHmNcJ9Hn/JQ/Fp3GSuQni+gEyOQK hy9tJ7PByacopEilcDjJidZFE8PC2LydiuwfwKQIdd4PI4nXBEduRjIOhAUOI0mtqS W9jvxi08tZrwU9X8xBpqPT0CXZn5olMSh8Y06ZdgQCCrA/8eP5pC5fT9KUZrlygbZY 7cfqNEN/25qTk/kFRhxNEc/zb1m3wJa3l+Psq5tXdbip/vSnRPCBKjXeFJXoQuSq3i 8EDOWJoFa0mrfLWF/DoQ0POT8b1WlxsLZddYxnCjilN+KODSmhvHj2FgaywmyiF94q InKXNsEwvogcw== Received: by mail-il1-f198.google.com with SMTP id d6-20020a056e020c0600b002deca741bc2so5556409ile.18 for ; Mon, 15 Aug 2022 11:21:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=xiqiCg2pEd4krjCp0aItDaCg9lIWgDAeYRc81T0Fjtg=; b=uSKxTRCsXoSLszGnbzIREPb2bxARqgVFd0+1GicpWrImd/IQxmcF6o2vYDVlAAxTs7 Nu86NmM9szqEb0q1hcBd3htduXYhIqO2JuH1JkZA2nBlIOWPzsGnz1s3r+s8DBA84Xey q3tStltmHT4Uu4kMsx3fmOVhH0JPUK+gXHmnzCdf/v7hBBi4GbDWlDyL9nu/UiL8oC3S MhJDl1EfVAgugohDEHYlY3uLsuOuHOoHXSY0MfplmSQoYtgvM72szPHneY7seBbL4YGD kpUP9SW6VEMNcR+VatthdnsIz848ZbPY9dqjE2En48zLeNwJKRwrxVVnvRT8aL+l1zB0 0Xwg== X-Gm-Message-State: ACgBeo0lDgAKGcTxyhK6OL2lUtgBe9ntuITU2UK1LzTgKPU+L7uywYyp lsi5S1hFrjqZETSAk/3nsMuWUxOMN0SiNdBQ4nhmi5dc6hYMMwAJ9sHO8BpTuRXKlRhEF7GqTL8 a4oQY2QHPGGIZEwv36zdYsZ+4JhN2YMfe/zannb+j9Q== X-Received: by 2002:a6b:671e:0:b0:688:6ab6:c64a with SMTP id b30-20020a6b671e000000b006886ab6c64amr1847554ioc.3.1660587709693; Mon, 15 Aug 2022 11:21:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR468iadSeUYFTK2iy9AiOt+9fJRdWxGR04gorfWcUgbvi1lMssLMd2K5akgr1ScZr+E3JW/zg== X-Received: by 2002:a6b:671e:0:b0:688:6ab6:c64a with SMTP id b30-20020a6b671e000000b006886ab6c64amr1847548ioc.3.1660587709495; Mon, 15 Aug 2022 11:21:49 -0700 (PDT) Received: from localhost.localdomain ([104.247.231.135]) by smtp.gmail.com with ESMTPSA id k2-20020a92c9c2000000b002cc20b48163sm4094394ilq.3.2022.08.15.11.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 11:21:48 -0700 (PDT) From: Philip Cox To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: SAUCE: drm/i915/gen11: Moving WAs to icl_gt_workarounds_init() Date: Mon, 15 Aug 2022 14:20:54 -0400 Message-Id: <20220815182055.1142354-2-philip.cox@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220815182055.1142354-1-philip.cox@canonical.com> References: <20220815182055.1142354-1-philip.cox@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Raviteja Goud Talla BugLink: https://bugs.launchpad.net/bugs/1981971 Bspec page says "Reset: BUS", Accordingly moving w/a's: Wa_1407352427,Wa_1406680159 to proper function icl_gt_workarounds_init() Which will resolve guc enabling error v2: - Previous patch rev2 was created by email client which caused the Build failure, This v2 is to resolve the previous broken series Reviewed-by: John Harrison Signed-off-by: Raviteja Goud Talla Signed-off-by: John Harrison Link: https://patchwork.freedesktop.org/patch/msgid/20211203145603.4006937-1-ravitejax.goud.talla@intel.com (cherry picked from commit 67b858dd89932086ae0ee2d0ce4dd070a2c88bb3) Signed-off-by: Philip Cox --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 6b5ab19a2ada..0dda8f6da423 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1049,6 +1049,15 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) GAMT_CHKN_BIT_REG, GAMT_CHKN_DISABLE_L3_COH_PIPE); + /* Wa_1407352427:icl,ehl */ + wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2, + PSDUNIT_CLKGATE_DIS); + + /* Wa_1406680159:icl,ehl */ + wa_write_or(wal, + SUBSLICE_UNIT_LEVEL_CLKGATE, + GWUNIT_CLKGATE_DIS); + /* Wa_1607087056:icl,ehl,jsl */ if (IS_ICELAKE(i915) || IS_JSL_EHL_GT_STEP(i915, STEP_A0, STEP_B0)) @@ -1745,15 +1754,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE, VSUNIT_CLKGATE_DIS | HSUNIT_CLKGATE_DIS); - /* Wa_1407352427:icl,ehl */ - wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2, - PSDUNIT_CLKGATE_DIS); - - /* Wa_1406680159:icl,ehl */ - wa_write_or(wal, - SUBSLICE_UNIT_LEVEL_CLKGATE, - GWUNIT_CLKGATE_DIS); - /* * Wa_1408767742:icl[a2..forever],ehl[all] * Wa_1605460711:icl[a0..c0] From patchwork Mon Aug 15 18:20:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Cox X-Patchwork-Id: 1666556 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=v8szBnOJ; dkim-atps=neutral Received: from legolas.ozlabs.org (legolas.ozlabs.org [150.107.73.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M62gH1b6Cz9sFs for ; Tue, 16 Aug 2022 04:22:03 +1000 (AEST) Received: by legolas.ozlabs.org (Postfix) id 4M62gG0byrz1ygS; Tue, 16 Aug 2022 04:22:02 +1000 (AEST) Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=v8szBnOJ; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M62gF42gJz1ygN for ; Tue, 16 Aug 2022 04:22:01 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oNeip-0003s9-I0; Mon, 15 Aug 2022 18:21:55 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oNein-0003rV-51 for kernel-team@lists.ubuntu.com; Mon, 15 Aug 2022 18:21:53 +0000 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id EABBB3F11A for ; Mon, 15 Aug 2022 18:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660587712; bh=ZT4dLdErkYpu6xjo81BOabI/n/yz1i478VWPIgYceT0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=v8szBnOJ3/fbKpVx7+lK7XMjhkAYNxLnGwfY6jqlrzOkZ2MiHKtdT2Hh1dZw1NaPl rhiUu4fKGxXFzWQt0AV0lnjPJKVdOMMkL5nH/zEO4D/WmmWc8qQT9Sqa+hixAkyGH6 81FUcBImX34PD0q5frb52QC3jrl1W6bHrweXyKlxDijOqFaUjKmsMWa2A537wWikLy 2wrqpEh9CrEsUJnlV0kW6rNJ77dnwivQgMnw3tOgn+IV/2kpVFZER6oXhUVVueUGvS jTNXuEa+s9uYVGABjcLy5felWnyujapz1FtA2B3veElCUH4xSILtzEm8H9T94eTA9y 63+E8IRymmKbQ== Received: by mail-il1-f198.google.com with SMTP id o9-20020a056e0214c900b002dc29c288bfso5566298ilk.3 for ; Mon, 15 Aug 2022 11:21:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=ZT4dLdErkYpu6xjo81BOabI/n/yz1i478VWPIgYceT0=; b=7fxBeiEzBXI96M0MXNZS5eNNo7wQrbV7M6XnCM/zNNbFQjnpOUY7jD+e3aqgFo6r9F belN6uEjAkLhuod5UHcwcm7FBiS3kQsEDcFZQPZnTWMXGldX5uXPnz4LxYZbkqEI69Cr cEJ7ASzSbBj6GAtRThmjL+V8H8HD2Yu8pL7hbhtyc2Eo9Uqi7vBYlxrjsa3zvtUJ6zpe oyHh9abzJbsb4Zr/Nd8onGJzBZStJHrCg0BZrcxjpV6m/3pyPX0rx5Hosf965nhgtaOh QnqwYuvS0jDyC18FjXRUJZIP6y87+ETT87g2pYDNlNp0Hp/IhZAns/70QU8CQZOyBio5 YSXA== X-Gm-Message-State: ACgBeo0MpHpbQ6QEYvLJITt8C5xWNf+4/N2Qda1tLQrHyMi30qBizHRV g9b2BukQQq6dnd2tZ3Yg4cGy97Mz7QPELiuz/5C03qxK951NnptuYzVidDOZSmtYqqoiPHu8uo3 uU/DObJy4Uj9W32+d/TtEGBp7FWxfC5g6wj72lBA4dg== X-Received: by 2002:a02:cab1:0:b0:343:4355:45e3 with SMTP id e17-20020a02cab1000000b00343435545e3mr8098694jap.165.1660587711482; Mon, 15 Aug 2022 11:21:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR6pOc5YpSmGiiNJNvIqvgVre9Gg8BwGckGp6tK1UgnOwSSa1CeuSQP3xWOpNip2/xIUcfZo8w== X-Received: by 2002:a02:cab1:0:b0:343:4355:45e3 with SMTP id e17-20020a02cab1000000b00343435545e3mr8098683jap.165.1660587711227; Mon, 15 Aug 2022 11:21:51 -0700 (PDT) Received: from localhost.localdomain ([104.247.231.135]) by smtp.gmail.com with ESMTPSA id k2-20020a92c9c2000000b002cc20b48163sm4094394ilq.3.2022.08.15.11.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 11:21:49 -0700 (PDT) From: Philip Cox To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 2/2] UBUNTU: SAUCE: (no-up) drm/i915: set enable_guc=2 for EHL, ICL, ADL-S platforms. Date: Mon, 15 Aug 2022 14:20:55 -0400 Message-Id: <20220815182055.1142354-3-philip.cox@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220815182055.1142354-1-philip.cox@canonical.com> References: <20220815182055.1142354-1-philip.cox@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1981971 The Elkhart Lake, Ice Lake, and Alder Lake S platforms need i915.enable_guc=2/ENABLE_GUC_LOAD_HUC to be set for them to work with the current version of the i915 driver we have in the linux-intel-iotg kernel. v2: Removed magic number. Signed-off-by: Philip Cox --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 86c318516e14..0c46a7c4d30f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -22,7 +22,18 @@ static void uc_expand_default_options(struct intel_uc *uc) if (i915->params.enable_guc != -1) return; - /* Don't enable GuC/HuC on pre-Gen12 */ + /* The parameter i915.enable_guc=2 is needed for EHL, ICL and ADL-S + to enable HuC authentication but not explicitly required for ADL-P + since HuC is default enabled. This check needs to be before the other + conditions are checked because the gen11 gfx platforms would return + out of the function and not get set. + */ + if (IS_JSL_EHL(i915) || IS_ICELAKE(i915) || IS_ALDERLAKE_S(i915)) { + i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; + return; + } + + /* Don't enable GuC/HuC on non-ICL and non-EHL pre-Gen12 platforms */ if (GRAPHICS_VER(i915) < 12) { i915->params.enable_guc = 0; return; @@ -35,7 +46,7 @@ static void uc_expand_default_options(struct intel_uc *uc) } /* Intermediate platforms are HuC authentication only */ - if (IS_DG1(i915) || IS_ALDERLAKE_S(i915)) { + if (IS_DG1(i915)) { i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; return; }