Attachment 77306 Details for Bug 116655

[patch] A revised patch fixing one more problem in the same code

acpipnp-dma-resource-setup-fix.patch (text/plain), 3.33 KB, created by Vojtech Pavlik on 2006-04-07 19:02:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vojtech Pavlik

Created: 2006-04-07 19:02:04 UTC

Size: 3.33 KB

patch

obsolete

>From: Vojtech Pavlik <vojtech@suse.cz>
>Date: Fri Apr  7 20:00:27 CEST 2006
>Subject: Fix DMA resource allocation in ACPIPnP
>Patch-mainline: Not yet
>References: 116655
>
>===================================================================
>
>The ACPIPnP implementation had the understanding of Linux resource flags very
>wrong, resulting in a nonfunctional implementation of DMA resource
>allocation. 
>
>This was usually not a problem, since almost no on-board PnP devices use ISA
>DMA, with the exception of ECP parallel ports. Even with that, parallel port
>DMA is preconfigured by the BIOS, so this routine isn't normally called.
>
>Except in the case where somebody does 'rmmod parport_pc; modprobe
>parport_pc', where the rmmod case disables the ECP parallel port resources,
>and they need to be enabled again to initialize the module. This didn't
>work, resulting in a non-printing printer.
>
>The application doing exactly the above to force reprobing of printers is
>the YaST printer module. Thus without this fix YaST wedged the printer when
>configuring it, and was not able to print a test page.
>
>Reported-by: Ralf Flaxa <rf@suse.de>
>Reproduced-by: Jiri Dluhos <jdluhos@suse.cz>
>Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
>
>===================================================================
>
> rsparser.c |   43 ++++++++++++++++++++++++++++---------------
> 1 files changed, 28 insertions(+), 15 deletions(-)
>
>Index: linux/drivers/pnp/pnpacpi/rsparser.c
>===================================================================
>--- linux.orig/drivers/pnp/pnpacpi/rsparser.c	2006-04-07 20:40:10.000000000 +0200
>+++ linux/drivers/pnp/pnpacpi/rsparser.c	2006-04-07 20:40:14.000000000 +0200
>@@ -775,22 +775,35 @@
> {
> 	resource->type = ACPI_RESOURCE_TYPE_DMA;
> 	resource->length = sizeof(struct acpi_resource);
>+
> 	/* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
>-	if (p->flags & IORESOURCE_DMA_COMPATIBLE)
>-		resource->data.dma.type = ACPI_COMPATIBILITY;
>-	else if (p->flags & IORESOURCE_DMA_TYPEA)
>-		resource->data.dma.type = ACPI_TYPE_A;
>-	else if (p->flags & IORESOURCE_DMA_TYPEB)
>-		resource->data.dma.type = ACPI_TYPE_B;
>-	else if (p->flags & IORESOURCE_DMA_TYPEF)
>-		resource->data.dma.type = ACPI_TYPE_F;
>-	if (p->flags & IORESOURCE_DMA_8BIT)
>-		resource->data.dma.transfer = ACPI_TRANSFER_8;
>-	else if (p->flags & IORESOURCE_DMA_8AND16BIT)
>-		resource->data.dma.transfer = ACPI_TRANSFER_8_16;
>-	else if (p->flags & IORESOURCE_DMA_16BIT)
>-		resource->data.dma.transfer = ACPI_TRANSFER_16;
>-	resource->data.dma.bus_master = p->flags & IORESOURCE_DMA_MASTER;
>+
>+	switch (p->flags & IORESOURCE_DMA_SPEED_MASK) {
>+		case IORESOURCE_DMA_TYPEA:
>+			resource->data.dma.type = ACPI_TYPE_A;
>+			break;
>+		case IORESOURCE_DMA_TYPEB:
>+			resource->data.dma.type = ACPI_TYPE_B;
>+			break;
>+		case IORESOURCE_DMA_TYPEF:
>+			resource->data.dma.type = ACPI_TYPE_F;
>+			break;
>+		default:
>+			resource->data.dma.type = ACPI_COMPATIBILITY;
>+	}
>+
>+	switch (p->flags & IORESOURCE_DMA_TYPE_MASK) {
>+		case IORESOURCE_DMA_8BIT:
>+			resource->data.dma.transfer = ACPI_TRANSFER_8;
>+			break;
>+		case IORESOURCE_DMA_8AND16BIT:
>+			resource->data.dma.transfer = ACPI_TRANSFER_8_16;
>+			break;
>+		default:
>+			resource->data.dma.transfer = ACPI_TRANSFER_16;
>+	}
>+
>+	resource->data.dma.bus_master = !!(p->flags & IORESOURCE_DMA_MASTER);
> 	resource->data.dma.channel_count = 1;
> 	resource->data.dma.channels[0] = p->start;
> }

Actions: View | Diff

Attachments on bug 116655: 49696 | 49697 | 49727 | 49728 | 49729 | 49730 | 49731 | 49739 | 49740 | 49741 | 49775 | 49776 | 49777 | 49779 | 49781 | 49782 | 77247 | 77248 | 77270 | 77297 | 77306