git: 6e36cfadbca9 - main - stress2: No need to run tests for 30 minutes
The branch main has been updated by pho:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6e36cfadbca9c537880d96d933bfd686f7606e30
commit 6e36cfadbca9c537880d96d933bfd686f7606e30
Author: Peter Holm
AuthorDate: 2022-12-06 09:32:49 +
Commit: Peter Holm
CommitDate: 2022-12-06 09:32:49 +
stress2: No need to run tests for 30 minutes
---
tools/test/stress2/misc/quota5.sh | 2 +-
tools/test/stress2/misc/suj11.sh | 2 +-
tools/test/stress2/misc/suj15.sh | 2 +-
tools/test/stress2/misc/suj16.sh | 2 +-
tools/test/stress2/misc/suj26.sh | 2 +-
tools/test/stress2/misc/suj27.sh | 2 +-
tools/test/stress2/misc/suj4.sh | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/test/stress2/misc/quota5.sh
b/tools/test/stress2/misc/quota5.sh
index 050ea4a822d9..ee69dac4be01 100755
--- a/tools/test/stress2/misc/quota5.sh
+++ b/tools/test/stress2/misc/quota5.sh
@@ -39,6 +39,6 @@ edquota -g -f /tmp -e /tmp:150:140:20:18
$testuser
quotaon /tmp
su $testuser -c "export runRUNTIME=60m; cd ../testcases/mkdir; \
-./mkdir -t 30m -i 200 -v -v"
+./mkdir -t 10m -i 200 -v -v"
quotaoff /tmp
diff --git a/tools/test/stress2/misc/suj11.sh b/tools/test/stress2/misc/suj11.sh
index 362d33caf8a4..01f3a49be087 100755
--- a/tools/test/stress2/misc/suj11.sh
+++ b/tools/test/stress2/misc/suj11.sh
@@ -42,7 +42,7 @@ newfs -j md$mdstart > /dev/null
mount /dev/md$mdstart $mntpoint
chmod 777 $mntpoint
-export runRUNTIME=30m
+export runRUNTIME=10m
export RUNDIR=$mntpoint/stressX
su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1
diff --git a/tools/test/stress2/misc/suj15.sh b/tools/test/stress2/misc/suj15.sh
index 6ab9e653f12c..86bf2f4e3f1d 100755
--- a/tools/test/stress2/misc/suj15.sh
+++ b/tools/test/stress2/misc/suj15.sh
@@ -48,7 +48,7 @@ newfs -j md$mdstart > /dev/null
mount /dev/md$mdstart $mntpoint
chmod 777 $mntpoint
-export runRUNTIME=30m
+export runRUNTIME=10m
export RUNDIR=$mntpoint/stressX
su $testuser -c 'cd ..; ./run.sh jeff.cfg > /dev/null' &
diff --git a/tools/test/stress2/misc/suj16.sh b/tools/test/stress2/misc/suj16.sh
index b58f406e7564..64e64dd65fbc 100755
--- a/tools/test/stress2/misc/suj16.sh
+++ b/tools/test/stress2/misc/suj16.sh
@@ -46,7 +46,7 @@ newfs -j md$mdstart > /dev/null 2>&1
mount /dev/md$mdstart $mntpoint
chmod 777 $mntpoint
-export runRUNTIME=30m
+export runRUNTIME=10m
export RUNDIR=$mntpoint/stressX
export creatINCARNATIONS=2
diff --git a/tools/test/stress2/misc/suj26.sh b/tools/test/stress2/misc/suj26.sh
index 940ef5c92a29..427f94dbc664 100755
--- a/tools/test/stress2/misc/suj26.sh
+++ b/tools/test/stress2/misc/suj26.sh
@@ -45,7 +45,7 @@ newfs $opt md$mdstart > /dev/null 2>&1
mount /dev/md$mdstart $mntpoint
chmod 777 $mntpoint
-export runRUNTIME=30m
+export runRUNTIME=10m
export RUNDIR=$mntpoint/stressX
export creatINCARNATIONS=2
diff --git a/tools/test/stress2/misc/suj27.sh b/tools/test/stress2/misc/suj27.sh
index 8253243f5868..02cc70af5520 100755
--- a/tools/test/stress2/misc/suj27.sh
+++ b/tools/test/stress2/misc/suj27.sh
@@ -45,7 +45,7 @@ newfs $opt md$mdstart > /dev/null 2>&1
mount /dev/md$mdstart $mntpoint
chmod 777 $mntpoint
-export runRUNTIME=30m
+export runRUNTIME=10m
export RUNDIR=$mntpoint/stressX
export creatINCARNATIONS=2
diff --git a/tools/test/stress2/misc/suj4.sh b/tools/test/stress2/misc/suj4.sh
index 27001a64a0e5..928909077cef 100755
--- a/tools/test/stress2/misc/suj4.sh
+++ b/tools/test/stress2/misc/suj4.sh
@@ -40,7 +40,7 @@ mount /dev/md$mdstart $mntpoint
chmod 777 $mntpoint
export RUNDIR=$mntpoint/stressX
-export runRUNTIME=30m
+export runRUNTIME=10m
set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'`
export KBLOCKS=$(($1 / 2))
export INODES=$(($2 / 2))
Re: git: 3cf97e91fac5 - main - Revert "newbus: Change attach failure behavior"
On 12/6/22 03:09, Warner Losh wrote: The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3cf97e91fac5f53fc0375bc816cc541a8864ffc4 commit 3cf97e91fac5f53fc0375bc816cc541a8864ffc4 Author: Warner Losh AuthorDate: 2022-12-05 23:57:58 + Commit: Warner Losh CommitDate: 2022-12-06 00:00:26 + Revert "newbus: Change attach failure behavior" This reverts commit 68c3f0302106643207dcdfe3b414810e245228e5. There are some weird crashes when KVMs switch caused by this, so revert this commit until they are sorted out. Reported by:cy@ Sponsored by: Netflix --- UPDATING| 2 ++ sys/kern/subr_bus.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 099066031b8e..001ec9f6de3a 100644 --- a/UPDATING +++ b/UPDATING @@ -43,6 +43,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: needs to use devctl to re-enable the device, and reprobe it (or set the sysctl/tunable hw.bus.disable_failed_devices=false). + NOTE: This was reverted 20221205 due to unexpected compatibility issues + 20221122: pf no longer accepts 'scrub fragment crop' or 'scrub fragment drop-ovl'. These configurations are no longer automatically reinterpreted as diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 6a5ec4efc38d..b9615b033007 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -69,7 +69,7 @@ SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, SYSCTL_ROOT_NODE(OID_AUTO, dev, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, NULL); -static bool disable_failed_devs = true; +static bool disable_failed_devs = false; SYSCTL_BOOL(_hw_bus, OID_AUTO, disable_failed_devices, CTLFLAG_RWTUN, &disable_failed_devs, 0, "Do not retry attaching devices that return an error from DEVICE_ATTACH the first time"); Thinking about it, this flag shouldn't be set for USB devices and HUBS and such. Probably only makes sense for PCI devices, though there is something called thunderbolt too, which may fail during probe/attach, because the user yanked the device. Regarding the assert in the USB stack, maybe the state was not correctly set on the device_t ? --HPS
git: b972e7cbb4f9 - main - bhyve: build SPCR ACPI table
The branch main has been updated by corvink:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b972e7cbb4f9f44ab77be24857c674c0733785cf
commit b972e7cbb4f9f44ab77be24857c674c0733785cf
Author: Corvin Köhne
AuthorDate: 2022-11-30 14:46:19 +
Commit: Corvin Köhne
CommitDate: 2022-12-06 11:58:27 +
bhyve: build SPCR ACPI table
OVMF ships some static ACPI tables. This worked in the past but won't
work in the future when we support devices like tpms. They require a TPM
ACPI table. So, we have to dynamically create ACPI tables depending on
the bhyve configuration.
Bhyve has much more information about the system than OVMF. Therefore,
it's easier for bhyve to build up some ACPI tables. For that reason, it
would be much better to use the ACPI tables provided by bhyve instead of
building some tables by OVMF.
At the moment, OVMF always creates a SPCR table. Maybe someone depends
on it. So, we have to build it by bhyve too before we can patch OVMF to
install the tables provided by bhyve.
Reviewed by:markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D37591
---
usr.sbin/bhyve/acpi.c | 32
usr.sbin/bhyve/basl.h | 23 +++
2 files changed, 55 insertions(+)
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index d8d021f4bb81..bdb0e97076ad 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -692,6 +692,37 @@ build_rsdt(struct vmctx *const ctx)
return (0);
}
+static int
+build_spcr(struct vmctx *const ctx)
+{
+ ACPI_TABLE_SPCR spcr;
+ struct basl_table *table;
+
+ BASL_EXEC(basl_table_create(&table, ctx, ACPI_SIG_SPCR,
+ BASL_TABLE_ALIGNMENT));
+
+ memset(&spcr, 0, sizeof(spcr));
+ BASL_EXEC(basl_table_append_header(table, ACPI_SIG_SPCR, 1, 1));
+ spcr.InterfaceType = ACPI_DBG2_16550_COMPATIBLE;
+ basl_fill_gas(&spcr.SerialPort, ACPI_ADR_SPACE_SYSTEM_IO, 8, 0,
+ ACPI_GAS_ACCESS_WIDTH_LEGACY, 0x3F8);
+ spcr.InterruptType = ACPI_SPCR_INTERRUPT_TYPE_8259;
+ spcr.PcInterrupt = 4;
+ spcr.BaudRate = ACPI_SPCR_BAUD_RATE_115200;
+ spcr.Parity = ACPI_SPCR_PARITY_NO_PARITY;
+ spcr.StopBits = ACPI_SPCR_STOP_BITS_1;
+ spcr.FlowControl = 3; /* RTS/CTS | DCD */
+ spcr.TerminalType = ACPI_SPCR_TERMINAL_TYPE_VT_UTF8;
+ BASL_EXEC(basl_table_append_content(table, &spcr, sizeof(spcr)));
+
+ BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_SPCR,
+ ACPI_RSDT_ENTRY_SIZE));
+ BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_SPCR,
+ ACPI_XSDT_ENTRY_SIZE));
+
+ return (0);
+}
+
static int
build_xsdt(struct vmctx *const ctx)
{
@@ -749,6 +780,7 @@ acpi_build(struct vmctx *ctx, int ncpu)
BASL_EXEC(build_hpet(ctx));
BASL_EXEC(build_mcfg(ctx));
BASL_EXEC(build_facs(ctx));
+ BASL_EXEC(build_spcr(ctx));
BASL_EXEC(build_dsdt(ctx));
BASL_EXEC(basl_finish());
diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h
index 78beba1bcad1..c7fdd783a9d5 100644
--- a/usr.sbin/bhyve/basl.h
+++ b/usr.sbin/bhyve/basl.h
@@ -18,6 +18,29 @@
#define ACPI_GAS_ACCESS_WIDTH_DWORD 3
#define ACPI_GAS_ACCESS_WIDTH_QWORD 4
+#define ACPI_SPCR_INTERRUPT_TYPE_8259 0x1
+#define ACPI_SPCR_INTERRUPT_TYPE_APIC 0x2
+#define ACPI_SPCR_INTERRUPT_TYPE_SAPIC 0x4
+#define ACPI_SPCR_INTERRUPT_TYPE_GIC 0x8
+
+#define ACPI_SPCR_BAUD_RATE_9600 3
+#define ACPI_SPCR_BAUD_RATE_19200 4
+#define ACPI_SPCR_BAUD_RATE_57600 6
+#define ACPI_SPCR_BAUD_RATE_115200 7
+
+#define ACPI_SPCR_PARITY_NO_PARITY 0
+
+#define ACPI_SPCR_STOP_BITS_1 1
+
+#define ACPI_SPCR_FLOW_CONTROL_DCD 0x1
+#define ACPI_SPCR_FLOW_CONTROL_RTS_CTS 0x2
+#define ACPI_SPCR_FLOW_CONTROL_XON_XOFF 0x4
+
+#define ACPI_SPCR_TERMINAL_TYPE_VT100 0
+#define ACPI_SPCR_TERMINAL_TYPE_VT100_PLUS 1
+#define ACPI_SPCR_TERMINAL_TYPE_VT_UTF8 2
+#define ACPI_SPCR_TERMINAL_TYPE_ANSI 3
+
#define BHYVE_ACPI_BASE 0xf2400
#define BASL_TABLE_ALIGNMENT 0x10
git: 4085bde9fa2e - main - linuxkpi: Fix return value of dma_map_sgtable
The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4085bde9fa2ea7ebe861a2e4a07312aac00a26fc
commit 4085bde9fa2ea7ebe861a2e4a07312aac00a26fc
Author: Austin Shafer
AuthorDate: 2022-12-06 15:25:53 +
Commit: Emmanuel Vadot
CommitDate: 2022-12-06 15:25:53 +
linuxkpi: Fix return value of dma_map_sgtable
dma_map_sgtable internally uses the dma_map_sg_attrs helper. The problem is
that dma_map_sg_attrs returns the number of entries mapped, whereas
dma_map_sgtable returns nonzero on failure. This leads to dma_map_sgtable
returning non-zero-but-positive values which tricks other areas of the stack
into thinking nents is a valid pointer.
This checks if nents is valid and returns zero if so, updating the nents
field
in sgt. This fixes PRIME render offload with nvidia-drm.
Fixes: 9202c95f47c2 ("linuxkpi: Add dma_{un,}map_sgtable")
---
sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
index d3d25fcce857..7f2579787b4b 100644
--- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -362,7 +362,14 @@ dma_map_sgtable(struct device *dev, struct sg_table *sgt,
unsigned long attrs)
{
- return (dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs));
+ int nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs);
+
+ if (nents < 0) {
+ return nents;
+ } else {
+ sgt->nents = nents;
+ return 0;
+ }
}
static inline void
git: 72621b543e98 - main - linuxkpi: Fix style for dma_map_sgtable
The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=72621b543e984a2074e1945adc26b49ac04af7e8
commit 72621b543e984a2074e1945adc26b49ac04af7e8
Author: Emmanuel Vadot
AuthorDate: 2022-12-06 15:52:16 +
Commit: Emmanuel Vadot
CommitDate: 2022-12-06 15:52:16 +
linuxkpi: Fix style for dma_map_sgtable
Reported by:bz
Sponsored by: Beckhoff Automation GmbH & Co. KG
---
sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
index 7f2579787b4b..01395cc7a0d5 100644
--- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -361,15 +361,13 @@ dma_map_sgtable(struct device *dev, struct sg_table *sgt,
enum dma_data_direction dir,
unsigned long attrs)
{
+ int nents;
- int nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs);
-
- if (nents < 0) {
- return nents;
- } else {
- sgt->nents = nents;
- return 0;
- }
+ nents = dma_map_sg_attrs(dev, sgt->sgl, sgt->nents, dir, attrs);
+ if (nents < 0)
+ return (nents);
+ sgt->nents = nents;
+ return (0);
}
static inline void
Re: git: 3cf97e91fac5 - main - Revert "newbus: Change attach failure behavior"
On Tue, Dec 6, 2022 at 3:57 AM Hans Petter Selasky wrote: > On 12/6/22 03:09, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3cf97e91fac5f53fc0375bc816cc541a8864ffc4 > > > > commit 3cf97e91fac5f53fc0375bc816cc541a8864ffc4 > > Author: Warner Losh > > AuthorDate: 2022-12-05 23:57:58 + > > Commit: Warner Losh > > CommitDate: 2022-12-06 00:00:26 + > > > > Revert "newbus: Change attach failure behavior" > > > > This reverts commit 68c3f0302106643207dcdfe3b414810e245228e5. There > are > > some weird crashes when KVMs switch caused by this, so revert this > > commit until they are sorted out. > > > > Reported by:cy@ > > Sponsored by: Netflix > > --- > > UPDATING| 2 ++ > > sys/kern/subr_bus.c | 2 +- > > 2 files changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/UPDATING b/UPDATING > > index 099066031b8e..001ec9f6de3a 100644 > > --- a/UPDATING > > +++ b/UPDATING > > @@ -43,6 +43,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: > > needs to use devctl to re-enable the device, and reprobe it (or set > > the sysctl/tunable hw.bus.disable_failed_devices=false). > > > > + NOTE: This was reverted 20221205 due to unexpected compatibility > issues > > + > > 20221122: > > pf no longer accepts 'scrub fragment crop' or 'scrub fragment > drop-ovl'. > > These configurations are no longer automatically reinterpreted as > > diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c > > index 6a5ec4efc38d..b9615b033007 100644 > > --- a/sys/kern/subr_bus.c > > +++ b/sys/kern/subr_bus.c > > @@ -69,7 +69,7 @@ SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW | > CTLFLAG_MPSAFE, NULL, > > SYSCTL_ROOT_NODE(OID_AUTO, dev, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, > > NULL); > > > > -static bool disable_failed_devs = true; > > +static bool disable_failed_devs = false; > > SYSCTL_BOOL(_hw_bus, OID_AUTO, disable_failed_devices, CTLFLAG_RWTUN, > &disable_failed_devs, > > 0, "Do not retry attaching devices that return an error from > DEVICE_ATTACH the first time"); > > > > Thinking about it, this flag shouldn't be set for USB devices and HUBS > and such. Probably only makes sense for PCI devices, though there is > something called thunderbolt too, which may fail during probe/attach, > because the user yanked the device. > I think it makes perfect sense for all devices everywhere. When a device goes away like you say, it's device_t will be gone soonish and this flag will clear if it is reinserted in the future. The bus will get a signal for that yanking and will remove the device_t (now maybe we have a bug in device deletion when that happens, which is what I suspected when I saw this and a couple other tracebacks). > Regarding the assert in the USB stack, maybe the state was not correctly > set on the device_t ? > It's unclear to me. Newbus doesn't guarantee certain states to the bus drivers, so maybe the assert in the USB stack is incorrectly strict on what states it assumes the device is in? I'm unsure. I haven't looked deeply enough to know what exactly is going on. Since there were problems and I didn't have time to do the proper deep dive, I just reverted for now and will revisit when I have the time. Warner
git: 17859d538c23 - main - ixl: silence runtime warning when PCI_IOV is not enabled
The branch main has been updated by gallatin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=17859d538c23d6faa5a5512262d678377130e591
commit 17859d538c23d6faa5a5512262d678377130e591
Author: Andrew Gallatin
AuthorDate: 2022-12-06 16:35:18 +
Commit: Andrew Gallatin
CommitDate: 2022-12-06 16:35:18 +
ixl: silence runtime warning when PCI_IOV is not enabled
When PCI_IOV is not enabled, do not attempt to call
iflib_softirq_alloc_generic(...IFLIB_INTR_IOV), as it results
in boot-time warnings similar to:
taskqgroup_attach_cpu: qid not found for iov cpu=2
ixl2: taskqgroup_attach_cpu failed 22
Instead, make it conditional on PCI_IOV like the other
SR-IOV related code.
Reviewed by:erj
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D37609
---
sys/dev/ixl/if_ixl.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c
index cb3ce72a95ed..352a35d95512 100644
--- a/sys/dev/ixl/if_ixl.c
+++ b/sys/dev/ixl/if_ixl.c
@@ -1064,8 +1064,11 @@ ixl_if_msix_intr_assign(if_ctx_t ctx, int msix)
"Failed to register Admin Que handler");
return (err);
}
+
+#ifdef PCI_IOV
/* Create soft IRQ for handling VFLRs */
iflib_softirq_alloc_generic(ctx, NULL, IFLIB_INTR_IOV, pf, 0, "iov");
+#endif
/* Now set up the stations */
for (i = 0, vector = 1; i < vsi->shared->isc_nrxqsets; i++, vector++,
rx_que++) {
Re: git: 9a4bc5208fad - main - acpica: Import ACPICA 20221020
In message <202210280205.29s25mz5011...@gitrepo.freebsd.org>, Jung-uk Kim
write
s:
> The branch main has been updated by jkim:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=9a4bc5208fad4d69360dbbe769e28a37
> 419c4e21
>
> commit 9a4bc5208fad4d69360dbbe769e28a37419c4e21
> Author: Jung-uk Kim
> AuthorDate: 2022-10-27 21:34:40 +
> Commit: Jung-uk Kim
> CommitDate: 2022-10-28 02:03:50 +
>
> acpica: Import ACPICA 20221020
>
> (cherry picked from commit a799bdd9d50e84cd6a36e8f1d2ac4301b2a6b374)
> ---
> sys/contrib/dev/acpica/common/acfileio.c | 131 ++--
> sys/contrib/dev/acpica/common/adisasm.c| 4 +-
> sys/contrib/dev/acpica/common/ahtable.c| 2 +
> sys/contrib/dev/acpica/common/ahuuids.c| 3 +
> sys/contrib/dev/acpica/common/dmtable.c| 116 ---
> sys/contrib/dev/acpica/common/dmtables.c | 2 +-
> sys/contrib/dev/acpica/common/dmtbdump.c | 4 +-
> sys/contrib/dev/acpica/common/dmtbdump1.c | 205 -
> sys/contrib/dev/acpica/common/dmtbdump2.c | 100 --
> sys/contrib/dev/acpica/common/dmtbinfo1.c | 110 +++
> sys/contrib/dev/acpica/common/dmtbinfo2.c | 33 +-
> sys/contrib/dev/acpica/common/dmtbinfo3.c | 17 ++
> sys/contrib/dev/acpica/compiler/aslcodegen.c | 75 -
> sys/contrib/dev/acpica/compiler/aslcompile.c | 12 +-
> sys/contrib/dev/acpica/compiler/aslerror.c | 1 -
> sys/contrib/dev/acpica/compiler/aslhelp.c | 1 +
> sys/contrib/dev/acpica/compiler/asloptions.c | 30 +-
> sys/contrib/dev/acpica/compiler/aslpredef.c| 2 +-
> sys/contrib/dev/acpica/compiler/aslprune.c | 8 +
> sys/contrib/dev/acpica/compiler/aslstartup.c | 2 +-
> sys/contrib/dev/acpica/compiler/dtcompile.c| 42 +++
> sys/contrib/dev/acpica/compiler/dtcompiler.h | 10 +
> sys/contrib/dev/acpica/compiler/dtio.c | 2 +-
> sys/contrib/dev/acpica/compiler/dttable1.c | 128 +++-
> sys/contrib/dev/acpica/compiler/dttable2.c | 169 +--
> sys/contrib/dev/acpica/compiler/dttemplate.h | 63 +++-
> sys/contrib/dev/acpica/compiler/dtutils.c | 3 +-
> .../dev/acpica/components/debugger/dbutils.c | 192
> sys/contrib/dev/acpica/components/events/evevent.c | 11 +-
> .../dev/acpica/components/events/evregion.c| 8 +
> .../dev/acpica/components/executer/exfield.c | 6 +-
> .../dev/acpica/components/executer/exserial.c | 6 +
> .../dev/acpica/components/hardware/hwsleep.c | 10 +
> sys/contrib/dev/acpica/components/tables/tbdata.c | 2 +-
> sys/contrib/dev/acpica/components/tables/tbfadt.c | 2 +-
> sys/contrib/dev/acpica/components/tables/tbprint.c | 90 +-
> sys/contrib/dev/acpica/components/tables/tbutils.c | 2 +-
> .../dev/acpica/components/tables/tbxfroot.c| 32 +-
> .../dev/acpica/components/utilities/utcksum.c | 335 +++
> ++
> .../dev/acpica/components/utilities/utglobal.c | 1 +
> .../dev/acpica/components/utilities/utstring.c | 10 +-
> sys/contrib/dev/acpica/include/acconfig.h | 2 +
> sys/contrib/dev/acpica/include/acdisasm.h | 19 ++
> sys/contrib/dev/acpica/include/acglobal.h | 1 +
> sys/contrib/dev/acpica/include/acpixf.h| 2 +-
> sys/contrib/dev/acpica/include/actables.h | 10 -
> sys/contrib/dev/acpica/include/actbinfo.h | 10 +
> sys/contrib/dev/acpica/include/actbl1.h| 179 ++-
> sys/contrib/dev/acpica/include/actbl2.h| 163 +-
> sys/contrib/dev/acpica/include/actypes.h | 9 +-
> sys/contrib/dev/acpica/include/acutils.h | 25 ++
> sys/contrib/dev/acpica/include/acuuid.h| 3 +-
> 52 files changed, 2121 insertions(+), 284 deletions(-)
This broke Wake-on-LAN on my Acer laptop. Sending a WOL signal to the
laptop fails to wake the machine. However, pulling the power cord, plugging
it back in, and then sending a WOL signal does wake it. This led me to
believe this commit was the cause of the problem.
To remediate I applied the following patch, essentially reverting two small
patches within this commit. This fixes my WOL problem.
diff --git a/sys/contrib/dev/acpica/components/events/evevent.c
b/sys/contrib/dev/acpica/components/events/evevent.c
index 07c06c7c7839..1eb1262b92ea 100644
--- a/sys/contrib/dev/acpica/components/events/evevent.c
+++ b/sys/contrib/dev/acpica/components/events/evevent.c
@@ -312,8 +312,7 @@ AcpiEvFixedEventInitialize (
{
Status = AcpiWriteBitRegister (
AcpiGbl_FixedEventInfo[i].EnableRegisterId,
-(i == ACPI_EVENT_PCIE_WAKE) ?
-ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT);
+ACPI_DISABLE_EVENT);
if (ACPI_FAILURE (Status))
{
git: 48e733eef92c - main - Add some more local.*.mk includes
The branch main has been updated by sjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=48e733eef92cf7c3bbde12d965c66766322e1f5e
commit 48e733eef92cf7c3bbde12d965c66766322e1f5e
Author: Simon J. Gerraty
AuthorDate: 2022-12-06 18:49:54 +
Commit: Simon J. Gerraty
CommitDate: 2022-12-06 18:49:54 +
Add some more local.*.mk includes
These facilitate customizing the build with minimal churn.
Reviewed by:stevek
Sponsored by: Juniper Networks, Inc.
Differential Revision: https://reviews.freebsd.org/D37592
---
share/mk/bsd.kmod.mk | 2 ++
share/mk/bsd.opts.mk | 2 ++
share/mk/bsd.sysdir.mk | 2 ++
3 files changed, 6 insertions(+)
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index 683967749e75..bb939f429546 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,4 +1,6 @@
# $FreeBSD$
+.-include
+
.include
.include "${SYSDIR}/conf/kmod.mk"
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index d448656bd96d..a391e16a6d1b 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -104,6 +104,8 @@ __DEFAULT_NO_OPTIONS+= PIE
__DEFAULT_YES_OPTIONS+=PIE
.endif
+.-include
+
.include
.if ${MK_INIT_ALL_PATTERN} == "yes" && ${MK_INIT_ALL_ZERO} == "yes"
diff --git a/share/mk/bsd.sysdir.mk b/share/mk/bsd.sysdir.mk
index 665905e1d537..046ca433e6af 100644
--- a/share/mk/bsd.sysdir.mk
+++ b/share/mk/bsd.sysdir.mk
@@ -1,5 +1,7 @@
# $FreeBSD$
+.-include
+
# Search for kernel source tree in standard places.
.if !defined(SYSDIR)
.for _dir in ${SRCTOP:D${SRCTOP}/sys} \
Re: git: 9a4bc5208fad - main - acpica: Import ACPICA 20221020
On 22. 12. 6., Cy Schubert wrote:
In message <202210280205.29s25mz5011...@gitrepo.freebsd.org>, Jung-uk Kim
write
s:
The branch main has been updated by jkim:
URL: https://cgit.FreeBSD.org/src/commit/?id=9a4bc5208fad4d69360dbbe769e28a37
419c4e21
commit 9a4bc5208fad4d69360dbbe769e28a37419c4e21
Author: Jung-uk Kim
AuthorDate: 2022-10-27 21:34:40 +
Commit: Jung-uk Kim
CommitDate: 2022-10-28 02:03:50 +
acpica: Import ACPICA 20221020
(cherry picked from commit a799bdd9d50e84cd6a36e8f1d2ac4301b2a6b374)
---
sys/contrib/dev/acpica/common/acfileio.c | 131 ++--
sys/contrib/dev/acpica/common/adisasm.c| 4 +-
sys/contrib/dev/acpica/common/ahtable.c| 2 +
sys/contrib/dev/acpica/common/ahuuids.c| 3 +
sys/contrib/dev/acpica/common/dmtable.c| 116 ---
sys/contrib/dev/acpica/common/dmtables.c | 2 +-
sys/contrib/dev/acpica/common/dmtbdump.c | 4 +-
sys/contrib/dev/acpica/common/dmtbdump1.c | 205 -
sys/contrib/dev/acpica/common/dmtbdump2.c | 100 --
sys/contrib/dev/acpica/common/dmtbinfo1.c | 110 +++
sys/contrib/dev/acpica/common/dmtbinfo2.c | 33 +-
sys/contrib/dev/acpica/common/dmtbinfo3.c | 17 ++
sys/contrib/dev/acpica/compiler/aslcodegen.c | 75 -
sys/contrib/dev/acpica/compiler/aslcompile.c | 12 +-
sys/contrib/dev/acpica/compiler/aslerror.c | 1 -
sys/contrib/dev/acpica/compiler/aslhelp.c | 1 +
sys/contrib/dev/acpica/compiler/asloptions.c | 30 +-
sys/contrib/dev/acpica/compiler/aslpredef.c| 2 +-
sys/contrib/dev/acpica/compiler/aslprune.c | 8 +
sys/contrib/dev/acpica/compiler/aslstartup.c | 2 +-
sys/contrib/dev/acpica/compiler/dtcompile.c| 42 +++
sys/contrib/dev/acpica/compiler/dtcompiler.h | 10 +
sys/contrib/dev/acpica/compiler/dtio.c | 2 +-
sys/contrib/dev/acpica/compiler/dttable1.c | 128 +++-
sys/contrib/dev/acpica/compiler/dttable2.c | 169 +--
sys/contrib/dev/acpica/compiler/dttemplate.h | 63 +++-
sys/contrib/dev/acpica/compiler/dtutils.c | 3 +-
.../dev/acpica/components/debugger/dbutils.c | 192
sys/contrib/dev/acpica/components/events/evevent.c | 11 +-
.../dev/acpica/components/events/evregion.c| 8 +
.../dev/acpica/components/executer/exfield.c | 6 +-
.../dev/acpica/components/executer/exserial.c | 6 +
.../dev/acpica/components/hardware/hwsleep.c | 10 +
sys/contrib/dev/acpica/components/tables/tbdata.c | 2 +-
sys/contrib/dev/acpica/components/tables/tbfadt.c | 2 +-
sys/contrib/dev/acpica/components/tables/tbprint.c | 90 +-
sys/contrib/dev/acpica/components/tables/tbutils.c | 2 +-
.../dev/acpica/components/tables/tbxfroot.c| 32 +-
.../dev/acpica/components/utilities/utcksum.c | 335 +++
++
.../dev/acpica/components/utilities/utglobal.c | 1 +
.../dev/acpica/components/utilities/utstring.c | 10 +-
sys/contrib/dev/acpica/include/acconfig.h | 2 +
sys/contrib/dev/acpica/include/acdisasm.h | 19 ++
sys/contrib/dev/acpica/include/acglobal.h | 1 +
sys/contrib/dev/acpica/include/acpixf.h| 2 +-
sys/contrib/dev/acpica/include/actables.h | 10 -
sys/contrib/dev/acpica/include/actbinfo.h | 10 +
sys/contrib/dev/acpica/include/actbl1.h| 179 ++-
sys/contrib/dev/acpica/include/actbl2.h| 163 +-
sys/contrib/dev/acpica/include/actypes.h | 9 +-
sys/contrib/dev/acpica/include/acutils.h | 25 ++
sys/contrib/dev/acpica/include/acuuid.h| 3 +-
52 files changed, 2121 insertions(+), 284 deletions(-)
This broke Wake-on-LAN on my Acer laptop. Sending a WOL signal to the
laptop fails to wake the machine. However, pulling the power cord, plugging
it back in, and then sending a WOL signal does wake it. This led me to
believe this commit was the cause of the problem.
To remediate I applied the following patch, essentially reverting two small
patches within this commit. This fixes my WOL problem.
diff --git a/sys/contrib/dev/acpica/components/events/evevent.c
b/sys/contrib/dev/acpica/components/events/evevent.c
index 07c06c7c7839..1eb1262b92ea 100644
--- a/sys/contrib/dev/acpica/components/events/evevent.c
+++ b/sys/contrib/dev/acpica/components/events/evevent.c
@@ -312,8 +312,7 @@ AcpiEvFixedEventInitialize (
{
Status = AcpiWriteBitRegister (
AcpiGbl_FixedEventInfo[i].EnableRegisterId,
-(i == ACPI_EVENT_PCIE_WAKE) ?
-ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT);
+ACPI_DISABLE_EVENT);
if (ACPI_FAILURE (Status))
{
return (Status);
@@ -4
Re: git: 9a4bc5208fad - main - acpica: Import ACPICA 20221020
On Tue, 6 Dec 2022 17:06:43 -0500 Jung-uk Kim wrote: > On 22. 12. 6., Cy Schubert wrote: > > In message <202210280205.29s25mz5011...@gitrepo.freebsd.org>, Jung-uk Kim > > write > > s: > >> The branch main has been updated by jkim: > >> > >> URL: > >> https://cgit.FreeBSD.org/src/commit/?id=9a4bc5208fad4d69360dbbe769e28a37 > >> 419c4e21 > >> > >> commit 9a4bc5208fad4d69360dbbe769e28a37419c4e21 > >> Author: Jung-uk Kim > >> AuthorDate: 2022-10-27 21:34:40 + > >> Commit: Jung-uk Kim > >> CommitDate: 2022-10-28 02:03:50 + > >> > >> acpica: Import ACPICA 20221020 > >> > >> (cherry picked from commit a799bdd9d50e84cd6a36e8f1d2ac4301b2a6b374) > >> --- > >> sys/contrib/dev/acpica/common/acfileio.c | 131 ++-- > >> sys/contrib/dev/acpica/common/adisasm.c| 4 +- > >> sys/contrib/dev/acpica/common/ahtable.c| 2 + > >> sys/contrib/dev/acpica/common/ahuuids.c| 3 + > >> sys/contrib/dev/acpica/common/dmtable.c| 116 --- > >> sys/contrib/dev/acpica/common/dmtables.c | 2 +- > >> sys/contrib/dev/acpica/common/dmtbdump.c | 4 +- > >> sys/contrib/dev/acpica/common/dmtbdump1.c | 205 - > >> sys/contrib/dev/acpica/common/dmtbdump2.c | 100 -- > >> sys/contrib/dev/acpica/common/dmtbinfo1.c | 110 +++ > >> sys/contrib/dev/acpica/common/dmtbinfo2.c | 33 +- > >> sys/contrib/dev/acpica/common/dmtbinfo3.c | 17 ++ > >> sys/contrib/dev/acpica/compiler/aslcodegen.c | 75 - > >> sys/contrib/dev/acpica/compiler/aslcompile.c | 12 +- > >> sys/contrib/dev/acpica/compiler/aslerror.c | 1 - > >> sys/contrib/dev/acpica/compiler/aslhelp.c | 1 + > >> sys/contrib/dev/acpica/compiler/asloptions.c | 30 +- > >> sys/contrib/dev/acpica/compiler/aslpredef.c| 2 +- > >> sys/contrib/dev/acpica/compiler/aslprune.c | 8 + > >> sys/contrib/dev/acpica/compiler/aslstartup.c | 2 +- > >> sys/contrib/dev/acpica/compiler/dtcompile.c| 42 +++ > >> sys/contrib/dev/acpica/compiler/dtcompiler.h | 10 + > >> sys/contrib/dev/acpica/compiler/dtio.c | 2 +- > >> sys/contrib/dev/acpica/compiler/dttable1.c | 128 +++- > >> sys/contrib/dev/acpica/compiler/dttable2.c | 169 +-- > >> sys/contrib/dev/acpica/compiler/dttemplate.h | 63 +++- > >> sys/contrib/dev/acpica/compiler/dtutils.c | 3 +- > >> .../dev/acpica/components/debugger/dbutils.c | 192 > >> sys/contrib/dev/acpica/components/events/evevent.c | 11 +- > >> .../dev/acpica/components/events/evregion.c| 8 + > >> .../dev/acpica/components/executer/exfield.c | 6 +- > >> .../dev/acpica/components/executer/exserial.c | 6 + > >> .../dev/acpica/components/hardware/hwsleep.c | 10 + > >> sys/contrib/dev/acpica/components/tables/tbdata.c | 2 +- > >> sys/contrib/dev/acpica/components/tables/tbfadt.c | 2 +- > >> sys/contrib/dev/acpica/components/tables/tbprint.c | 90 +- > >> sys/contrib/dev/acpica/components/tables/tbutils.c | 2 +- > >> .../dev/acpica/components/tables/tbxfroot.c| 32 +- > >> .../dev/acpica/components/utilities/utcksum.c | 335 > >> +++ > >> ++ > >> .../dev/acpica/components/utilities/utglobal.c | 1 + > >> .../dev/acpica/components/utilities/utstring.c | 10 +- > >> sys/contrib/dev/acpica/include/acconfig.h | 2 + > >> sys/contrib/dev/acpica/include/acdisasm.h | 19 ++ > >> sys/contrib/dev/acpica/include/acglobal.h | 1 + > >> sys/contrib/dev/acpica/include/acpixf.h| 2 +- > >> sys/contrib/dev/acpica/include/actables.h | 10 - > >> sys/contrib/dev/acpica/include/actbinfo.h | 10 + > >> sys/contrib/dev/acpica/include/actbl1.h| 179 ++- > >> sys/contrib/dev/acpica/include/actbl2.h| 163 +- > >> sys/contrib/dev/acpica/include/actypes.h | 9 +- > >> sys/contrib/dev/acpica/include/acutils.h | 25 ++ > >> sys/contrib/dev/acpica/include/acuuid.h| 3 +- > >> 52 files changed, 2121 insertions(+), 284 deletions(-) > > > > This broke Wake-on-LAN on my Acer laptop. Sending a WOL signal to the > > laptop fails to wake the machine. However, pulling the power cord, plugging > > it back in, and then sending a WOL signal does wake it. This led me to > > believe this commit was the cause of the problem. > > > > To remediate I applied the following patch, essentially reverting two small > > patches within this commit. This fixes my WOL problem. > > > > diff --git a/sys/contrib/dev/acpica/components/events/evevent.c > > b/sys/contrib/dev/acpica/components/events/evevent.c > > index 07c06c7c7839..1eb1262b92ea 100644 > > --- a/sys/contrib/dev/acpica/components/events/ev
