Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc16f5f2 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

PNP: make generic pnp_add_dma_resource() 



Add a pnp_add_dma_resource() that can be used by all the PNP
backends.  This consolidates a little more pnp_resource_table
knowledge into one place.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent dbddd038

drivers/pnp/base.h

+2 −0
Original line number Diff line number Diff line
@@ -43,3 +43,5 @@ struct pnp_resource_table { 


struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,

					  int flags);

struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,

					  int flags);

drivers/pnp/interface.c

+4 −10
Original line number Diff line number Diff line
@@ -440,16 +440,10 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, 
				buf += 3;

				while (isspace(*buf))

					++buf;

				pnp_res = pnp_get_pnp_resource(dev,

						IORESOURCE_DMA, ndma);

				if (!pnp_res)

					break;

				pnp_res->index = ndma;

				res = &pnp_res->res;

				res->start = res->end =

				    simple_strtoul(buf, &buf, 0);

				res->flags = IORESOURCE_DMA;

				ndma++;

				start = simple_strtoul(buf, &buf, 0);

				pnp_res = pnp_add_dma_resource(dev, start, 0);

				if (pnp_res)

					pnp_res->index = ndma++;

				continue;

			}

			break;

drivers/pnp/isapnp/core.c

+3 −6
Original line number Diff line number Diff line
@@ -973,12 +973,9 @@ static int isapnp_read_resources(struct pnp_dev *dev) 
			ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);

			if (ret == 4)

				continue;

			pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA,

						       tmp);

			pnp_res = pnp_add_dma_resource(dev, ret, 0);

			if  (pnp_res)

				pnp_res->index = tmp;

			res = &pnp_res->res;

			res->start = res->end = ret;

			res->flags = IORESOURCE_DMA;

		}

	}

	return 0;

drivers/pnp/pnpacpi/rsparser.c

+8 −34
Original line number Diff line number Diff line
@@ -158,34 +158,6 @@ static int dma_flags(int type, int bus_master, int transfer) 
	return flags;

}



static void pnpacpi_parse_allocated_dmaresource(struct pnp_dev *dev,

						u32 dma, int flags)

{

	struct resource *res;

	int i;

	static unsigned char warned;



	for (i = 0; i < PNP_MAX_DMA; i++) {

		res = pnp_get_resource(dev, IORESOURCE_DMA, i);

		if (!pnp_resource_valid(res))

			break;

	}

	if (i < PNP_MAX_DMA) {

		res->flags = IORESOURCE_DMA;	// Also clears _UNSET flag

		res->flags |= flags;

		if (dma == -1) {

			res->flags |= IORESOURCE_DISABLED;

			return;

		}

		res->start = dma;

		res->end = dma;

	} else if (!warned) {

		printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA "

				"resources: %d \n", PNP_MAX_DMA);

		warned = 1;

	}

}



static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev,

					       u64 io, u64 len, int io_decode)

{
@@ -285,7 +257,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 
	struct acpi_resource_memory32 *memory32;

	struct acpi_resource_fixed_memory32 *fixed_memory32;

	struct acpi_resource_extended_irq *extended_irq;

	int i;

	int i, flags;



	switch (res->type) {

	case ACPI_RESOURCE_TYPE_IRQ:
@@ -305,11 +277,13 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 


	case ACPI_RESOURCE_TYPE_DMA:

		dma = &res->data.dma;

		if (dma->channel_count > 0)

			pnpacpi_parse_allocated_dmaresource(dev,

				dma->channels[0],

				dma_flags(dma->type, dma->bus_master,

					  dma->transfer));

		if (dma->channel_count > 0) {

			flags = dma_flags(dma->type, dma->bus_master,

					  dma->transfer);

			if (dma->channels[0] == (u8) -1)

				flags |= IORESOURCE_DISABLED;

			pnp_add_dma_resource(dev, dma->channels[0], flags);

		}

		break;



	case ACPI_RESOURCE_TYPE_IO:

drivers/pnp/pnpbios/rsparser.c

+4 −22
Original line number Diff line number Diff line
@@ -54,27 +54,6 @@ inline void pcibios_penalize_isa_irq(int irq, int active) 
 * Allocated Resources

 */



static void pnpbios_parse_allocated_dmaresource(struct pnp_dev *dev, int dma)

{

	struct resource *res;

	int i;



	for (i = 0; i < PNP_MAX_DMA; i++) {

		res = pnp_get_resource(dev, IORESOURCE_DMA, i);

		if (!pnp_resource_valid(res))

			break;

	}



	if (i < PNP_MAX_DMA) {

		res->flags = IORESOURCE_DMA;	// Also clears _UNSET flag

		if (dma == -1) {

			res->flags |= IORESOURCE_DISABLED;

			return;

		}

		res->start = res->end = (unsigned long)dma;

	}

}



static void pnpbios_parse_allocated_ioresource(struct pnp_dev *dev,

					       int io, int len)

{
@@ -199,12 +178,15 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev, 
		case SMALL_TAG_DMA:

			if (len != 2)

				goto len_err;

			flags = 0;

			io = -1;

			mask = p[1];

			for (i = 0; i < 8; i++, mask = mask >> 1)

				if (mask & 0x01)

					io = i;

			pnpbios_parse_allocated_dmaresource(dev, io);

			if (io == -1)

				flags = IORESOURCE_DISABLED;

			pnp_add_dma_resource(dev, io, flags);

			break;



		case SMALL_TAG_PORT: