Commit 0bdf9b3d authored by Magnus Damm's avatar Magnus Damm Committed by Dominik Brodowski
Browse files

pcmcia: Change window_handle_t logic to unsigned long 



Logic changes based on top of the other patches:

This set of patches changed window_handle_t from being a pointer to an
unsigned long. The unsigned long is now a simple index into socket->win[].
Going from a pointer to unsigned long should leave the user space interface
unchanged unless I'm mistaken.

This change results in code that is less error prone and a user space
interface which is much cleaner and safer. A nice side effect is that we
are also are able to remove all members except one from window_t.

[ linux@dominikbrodowski.net:
	Update to 2.6.31. Also, a plain "index" to socket->win[] does not
	work, as several codepaths rely on "window_handle_t" being
	non-zero if used. Therefore, set the window_handle_t to the
	socket->win[] index + 1. ]

CC: netdev@vger.kernel.org
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 16456eba

drivers/net/pcmcia/pcnet_cs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1514,7 +1514,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, 
    if (i != (TX_PAGES<<8)) {

    if (i != (TX_PAGES<<8)) {

	iounmap(info->base);

	iounmap(info->base);

	pcmcia_release_window(link, link->win);

	pcmcia_release_window(link, link->win);

	info->base = NULL; link->win = NULL;

	info->base = NULL; link->win = 0;

	goto failed;

	goto failed;

    }

    }

drivers/pcmcia/cs_internal.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -149,8 +149,8 @@ extern struct list_head pcmcia_socket_list; 
extern struct class pcmcia_socket_class;

extern struct class pcmcia_socket_class;





int pcmcia_get_window(struct pcmcia_socket *s,

int pcmcia_get_window(struct pcmcia_socket *s,

		      window_handle_t *handle,

		      window_handle_t *wh_out,

		      int idx,

		      window_handle_t wh,

		      win_req_t *req);

		      win_req_t *req);

int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);

int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);

struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);

struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);

drivers/pcmcia/pcmcia_ioctl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -916,12 +916,12 @@ static int ds_ioctl(struct inode * inode, struct file * file, 
	goto free_out;

	goto free_out;

	break;

	break;

    case DS_GET_FIRST_WINDOW:

    case DS_GET_FIRST_WINDOW:

	ret = pcmcia_get_window(s, &buf->win_info.handle, 0,

	ret = pcmcia_get_window(s, &buf->win_info.handle, 1,

			&buf->win_info.window);

			&buf->win_info.window);

	break;

	break;

    case DS_GET_NEXT_WINDOW:

    case DS_GET_NEXT_WINDOW:

	ret = pcmcia_get_window(s, &buf->win_info.handle,

	ret = pcmcia_get_window(s, &buf->win_info.handle,

			buf->win_info.handle->index + 1, &buf->win_info.window);

			buf->win_info.handle + 1, &buf->win_info.window);

	break;

	break;

    case DS_GET_MEM_PAGE:

    case DS_GET_MEM_PAGE:

	ret = pcmcia_get_mem_page(s, buf->win_info.handle,

	ret = pcmcia_get_mem_page(s, buf->win_info.handle,

drivers/pcmcia/pcmcia_resource.c

+30 −29
Original line number Original line Diff line number Diff line
@@ -187,15 +187,19 @@ EXPORT_SYMBOL(pcmcia_access_configuration_register); 




/** pcmcia_get_window

/** pcmcia_get_window

 */

 */

int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle,

int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *wh_out,

		      int idx, win_req_t *req)

		window_handle_t wh, win_req_t *req)

{

{

	window_t *win;

	window_t *win;

	int w;

	window_handle_t w;





	if (!s || !(s->state & SOCKET_PRESENT))

	if (!s || !(s->state & SOCKET_PRESENT))

		return -ENODEV;

		return -ENODEV;

	for (w = idx; w < MAX_WIN; w++)



	wh--;

	if (wh >= MAX_WIN)

		return -EINVAL;

	for (w = wh; w < MAX_WIN; w++)

		if (s->state & SOCKET_WIN_REQ(w))

		if (s->state & SOCKET_WIN_REQ(w))

			break;

			break;

	if (w == MAX_WIN)

	if (w == MAX_WIN)
@@ -213,7 +217,8 @@ int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle, 
		req->Attributes |= WIN_DATA_WIDTH_16;

		req->Attributes |= WIN_DATA_WIDTH_16;

	if (win->ctl.flags & MAP_USE_WAIT)

	if (win->ctl.flags & MAP_USE_WAIT)

		req->Attributes |= WIN_USE_WAIT;

		req->Attributes |= WIN_USE_WAIT;

	*handle = win;



	*wh_out = w++;

	return 0;

	return 0;

} /* pcmcia_get_window */

} /* pcmcia_get_window */

EXPORT_SYMBOL(pcmcia_get_window);

EXPORT_SYMBOL(pcmcia_get_window);
@@ -226,12 +231,12 @@ EXPORT_SYMBOL(pcmcia_get_window); 
int pcmcia_get_mem_page(struct pcmcia_socket *skt, window_handle_t wh,

int pcmcia_get_mem_page(struct pcmcia_socket *skt, window_handle_t wh,

			memreq_t *req)

			memreq_t *req)

{

{

	window_handle_t win = wh;

	wh--;



	if (wh >= MAX_WIN)

	if ((win == NULL) || (win->magic != WINDOW_MAGIC))

		return -EINVAL;

		return -EINVAL;



	req->Page = 0;

	req->Page = 0;

	req->CardOffset = win->ctl.card_start;

	req->CardOffset = skt->win[wh].ctl.card_start;

	return 0;

	return 0;

} /* pcmcia_get_mem_page */

} /* pcmcia_get_mem_page */

EXPORT_SYMBOL(pcmcia_get_mem_page);

EXPORT_SYMBOL(pcmcia_get_mem_page);
@@ -240,18 +245,17 @@ EXPORT_SYMBOL(pcmcia_get_mem_page); 
int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh,

int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh,

			memreq_t *req)

			memreq_t *req)

{

{

	struct pcmcia_socket *s;

	struct pcmcia_socket *s = p_dev->socket;

	window_handle_t win = wh;





	if ((win == NULL) || (win->magic != WINDOW_MAGIC))

	wh--;

	if (wh >= MAX_WIN)

		return -EINVAL;

		return -EINVAL;

	s = win->sock;

	if (req->Page != 0) {

	if (req->Page != 0) {

		dev_dbg(&s->dev, "failure: requested page is zero\n");

		dev_dbg(&s->dev, "failure: requested page is zero\n");

		return -EINVAL;

		return -EINVAL;

	}

	}

	win->ctl.card_start = req->CardOffset;

	s->win[wh].ctl.card_start = req->CardOffset;

	if (s->ops->set_mem_map(s, &win->ctl) != 0) {

	if (s->ops->set_mem_map(s, &s->win[wh].ctl) != 0) {

		dev_dbg(&s->dev, "failed to set_mem_map\n");

		dev_dbg(&s->dev, "failed to set_mem_map\n");

		return -EIO;

		return -EIO;

	}

	}
@@ -450,13 +454,16 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req) 




int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh)

int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh)

{

{

	struct pcmcia_socket *s;

	struct pcmcia_socket *s = p_dev->socket;

	window_handle_t win = wh;

	window_t *win;





	if ((win == NULL) || (win->magic != WINDOW_MAGIC))

	wh--;

	if (wh >= MAX_WIN)

		return -EINVAL;

		return -EINVAL;

	s = win->sock;



	if (!(win->handle->_win & CLIENT_WIN_REQ(win->index))) {

	win = &s->win[wh];



	if (!(p_dev->_win & CLIENT_WIN_REQ(wh))) {

		dev_dbg(&s->dev, "not releasing unknown window\n");

		dev_dbg(&s->dev, "not releasing unknown window\n");

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -464,7 +471,7 @@ int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh) 
	/* Shut down memory window */

	/* Shut down memory window */

	win->ctl.flags &= ~MAP_ACTIVE;

	win->ctl.flags &= ~MAP_ACTIVE;

	s->ops->set_mem_map(s, &win->ctl);

	s->ops->set_mem_map(s, &win->ctl);

	s->state &= ~SOCKET_WIN_REQ(win->index);

	s->state &= ~SOCKET_WIN_REQ(wh);





	/* Release system memory */

	/* Release system memory */

	if (win->ctl.res) {

	if (win->ctl.res) {
@@ -472,9 +479,7 @@ int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh) 
		kfree(win->ctl.res);

		kfree(win->ctl.res);

		win->ctl.res = NULL;

		win->ctl.res = NULL;

	}

	}

	win->handle->_win &= ~CLIENT_WIN_REQ(win->index);

	p_dev->_win &= ~CLIENT_WIN_REQ(wh);



	win->magic = 0;





	return 0;

	return 0;

} /* pcmcia_release_window */

} /* pcmcia_release_window */
@@ -847,10 +852,6 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h 
	}

	}





	win = &s->win[w];

	win = &s->win[w];

	win->magic = WINDOW_MAGIC;

	win->index = w;

	win->handle = *p_dev;

	win->sock = s;





	if (!(s->features & SS_CAP_STATIC_MAP)) {

	if (!(s->features & SS_CAP_STATIC_MAP)) {

		win->ctl.res = pcmcia_find_mem_region(req->Base, req->Size, align,

		win->ctl.res = pcmcia_find_mem_region(req->Base, req->Size, align,
@@ -887,7 +888,7 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h 
	} else {

	} else {

		req->Base = win->ctl.res->start;

		req->Base = win->ctl.res->start;

	}

	}

	*wh = win;

	*wh = w + 1;





	return 0;

	return 0;

} /* pcmcia_request_window */

} /* pcmcia_request_window */

include/pcmcia/cs_types.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -26,8 +26,7 @@ typedef u_int event_t; 
typedef u_char	cisdata_t;

typedef u_char	cisdata_t;

typedef u_short	page_t;

typedef u_short	page_t;





struct window_t;

typedef unsigned long window_handle_t;

typedef struct window_t *window_handle_t;





struct region_t;

struct region_t;

typedef struct region_t *memory_handle_t;

typedef struct region_t *memory_handle_t;

CRA Git | Maintained and supported by SUSTech CRA and CCSE