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

Commit 22916638 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

[PATCH] pcmcia: update resource database adjust routines to use unsigned long values 



Make adjust_io and adjust_memory independent of adjust_t to allow for IO
resources > x86's IO_SPACE_LIMIT.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5085cb26

drivers/pcmcia/rsrc_nonstatic.c

+38 −51
Original line number Original line Diff line number Diff line
@@ -683,27 +683,23 @@ static struct resource * nonstatic_find_mem_region(u_long base, u_long num, 
}

}









static int adjust_memory(struct pcmcia_socket *s, adjust_t *adj)

static int adjust_memory(struct pcmcia_socket *s, unsigned int action, unsigned long start, unsigned long end)

{

{

	u_long base, num;

	struct socket_data *data = s->resource_data;

	struct socket_data *data = s->resource_data;

	int ret;

	unsigned long size = end - start + 1;



	int ret = 0;

	base = adj->resource.memory.Base;

	num = adj->resource.memory.Size;

	if ((num == 0) || (base+num-1 < base))

		return CS_BAD_SIZE;





	ret = CS_SUCCESS;

	if (end <= start)

		return -EINVAL;





	down(&rsrc_sem);

	down(&rsrc_sem);

	switch (adj->Action) {

	switch (action) {

	case ADD_MANAGED_RESOURCE:

	case ADD_MANAGED_RESOURCE:

		ret = add_interval(&data->mem_db, base, num);

		ret = add_interval(&data->mem_db, start, size);

		break;

		break;

	case REMOVE_MANAGED_RESOURCE:

	case REMOVE_MANAGED_RESOURCE:

		ret = sub_interval(&data->mem_db, base, num);

		ret = sub_interval(&data->mem_db, start, size);

		if (ret == CS_SUCCESS) {

		if (!ret) {

			struct pcmcia_socket *socket;

			struct pcmcia_socket *socket;

			down_read(&pcmcia_socket_list_rwsem);

			down_read(&pcmcia_socket_list_rwsem);

			list_for_each_entry(socket, &pcmcia_socket_list, socket_list)

			list_for_each_entry(socket, &pcmcia_socket_list, socket_list)
@@ -712,7 +708,7 @@ static int adjust_memory(struct pcmcia_socket *s, adjust_t *adj) 
		}

		}

		break;

		break;

	default:

	default:

		ret = CS_UNSUPPORTED_FUNCTION;

		ret = -EINVAL;

	}

	}

	up(&rsrc_sem);

	up(&rsrc_sem);
@@ -720,36 +716,35 @@ static int adjust_memory(struct pcmcia_socket *s, adjust_t *adj) 
}

}









static int adjust_io(struct pcmcia_socket *s, adjust_t *adj)

static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long start, unsigned long end)

{

{

	struct socket_data *data = s->resource_data;

	struct socket_data *data = s->resource_data;

	kio_addr_t base, num;

	unsigned long size = end - start + 1;

	int ret = CS_SUCCESS;

	int ret = 0;





	base = adj->resource.io.BasePort;

	if (end <= start)

	num = adj->resource.io.NumPorts;

		return -EINVAL;

	if ((base < 0) || (base > 0xffff))



		return CS_BAD_BASE;

	if (end > IO_SPACE_LIMIT)

	if ((num <= 0) || (base+num > 0x10000) || (base+num <= base))

		return -EINVAL;

		return CS_BAD_SIZE;





	down(&rsrc_sem);

	down(&rsrc_sem);

	switch (adj->Action) {

	switch (action) {

	case ADD_MANAGED_RESOURCE:

	case ADD_MANAGED_RESOURCE:

		if (add_interval(&data->io_db, base, num) != 0) {

		if (add_interval(&data->io_db, start, size) != 0) {

			ret = CS_IN_USE;

			ret = -EBUSY;

			break;

			break;

		}

		}

#ifdef CONFIG_PCMCIA_PROBE

#ifdef CONFIG_PCMCIA_PROBE

		if (probe_io)

		if (probe_io)

			do_io_probe(s, base, num);

			do_io_probe(s, start, size);

#endif

#endif

		break;

		break;

	case REMOVE_MANAGED_RESOURCE:

	case REMOVE_MANAGED_RESOURCE:

		sub_interval(&data->io_db, base, num);

		sub_interval(&data->io_db, start, size);

		break;

		break;

	default:

	default:

		ret = CS_UNSUPPORTED_FUNCTION;

		ret = -EINVAL;

		break;

		break;

	}

	}

	up(&rsrc_sem);

	up(&rsrc_sem);
@@ -760,11 +755,15 @@ static int adjust_io(struct pcmcia_socket *s, adjust_t *adj) 




static int nonstatic_adjust_resource_info(struct pcmcia_socket *s, adjust_t *adj)

static int nonstatic_adjust_resource_info(struct pcmcia_socket *s, adjust_t *adj)

{

{

	unsigned long end;



	switch (adj->Resource) {

	switch (adj->Resource) {

	case RES_MEMORY_RANGE:

	case RES_MEMORY_RANGE:

		return adjust_memory(s, adj);

		end = adj->resource.memory.Base + adj->resource.memory.Size - 1;

		return adjust_memory(s, adj->Action, adj->resource.memory.Base, end);

	case RES_IO_RANGE:

	case RES_IO_RANGE:

		return adjust_io(s, adj);

		end = adj->resource.io.BasePort + adj->resource.io.NumPorts - 1;

		return adjust_io(s, adj->Action, adj->resource.io.BasePort, end);

	}

	}

	return CS_UNSUPPORTED_FUNCTION;

	return CS_UNSUPPORTED_FUNCTION;

}

}
@@ -845,17 +844,16 @@ static ssize_t store_io_db(struct class_device *class_dev, const char *buf, size 
{

{

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	unsigned long start_addr, end_addr;

	unsigned long start_addr, end_addr;

	unsigned int add = 1;

	unsigned int add = ADD_MANAGED_RESOURCE;

	adjust_t adj;

	ssize_t ret = 0;

	ssize_t ret = 0;





	ret = sscanf (buf, "+ 0x%lx - 0x%lx", &start_addr, &end_addr);

	ret = sscanf (buf, "+ 0x%lx - 0x%lx", &start_addr, &end_addr);

	if (ret != 2) {

	if (ret != 2) {

		ret = sscanf (buf, "- 0x%lx - 0x%lx", &start_addr, &end_addr);

		ret = sscanf (buf, "- 0x%lx - 0x%lx", &start_addr, &end_addr);

		add = 0;

		add = REMOVE_MANAGED_RESOURCE;

		if (ret != 2) {

		if (ret != 2) {

			ret = sscanf (buf, "0x%lx - 0x%lx", &start_addr, &end_addr);

			ret = sscanf (buf, "0x%lx - 0x%lx", &start_addr, &end_addr);

			add = 1;

			add = ADD_MANAGED_RESOURCE;

			if (ret != 2)

			if (ret != 2)

				return -EINVAL;

				return -EINVAL;

		}

		}
@@ -863,12 +861,7 @@ static ssize_t store_io_db(struct class_device *class_dev, const char *buf, size 
	if (end_addr <= start_addr)

	if (end_addr <= start_addr)

		return -EINVAL;

		return -EINVAL;





	adj.Action = add ? ADD_MANAGED_RESOURCE : REMOVE_MANAGED_RESOURCE;

	ret = adjust_io(s, add, start_addr, end_addr);

	adj.Resource = RES_IO_RANGE;

	adj.resource.io.BasePort = start_addr;

	adj.resource.io.NumPorts = end_addr - start_addr + 1;



	ret = adjust_io(s, &adj);





	return ret ? ret : count;

	return ret ? ret : count;

}

}
@@ -901,17 +894,16 @@ static ssize_t store_mem_db(struct class_device *class_dev, const char *buf, siz 
{

{

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	struct pcmcia_socket *s = class_get_devdata(class_dev);

	unsigned long start_addr, end_addr;

	unsigned long start_addr, end_addr;

	unsigned int add = 1;

	unsigned int add = ADD_MANAGED_RESOURCE;

	adjust_t adj;

	ssize_t ret = 0;

	ssize_t ret = 0;





	ret = sscanf (buf, "+ 0x%lx - 0x%lx", &start_addr, &end_addr);

	ret = sscanf (buf, "+ 0x%lx - 0x%lx", &start_addr, &end_addr);

	if (ret != 2) {

	if (ret != 2) {

		ret = sscanf (buf, "- 0x%lx - 0x%lx", &start_addr, &end_addr);

		ret = sscanf (buf, "- 0x%lx - 0x%lx", &start_addr, &end_addr);

		add = 0;

		add = REMOVE_MANAGED_RESOURCE;

		if (ret != 2) {

		if (ret != 2) {

			ret = sscanf (buf, "0x%lx - 0x%lx", &start_addr, &end_addr);

			ret = sscanf (buf, "0x%lx - 0x%lx", &start_addr, &end_addr);

			add = 1;

			add = ADD_MANAGED_RESOURCE;

			if (ret != 2)

			if (ret != 2)

				return -EINVAL;

				return -EINVAL;

		}

		}
@@ -919,12 +911,7 @@ static ssize_t store_mem_db(struct class_device *class_dev, const char *buf, siz 
	if (end_addr <= start_addr)

	if (end_addr <= start_addr)

		return -EINVAL;

		return -EINVAL;





	adj.Action = add ? ADD_MANAGED_RESOURCE : REMOVE_MANAGED_RESOURCE;

	ret = adjust_memory(s, add, start_addr, end_addr);

	adj.Resource = RES_MEMORY_RANGE;

	adj.resource.memory.Base = start_addr;

	adj.resource.memory.Size = end_addr - start_addr + 1;



	ret = adjust_memory(s, &adj);





	return ret ? ret : count;

	return ret ? ret : count;

}

}