piro77 / fbsdpt3 Goto Github PK

https://www.starlink.jp/pt3-freebsd-driver-pach/
にパッチあり。

from https://www.starlink.jp/pt3-freebsd-driver-pach/

Sleeping thread (tid 100124, pid 86675) owns a non-sleepable lock
KDB: stack backtrace of thread 100124:
#0 0xffffffff805cab32 at mi_switch+0xd2
#1 0xffffffff8061807a at sleepq_timedwait+0x3a
#2 0xffffffff805ca4e1 at _sleep+0x281
#3 0xffffffff805ca94e at pause_sbt+0x6e
#4 0xffffffff8171ae7c at pt3_dma_set_enabled+0x1dc
#5 0xffffffff8171d6c7 at pt3close+0x47
#6 0xffffffff804729d5 at devfs_close+0x5e5
#7 0xffffffff8098a5d9 at VOP_CLOSE_APV+0x89
#8 0xffffffff806a08ae at vn_close+0x13e
#9 0xffffffff8069f35a at vn_closefile+0x4a
#10 0xffffffff804735fc at devfs_close_f+0x2c
#11 0xffffffff8055be3a at _fdrop+0x1a
#12 0xffffffff8055f914 at closef+0x2d4
#13 0xffffffff8055c336 at closefp+0xb6
#14 0xffffffff8091e0fe at amd64_syscall+0x4ce
#15 0xffffffff8090220b at Xfast_syscall+0xfb
panic: sleeping thread
cpuid = 1
KDB: stack backtrace:
#0 0xffffffff80609957 at kdb_backtrace+0x67
#1 0xffffffff805bf902 at vpanic+0x182
#2 0xffffffff805bf773 at panic+0x43
#3 0xffffffff8061f379 at propagate_priority+0x299
#4 0xffffffff8061fe7f at turnstile_wait+0x3ef
#5 0xffffffff8059c1fd at __mtx_lock_sleep+0x13d
#6 0xffffffff8171d6af at pt3close+0x2f
#7 0xffffffff804729d5 at devfs_close+0x5e5
#8 0xffffffff8098a5d9 at VOP_CLOSE_APV+0x89
#9 0xffffffff806a08ae at vn_close+0x13e
#10 0xffffffff8069f35a at vn_closefile+0x4a
#11 0xffffffff804735fc at devfs_close_f+0x2c
#12 0xffffffff8055be3a at _fdrop+0x1a
#13 0xffffffff8055f914 at closef+0x2d4
#14 0xffffffff8055c336 at closefp+0xb6
#15 0xffffffff8091e0fe at amd64_syscall+0x4ce
#16 0xffffffff8090220b at Xfast_syscall+0xfb
Uptime: 35d7h25m53s

make
machine -> /usr/src/sys/amd64/include
x86 -> /usr/src/sys/x86/include
awk -f /usr/src/sys/tools/makeobjops.awk /usr/src/sys/kern/bus_if.m -h
awk -f /usr/src/sys/tools/makeobjops.awk /usr/src/sys/kern/device_if.m -h
awk -f /usr/src/sys/tools/makeobjops.awk /usr/src/sys/dev/pci/pci_if.m -h
touch opt_global.h
Warning: Object directory not changed from original /usr/home/takemon/tmp/fbsdpt3
cc -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -include /usr/home/takemon/tmp/fbsdpt3/opt_global.h -I. -I/usr/src/sys -I/usr/src/sys/contrib/ck/include -fno-common -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fdebug-prefix-map=./machine=/usr/src/sys/amd64/include -fdebug-prefix-map=./x86=/usr/src/sys/x86/include -MD -MF.depend.ptx.o -MTptx.o -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=freebsd_kprintf -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error=tautological-compare -Wno-error=empty-body -Wno-error=parentheses-equality -Wno-error=unused-function -Wno-error=pointer-sign -Wno-error=shift-negative-value -Wno-address-of-packed-member -Wno-error=unused-but-set-variable -Wno-format-zero-length -mno-aes -mno-avx -std=iso9899:1999 -c ptx.c -o ptx.o
ptx.c:304:7: error: implicit declaration of function 'lock_initialized' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (mtx_initialized(&s->lock)) {
^
/usr/src/sys/sys/mutex.h:469:28: note: expanded from macro 'mtx_initialized'
#define mtx_initialized(m) lock_initialized(&(m)->lock_object)
^
ptx.c:329:6: error: implicit declaration of function 'lock_initialized' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (mtx_initialized(&scp->lock)) {
^
/usr/src/sys/sys/mutex.h:469:28: note: expanded from macro 'mtx_initialized'
#define mtx_initialized(m) lock_initialized(&(m)->lock_object)
^
2 errors generated.
*** Error code 1

Stop.
make: stopped in /usr/home/takemon/tmp/fbsdpt3

すくなくとも 12.3 RELEASE までは問題なく make できましたが、13.1 に上げたら上記のような
エラーがでます。
この修正で大丈夫なのかはわかりませんが、ひとまず、ptx.h に
#include <sys/lock.h>
を追加したら動くようになりました。