PCMCIA patches
Hi,
I'm about to send a set of 6 PCMCIA patches, which I'd like people to test. They're against base current 2.5.64 BK (as of this morning GMT,) but they apply with some offset to plain .64.
The patch numbering starts at 2 - the first set (which was 1a to 1h) was ARM stuff, which Linus has already accepted.
pcmcia-2.diff
get_io_map and get_mem_map PCMCIA socket methods are never called by the PCMCIA core code. They are therefore dead code, and can be removed.
pcmcia-3.diff
Remove the bus_* abstractions.
pcmcia-4.diff
Cardbus uses socket->cb_config to detect when the cardbus card has been initialised. Since cb_config will eventually die, we need a solution - introduce the SOCKET_CARDBUS_CONFIG flag, which is set once we have initialised the cardbus socket.
pcmcia-5.diff
Add an element of locking to the resource manager - don't allow the PCMCIA resource lists to be changed while the pcmcia code is scanning them.
pcmcia-6.diff
Remove the dependence of the PCMCIA layer on CONFIG_ISA - introduce CONFIG_PCMCIA_PROBE to determine whether we need the resource handling code. This prevents oopsen on SA11x0 and similar platforms which use statically mapped, non-windowed sockets.
pcmcia-7.diff
Remove support for the old PCMCIA cardbus clients - all cardbus drivers should be converted to be full-class PCI citizens.
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Re: [CFT] 1/6 (2) kill get_*_map
pcmcia-2.diff
get_io_map and get_mem_map PCMCIA socket methods are never called by the PCMCIA core code. They are therefore dead code, and can be removed.
drivers/pcmcia/hd64465_ss.c +0 -32
@@ -599,21 +599,6 @@/*============================================================*/ -static int hs_get_io_map (unsigned int sock,struct pccard_io_map *io) -{ -hs_socket_t *sp = &hs_sockets[sock]; -int map = io->map; - -DPRINTK ("hs_get_io_map(%d, %d)\n" , sock, map); -if (map >=MAX_IO_WIN ) -return -EINVAL ; - - *io = sp->io_maps[map]; -return 0 ; -} - -/*============================================================*/ -static int hs_set_io_map (unsigned int sock,struct pccard_io_map *io) {hs_socket_t *sp = &hs_sockets[sock];
@@ -696,21 +681,6 @@/*============================================================*/ -static int hs_get_mem_map (unsigned int sock,struct pccard_mem_map *mem) -{ -hs_socket_t *sp = &hs_sockets[sock]; -int map = mem->map; - -DPRINTK ("hs_get_mem_map(%d, %d)\n" , sock, map); -if (map >=MAX_WIN ) -return -EINVAL ; - - *mem = sp->mem_maps[map]; -return 0 ; -} - -/*============================================================*/ -static int hs_set_mem_map (unsigned int sock,struct pccard_mem_map *mem) {hs_socket_t *sp = &hs_sockets[sock];
@@ -894,9 +864,7 @@ .get_status = hs_get_status, .get_socket = hs_get_socket, .set_socket = hs_set_socket, - .get_io_map = hs_get_io_map, .set_io_map = hs_set_io_map, - .get_mem_map = hs_get_mem_map, .set_mem_map = hs_set_mem_map, .proc_setup = hs_proc_setup, };
drivers/pcmcia/i82092.c +0 -88
107 lines not on this page · raw message
drivers/pcmcia/i82092aa.h +0 -2
@@ -29,9 +29,7 @@static int i82092aa_get_status (unsigned int sock,u_int *value);static int i82092aa_get_socket (unsigned int sock,socket_state_t *state);static int i82092aa_set_socket (unsigned int sock,socket_state_t *state); -static int i82092aa_get_io_map (unsigned int sock,struct pccard_io_map *io);static int i82092aa_set_io_map (unsigned int sock,struct pccard_io_map *io); -static int i82092aa_get_mem_map (unsigned int sock,struct pccard_mem_map *mem);static int i82092aa_set_mem_map (unsigned int sock,struct pccard_mem_map *mem);static int i82092aa_init (unsigned int s);static int i82092aa_suspend (unsigned int sock);
drivers/pcmcia/i82365.c +0 -77
108 lines not on this page · raw message
drivers/pcmcia/pci_socket.c +0 -20
@@ -105,15 +105,6 @@return -EINVAL ; } -static int pci_get_io_map (unsigned int sock,struct pccard_io_map *io) -{ -pci_socket_t *socket = pci_socket_array + sock; - -if (socket->op && socket->op->get_io_map) -return socket->op->get_io_map (socket, io); -return -EINVAL ; -} -static int pci_set_io_map (unsigned int sock,struct pccard_io_map *io) {pci_socket_t *socket = pci_socket_array + sock;
@@ -123,15 +114,6 @@return -EINVAL ; } -static int pci_get_mem_map (unsigned int sock,struct pccard_mem_map *mem) -{ -pci_socket_t *socket = pci_socket_array + sock; - -if (socket->op && socket->op->get_mem_map) -return socket->op->get_mem_map (socket, mem); -return -EINVAL ; -} -static int pci_set_mem_map (unsigned int sock,struct pccard_mem_map *mem) {pci_socket_t *socket = pci_socket_array + sock;
@@ -158,9 +140,7 @@ .get_status = pci_get_status, .get_socket = pci_get_socket, .set_socket = pci_set_socket, - .get_io_map = pci_get_io_map, .set_io_map = pci_set_io_map, - .get_mem_map = pci_get_mem_map, .set_mem_map = pci_set_mem_map, .proc_setup = pci_proc_setup, };
drivers/pcmcia/pci_socket.h +0 -2
@@ -37,9 +37,7 @@int (*get_status)(struct pci_socket *,unsigned int *);int (*get_socket)(struct pci_socket *,socket_state_t *);int (*set_socket)(struct pci_socket *,socket_state_t *); -int (*get_io_map)(struct pci_socket *,struct pccard_io_map *);int (*set_io_map)(struct pci_socket *,struct pccard_io_map *); -int (*get_mem_map)(struct pci_socket *,struct pccard_mem_map *);int (*set_mem_map)(struct pci_socket *,struct pccard_mem_map *);void (*proc_setup)(struct pci_socket *,struct proc_dir_entry *base); };
drivers/pcmcia/ricoh.h +0 -2
@@ -170,9 +170,7 @@ yenta_get_status, yenta_get_socket, yenta_set_socket, - yenta_get_io_map, yenta_set_io_map, - yenta_get_mem_map, yenta_set_mem_map, yenta_proc_setup };
drivers/pcmcia/sa1100_generic.c +0 -53
72 lines not on this page · raw message
drivers/pcmcia/tcic.c +0 -85
104 lines not on this page · raw message
drivers/pcmcia/ti113x.h +0 -6
@@ -185,9 +185,7 @@ yenta_get_status, yenta_get_socket, yenta_set_socket, - yenta_get_io_map, yenta_set_io_map, - yenta_get_mem_map, yenta_set_mem_map, yenta_proc_setup };
@@ -230,9 +228,7 @@ yenta_get_status, yenta_get_socket, yenta_set_socket, - yenta_get_io_map, yenta_set_io_map, - yenta_get_mem_map, yenta_set_mem_map, yenta_proc_setup };
@@ -272,9 +268,7 @@ yenta_get_status, yenta_get_socket, yenta_set_socket, - yenta_get_io_map, yenta_set_io_map, - yenta_get_mem_map, yenta_set_mem_map, yenta_proc_setup };
drivers/pcmcia/yenta.c +1 -61
87 lines not on this page · raw message
include/pcmcia/ss.h +0 -2
@@ -134,9 +134,7 @@int (*get_status)(unsigned int sock,u_int *value);int (*get_socket)(unsigned int sock,socket_state_t *state);int (*set_socket)(unsigned int sock,socket_state_t *state); -int (*get_io_map)(unsigned int sock,struct pccard_io_map *io);int (*set_io_map)(unsigned int sock,struct pccard_io_map *io); -int (*get_mem_map)(unsigned int sock,struct pccard_mem_map *mem);int (*set_mem_map)(unsigned int sock,struct pccard_mem_map *mem);void (*proc_setup)(unsigned int sock,struct proc_dir_entry *base); };
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Re: [CFT] 3/6 (4): add SOCKET_CARDBUS_CONFIG flag
In reply to Russell Kingpcmcia-4.diff
Cardbus uses socket->cb_config to detect when the cardbus card has been initialised. Since cb_config will eventually die, we need a solution - introduce the SOCKET_CARDBUS_CONFIG flag, which is set once we have initialised the cardbus socket.
drivers/pcmcia/cs.c +4 -2
@@ -621,8 +621,10 @@send_event (s,CS_EVENT_PM_RESUME ,CS_EVENT_PRI_LOW ); }else if (s->state &SOCKET_SETUP_PENDING ) {#ifdef CONFIG_CARDBUS -if (s->state &SOCKET_CARDBUS ) +if (s->state &SOCKET_CARDBUS ) {cb_alloc (s); + s->state |=SOCKET_CARDBUS_CONFIG ; + }#endif send_event (s,CS_EVENT_CARD_INSERTION ,CS_EVENT_PRI_LOW ); s->state &= ~SOCKET_SETUP_PENDING ;
@@ -1072,7 +1074,7 @@ config->Vcc = s->socket.Vcc; config->Vpp1 = config->Vpp2 = s->socket.Vpp; config->Option = s->cap.cb_dev->subordinate->number; -if (s->cb_config) { +if (s->state &SOCKET_CARDBUS_CONFIG ) { config->Attributes =CONF_VALID_CLIENT ; config->IntType =INT_CARDBUS ; config->AssignedIRQ = s->irq.AssignedIRQ;
drivers/pcmcia/cs_internal.h +1 -0
@@ -176,6 +176,7 @@#define SOCKET_IO_REQ (i) (0x1000<<(i))#define SOCKET_REGION_INFO 0x4000#define SOCKET_CARDBUS 0x8000 +#define SOCKET_CARDBUS_CONFIG 0x10000#define CHECK_HANDLE (h) \ (((h) == NULL) || ((h)->client_magic != CLIENT_MAGIC))
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Re: [CFT] 2/6 (3): Remove bus_* abstractions
In reply to Russell Kingpcmcia-3.diff
Remove the bus_* abstractions; they are unused.
drivers/pcmcia/cistpl.c +27 -29
@@ -49,7 +49,6 @@#include <asm/byteorder.h> #include <pcmcia/cs_types.h> -#include <pcmcia/bus_ops.h> #include <pcmcia/ss.h> #include <pcmcia/cs.h> #include <pcmcia/bulkmem.h>
@@ -103,9 +102,8 @@ s->ss_entry->set_mem_map (s->sock, mem);if (s->cap.features &SS_CAP_STATIC_MAP ) {if (s->cis_virt) -bus_iounmap (s->cap.bus, s->cis_virt); - s->cis_virt =bus_ioremap (s->cap.bus, mem->sys_start, - s->cap.map_size); +iounmap (s->cis_virt); + s->cis_virt =ioremap (mem->sys_start, s->cap.map_size); } }
@@ -130,13 +128,13 @@ mem->card_start =0 ; mem->flags =MAP_ACTIVE ;set_cis_map (s, mem); sys = s->cis_virt; -bus_writeb (s->cap.bus, flags, sys+CISREG_ICTRL0 ); -bus_writeb (s->cap.bus, addr &0xff , sys+CISREG_IADDR0 ); -bus_writeb (s->cap.bus, (addr>>8 ) &0xff , sys+CISREG_IADDR1 ); -bus_writeb (s->cap.bus, (addr>>16 ) &0xff , sys+CISREG_IADDR2 ); -bus_writeb (s->cap.bus, (addr>>24 ) &0xff , sys+CISREG_IADDR3 ); +writeb (flags, sys+CISREG_ICTRL0 ); +writeb (addr &0xff , sys+CISREG_IADDR0 ); +writeb ((addr>>8 ) &0xff , sys+CISREG_IADDR1 ); +writeb ((addr>>16 ) &0xff , sys+CISREG_IADDR2 ); +writeb ((addr>>24 ) &0xff , sys+CISREG_IADDR3 );for ( ; len >0 ; len--, buf++) - *buf =bus_readb (s->cap.bus, sys+CISREG_IDATA0 ); + *buf =readb (sys+CISREG_IDATA0 ); }else {u_int inc =1 ;if (attr) { mem->flags |=MAP_ATTRIB ; inc++; addr *=2 ; }
@@ -147,7 +145,7 @@ sys = s->cis_virt + (addr & (s->cap.map_size-1 ));for ( ; len >0 ; len--, buf++, sys += inc) {if (sys == s->cis_virt+s->cap.map_size)break ; - *buf =bus_readb (s->cap.bus, sys); + *buf =readb (sys); } mem->card_start += s->cap.map_size; addr =0 ;
@@ -177,13 +175,13 @@ mem->card_start =0 ; mem->flags =MAP_ACTIVE ;set_cis_map (s, mem); sys = s->cis_virt; -bus_writeb (s->cap.bus, flags, sys+CISREG_ICTRL0 ); -bus_writeb (s->cap.bus, addr &0xff , sys+CISREG_IADDR0 ); -bus_writeb (s->cap.bus, (addr>>8 ) &0xff , sys+CISREG_IADDR1 ); -bus_writeb (s->cap.bus, (addr>>16 ) &0xff , sys+CISREG_IADDR2 ); -bus_writeb (s->cap.bus, (addr>>24 ) &0xff , sys+CISREG_IADDR3 ); +writeb (flags, sys+CISREG_ICTRL0 ); +writeb (addr &0xff , sys+CISREG_IADDR0 ); +writeb ((addr>>8 ) &0xff , sys+CISREG_IADDR1 ); +writeb ((addr>>16 ) &0xff , sys+CISREG_IADDR2 ); +writeb ((addr>>24 ) &0xff , sys+CISREG_IADDR3 );for ( ; len >0 ; len--, buf++) -bus_writeb (s->cap.bus, *buf, sys+CISREG_IDATA0 ); +writeb (*buf, sys+CISREG_IDATA0 ); }else {int inc =1 ;if (attr &IS_ATTR ) { mem->flags |=MAP_ATTRIB ; inc++; addr *=2 ; }
@@ -193,7 +191,7 @@ sys = s->cis_virt + (addr & (s->cap.map_size-1 ));for ( ; len >0 ; len--, buf++, sys += inc) {if (sys == s->cis_virt+s->cap.map_size)break ; -bus_writeb (s->cap.bus, *buf, sys); +writeb (*buf, sys); } mem->card_start += s->cap.map_size; addr =0 ;
@@ -218,18 +216,19 @@int ret; vs->cis_mem.sys_start = base; vs->cis_mem.sys_stop = base+vs->cap.map_size-1 ; - vs->cis_virt =bus_ioremap (vs->cap.bus, base, vs->cap.map_size); + vs->cis_virt =ioremap (base, vs->cap.map_size); ret =pcmcia_validate_cis (vs->clients, &info1);/* invalidate mapping and CIS cache */ -bus_iounmap (vs->cap.bus, vs->cis_virt); vs->cis_used =0 ; +iounmap (vs->cis_virt); + vs->cis_used =0 ;if ((ret !=0 ) || (info1.Chains ==0 ))return 0 ; vs->cis_mem.sys_start = base+vs->cap.map_size; vs->cis_mem.sys_stop = base+2 *vs->cap.map_size-1 ; - vs->cis_virt =bus_ioremap (vs->cap.bus, base+vs->cap.map_size, - vs->cap.map_size); + vs->cis_virt =ioremap (base+vs->cap.map_size, vs->cap.map_size); ret =pcmcia_validate_cis (vs->clients, &info2); -bus_iounmap (vs->cap.bus, vs->cis_virt); vs->cis_used =0 ; +iounmap (vs->cis_virt); + vs->cis_used =0 ;return ((ret ==0 ) && (info1.Chains == info2.Chains)); }
@@ -239,17 +238,17 @@int i, a, b, d; vs->cis_mem.sys_start = base; vs->cis_mem.sys_stop = base+vs->cap.map_size-1 ; - vs->cis_virt =bus_ioremap (vs->cap.bus, base, vs->cap.map_size); + vs->cis_virt =ioremap (base, vs->cap.map_size); vs->cis_mem.card_start =0 ; vs->cis_mem.flags =MAP_ACTIVE ; vs->ss_entry->set_mem_map (vs->sock, &vs->cis_mem);/* Don't bother checking every word... */ a =0 ; b =-1 ;for (i =0 ; i < vs->cap.map_size; i +=44 ) { - d =bus_readl (vs->cap.bus, vs->cis_virt+i); + d =readl (vs->cis_virt+i); a += d; b &= d; } -bus_iounmap (vs->cap.bus, vs->cis_virt); +iounmap (vs->cis_virt);return (b ==-1 ) ?-1 : (a>>1 ); }
@@ -274,8 +273,7 @@return -1 ; } s->cis_mem.sys_stop = s->cis_mem.sys_start+s->cap.map_size-1 ; - s->cis_virt =bus_ioremap (s->cap.bus, s->cis_mem.sys_start, - s->cap.map_size); + s->cis_virt =ioremap (s->cis_mem.sys_start, s->cap.map_size); }return 0 ; }
@@ -287,7 +285,7 @@ s->ss_entry->set_mem_map (s->sock, &s->cis_mem);if (!(s->cap.features &SS_CAP_STATIC_MAP ))release_mem_region (s->cis_mem.sys_start, s->cap.map_size); -bus_iounmap (s->cap.bus, s->cis_virt); +iounmap (s->cis_virt); s->cis_mem.sys_start =0 ; s->cis_virt =NULL ; }
drivers/pcmcia/cs.c +2 -4
@@ -59,7 +59,6 @@#include <pcmcia/bulkmem.h> #include <pcmcia/cistpl.h> #include <pcmcia/cisreg.h> -#include <pcmcia/bus_ops.h> #include "cs_internal.h" #ifdef CONFIG_PCI
@@ -1469,7 +1468,6 @@ client->event_handler = req->event_handler; client->event_callback_args = req->event_callback_args; client->event_callback_args.client_handle = client; - client->event_callback_args.bus = s->cap.bus;if (s->state &SOCKET_CARDBUS ) client->state |=CLIENT_CARDBUS ;
@@ -1618,7 +1616,7 @@ }if (req->Attributes &IRQ_HANDLE_PRESENT ) { -bus_free_irq (s->cap.bus, req->AssignedIRQ, req->Instance); +free_irq (req->AssignedIRQ, req->Instance); }#ifdef CONFIG_ISA
@@ -1913,7 +1911,7 @@if (ret !=0 )return ret;if (req->Attributes &IRQ_HANDLE_PRESENT ) { - if (bus_request_irq(s->cap.bus, irq, req->Handler, + if (request_irq(irq, req->Handler, ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) || (s->functions > 1) || (irq == s->cap.pci_irq)) ? SA_SHIRQ : 0,
drivers/pcmcia/sa1100_generic.c +0 -1
@@ -52,7 +52,6 @@#include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/ss.h> -#include <pcmcia/bus_ops.h> #include <asm/hardware.h> #include <asm/io.h>
drivers/pcmcia/yenta.c +0 -1
@@ -514,7 +514,6 @@ socket->cap.pci_irq = socket->cb_irq; socket->cap.irq_mask =yenta_probe_irq (socket, isa_irq_mask); socket->cap.cb_dev = socket->dev; - socket->cap.bus =NULL ;printk ("Yenta IRQ list %04x, PCI irq%d\n" , socket->cap.irq_mask, socket->cb_irq); }
include/pcmcia/bus_ops.h +2 -152
154 lines not on this page · raw message
include/pcmcia/cs.h +0 -1
@@ -98,7 +98,6 @@void *buffer;void *misc;void *client_data; -struct bus_operations *bus; } event_callback_args_t;/* for GetConfigurationInfo */
include/pcmcia/ss.h +0 -1
@@ -58,7 +58,6 @@ioaddr_t io_offset;u_char pci_irq;struct pci_dev *cb_dev; -struct bus_operations *bus; } socket_cap_t;/* InquireSocket capabilities */
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Re: [CFT] 5/6 (6): Introduce CONFIG_PCMCIA_PROBE
In reply to Russell Kingpcmcia-6.diff
Remove the dependence of the PCMCIA layer on CONFIG_ISA - introduce CONFIG_PCMCIA_PROBE to determine whether we need the resource handling code. This prevents oopsen on SA11x0 and similar platforms which use statically mapped, non-windowed sockets.
drivers/pcmcia/Kconfig +4 -0
@@ -86,6 +86,10 @@ config PCMCIA_SA1111 tristate "SA1111 support" depends on PCMCIA_SA1100 && SA1111 + +config PCMCIA_PROBE + bool + default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X endmenu
drivers/pcmcia/cs.c +2 -2
@@ -1621,7 +1621,7 @@free_irq (req->AssignedIRQ, req->Instance); } -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE if (req->AssignedIRQ != s->cap.pci_irq)undo_irq (req->Attributes, req->AssignedIRQ);#endif
@@ -1883,7 +1883,7 @@if (!s->cap.irq_mask) { irq = s->cap.pci_irq; ret = (irq) ?0 :CS_IN_USE ; -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE }else if (s->irq.AssignedIRQ !=0 ) {/* If the interrupt is already assigned, it must match */ irq = s->irq.AssignedIRQ;
drivers/pcmcia/rsrc_mgr.c +10 -10
@@ -62,7 +62,7 @@#define INT_MODULE_PARM (n, v) static int n = v; MODULE_PARM(n, "i")INT_MODULE_PARM (probe_mem,1 );/* memory probe? */ -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE INT_MODULE_PARM (probe_io,1 );/* IO port probe? */ INT_MODULE_PARM (mem_limit,0x10000 );#endif
@@ -87,7 +87,7 @@static DECLARE_MUTEX (rsrc_sem); -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE typedef struct irq_info_t { u_int Attributes;
@@ -273,7 +273,7 @@======================================================================*/ -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE static void do_io_probe (ioaddr_t base,ioaddr_t num) {
@@ -378,7 +378,7 @@return (num - bad); } -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE static u_long inv_probe(int (*is_valid)(u_long), int (*do_cksum)(u_long),
@@ -442,7 +442,7 @@ up(&rsrc_sem); } -#else /* CONFIG_ISA */ +#else /* CONFIG_PCMCIA_PROBE */ void validate_mem (int (*is_valid)(u_long ),int (*do_cksum)(u_long ),int force_low,socket_info_t *s)
@@ -459,7 +459,7 @@ } } -#endif /* CONFIG_ISA */ +#endif /* CONFIG_PCMCIA_PROBE */ /*======================================================================
@@ -545,7 +545,7 @@======================================================================*/ -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE static void fake_irq (int i,void *d,struct pt_regs *r) { }static inline int check_irq (int irq)
@@ -634,7 +634,7 @@/*====================================================================*/ -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE void undo_irq (u_int Attributes,int irq) {
@@ -725,7 +725,7 @@ ret =CS_IN_USE ;break ; } -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE if (probe_io)do_io_probe (base, num);#endif
@@ -747,7 +747,7 @@static int adjust_irq (adjust_t *adj) {int ret =CS_SUCCESS ; -#ifdef CONFIG_ISA +#ifdef CONFIG_PCMCIA_PROBE int irq;irq_info_t *info;
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Re: [CFT] 4/6 (5): Add some locking to rsrc_mgr.c
In reply to Russell Kingpcmcia-5.diff
Add an element of locking to the resource manager - don't allow the PCMCIA resource lists to be changed while the pcmcia code is scanning them.
drivers/pcmcia/rsrc_mgr.c +115 -50
@@ -85,6 +85,8 @@/* IO port resource database */ static resource_map_t io_db = {0 ,0 , &io_db }; +static DECLARE_MUTEX (rsrc_sem); + #ifdef CONFIG_ISA typedef struct irq_info_t {
@@ -403,16 +405,20 @@static u_char order[] = {0xd0 ,0xe0 ,0xc0 ,0xf0 };static int hi =0 , lo =0 ;u_long b, i, ok =0 ; - -if (!probe_mem)return ; + +if (!probe_mem) +return ; + +down (&rsrc_sem);/* We do up to four passes through the list */ if (!force_low) {if (hi++ || (inv_probe (is_valid, do_cksum, mem_db.next, s) >0 )) -return ; + goto out;printk (KERN_NOTICE "cs: warning: no high memory space " "available!\n" ); } -if (lo++)return ; +if (lo++) + goto out;for (m = mem_db.next; m != &mem_db; m = n) { n = m->next;/* Only probe < 1 MB */
@@ -432,6 +438,8 @@ } } } + out: +up (&rsrc_sem); }#else /* CONFIG_ISA */
@@ -442,11 +450,13 @@resource_map_t *m;static int done =0 ; -if (!probe_mem || done++) -return ; -for (m = mem_db.next; m != &mem_db; m = m->next) -if (do_mem_probe (m->base, m->num, is_valid, do_cksum, s)) - return; +if (probe_mem && done++ ==0 ) { +down (&rsrc_sem); +for (m = mem_db.next; m != &mem_db; m = m->next) +if (do_mem_probe (m->base, m->num, is_valid, do_cksum, s)) +break ; +up (&rsrc_sem); + } }#endif /* CONFIG_ISA */
@@ -469,7 +479,9 @@ {ioaddr_t try;resource_map_t *m; - +int ret =-1 ; + +down (&rsrc_sem);for (m = io_db.next; m != &io_db; m = m->next) { try = (m->base & ~(align-1 )) + *base; for (try = (try >= m->base) ? try : try+align;
@@ -477,12 +489,16 @@ try += align) {if (request_io_resource (try, num, name, s->cap.cb_dev) ==0 ) { *base = try; -return 0 ; + ret =0 ; + goto out; } -if (!align)break ; +if (!align) +break ; } } -return -1 ; + out: +up (&rsrc_sem); +return ret; } int find_mem_region(u_long *base, u_long num, u_long align,
@@ -490,26 +506,35 @@ {u_long try;resource_map_t *m; +int ret =-1 ; +down (&rsrc_sem);while (1 ) {for (m = mem_db.next; m != &mem_db; m = m->next) {/* first pass >1MB, second pass <1MB */ -if ((force_low !=0 ) ^ (m->base <0x100000 ))continue ; +if ((force_low !=0 ) ^ (m->base <0x100000 )) +continue ; + try = (m->base & ~(align-1 )) + *base;for (try = (try >= m->base) ? try : try+align; (try >= m->base) && (try+num <= m->base+m->num); try += align) {if (request_mem_resource (try, num, name, s->cap.cb_dev) ==0 ) { *base = try; -return 0 ; + ret =0 ; + goto out; } -if (!align)break ; +if (!align) +break ; } } -if (force_low)break ; +if (force_low) +break ; force_low++; } -return -1 ; + out: +up (&rsrc_sem); +return ret; }/*======================================================================
@@ -534,53 +559,75 @@int try_irq (u_int Attributes,int irq,int specific) {irq_info_t *info = &irq_table[irq]; +int ret =0 ; + +down (&rsrc_sem);if (info->Attributes &RES_ALLOCATED ) {switch (Attributes &IRQ_TYPE ) {case IRQ_TYPE_EXCLUSIVE : -return CS_IN_USE ; + ret =CS_IN_USE ; +break ;case IRQ_TYPE_TIME :if ((info->Attributes &RES_IRQ_TYPE ) - !=RES_IRQ_TYPE_TIME ) -return CS_IN_USE ; -if (Attributes &IRQ_FIRST_SHARED ) -return CS_BAD_ATTRIBUTE ; + !=RES_IRQ_TYPE_TIME ) { + ret =CS_IN_USE ; +break ; + } +if (Attributes &IRQ_FIRST_SHARED ) { + ret =CS_BAD_ATTRIBUTE ; +break ; + } info->Attributes |=RES_IRQ_TYPE_TIME |RES_ALLOCATED ; info->time_share++;break ;case IRQ_TYPE_DYNAMIC_SHARING :if ((info->Attributes &RES_IRQ_TYPE ) - !=RES_IRQ_TYPE_DYNAMIC ) -return CS_IN_USE ; -if (Attributes &IRQ_FIRST_SHARED ) -return CS_BAD_ATTRIBUTE ; + !=RES_IRQ_TYPE_DYNAMIC ) { + ret =CS_IN_USE ; +break ; + } +if (Attributes &IRQ_FIRST_SHARED ) { + ret =CS_BAD_ATTRIBUTE ; +break ; + } info->Attributes |=RES_IRQ_TYPE_DYNAMIC |RES_ALLOCATED ; info->dyn_share++;break ; } }else { -if ((info->Attributes &RES_RESERVED ) && !specific) -return CS_IN_USE ; -if (check_irq (irq) !=0 ) -return CS_IN_USE ; +if ((info->Attributes &RES_RESERVED ) && !specific) { + ret =CS_IN_USE ; + goto out; + } +if (check_irq (irq) !=0 ) { + ret =CS_IN_USE ; + goto out; + }switch (Attributes &IRQ_TYPE ) {case IRQ_TYPE_EXCLUSIVE : info->Attributes |=RES_ALLOCATED ;break ;case IRQ_TYPE_TIME : -if (!(Attributes &IRQ_FIRST_SHARED )) -return CS_BAD_ATTRIBUTE ; +if (!(Attributes &IRQ_FIRST_SHARED )) { + ret =CS_BAD_ATTRIBUTE ; +break ; + } info->Attributes |=RES_IRQ_TYPE_TIME |RES_ALLOCATED ; info->time_share =1 ;break ;case IRQ_TYPE_DYNAMIC_SHARING : -if (!(Attributes &IRQ_FIRST_SHARED )) -return CS_BAD_ATTRIBUTE ; +if (!(Attributes &IRQ_FIRST_SHARED )) { + ret =CS_BAD_ATTRIBUTE ; +break ; + } info->Attributes |=RES_IRQ_TYPE_DYNAMIC |RES_ALLOCATED ; info->dyn_share =1 ;break ; } } -return 0 ; + out: +up (&rsrc_sem); +return ret; }#endif
@@ -594,6 +641,7 @@irq_info_t *info; info = &irq_table[irq]; +down (&rsrc_sem);switch (Attributes &IRQ_TYPE ) {case IRQ_TYPE_EXCLUSIVE : info->Attributes &=RES_RESERVED ;
@@ -609,6 +657,7 @@ info->Attributes &=RES_RESERVED ; break; } +up (&rsrc_sem); }#endif
@@ -631,6 +680,8 @@return CS_BAD_SIZE ; ret =CS_SUCCESS ; + +down (&rsrc_sem);switch (adj->Action) {case ADD_MANAGED_RESOURCE : ret =add_interval (&mem_db, base, num);
@@ -649,6 +700,7 @@default : ret =CS_UNSUPPORTED_FUNCTION ; } +up (&rsrc_sem);return ret; }
@@ -657,7 +709,7 @@static int adjust_io (adjust_t *adj) { -int base, num; +int base, num, ret =CS_SUCCESS ; base = adj->resource.io.BasePort; num = adj->resource.io.NumPorts;
@@ -666,10 +718,13 @@if ((num <=0 ) || (base+num >0x10000 ) || (base+num <= base))return CS_BAD_SIZE ; +down (&rsrc_sem);switch (adj->Action) {case ADD_MANAGED_RESOURCE : -if (add_interval (&io_db, base, num) !=0 ) -return CS_IN_USE ; +if (add_interval (&io_db, base, num) !=0 ) { + ret =CS_IN_USE ; +break ; + }#ifdef CONFIG_ISA if (probe_io)do_io_probe (base, num);
@@ -679,17 +734,19 @@sub_interval (&io_db, base, num);break ;default : -return CS_UNSUPPORTED_FUNCTION ; + ret =CS_UNSUPPORTED_FUNCTION ;break ; } +up (&rsrc_sem); -return CS_SUCCESS ; +return ret; }/*====================================================================*/ static int adjust_irq (adjust_t *adj) { +int ret =CS_SUCCESS ;#ifdef CONFIG_ISA int irq;irq_info_t *info;
@@ -698,33 +755,41 @@if ((irq <0 ) || (irq >15 ))return CS_BAD_IRQ ; info = &irq_table[irq]; - + +down (&rsrc_sem);switch (adj->Action) {case ADD_MANAGED_RESOURCE :if (info->Attributes &RES_REMOVED ) info->Attributes &= ~(RES_REMOVED |RES_ALLOCATED );else -if (adj->Attributes &RES_ALLOCATED ) -return CS_IN_USE ; +if (adj->Attributes &RES_ALLOCATED ) { + ret =CS_IN_USE ; +break ; + }if (adj->Attributes &RES_RESERVED ) info->Attributes |=RES_RESERVED ;else info->Attributes &= ~RES_RESERVED ;break ;case REMOVE_MANAGED_RESOURCE : -if (info->Attributes &RES_REMOVED ) -return 0 ; -if (info->Attributes &RES_ALLOCATED ) -return CS_IN_USE ; +if (info->Attributes &RES_REMOVED ) { + ret =0 ; +break ; + } +if (info->Attributes &RES_ALLOCATED ) { + ret =CS_IN_USE ; +break ; + } info->Attributes |=RES_ALLOCATED |RES_REMOVED ; info->Attributes &= ~RES_RESERVED ;break ;default : -return CS_UNSUPPORTED_FUNCTION ; + ret =CS_UNSUPPORTED_FUNCTION ;break ; } +up (&rsrc_sem);#endif -return CS_SUCCESS ; +return ret; }/*====================================================================*/
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Re: [CFT] 6/6 (7): Remove support for old cardbus clients
In reply to Russell Kingpcmcia-7.diff
Remove support for the old PCMCIA cardbus clients - all cardbus drivers should be converted to be full-class PCI citizens.
drivers/pcmcia/cardbus.c +0 -62
@@ -326,66 +326,4 @@kfree (c);printk (KERN_INFO "cs: cb_free(bus %d)\n" , s->cap.cb_dev->subordinate->number); } -} - -/*===================================================================== - -cb_enable() has the job of configuring a socket for a Cardbus -card, and initializing the card's PCI configuration registers. - -It first sets up the Cardbus bridge windows, for IO and memory -accesses. Then, it initializes each card function's base address -registers, interrupt line register, and command register. - -It is called as part of the RequestConfiguration card service. -It should be called after a previous call to cb_config() (via the -RequestIO service). -- ======================================================================*/ - -void cb_enable (socket_info_t * s) -{ -struct pci_dev *dev; -u_char i; - -DEBUG (0 ,"cs: cb_enable(bus %d)\n" , s->cap.cb_dev->subordinate->number); - -/* Configure bridge */ -cb_release_cis_mem (s); - -/* Set up PCI interrupt and command registers */ -for (i =0 ; i < s->functions; i++) { - dev = s->cb_config->dev[i]; -pci_write_config_byte (dev,PCI_COMMAND ,PCI_COMMAND_MASTER | -PCI_COMMAND_IO |PCI_COMMAND_MEMORY ); -pci_write_config_byte (dev,PCI_CACHE_LINE_SIZE , -L1_CACHE_BYTES /4 ); - } - -if (s->irq.AssignedIRQ) { -for (i =0 ; i < s->functions; i++) { - dev = s->cb_config->dev[i]; -pci_write_config_byte (dev,PCI_INTERRUPT_LINE , - s->irq.AssignedIRQ); - } - s->socket.io_irq = s->irq.AssignedIRQ; - s->ss_entry->set_socket (s->sock, &s->socket); - } -} - -/*====================================================================== - -cb_disable() unconfigures a Cardbus card previously set up by -cb_enable(). - -It is called from the ReleaseConfiguration service. -- ======================================================================*/ - -void cb_disable (socket_info_t * s) -{ -DEBUG (0 ,"cs: cb_disable(bus %d)\n" , s->cap.cb_dev->subordinate->number); - -/* Turn off bridge windows */ -cb_release_cis_mem (s); }
drivers/pcmcia/cs.c +3 -14
@@ -1518,11 +1518,8 @@ s =SOCKET (handle);#ifdef CONFIG_CARDBUS -if (handle->state &CLIENT_CARDBUS ) { -cb_disable (s); - s->lock_count =0 ; +if (handle->state &CLIENT_CARDBUS )return CS_SUCCESS ; - }#endif if (!(handle->state &CLIENT_STALE )) {
@@ -1674,16 +1671,8 @@return CS_NO_CARD ;#ifdef CONFIG_CARDBUS -if (handle->state &CLIENT_CARDBUS ) { -if (!(req->IntType &INT_CARDBUS )) -return CS_UNSUPPORTED_MODE ; -if (s->lock_count !=0 ) -return CS_CONFIGURATION_LOCKED ; -cb_enable (s); - handle->state |=CLIENT_CONFIG_LOCKED ; - s->lock_count++; -return CS_SUCCESS ; - } +if (handle->state &CLIENT_CARDBUS ) +return CS_UNSUPPORTED_MODE ;#endif if (req->IntType &INT_CARDBUS )
drivers/pcmcia/cs_internal.h +0 -2
@@ -199,8 +199,6 @@/* In cardbus.c */ int cb_alloc (socket_info_t *s);void cb_free (socket_info_t *s); -void cb_enable (socket_info_t *s); -void cb_disable (socket_info_t *s);int read_cb_mem (socket_info_t *s,int space,u_int addr,u_int len,void *ptr);void cb_release_cis_mem (socket_info_t *s);
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Quoted 3 lines · Russell King
I'm about to send a set of 6 PCMCIA patches, which I'd like people to test. They're against base current 2.5.64 BK (as of this morning GMT,) but they apply with some offset to plain .64.
Just tried them on a G3 powerbook, and it all seems fine. I plugged in a CF card and a wireless ethernet card (both 16-bit pcmcia) and they both worked. I don't have any cardbus cards to try.
Paul.