From patchwork Wed Feb 21 21:12:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 13566292 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 DA49A86AD5; Wed, 21 Feb 2024 21:12:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708549926; cv=none; b=SDL40+OzzDUOjiXk0RzFPo8nOcgEorXjN8/tSdklmMSLEME3lYUkkxNYq/QOYwzaBPAOV7Qe7PwWQbkoi3UxBJ7AraaAjtI+rkwUyBbtL6i2oNXRW07RDPCo2icATSVQFMtPuYtHzg4TVDprHkJOBJzEImOs5laAwcb+7lH0Bis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708549926; c=relaxed/simple; bh=iu4KbvHGlcFRRSdY9K/Jk/Zeck2ywiKqKuPQgDf0Gjo=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Xai7F4mDyFWICEO78MWovEfMWzmDuTjLVHXAQsaf3nGf2PWdd01FO8yYZMRZhiryp9MBB6iHQUG8u9MOOHmi8AL27fSzgxJLfsrUgcbiad6v7wdp/ZKq4FlD8byRGYvPRnQZpVp+0wCoTh7aZDAFr/ph2AJ/+Sxj60duaUctuR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=lU4/mMVe; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="lU4/mMVe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708549925; x=1740085925; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=iu4KbvHGlcFRRSdY9K/Jk/Zeck2ywiKqKuPQgDf0Gjo=; b=lU4/mMVeWQKC+WhF9G+shO4BAsY9DbnbiSc/u+JQ51B/pGZ1rIJZKB94 cH04ZEpp1Yp3e0mrxMYoPRAflnJdmONT8KZ+LI5YSIdyGevSsx7xzwxt4 yY489DeM7zguEE2pGUFn9AtgdECKMJsMuHH/1v+G26NGgarI3ryUdahiq 4fQEFDxPJ0M/Sv+qPNbgQVHUKtg4vFO8iXkTM1fMtvjc2dZYej5xP1Mcu K/QzpLgg/bs+nu2l6SeDUEvuJHjbs+lZd1rsixEYGwAiem2fMZXXhCrH0 2z1cZrwgOy27NY5vH28wOWGrqDm9acSMMt2GbpL75BkwqTXLVjTFZkNsO g==; X-IronPort-AV: E=McAfee;i="6600,9927,10991"; a="13865875" X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="13865875" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 13:12:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="9934209" Received: from linux.intel.com ([10.54.29.200]) by orviesa003.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 13:12:04 -0800 Received: from debox1-desk4.lan (unknown [10.209.70.184]) by linux.intel.com (Postfix) with ESMTP id 31027580DB4; Wed, 21 Feb 2024 13:12:04 -0800 (PST) From: "David E. Box" To: david.e.box@linux.intel.com, rajvi.jingar@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Subject: [PATCH 1/3] platform/x86/intel/vsec: Remove nuisance message Date: Wed, 21 Feb 2024 13:12:01 -0800 Message-Id: <20240221211204.515159-1-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 intel_vsec_walk_header() is used to configure features from devices that don't provide a PCI VSEC or DVSEC structure. Some of these features may be unsupported and fail to load. Ignore them silently as we do for unsupported features described by VSEC/DVSEC. Signed-off-by: David E. Box Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/intel/vsec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) base-commit: 841c35169323cd833294798e58b9bf63fa4fa1de diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c index 778eb0aa3479..0fdfaf3a4f5c 100644 --- a/drivers/platform/x86/intel/vsec.c +++ b/drivers/platform/x86/intel/vsec.c @@ -236,10 +236,7 @@ static bool intel_vsec_walk_header(struct pci_dev *pdev, for ( ; *header; header++) { ret = intel_vsec_add_dev(pdev, *header, info); - if (ret) - dev_info(&pdev->dev, "Could not add device for VSEC id %d\n", - (*header)->id); - else + if (!ret) have_devices = true; } From patchwork Wed Feb 21 21:12:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 13566293 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 769421272B6; Wed, 21 Feb 2024 21:12:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708549928; cv=none; b=RVlwXj3paf7EnRzNDUMUXUywhQztXeC3ewFULIxXyXUv1eK15BDyVjLc0f2IYD9ufo44zj3Ch/EVd+s1kE9YBWPtFnYnj6Gw6KNuzvNgMjOogppn5EBLMZOX/QyUtpz2vWT4lBWJkcqe1xPW7GiRWGf3ncegCJHCjEHZXUcPbuc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708549928; c=relaxed/simple; bh=ZisVPYMGWqQkxkgSAqnP3vYo3/NAqEjcSBmQQo5muuo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=J1aDNSr1OX5ZunyqlG95mlMGO0eEwPM9fSbzBzZXqBmQ43pyVS+mgAIAzkiFNiycH2UV08a7uilo8vdQW6N4Vt1iwEdCQXRc1pNVIHeACQgTlmebarH8THITNu3goTqxkbX7mSKYbdwFts19RssrVCMPi55NcBKQwGFRv1fs9iM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HJ5ko6aI; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HJ5ko6aI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708549927; x=1740085927; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=ZisVPYMGWqQkxkgSAqnP3vYo3/NAqEjcSBmQQo5muuo=; b=HJ5ko6aI2Xa5waK6uxc0RBPNsRYSpafbb8BnKYT767POLhj31P+s69ok sNwPjIUJvPLHrioVIKkE4CjXKk5GBvL0d9gZJVNpsGJQgM2DxKDlyDbY/ Eh1n66Myy00vXyhtnuoQy+JYZS4yU/EwpYRCPVDIpkMWZcf62YpU5k0uk IVS0kbWV0/ni5pTiEZ2GspRHgPLNfg2Bt3fqf4AbyYVLnDHc4eWbjhSvT l6TysxYUFeVu7Gf20ZKbpfYXsLcCVL+QCIZHVQXKEQJ9eplDkFqWBD28F bf3HlfC7xE3jytHepMDIKnEY13+AMmrEhMOvMx2wccsmvSV0YrSB8KYzW Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10991"; a="13865876" X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="13865876" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 13:12:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="5214082" Received: from linux.intel.com ([10.54.29.200]) by fmviesa009.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 13:12:04 -0800 Received: from debox1-desk4.lan (unknown [10.209.70.184]) by linux.intel.com (Postfix) with ESMTP id 5B887580DED; Wed, 21 Feb 2024 13:12:04 -0800 (PST) From: "David E. Box" To: david.e.box@linux.intel.com, rajvi.jingar@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Subject: [PATCH 2/3] platform/x86/intel/pmc/lnl: Remove SSRAM support Date: Wed, 21 Feb 2024 13:12:02 -0800 Message-Id: <20240221211204.515159-2-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240221211204.515159-1-david.e.box@linux.intel.com> References: <20240221211204.515159-1-david.e.box@linux.intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 A recent PMC firmware change in Lunar Lake caused the pmc_core driver to fail to probe. This is due to a change in the GUID for PMC telemetry coming from the SSRAM device. We are told the current update may change again before a final release so we can't upstream a fix just yet. In the meantime, remove SSRAM support for Lunar Lake so the driver can load and provide some basic functionality. Fixes: 3748dfdae2a6 ("platform/x86/intel/pmc: Add Lunar Lake M support to intel_pmc_core driver") Signed-off-by: David E. Box Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/intel/pmc/lnl.c | 38 +++------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/drivers/platform/x86/intel/pmc/lnl.c b/drivers/platform/x86/intel/pmc/lnl.c index abad17cdd3d7..068d72504683 100644 --- a/drivers/platform/x86/intel/pmc/lnl.c +++ b/drivers/platform/x86/intel/pmc/lnl.c @@ -13,21 +13,6 @@ #include "core.h" -#define SOCM_LPM_REQ_GUID 0x11594920 - -#define PMC_DEVID_SOCM 0xa87f - -static const u8 LNL_LPM_REG_INDEX[] = {0, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20}; - -static struct pmc_info lnl_pmc_info_list[] = { - { - .guid = SOCM_LPM_REQ_GUID, - .devid = PMC_DEVID_SOCM, - .map = &lnl_socm_reg_map, - }, - {} -}; - const struct pmc_bit_map lnl_ltr_show_map[] = { {"SOUTHPORT_A", CNP_PMC_LTR_SPA}, {"SOUTHPORT_B", CNP_PMC_LTR_SPB}, @@ -490,7 +475,6 @@ const struct pmc_reg_map lnl_socm_reg_map = { .lpm_sts = lnl_lpm_maps, .lpm_status_offset = MTL_LPM_STATUS_OFFSET, .lpm_live_status_offset = MTL_LPM_LIVE_STATUS_OFFSET, - .lpm_reg_index = LNL_LPM_REG_INDEX, }; #define LNL_NPU_PCI_DEV 0x643e @@ -517,33 +501,19 @@ static int lnl_resume(struct pmc_dev *pmcdev) int lnl_core_init(struct pmc_dev *pmcdev) { int ret; - int func = 2; - bool ssram_init = true; struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC]; lnl_d3_fixup(); pmcdev->suspend = cnl_suspend; pmcdev->resume = lnl_resume; - pmcdev->regmap_list = lnl_pmc_info_list; - ret = pmc_core_ssram_init(pmcdev, func); - /* If regbase not assigned, set map and discover using legacy method */ - if (ret) { - ssram_init = false; - pmc->map = &lnl_socm_reg_map; - ret = get_primary_reg_base(pmc); - if (ret) - return ret; - } + pmc->map = &lnl_socm_reg_map; + ret = get_primary_reg_base(pmc); + if (ret) + return ret; pmc_core_get_low_power_modes(pmcdev); - if (ssram_init) { - ret = pmc_core_ssram_get_lpm_reqs(pmcdev); - if (ret) - return ret; - } - return 0; } From patchwork Wed Feb 21 21:12:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 13566294 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 DC856127B40; Wed, 21 Feb 2024 21:12:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708549928; cv=none; b=cVeciyJqomGc91FPmxxo3/X5mV236LABq2N8ibZGW38z1vnrCQi72QG2oqR3RiDYVoH6DtH3GkFJVj3v0F+cIK0b0Bj7EVPStwMmEwkq6n5xg2mWhziGzoV1wrNPPmb5sBPIbYA2syQD+hfc2/NDeY+VFlPtxhyceoKdD7mEWvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708549928; c=relaxed/simple; bh=KRiyyGKk5c6LKsxkMPIkDheNqkttEI3XK8ef20ZlAzk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QzCzeAsuej3vB0VfITtiaoTbom86Sl6mS1NwjQbVEv+kra0+qbvS01TfND4TZuzEsU5r4Aw1a/gL7JVaQqjDYZTxywEwd9UY00L1c5kgpuxczhWLSATjdedWQy9Ih36+Jx07sAyvPfIeodCR1V3/onVoTH7NF/tf9zf2zZFBNG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Hikl12X7; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Hikl12X7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708549927; x=1740085927; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=KRiyyGKk5c6LKsxkMPIkDheNqkttEI3XK8ef20ZlAzk=; b=Hikl12X74uIJcEHQh1cO4CnkqpS49bjoNP3g5y4DfIQLZBBXZZVri6YP hhrotc7ePC28xflWxg7Hk7QALgsAIZN6fHkr5uU/UzMpbH0GDAoRcIH75 hFelE1y0O2l9hIjpct1t5P4xZpZKNYkIavy1yHHbDP3b3VRV+Mlf3etzX W0hS77EKUVpbLQzZNteLQGn2ekkzcojVBOwxj77GEbLpRzNtjzG7TRLfW eaSKKspTNe6u4tT42btenLhDyWh1foHMChbW/jV/x2xo+nd0r3eibqgIa s43tASIxrxNXHkXKk0hn5bQy0VGuU8sgSAncP3fj5I8XenHAD5gkGTrwO A==; X-IronPort-AV: E=McAfee;i="6600,9927,10991"; a="13865880" X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="13865880" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 13:12:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="5214083" Received: from linux.intel.com ([10.54.29.200]) by fmviesa009.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 13:12:05 -0800 Received: from debox1-desk4.lan (unknown [10.209.70.184]) by linux.intel.com (Postfix) with ESMTP id 8128C580DB4; Wed, 21 Feb 2024 13:12:04 -0800 (PST) From: "David E. Box" To: david.e.box@linux.intel.com, rajvi.jingar@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Subject: [PATCH 3/3] platform/x86/intel/pmc/arl: Put GNA device in D3 Date: Wed, 21 Feb 2024 13:12:03 -0800 Message-Id: <20240221211204.515159-3-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240221211204.515159-1-david.e.box@linux.intel.com> References: <20240221211204.515159-1-david.e.box@linux.intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To unblock Package C state entry, put the GNA device in D3 by default if no driver is loaded for it. Fixes: 83f168a1a437 ("platform/x86/intel/pmc: Add Arrow Lake S support to intel_pmc_core driver") Signed-off-by: David E. Box Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/intel/pmc/arl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c index 683ae828276b..34b4cd23bfe5 100644 --- a/drivers/platform/x86/intel/pmc/arl.c +++ b/drivers/platform/x86/intel/pmc/arl.c @@ -673,6 +673,7 @@ static struct pmc_info arl_pmc_info_list[] = { }; #define ARL_NPU_PCI_DEV 0xad1d +#define ARL_GNA_PCI_DEV 0xae4c /* * Set power state of select devices that do not have drivers to D3 * so that they do not block Package C entry. @@ -680,6 +681,7 @@ static struct pmc_info arl_pmc_info_list[] = { static void arl_d3_fixup(void) { pmc_core_set_device_d3(ARL_NPU_PCI_DEV); + pmc_core_set_device_d3(ARL_GNA_PCI_DEV); } static int arl_resume(struct pmc_dev *pmcdev)