From patchwork Fri Apr 19 23:00:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fernando Pacheco X-Patchwork-Id: 10909847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8AFB113B5 for ; Fri, 19 Apr 2019 23:02:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7325D28E27 for ; Fri, 19 Apr 2019 23:02:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6793A28E31; Fri, 19 Apr 2019 23:02:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0B98528E2C for ; Fri, 19 Apr 2019 23:02:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 15ED6892C0; Fri, 19 Apr 2019 23:02:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id B5F05892C1 for ; Fri, 19 Apr 2019 23:02:44 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2019 16:02:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,371,1549958400"; d="scan'208";a="339160764" Received: from pachecof-ubuntu.fm.intel.com ([10.1.27.31]) by fmsmga005.fm.intel.com with ESMTP; 19 Apr 2019 16:02:44 -0700 From: Fernando Pacheco To: intel-gfx@lists.freedesktop.org Date: Fri, 19 Apr 2019 16:00:10 -0700 Message-Id: <20190419230015.18121-1-fernando.pacheco@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 0/5] Perma-pin uC firmware and re-enable global reset X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The intent is to move the GuC and HuC firmware images to the top of the address space. This portion is inaccessible during normal GuC operations and should be relatively safe to house both firmware images. By making the move we can re-enable the full gpu reset with GuC enabled. Placing the firmware images above GUC_GGTT_TOP was discussed previously here: https://patchwork.freedesktop.org/patch/273616/ v3: Bindings are only needed for xfer v2: The decision to rename both the uc_fw init and fini functions made it easier to pull the bind/unbind operations out of intel_guc_fw.* and intel_huc_fw.*. The bind/unbind will now take place within the newly repurposed intel_uc_fw_init/fini. All other changes should be called out in their respective patches and should be the direct result of a review comment. Cc: Chris Wilson Cc: Daniele Ceraolo Spurio Fernando Pacheco (5): drm/i915/uc: Rename uC firmware init/fini functions drm/i915/uc: Reserve upper range of GGTT drm/i915/uc: Place uC firmware in upper range of GGTT Revert "drm/i915/guc: Disable global reset" drm/i915/selftests: Check that gpu reset is usable from atomic context drivers/gpu/drm/i915/i915_gem_gtt.c | 25 ++-- drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + drivers/gpu/drm/i915/i915_reset.c | 3 - drivers/gpu/drm/i915/intel_guc.c | 41 ++++++- drivers/gpu/drm/i915/intel_guc.h | 2 + drivers/gpu/drm/i915/intel_guc_fw.c | 20 ++-- drivers/gpu/drm/i915/intel_huc.c | 74 +++++++++--- drivers/gpu/drm/i915/intel_huc.h | 6 +- drivers/gpu/drm/i915/intel_huc_fw.c | 49 +++++--- drivers/gpu/drm/i915/intel_uc.c | 23 +++- drivers/gpu/drm/i915/intel_uc_fw.c | 107 +++++++++++++----- drivers/gpu/drm/i915/intel_uc_fw.h | 10 +- .../gpu/drm/i915/selftests/intel_hangcheck.c | 6 +- 13 files changed, 267 insertions(+), 100 deletions(-)