From nobody Fri Aug 8 13:19:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bz4QC5LGSz63ph5 for ; Fri, 08 Aug 2025 13:20:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bz4QC1Lsyz3ZKk for ; Fri, 08 Aug 2025 13:20:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-459ddada9b1so19837435e9.0 for ; Fri, 08 Aug 2025 06:20:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754659201; x=1755264001; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ny9aJf3Hisvhr2icFtjxtezk/LfDH22427JMglh6VBg=; b=PKv7W/LUhs/CidJGUPWlTml+FQBmOhqAeLDUNUnV9xf01kyXMzXTIRzqJQPNZsC/RK fawwAyfqH+kRrgxShJf0hj39FHdrhBg8hdtreN2o6QlTPHhacP8fw2YITahYlBfIe6ZS afxa+Fbyph8uhzODFerzEYU5q3j9hzEuY0gMIbLbPLhnhG1gDEeSwjgcvBWhqCPVcsEE DApdVYn+SE45dPBisOG/3Kpi1pDl/8Nas4/IKdJaqGYL+omQ/NS3DaX7P6YlEHs75tmO 0D/kLqtMec1BzsZ6yyaQVYbjcpy6FzeHE1qm0L/QI4f1W+GWNjjxXwGZqvnQOsZj7EE8 rrQA== X-Forwarded-Encrypted: i=1; AJvYcCWjdd4s/AVCD2VC6Q/NUcNqY4lZOIJB4UlM9LnkYBru1KwqRDWhuQNbxfcKPTg9edpQuo4Nmbxl+5ySGWtDWcMNPrHgkw==@freebsd.org X-Gm-Message-State: AOJu0YwzAwR4DSgoYGtoFOfQC88UQkuVChFoYuP+LE/5rBTW35EuV/Pc xTZqk84cUq1zdA3yGprTmJb4AtguXxiIMH8Zwh9FP3CsggLguE2JYWyLTSBO2tWHQcQ= X-Gm-Gg: ASbGncvlqjpG7igoBFmdDxVUJmBzGVjYntkVLL/YjdmRsU085T/R8jziwLsyxHxPMvE T0yeS77eWd4vFseNkSIHhFaQv3c49PwgMT3RvE3IDjrYbO7suR7k9sDbL/3yhgncypMTPbvDszT PGaJNuNZXt14ej+/9FaXR1Z9P6JUnZ5YRWPQvtm8sy25LDS+nMq5ufcruphJhSyyVKiLxtkhVX3 Z5bwTyhfaErWWgQItLwqxmQ/Z7IcpLquivzdwREEokjpp065/WSlJD15oFF0LrNTEzCogUwAlVh Rxn5raCTHBlZqAXqcGKYrm/KPK2EFwtLLyFISyO8c6Hs8jHPjsoN+8bWw2rHcsdal1hVrwJEef5 GM4neklb0DcBwl4Xx8UacyDbDYctJ+OaOu2UttyDLDYvWjQPOW3WnOOyNrfir9+hGIQSWRpA= X-Google-Smtp-Source: AGHT+IG9DYOqJ3pDNyZbeJX7PIOMvdn5Bvk+ZmAb8YwkvX901NyzpgDfhvVYzxZmuQzID50ZtGkXxA== X-Received: by 2002:a05:600c:1c10:b0:459:ddd6:1ca3 with SMTP id 5b1f17b1804b1-459f4c4ecedmr30723825e9.0.1754659201054; Fri, 08 Aug 2025 06:20:01 -0700 (PDT) Received: from smtpclient.apple (global-184-99.n-1.net.cam.ac.uk. [131.111.184.99]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459e5d0b1afsm131699565e9.26.2025.08.08.06.20.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Aug 2025 06:20:00 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Subject: Re: git: 84bbfc32a3f4 - main - acpi_powerres: D3cold support From: Jessica Clarke In-Reply-To: <202508080949.5789nfTs002732@gitrepo.freebsd.org> Date: Fri, 8 Aug 2025 14:19:58 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <80E8FFC9-8A81-400A-A849-2A468B212884@freebsd.org> References: <202508080949.5789nfTs002732@gitrepo.freebsd.org> To: Aymeric Wibo X-Mailer: Apple Mail (2.3826.600.51.1.1) X-Rspamd-Queue-Id: 4bz4QC1Lsyz3ZKk X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 8 Aug 2025, at 10:49, Aymeric Wibo wrote: >=20 > The branch main has been updated by obiwac: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D84bbfc32a3f47bd2e32741247afe516c= beff7789 >=20 > commit 84bbfc32a3f47bd2e32741247afe516cbeff7789 > Author: Aymeric Wibo > AuthorDate: 2025-06-14 15:29:25 +0000 > Commit: Aymeric Wibo > CommitDate: 2025-08-08 09:42:44 +0000 >=20 > acpi_powerres: D3cold support >=20 > Cherry-pick commit 0b76c0a from ACPICA (actypes: Distinguish = between > D3hot/cold, and default `ACPI_STATE_D3` to D3cold). >=20 > The same distinction is made between `PCI_POWERSTATE_D3_HOT` and > `PCI_POWERSTATE_D3_COLD`, as they're defined by ACPI (and are = asserted > to be the same). >=20 > D3cold is essentially the same as D3hot except the power resources = are > turned off. Add support for D3cold to `acpi_pwr_switch_consumer`. >=20 > `acpi_d_state_to_str` replaces the `printf("D%d", d_state)` = pattern, > allowing for "D3hot" and "D3cold" strings to be printed instead of = just > "D3". >=20 > Reviewed by: markj, ziaee, mckusick (mentor) > Approved by: markj, mckusick (mentor) > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D48384 > --- > share/man/man9/pci.9 | 8 +++- > sys/compat/linuxkpi/common/include/linux/pci.h | 10 ++--- > sys/contrib/dev/acpica/include/actypes.h | 8 ++-- > sys/dev/acpica/acpi.c | 9 ++-- > sys/dev/acpica/acpi_pci.c | 12 +++--- > sys/dev/acpica/acpi_powerres.c | 58 = +++++++++++++++++++------- > sys/dev/acpica/acpivar.h | 9 ++++ > sys/dev/pci/pci.c | 7 +++- > sys/dev/pci/pcivar.h | 27 ++++++------ > 9 files changed, 98 insertions(+), 50 deletions(-) >=20 > [...] > diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c > index f94438cda041..4629165f34b2 100644 > --- a/sys/dev/pci/pci.c > +++ b/sys/dev/pci/pci.c > @@ -81,6 +81,9 @@ >=20 > #include >=20 > +#include > +#include > + This breaks non-ACPI kernel configs. Please revert or fix. Note this is particularly bad for architectures that don=E2=80=99t use / support ACPI, i.e. everything except x86 and arm64. Jessica > #include "pcib_if.h" > #include "pci_if.h" >=20 > @@ -2896,8 +2899,8 @@ pci_set_powerstate_method(device_t dev, device_t = child, int state) > } >=20 > if (bootverbose) > - pci_printf(cfg, "Transition from D%d to D%d\n", oldstate, > - state); > + pci_printf(cfg, "Transition from %s to %s\n", > + acpi_d_state_to_str(oldstate), acpi_d_state_to_str(state)); >=20 > PCI_WRITE_CONFIG(dev, child, cfg->pp.pp_location + PCIR_POWER_STATUS, > status, 2); > [...]