lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipwireless: Explicitly request io and mem regions

Browse Source 
ipwireless: Explicitly request io and mem regions

Documentation/pcmcia/driver-changes.txt says, that driver should call request_region
for used memory/io regions since PCMCIA does not do this (since 2.6.8).

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Sterba
2008-07-28 16:53:16 +02:00
committed by Linus Torvalds
parent ff3e990e61
commit 09e491e9a7
2 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
drivers/char/pcmcia/ipwireless/main.c
View File

@@ -88,8 +88,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
unsigned short buf[64]; unsigned short buf[64];
cisparse_t parse; cisparse_t parse;
unsigned short cor_value; unsigned short cor_value;
win_req_t request_attr_memory;
win_req_t request_common_memory;
memreq_t memreq_attr_memory; memreq_t memreq_attr_memory;
memreq_t memreq_common_memory; memreq_t memreq_common_memory;
@@ -188,6 +186,9 @@ static int config_ipwireless(struct ipw_dev *ipw)
goto exit0; goto exit0;
} }
request_region(link->io.BasePort1, link->io.NumPorts1,
IPWIRELESS_PCCARD_NAME);
/* memory settings */ /* memory settings */
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
@@ -214,16 +215,16 @@ static int config_ipwireless(struct ipw_dev *ipw)
} }
if (parse.cftable_entry.mem.nwin > 0) { if (parse.cftable_entry.mem.nwin > 0) {
request_common_memory.Attributes = ipw->request_common_memory.Attributes =
WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE; WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM | WIN_ENABLE;
request_common_memory.Base = ipw->request_common_memory.Base =
parse.cftable_entry.mem.win[0].host_addr; parse.cftable_entry.mem.win[0].host_addr;
request_common_memory.Size = parse.cftable_entry.mem.win[0].len; ipw->request_common_memory.Size = parse.cftable_entry.mem.win[0].len;
if (request_common_memory.Size < 0x1000) if (ipw->request_common_memory.Size < 0x1000)
request_common_memory.Size = 0x1000; ipw->request_common_memory.Size = 0x1000;
request_common_memory.AccessSpeed = 0; ipw->request_common_memory.AccessSpeed = 0;
ret = pcmcia_request_window(&link, &request_common_memory, ret = pcmcia_request_window(&link, &ipw->request_common_memory,
&ipw->handle_common_memory); &ipw->handle_common_memory);
if (ret != CS_SUCCESS) { if (ret != CS_SUCCESS) {
@@ -246,16 +247,18 @@ static int config_ipwireless(struct ipw_dev *ipw)
ipw->is_v2_card = ipw->is_v2_card =
parse.cftable_entry.mem.win[0].len == 0x100; parse.cftable_entry.mem.win[0].len == 0x100;
ipw->common_memory = ioremap(request_common_memory.Base, ipw->common_memory = ioremap(ipw->request_common_memory.Base,
request_common_memory.Size); ipw->request_common_memory.Size);
request_mem_region(ipw->request_common_memory.Base,
ipw->request_common_memory.Size, IPWIRELESS_PCCARD_NAME);
request_attr_memory.Attributes = ipw->request_attr_memory.Attributes =
WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE; WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_AM | WIN_ENABLE;
request_attr_memory.Base = 0; ipw->request_attr_memory.Base = 0;
request_attr_memory.Size = 0; /* this used to be 0x1000 */ ipw->request_attr_memory.Size = 0; /* this used to be 0x1000 */
request_attr_memory.AccessSpeed = 0; ipw->request_attr_memory.AccessSpeed = 0;
ret = pcmcia_request_window(&link, &request_attr_memory, ret = pcmcia_request_window(&link, &ipw->request_attr_memory,
&ipw->handle_attr_memory); &ipw->handle_attr_memory);
if (ret != CS_SUCCESS) { if (ret != CS_SUCCESS) {
@@ -274,8 +277,10 @@ static int config_ipwireless(struct ipw_dev *ipw)
goto exit2; goto exit2;
} }
ipw->attr_memory = ioremap(request_attr_memory.Base, ipw->attr_memory = ioremap(ipw->request_attr_memory.Base,
request_attr_memory.Size); ipw->request_attr_memory.Size);
request_mem_region(ipw->request_attr_memory.Base, ipw->request_attr_memory.Size,
IPWIRELESS_PCCARD_NAME);
} }
INIT_WORK(&ipw->work_reboot, signalled_reboot_work); INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
@@ -312,12 +317,12 @@ static int config_ipwireless(struct ipw_dev *ipw)
if (ipw->attr_memory && ipw->common_memory) if (ipw->attr_memory && ipw->common_memory)
printk(KERN_INFO IPWIRELESS_PCCARD_NAME printk(KERN_INFO IPWIRELESS_PCCARD_NAME
": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n", ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n",
request_attr_memory.Base, ipw->request_attr_memory.Base,
request_attr_memory.Base ipw->request_attr_memory.Base
+ request_attr_memory.Size - 1, + ipw->request_attr_memory.Size - 1,
request_common_memory.Base, ipw->request_common_memory.Base,
request_common_memory.Base ipw->request_common_memory.Base
+ request_common_memory.Size - 1); + ipw->request_common_memory.Size - 1);
ipw->network = ipwireless_network_create(ipw->hardware); ipw->network = ipwireless_network_create(ipw->hardware);
if (!ipw->network) if (!ipw->network)
@@ -349,12 +354,16 @@ exit4:
pcmcia_disable_device(link); pcmcia_disable_device(link);
exit3: exit3:
if (ipw->attr_memory) { if (ipw->attr_memory) {
release_mem_region(ipw->request_attr_memory.Base,
ipw->request_attr_memory.Size);
iounmap(ipw->attr_memory); iounmap(ipw->attr_memory);
pcmcia_release_window(ipw->handle_attr_memory); pcmcia_release_window(ipw->handle_attr_memory);
pcmcia_disable_device(link); pcmcia_disable_device(link);
} }
exit2: exit2:
if (ipw->common_memory) { if (ipw->common_memory) {
release_mem_region(ipw->request_common_memory.Base,
ipw->request_common_memory.Size);
iounmap(ipw->common_memory); iounmap(ipw->common_memory);
pcmcia_release_window(ipw->handle_common_memory); pcmcia_release_window(ipw->handle_common_memory);
} }
@@ -366,19 +375,25 @@ exit0:
static void release_ipwireless(struct ipw_dev *ipw) static void release_ipwireless(struct ipw_dev *ipw)
{ {
struct pcmcia_device *link = ipw->link; pcmcia_disable_device(ipw->link);
pcmcia_disable_device(link); if (ipw->common_memory) {
release_mem_region(ipw->request_common_memory.Base,
if (ipw->common_memory) ipw->request_common_memory.Size);
iounmap(ipw->common_memory); iounmap(ipw->common_memory);
if (ipw->attr_memory) }
if (ipw->attr_memory) {
release_mem_region(ipw->request_attr_memory.Base,
ipw->request_attr_memory.Size);
iounmap(ipw->attr_memory); iounmap(ipw->attr_memory);
}
if (ipw->common_memory) if (ipw->common_memory)
pcmcia_release_window(ipw->handle_common_memory); pcmcia_release_window(ipw->handle_common_memory);
if (ipw->attr_memory) if (ipw->attr_memory)
pcmcia_release_window(ipw->handle_attr_memory); pcmcia_release_window(ipw->handle_attr_memory);
pcmcia_disable_device(link);
/* Break the link with Card Services */
pcmcia_disable_device(ipw->link);
} }
/* /*
@@ -436,10 +451,6 @@ static void ipwireless_detach(struct pcmcia_device *link)
release_ipwireless(ipw); release_ipwireless(ipw);
/* Break the link with Card Services */
if (link)
pcmcia_disable_device(link);
if (ipw->tty != NULL) if (ipw->tty != NULL)
ipwireless_tty_free(ipw->tty); ipwireless_tty_free(ipw->tty);
if (ipw->network != NULL) if (ipw->network != NULL)

5
drivers/char/pcmcia/ipwireless/main.h
View File

@@ -45,10 +45,15 @@ struct ipw_tty;
struct ipw_dev { struct ipw_dev {
struct pcmcia_device *link; struct pcmcia_device *link;
int is_v2_card; int is_v2_card;
window_handle_t handle_attr_memory; window_handle_t handle_attr_memory;
void __iomem *attr_memory; void __iomem *attr_memory;
win_req_t request_attr_memory;
window_handle_t handle_common_memory; window_handle_t handle_common_memory;
void __iomem *common_memory; void __iomem *common_memory;
win_req_t request_common_memory;
dev_node_t nodes[2]; dev_node_t nodes[2];
/* Reference to attribute memory, containing CIS data */ /* Reference to attribute memory, containing CIS data */
void *attribute_memory; void *attribute_memory;