From patchwork Tue Jun 13 16:10:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wilczynski, Michal" X-Patchwork-Id: 107453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp669223vqr; Tue, 13 Jun 2023 09:21:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6i0GkqnSkTIzODVXoZ1cYNL4VdJBg2sY3O6JC5CWSAPXqxZFgFoM7GTxffbKgOCheO8jNl X-Received: by 2002:a05:6a00:399f:b0:662:c4ca:65c2 with SMTP id fi31-20020a056a00399f00b00662c4ca65c2mr15330842pfb.0.1686673269158; Tue, 13 Jun 2023 09:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686673269; cv=none; d=google.com; s=arc-20160816; b=H6MrcWnyCXDyJi5PVmC7Uy6bjjq6Gv9Fx85MpXSbOlh4V74w/ShqvQMfArOy8vHahY vfT0B4WBkbTXjp0EkJ4IfboTuRvzdAf9DTJwVKc/vcVkr2MUpqZUzJMYT0+LV3YBIATb Iu9KNZKhull8j6qt5dxJEZ7T/4y6sYh9BB4IGT+fs/Nw+jnNzedt2Pys7ZLP9dol80d3 wxR24h9VNlu6BpzKvd6jjg2YDOIlElIR7Gj/rcitw/P6iy4XXimBCRiSahiqkf6kxH6c BqbDeaGmhPjXdR2nUSjzkUjGlXkPwS8UOfd/vKuS0sfsigXYLIlQIu9q3qE3U4NU4hiB E+TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0H8Eo7UY9a6GCL76qp+qGKDRc5BFDl5S9ZiNtuIv5OU=; b=C3u96lrl6JY97a20erx6gHPUzPuUZYG4l3l1WcnoKnqA8sHiZKH2ymD7scezDLM4fY 0mBfOxXY1P016shZ7zk/rmWeyXL2Q+0DxQPjIvvS9n8nf5CXd9cxKuIKfeUjuecGp+7D EolWqN7UEyBQSTPkjRTeibdo/DNVMJzHSqrA+IMPV24cKBVhlOELWlwFX0lGGo/lNgfJ ZQPrBIQ9r4iYRw3xWtAQMQ43oJFXtCWbI5cvfz4mCi9lllAaSydVlea5Ssa0V0/818WG xAu7yINDFBzfotVtYgjNpSgUQWVQ4iFkUAKXaEAL03I+6B1FHBDID/846vWZMCrRpbRP kApw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AID3wy79; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z3-20020aa79583000000b0063b77381764si8959736pfj.49.2023.06.13.09.20.57; Tue, 13 Jun 2023 09:21:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AID3wy79; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243037AbjFMQM6 (ORCPT + 99 others); Tue, 13 Jun 2023 12:12:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243007AbjFMQMw (ORCPT ); Tue, 13 Jun 2023 12:12:52 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABCA6199C; Tue, 13 Jun 2023 09:12:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686672769; x=1718208769; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=q6hZmWD+34oqCL6/IAdani4632AKiZB8VpAcTJgImVQ=; b=AID3wy79ynN2oNRwLEKtK8jbPZhqhcdLO61F9vCV00Kxi1aFtRSi2wP3 uMi9zsxW/1NRajUUwXtB2Nv2B++x0o0UwIaQCViVVVsszVtWCQvmjoUEI tWp4ci0c1BDYdth03SNYUlDTbj7aC1+lm8H53BZl6WPydsuTGGwpaK7Ov 1tVSS1915Io2cerqNGFef7PhtMFkjgmwCOCxeNhFn3l4U7I/eYUIJj9Vn ScKHp8/5ls5Tpc8gYTGZ7HeA3rv6Sphc8R4grl+76a8NVxUQjy7tG/NEC qjseYnQnOayLWA7qxnyf4KfMWqC/YQoQBIrR9aV8Oh3Fa7NtYDq2bxvl0 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="348038856" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="348038856" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 09:11:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="714863563" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="714863563" Received: from powerlab.fi.intel.com ([10.237.71.25]) by fmsmga007.fm.intel.com with ESMTP; 13 Jun 2023 09:11:01 -0700 From: Michal Wilczynski To: linux-acpi@vger.kernel.org Cc: rafael@kernel.org, andriy.shevchenko@intel.com, artem.bityutskiy@linux.intel.com, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, lenb@kernel.org, jgross@suse.com, linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH v3 3/5] acpi: Introduce new function callback for _OSC Date: Tue, 13 Jun 2023 19:10:32 +0300 Message-Id: <20230613161034.3496047-4-michal.wilczynski@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230613161034.3496047-1-michal.wilczynski@intel.com> References: <20230613161034.3496047-1-michal.wilczynski@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768605109729317059?= X-GMAIL-MSGID: =?utf-8?q?1768605109729317059?= Currently in ACPI code _OSC method is already used for workaround introduced in commit a21211672c9a ("ACPI / processor: Request native thermal interrupt handling via _OSC"). Create new function, similar to already existing acpi_hwp_native_thermal_lvt_osc(). Call new function acpi_processor_osc(). Make this function fulfill the purpose previously fulfilled by the workaround plus convey OSPM processor capabilities with it by setting correct processor capability bits. Suggested-by: Rafael J. Wysocki Signed-off-by: Michal Wilczynski Reviewed-by: Andy Shevchenko --- arch/x86/include/asm/acpi.h | 3 +++ drivers/acpi/acpi_processor.c | 43 ++++++++++++++++++++++++++++++++++- include/acpi/pdc_intel.h | 1 + 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 6a498d1781e7..6c25ce2dad18 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -112,6 +112,9 @@ static inline void arch_acpi_set_proc_cap_bits(u32 *cap) if (cpu_has(c, X86_FEATURE_ACPI)) *cap |= ACPI_PDC_T_FFH; + if (cpu_has(c, X86_FEATURE_HWP)) + *cap |= ACPI_PDC_COLLAB_PROC_PERF; + /* * If mwait/monitor is unsupported, C2/C3_FFH will be disabled */ diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 8c5d0295a042..0de0b05b6f53 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -591,13 +591,54 @@ void __init processor_dmi_check(void) dmi_check_system(processor_idle_dmi_table); } +/* vendor specific UUID indicating an Intel platform */ +static u8 sb_uuid_str[] = "4077A616-290C-47BE-9EBD-D87058713953"; static bool acpi_hwp_native_thermal_lvt_set; +static acpi_status __init acpi_processor_osc(acpi_handle handle, u32 lvl, + void *context, void **rv) +{ + u32 capbuf[2] = {}; + acpi_status status; + struct acpi_osc_context osc_context = { + .uuid_str = sb_uuid_str, + .rev = 1, + .cap.length = 8, + .cap.pointer = capbuf, + }; + + if (processor_physically_present(handle) == false) + return AE_OK; + + arch_acpi_set_proc_cap_bits(&capbuf[OSC_SUPPORT_DWORD]); + + if (boot_option_idle_override == IDLE_NOMWAIT) + capbuf[OSC_SUPPORT_DWORD] &= + ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); + + status = acpi_run_osc(handle, &osc_context); + if (ACPI_FAILURE(status)) + return status; + + if (osc_context.ret.pointer && osc_context.ret.length > 1) { + u32 *capbuf_ret = osc_context.ret.pointer; + + if (!acpi_hwp_native_thermal_lvt_set && + capbuf_ret[1] & ACPI_PDC_COLLAB_PROC_PERF) { + acpi_handle_info(handle, + "_OSC native thermal LVT Acked\n"); + acpi_hwp_native_thermal_lvt_set = true; + } + } + kfree(osc_context.ret.pointer); + + return AE_OK; +} + static acpi_status __init acpi_hwp_native_thermal_lvt_osc(acpi_handle handle, u32 lvl, void *context, void **rv) { - u8 sb_uuid_str[] = "4077A616-290C-47BE-9EBD-D87058713953"; u32 capbuf[2]; struct acpi_osc_context osc_context = { .uuid_str = sb_uuid_str, diff --git a/include/acpi/pdc_intel.h b/include/acpi/pdc_intel.h index 967c552d1cd3..9427f639287f 100644 --- a/include/acpi/pdc_intel.h +++ b/include/acpi/pdc_intel.h @@ -16,6 +16,7 @@ #define ACPI_PDC_C_C1_FFH (0x0100) #define ACPI_PDC_C_C2C3_FFH (0x0200) #define ACPI_PDC_SMP_P_HWCOORD (0x0800) +#define ACPI_PDC_COLLAB_PROC_PERF (0x1000) #define ACPI_PDC_EST_CAPABILITY_SMP (ACPI_PDC_SMP_C1PT | \ ACPI_PDC_C_C1_HALT | \