From patchwork Mon Aug 12 18:41:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marek_Ma=C5=9Blanka?= X-Patchwork-Id: 13760949 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C89C12B9B7 for ; Mon, 12 Aug 2024 18:41:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723488118; cv=none; b=pkHZ4jDSVFZLxP4/qDf1KCPFbq7HTMeIdDZZwLzAYGUoiR17dHVH87xiKFJZo+oUPRKbCH6+lauFkFgaYBdbSgPJRbgehmD62ogkg5LyVWkGkTgQlYsJvGZer5LhA+axb7FAp2+1B4C14hJRjyT16j6e2GOX3pFTaz7+Cjnrvis= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723488118; c=relaxed/simple; bh=AAhoSUedFQ21Pzt+ZLf5UI+xIte0RYuXGfOPV8lhJkQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AfY52McciUwgJ+wi99TqwftCF+ZvWHGFoJoR2/CFHVIWzP5FLdI9QKHACMKmGWOqspzam20o5r+6U89IyeaZlRItVjyfR5Ys15UJxm06dfMduxPLWwMG3KY0PJl+JEWbtF3LFccXYIrj0SABz3yTAyA4M4Wy41e3GsylgCAaKFY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--mmaslanka.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=noSaYr/R; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--mmaslanka.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="noSaYr/R" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-66890dbb7b8so108302187b3.0 for ; Mon, 12 Aug 2024 11:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723488116; x=1724092916; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nI7HvxsW6/J3qlupAqXzePRp1xg6T40uW8wUoGhn2xg=; b=noSaYr/RV8h//OC8Ml5d4jnyUYR/nfw+dhI8xPmK31/2A2i/3mXf16KeNcgMGkqUCg C45ErjiBkKvQEQjLH1iOKm5bkHu2w8egQe7QfcIaVXFJpL6DdasjtFfc9gsWAvLUFLXd qmB+hhVyfqpsvh+aznlRZbe/qGRYtErOLIYhh2yTGaNk+EHYC+d7W7N1/SmlRfgxpDtX 1up9vKqUvrdPMXMMuZQMO0+y8oKdM/28odd3lTz4lm3nQdVQxPzW6zb19B168eRbFf4t s+JGIigQdZP94kPOrPMEDxTJRL0jL3fl+G6Ux1YgHUhJmW0N1sq46PmaPvFMGmKNsg+b zwMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723488116; x=1724092916; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nI7HvxsW6/J3qlupAqXzePRp1xg6T40uW8wUoGhn2xg=; b=TKtdO/qtal8YAaWdG1GGDGtTmE+R+yyD73/J2qFquhYHJaDpG/fi0EF1KcOCJxpJFw 62vJ3Gc+3aKxCRRe97Qm5nTxYWtt00+b60T1Q6DMPpy+4WtS5BOghRF0aEPwyWH2Ynjk Iddg8y1FMJpx/0N3u/yGxDNb8rkJx2+rt/zO0qVsEdBfKK1kfGh8Q+e4YiZKCq9/jwNu UnP9gtrvtUduQFP2b6TZhHY1iqwMqbar4FLOKwBHDTQkB98dPp4LZDMOMjndhsHG0g5a rPxXkFcEQASvk9Ycgoomk1OJXTZufxqNDgirjkYe3JzY2WV+lsGnElYvuDHPen2522VO MUoA== X-Forwarded-Encrypted: i=1; AJvYcCV0HDcYMIYAB/dWYGlDh2q4mAucs6SIkPOCVLG+qpM5peiGuaQ9WVrF/I5KxIpVkVsL5kvsCrNpJnKsnb0Lu6J7pFEWJ6BG9BCWLWKTTcbw2f5xvA== X-Gm-Message-State: AOJu0Yz7r14i0OZ0GTgT+dQwJU1RxJgw1pZKmHMKyux8zDiN0xaAeX7f 2X2W64fUmhBKEvpOSa1pVJktFMAqSF+mI/dKLNCSeSJsTPgQvvHJVX2EeLjym/umsYrUYLZjHjM AiNJfvJ5ktmfDCg== X-Google-Smtp-Source: AGHT+IHyX7O3OMhj0SimuYiJ6Gy10rgLPqYfuUi/gIFhYUEZSR1qaftT6St/zesxOuoSti285RBcVCrSUaKbXJo= X-Received: from mmaslanka2.c.googlers.com ([fda3:e722:ac3:cc00:31:98fb:c0a8:b8d]) (user=mmaslanka job=sendgmr) by 2002:a05:690c:d8c:b0:667:8a45:d0f9 with SMTP id 00721157ae682-6a96c03e52dmr114577b3.0.1723488115781; Mon, 12 Aug 2024 11:41:55 -0700 (PDT) Date: Mon, 12 Aug 2024 18:41:42 +0000 In-Reply-To: <935e8c82-3c91-4c9a-8e43-e6045b28279d@redhat.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <935e8c82-3c91-4c9a-8e43-e6045b28279d@redhat.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog Message-ID: <20240812184150.1079924-1-mmaslanka@google.com> Subject: [PATCH v6 1/2] clocksource: acpi_pm: Add external callback for suspend/resume From: Marek Maslanka To: LKML Cc: Marek Maslanka , Daniel Lezcano , Thomas Gleixner , Rajneesh Bhardwaj , David E Box , Hans de Goede , " =?utf-8?q?Ilpo_J=C3=A4rvinen?= " , platform-driver-x86@vger.kernel.org Provides the capability to register an external callback for the ACPI PM timer, which is called during the suspend and resume processes. Signed-off-by: Marek Maslanka Reviewed-by: Hans de Goede --- Changes in v6: - Add the acpi_pmtmr_unregister_suspend_resume_callback function to remove callback - Add EXPORT_SYMBOL_GPL to the added functions - Link to v5: https://lore.kernel.org/lkml/20240812043741.3434744-1-mmaslanka@google.com/ --- --- drivers/clocksource/acpi_pm.c | 32 ++++++++++++++++++++++++++++++++ include/linux/acpi_pmtmr.h | 13 +++++++++++++ 2 files changed, 45 insertions(+) diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 82338773602ca..b4330a01a566b 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c @@ -25,6 +25,10 @@ #include #include +static void *suspend_resume_cb_data; + +static void (*suspend_resume_callback)(void *data, bool suspend); + /* * The I/O port the PMTMR resides at. * The location is detected during setup_arch(), @@ -58,6 +62,32 @@ u32 acpi_pm_read_verified(void) return v2; } +void acpi_pmtmr_register_suspend_resume_callback(void (*cb)(void *data, bool suspend), void *data) +{ + suspend_resume_callback = cb; + suspend_resume_cb_data = data; +} +EXPORT_SYMBOL_GPL(acpi_pmtmr_register_suspend_resume_callback); + +void acpi_pmtmr_unregister_suspend_resume_callback(void) +{ + suspend_resume_callback = NULL; + suspend_resume_cb_data = NULL; +} +EXPORT_SYMBOL_GPL(acpi_pmtmr_unregister_suspend_resume_callback); + +static void acpi_pm_suspend(struct clocksource *cs) +{ + if (suspend_resume_callback) + suspend_resume_callback(suspend_resume_cb_data, true); +} + +static void acpi_pm_resume(struct clocksource *cs) +{ + if (suspend_resume_callback) + suspend_resume_callback(suspend_resume_cb_data, false); +} + static u64 acpi_pm_read(struct clocksource *cs) { return (u64)read_pmtmr(); @@ -69,6 +99,8 @@ static struct clocksource clocksource_acpi_pm = { .read = acpi_pm_read, .mask = (u64)ACPI_PM_MASK, .flags = CLOCK_SOURCE_IS_CONTINUOUS, + .suspend = acpi_pm_suspend, + .resume = acpi_pm_resume, }; diff --git a/include/linux/acpi_pmtmr.h b/include/linux/acpi_pmtmr.h index 50d88bf1498d7..0ded9220d379c 100644 --- a/include/linux/acpi_pmtmr.h +++ b/include/linux/acpi_pmtmr.h @@ -26,6 +26,19 @@ static inline u32 acpi_pm_read_early(void) return acpi_pm_read_verified() & ACPI_PM_MASK; } +/** + * Register callback for suspend and resume event + * + * @cb Callback triggered on suspend and resume + * @data Data passed with the callback + */ +void acpi_pmtmr_register_suspend_resume_callback(void (*cb)(void *data, bool suspend), void *data); + +/** + * Remove registered callback for suspend and resume event + */ +void acpi_pmtmr_unregister_suspend_resume_callback(void); + #else static inline u32 acpi_pm_read_early(void) From patchwork Mon Aug 12 18:42:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marek_Ma=C5=9Blanka?= X-Patchwork-Id: 13760950 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5BD22B9B7 for ; Mon, 12 Aug 2024 18:42:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723488136; cv=none; b=BTDsVcR/iegB5ft0bYXbPPnygbLHkf8UNRrd0YpKYqS2ZCOplSF9nYd0RHD1N9PqH5PVvZ6FKACpGkcBzR3YijjByM2TpX3DPN7nH8TUVog3tm+YOf89ik3dBtYVz7vUdUlt4uAhbPw3EO2OfmGHYNvCkw2/l5k7wiDVhOK0APk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723488136; c=relaxed/simple; bh=/y3lUBX/oblkST1KSmp1thAtAt6X8yK37xsnQ76Fz1k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qg7pBOkrfkqNKvPQnsQ2mDsZnRvoJRS+NrH9fYOwkR17y7VTK3DmplQ/1duwW5qzYh9vAtaOqvWqBwDwiNS+xiGG9rvflSAR3AHctED9Yr2mKxqXNpzsKVg33neC7UK5E7pM772E7a7oYA9JdMtVpHvrMDbXcRH8bwkTwZgQnMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--mmaslanka.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=jIuF7aGJ; arc=none smtp.client-ip=209.85.208.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--mmaslanka.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jIuF7aGJ" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-5bb9bfa4948so3511119a12.3 for ; Mon, 12 Aug 2024 11:42:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723488133; x=1724092933; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=gGA4f4l9Vv1f1Kt4ktYiCLFLAKgKb57xwNOAqkw0JyM=; b=jIuF7aGJCexajUBA2incXWLjk3J0v5bWJePmIio0nUgdD+eRSwh9Jxv0F/M+uuj7DJ StSkqD6Rmb5gNn2MxL1ClQpnYk8MS3e8wrjEaJkZiN9TbcoCta+ZXWe+kUFhZfTsUMLB MpHNVo8uzRZzKEDCxbkB55wjeF7lu3weSWuUYA06vsq96jCv9sBf4jk59EnOiimsyccu 5/0TZzCROBeXo0k0hcdc78rtVwxwKuf5Tflo6VJyOcSPacMaz16ifZsaHCUGBc9m+JYI xmFlFcNeZUK9pffd8IKXdBxCDG72JuJmIM6XTURhV/JSJ8o45usmYiIPsWNoES2gImQB 32IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723488133; x=1724092933; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gGA4f4l9Vv1f1Kt4ktYiCLFLAKgKb57xwNOAqkw0JyM=; b=R4MIwrVemlpE/EgbbQsghqOrDS9MbYp3PIBLFCEiWU0a7jCPvRcv1zDZsMZAjFzPJU 123SxQLyzQVWF2Quw1ZYNqoHySE1g6FXshhEwwX2f0IF83s0maht4u8jUsf5sBS4u29K JM1bphSd4kiDepzgj/vm9F1Jjkd58oFXEJWZfupOmrGOTOgpdBmtACfm4UlYvVK3OfHx 3zGUmqTYDv4r5APDLPP53pNL9o8ymrDXesYEepCQymuf2d5QR0l9TSl7sdbmIsgy7ADN u45SVQfGPLIqA1r1r343S8qlyL8k4sfaMXpHSGtlZtQOOYaUyVsgDirZZ4PXaOItPUi5 /6DA== X-Forwarded-Encrypted: i=1; AJvYcCXbzllXxp9TyT/orVc0NYBu99gmZea74OF+oXKRlaAlT54LgPBLCgAwgJAJ3VlaleFnt2cJcAFvwEmKpgLgYQj7BbVE3nq9OinyO4ZfqTk/q65DGA== X-Gm-Message-State: AOJu0YyUHiRGhH1DyYFCOLQFADdqi332lhVMWy9VamC4uYiHvwSeJnrA YSQnmAGlwu2Z1mN7BTg1VOcn4tC87byjkCTDJj571alPA/o9FojGvKxDLuunrkwTxKBjxFoJE3q FtJfC9DBe+Puxuw== X-Google-Smtp-Source: AGHT+IGSdAF9SL+HwpuB5hWlXp9IGbKjWn6YXCR72WvOuEpwunYdHwU3j45RBIjNMx7pXiIjUBRL2B5io5GxOYo= X-Received: from mmaslanka2.c.googlers.com ([fda3:e722:ac3:cc00:31:98fb:c0a8:b8d]) (user=mmaslanka job=sendgmr) by 2002:a17:906:4142:b0:a7a:8379:c61d with SMTP id a640c23a62f3a-a80ed2cce3dmr118166b.11.1723488132875; Mon, 12 Aug 2024 11:42:12 -0700 (PDT) Date: Mon, 12 Aug 2024 18:42:00 +0000 In-Reply-To: Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog Message-ID: <20240812184208.1080710-1-mmaslanka@google.com> Subject: [PATCH v6 2/2] platform/x86:intel/pmc: Enable the ACPI PM Timer to be turned off when suspended From: Marek Maslanka To: LKML Cc: Marek Maslanka , Daniel Lezcano , Thomas Gleixner , Rajneesh Bhardwaj , David E Box , Hans de Goede , " =?utf-8?q?Ilpo_J=C3=A4rvinen?= " , platform-driver-x86@vger.kernel.org Allow to disable ACPI PM Timer on suspend and enable on resume. A disabled timer helps optimise power consumption when the system is suspended. On resume the timer is only reactivated if it was activated prior to suspend, so unless the ACPI PM timer is enabled in the BIOS, this won't change anything. The ACPI PM timer is used by Intel's iTCO/wdat_wdt watchdog to drive the watchdog, so it doesn't need to run during suspend. Signed-off-by: Marek Maslanka Reviewed-by: Hans de Goede --- Changes in v6: - Use guard() to manage the mutex instead of mutex_lock/mutex_unlock - Use newly added acpi_pmtmr_unregister_suspend_resume_callback to remove callback - Link to v5: https://lore.kernel.org/lkml/20240812044028.3439329-1-mmaslanka@google.com/ --- --- drivers/platform/x86/intel/pmc/adl.c | 2 ++ drivers/platform/x86/intel/pmc/cnp.c | 2 ++ drivers/platform/x86/intel/pmc/core.c | 45 +++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 8 +++++ drivers/platform/x86/intel/pmc/icl.c | 2 ++ drivers/platform/x86/intel/pmc/mtl.c | 2 ++ drivers/platform/x86/intel/pmc/spt.c | 2 ++ drivers/platform/x86/intel/pmc/tgl.c | 2 ++ 8 files changed, 65 insertions(+) diff --git a/drivers/platform/x86/intel/pmc/adl.c b/drivers/platform/x86/intel/pmc/adl.c index e7878558fd909..9d9c07f44ff61 100644 --- a/drivers/platform/x86/intel/pmc/adl.c +++ b/drivers/platform/x86/intel/pmc/adl.c @@ -295,6 +295,8 @@ const struct pmc_reg_map adl_reg_map = { .ppfear_buckets = CNP_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, .ltr_ignore_max = ADL_NUM_IP_IGN_ALLOWED, .lpm_num_modes = ADL_LPM_NUM_MODES, .lpm_num_maps = ADL_LPM_NUM_MAPS, diff --git a/drivers/platform/x86/intel/pmc/cnp.c b/drivers/platform/x86/intel/pmc/cnp.c index dd72974bf71e2..513c02670c5aa 100644 --- a/drivers/platform/x86/intel/pmc/cnp.c +++ b/drivers/platform/x86/intel/pmc/cnp.c @@ -200,6 +200,8 @@ const struct pmc_reg_map cnp_reg_map = { .ppfear_buckets = CNP_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, .ltr_ignore_max = CNP_NUM_IP_IGN_ALLOWED, .etr3_offset = ETR3_OFFSET, }; diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index 10c96c1a850af..d8fa9bed4cd3c 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include #include @@ -1171,6 +1172,38 @@ static bool pmc_core_is_pson_residency_enabled(struct pmc_dev *pmcdev) return val == 1; } +/** + * Enable or disable ACPI PM Timer + * + * This function is intended to be a callback for ACPI PM suspend/resume event. + * The ACPI PM Timer is enabled on resume only if it was enabled during suspend. + */ +static void pmc_core_acpi_pm_timer_suspend_resume(void *data, bool suspend) +{ + struct pmc_dev *pmcdev = data; + struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN]; + const struct pmc_reg_map *map = pmc->map; + bool enabled; + u32 reg; + + if (!map->acpi_pm_tmr_ctl_offset) + return; + + guard(mutex)(&pmcdev->lock); + + if (!suspend && !pmcdev->enable_acpi_pm_timer_on_resume) + return; + + reg = pmc_core_reg_read(pmc, map->acpi_pm_tmr_ctl_offset); + enabled = !(reg & map->acpi_pm_tmr_disable_bit); + if (suspend) + reg |= map->acpi_pm_tmr_disable_bit; + else + reg &= ~map->acpi_pm_tmr_disable_bit; + pmc_core_reg_write(pmc, map->acpi_pm_tmr_ctl_offset, reg); + + pmcdev->enable_acpi_pm_timer_on_resume = suspend && enabled; +} static void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev) { @@ -1362,6 +1395,7 @@ static int pmc_core_probe(struct platform_device *pdev) struct pmc_dev *pmcdev; const struct x86_cpu_id *cpu_id; int (*core_init)(struct pmc_dev *pmcdev); + const struct pmc_reg_map *map; struct pmc *primary_pmc; int ret; @@ -1420,6 +1454,11 @@ static int pmc_core_probe(struct platform_device *pdev) pm_report_max_hw_sleep(FIELD_MAX(SLP_S0_RES_COUNTER_MASK) * pmc_core_adjust_slp_s0_step(primary_pmc, 1)); + map = primary_pmc->map; + if (map->acpi_pm_tmr_ctl_offset) + acpi_pmtmr_register_suspend_resume_callback(pmc_core_acpi_pm_timer_suspend_resume, + pmcdev); + device_initialized = true; dev_info(&pdev->dev, " initialized\n"); @@ -1429,6 +1468,12 @@ static int pmc_core_probe(struct platform_device *pdev) static void pmc_core_remove(struct platform_device *pdev) { struct pmc_dev *pmcdev = platform_get_drvdata(pdev); + const struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN]; + const struct pmc_reg_map *map = pmc->map; + + if (map->acpi_pm_tmr_ctl_offset) + acpi_pmtmr_unregister_suspend_resume_callback(); + pmc_core_dbgfs_unregister(pmcdev); pmc_core_clean_structure(pdev); } diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h index 83504c49a0e31..fe1a94f693b63 100644 --- a/drivers/platform/x86/intel/pmc/core.h +++ b/drivers/platform/x86/intel/pmc/core.h @@ -67,6 +67,8 @@ struct telem_endpoint; #define SPT_PMC_LTR_SCC 0x3A0 #define SPT_PMC_LTR_ISH 0x3A4 +#define SPT_PMC_ACPI_PM_TMR_CTL_OFFSET 0x18FC + /* Sunrise Point: PGD PFET Enable Ack Status Registers */ enum ppfear_regs { SPT_PMC_XRAM_PPFEAR0A = 0x590, @@ -147,6 +149,8 @@ enum ppfear_regs { #define SPT_PMC_VRIC1_SLPS0LVEN BIT(13) #define SPT_PMC_VRIC1_XTALSDQDIS BIT(22) +#define SPT_PMC_BIT_ACPI_PM_TMR_DISABLE BIT(1) + /* Cannonlake Power Management Controller register offsets */ #define CNP_PMC_SLPS0_DBG_OFFSET 0x10B4 #define CNP_PMC_PM_CFG_OFFSET 0x1818 @@ -344,6 +348,8 @@ struct pmc_reg_map { const u8 *lpm_reg_index; const u32 pson_residency_offset; const u32 pson_residency_counter_step; + const u32 acpi_pm_tmr_ctl_offset; + const u32 acpi_pm_tmr_disable_bit; }; /** @@ -417,6 +423,8 @@ struct pmc_dev { u32 die_c6_offset; struct telem_endpoint *punit_ep; struct pmc_info *regmap_list; + + bool enable_acpi_pm_timer_on_resume; }; enum pmc_index { diff --git a/drivers/platform/x86/intel/pmc/icl.c b/drivers/platform/x86/intel/pmc/icl.c index 71b0fd6cb7d84..cbbd440544688 100644 --- a/drivers/platform/x86/intel/pmc/icl.c +++ b/drivers/platform/x86/intel/pmc/icl.c @@ -46,6 +46,8 @@ const struct pmc_reg_map icl_reg_map = { .ppfear_buckets = ICL_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, .ltr_ignore_max = ICL_NUM_IP_IGN_ALLOWED, .etr3_offset = ETR3_OFFSET, }; diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c index c7d15d864039d..91f2fa728f5c8 100644 --- a/drivers/platform/x86/intel/pmc/mtl.c +++ b/drivers/platform/x86/intel/pmc/mtl.c @@ -462,6 +462,8 @@ const struct pmc_reg_map mtl_socm_reg_map = { .ppfear_buckets = MTL_SOCM_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, .lpm_num_maps = ADL_LPM_NUM_MAPS, .ltr_ignore_max = MTL_SOCM_NUM_IP_IGN_ALLOWED, .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2, diff --git a/drivers/platform/x86/intel/pmc/spt.c b/drivers/platform/x86/intel/pmc/spt.c index ab993a69e33ee..2cd2b3c68e468 100644 --- a/drivers/platform/x86/intel/pmc/spt.c +++ b/drivers/platform/x86/intel/pmc/spt.c @@ -130,6 +130,8 @@ const struct pmc_reg_map spt_reg_map = { .ppfear_buckets = SPT_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT, + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, .ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED, .pm_vric1_offset = SPT_PMC_VRIC1_OFFSET, }; diff --git a/drivers/platform/x86/intel/pmc/tgl.c b/drivers/platform/x86/intel/pmc/tgl.c index e0580de180773..371b4e30f1426 100644 --- a/drivers/platform/x86/intel/pmc/tgl.c +++ b/drivers/platform/x86/intel/pmc/tgl.c @@ -197,6 +197,8 @@ const struct pmc_reg_map tgl_reg_map = { .ppfear_buckets = ICL_PPFEAR_NUM_ENTRIES, .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET, .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT, + .acpi_pm_tmr_ctl_offset = SPT_PMC_ACPI_PM_TMR_CTL_OFFSET, + .acpi_pm_tmr_disable_bit = SPT_PMC_BIT_ACPI_PM_TMR_DISABLE, .ltr_ignore_max = TGL_NUM_IP_IGN_ALLOWED, .lpm_num_maps = TGL_LPM_NUM_MAPS, .lpm_res_counter_step_x2 = TGL_PMC_LPM_RES_COUNTER_STEP_X2,