Skip to content

Commit 406fb9e

Browse files
committed
Merge tag 'firewire-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire updates from Takashi Sakamoto: "This consist of three parts; UAPI update, OHCI driver update, and several bug fixes. Firstly, the 1394 OHCI specification defines method to retrieve hardware time stamps for asynchronous communication, which was previously unavailable in user space. This adds new events to the UAPI, allowing applications to retrieve the time when asynchronous packet are received and sent. The new events are tested in the bleeding edge of libhinawa and look to work well. The new version of libhinawa will be released after current merge window is closed: https://git.kernel.org/pub/scm/libs/ieee1394/libhinawa.git/ Secondly, the FireWire stack includes a PCM device driver for 1394 OHCI hardware, This change modernizes the driver by managed resource (devres) framework. Lastly, bug fixes for firewire-net and firewire-core" * tag 'firewire-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: (25 commits) firewire: net: fix use after free in fwnet_finish_incoming_packet() firewire: core: obsolete usage of GFP_ATOMIC at building node tree firewire: ohci: release buffer for AR req/resp contexts when managed resource is released firewire: ohci: use devres for content of configuration ROM firewire: ohci: use devres for IT, IR, AT/receive, and AT/request contexts firewire: ohci: use devres for list of isochronous contexts firewire: ohci: use devres for requested IRQ firewire: ohci: use devres for misc DMA buffer firewire: ohci: use devres for MMIO region mapping firewire: ohci: use devres for PCI-related resources firewire: ohci: use devres for memory object of ohci structure firewire: fix warnings to generate UAPI documentation firewire: fix build failure due to missing module license firewire: cdev: implement new event relevant to phy packet with time stamp firewire: cdev: add new event to notify phy packet with time stamp firewire: cdev: code refactoring to dispatch event for phy packet firewire: cdev: implement new event to notify response subaction with time stamp firewire: cdev: add new event to notify response subaction with time stamp firewire: cdev: code refactoring to operate event of response firewire: core: implement variations to send request and wait for response with time stamp ...
2 parents f196220 + 3ff2567 commit 406fb9e

13 files changed

Lines changed: 694 additions & 231 deletions

File tree

drivers/firewire/.kunitconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CONFIG_KUNIT=y
2+
CONFIG_PCI=y
3+
CONFIG_FIREWIRE=y
4+
CONFIG_FIREWIRE_KUNIT_UAPI_TEST=y

drivers/firewire/Kconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ config FIREWIRE
1818
To compile this driver as a module, say M here: the module will be
1919
called firewire-core.
2020

21+
config FIREWIRE_KUNIT_UAPI_TEST
22+
tristate "KUnit tests for layout of structure in UAPI" if !KUNIT_ALL_TESTS
23+
depends on FIREWIRE && KUNIT
24+
default KUNIT_ALL_TESTS
25+
help
26+
This builds the KUnit tests whether structures exposed to user
27+
space have expected layout.
28+
29+
KUnit tests run during boot and output the results to the debug
30+
log in TAP format (https://testanything.org/). Only useful for
31+
kernel devs running KUnit test harness and are not for inclusion
32+
into a production build.
33+
34+
For more information on KUnit and unit tests in general, refer
35+
to the KUnit documentation in Documentation/dev-tools/kunit/.
36+
2137
config FIREWIRE_OHCI
2238
tristate "OHCI-1394 controllers"
2339
depends on PCI && FIREWIRE && MMU

drivers/firewire/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o
1515
obj-$(CONFIG_FIREWIRE_NET) += firewire-net.o
1616
obj-$(CONFIG_FIREWIRE_NOSY) += nosy.o
1717
obj-$(CONFIG_PROVIDE_OHCI1394_DMA_INIT) += init_ohci1394_dma.o
18+
19+
firewire-uapi-test-objs += uapi-test.o
20+
obj-$(CONFIG_FIREWIRE_KUNIT_UAPI_TEST) += firewire-uapi-test.o

0 commit comments

Comments
 (0)