Commit e7ec2e32 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville

ssb: Add SPROM/invariants support for PCMCIA devices

This adds support for reading/writing the SPROM invariants
for PCMCIA based devices.
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 068edceb
...@@ -20,6 +20,10 @@ config SSB ...@@ -20,6 +20,10 @@ config SSB
If unsure, say N. If unsure, say N.
# Common SPROM support routines
config SSB_SPROM
bool
config SSB_PCIHOST_POSSIBLE config SSB_PCIHOST_POSSIBLE
bool bool
depends on SSB && (PCI = y || PCI = SSB) depends on SSB && (PCI = y || PCI = SSB)
...@@ -28,6 +32,7 @@ config SSB_PCIHOST_POSSIBLE ...@@ -28,6 +32,7 @@ config SSB_PCIHOST_POSSIBLE
config SSB_PCIHOST config SSB_PCIHOST
bool "Support for SSB on PCI-bus host" bool "Support for SSB on PCI-bus host"
depends on SSB_PCIHOST_POSSIBLE depends on SSB_PCIHOST_POSSIBLE
select SSB_SPROM
default y default y
help help
Support for a Sonics Silicon Backplane on top Support for a Sonics Silicon Backplane on top
...@@ -48,6 +53,7 @@ config SSB_PCMCIAHOST_POSSIBLE ...@@ -48,6 +53,7 @@ config SSB_PCMCIAHOST_POSSIBLE
config SSB_PCMCIAHOST config SSB_PCMCIAHOST
bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)" bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
depends on SSB_PCMCIAHOST_POSSIBLE depends on SSB_PCMCIAHOST_POSSIBLE
select SSB_SPROM
help help
Support for a Sonics Silicon Backplane on top Support for a Sonics Silicon Backplane on top
of a PCMCIA device. of a PCMCIA device.
......
# core # core
ssb-y += main.o scan.o ssb-y += main.o scan.o
ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o
ssb-$(CONFIG_SSB_SPROM) += sprom.o
# host support # host support
ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o
......
...@@ -69,6 +69,25 @@ found: ...@@ -69,6 +69,25 @@ found:
} }
#endif /* CONFIG_SSB_PCIHOST */ #endif /* CONFIG_SSB_PCIHOST */
#ifdef CONFIG_SSB_PCMCIAHOST
struct ssb_bus *ssb_pcmcia_dev_to_bus(struct pcmcia_device *pdev)
{
struct ssb_bus *bus;
ssb_buses_lock();
list_for_each_entry(bus, &buses, list) {
if (bus->bustype == SSB_BUSTYPE_PCMCIA &&
bus->host_pcmcia == pdev)
goto found;
}
bus = NULL;
found:
ssb_buses_unlock();
return bus;
}
#endif /* CONFIG_SSB_PCMCIAHOST */
int ssb_for_each_bus_call(unsigned long data, int ssb_for_each_bus_call(unsigned long data,
int (*func)(struct ssb_bus *bus, unsigned long data)) int (*func)(struct ssb_bus *bus, unsigned long data))
{ {
...@@ -398,7 +417,7 @@ void ssb_bus_unregister(struct ssb_bus *bus) ...@@ -398,7 +417,7 @@ void ssb_bus_unregister(struct ssb_bus *bus)
list_del(&bus->list); list_del(&bus->list);
ssb_buses_unlock(); ssb_buses_unlock();
/* ssb_pcmcia_exit(bus); */ ssb_pcmcia_exit(bus);
ssb_pci_exit(bus); ssb_pci_exit(bus);
ssb_iounmap(bus); ssb_iounmap(bus);
} }
...@@ -663,7 +682,7 @@ out: ...@@ -663,7 +682,7 @@ out:
err_dequeue: err_dequeue:
list_del(&bus->list); list_del(&bus->list);
err_pcmcia_exit: err_pcmcia_exit:
/* ssb_pcmcia_exit(bus); */ ssb_pcmcia_exit(bus);
err_pci_exit: err_pci_exit:
ssb_pci_exit(bus); ssb_pci_exit(bus);
err_unmap: err_unmap:
......
...@@ -227,7 +227,7 @@ static u8 ssb_sprom_crc(const u16 *sprom, u16 size) ...@@ -227,7 +227,7 @@ static u8 ssb_sprom_crc(const u16 *sprom, u16 size)
return crc; return crc;
} }
static int sprom_check_crc(const u16 *sprom, u16 size) static int sprom_check_crc(const u16 *sprom, size_t size)
{ {
u8 crc; u8 crc;
u8 expected_crc; u8 expected_crc;
...@@ -242,12 +242,14 @@ static int sprom_check_crc(const u16 *sprom, u16 size) ...@@ -242,12 +242,14 @@ static int sprom_check_crc(const u16 *sprom, u16 size)
return 0; return 0;
} }
static void sprom_do_read(struct ssb_bus *bus, u16 *sprom) static int sprom_do_read(struct ssb_bus *bus, u16 *sprom)
{ {
int i; int i;
for (i = 0; i < bus->sprom_size; i++) for (i = 0; i < bus->sprom_size; i++)
sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2)); sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
return 0;
} }
static int sprom_do_write(struct ssb_bus *bus, const u16 *sprom) static int sprom_do_write(struct ssb_bus *bus, const u16 *sprom)
...@@ -660,71 +662,18 @@ const struct ssb_bus_ops ssb_pci_ops = { ...@@ -660,71 +662,18 @@ const struct ssb_bus_ops ssb_pci_ops = {
.write32 = ssb_pci_write32, .write32 = ssb_pci_write32,
}; };
static int sprom2hex(const u16 *sprom, char *buf, size_t buf_len, u16 size)
{
int i, pos = 0;
for (i = 0; i < size; i++)
pos += snprintf(buf + pos, buf_len - pos - 1,
"%04X", swab16(sprom[i]) & 0xFFFF);
pos += snprintf(buf + pos, buf_len - pos - 1, "\n");
return pos + 1;
}
static int hex2sprom(u16 *sprom, const char *dump, size_t len, u16 size)
{
char tmp[5] = { 0 };
int cnt = 0;
unsigned long parsed;
if (len < size * 2)
return -EINVAL;
while (cnt < size) {
memcpy(tmp, dump, 4);
dump += 4;
parsed = simple_strtoul(tmp, NULL, 16);
sprom[cnt++] = swab16((u16)parsed);
}
return 0;
}
static ssize_t ssb_pci_attr_sprom_show(struct device *pcidev, static ssize_t ssb_pci_attr_sprom_show(struct device *pcidev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct pci_dev *pdev = container_of(pcidev, struct pci_dev, dev); struct pci_dev *pdev = container_of(pcidev, struct pci_dev, dev);
struct ssb_bus *bus; struct ssb_bus *bus;
u16 *sprom;
int err = -ENODEV;
ssize_t count = 0;
bus = ssb_pci_dev_to_bus(pdev); bus = ssb_pci_dev_to_bus(pdev);
if (!bus) if (!bus)
goto out; return -ENODEV;
err = -ENOMEM;
sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
if (!sprom)
goto out;
/* Use interruptible locking, as the SPROM write might return ssb_attr_sprom_show(bus, buf, sprom_do_read);
* be holding the lock for several seconds. So allow userspace
* to cancel operation. */
err = -ERESTARTSYS;
if (mutex_lock_interruptible(&bus->pci_sprom_mutex))
goto out_kfree;
sprom_do_read(bus, sprom);
mutex_unlock(&bus->pci_sprom_mutex);
count = sprom2hex(sprom, buf, PAGE_SIZE, bus->sprom_size);
err = 0;
out_kfree:
kfree(sprom);
out:
return err ? err : count;
} }
static ssize_t ssb_pci_attr_sprom_store(struct device *pcidev, static ssize_t ssb_pci_attr_sprom_store(struct device *pcidev,
...@@ -733,55 +682,13 @@ static ssize_t ssb_pci_attr_sprom_store(struct device *pcidev, ...@@ -733,55 +682,13 @@ static ssize_t ssb_pci_attr_sprom_store(struct device *pcidev,
{ {
struct pci_dev *pdev = container_of(pcidev, struct pci_dev, dev); struct pci_dev *pdev = container_of(pcidev, struct pci_dev, dev);
struct ssb_bus *bus; struct ssb_bus *bus;
u16 *sprom;
int res = 0, err = -ENODEV;
bus = ssb_pci_dev_to_bus(pdev); bus = ssb_pci_dev_to_bus(pdev);
if (!bus) if (!bus)
goto out; return -ENODEV;
err = -ENOMEM;
sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
if (!sprom)
goto out;
err = hex2sprom(sprom, buf, count, bus->sprom_size);
if (err) {
err = -EINVAL;
goto out_kfree;
}
err = sprom_check_crc(sprom, bus->sprom_size);
if (err) {
err = -EINVAL;
goto out_kfree;
}
/* Use interruptible locking, as the SPROM write might return ssb_attr_sprom_store(bus, buf, count,
* be holding the lock for several seconds. So allow userspace sprom_check_crc, sprom_do_write);
* to cancel operation. */
err = -ERESTARTSYS;
if (mutex_lock_interruptible(&bus->pci_sprom_mutex))
goto out_kfree;
err = ssb_devices_freeze(bus);
if (err == -EOPNOTSUPP) {
ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
"No suspend support. Is CONFIG_PM enabled?\n");
goto out_unlock;
}
if (err) {
ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
goto out_unlock;
}
res = sprom_do_write(bus, sprom);
err = ssb_devices_thaw(bus);
if (err)
ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
out_unlock:
mutex_unlock(&bus->pci_sprom_mutex);
out_kfree:
kfree(sprom);
out:
if (res)
return res;
return err ? err : count;
} }
static DEVICE_ATTR(ssb_sprom, 0600, static DEVICE_ATTR(ssb_sprom, 0600,
...@@ -808,7 +715,7 @@ int ssb_pci_init(struct ssb_bus *bus) ...@@ -808,7 +715,7 @@ int ssb_pci_init(struct ssb_bus *bus)
return 0; return 0;
pdev = bus->host_pci; pdev = bus->host_pci;
mutex_init(&bus->pci_sprom_mutex); mutex_init(&bus->sprom_mutex);
err = device_create_file(&pdev->dev, &dev_attr_ssb_sprom); err = device_create_file(&pdev->dev, &dev_attr_ssb_sprom);
if (err) if (err)
goto out; goto out;
......
This diff is collapsed.
/*
* Sonics Silicon Backplane
* Common SPROM support routines
*
* Copyright (C) 2005-2008 Michael Buesch <mb@bu3sch.de>
* Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
* Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
* Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
* Copyright (C) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
*
* Licensed under the GNU/GPL. See COPYING for details.
*/
#include "ssb_private.h"
static int sprom2hex(const u16 *sprom, char *buf, size_t buf_len,
size_t sprom_size_words)
{
int i, pos = 0;
for (i = 0; i < sprom_size_words; i++)
pos += snprintf(buf + pos, buf_len - pos - 1,
"%04X", swab16(sprom[i]) & 0xFFFF);
pos += snprintf(buf + pos, buf_len - pos - 1, "\n");
return pos + 1;
}
static int hex2sprom(u16 *sprom, const char *dump, size_t len,
size_t sprom_size_words)
{
char tmp[5] = { 0 };
int cnt = 0;
unsigned long parsed;
if (len < sprom_size_words * 2)
return -EINVAL;
while (cnt < sprom_size_words) {
memcpy(tmp, dump, 4);
dump += 4;
parsed = simple_strtoul(tmp, NULL, 16);
sprom[cnt++] = swab16((u16)parsed);
}
return 0;
}
/* Common sprom device-attribute show-handler */
ssize_t ssb_attr_sprom_show(struct ssb_bus *bus, char *buf,
int (*sprom_read)(struct ssb_bus *bus, u16 *sprom))
{
u16 *sprom;
int err = -ENOMEM;
ssize_t count = 0;
size_t sprom_size_words = bus->sprom_size;
sprom = kcalloc(sprom_size_words, sizeof(u16), GFP_KERNEL);
if (!sprom)
goto out;
/* Use interruptible locking, as the SPROM write might
* be holding the lock for several seconds. So allow userspace
* to cancel operation. */
err = -ERESTARTSYS;
if (mutex_lock_interruptible(&bus->sprom_mutex))
goto out_kfree;
err = sprom_read(bus, sprom);
mutex_unlock(&bus->sprom_mutex);
if (!err)
count = sprom2hex(sprom, buf, PAGE_SIZE, sprom_size_words);
out_kfree:
kfree(sprom);
out:
return err ? err : count;
}
/* Common sprom device-attribute store-handler */
ssize_t ssb_attr_sprom_store(struct ssb_bus *bus,
const char *buf, size_t count,
int (*sprom_check_crc)(const u16 *sprom, size_t size),
int (*sprom_write)(struct ssb_bus *bus, const u16 *sprom))
{
u16 *sprom;
int res = 0, err = -ENOMEM;
size_t sprom_size_words = bus->sprom_size;
sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
if (!sprom)
goto out;
err = hex2sprom(sprom, buf, count, sprom_size_words);
if (err) {
err = -EINVAL;
goto out_kfree;
}
err = sprom_check_crc(sprom, sprom_size_words);
if (err) {
err = -EINVAL;
goto out_kfree;
}
/* Use interruptible locking, as the SPROM write might
* be holding the lock for several seconds. So allow userspace
* to cancel operation. */
err = -ERESTARTSYS;
if (mutex_lock_interruptible(&bus->sprom_mutex))
goto out_kfree;
err = ssb_devices_freeze(bus);
if (err == -EOPNOTSUPP) {
ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
"No suspend support. Is CONFIG_PM enabled?\n");
goto out_unlock;
}
if (err) {
ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
goto out_unlock;
}
res = sprom_write(bus, sprom);
err = ssb_devices_thaw(bus);
if (err)
ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
out_unlock:
mutex_unlock(&bus->sprom_mutex);
out_kfree:
kfree(sprom);
out:
if (res)
return res;
return err ? err : count;
}
...@@ -81,6 +81,7 @@ extern int ssb_pcmcia_switch_segment(struct ssb_bus *bus, ...@@ -81,6 +81,7 @@ extern int ssb_pcmcia_switch_segment(struct ssb_bus *bus,
u8 seg); u8 seg);
extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus, extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
struct ssb_init_invariants *iv); struct ssb_init_invariants *iv);
extern void ssb_pcmcia_exit(struct ssb_bus *bus);
extern int ssb_pcmcia_init(struct ssb_bus *bus); extern int ssb_pcmcia_init(struct ssb_bus *bus);
extern const struct ssb_bus_ops ssb_pcmcia_ops; extern const struct ssb_bus_ops ssb_pcmcia_ops;
#else /* CONFIG_SSB_PCMCIAHOST */ #else /* CONFIG_SSB_PCMCIAHOST */
...@@ -99,6 +100,9 @@ static inline int ssb_pcmcia_switch_segment(struct ssb_bus *bus, ...@@ -99,6 +100,9 @@ static inline int ssb_pcmcia_switch_segment(struct ssb_bus *bus,
{ {
return 0; return 0;
} }
static inline void ssb_pcmcia_exit(struct ssb_bus *bus)
{
}
static inline int ssb_pcmcia_init(struct ssb_bus *bus) static inline int ssb_pcmcia_init(struct ssb_bus *bus)
{ {
return 0; return 0;
...@@ -113,6 +117,17 @@ extern int ssb_bus_scan(struct ssb_bus *bus, ...@@ -113,6 +117,17 @@ extern int ssb_bus_scan(struct ssb_bus *bus,
extern void ssb_iounmap(struct ssb_bus *ssb); extern void ssb_iounmap(struct ssb_bus *ssb);
/* sprom.c */
extern
ssize_t ssb_attr_sprom_show(struct ssb_bus *bus, char *buf,
int (*sprom_read)(struct ssb_bus *bus, u16 *sprom));
extern
ssize_t ssb_attr_sprom_store(struct ssb_bus *bus,
const char *buf, size_t count,
int (*sprom_check_crc)(const u16 *sprom, size_t size),
int (*sprom_write)(struct ssb_bus *bus, const u16 *sprom));
/* core.c */ /* core.c */
extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m); extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m);
extern int ssb_devices_freeze(struct ssb_bus *bus); extern int ssb_devices_freeze(struct ssb_bus *bus);
...@@ -120,6 +135,8 @@ extern int ssb_devices_thaw(struct ssb_bus *bus); ...@@ -120,6 +135,8 @@ extern int ssb_devices_thaw(struct ssb_bus *bus);
extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
int ssb_for_each_bus_call(unsigned long data, int ssb_for_each_bus_call(unsigned long data,
int (*func)(struct ssb_bus *bus, unsigned long data)); int (*func)(struct ssb_bus *bus, unsigned long data));
extern struct ssb_bus *ssb_pcmcia_dev_to_bus(struct pcmcia_device *pdev);
/* b43_pci_bridge.c */ /* b43_pci_bridge.c */
#ifdef CONFIG_SSB_B43_PCI_BRIDGE #ifdef CONFIG_SSB_B43_PCI_BRIDGE
......
...@@ -245,9 +245,9 @@ struct ssb_bus { ...@@ -245,9 +245,9 @@ struct ssb_bus {
/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */ /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
struct pcmcia_device *host_pcmcia; struct pcmcia_device *host_pcmcia;
#ifdef CONFIG_SSB_PCIHOST #ifdef CONFIG_SSB_SPROM
/* Mutex to protect the SPROM writing. */ /* Mutex to protect the SPROM writing. */
struct mutex pci_sprom_mutex; struct mutex sprom_mutex;
#endif #endif
/* ID information about the Chip. */ /* ID information about the Chip. */
......
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