From patchwork Tue Jan 30 09:59:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 1892729 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=endlessos.org header.i=@endlessos.org header.a=rsa-sha256 header.s=google header.b=XFxZfmIC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45d1:ec00::1; helo=ny.mirrors.kernel.org; envelope-from=linux-ide+bounces-374-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [IPv6:2604:1380:45d1:ec00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TPLNs6g8Vz23dQ for ; Tue, 30 Jan 2024 21:04:13 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id DB7A61C26E94 for ; Tue, 30 Jan 2024 10:04:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0FE536A344; Tue, 30 Jan 2024 10:00:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b="XFxZfmIC" X-Original-To: linux-ide@vger.kernel.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 1BCA160B9F for ; Tue, 30 Jan 2024 10:00:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706608828; cv=none; b=V3mBfl7poXAVTowly6ld/v9OXEXDqsAexr0IvZGdNdfdfHgyKMhigv2GqVckF2xHYk0lHid1EVp/9wuAtWC31U8TtH7cBAmWSOaQkq8QHsU/Xl/s7lXYoSg1/D0ZN05asKvcw8gyYTbG4Cr0zPCTRDKMIGl8JTAWwmuF96Y8w/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706608828; c=relaxed/simple; bh=UXxOFnzyPjSmWhL7VN01cLQZkxTaV1mX68f4OmqP1C8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YPPdyYwGeGRZ5DtSxxtCJunJmI8deKwPnISPi+Q0/lTD4A29NfH/apQs8ua+LFRXmsgrJ7u6f1/TQonFdmR7Rdn1QtYvKjWeQK0YeEf1JvkpgxYoFQoBpErfCpI9fgpkk1SofMA0KkTEyXIo1VJ/k0MUtuebmhRssuJjUbKfil8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org; spf=pass smtp.mailfrom=endlessos.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b=XFxZfmIC; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=endlessos.org Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6ddb1115e82so2468442b3a.0 for ; Tue, 30 Jan 2024 02:00:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1706608826; x=1707213626; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=b8wT6bcymUslDtltBZzAISdjS3jJfOOrz/LevDJCQnA=; b=XFxZfmICV3268PQyy8LsPPvJWfUwpbnkOgIuLrCTHiIIwHU4+G5pj/9KBrVGiA5DZI gr3rHTmTnECx62dynyV94UXRv3x1wDvmOlfPUYN7aN3NxfKHRB7XPL2kTk8PUJUKwGBQ kfu1Mb1rTwfZZLiB6IFgnybZyYoY8Fmd5lLW93r6C2ElBL8CH/q4jEgI8gcAgJMRbdvF p9o11P5r1oSSjGGYVP5+Z4pOqIEQnMpoEDCSBw7tfLWYWLq52vhuSwB72ZwFCexnUki4 QUSHGgyiy4r/nWhL2YwWyOIUSbLJ9xv8NlQWP8ocphquFTM4Oj3tNY/tQXVD33w5nMg5 V61g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706608826; x=1707213626; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=b8wT6bcymUslDtltBZzAISdjS3jJfOOrz/LevDJCQnA=; b=mDfUsCrPImKysxywfqvEloj9hGbUNPGNsgDcYABKRJOjTa2TuCEF4Q8vWJ2g1gn4dD 4lB0L+5p3gIkjqTl/AWsHFS3wI2pYt/Z1v+csnbErcC7MXBJ1h/pgECxJNwKTAxc+RiJ F3AwY+MvPTiNvRjLH3R0p1QJMwSZDH+lX3R77ougD8NcFexfxcVIVIQE/X3l1kJ1hcPl w1VNAlTD8x7+YhGK5nuJ6rPLLNspziSPOxW+pENwDXyleXIlvkUAk9M8Y2YzOYUhCiet dNUXiGZW5QXo7AbzTIB+XOrVbLl565ofJbcXvpQ4SbbDd4QR5xkB3//EJ4PWs0BOYOA+ gRVA== X-Gm-Message-State: AOJu0Yw4FWThWA6QF20mNBea5lZpOmqay7XLjB3O4p3WgohormoICHc7 FVvkAHt7LlZnJEaosPd9U4bihDp07km+yXwO4quPek49WowlpOWw+Q1DOgEIgvk= X-Google-Smtp-Source: AGHT+IGDHT0UPx/DNjOeTCfqAlne/0fbxsadm9lL9NrmGBXb7/BJ1WXgntbW37yuK8GXzLGuWXYMBA== X-Received: by 2002:a05:6a00:179c:b0:6dd:7fd4:9fa1 with SMTP id s28-20020a056a00179c00b006dd7fd49fa1mr6712516pfg.8.1706608826374; Tue, 30 Jan 2024 02:00:26 -0800 (PST) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id w22-20020aa78596000000b006dde44a2d16sm7345021pfn.199.2024.01.30.02.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 02:00:26 -0800 (PST) From: Jian-Hong Pan To: Mika Westerberg , David Box , Damien Le Moal , Niklas Cassel , Nirmal Patel , Jonathan Derrick Cc: linux-ide@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan Subject: [PATCH 1/2] ata: ahci: Add force LPM policy quirk for ASUS B1400CEAE Date: Tue, 30 Jan 2024 17:59:33 +0800 Message-ID: <20240130095933.14158-1-jhp@endlessos.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some systems, like ASUS B1400CEAE equipped with the SATA controller [8086:a0d3] can use LPM policy to save power, especially for s2idle. However, the same controller may be failed on other platforms. So, commit (ata: ahci: Revert "ata: ahci: Add Tiger Lake UP{3,4} AHCI controller") drops LPM policy for [8086:a0d3]. But, this blocks going to deeper CPU Package C-state when s2idle with enabled Intel VMD. This patch adds ahci_force_lpm_policy DMI quirk for ASUS B1400CEAE to fix s2idle's power consumption issue when Intel VMD feature is enabled. Link: https://bugzilla.kernel.org/show_bug.cgi?id=218394 Signed-off-by: Jian-Hong Pan --- drivers/ata/ahci.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index d2460fa985b7..6bc5298a4adf 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1434,6 +1434,33 @@ static bool ahci_broken_devslp(struct pci_dev *pdev) return pci_match_id(ids, pdev); } +static bool ahci_force_lpm_policy(void) +{ + /* + * Some systems, like ASUS B1400CEAE equipped with the SATA controller + * [8086:a0d3] can use LPM policy to save power, especially for s2idle. + * However, the same controller may be failed on other platforms. So, + * commit (ata: ahci: Revert "ata: ahci: Add Tiger Lake UP{3,4} AHCI + * controller") drops LPM policy for [8086:a0d3]. + * + * https://bugzilla.kernel.org/show_bug.cgi?id=218394 + */ + static const struct dmi_system_id sysids[] = { + { + .ident = "ASUS B1400CEAE", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, + "ASUS EXPERTBOOK B1400CEAE"), + }, + }, + { } /* terminate list */ + }; + + return dmi_first_match(sysids); +} + #ifdef CONFIG_ATA_ACPI static void ahci_gtf_filter_workaround(struct ata_host *host) { @@ -1760,6 +1787,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ahci_pci_bar = AHCI_PCI_BAR_LOONGSON; } + if (ahci_force_lpm_policy()) { + pi = ahci_port_info[board_ahci_low_power]; + dev_info(&pdev->dev, "force controller follow LPM policy\n"); + } + /* acquire resources */ rc = pcim_enable_device(pdev); if (rc) From patchwork Tue Jan 30 10:00:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 1892732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=endlessos.org header.i=@endlessos.org header.a=rsa-sha256 header.s=google header.b=Pg8ZQJsu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.199.223; helo=ny.mirrors.kernel.org; envelope-from=linux-ide+bounces-375-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [147.75.199.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TPLPb6DSQz23dQ for ; Tue, 30 Jan 2024 21:04:51 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id B8C3B1C26FA6 for ; Tue, 30 Jan 2024 10:04:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A327F65BCF; Tue, 30 Jan 2024 10:01:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b="Pg8ZQJsu" X-Original-To: linux-ide@vger.kernel.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 7C82465BBB for ; Tue, 30 Jan 2024 10:01:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706608902; cv=none; b=HsIF3b0lo1ciIXjZTBjmvluQErhoSwwFKC1KSVb+wyNCpgcvDiXFaEcDJFfrmOA7wJuIngq8roPD35uMYBL/bxR9GVoJDwZJHCdQF7s2D7SpivpPb1BqwKn1BJyxbvFn3CA+wQ/B9XC0skj68FJ7SWCmQ2k6pIoVrUS5Pt24Jl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706608902; c=relaxed/simple; bh=teXt9OHZdZez3wzxIY3fbH5xLvmsOi4Wj5q2dFRSqx0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Ptro7ht0g/qjwANzuC2Xfan2T1EqsE4ll9emN7QGR2uNGgPCVFybqALsag5FVD6pI5zpc+cyGYk1zkZGJsP+vkIuUOiX3a/ibWnAKjF3znz9pVhFpg1kLJ19ewGVaIBf5HoQ7i/a7TJFKgyUjClyxioIj82VtpfzNUmQM9Jants= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org; spf=pass smtp.mailfrom=endlessos.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b=Pg8ZQJsu; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=endlessos.org Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-290da27f597so1739293a91.2 for ; Tue, 30 Jan 2024 02:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1706608900; x=1707213700; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QKkQF0FpW08UeteOAoIxviKy11wOo5codk8APJXnHpw=; b=Pg8ZQJsuOIKrKWAPtAdwj5JEMcqmwByEUHyPkHoyIeI6rd8cAgKB7dODgs4H37vWof UZOFF+qg83yKXNm1ar+ZncH5VL0C3KU6guVI3nVf41V1ZP/Jk+AXXD/rI5uO75TBa3uW slx4fV5rysnvznkjxxcVw+4lhidKLB5fVCWSF+yFSw+FX6wEe25t4qnKtte8gSAhuCL2 7egLUuUH77GBRVIvWT8XnkT3pDanYR/kS1iUTpA7k8wC21NL3UZavlf+0PuD9i/elSvP 7FKO+zU5JD6DSaHcSVCv3zMMXywKe4Sq9+A9jfjgYkuTNyaoYy8EmHIzYB98d2R6Fvab jzAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706608900; x=1707213700; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QKkQF0FpW08UeteOAoIxviKy11wOo5codk8APJXnHpw=; b=XIRi8a4MVZzV3QFqZCzCUbdWdU/cRSmlpMB0uSk2d4nDh9Su80nlTMB0fQC0SRRaLW xLkZOG55reVRjlo3gEMWhq9myeMx+QnCULWWIFEIbyiD+PZ3z0A4rGoIR7MnY50gale8 iu8QZg2QAz1SqtUqt0Bt7AwMSrjRom0UtTpoN6mSYLdyMktjSFQdwUxrVhkjawJPVq9J gqJLAfsOzTVZt0FacFNQUOJwQD9tGQusSX7eRhiIWXZogjii8Z9mLfcoOMIzPw5Q6lyC V8Bo40bIKpdvvu/xXZnzvjnhqXQuLkWz4zfvXirhrfcfdLPLNFCs/ZLtpJV89feAzMgE dUpg== X-Gm-Message-State: AOJu0Yz0qecnK2ZIGJgavBW8k8OsewhVyaaNClE/bHmlEMwgMpOgwMrB hxdX7PGKx86F3r6NV1mq07HXcnriSwGVzp9v2zezoZNky/C5l0XdM53GeQAOwtgoA0qDrC9gYWN ZIjs= X-Google-Smtp-Source: AGHT+IESf0EpjQx4lpB34RFQ6qQXQst1fuUCLWSZ9r/E3tjdjKkRAJqjn7CH4cmrPl4d8ixCz9wsdQ== X-Received: by 2002:a17:90a:604f:b0:295:b7d0:eadc with SMTP id h15-20020a17090a604f00b00295b7d0eadcmr456213pjm.24.1706608899779; Tue, 30 Jan 2024 02:01:39 -0800 (PST) Received: from localhost.localdomain ([123.51.167.56]) by smtp.googlemail.com with ESMTPSA id sg14-20020a17090b520e00b00295bc312ceasm730672pjb.34.2024.01.30.02.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 02:01:39 -0800 (PST) From: Jian-Hong Pan To: Mika Westerberg , David Box , Damien Le Moal , Niklas Cassel , Nirmal Patel , Jonathan Derrick Cc: linux-ide@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessos.org, Jian-Hong Pan Subject: [PATCH 2/2] PCI: vmd: enable PCI PM's L1 substates of remapped PCIe port and NVMe Date: Tue, 30 Jan 2024 18:00:51 +0800 Message-ID: <20240130100050.14182-2-jhp@endlessos.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The remmapped PCIe port and NVMe have PCI PM L1 substates capability on ASUS B1400CEAE, but they are disabled originally: Capabilities: [900 v1] L1 PM Substates L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1- ASPM_L1.2+ ASPM_L1.1- L1_PM_Substates+ PortCommonModeRestoreTime=32us PortTPowerOnTime=10us L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1- ASPM_L1.2+ ASPM_L1.1- T_CommonMode=0us LTR1.2_Threshold=0ns L1SubCtl2: T_PwrOn=10us Power on all of the VMD remapped PCI devices before enable PCI-PM L1 PM Substates by following "Section 5.5.4 of PCIe Base Spec Revision 5.0 Version 0.1". Then, PCI PM's L1 substates control are enabled accordingly. Link: https://bugzilla.kernel.org/show_bug.cgi?id=218394 Signed-off-by: Jian-Hong Pan --- drivers/pci/controller/vmd.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index 87b7856f375a..b1bbe8e6075a 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -738,6 +738,12 @@ static void vmd_copy_host_bridge_flags(struct pci_host_bridge *root_bridge, vmd_bridge->native_dpc = root_bridge->native_dpc; } +static int vmd_power_on_pci_device(struct pci_dev *pdev, void *userdata) +{ + pci_set_power_state(pdev, PCI_D0); + return 0; +} + /* * Enable ASPM and LTR settings on devices that aren't configured by BIOS. */ @@ -928,6 +934,13 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) vmd_acpi_begin(); pci_scan_child_bus(vmd->bus); + + /* + * Make PCI devices at D0 when enable PCI-PM L1 PM Substates from + * Section 5.5.4 of PCIe Base Spec Revision 5.0 Version 0.1 + */ + pci_walk_bus(vmd->bus, vmd_power_on_pci_device, NULL); + vmd_domain_reset(vmd); /* When Intel VMD is enabled, the OS does not discover the Root Ports