Commit 8d37a371 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: validate late-added resources
  pcmcia: allow for extension of resource interval
  pcmcia: remove useless msleep in ds.c
  pcmcia: use read_cis_mem return value
  pcmcia: handle error in serial_cs config calls
  pcmcia: add locking to pcmcia_{read,write}_cis_mem
  pcmcia: avoid prod_id memleak
  pcmcia: avoid sysfs-related lockup for cardbus
  pcmcia: use state machine for extended requery
  pcmcia: delay re-scanning and re-querying of PCMCIA bus
  pcmcia: use pccardd to handle eject, insert, suspend and resume requests
  pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
  pcmcia: use mutex for dynid lock
  pcmcia: assert locking to struct pcmcia_device
  pcmcia: add locking documentation
  pcmcia: simplify locking
  pcmcia: add locking to struct pcmcia_socket->pcmcia_state()
  pcmcia: protect s->device_count
  pcmcia: properly lock skt->irq, skt->irq_mask
  pcmcia: lock ops->set_socket
  ...
parents ef1a8de8 7b4884ca
This file explains the locking and exclusion scheme used in the PCCARD
and PCMCIA subsystems.
A) Overview, Locking Hierarchy:
===============================
pcmcia_socket_list_rwsem - protects only the list of sockets
- skt_mutex - serializes card insert / ejection
- ops_mutex - serializes socket operation
B) Exclusion
============
The following functions and callbacks to struct pcmcia_socket must
be called with "skt_mutex" held:
socket_detect_change()
send_event()
socket_reset()
socket_shutdown()
socket_setup()
socket_remove()
socket_insert()
socket_early_resume()
socket_late_resume()
socket_resume()
socket_suspend()
struct pcmcia_callback *callback
The following functions and callbacks to struct pcmcia_socket must
be called with "ops_mutex" held:
socket_reset()
socket_setup()
struct pccard_operations *ops
struct pccard_resource_ops *resource_ops;
Note that send_event() and struct pcmcia_callback *callback must not be
called with "ops_mutex" held.
C) Protection
=============
1. Global Data:
---------------
struct list_head pcmcia_socket_list;
protected by pcmcia_socket_list_rwsem;
2. Per-Socket Data:
-------------------
The resource_ops and their data are protected by ops_mutex.
The "main" struct pcmcia_socket is protected as follows (read-only fields
or single-use fields not mentioned):
- by pcmcia_socket_list_rwsem:
struct list_head socket_list;
- by thread_lock:
unsigned int thread_events;
- by skt_mutex:
u_int suspended_state;
void (*tune_bridge);
struct pcmcia_callback *callback;
int resume_status;
- by ops_mutex:
socket_state_t socket;
u_int state;
u_short lock_count;
pccard_mem_map cis_mem;
void __iomem *cis_virt;
struct { } irq;
io_window_t io[];
pccard_mem_map win[];
struct list_head cis_cache;
size_t fake_cis_len;
u8 *fake_cis;
u_int irq_mask;
void (*zoom_video);
int (*power_hook);
u8 resource...;
struct list_head devices_list;
u8 device_count;
struct pcmcia_state;
3. Per PCMCIA-device Data:
--------------------------
The "main" struct pcmcia_devie is protected as follows (read-only fields
or single-use fields not mentioned):
- by pcmcia_socket->ops_mutex:
struct list_head socket_device_list;
struct config_t *function_config;
u16 _irq:1;
u16 _io:1;
u16 _win:4;
u16 _locked:1;
u16 allow_func_id_match:1;
u16 suspended:1;
u16 _removed:1;
- by the PCMCIA driver:
io_req_t io;
irq_req_t irq;
config_req_t conf;
window_handle_t win;
...@@ -1047,7 +1047,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count, ...@@ -1047,7 +1047,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
static ssize_t cmm_write(struct file *filp, const char __user *buf, static ssize_t cmm_write(struct file *filp, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct cm4000_dev *dev = (struct cm4000_dev *) filp->private_data; struct cm4000_dev *dev = filp->private_data;
unsigned int iobase = dev->p_dev->io.BasePort1; unsigned int iobase = dev->p_dev->io.BasePort1;
unsigned short s; unsigned short s;
unsigned char tmp; unsigned char tmp;
......
...@@ -453,8 +453,7 @@ static int mhz_mfc_config(struct pcmcia_device *link) ...@@ -453,8 +453,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status = CCSR_AUDIO_ENA; link->conf.Status = CCSR_AUDIO_ENA;
link->irq.Attributes = link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
IRQ_TYPE_DYNAMIC_SHARING;
link->io.IOAddrLines = 16; link->io.IOAddrLines = 16;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
link->io.NumPorts2 = 8; link->io.NumPorts2 = 8;
...@@ -652,8 +651,7 @@ static int osi_config(struct pcmcia_device *link) ...@@ -652,8 +651,7 @@ static int osi_config(struct pcmcia_device *link)
link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status = CCSR_AUDIO_ENA; link->conf.Status = CCSR_AUDIO_ENA;
link->irq.Attributes = link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
link->io.NumPorts1 = 64; link->io.NumPorts1 = 64;
link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
link->io.NumPorts2 = 8; link->io.NumPorts2 = 8;
......
...@@ -84,7 +84,7 @@ config YENTA ...@@ -84,7 +84,7 @@ config YENTA
tristate "CardBus yenta-compatible bridge support" tristate "CardBus yenta-compatible bridge support"
depends on PCI depends on PCI
select CARDBUS if !EMBEDDED select CARDBUS if !EMBEDDED
select PCCARD_NONSTATIC select PCCARD_NONSTATIC if PCMCIA != n
---help--- ---help---
This option enables support for CardBus host bridges. Virtually This option enables support for CardBus host bridges. Virtually
all modern PCMCIA bridges are CardBus compatible. A "bridge" is all modern PCMCIA bridges are CardBus compatible. A "bridge" is
...@@ -161,9 +161,8 @@ config TCIC ...@@ -161,9 +161,8 @@ config TCIC
config PCMCIA_M8XX config PCMCIA_M8XX
tristate "MPC8xx PCMCIA support" tristate "MPC8xx PCMCIA support"
depends on PCMCIA && PPC && 8xx depends on PCCARD && PPC && 8xx
select PCCARD_IODYN select PCCARD_IODYN if PCMCIA != n
select PCCARD_NONSTATIC
help help
Say Y here to include support for PowerPC 8xx series PCMCIA Say Y here to include support for PowerPC 8xx series PCMCIA
controller. controller.
...@@ -238,14 +237,12 @@ config PCMCIA_PROBE ...@@ -238,14 +237,12 @@ config PCMCIA_PROBE
config M32R_PCC config M32R_PCC
bool "M32R PCMCIA I/F" bool "M32R PCMCIA I/F"
depends on M32R && CHIP_M32700 && PCMCIA depends on M32R && CHIP_M32700 && PCMCIA
select PCCARD_NONSTATIC
help help
Say Y here to use the M32R PCMCIA controller. Say Y here to use the M32R PCMCIA controller.
config M32R_CFC config M32R_CFC
bool "M32R CF I/F Controller" bool "M32R CF I/F Controller"
depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT) depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
select PCCARD_NONSTATIC
help help
Say Y here to use the M32R CompactFlash controller. Say Y here to use the M32R CompactFlash controller.
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
# Makefile for the kernel pcmcia subsystem (c/o David Hinds) # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
# #
pcmcia_core-y += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o pcmcia_core-y += cs.o rsrc_mgr.o socket_sysfs.o
pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o
obj-$(CONFIG_PCCARD) += pcmcia_core.o obj-$(CONFIG_PCCARD) += pcmcia_core.o
pcmcia-y += ds.o pcmcia_resource.o pcmcia-y += ds.o pcmcia_resource.o cistpl.o
pcmcia-$(CONFIG_PCMCIA_IOCTL) += pcmcia_ioctl.o pcmcia-$(CONFIG_PCMCIA_IOCTL) += pcmcia_ioctl.o
obj-$(CONFIG_PCMCIA) += pcmcia.o obj-$(CONFIG_PCMCIA) += pcmcia.o
......
...@@ -52,8 +52,6 @@ struct at91_cf_socket { ...@@ -52,8 +52,6 @@ struct at91_cf_socket {
unsigned long phys_baseaddr; unsigned long phys_baseaddr;
}; };
#define SZ_2K (2 * SZ_1K)
static inline int at91_cf_present(struct at91_cf_socket *cf) static inline int at91_cf_present(struct at91_cf_socket *cf)
{ {
return !gpio_get_value(cf->board->det_pin); return !gpio_get_value(cf->board->det_pin);
......
...@@ -205,7 +205,7 @@ static int __devinit bfin_cf_probe(struct platform_device *pdev) ...@@ -205,7 +205,7 @@ static int __devinit bfin_cf_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "Blackfin CompactFlash/PCMCIA Socket Driver\n"); dev_info(&pdev->dev, "Blackfin CompactFlash/PCMCIA Socket Driver\n");
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (!irq) if (irq <= 0)
return -EINVAL; return -EINVAL;
cd_pfx = platform_get_irq(pdev, 1); /*Card Detect GPIO PIN */ cd_pfx = platform_get_irq(pdev, 1); /*Card Detect GPIO PIN */
......
...@@ -20,170 +20,12 @@ ...@@ -20,170 +20,12 @@
*/ */
#include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/module.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/io.h>
#include <asm/irq.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h> #include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"
/*====================================================================*/
/* Offsets in the Expansion ROM Image Header */
#define ROM_SIGNATURE 0x0000 /* 2 bytes */
#define ROM_DATA_PTR 0x0018 /* 2 bytes */
/* Offsets in the CardBus PC Card Data Structure */
#define PCDATA_SIGNATURE 0x0000 /* 4 bytes */
#define PCDATA_VPD_PTR 0x0008 /* 2 bytes */
#define PCDATA_LENGTH 0x000a /* 2 bytes */
#define PCDATA_REVISION 0x000c
#define PCDATA_IMAGE_SZ 0x0010 /* 2 bytes */
#define PCDATA_ROM_LEVEL 0x0012 /* 2 bytes */
#define PCDATA_CODE_TYPE 0x0014
#define PCDATA_INDICATOR 0x0015
/*=====================================================================
Expansion ROM's have a special layout, and pointers specify an
image number and an offset within that image. xlate_rom_addr()
converts an image/offset address to an absolute offset from the
ROM's base address.
=====================================================================*/
static u_int xlate_rom_addr(void __iomem *b, u_int addr)
{
u_int img = 0, ofs = 0, sz;
u_short data;
while ((readb(b) == 0x55) && (readb(b + 1) == 0xaa)) {
if (img == (addr >> 28))
return (addr & 0x0fffffff) + ofs;
data = readb(b + ROM_DATA_PTR) + (readb(b + ROM_DATA_PTR + 1) << 8);
sz = 512 * (readb(b + data + PCDATA_IMAGE_SZ) +
(readb(b + data + PCDATA_IMAGE_SZ + 1) << 8));
if ((sz == 0) || (readb(b + data + PCDATA_INDICATOR) & 0x80))
break;
b += sz;
ofs += sz;
img++;
}
return 0;
}
/*=====================================================================
These are similar to setup_cis_mem and release_cis_mem for 16-bit
cards. The "result" that is used externally is the cb_cis_virt
pointer in the struct pcmcia_socket structure.
=====================================================================*/
static void cb_release_cis_mem(struct pcmcia_socket *s)
{
if (s->cb_cis_virt) {
dev_dbg(&s->dev, "cb_release_cis_mem()\n");
iounmap(s->cb_cis_virt);
s->cb_cis_virt = NULL;
s->cb_cis_res = NULL;
}
}
static int cb_setup_cis_mem(struct pcmcia_socket *s, struct resource *res)
{
unsigned int start, size;
if (res == s->cb_cis_res)
return 0;
if (s->cb_cis_res)
cb_release_cis_mem(s);
start = res->start;
size = res->end - start + 1;
s->cb_cis_virt = ioremap(start, size);
if (!s->cb_cis_virt)
return -1;
s->cb_cis_res = res;
return 0;
}
/*=====================================================================
This is used by the CIS processing code to read CIS information
from a CardBus device.
=====================================================================*/
int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len,
void *ptr)
{
struct pci_dev *dev;
struct resource *res;
dev_dbg(&s->dev, "read_cb_mem(%d, %#x, %u)\n", space, addr, len);
dev = pci_get_slot(s->cb_dev->subordinate, 0);
if (!dev)
goto fail;
/* Config space? */
if (space == 0) {
if (addr + len > 0x100)
goto failput;
for (; len; addr++, ptr++, len--)
pci_read_config_byte(dev, addr, ptr);
return 0;
}
res = dev->resource + space - 1;
pci_dev_put(dev);
if (!res->flags)
goto fail;
if (cb_setup_cis_mem(s, res) != 0)
goto fail;
if (space == 7) {
addr = xlate_rom_addr(s->cb_cis_virt, addr);
if (addr == 0)
goto fail;
}
if (addr + len > res->end - res->start)
goto fail;
memcpy_fromio(ptr, s->cb_cis_virt + addr, len);
return 0;
failput:
pci_dev_put(dev);
fail:
memset(ptr, 0xff, len);
return -1;
}
/*=====================================================================
cb_alloc() and cb_free() allocate and free the kernel data
structures for a Cardbus device, and handle the lowest level PCI
device setup issues.
=====================================================================*/
static void cardbus_config_irq_and_cls(struct pci_bus *bus, int irq) static void cardbus_config_irq_and_cls(struct pci_bus *bus, int irq)
{ {
...@@ -215,6 +57,13 @@ static void cardbus_config_irq_and_cls(struct pci_bus *bus, int irq) ...@@ -215,6 +57,13 @@ static void cardbus_config_irq_and_cls(struct pci_bus *bus, int irq)
} }
} }
/**
* cb_alloc() - add CardBus device
* @s: the pcmcia_socket where the CardBus device is located
*
* cb_alloc() allocates the kernel data structures for a Cardbus device
* and handles the lowest level PCI device setup issues.
*/
int __ref cb_alloc(struct pcmcia_socket *s) int __ref cb_alloc(struct pcmcia_socket *s)
{ {
struct pci_bus *bus = s->cb_dev->subordinate; struct pci_bus *bus = s->cb_dev->subordinate;
...@@ -249,12 +98,16 @@ int __ref cb_alloc(struct pcmcia_socket *s) ...@@ -249,12 +98,16 @@ int __ref cb_alloc(struct pcmcia_socket *s)
return 0; return 0;
} }
/**
* cb_free() - remove CardBus device
* @s: the pcmcia_socket where the CardBus device was located
*
* cb_free() handles the lowest level PCI device cleanup.
*/
void cb_free(struct pcmcia_socket *s) void cb_free(struct pcmcia_socket *s)
{ {
struct pci_dev *bridge = s->cb_dev; struct pci_dev *bridge = s->cb_dev;
cb_release_cis_mem(s);
if (bridge) if (bridge)
pci_remove_behind_bridge(bridge); pci_remove_behind_bridge(bridge);
} }
This diff is collapsed.
This diff is collapsed.
...@@ -87,37 +87,11 @@ struct pccard_resource_ops { ...@@ -87,37 +87,11 @@ struct pccard_resource_ops {
#define SOCKET_CARDBUS 0x8000 #define SOCKET_CARDBUS 0x8000
#define SOCKET_CARDBUS_CONFIG 0x10000 #define SOCKET_CARDBUS_CONFIG 0x10000
static inline int cs_socket_get(struct pcmcia_socket *skt)
{
int ret;
WARN_ON(skt->state & SOCKET_INUSE);
ret = try_module_get(skt->owner);
if (ret)
skt->state |= SOCKET_INUSE;
return ret;
}
static inline void cs_socket_put(struct pcmcia_socket *skt)
{
if (skt->state & SOCKET_INUSE) {
skt->state &= ~SOCKET_INUSE;
module_put(skt->owner);
}
}
/* /*
* Stuff internal to module "pcmcia_core": * Stuff internal to module "pcmcia_core":
*/ */
/* cistpl.c */
int verify_cis_cache(struct pcmcia_socket *s);
/* rsrc_mgr.c */
void release_resource_db(struct pcmcia_socket *s);
/* socket_sysfs.c */ /* socket_sysfs.c */
extern int pccard_sysfs_add_socket(struct device *dev); extern int pccard_sysfs_add_socket(struct device *dev);
extern void pccard_sysfs_remove_socket(struct device *dev); extern void pccard_sysfs_remove_socket(struct device *dev);
...@@ -125,8 +99,6 @@ extern void pccard_sysfs_remove_socket(struct device *dev); ...@@ -125,8 +99,6 @@ extern void pccard_sysfs_remove_socket(struct device *dev);
/* cardbus.c */ /* cardbus.c */
int cb_alloc(struct pcmcia_socket *s); int cb_alloc(struct pcmcia_socket *s);
void cb_free(struct pcmcia_socket *s); void cb_free(struct pcmcia_socket *s);
int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len,
void *ptr);
...@@ -138,7 +110,8 @@ struct pcmcia_callback{ ...@@ -138,7 +110,8 @@ struct pcmcia_callback{
struct module *owner; struct module *owner;
int (*event) (struct pcmcia_socket *s, int (*event) (struct pcmcia_socket *s,
event_t event, int priority); event_t event, int priority);
void (*requery) (struct pcmcia_socket *s, int new_cis); void (*requery) (struct pcmcia_socket *s);
int (*validate) (struct pcmcia_socket *s, unsigned int *i);
int (*suspend) (struct pcmcia_socket *s); int (*suspend) (struct pcmcia_socket *s);
int (*resume) (struct pcmcia_socket *s); int (*resume) (struct pcmcia_socket *s);
}; };
...@@ -151,16 +124,35 @@ extern struct class pcmcia_socket_class; ...@@ -151,16 +124,35 @@ extern struct class pcmcia_socket_class;
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);
int pcmcia_suspend_card(struct pcmcia_socket *skt); void pcmcia_parse_uevents(struct pcmcia_socket *socket, unsigned int events);
int pcmcia_resume_card(struct pcmcia_socket *skt); #define PCMCIA_UEVENT_EJECT 0x0001
#define PCMCIA_UEVENT_INSERT 0x0002
int pcmcia_eject_card(struct pcmcia_socket *skt); #define PCMCIA_UEVENT_SUSPEND 0x0004
int pcmcia_insert_card(struct pcmcia_socket *skt); #define PCMCIA_UEVENT_RESUME 0x0008
#define PCMCIA_UEVENT_REQUERY 0x0010
struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt); struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt);
void pcmcia_put_socket(struct pcmcia_socket *skt); void pcmcia_put_socket(struct pcmcia_socket *skt);
/*
* Stuff internal to module "pcmcia".
*/
/* ds.c */
extern struct bus_type pcmcia_bus_type;
/* pcmcia_resource.c */
extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
extern int pcmcia_validate_mem(struct pcmcia_socket *s);
extern struct resource *pcmcia_find_mem_region(u_long base,
u_long num,
u_long align,
int low,
struct pcmcia_socket *s);
/* cistpl.c */ /* cistpl.c */
extern struct bin_attribute pccard_cis_attr;
int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr,
u_int addr, u_int len, void *ptr); u_int addr, u_int len, void *ptr);
void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr,
...@@ -172,8 +164,8 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, ...@@ -172,8 +164,8 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function,
int pcmcia_replace_cis(struct pcmcia_socket *s, int pcmcia_replace_cis(struct pcmcia_socket *s,
const u8 *data, const size_t len); const u8 *data, const size_t len);
int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count); int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count);
int verify_cis_cache(struct pcmcia_socket *s);
/* loop over CIS entries */
int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function, int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function,
cisdata_t code, cisparse_t *parse, void *priv_data, cisdata_t code, cisparse_t *parse, void *priv_data,
int (*loop_tuple) (tuple_t *tuple, int (*loop_tuple) (tuple_t *tuple,
...@@ -189,35 +181,8 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, ...@@ -189,35 +181,8 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
/* rsrc_mgr.c */
int pcmcia_validate_mem(struct pcmcia_socket *s);
struct resource *pcmcia_find_io_region(unsigned long base,
int num,
unsigned long align,
struct pcmcia_socket *s);
int pcmcia_adjust_io_region(struct resource *res,
unsigned long r_start,
unsigned long r_end,
struct pcmcia_socket *s);
struct resource *pcmcia_find_mem_region(u_long base,
u_long num,
u_long align,
int low,
struct pcmcia_socket *s);
/*
* Stuff internal to module "pcmcia".
*/
/* ds.c */
extern struct bus_type pcmcia_bus_type;
/* pcmcia_resource.c */
extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
#ifdef CONFIG_PCMCIA_IOCTL #ifdef CONFIG_PCMCIA_IOCTL
/* ds.c */ /* ds.c */
extern spinlock_t pcmcia_dev_list_lock;
extern struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev); extern struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev);
extern void pcmcia_put_dev(struct pcmcia_device *p_dev); extern void pcmcia_put_dev(struct pcmcia_device *p_dev);
......
This diff is collapsed.
...@@ -347,7 +347,7 @@ static int __devexit electra_cf_remove(struct of_device *ofdev) ...@@ -347,7 +347,7 @@ static int __devexit electra_cf_remove(struct of_device *ofdev)
return 0; return 0;
} }
static struct of_device_id electra_cf_match[] = { static const struct of_device_id electra_cf_match[] = {
{ {
.compatible = "electra-cf", .compatible = "electra-cf",
}, },
......
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
#define I365_VPP2_5V 0x04 /* Vpp2 = 5.0v */ #define I365_VPP2_5V 0x04 /* Vpp2 = 5.0v */
#define I365_VPP2_12V 0x08 /* Vpp2 = 12.0v */ #define I365_VPP2_12V 0x08 /* Vpp2 = 12.0v */
#define I365_VPP1_MASK 0x03 /* Mask for turning off Vpp1 */ #define I365_VPP1_MASK 0x03 /* Mask for turning off Vpp1 */
#define I365_VPP1_5V 0x01 /* Vpp2 = 5.0v */ #define I365_VPP1_5V 0x01 /* Vpp1 = 5.0v */
#define I365_VPP1_12V 0x02 /* Vpp2 = 12.0v */ #define I365_VPP1_12V 0x02 /* Vpp1 = 12.0v */
/* Flags for I365_INTCTL */ /* Flags for I365_INTCTL */
#define I365_RING_ENA 0x80 #define I365_RING_ENA 0x80
......
...@@ -764,7 +764,7 @@ static int __init init_m32r_pcc(void) ...@@ -764,7 +764,7 @@ static int __init init_m32r_pcc(void)
for (i = 0 ; i < pcc_sockets ; i++) { for (i = 0 ; i < pcc_sockets ; i++) {
socket[i].socket.dev.parent = &pcc_device.dev; socket[i].socket.dev.parent = &pcc_device.dev;
socket[i].socket.ops = &pcc_operations; socket[i].socket.ops = &pcc_operations;
socket[i].socket.resource_ops = &pccard_nonstatic_ops; socket[i].socket.resource_ops = &pccard_static_ops;
socket[i].socket.owner = THIS_MODULE; socket[i].socket.owner = THIS_MODULE;
socket[i].number = i; socket[i].number = i;
ret = pcmcia_register_socket(&socket[i].socket); ret = pcmcia_register_socket(&socket[i].socket);
......
...@@ -1233,7 +1233,7 @@ static int __init m8xx_probe(struct of_device *ofdev, ...@@ -1233,7 +1233,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
socket[i].socket.io_offset = 0; socket[i].socket.io_offset = 0;
socket[i].socket.pci_irq = pcmcia_schlvl; socket[i].socket.pci_irq = pcmcia_schlvl;
socket[i].socket.ops = &m8xx_services; socket[i].socket.ops = &m8xx_services;
socket[i].socket.resource_ops = &pccard_nonstatic_ops; socket[i].socket.resource_ops = &pccard_iodyn_ops;
socket[i].socket.cb_dev = NULL; socket[i].socket.cb_dev = NULL;
socket[i].socket.dev.parent = &ofdev->dev; socket[i].socket.dev.parent = &ofdev->dev;
socket[i].pcmcia = pcmcia; socket[i].pcmcia = pcmcia;
...@@ -1303,7 +1303,7 @@ static int m8xx_resume(struct platform_device *pdev) ...@@ -1303,7 +1303,7 @@ static int m8xx_resume(struct platform_device *pdev)
#define m8xx_resume NULL #define m8xx_resume NULL
#endif #endif
static struct of_device_id m8xx_pcmcia_match[] = { static const struct of_device_id m8xx_pcmcia_match[] = {
{ {
.type = "pcmcia", .type = "pcmcia",
.compatible = "fsl,pq-pcmcia", .compatible = "fsl,pq-pcmcia",
......
...@@ -116,13 +116,12 @@ static int o2micro_override(struct yenta_socket *socket) ...@@ -116,13 +116,12 @@ static int o2micro_override(struct yenta_socket *socket)
* from Eric Still, 02Micro. * from Eric Still, 02Micro.
*/ */
u8 a, b; u8 a, b;
bool use_speedup;
if (PCI_FUNC(socket->dev->devfn) == 0) { if (PCI_FUNC(socket->dev->devfn) == 0) {
a = config_readb(socket, O2_RESERVED1); a = config_readb(socket, O2_RESERVED1);
b = config_readb(socket, O2_RESERVED2); b = config_readb(socket, O2_RESERVED2);
dev_dbg(&socket->dev->dev, "O2: 0x94/0xD4: %02x/%02x\n", a, b);
dev_printk(KERN_INFO, &socket->dev->dev,
"O2: res at 0x94/0xD4: %02x/%02x\n", a, b);
switch (socket->dev->device) { switch (socket->dev->device) {
/* /*
...@@ -135,23 +134,37 @@ static int o2micro_override(struct yenta_socket *socket) ...@@ -135,23 +134,37 @@ static int o2micro_override(struct yenta_socket *socket)
case PCI_DEVICE_ID_O2_6812: case PCI_DEVICE_ID_O2_6812:
case PCI_DEVICE_ID_O2_6832: case PCI_DEVICE_ID_O2_6832:
case PCI_DEVICE_ID_O2_6836: case PCI_DEVICE_ID_O2_6836:
case PCI_DEVICE_ID_O2_6933: case PCI_DEVICE_ID_O2_6933:
dev_printk(KERN_INFO, &socket->dev->dev, use_speedup = false;
"Yenta O2: old bridge, disabling read "
"prefetch/write burst\n");
config_writeb(socket, O2_RESERVED1,
a & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST));
config_writeb(socket, O2_RESERVED2,
b & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST));
break; break;
default: default:
dev_printk(KERN_INFO , &socket->dev->dev, use_speedup = true;
"O2: enabling read prefetch/write burst\n"); break;
}
/* the user may override our decision */
if (strcasecmp(o2_speedup, "on") == 0)
use_speedup = true;
else if (strcasecmp(o2_speedup, "off") == 0)
use_speedup = false;
else if (strcasecmp(o2_speedup, "default") != 0)
dev_warn(&socket->dev->dev,
"O2: Unknown parameter, using 'default'");
if (use_speedup) {
dev_info(&socket->dev->dev,
"O2: enabling read prefetch/write burst\n");
config_writeb(socket, O2_RESERVED1,
a | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST);
config_writeb(socket, O2_RESERVED2,
b | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST);
} else {
dev_info(&socket->dev->dev,
"O2: disabling read prefetch/write burst\n");
config_writeb(socket, O2_RESERVED1, config_writeb(socket, O2_RESERVED1,
a | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST); a & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST));
config_writeb(socket, O2_RESERVED2, config_writeb(socket, O2_RESERVED2,
b | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST); b & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST));
} }
} }
......
...@@ -71,8 +71,6 @@ struct omap_cf_socket { ...@@ -71,8 +71,6 @@ struct omap_cf_socket {
#define POLL_INTERVAL (2 * HZ) #define POLL_INTERVAL (2 * HZ)
#define SZ_2K (2 * SZ_1K)
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
static int omap_cf_ss_init(struct pcmcia_socket *s) static int omap_cf_ss_init(struct pcmcia_socket *s)
......
...@@ -62,16 +62,15 @@ static struct pcmcia_device *get_pcmcia_device(struct pcmcia_socket *s, ...@@ -62,16 +62,15 @@ static struct pcmcia_device *get_pcmcia_device(struct pcmcia_socket *s,
unsigned int function) unsigned int function)
{ {
struct pcmcia_device *p_dev = NULL; struct pcmcia_device *p_dev = NULL;
unsigned long flags;
spin_lock_irqsave(&pcmcia_dev_list_lock, flags); mutex_lock(&s->ops_mutex);
list_for_each_entry(p_dev, &s->devices_list, socket_device_list) { list_for_each_entry(p_dev, &s->devices_list, socket_device_list) {
if (p_dev->func == function) { if (p_dev->func == function) {
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
return pcmcia_get_dev(p_dev); return pcmcia_get_dev(p_dev);
} }
} }
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
return NULL; return NULL;
} }
...@@ -169,7 +168,6 @@ static int pcmcia_adjust_resource_info(adjust_t *adj) ...@@ -169,7 +168,6 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
{ {
struct pcmcia_socket *s; struct pcmcia_socket *s;
int ret = -ENOSYS; int ret = -ENOSYS;
unsigned long flags;
down_read(&pcmcia_socket_list_rwsem); down_read(&pcmcia_socket_list_rwsem);
list_for_each_entry(s, &pcmcia_socket_list, socket_list) { list_for_each_entry(s, &pcmcia_socket_list, socket_list) {
...@@ -182,14 +180,13 @@ static int pcmcia_adjust_resource_info(adjust_t *adj) ...@@ -182,14 +180,13 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
/* you can't use the old interface if the new /* you can't use the old interface if the new
* one was used before */ * one was used before */
spin_lock_irqsave(&s->lock, flags); mutex_lock(&s->ops_mutex);
if ((s->resource_setup_new) && if ((s->resource_setup_new) &&
!(s->resource_setup_old)) { !(s->resource_setup_old)) {
spin_unlock_irqrestore(&s->lock, flags); mutex_unlock(&s->ops_mutex);
continue; continue;
} else if (!(s->resource_setup_old)) } else if (!(s->resource_setup_old))
s->resource_setup_old = 1; s->resource_setup_old = 1;
spin_unlock_irqrestore(&s->lock, flags);
switch (adj->Resource) { switch (adj->Resource) {
case RES_MEMORY_RANGE: case RES_MEMORY_RANGE:
...@@ -208,10 +205,9 @@ static int pcmcia_adjust_resource_info(adjust_t *adj) ...@@ -208,10 +205,9 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
* last call to adjust_resource_info, we * last call to adjust_resource_info, we
* always need to assume this is the latest * always need to assume this is the latest
* one... */ * one... */
spin_lock_irqsave(&s->lock, flags);
s->resource_setup_done = 1; s->resource_setup_done = 1;
spin_unlock_irqrestore(&s->lock, flags);
} }
mutex_unlock(&s->ops_mutex);
} }
} }
up_read(&pcmcia_socket_list_rwsem); up_read(&pcmcia_socket_list_rwsem);
...@@ -470,7 +466,6 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info) ...@@ -470,7 +466,6 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info)
struct pcmcia_driver *p_drv; struct pcmcia_driver *p_drv;
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
int ret = 0; int ret = 0;
unsigned long flags;
s = pcmcia_get_socket(s); s = pcmcia_get_socket(s);
if (!s) if (!s)
...@@ -490,7 +485,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info) ...@@ -490,7 +485,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info)
goto err_put_driver; goto err_put_driver;
} }
spin_lock_irqsave(&pcmcia_dev_list_lock, flags); mutex_lock(&s->ops_mutex);
list_for_each_entry(p_dev, &s->devices_list, socket_device_list) { list_for_each_entry(p_dev, &s->devices_list, socket_device_list) {
if (p_dev->func == bind_info->function) { if (p_dev->func == bind_info->function) {
if ((p_dev->dev.driver == &p_drv->drv)) { if ((p_dev->dev.driver == &p_drv->drv)) {
...@@ -499,7 +494,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info) ...@@ -499,7 +494,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info)
* registered, and it was registered * registered, and it was registered
* by userspace before, we need to * by userspace before, we need to
* return the "instance". */ * return the "instance". */
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
bind_info->instance = p_dev; bind_info->instance = p_dev;
ret = -EBUSY; ret = -EBUSY;
goto err_put_module; goto err_put_module;
...@@ -507,7 +502,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info) ...@@ -507,7 +502,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info)
/* the correct driver managed to bind /* the correct driver managed to bind
* itself magically to the correct * itself magically to the correct
* device. */ * device. */
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
p_dev->cardmgr = p_drv; p_dev->cardmgr = p_drv;
ret = 0; ret = 0;
goto err_put_module; goto err_put_module;
...@@ -516,12 +511,12 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info) ...@@ -516,12 +511,12 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info)
/* there's already a device available where /* there's already a device available where
* no device has been bound to yet. So we don't * no device has been bound to yet. So we don't
* need to register a device! */ * need to register a device! */
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
goto rescan; goto rescan;
} }
} }
} }
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
p_dev = pcmcia_device_add(s, bind_info->function); p_dev = pcmcia_device_add(s, bind_info->function);
if (!p_dev) { if (!p_dev) {
...@@ -578,7 +573,6 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int ...@@ -578,7 +573,6 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int
dev_node_t *node; dev_node_t *node;
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
struct pcmcia_driver *p_drv; struct pcmcia_driver *p_drv;
unsigned long flags;
int ret = 0; int ret = 0;
#ifdef CONFIG_CARDBUS #ifdef CONFIG_CARDBUS
...@@ -617,7 +611,7 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int ...@@ -617,7 +611,7 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int
} }
#endif #endif
spin_lock_irqsave(&pcmcia_dev_list_lock, flags); mutex_lock(&s->ops_mutex);
list_for_each_entry(p_dev, &s->devices_list, socket_device_list) { list_for_each_entry(p_dev, &s->devices_list, socket_device_list) {
if (p_dev->func == bind_info->function) { if (p_dev->func == bind_info->function) {
p_dev = pcmcia_get_dev(p_dev); p_dev = pcmcia_get_dev(p_dev);
...@@ -626,11 +620,11 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int ...@@ -626,11 +620,11 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int
goto found; goto found;
} }
} }
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
return -ENODEV; return -ENODEV;
found: found:
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags); mutex_unlock(&s->ops_mutex);
p_drv = to_pcmcia_drv(p_dev->dev.driver); p_drv = to_pcmcia_drv(p_dev->dev.driver);
if (p_drv && !p_dev->_locked) { if (p_drv && !p_dev->_locked) {
...@@ -931,16 +925,16 @@ static int ds_ioctl(struct inode *inode, struct file *file, ...@@ -931,16 +925,16 @@ static int ds_ioctl(struct inode *inode, struct file *file,
ret = pccard_validate_cis(s, &buf->cisinfo.Chains); ret = pccard_validate_cis(s, &buf->cisinfo.Chains);
break; break;
case DS_SUSPEND_CARD: case DS_SUSPEND_CARD:
ret = pcmcia_suspend_card(s); pcmcia_parse_uevents(s, PCMCIA_UEVENT_SUSPEND);
break; break;
case DS_RESUME_CARD: case DS_RESUME_CARD:
ret = pcmcia_resume_card(s); pcmcia_parse_uevents(s, PCMCIA_UEVENT_RESUME);
break; break;
case DS_EJECT_CARD: case DS_EJECT_CARD:
err = pcmcia_eject_card(s); pcmcia_parse_uevents(s, PCMCIA_UEVENT_EJECT);
break; break;
case DS_INSERT_CARD: case DS_INSERT_CARD:
err = pcmcia_insert_card(s); pcmcia_parse_uevents(s, PCMCIA_UEVENT_INSERT);
break; break;
case DS_ACCESS_CONFIGURATION_REGISTER: case DS_ACCESS_CONFIGURATION_REGISTER:
if ((buf->conf_reg.Action == CS_WRITE) && !capable(CAP_SYS_ADMIN)) { if ((buf->conf_reg.Action == CS_WRITE) && !capable(CAP_SYS_ADMIN)) {
......
This diff is collapsed.
...@@ -21,60 +21,12 @@ ...@@ -21,60 +21,12 @@
#include <pcmcia/cistpl.h> #include <pcmcia/cistpl.h>
#include "cs_internal.h" #include "cs_internal.h"
int pcmcia_validate_mem(struct pcmcia_socket *s)
{
if (s->resource_ops->validate_mem)
return s->resource_ops->validate_mem(s);
/* if there is no callback, we can assume that everything is OK */
return 0;
}
EXPORT_SYMBOL(pcmcia_validate_mem);
int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start,
unsigned long r_end, struct pcmcia_socket *s)
{
if (s->resource_ops->adjust_io_region)
return s->resource_ops->adjust_io_region(res, r_start, r_end, s);
return -ENOMEM;
}
EXPORT_SYMBOL(pcmcia_adjust_io_region);
struct resource *pcmcia_find_io_region(unsigned long base, int num,
unsigned long align, struct pcmcia_socket *s)
{
if (s->resource_ops->find_io)
return s->resource_ops->find_io(base, num, align, s);
return NULL;
}
EXPORT_SYMBOL(pcmcia_find_io_region);
struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align,
int low, struct pcmcia_socket *s)
{
if (s->resource_ops->find_mem)
return s->resource_ops->find_mem(base, num, align, low, s);
return NULL;
}
EXPORT_SYMBOL(pcmcia_find_mem_region);
void release_resource_db(struct pcmcia_socket *s)
{
if (s->resource_ops->exit)
s->resource_ops->exit(s);
}
static int static_init(struct pcmcia_socket *s) static int static_init(struct pcmcia_socket *s)
{ {
unsigned long flags;
/* the good thing about SS_CAP_STATIC_MAP sockets is /* the good thing about SS_CAP_STATIC_MAP sockets is
* that they don't need a resource database */ * that they don't need a resource database */
spin_lock_irqsave(&s->lock, flags);
s->resource_setup_done = 1; s->resource_setup_done = 1;
spin_unlock_irqrestore(&s->lock, flags);
return 0; return 0;
} }
......
This diff is collapsed.
...@@ -88,15 +88,14 @@ static DEVICE_ATTR(card_vcc, 0444, pccard_show_vcc, NULL); ...@@ -88,15 +88,14 @@ static DEVICE_ATTR(card_vcc, 0444, pccard_show_vcc, NULL);
static ssize_t pccard_store_insert(struct device *dev, struct device_attribute *attr, static ssize_t pccard_store_insert(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
ssize_t ret;
struct pcmcia_socket *s = to_socket(dev); struct pcmcia_socket *s = to_socket(dev);
if (!count) if (!count)
return -EINVAL; return -EINVAL;
ret = pcmcia_insert_card(s); pcmcia_parse_uevents(s, PCMCIA_UEVENT_INSERT);
return ret ? ret : count; return count;
} }
static DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert); static DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert);
...@@ -113,18 +112,22 @@ static ssize_t pccard_store_card_pm_state(struct device *dev, ...@@ -113,18 +112,22 @@ static ssize_t pccard_store_card_pm_state(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
ssize_t ret = -EINVAL;
struct pcmcia_socket *s = to_socket(dev); struct pcmcia_socket *s = to_socket(dev);
ssize_t ret = count;
if (!count) if (!count)
return -EINVAL; return -EINVAL;
if (!(s->state & SOCKET_SUSPEND) && !strncmp(buf, "off", 3)) if (!strncmp(buf, "off", 3))
ret = pcmcia_suspend_card(s); pcmcia_parse_uevents(s, PCMCIA_UEVENT_SUSPEND);
else if ((s->state & SOCKET_SUSPEND) && !strncmp(buf, "on", 2)) else {
ret = pcmcia_resume_card(s); if (!strncmp(buf, "on", 2))
pcmcia_parse_uevents(s, PCMCIA_UEVENT_RESUME);
else
ret = -EINVAL;
}
return ret ? -ENODEV : count; return ret;
} }
static DEVICE_ATTR(card_pm_state, 0644, pccard_show_card_pm_state, pccard_store_card_pm_state); static DEVICE_ATTR(card_pm_state, 0644, pccard_show_card_pm_state, pccard_store_card_pm_state);
...@@ -132,15 +135,14 @@ static ssize_t pccard_store_eject(struct device *dev, ...@@ -132,15 +135,14 @@ static ssize_t pccard_store_eject(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
ssize_t ret;
struct pcmcia_socket *s = to_socket(dev); struct pcmcia_socket *s = to_socket(dev);
if (!count) if (!count)
return -EINVAL; return -EINVAL;
ret = pcmcia_eject_card(s); pcmcia_parse_uevents(s, PCMCIA_UEVENT_EJECT);
return ret ? ret : count; return count;
} }
static DEVICE_ATTR(card_eject, 0200, NULL, pccard_store_eject); static DEVICE_ATTR(card_eject, 0200, NULL, pccard_store_eject);
...@@ -167,7 +169,9 @@ static ssize_t pccard_store_irq_mask(struct device *dev, ...@@ -167,7 +169,9 @@ static ssize_t pccard_store_irq_mask(struct device *dev,
ret = sscanf(buf, "0x%x\n", &mask); ret = sscanf(buf, "0x%x\n", &mask);
if (ret == 1) { if (ret == 1) {
mutex_lock(&s->ops_mutex);
s->irq_mask &= mask; s->irq_mask &= mask;
mutex_unlock(&s->ops_mutex);
ret = 0; ret = 0;
} }
...@@ -187,163 +191,21 @@ static ssize_t pccard_store_resource(struct device *dev, ...@@ -187,163 +191,21 @@ static ssize_t pccard_store_resource(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
unsigned long flags;
struct pcmcia_socket *s = to_socket(dev); struct pcmcia_socket *s = to_socket(dev);
if (!count) if (!count)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&s->lock, flags); mutex_lock(&s->ops_mutex);
if (!s->resource_setup_done) if (!s->resource_setup_done)
s->resource_setup_done = 1; s->resource_setup_done = 1;
spin_unlock_irqrestore(&s->lock, flags); mutex_unlock(&s->ops_mutex);
mutex_lock(&s->skt_mutex);
if ((s->callback) &&
(s->state & SOCKET_PRESENT) &&
!(s->state & SOCKET_CARDBUS)) {
if (try_module_get(s->callback->owner)) {
s->callback->requery(s, 0);
module_put(s->callback->owner);
}
}
mutex_unlock(&s->skt_mutex);
return count;
}
static DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
pcmcia_parse_uevents(s, PCMCIA_UEVENT_REQUERY);
static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off, size_t count)
{
tuple_t tuple;
int status, i;
loff_t pointer = 0;
ssize_t ret = 0;
u_char *tuplebuffer;
u_char *tempbuffer;
tuplebuffer = kmalloc(sizeof(u_char) * 256, GFP_KERNEL);
if (!tuplebuffer)
return -ENOMEM;
tempbuffer = kmalloc(sizeof(u_char) * 258, GFP_KERNEL);
if (!tempbuffer) {
ret = -ENOMEM;
goto free_tuple;
}
memset(&tuple, 0, sizeof(tuple_t));
tuple.Attributes = TUPLE_RETURN_LINK | TUPLE_RETURN_COMMON;
tuple.DesiredTuple = RETURN_FIRST_TUPLE;
tuple.TupleOffset = 0;
status = pccard_get_first_tuple(s, BIND_FN_ALL, &tuple);
while (!status) {
tuple.TupleData = tuplebuffer;
tuple.TupleDataMax = 255;
memset(tuplebuffer, 0, sizeof(u_char) * 255);
status = pccard_get_tuple_data(s, &tuple);
if (status)
break;
if (off < (pointer + 2 + tuple.TupleDataLen)) {
tempbuffer[0] = tuple.TupleCode & 0xff;
tempbuffer[1] = tuple.TupleLink & 0xff;
for (i = 0; i < tuple.TupleDataLen; i++)
tempbuffer[i + 2] = tuplebuffer[i] & 0xff;
for (i = 0; i < (2 + tuple.TupleDataLen); i++) {
if (((i + pointer) >= off) &&
(i + pointer) < (off + count)) {
buf[ret] = tempbuffer[i];
ret++;
}
}
}
pointer += 2 + tuple.TupleDataLen;
if (pointer >= (off + count))
break;
if (tuple.TupleCode == CISTPL_END)
break;
status = pccard_get_next_tuple(s, BIND_FN_ALL, &tuple);
}
kfree(tempbuffer);
free_tuple:
kfree(tuplebuffer);
return ret;
}
static ssize_t pccard_show_cis(struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
unsigned int size = 0x200;
if (off >= size)
count = 0;
else {
struct pcmcia_socket *s;
unsigned int chains;
if (off + count > size)
count = size - off;
s = to_socket(container_of(kobj, struct device, kobj));
if (!(s->state & SOCKET_PRESENT))
return -ENODEV;
if (pccard_validate_cis(s, &chains))
return -EIO;
if (!chains)
return -ENODATA;
count = pccard_extract_cis(s, buf, off, count);
}
return count;
}
static ssize_t pccard_store_cis(struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct pcmcia_socket *s = to_socket(container_of(kobj, struct device, kobj));
int error;
if (off)
return -EINVAL;
if (count >= CISTPL_MAX_CIS_SIZE)
return -EINVAL;
if (!(s->state & SOCKET_PRESENT))
return -ENODEV;
error = pcmcia_replace_cis(s, buf, count);
if (error)
return -EIO;
mutex_lock(&s->skt_mutex);
if ((s->callback) && (s->state & SOCKET_PRESENT) &&
!(s->state & SOCKET_CARDBUS)) {
if (try_module_get(s->callback->owner)) {
s->callback->requery(s, 1);
module_put(s->callback->owner);
}
}
mutex_unlock(&s->skt_mutex);
return count; return count;
} }
static DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
static struct attribute *pccard_socket_attributes[] = { static struct attribute *pccard_socket_attributes[] = {
&dev_attr_card_type.attr, &dev_attr_card_type.attr,
...@@ -362,28 +224,12 @@ static const struct attribute_group socket_attrs = { ...@@ -362,28 +224,12 @@ static const struct attribute_group socket_attrs = {
.attrs = pccard_socket_attributes, .attrs = pccard_socket_attributes,
}; };
static struct bin_attribute pccard_cis_attr = {
.attr = { .name = "cis", .mode = S_IRUGO | S_IWUSR },
.size = 0x200,
.read = pccard_show_cis,
.write = pccard_store_cis,
};
int pccard_sysfs_add_socket(struct device *dev) int pccard_sysfs_add_socket(struct device *dev)
{ {
int ret = 0; return sysfs_create_group(&dev->kobj, &socket_attrs);
ret = sysfs_create_group(&dev->kobj, &socket_attrs);
if (!ret) {
ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
if (ret)
sysfs_remove_group(&dev->kobj, &socket_attrs);
}
return ret;
} }
void pccard_sysfs_remove_socket(struct device *dev) void pccard_sysfs_remove_socket(struct device *dev)
{ {
sysfs_remove_bin_file(&dev->kobj, &pccard_cis_attr);
sysfs_remove_group(&dev->kobj, &socket_attrs); sysfs_remove_group(&dev->kobj, &socket_attrs);
} }
...@@ -37,6 +37,11 @@ static int pwr_irqs_off; ...@@ -37,6 +37,11 @@ static int pwr_irqs_off;
module_param(pwr_irqs_off, bool, 0644); module_param(pwr_irqs_off, bool, 0644);
MODULE_PARM_DESC(pwr_irqs_off, "Force IRQs off during power-on of slot. Use only when seeing IRQ storms!"); MODULE_PARM_DESC(pwr_irqs_off, "Force IRQs off during power-on of slot. Use only when seeing IRQ storms!");
static char o2_speedup[] = "default";
module_param_string(o2_speedup, o2_speedup, sizeof(o2_speedup), 0444);
MODULE_PARM_DESC(o2_speedup, "Use prefetch/burst for O2-bridges: 'on', 'off' "
"or 'default' (uses recommended behaviour for the detected bridge)");
#define debug(x, s, args...) dev_dbg(&s->dev->dev, x, ##args) #define debug(x, s, args...) dev_dbg(&s->dev->dev, x, ##args)
/* Don't ask.. */ /* Don't ask.. */
......
...@@ -696,11 +696,11 @@ static int serial_config(struct pcmcia_device * link) ...@@ -696,11 +696,11 @@ static int serial_config(struct pcmcia_device * link)
info->multi = info->quirk->multi; info->multi = info->quirk->multi;
if (info->multi > 1) if (info->multi > 1)
multi_config(link); i = multi_config(link);
else else
simple_config(link); i = simple_config(link);
if (info->ndev == 0) if (i || info->ndev == 0)
goto failed; goto failed;
/* /*
...@@ -715,6 +715,7 @@ static int serial_config(struct pcmcia_device * link) ...@@ -715,6 +715,7 @@ static int serial_config(struct pcmcia_device * link)
return 0; return 0;
failed: failed:
dev_warn(&link->dev, "serial_cs: failed to initialize\n");
serial_remove(link); serial_remove(link);
return -ENODEV; return -ENODEV;
} }
......
...@@ -40,7 +40,7 @@ struct net_device; ...@@ -40,7 +40,7 @@ struct net_device;
* Documentation/pcmcia/driver.txt for details. * Documentation/pcmcia/driver.txt for details.
*/ */
struct pcmcia_dynids { struct pcmcia_dynids {
spinlock_t lock; struct mutex lock;
struct list_head list; struct list_head list;
}; };
......
...@@ -134,9 +134,9 @@ struct pccard_operations { ...@@ -134,9 +134,9 @@ struct pccard_operations {
struct pcmcia_socket { struct pcmcia_socket {
struct module *owner; struct module *owner;
spinlock_t lock;
socket_state_t socket; socket_state_t socket;
u_int state; u_int state;
u_int suspended_state; /* state before suspend */
u_short functions; u_short functions;
u_short lock_count; u_short lock_count;
pccard_mem_map cis_mem; pccard_mem_map cis_mem;
...@@ -200,9 +200,14 @@ struct pcmcia_socket { ...@@ -200,9 +200,14 @@ struct pcmcia_socket {
struct task_struct *thread; struct task_struct *thread;
struct completion thread_done; struct completion thread_done;
unsigned int thread_events; unsigned int thread_events;
/* protects socket h/w state */ unsigned int sysfs_events;
/* For the non-trivial interaction between these locks,
* see Documentation/pcmcia/locking.txt */
struct mutex skt_mutex; struct mutex skt_mutex;
/* protects thread_events */ struct mutex ops_mutex;
/* protects thread_events and sysfs_events */
spinlock_t thread_lock; spinlock_t thread_lock;
/* pcmcia (16-bit) */ /* pcmcia (16-bit) */
...@@ -225,30 +230,19 @@ struct pcmcia_socket { ...@@ -225,30 +230,19 @@ struct pcmcia_socket {
u8 busy:1; u8 busy:1;
/* pcmcia module is being unloaded */ /* pcmcia module is being unloaded */
u8 dead:1; u8 dead:1;
/* a multifunction-device add event is pending */ /* the PCMCIA card consists of two pseudo devices */
u8 device_add_pending:1; u8 has_pfc:1;
/* the pending event adds a mfc (1) or pfc (0) */
u8 mfc_pfc:1;
u8 reserved:3; u8 reserved:4;
} pcmcia_state; } pcmcia_state;
/* for adding further pseudo-multifunction devices */
struct work_struct device_add;
#ifdef CONFIG_PCMCIA_IOCTL #ifdef CONFIG_PCMCIA_IOCTL
struct user_info_t *user; struct user_info_t *user;
wait_queue_head_t queue; wait_queue_head_t queue;
#endif /* CONFIG_PCMCIA_IOCTL */ #endif /* CONFIG_PCMCIA_IOCTL */
#endif /* CONFIG_PCMCIA */ #endif /* CONFIG_PCMCIA */
/* cardbus (32-bit) */
#ifdef CONFIG_CARDBUS
struct resource *cb_cis_res;
void __iomem *cb_cis_virt;
#endif /* CONFIG_CARDBUS */
/* socket device */ /* socket device */
struct device dev; struct device dev;
/* data internal to the socket driver */ /* data internal to the socket driver */
...@@ -263,13 +257,25 @@ struct pcmcia_socket { ...@@ -263,13 +257,25 @@ struct pcmcia_socket {
* - pccard_static_ops iomem and ioport areas are assigned statically * - pccard_static_ops iomem and ioport areas are assigned statically
* - pccard_iodyn_ops iomem areas is assigned statically, ioport * - pccard_iodyn_ops iomem areas is assigned statically, ioport
* areas dynamically * areas dynamically
* If this option is selected, use
* "select PCCARD_IODYN" in Kconfig.
* - pccard_nonstatic_ops iomem and ioport areas are assigned dynamically. * - pccard_nonstatic_ops iomem and ioport areas are assigned dynamically.
* If this option is selected, use * If this option is selected, use
* "select PCCARD_NONSTATIC" in Kconfig. * "select PCCARD_NONSTATIC" in Kconfig.
*
*/ */
extern struct pccard_resource_ops pccard_static_ops; extern struct pccard_resource_ops pccard_static_ops;
#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
extern struct pccard_resource_ops pccard_iodyn_ops; extern struct pccard_resource_ops pccard_iodyn_ops;
extern struct pccard_resource_ops pccard_nonstatic_ops; extern struct pccard_resource_ops pccard_nonstatic_ops;
#else
/* If PCMCIA is not used, but only CARDBUS, these functions are not used
* at all. Therefore, do not use the large (240K!) rsrc_nonstatic module
*/
#define pccard_iodyn_ops pccard_static_ops
#define pccard_nonstatic_ops pccard_static_ops
#endif
/* socket drivers are expected to use these callbacks in their .drv struct */ /* socket drivers are expected to use these callbacks in their .drv struct */
extern int pcmcia_socket_dev_suspend(struct device *dev); extern int pcmcia_socket_dev_suspend(struct device *dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment