diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-06 10:22:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 10:54:16 -0700 |
commit | 4f824cdefb327963c511434087fc3a8312f0f685 (patch) | |
tree | f072add3f84176612a22706228f114b05b8d8109 /drivers/ssb/pci.c | |
parent | 0f6b65e300c5237fa981e2d2265d87505ca34bc8 (diff) |
Revert "ssb: Handle Netbook devices where the SPROM address is changed"
Turns out this isn't the best way to resolve this issue. The
individual patches will be applied instead.
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ssb/pci.c')
-rw-r--r-- | drivers/ssb/pci.c | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index 7e284ae81a82..a8dbb06623c9 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c @@ -23,7 +23,6 @@ #include "ssb_private.h" -bool ssb_is_sprom_available(struct ssb_bus *bus); /* Define the following to 1 to enable a printk on each coreswitch. */ #define SSB_VERBOSE_PCICORESWITCH_DEBUG 0 @@ -169,7 +168,7 @@ err_pci: } /* Get the word-offset for a SSB_SPROM_XXX define. */ -#define SPOFF(offset) ((offset) / sizeof(u16)) +#define SPOFF(offset) (((offset) - SSB_SPROM_BASE) / sizeof(u16)) /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */ #define SPEX16(_outvar, _offset, _mask, _shift) \ out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift)) @@ -254,13 +253,8 @@ static int sprom_do_read(struct ssb_bus *bus, u16 *sprom) { int i; - /* Check if SPROM can be read */ - if (ioread16(bus->mmio + bus->sprom_offset) == 0xFFFF) { - ssb_printk(KERN_ERR PFX "Unable to read SPROM\n"); - return -ENODEV; - } for (i = 0; i < bus->sprom_size; i++) - sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2)); + sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2)); return 0; } @@ -291,7 +285,7 @@ static int sprom_do_write(struct ssb_bus *bus, const u16 *sprom) ssb_printk("75%%"); else if (i % 2) ssb_printk("."); - writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2)); + writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2)); mmiowb(); msleep(20); } @@ -627,49 +621,21 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, int err = -ENOMEM; u16 *buf; - if (!ssb_is_sprom_available(bus)) { - ssb_printk(KERN_ERR PFX "No SPROM available!\n"); - return -ENODEV; - } - if (bus->chipco.dev) { /* can be unavailible! */ - /* - * get SPROM offset: SSB_SPROM_BASE1 except for - * chipcommon rev >= 31 or chip ID is 0x4312 and - * chipcommon status & 3 == 2 - */ - if (bus->chipco.dev->id.revision >= 31) - bus->sprom_offset = SSB_SPROM_BASE31; - else if (bus->chip_id == 0x4312 && - (bus->chipco.status & 0x03) == 2) - bus->sprom_offset = SSB_SPROM_BASE31; - else - bus->sprom_offset = SSB_SPROM_BASE1; - } else { - bus->sprom_offset = SSB_SPROM_BASE1; - } - ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset); - buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL); if (!buf) goto out; bus->sprom_size = SSB_SPROMSIZE_WORDS_R123; - err = sprom_do_read(bus, buf); - if (err) - goto out_free; + sprom_do_read(bus, buf); err = sprom_check_crc(buf, bus->sprom_size); if (err) { /* try for a 440 byte SPROM - revision 4 and higher */ kfree(buf); buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16), GFP_KERNEL); - if (!buf) { - err = -ENOMEM; + if (!buf) goto out; - } bus->sprom_size = SSB_SPROMSIZE_WORDS_R4; - err = sprom_do_read(bus, buf); - if (err) - goto out_free; + sprom_do_read(bus, buf); err = sprom_check_crc(buf, bus->sprom_size); if (err) { /* All CRC attempts failed. |