Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel… · fabgithub/linux@36f571e · GitHub

1. fabgithub
2. linux

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 36f571e

Browse filesBrowse the repository at this point in the historyBrowse files

torvalds

committed

Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire regression fix from Stefan Richter: "This fixes corrupted video capture, seen with IIDC/DCAM video and certain buffer settings. (Regression since v3.4 inclusive.)" * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: fix libdc1394/FlyCap2 iso event regression

2 parents 8027678 + 0699a73 commit 36f571e
Copy full SHA for 36f571e

4 files changed

+14-4Lines changed: 14 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• drivers/firewire
  • core-cdev.c
  • ohci.c
• include
  • linux
    • firewire.h
  • uapi/linux
    • firewire-cdev.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎drivers/firewire/core-cdev.c‎

Copy file name to clipboardExpand all lines: drivers/firewire/core-cdev.c

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -54,6 +54,7 @@
54	54	#define FW_CDEV_KERNEL_VERSION 5
55	55	#define FW_CDEV_VERSION_EVENT_REQUEST2 4
56	56	#define FW_CDEV_VERSION_ALLOCATE_REGION_END 4
	57	+ #define FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW 5
57	58
58	59	struct client {
59	60	u32 version;
@@ -1005,6 +1006,8 @@ static int ioctl_create_iso_context(struct client *client, union ioctl_arg *arg)
1005	1006	a->channel, a->speed, a->header_size, cb, client);
1006	1007	if (IS_ERR(context))
1007	1008	return PTR_ERR(context);
	1009	+ if (client->version < FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW)
	1010	+ context->drop_overflow_headers = true;
1008	1011
1009	1012	/* We only support one context at this time. */
1010	1013	spin_lock_irq(&client->lock);

Collapse file

‎drivers/firewire/ohci.c‎

Copy file name to clipboardExpand all lines: drivers/firewire/ohci.c

+8-2Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -2749,8 +2749,11 @@ static void copy_iso_headers(struct iso_context *ctx, const u32 *dma_hdr)
2749	2749	{
2750	2750	u32 *ctx_hdr;
2751	2751
2752		- if (ctx->header_length + ctx->base.header_size > PAGE_SIZE)
	2752	+ if (ctx->header_length + ctx->base.header_size > PAGE_SIZE) {
	2753	+ if (ctx->base.drop_overflow_headers)
	2754	+ return;
2753	2755	flush_iso_completions(ctx);
	2756	+ }
2754	2757
2755	2758	ctx_hdr = ctx->header + ctx->header_length;
2756	2759	ctx->last_timestamp = (u16)le32_to_cpu((__force __le32)dma_hdr[0]);
@@ -2910,8 +2913,11 @@ static int handle_it_packet(struct context *context,
2910	2913
2911	2914	sync_it_packet_for_cpu(context, d);
2912	2915
2913		- if (ctx->header_length + 4 > PAGE_SIZE)
	2916	+ if (ctx->header_length + 4 > PAGE_SIZE) {
	2917	+ if (ctx->base.drop_overflow_headers)
	2918	+ return 1;
2914	2919	flush_iso_completions(ctx);
	2920	+ }
2915	2921
2916	2922	ctx_hdr = ctx->header + ctx->header_length;
2917	2923	ctx->last_timestamp = le16_to_cpu(last->res_count);

Collapse file

‎include/linux/firewire.h‎

Copy file name to clipboardExpand all lines: include/linux/firewire.h

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -436,6 +436,7 @@ struct fw_iso_context {
436	436	int type;
437	437	int channel;
438	438	int speed;
	439	+ bool drop_overflow_headers;
439	440	size_t header_size;
440	441	union {
441	442	fw_iso_callback_t sc;

Collapse file

‎include/uapi/linux/firewire-cdev.h‎

Copy file name to clipboardExpand all lines: include/uapi/linux/firewire-cdev.h

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -215,8 +215,8 @@ struct fw_cdev_event_request2 {
215	215	* with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with
216	216	* %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets
217	217	* without the interrupt bit set that the kernel's internal buffer for @header
218		- * is about to overflow. (In the last case, kernels with ABI version < 5 drop
219		- * header data up to the next interrupt packet.)
	218	+ * is about to overflow. (In the last case, ABI versions < 5 drop header data
	219	+ * up to the next interrupt packet.)
220	220	*
221	221	* Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT):
222	222	*

0 commit comments

Comments

0 (0)