From patchwork Thu Jul 25 13:56:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Usyskin X-Patchwork-Id: 814556 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C87C31993B7 for ; Thu, 25 Jul 2024 14:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721916378; cv=none; b=DkkwywblPCn61XogPeUZA5GO4i+8QaGgeqrg/4Me6A719dYajL5qqa65TfK6Lxp+z7qWL0/F+u158/dfiHoWQcXWgpbZvC3GqcunZJmWyTm5bFB4vMKwzaLWmgujjY3OBiZE89cRXPf3aUC3kbm1IJznzXIY884jcwzulhIsOC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721916378; c=relaxed/simple; bh=qWTpkyGmT+qHfbsiAtnPnaMcQltPze6qXR966ASrSdQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qYYgTSoWiw/vyf3etRGxC94hzeG/QwDIgNdXcWPV5VRJoIDkj2oXOGEs9gsf+2OdVZKGrQcC/LPiqCBXZSY1Zi4zSOleU60T0g6PyXmWVk8YZ4b6sDxqKBj3HDBNcdD4lpY6aTbSjoyuksxcJQMyS+ztx+ld2HuV9wK2o7F22LE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=VYFAcihB; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="VYFAcihB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1721916377; x=1753452377; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qWTpkyGmT+qHfbsiAtnPnaMcQltPze6qXR966ASrSdQ=; b=VYFAcihB233Dy+9Mtl9Sd2RElzqZobdntcWsfTarIeh4/ZwrpBtDTBYV gohJotRW9vzuGaHEStGVYEE5ZMgYt7IAfPjhuZiEqY3AyggNJhEksHRX2 LYqYkIiSW+BYoixGhNwCiMM+VccI6y6Az8FgGIWmxlu/p5e6re+xbejp/ 8Mt/fC14FG5aDPYtnCMqwDhnDBnxWCX2atDD+AcrjyMZ+r13EhZJCnHjg hrOkbGChl3O8/YU7dmmiPISEBOrGOvQLR1FGrlcyxVaDjYWfSmmEyivt8 iI/97I/XbKpVDGpAKiTR50INoWDvPEmFteJpBDMSVLpxi00UNnDqXvQHH w==; X-CSE-ConnectionGUID: KD7iXUf5RxyYcmikqf+kBg== X-CSE-MsgGUID: Ev+/pTQ6R6aohvT5SiSYdA== X-IronPort-AV: E=McAfee;i="6700,10204,11144"; a="19504966" X-IronPort-AV: E=Sophos;i="6.09,236,1716274800"; d="scan'208";a="19504966" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2024 07:06:17 -0700 X-CSE-ConnectionGUID: fQTRR9wAQnC2Ugw+3vp7HQ== X-CSE-MsgGUID: HHpkXpTHTN2qylMdL6pKYg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,236,1716274800"; d="scan'208";a="53007851" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2024 07:06:10 -0700 From: Alexander Usyskin To: Mark Brown , Lucas De Marchi , Oded Gabbay , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-spi@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: [PATCH v3 10/12] drm/i915/spi: add support for access mode Date: Thu, 25 Jul 2024 16:56:55 +0300 Message-Id: <20240725135657.1061836-11-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240725135657.1061836-1-alexander.usyskin@intel.com> References: <20240725135657.1061836-1-alexander.usyskin@intel.com> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Check SPI access mode from GSC FW status registers and overwrite access status read from SPI descriptor, if needed. Signed-off-by: Alexander Usyskin --- drivers/gpu/drm/i915/spi/intel_spi.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/gpu/drm/i915/spi/intel_spi.c b/drivers/gpu/drm/i915/spi/intel_spi.c index 8dd4065551e2..747e43313c6f 100644 --- a/drivers/gpu/drm/i915/spi/intel_spi.c +++ b/drivers/gpu/drm/i915/spi/intel_spi.c @@ -10,6 +10,7 @@ #include "spi/intel_spi.h" #define GEN12_GUNIT_SPI_SIZE 0x80 +#define HECI_FW_STATUS_2_SPI_ACCESS_MODE BIT(3) static const struct intel_dg_spi_region regions[INTEL_DG_SPI_REGIONS] = { [0] = { .name = "DESCRIPTOR", }, @@ -22,6 +23,29 @@ static void i915_spi_release_dev(struct device *dev) { } +static bool i915_spi_writeable_override(struct drm_i915_private *dev_priv) +{ + struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev); + resource_size_t base; + bool writeable_override; + + if (IS_DG1(dev_priv)) { + base = DG1_GSC_HECI2_BASE; + } else if (IS_DG2(dev_priv)) { + base = DG2_GSC_HECI2_BASE; + } else { + dev_err(&pdev->dev, "Unknown platform\n"); + return true; + } + + writeable_override = + !(intel_uncore_read(&dev_priv->uncore, HECI_FWSTS(base, 2)) & + HECI_FW_STATUS_2_SPI_ACCESS_MODE); + if (writeable_override) + dev_info(&pdev->dev, "SPI access overridden by jumper\n"); + return writeable_override; +} + void intel_spi_init(struct drm_i915_private *dev_priv) { struct intel_dg_spi_dev *spi = &dev_priv->spi; @@ -33,6 +57,7 @@ void intel_spi_init(struct drm_i915_private *dev_priv) if (!IS_DGFX(dev_priv)) return; + spi->writeable_override = i915_spi_writeable_override(dev_priv); spi->bar.parent = &pdev->resource[0]; spi->bar.start = GEN12_GUNIT_SPI_BASE + pdev->resource[0].start; spi->bar.end = spi->bar.start + GEN12_GUNIT_SPI_SIZE - 1;