- 17 Feb, 2010 34 commits
-
-
Dominik Brodowski authored
If a new interval overlaps or extends an existing interval in add_interval(), do not fail, but extend the existing interval. Signed-off-by:Dominik Brodowski <linux@dominikbrodowski.net>
-
Dominik Brodowski authored
As this is the socket thread (pccardd) starting up, we do not have anything to wait for in ds.c. Instead, wait the same amount of time in pccardd to allow userspace to catch up and - possibly - execute pcmcia-socket-startup. Signed-off-by: -
Dominik Brodowski authored
Signed-off-by: -
Dominik Brodowski authored
Do not ignore the error returned by simple_config() / multi_config(). CC: linux-serial@vger.kernel.org Signed-off-by: -
Dominik Brodowski authored
Signed-off-by: -
Dominik Brodowski authored
Reported-by:
Wolfram Sang <w.sang@pengutronix.de> Signed-off-by:
-
Dominik Brodowski authored
In cb_free(), we remove some sysfs files -- other sysfs files might grab ops_mutex, so we cannot hold it while removing sysfs files. This fixes http://lkml.org/lkml/2010/1/17/88 . Tested-by:
-
Dominik Brodowski authored
The requery callback now also handles the addition of a second pseudo multifunction device. Avoids messing with dev_{g,s}et_drvdata(), and fixes any workqueue <-> skt_mutex deadlock. Tested-by: -
Dominik Brodowski authored
After a CIS update -- or the finalization of the resource database --, proceed with the re-scanning or re-querying of PCMCIA cards only in a separate thread to avoid deadlocks. Tested-by:
-
Dominik Brodowski authored
This avoids any sysfs-related deadlock (or lockdep warning), such as reported at http://lkml.org/lkml/2010/1/17/88 . Reported-by:
Ming Lei <tom.leiming@gmail.com> Tested-by:
-
Dominik Brodowski authored
Tested-by:
-
Dominik Brodowski authored
Even though we weren't calling a blocking function within the dynid spinlock, we do not need a spinlock here but can and should be using a mutex. Reported-by:
Jiri Slaby <jirislaby@gmail.com> Tested-by:
-
Dominik Brodowski authored
Tested-by:
-
Dominik Brodowski authored
Tested-by:
-
Dominik Brodowski authored
replace pcmcia_socket->lock and pcmcia_dev_list_lock by using the per-socket "ops_mutex", as we do neither need different locks nor a spinlock here. Tested-by:
-
Dominik Brodowski authored
Tested-by:
-
Dominik Brodowski authored
Tested-by:
-
Dominik Brodowski authored
Tested-by:
-
Dominik Brodowski authored
As a side effect, socket_state_t socket; u_int state; u_int suspended_state; are properly protected now. Tested-by:
-
Dominik Brodowski authored
As a side effect, io_window_t io[MAX_IO_WIN]; is explicitely protected now. Tested-by:
-
Dominik Brodowski authored
Specifically, struct list_head cis_cache; size_t fake_cis_len; u8 *fake_cis; are protected. Tested-by:
-
Dominik Brodowski authored
Protect the pccard_operations callback "set_mem_map" by a new mutex ops_mutex. This mutex also protects the following values in struct pcmcia_socket: pccard_mem_map win[] pccard_mem_map cis_mem void __iomem *cis_virt Tested-by: -
Wolfram Sang authored
Signed-off-by:
-
Uwe Kleine-König authored
This fixes: drivers/pcmcia/omap_cf.c:74:1: warning: "SZ_2K" redefined Since c1191b0e ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM) SZ_2K is defined in arch/arm/include/asm/sizes.h. Signed-off-by:
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by:
-
Uwe Kleine-König authored
This fixes: drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined Since c1191b0e ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM) SZ_2K is defined in arch/arm/include/asm/sizes.h. Signed-off-by:
Andrew Victor <linux@maxim.org.za> Signed-off-by:
-
Uwe Kleine-König authored
platform_get_irq returns -ENXIO on failure, so !irq was probably always true. Better use irq <= 0. Note that a return value of zero is still handled as error even though this could mean irq0. This is a followup to 305b3228 that changed the return value of platform_get_irq from 0 to -ENXIO on error. Signed-off-by:
-
Wolfram Sang authored
O2-bridges can do read prefetch and write burst. However, for some combinations of older bridges and cards, this causes problems, so it is disabled for those bridges. Now, as some users know their setup works with the speedups enabled, a new parameter is introduced to the driver. Now, a user can specifically enable or disable these features, while the default is what we have today: detect the bridge and decide accordingly. Fixes Bugzilla entry 15014. Simplify and unify the printouts, fix a whitespace issue while we are here. Signed-off-by:
-
Márton Németh authored
The match_table field of the struct of_device_id is constant in <linux/of_platform.h> so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // </smpl> Signed-off-by:
Márton Németh <nm127@freemail.hu> Cc: Julia Lawall <julia@diku.dk> Cc: cocci@diku.dk Acked-by:
-
H Hartley Sweeten authored
The struct file 'private_data' member is a void *, the cast is not needed. Signed-off-by:
H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Harald Welte <laforge@gnumonks.org> Signed-off-by:
-
Michal Marek authored
With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' This is because select PCCARD_NONSTATIC if PCMCIA sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' to remove the upper limit. [linux@dominikbrodowski.net: propagate change to PCMICA_M8XX] Reported-by:
Randy Dunlap <rdunlap@xenotime.net> Signed-off-by:
Michal Marek <mmarek@suse.cz> Acked-by:
-
Dominik Brodowski authored
If only CardBus cards are used, but not PCMCIA cards, we do not need the extensive resource management functions provided for by rsrc_nonstatic.c (~240K). Tested-by:
-
Dominik Brodowski authored
Move rsrc_mgr indirections only used by the pcmcia module to the pcmcia module. Tested-by:
-
Dominik Brodowski authored
As PCMCIA is the only real user of CIS access functions, include cistpl.c in the PCMCIA module, not in the PCMCIA & CardBus core module. Tested-by:
-
Dominik Brodowski authored
The socket driver m8xx_pcmcia.c uses a static memory assignment, but io_offset is set to 0. Therefore, it seems proper to use the iodyn resource manager for this driver, as was previously the case (before commit 80128ff7). CC: Vitaly Bordug <vitb@kernel.crashing.org> CC: Arnd Bergmann <arnd@arndb.de> CC: Olof Johansson <olof@lixom.net> Signed-off-by:
-
- 24 Jan, 2010 4 commits
-
-
Dominik Brodowski authored
m32r_cfc sets the socket capabilities to SS_CAP_STATIC_MAP and also sets io_offset != 0. This means no calls to &pccard_nonstatic_ops went through. Therfore, replace it with &pccard_static_ops which is exactly for this case. CC: Mamoru Sakugawa <sakugawa@linux-m32r.org> CC: Hirokazu Takata <takata@linux-m32r.org> Tested-by:
-
Dominik Brodowski authored
Remove rsrc_mgr indirections only used by pcmcia_resource.c Tested-by:
-
Dominik Brodowski authored
As release_resoure_db() used to be called only from one place, and it's a two-line function, remove it. Tested-by:
-
Dominik Brodowski authored
Do not lock the socket driver module on card insert, as the PCMCIA core can handle a socket module removal, at least if we add a call to socket_remove() on pccardd()'s shutdown. Signed-off-by:
-
- 17 Jan, 2010 2 commits
-
-
Dominik Brodowski authored
Do not lock the socket driver module in pcmcia_get_socket(), as the PCMCIA core can handle a socket module removal: In pcmcia_unregister_socket(), we explicitely wait for the last put_device() to succeed. Tested-by:
-
Dominik Brodowski authored
Add a lot of documentation to the rsrc_nonstatic io memory probe functions. Also, add a first memory probe call -- just checking whether request_resource() succeeds -- upon adding of resources. Tested-by:
-
