Attachment 309397 Details for Bug 435550 – logging + allocation test

[patch] logging + allocation test

xxx (text/plain), 2.03 KB, created by Stefan Richter on 2008-06-15 13:32:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Richter

Created: 2008-06-15 13:32:44 UTC

Size: 2.03 KB

patch

obsolete

>---
> drivers/firewire/fw-iso.c  |    4 ++--
> drivers/firewire/fw-ohci.c |   13 ++++++++++++-
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
>Index: linux/drivers/firewire/fw-ohci.c
>===================================================================
>--- linux.orig/drivers/firewire/fw-ohci.c
>+++ linux/drivers/firewire/fw-ohci.c
>@@ -749,7 +749,7 @@ context_add_buffer(struct context *ctx)
> 		return -ENOMEM;
> 
> 	desc = dma_alloc_coherent(ctx->ohci->card.device, PAGE_SIZE,
>-			&bus_addr, GFP_ATOMIC);
>+			&bus_addr, GFP_ATOMIC | __GFP_HIGHMEM);
> 	if (!desc)
> 		return -ENOMEM;
> 
>@@ -2121,6 +2121,7 @@ ohci_queue_iso_receive_dualbuffer(struct
> 	dma_addr_t d_bus, page_bus;
> 	u32 z, header_z, length, rest;
> 	int page, offset, packet_count, header_size;
>+	static int logged_d, logged_b;
> 
> 	/*
> 	 * FIXME: Cycle lost behavior should be configurable: lose
>@@ -2175,6 +2176,16 @@ ohci_queue_iso_receive_dualbuffer(struct
> 		page_bus = page_private(buffer->pages[page]);
> 		db->second_buffer = cpu_to_le32(page_bus + offset);
> 
>+		if (!logged_d && d_bus & 1 << 31) {
>+			fw_notify("##### d_bus %x (page_bus %x)\n", d_bus, page_bus);
>+			logged_d++;
>+		}
>+
>+		if (!logged_b && page_bus & 1 << 31) {
>+			fw_notify("##### page_bus %x (d_bus %x)\n", page_bus, d_bus);
>+			logged_b++;
>+		}
>+
> 		if (p->interrupt && length == rest)
> 			db->control |= cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS);
> 
>Index: linux/drivers/firewire/fw-iso.c
>===================================================================
>--- linux.orig/drivers/firewire/fw-iso.c
>+++ linux/drivers/firewire/fw-iso.c
>@@ -39,12 +39,12 @@ fw_iso_buffer_init(struct fw_iso_buffer 
> 	buffer->direction = direction;
> 
> 	buffer->pages = kmalloc(page_count * sizeof(buffer->pages[0]),
>-				GFP_KERNEL);
>+				GFP_KERNEL | __GFP_HIGHMEM);
> 	if (buffer->pages == NULL)
> 		goto out;
> 
> 	for (i = 0; i < buffer->page_count; i++) {
>-		buffer->pages[i] = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
>+		buffer->pages[i] = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO | __GFP_HIGHMEM);
> 		if (buffer->pages[i] == NULL)
> 			goto out_pages;
>

Actions: View | Diff

Attachments on bug 435550: 296782 | 304485 | 304486 | 304488 | 304489 | 305409 | 307293 | 309397 | 309398 | 312363