svn commit: r309528 - head/sys/dev/sound/pci/hda
Author: yongari Date: Sun Dec 4 05:55:18 2016 New Revision: 309528 URL: https://svnweb.freebsd.org/changeset/base/309528 Log: Fix too low volume on MSI H170 GAMING M3 board by poking vendor specific COEF. Modified: head/sys/dev/sound/pci/hda/hdaa_patches.c Modified: head/sys/dev/sound/pci/hda/hdaa_patches.c == --- head/sys/dev/sound/pci/hda/hdaa_patches.c Sun Dec 4 05:46:30 2016 (r309527) +++ head/sys/dev/sound/pci/hda/hdaa_patches.c Sun Dec 4 05:55:18 2016 (r309528) @@ -739,6 +739,12 @@ hdaa_patch_direct(struct hdaa_devinfo *d hda_command(dev, HDA_CMD_12BIT(0, devinfo->nid, 0xf88, 0xc0)); break; + case HDA_CODEC_ALC1150: + if (subid == 0xd9781462) { + /* Too low volume on MSI H170 GAMING M3. */ + hdaa_write_coef(dev, 0x20, 0x07, 0x7cb); + } + break; } if (subid == APPLE_INTEL_MAC) hda_command(dev, HDA_CMD_12BIT(0, devinfo->nid, ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309527 - head/sys/dev/sound/pci/hda
Author: yongari Date: Sun Dec 4 05:46:30 2016 New Revision: 309527 URL: https://svnweb.freebsd.org/changeset/base/309527 Log: Recognize RealTek ALC1150 7.1 channel HD audio codec. Modified: head/sys/dev/sound/pci/hda/hdac.h head/sys/dev/sound/pci/hda/hdacc.c Modified: head/sys/dev/sound/pci/hda/hdac.h == --- head/sys/dev/sound/pci/hda/hdac.h Sun Dec 4 04:04:57 2016 (r309526) +++ head/sys/dev/sound/pci/hda/hdac.h Sun Dec 4 05:46:30 2016 (r309527) @@ -368,6 +368,7 @@ #define HDA_CODEC_ALC889 HDA_CODEC_CONSTRUCT(REALTEK, 0x0889) #define HDA_CODEC_ALC892 HDA_CODEC_CONSTRUCT(REALTEK, 0x0892) #define HDA_CODEC_ALC899 HDA_CODEC_CONSTRUCT(REALTEK, 0x0899) +#define HDA_CODEC_ALC1150 HDA_CODEC_CONSTRUCT(REALTEK, 0x0900) #define HDA_CODEC_ALC HDA_CODEC_CONSTRUCT(REALTEK, 0x) /* Motorola */ Modified: head/sys/dev/sound/pci/hda/hdacc.c == --- head/sys/dev/sound/pci/hda/hdacc.c Sun Dec 4 04:04:57 2016 (r309526) +++ head/sys/dev/sound/pci/hda/hdacc.c Sun Dec 4 05:46:30 2016 (r309527) @@ -111,6 +111,7 @@ static const struct { { HDA_CODEC_ALC889, 0, "Realtek ALC889" }, { HDA_CODEC_ALC892, 0, "Realtek ALC892" }, { HDA_CODEC_ALC899, 0, "Realtek ALC899" }, + { HDA_CODEC_ALC1150, 0, "Realtek ALC1150" }, { HDA_CODEC_AD1882, 0, "Analog Devices AD1882" }, { HDA_CODEC_AD1882A, 0, "Analog Devices AD1882A" }, { HDA_CODEC_AD1883, 0, "Analog Devices AD1883" }, ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309526 - head/sys/dev/ioat
Author: cem Date: Sun Dec 4 04:04:57 2016 New Revision: 309526 URL: https://svnweb.freebsd.org/changeset/base/309526 Log: ioat(4): Compile on i386 Truncate BUS_SPACE_MAXADDR_40BIT to essentially BUS_SPACE_MAXADDR_32BIT on platforms with 32-bit bus_addr_t (i.e., i386). PR: 215034 Reported by: ngie@ Sponsored by: Dell EMC Isilon Modified: head/sys/dev/ioat/ioat.c Modified: head/sys/dev/ioat/ioat.c == --- head/sys/dev/ioat/ioat.cSun Dec 4 03:50:57 2016(r309525) +++ head/sys/dev/ioat/ioat.cSun Dec 4 04:04:57 2016(r309526) @@ -486,8 +486,9 @@ ioat3_attach(device_t device) ringsz = sizeof(struct ioat_dma_hw_descriptor) * num_descriptors; error = bus_dma_tag_create(bus_get_dma_tag(ioat->device), - 2 * 1024 * 1024, 0x0, BUS_SPACE_MAXADDR_40BIT, BUS_SPACE_MAXADDR, - NULL, NULL, ringsz, 1, ringsz, 0, NULL, NULL, >hw_desc_tag); + 2 * 1024 * 1024, 0x0, (bus_addr_t)BUS_SPACE_MAXADDR_40BIT, + BUS_SPACE_MAXADDR, NULL, NULL, ringsz, 1, ringsz, 0, NULL, NULL, + >hw_desc_tag); if (error != 0) return (error); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309525 - head/tests/sys/kern
Author: cem Date: Sun Dec 4 03:50:57 2016 New Revision: 309525 URL: https://svnweb.freebsd.org/changeset/base/309525 Log: coredump_phnum_test: Make expected pheader count more flexible Note: this test still requires binutils readelf (from ports) to pass, until a few issues are resolved in elftoolchain. PR: 215019 Reported by: ngie@ Sponsored by: Dell EMC Isilon Modified: head/tests/sys/kern/coredump_phnum_test.sh Modified: head/tests/sys/kern/coredump_phnum_test.sh == --- head/tests/sys/kern/coredump_phnum_test.sh Sun Dec 4 03:10:25 2016 (r309524) +++ head/tests/sys/kern/coredump_phnum_test.sh Sun Dec 4 03:50:57 2016 (r309525) @@ -39,7 +39,7 @@ coredump_phnum_head() } coredump_phnum_body() { - atf_expect_fail "the value parsed doesn't always match the value obtained on the running system; bug # 215019" + atf_expect_fail "elftoolchain (base) readelf doesn't handle extended program header numbers; bug # 215019" # Set up core dumping cat > coredump_phnum_restore_state.sh <<-EOF @@ -65,17 +65,17 @@ EOF # the result of running the helper program and dumping core. The only # important bit is that they're larger than 65535 (UINT16_MAX). readelf -h coredump_phnum_helper.core | \ - atf_check -o "match:65535 \(66169\)" \ + atf_check -o "match:65535 \(66[0-9]{3}\)" \ grep "Number of program headers:" readelf -l coredump_phnum_helper.core | \ - atf_check -o "match:There are 66169 program headers" \ + atf_check -o "match:There are 66[0-9]{3} program headers" \ grep -1 "program headers" readelf -S coredump_phnum_helper.core | \ - atf_check -o "match: 0001 .* 66169 " \ + atf_check -o "match: 0001 .* 66[0-9]{3} " \ grep -A1 "^ \[ 0\] " procstat -v coredump_phnum_helper.core | \ - atf_check -o "match:66545" wc -l + atf_check -o "match:66[0-9]{3}" wc -l } coredump_phnum_cleanup() { ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309522 - head/sys/powerpc/booke
On Sun, 4 Dec 2016 02:15:46 + (UTC) Justin Hibbitswrote: > Author: jhibbits > Date: Sun Dec 4 02:15:46 2016 > New Revision: 309522 > URL: https://svnweb.freebsd.org/changeset/base/309522 > > Log: > Fix a typo (move parenthesis to correct location in the line). > > Before this, it would cause the one consumer of this API in powerpc > usage (dev/dpaa) to set the PTE WIMG flags to empty instead of --M-, > making the cache-enabled buffer portals non-coherent. Not really, because the buffer portals are in TLB1, not TLB0, so this is effectively a no-op for existing code. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309522 - head/sys/powerpc/booke
Author: jhibbits Date: Sun Dec 4 02:15:46 2016 New Revision: 309522 URL: https://svnweb.freebsd.org/changeset/base/309522 Log: Fix a typo (move parenthesis to correct location in the line). Before this, it would cause the one consumer of this API in powerpc usage (dev/dpaa) to set the PTE WIMG flags to empty instead of --M-, making the cache-enabled buffer portals non-coherent. Modified: head/sys/powerpc/booke/pmap.c Modified: head/sys/powerpc/booke/pmap.c == --- head/sys/powerpc/booke/pmap.c Sun Dec 4 02:08:40 2016 (r309521) +++ head/sys/powerpc/booke/pmap.c Sun Dec 4 02:15:46 2016 (r309522) @@ -2967,7 +2967,7 @@ mmu_booke_change_attr(mmu_t mmu, vm_offs for (va = addr; va < addr + sz; va += PAGE_SIZE) { pte = pte_find(mmu, kernel_pmap, va); *pte &= ~(PTE_MAS2_MASK << PTE_MAS2_SHIFT); - *pte |= tlb_calc_wimg(PTE_PA(pte), mode << PTE_MAS2_SHIFT); + *pte |= tlb_calc_wimg(PTE_PA(pte), mode) << PTE_MAS2_SHIFT; tlb0_flush_entry(va); } tlb_miss_unlock(); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309521 - head/sys/modules/ioat
Author: ngie Date: Sun Dec 4 02:08:40 2016 New Revision: 309521 URL: https://svnweb.freebsd.org/changeset/base/309521 Log: Unbreak "make depend" with sys/modules/ioat by adding opt_ddb.h to SRCS MFC after: 2 weeks Modified: head/sys/modules/ioat/Makefile Modified: head/sys/modules/ioat/Makefile == --- head/sys/modules/ioat/Makefile Sun Dec 4 00:33:07 2016 (r309520) +++ head/sys/modules/ioat/Makefile Sun Dec 4 02:08:40 2016 (r309521) @@ -9,6 +9,7 @@ IOAT_SRC_PATH = ${.CURDIR}/../.. KMOD= ioat SRCS= ioat.c ioat_test.c SRCS+= device_if.h bus_if.h pci_if.h +SRCS+= opt_ddb.h CFLAGS+= -I${IOAT_SRC_PATH} ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309405 - head/contrib/libarchive/libarchive
Looks like older versions of "plexus-archiver" (plugin used by maven) create malformed tar archives with spaced uid/gid fields (PLXCOMP-233). I will fix that quickly or backout the header sanity check for now. On 03.12.2016 22:48, Antoine Brodin wrote: > On Fri, Dec 2, 2016 at 10:30 AM, Martin Matuskawrote: >> Author: mm >> Date: Fri Dec 2 09:30:13 2016 >> New Revision: 309405 >> URL: https://svnweb.freebsd.org/changeset/base/309405 >> >> Log: >> MFV r309403: >> >> Sync libarchive with vendor. >> >> Vendor bugfixes: >> Fix for heap-buffer-overflow in archive_le16dec() >> Fix for heap-buffer-overflow in uudecode_bidder_bid() >> Reworked fix for compatibility with archives created by Perl Archive::Tar >> >> MFC after:1 week > Hi, > > There are still ports failing to extract (logs are ipv6 only): > http://beefy11.nyi.freebsd.org/data/head-i386-default/p427588_s309451/logs/errors/jakarta-commons-logging-1.2.log > http://beefy11.nyi.freebsd.org/data/head-i386-default/p427588_s309451/logs/errors/activemq-5.14.1.log > http://beefy11.nyi.freebsd.org/data/head-i386-default/p427588_s309451/logs/errors/hadoop2-2.7.2_1.log > > Please request an exp-run before updating libarchive. > > Cheers, > > Antoine ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309405 - head/contrib/libarchive/libarchive
On Fri, Dec 2, 2016 at 10:30 AM, Martin Matuskawrote: > Author: mm > Date: Fri Dec 2 09:30:13 2016 > New Revision: 309405 > URL: https://svnweb.freebsd.org/changeset/base/309405 > > Log: > MFV r309403: > > Sync libarchive with vendor. > > Vendor bugfixes: > Fix for heap-buffer-overflow in archive_le16dec() > Fix for heap-buffer-overflow in uudecode_bidder_bid() > Reworked fix for compatibility with archives created by Perl Archive::Tar > > MFC after:1 week Hi, There are still ports failing to extract (logs are ipv6 only): http://beefy11.nyi.freebsd.org/data/head-i386-default/p427588_s309451/logs/errors/jakarta-commons-logging-1.2.log http://beefy11.nyi.freebsd.org/data/head-i386-default/p427588_s309451/logs/errors/activemq-5.14.1.log http://beefy11.nyi.freebsd.org/data/head-i386-default/p427588_s309451/logs/errors/hadoop2-2.7.2_1.log Please request an exp-run before updating libarchive. Cheers, Antoine ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309462 - head/tests/sys/kern
> On Dec 3, 2016, at 12:02, Conrad Meyerwrote: > >> On Fri, Dec 2, 2016 at 6:09 PM, Ngie Cooper wrote: >> Author: ngie >> Date: Sat Dec 3 02:09:23 2016 >> New Revision: 309462 >> URL: https://svnweb.freebsd.org/changeset/base/309462 >> >> Log: >> Fix test coredump_phnum_test:coredump_phnum require.config specification >> >> The requirement is set via `atf_set "require.config" >> "allow_sysctl_side_effects"', >> not `atf_set "require.config" "allow_sysctl_side_effects"' >> >> X-MFC with: r308177 >> Pointyhat to: cmeyer > > Ngie, > > This line was added verbatim at your request: > https://reviews.freebsd.org/D7264?id=18609#inline-43800 Ok, I'll take that part of the pointhat. -Ngie ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309462 - head/tests/sys/kern
On Fri, Dec 2, 2016 at 6:09 PM, Ngie Cooperwrote: > Author: ngie > Date: Sat Dec 3 02:09:23 2016 > New Revision: 309462 > URL: https://svnweb.freebsd.org/changeset/base/309462 > > Log: > Fix test coredump_phnum_test:coredump_phnum require.config specification > > The requirement is set via `atf_set "require.config" > "allow_sysctl_side_effects"', > not `atf_set "require.config" "allow_sysctl_side_effects"' > > X-MFC with: r308177 > Pointyhat to: cmeyer Ngie, This line was added verbatim at your request: https://reviews.freebsd.org/D7264?id=18609#inline-43800 Conrad ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309400 - head/sys/dev/acpica
On 12/3/16, Oliver Pinterwrote: > On Fri, Dec 2, 2016 at 9:21 AM, Hans Petter Selasky > wrote: >> Author: hselasky >> Date: Fri Dec 2 08:21:08 2016 >> New Revision: 309400 >> URL: https://svnweb.freebsd.org/changeset/base/309400 >> >> Log: >> Fix for endless recursion in the ACPI GPE handler during boot. >> >> When handling a GPE ACPI interrupt object the EcSpaceHandler() >> function can be called which checks the EC_EVENT_SCI bit and then >> recurse on the EcGpeQueryHandler() function. If there are multiple GPE >> events pending the EC_EVENT_SCI bit will be set at the next call to >> EcSpaceHandler() causing it to recurse again via the >> EcGpeQueryHandler() function. This leads to a slow never ending >> recursion during boot which prevents proper system startup, because >> the EC_EVENT_SCI bit never gets cleared in this scenario. >> >> The behaviour is reproducible with the ALASKA AMI in combination with >> a newer Skylake based mainboard in the following way: >> >> Enter BIOS and adjust the clock one hour forward. Save and exit the >> BIOS. System fails to boot due to the above mentioned bug in >> EcGpeQueryHandler() which was observed recursing multiple times. >> >> This patch adds a simple recursion guard to the EcGpeQueryHandler() >> function and also also adds logic to detect if new GPE events occurred >> during the execution of EcGpeQueryHandler() and then loop on this >> function instead of recursing. >> >> Reviewed by: jhb >> MFC after:2 weeks >> >> Modified: >> head/sys/dev/acpica/acpi_ec.c > > > I have similar error since the latest BIOS update on my gigabyte > H170N-Wifi board. The curiosity of the BIOS update was after upgrading > to this version, there are no possibility to rollback to older > version. > > The other weird thing, is that MFCing back this patch does not help. I > get stucked lock in acmtx mutex, as you > could see from the attached log. The other interesting is the ACPI > error at boot time: > > [1] ACPI Error: Mutex [0x0] is not acquired, cannot release > (20160527/utmutex-386) > [1] ACPI Error: Could not release AML Interpreter mutex > (20160527/exutils-147) > [1] ACPI Error: Mutex [0x0] is not acquired, cannot release > (20160527/utmutex-386) > [1] ACPI Error: Could not release AML Interpreter mutex > (20160527/exutils-147) > [1] cpu1: on acpi0 > [1] ACPI Error: Mutex [0x0] is not acquired, cannot release > (20160527/utmutex-386) > [1] ACPI Error: Could not release AML Interpreter mutex > (20160527/exutils-147) > [1] ACPI Error: Mutex [0x0] is not acquired, cannot release > (20160527/utmutex-386) > [1] ACPI Error: Could not release AML Interpreter mutex > (20160527/exutils-147) > > (This error is on 10-STABLE.) > After backported the last to ACPICA update to 10-STABLE with this patch, the issue reducated to this warning message: [1] acpi0: Power Button (fixed) [1] ACPI Error: Method parse/execution failed [\134_SB.PCI0.IOTR._CRS] (Node 0xf80006592f00), AE_AML_NO_RESOURCE_END_TAG (20161117/psparse-560) [1] ACPI Error: Method execution failed [\134_SB.PCI0.IOTR._CRS] (Node 0xf80006592f00), AE_AML_NO_RESOURCE_END_TAG (20161117/uteval-111) [1] can't fetch resources for \134_SB_.PCI0.IOTR - AE_AML_NO_RESOURCE_END_TAG but the lockup has gone. ;) [trim] ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309513 - head/sbin/camcontrol
Author: adrian Date: Sat Dec 3 20:35:39 2016 New Revision: 309513 URL: https://svnweb.freebsd.org/changeset/base/309513 Log: [camcontrol] init ts=0 to quieten gcc. It "looks" like ts is set to something on success, and not modified on error. Checked on IRC with: cem Modified: head/sbin/camcontrol/timestamp.c Modified: head/sbin/camcontrol/timestamp.c == --- head/sbin/camcontrol/timestamp.cSat Dec 3 20:30:25 2016 (r309512) +++ head/sbin/camcontrol/timestamp.cSat Dec 3 20:35:39 2016 (r309513) @@ -328,7 +328,7 @@ timestamp(struct cam_device *device, int int retry_count, int timeout, int verbosemode __unused) { int c; - uint64_t ts; + uint64_t ts = 0; char *format_string = NULL; char *timestamp_string = NULL; int action = -1; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309374 - in head: sbin/camcontrol sys/cam/scsi
On Fri, Dec 2, 2016 at 9:38 PM, Ravi Pokalawrote: > -Original Message- >> From: on behalf of Kyle Evans >> >> >> I understand that this is a bogus error because at this point it >> pretty much *has* to be set by the report_timestamp call just prior, >> but is there a clean way to trick GCC into agreeing, or is it just a >> matter of explicitly initializing it to 0 before the report_timestamp >> call? > > Actually, it's a valid warning. While all paths to that point in timestamp() > go through report_timestamp(), not all paths through report_timestamp() set > *ts. Specifically, if cam_getccb() or cam_send_ccb() fail, or the request was > not completed, report_timestamp() does 'goto bailout' without setting *ts. But in that case, report_timestamp() returns a non-zero error. And timestamp() will goto its own bailout, avoiding use of an unset value. > I'm disappointed that `clang' (on i386 and amd64) didn't notice this; I was > under the impression `clang' did more of that type of deep path analysis than > `gcc'. I think it's purely spurious, although understandably difficult for the compiler to notice. Adrian's proposed zero initialization seems like a fine fix. Best, Conrad ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r309400 - head/sys/dev/acpica
On Fri, Dec 2, 2016 at 9:21 AM, Hans Petter Selaskywrote: > Author: hselasky > Date: Fri Dec 2 08:21:08 2016 > New Revision: 309400 > URL: https://svnweb.freebsd.org/changeset/base/309400 > > Log: > Fix for endless recursion in the ACPI GPE handler during boot. > > When handling a GPE ACPI interrupt object the EcSpaceHandler() > function can be called which checks the EC_EVENT_SCI bit and then > recurse on the EcGpeQueryHandler() function. If there are multiple GPE > events pending the EC_EVENT_SCI bit will be set at the next call to > EcSpaceHandler() causing it to recurse again via the > EcGpeQueryHandler() function. This leads to a slow never ending > recursion during boot which prevents proper system startup, because > the EC_EVENT_SCI bit never gets cleared in this scenario. > > The behaviour is reproducible with the ALASKA AMI in combination with > a newer Skylake based mainboard in the following way: > > Enter BIOS and adjust the clock one hour forward. Save and exit the > BIOS. System fails to boot due to the above mentioned bug in > EcGpeQueryHandler() which was observed recursing multiple times. > > This patch adds a simple recursion guard to the EcGpeQueryHandler() > function and also also adds logic to detect if new GPE events occurred > during the execution of EcGpeQueryHandler() and then loop on this > function instead of recursing. > > Reviewed by: jhb > MFC after:2 weeks > > Modified: > head/sys/dev/acpica/acpi_ec.c I have similar error since the latest BIOS update on my gigabyte H170N-Wifi board. The curiosity of the BIOS update was after upgrading to this version, there are no possibility to rollback to older version. The other weird thing, is that MFCing back this patch does not help. I get stucked lock in acmtx mutex, as you could see from the attached log. The other interesting is the ACPI error at boot time: [1] ACPI Error: Mutex [0x0] is not acquired, cannot release (20160527/utmutex-386) [1] ACPI Error: Could not release AML Interpreter mutex (20160527/exutils-147) [1] ACPI Error: Mutex [0x0] is not acquired, cannot release (20160527/utmutex-386) [1] ACPI Error: Could not release AML Interpreter mutex (20160527/exutils-147) [1] cpu1: on acpi0 [1] ACPI Error: Mutex [0x0] is not acquired, cannot release (20160527/utmutex-386) [1] ACPI Error: Could not release AML Interpreter mutex (20160527/exutils-147) [1] ACPI Error: Mutex [0x0] is not acquired, cannot release (20160527/utmutex-386) [1] ACPI Error: Could not release AML Interpreter mutex (20160527/exutils-147) (This error is on 10-STABLE.) > > Modified: head/sys/dev/acpica/acpi_ec.c > == > --- head/sys/dev/acpica/acpi_ec.c Fri Dec 2 08:15:52 2016 > (r309399) > +++ head/sys/dev/acpica/acpi_ec.c Fri Dec 2 08:21:08 2016 > (r309400) > @@ -613,16 +613,14 @@ EcCheckStatus(struct acpi_ec_softc *sc, > } > > static void > -EcGpeQueryHandler(void *Context) > +EcGpeQueryHandlerSub(struct acpi_ec_softc *sc) > { > -struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context; > UINT8 Data; > ACPI_STATUSStatus; > intretry; > char qxx[5]; > > ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); > -KASSERT(Context != NULL, ("EcGpeQueryHandler called with NULL")); > > /* Serialize user access with EcSpaceHandler(). */ > Status = EcLock(sc); > @@ -647,7 +645,6 @@ EcGpeQueryHandler(void *Context) > EC_EVENT_INPUT_BUFFER_EMPTY))) > break; > } > -sc->ec_sci_pend = FALSE; > if (ACPI_FAILURE(Status)) { > EcUnlock(sc); > device_printf(sc->ec_dev, "GPE query failed: %s\n", > @@ -678,6 +675,29 @@ EcGpeQueryHandler(void *Context) > } > } > > +static void > +EcGpeQueryHandler(void *Context) > +{ > +struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context; > +int pending; > + > +KASSERT(Context != NULL, ("EcGpeQueryHandler called with NULL")); > + > +do { > + /* Read the current pending count */ > + pending = atomic_load_acq_int(>ec_sci_pend); > + > + /* Call GPE handler function */ > + EcGpeQueryHandlerSub(sc); > + > + /* > +* Try to reset the pending count to zero. If this fails we > +* know another GPE event has occurred while handling the > +* current GPE event and need to loop. > +*/ > +} while (!atomic_cmpset_int(>ec_sci_pend, pending, 0)); > +} > + > /* > * The GPE handler is called when IBE/OBF or SCI events occur. We are > * called from an unknown lock context. > @@ -706,13 +726,14 @@ EcGpeHandler(ACPI_HANDLE GpeDevice, UINT > * It will run the query and _Qxx method later, under the lock. > */ > EcStatus = EC_GET_CSR(sc); > -if ((EcStatus &
svn commit: r309491 - in head/sys/modules: . bios
Author: rpokala Date: Sat Dec 3 17:54:08 2016 New Revision: 309491 URL: https://svnweb.freebsd.org/changeset/base/309491 Log: Build smbios.ko as a module for amd64 and i386 For whatever reason, smapi, smbios, vpd are all under the "bios" directory. smapi is only for i386, so the entire "bios" directory is only built for i386. Break smapi out, and make only it i386-specific. Then, build the "bios" directory for both amd64 and i386. Reviewed by: imp MFC after:1 week Sponsored by: Panasas Differential Revision:https://reviews.freebsd.org/D8609 Modified: head/sys/modules/Makefile head/sys/modules/bios/Makefile Modified: head/sys/modules/Makefile == --- head/sys/modules/Makefile Sat Dec 3 17:44:43 2016(r309490) +++ head/sys/modules/Makefile Sat Dec 3 17:54:08 2016(r309491) @@ -550,6 +550,7 @@ _igb= igb _agp= agp _an= an _aout= aout +_bios= bios _bktr= bktr _bxe= bxe _cardbus= cardbus @@ -730,7 +731,6 @@ _svr4= svr4 .if ${MK_EISA} != "no" _ahb= ahb .endif -_bios= bios _cm= cm .if ${MK_SOURCELESS_UCODE} != "no" _ctau= ctau Modified: head/sys/modules/bios/Makefile == --- head/sys/modules/bios/Makefile Sat Dec 3 17:44:43 2016 (r309490) +++ head/sys/modules/bios/Makefile Sat Dec 3 17:54:08 2016 (r309491) @@ -1,6 +1,10 @@ # $FreeBSD$ # -SUBDIR=smapi smbios vpd +SUBDIR=smbios vpd + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= smapi +.endif .include ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309490 - head/cddl/contrib/opensolaris/tools/ctf/cvt
Author: pfg Date: Sat Dec 3 17:44:43 2016 New Revision: 309490 URL: https://svnweb.freebsd.org/changeset/base/309490 Log: Revert r253678, r253661: Fix a segfault in ctfmerge(1) due to a bug in GCC. The change was correct and the bug real, but upstream didn't adopt it and we want to remain in sync. When/if upstream does something about it we can bring their version. The bug in question was fixed in GCC 4.9 which is now the default in FreeBSD's ports. Our native gcc-4.2, which is still in use in some Tier-2 platforms also has a workaround so no end-user should be harmed by the revert. Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c head/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c == --- head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Sat Dec 3 17:40:58 2016(r309489) +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Sat Dec 3 17:44:43 2016(r309490) @@ -52,8 +52,6 @@ static char *curfile; #defineCTF_BUF_CHUNK_SIZE (64 * 1024) #defineRES_BUF_CHUNK_SIZE (64 * 1024) -static int ntypes = 0; /* The number of types. */ - struct ctf_buf { strtab_t ctb_strtab;/* string table */ caddr_t ctb_base; /* pointer to base of buffer */ @@ -1145,10 +1143,6 @@ resurrect_types(ctf_header_t *h, tdata_t (*mpp)->ml_type = tdarr[ctm->ctm_type]; (*mpp)->ml_offset = ctm->ctm_offset; (*mpp)->ml_size = 0; - if (ctm->ctm_type > ntypes) { - parseterminate("Invalid member type ctm_type=%d", - ctm->ctm_type); - } } } else { for (i = 0, mpp = >t_members; i < vlen; @@ -1165,10 +1159,6 @@ resurrect_types(ctf_header_t *h, tdata_t (*mpp)->ml_offset = (int)CTF_LMEM_OFFSET(ctlm); (*mpp)->ml_size = 0; - if (ctlm->ctlm_type > ntypes) { - parseterminate("Invalid lmember type ctlm_type=%d", - ctlm->ctlm_type); - } } } @@ -1282,10 +1272,9 @@ ctf_parse(ctf_header_t *h, caddr_t buf, { tdata_t *td = tdata_new(); tdesc_t **tdarr; + int ntypes = count_types(h, buf); int idx, i; - ntypes = count_types(h, buf); - /* shudder */ tdarr = xcalloc(sizeof (tdesc_t *) * (ntypes + 1)); tdarr[0] = NULL; Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h == --- head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h Sat Dec 3 17:40:58 2016(r309489) +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h Sat Dec 3 17:44:43 2016(r309490) @@ -159,7 +159,7 @@ typedef struct ardef { /* Auxiliary structure for structure/union tdesc_t */ typedef struct mlist { int ml_offset; /* Offset from start of structure (in bits) */ - uint_t ml_size;/* Member size (in bits) */ + int ml_size;/* Member size (in bits) */ char*ml_name; /* Member name */ struct tdesc *ml_type; /* Member type */ struct mlist *ml_next; /* Next member */ Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c == --- head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat Dec 3 17:40:58 2016(r309489) +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat Dec 3 17:44:43 2016(r309490) @@ -727,13 +727,6 @@ die_array_create(dwarf_t *dw, Dwarf_Die tdesc_t *dimtdp; int flags; - /* Check for bogus gcc DW_AT_byte_size attribute */ - if (uval == (unsigned)-1) { - printf("dwarf.c:%s() working around bogus -1 DW_AT_byte_size\n", - __func__); - uval = 0; - } - tdp->t_size = uval; /* @@ -826,12 +819,6 @@ die_enum_create(dwarf_t *dw, Dwarf_Die d tdp->t_type = ENUM; (void) die_unsigned(dw, die, DW_AT_byte_size, , DW_ATTR_REQ); -
svn commit: r309486 - head/sys/dev/rtwn
Author: avos Date: Sat Dec 3 17:27:10 2016 New Revision: 309486 URL: https://svnweb.freebsd.org/changeset/base/309486 Log: rtwn: fix bitmap size calculation. Tested with RTL8188CE, STA mode. Modified: head/sys/dev/rtwn/if_rtwnvar.h Modified: head/sys/dev/rtwn/if_rtwnvar.h == --- head/sys/dev/rtwn/if_rtwnvar.h Sat Dec 3 17:17:42 2016 (r309485) +++ head/sys/dev/rtwn/if_rtwnvar.h Sat Dec 3 17:27:10 2016 (r309486) @@ -207,8 +207,8 @@ struct rtwn_softc { int vaps_running; int monvaps_running; - uint16_tnext_rom_addr; - uint8_t keys_bmap[roundup2(RTWN_CAM_ENTRY_LIMIT, NBBY)]; + uint16_tnext_rom_addr; + uint8_t keys_bmap[howmany(RTWN_CAM_ENTRY_LIMIT, NBBY)]; struct rtwn_vap *vaps[RTWN_PORT_COUNT]; struct ieee80211_node *node_list[RTWN_MACID_LIMIT]; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309481 - head/sys/dev/usb/wlan
Author: avos Date: Sat Dec 3 16:02:53 2016 New Revision: 309481 URL: https://svnweb.freebsd.org/changeset/base/309481 Log: rsu: fix frame processing in the Rx path (similar to r292207). - Fill in Rx radiotap header correctly (for every packet in a chain; not once per chain). - Fix rate / flags fields in Rx radiotap. - Add debug messages for discarded frames. - Pass received control (< sizeof(struct ieee80211_frame)) frames to net80211 (if allowed by device filter; cannot happen yet). Tested with Asus USB-N10. Differential Revision:https://reviews.freebsd.org/D5723 Modified: head/sys/dev/usb/wlan/if_rsu.c Modified: head/sys/dev/usb/wlan/if_rsu.c == --- head/sys/dev/usb/wlan/if_rsu.c Sat Dec 3 14:41:53 2016 (r309480) +++ head/sys/dev/usb/wlan/if_rsu.c Sat Dec 3 16:02:53 2016 (r309481) @@ -219,7 +219,10 @@ static voidrsu_rx_multi_event(struct rs #if 0 static int8_t rsu_get_rssi(struct rsu_softc *, int, void *); #endif -static struct mbuf * rsu_rx_frame(struct rsu_softc *, uint8_t *, int); +static struct mbuf * rsu_rx_copy_to_mbuf(struct rsu_softc *, + struct r92s_rx_stat *, int); +static struct ieee80211_node * rsu_rx_frame(struct rsu_softc *, struct mbuf *, + int8_t *); static struct mbuf * rsu_rx_multi_frame(struct rsu_softc *, uint8_t *, int); static struct mbuf * rsu_rxeof(struct usb_xfer *, struct rsu_data *); @@ -1827,64 +1830,76 @@ rsu_get_rssi(struct rsu_softc *sc, int r #endif static struct mbuf * -rsu_rx_frame(struct rsu_softc *sc, uint8_t *buf, int pktlen) +rsu_rx_copy_to_mbuf(struct rsu_softc *sc, struct r92s_rx_stat *stat, +int totlen) { struct ieee80211com *ic = >sc_ic; - struct ieee80211_frame *wh; + struct mbuf *m; + uint32_t rxdw0; + int pktlen; + + rxdw0 = le32toh(stat->rxdw0); + if (__predict_false(rxdw0 & R92S_RXDW0_CRCERR)) { + RSU_DPRINTF(sc, RSU_DEBUG_RX, + "%s: RX flags error (CRC)\n", __func__); + goto fail; + } + + pktlen = MS(rxdw0, R92S_RXDW0_PKTLEN); + if (__predict_false(pktlen < sizeof (struct ieee80211_frame_ack))) { + RSU_DPRINTF(sc, RSU_DEBUG_RX, + "%s: frame is too short: %d\n", __func__, pktlen); + goto fail; + } + + m = m_get2(totlen, M_NOWAIT, MT_DATA, M_PKTHDR); + if (__predict_false(m == NULL)) { + device_printf(sc->sc_dev, "%s: could not allocate RX mbuf\n", + __func__); + goto fail; + } + + /* Finalize mbuf. */ + memcpy(mtod(m, uint8_t *), (uint8_t *)stat, totlen); + m->m_pkthdr.len = m->m_len = totlen; + + return (m); +fail: + counter_u64_add(ic->ic_ierrors, 1); + return (NULL); +} + +static struct ieee80211_node * +rsu_rx_frame(struct rsu_softc *sc, struct mbuf *m, int8_t *rssi_p) +{ + struct ieee80211com *ic = >sc_ic; + struct ieee80211_frame_min *wh; struct r92s_rx_stat *stat; uint32_t rxdw0, rxdw3; - struct mbuf *m; uint8_t rate; int infosz; - stat = (struct r92s_rx_stat *)buf; + stat = mtod(m, struct r92s_rx_stat *); rxdw0 = le32toh(stat->rxdw0); rxdw3 = le32toh(stat->rxdw3); - if (__predict_false(rxdw0 & R92S_RXDW0_CRCERR)) { - counter_u64_add(ic->ic_ierrors, 1); - return NULL; - } - if (__predict_false(pktlen < sizeof(*wh) || pktlen > MCLBYTES)) { - counter_u64_add(ic->ic_ierrors, 1); - return NULL; - } - rate = MS(rxdw3, R92S_RXDW3_RATE); infosz = MS(rxdw0, R92S_RXDW0_INFOSZ) * 8; #if 0 /* Get RSSI from PHY status descriptor if present. */ if (infosz != 0) - *rssi = rsu_get_rssi(sc, rate, [1]); + *rssi_p = rsu_get_rssi(sc, rate, [1]); else - *rssi = 0; #endif - - RSU_DPRINTF(sc, RSU_DEBUG_RX, - "%s: Rx frame len=%d rate=%d infosz=%d\n", - __func__, pktlen, rate, infosz); - - m = m_get2(pktlen, M_NOWAIT, MT_DATA, M_PKTHDR); - if (__predict_false(m == NULL)) { - counter_u64_add(ic->ic_ierrors, 1); - return NULL; - } - /* Hardware does Rx TCP checksum offload. */ - if (rxdw3 & R92S_RXDW3_TCPCHKVALID) { - if (__predict_true(rxdw3 & R92S_RXDW3_TCPCHKRPT)) - m->m_pkthdr.csum_flags |= CSUM_DATA_VALID; - } - wh = (struct ieee80211_frame *)((uint8_t *)[1] + infosz); - memcpy(mtod(m, uint8_t *), wh, pktlen); - m->m_pkthdr.len = m->m_len = pktlen; + *rssi_p = 0; if (ieee80211_radiotap_active(ic)) { struct rsu_rx_radiotap_header *tap = >sc_rxtap; /* Map HW
svn commit: r309480 - head/sys/dev/rtwn/rtl8192c/usb
Author: kevlo Date: Sat Dec 3 14:41:53 2016 New Revision: 309480 URL: https://svnweb.freebsd.org/changeset/base/309480 Log: Fix logic error so the R92C_TDECTRL register value is updated correctly. Reviewed by: avos Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c == --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c Sat Dec 3 14:26:58 2016 (r309479) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c Sat Dec 3 14:41:53 2016 (r309480) @@ -333,9 +333,11 @@ void r92cu_init_tx_agg(struct rtwn_softc *sc) { struct rtwn_usb_softc *uc = RTWN_USB_SOFTC(sc); + uint32_t reg; - rtwn_setbits_4(sc, R92C_TDECTRL, - R92C_TDECTRL_BLK_DESC_NUM_M, uc->tx_agg_desc_num); + reg = rtwn_read_4(sc, R92C_TDECTRL); + reg = RW(reg, R92C_TDECTRL_BLK_DESC_NUM, uc->tx_agg_desc_num); + rtwn_write_4(sc, R92C_TDECTRL, reg); } void ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r309479 - head/sys/dev/usb/wlan
Author: avos Date: Sat Dec 3 14:26:58 2016 New Revision: 309479 URL: https://svnweb.freebsd.org/changeset/base/309479 Log: rsu: remove unused structures / variables. Modified: head/sys/dev/usb/wlan/if_rsu.c head/sys/dev/usb/wlan/if_rsureg.h Modified: head/sys/dev/usb/wlan/if_rsu.c == --- head/sys/dev/usb/wlan/if_rsu.c Sat Dec 3 05:29:35 2016 (r309478) +++ head/sys/dev/usb/wlan/if_rsu.c Sat Dec 3 14:26:58 2016 (r309479) @@ -2937,9 +2937,6 @@ rsu_init(struct rsu_softc *sc) /* Ensure the mbuf queue is drained */ rsu_drain_mbufq(sc); - /* Init host async commands ring. */ - sc->cmdq.cur = sc->cmdq.next = sc->cmdq.queued = 0; - /* Reset power management state. */ rsu_write_1(sc, R92S_USB_HRPWM, 0); Modified: head/sys/dev/usb/wlan/if_rsureg.h == --- head/sys/dev/usb/wlan/if_rsureg.h Sat Dec 3 05:29:35 2016 (r309478) +++ head/sys/dev/usb/wlan/if_rsureg.h Sat Dec 3 14:26:58 2016 (r309479) @@ -625,8 +625,6 @@ struct r92s_add_ba_req { #define RSU_RX_LIST_COUNT 100 #define RSU_TX_LIST_COUNT 32 -#define RSU_HOST_CMD_RING_COUNT32 - #define RSU_RXBUFSZ(8 * 1024) #define RSU_TXBUFSZ\ ((sizeof(struct r92s_tx_desc) + IEEE80211_MAX_LEN + 3) & ~3) @@ -700,27 +698,6 @@ struct rsu_tx_radiotap_header { struct rsu_softc; -struct rsu_host_cmd { - void(*cb)(struct rsu_softc *, void *); - uint8_t data[256]; -}; - -struct rsu_cmd_newstate { - enum ieee80211_statestate; - int arg; -}; - -struct rsu_cmd_key { - struct ieee80211_keykey; -}; - -struct rsu_host_cmd_ring { - struct rsu_host_cmd cmd[RSU_HOST_CMD_RING_COUNT]; - int cur; - int next; - int queued; -}; - enum { RSU_BULK_RX, RSU_BULK_TX_BE_BK, /* = WME_AC_BE/BK */ @@ -755,12 +732,9 @@ struct rsu_softc { struct mbufqsc_snd; device_tsc_dev; struct usb_device *sc_udev; - int (*sc_newstate)(struct ieee80211com *, - enum ieee80211_state, int); - struct usbd_interface *sc_iface; + struct timeout_task calib_task; struct task tx_task; - const uint8_t *qid2idx; struct mtx sc_mtx; int sc_ht; int sc_nendpoints; @@ -775,10 +749,8 @@ struct rsu_softc { uint8_t sc_rftype; int8_t sc_nrxstream; int8_t sc_ntxstream; - struct rsu_host_cmd_ringcmdq; struct rsu_data sc_rx[RSU_RX_LIST_COUNT]; struct rsu_data sc_tx[RSU_TX_LIST_COUNT]; - struct rsu_data *fwcmd_data; uint8_t cmd_seq; uint8_t rom[128]; struct usb_xfer *sc_xfer[RSU_N_TRANSFER]; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"