mirror of
https://github.com/torvalds/linux.git
synced 2024-10-31 17:21:49 +00:00
51ec92e295
Suppressing uevents turned out to be a bad idea as it screws up the order of events, making user space very confused. Change the system to use sysfs groups instead. This is a regression that, for some odd reason, has gone unnoticed for some time. It confuses hal so that the block devices (which have the mmc device as a parent) are not registered. End result being that desktop magic when cards are inserted won't work. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
280 lines
5.5 KiB
C
280 lines
5.5 KiB
C
/*
|
|
* linux/drivers/mmc/core/bus.c
|
|
*
|
|
* Copyright (C) 2003 Russell King, All Rights Reserved.
|
|
* Copyright (C) 2007 Pierre Ossman
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* MMC card bus driver model
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/err.h>
|
|
|
|
#include <linux/mmc/card.h>
|
|
#include <linux/mmc/host.h>
|
|
|
|
#include "core.h"
|
|
#include "sdio_cis.h"
|
|
#include "bus.h"
|
|
|
|
#define dev_to_mmc_card(d) container_of(d, struct mmc_card, dev)
|
|
#define to_mmc_driver(d) container_of(d, struct mmc_driver, drv)
|
|
|
|
static ssize_t mmc_type_show(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct mmc_card *card = dev_to_mmc_card(dev);
|
|
|
|
switch (card->type) {
|
|
case MMC_TYPE_MMC:
|
|
return sprintf(buf, "MMC\n");
|
|
case MMC_TYPE_SD:
|
|
return sprintf(buf, "SD\n");
|
|
case MMC_TYPE_SDIO:
|
|
return sprintf(buf, "SDIO\n");
|
|
default:
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
static struct device_attribute mmc_dev_attrs[] = {
|
|
__ATTR(type, S_IRUGO, mmc_type_show, NULL),
|
|
__ATTR_NULL,
|
|
};
|
|
|
|
/*
|
|
* This currently matches any MMC driver to any MMC card - drivers
|
|
* themselves make the decision whether to drive this card in their
|
|
* probe method.
|
|
*/
|
|
static int mmc_bus_match(struct device *dev, struct device_driver *drv)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
{
|
|
struct mmc_card *card = dev_to_mmc_card(dev);
|
|
const char *type;
|
|
int retval = 0;
|
|
|
|
switch (card->type) {
|
|
case MMC_TYPE_MMC:
|
|
type = "MMC";
|
|
break;
|
|
case MMC_TYPE_SD:
|
|
type = "SD";
|
|
break;
|
|
case MMC_TYPE_SDIO:
|
|
type = "SDIO";
|
|
break;
|
|
default:
|
|
type = NULL;
|
|
}
|
|
|
|
if (type) {
|
|
retval = add_uevent_var(env, "MMC_TYPE=%s", type);
|
|
if (retval)
|
|
return retval;
|
|
}
|
|
|
|
retval = add_uevent_var(env, "MMC_NAME=%s", mmc_card_name(card));
|
|
|
|
return retval;
|
|
}
|
|
|
|
static int mmc_bus_probe(struct device *dev)
|
|
{
|
|
struct mmc_driver *drv = to_mmc_driver(dev->driver);
|
|
struct mmc_card *card = dev_to_mmc_card(dev);
|
|
|
|
return drv->probe(card);
|
|
}
|
|
|
|
static int mmc_bus_remove(struct device *dev)
|
|
{
|
|
struct mmc_driver *drv = to_mmc_driver(dev->driver);
|
|
struct mmc_card *card = dev_to_mmc_card(dev);
|
|
|
|
drv->remove(card);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mmc_bus_suspend(struct device *dev, pm_message_t state)
|
|
{
|
|
struct mmc_driver *drv = to_mmc_driver(dev->driver);
|
|
struct mmc_card *card = dev_to_mmc_card(dev);
|
|
int ret = 0;
|
|
|
|
if (dev->driver && drv->suspend)
|
|
ret = drv->suspend(card, state);
|
|
return ret;
|
|
}
|
|
|
|
static int mmc_bus_resume(struct device *dev)
|
|
{
|
|
struct mmc_driver *drv = to_mmc_driver(dev->driver);
|
|
struct mmc_card *card = dev_to_mmc_card(dev);
|
|
int ret = 0;
|
|
|
|
if (dev->driver && drv->resume)
|
|
ret = drv->resume(card);
|
|
return ret;
|
|
}
|
|
|
|
static struct bus_type mmc_bus_type = {
|
|
.name = "mmc",
|
|
.dev_attrs = mmc_dev_attrs,
|
|
.match = mmc_bus_match,
|
|
.uevent = mmc_bus_uevent,
|
|
.probe = mmc_bus_probe,
|
|
.remove = mmc_bus_remove,
|
|
.suspend = mmc_bus_suspend,
|
|
.resume = mmc_bus_resume,
|
|
};
|
|
|
|
int mmc_register_bus(void)
|
|
{
|
|
return bus_register(&mmc_bus_type);
|
|
}
|
|
|
|
void mmc_unregister_bus(void)
|
|
{
|
|
bus_unregister(&mmc_bus_type);
|
|
}
|
|
|
|
/**
|
|
* mmc_register_driver - register a media driver
|
|
* @drv: MMC media driver
|
|
*/
|
|
int mmc_register_driver(struct mmc_driver *drv)
|
|
{
|
|
drv->drv.bus = &mmc_bus_type;
|
|
return driver_register(&drv->drv);
|
|
}
|
|
|
|
EXPORT_SYMBOL(mmc_register_driver);
|
|
|
|
/**
|
|
* mmc_unregister_driver - unregister a media driver
|
|
* @drv: MMC media driver
|
|
*/
|
|
void mmc_unregister_driver(struct mmc_driver *drv)
|
|
{
|
|
drv->drv.bus = &mmc_bus_type;
|
|
driver_unregister(&drv->drv);
|
|
}
|
|
|
|
EXPORT_SYMBOL(mmc_unregister_driver);
|
|
|
|
static void mmc_release_card(struct device *dev)
|
|
{
|
|
struct mmc_card *card = dev_to_mmc_card(dev);
|
|
|
|
sdio_free_common_cis(card);
|
|
|
|
if (card->info)
|
|
kfree(card->info);
|
|
|
|
kfree(card);
|
|
}
|
|
|
|
/*
|
|
* Allocate and initialise a new MMC card structure.
|
|
*/
|
|
struct mmc_card *mmc_alloc_card(struct mmc_host *host, struct device_type *type)
|
|
{
|
|
struct mmc_card *card;
|
|
|
|
card = kzalloc(sizeof(struct mmc_card), GFP_KERNEL);
|
|
if (!card)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
card->host = host;
|
|
|
|
device_initialize(&card->dev);
|
|
|
|
card->dev.parent = mmc_classdev(host);
|
|
card->dev.bus = &mmc_bus_type;
|
|
card->dev.release = mmc_release_card;
|
|
card->dev.type = type;
|
|
|
|
return card;
|
|
}
|
|
|
|
/*
|
|
* Register a new MMC card with the driver model.
|
|
*/
|
|
int mmc_add_card(struct mmc_card *card)
|
|
{
|
|
int ret;
|
|
const char *type;
|
|
|
|
snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
|
|
"%s:%04x", mmc_hostname(card->host), card->rca);
|
|
|
|
switch (card->type) {
|
|
case MMC_TYPE_MMC:
|
|
type = "MMC";
|
|
break;
|
|
case MMC_TYPE_SD:
|
|
type = "SD";
|
|
if (mmc_card_blockaddr(card))
|
|
type = "SDHC";
|
|
break;
|
|
case MMC_TYPE_SDIO:
|
|
type = "SDIO";
|
|
break;
|
|
default:
|
|
type = "?";
|
|
break;
|
|
}
|
|
|
|
if (mmc_host_is_spi(card->host)) {
|
|
printk(KERN_INFO "%s: new %s%s card on SPI\n",
|
|
mmc_hostname(card->host),
|
|
mmc_card_highspeed(card) ? "high speed " : "",
|
|
type);
|
|
} else {
|
|
printk(KERN_INFO "%s: new %s%s card at address %04x\n",
|
|
mmc_hostname(card->host),
|
|
mmc_card_highspeed(card) ? "high speed " : "",
|
|
type, card->rca);
|
|
}
|
|
|
|
ret = device_add(&card->dev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
mmc_card_set_present(card);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Unregister a new MMC card with the driver model, and
|
|
* (eventually) free it.
|
|
*/
|
|
void mmc_remove_card(struct mmc_card *card)
|
|
{
|
|
if (mmc_card_present(card)) {
|
|
if (mmc_host_is_spi(card->host)) {
|
|
printk(KERN_INFO "%s: SPI card removed\n",
|
|
mmc_hostname(card->host));
|
|
} else {
|
|
printk(KERN_INFO "%s: card %04x removed\n",
|
|
mmc_hostname(card->host), card->rca);
|
|
}
|
|
device_del(&card->dev);
|
|
}
|
|
|
|
put_device(&card->dev);
|
|
}
|
|
|