linux-toradex.git/include/pcmcia, branch v2.6.34

pcmcia: pcmcia_dev_present bugfix

2010-04-21T06:09:17+00:00

pcmcia_dev_present is in and by itself buggy. Add a note specifying
why it is broken, and replace the broken locking -- taking a mutex
is a bad idea in IRQ context, from which this function is rarely
called -- by an atomic_t.

Signed-off-by: Dominik Brodowski

pcmcia: use dev_pm_ops for class pcmcia_socket_class

2010-03-24T10:00:11+00:00

Instead of requiring PCMCIA socket drivers to call various functions
during their (bus) resume and suspend functions, register an own
dev_pm_ops for this class. This fixes several suspend/resume bugs
seen on db1xxx-ss, and probably on some other socket drivers, too.

With regard to the asymmetry with only _noirq suspend, but split up
resume, please see bug 14334 and commit 9905d1b411946fb3 .

Signed-off-by: Dominik Brodowski

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-03-01T03:23:06+00:00

Conflicts:
	drivers/firmware/iscsi_ibft.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2010-02-26T07:26:21+00:00

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/rt2x00/rt2800pci.c

Introduce PCMCIA_DEVICE_PROD_ID3

2010-02-19T20:51:23+00:00

...and use it in hostap_cs and orinoco_cs.

Another PCMCIA device with Intersil Prism chipset has been reported:

Socket 0:
  product info: "Gigabyte", "GN-WLM01_P25L_ADAPTER", "ISL37300P", "Eval-RevA"
  manfid: 0x02e0, 0x1011
  function: 6 (network)

As it's the case with some other Prism based devices, the third ID
string contains a design name that should be sufficient to identify the
card as having Intersil Prism chipset and thus compatible with both
orinoco_cs and hostap_cs.

Introduce PCMCIA_DEVICE_PROD_ID3 that matches the third ID string only.

Use it in orinoco_cs and hostap_cs to match cards with the third ID
string indicating Prism chipset.  Remove corresponding entries that use
PCMCIA_DEVICE_PROD_ID123.

Reported-by: Ozzy 
Signed-off-by: Pavel Roskin 
Signed-off-by: John W. Linville

pcmcia: use state machine for extended requery

2010-02-17T16:48:27+00:00

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: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: use pccardd to handle eject, insert, suspend and resume requests

2010-02-17T16:48:25+00:00

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 
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: use mutex for dynid lock

2010-02-17T16:48:23+00:00

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 
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: simplify locking

2010-02-17T16:48:20+00:00

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: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: add locking to set_mem_map()

2010-02-17T16:48:13+00:00

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 
Signed-off-by: Dominik Brodowski