lkml.org 
[lkml]   [2010]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[32/36] Revert "ssb: Handle Netbook devices where the SPROM address is changed"
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Greg Kroah-Hartman <gregkh@suse.de>

    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>

    ---
    drivers/ssb/driver_chipcommon.c | 3 -
    drivers/ssb/driver_chipcommon_pmu.c | 17 ++++++-----
    drivers/ssb/pci.c | 46 +++---------------------------
    drivers/ssb/sprom.c | 15 ---------
    include/linux/ssb/ssb.h | 1
    include/linux/ssb/ssb_driver_chipcommon.h | 2 -
    include/linux/ssb/ssb_regs.h | 3 -
    7 files changed, 17 insertions(+), 70 deletions(-)

    --- a/drivers/ssb/driver_chipcommon.c
    +++ b/drivers/ssb/driver_chipcommon.c
    @@ -233,9 +233,6 @@ void ssb_chipcommon_init(struct ssb_chip
    {
    if (!cc->dev)
    return; /* We don't have a ChipCommon */
    - if (cc->dev->id.revision >= 11)
    - cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
    - ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);
    ssb_pmu_init(cc);
    chipco_powercontrol_init(cc);
    ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
    --- a/drivers/ssb/driver_chipcommon_pmu.c
    +++ b/drivers/ssb/driver_chipcommon_pmu.c
    @@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struc
    chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
    }

    -/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */
    void ssb_pmu_init(struct ssb_chipcommon *cc)
    {
    + struct ssb_bus *bus = cc->dev->bus;
    u32 pmucap;

    if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
    @@ -516,12 +516,15 @@ void ssb_pmu_init(struct ssb_chipcommon
    ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
    cc->pmu.rev, pmucap);

    - if (cc->pmu.rev == 1)
    - chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
    - ~SSB_CHIPCO_PMU_CTL_NOILPONW);
    - else
    - chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
    - SSB_CHIPCO_PMU_CTL_NOILPONW);
    + if (cc->pmu.rev >= 1) {
    + if ((bus->chip_id == 0x4325) && (bus->chip_rev < 2)) {
    + chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
    + ~SSB_CHIPCO_PMU_CTL_NOILPONW);
    + } else {
    + chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
    + SSB_CHIPCO_PMU_CTL_NOILPONW);
    + }
    + }
    ssb_pmu_pll_init(cc);
    ssb_pmu_resources_init(cc);
    }
    --- 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
    {
    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
    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_
    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.
    --- a/drivers/ssb/sprom.c
    +++ b/drivers/ssb/sprom.c
    @@ -176,18 +176,3 @@ const struct ssb_sprom *ssb_get_fallback
    {
    return fallback_sprom;
    }
    -
    -/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
    -bool ssb_is_sprom_available(struct ssb_bus *bus)
    -{
    - /* status register only exists on chipcomon rev >= 11 and we need check
    - for >= 31 only */
    - /* this routine differs from specs as we do not access SPROM directly
    - on PCMCIA */
    - if (bus->bustype == SSB_BUSTYPE_PCI &&
    - bus->chipco.dev && /* can be unavailible! */
    - bus->chipco.dev->id.revision >= 31)
    - return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
    -
    - return true;
    -}
    --- a/include/linux/ssb/ssb.h
    +++ b/include/linux/ssb/ssb.h
    @@ -306,7 +306,6 @@ struct ssb_bus {
    u16 chip_id;
    u16 chip_rev;
    u16 sprom_size; /* number of words in sprom */
    - u16 sprom_offset;
    u8 chip_package;

    /* List of devices (cores) on the backplane. */
    --- a/include/linux/ssb/ssb_driver_chipcommon.h
    +++ b/include/linux/ssb/ssb_driver_chipcommon.h
    @@ -46,7 +46,6 @@
    #define SSB_PLLTYPE_7 0x00038000 /* 25Mhz, 4 dividers */
    #define SSB_CHIPCO_CAP_PCTL 0x00040000 /* Power Control */
    #define SSB_CHIPCO_CAP_OTPS 0x00380000 /* OTP size */
    -#define SSB_CHIPCO_CAP_SPROM 0x40000000 /* SPROM present */
    #define SSB_CHIPCO_CAP_OTPS_SHIFT 19
    #define SSB_CHIPCO_CAP_OTPS_BASE 5
    #define SSB_CHIPCO_CAP_JTAGM 0x00400000 /* JTAG master present */
    @@ -565,7 +564,6 @@ struct ssb_chipcommon_pmu {
    struct ssb_chipcommon {
    struct ssb_device *dev;
    u32 capabilities;
    - u32 status;
    /* Fast Powerup Delay constant */
    u16 fast_pwrup_delay;
    struct ssb_chipcommon_pmu pmu;
    --- a/include/linux/ssb/ssb_regs.h
    +++ b/include/linux/ssb/ssb_regs.h
    @@ -170,8 +170,7 @@
    #define SSB_SPROMSIZE_WORDS_R4 220
    #define SSB_SPROMSIZE_BYTES_R123 (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
    #define SSB_SPROMSIZE_BYTES_R4 (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
    -#define SSB_SPROM_BASE1 0x1000
    -#define SSB_SPROM_BASE31 0x0800
    +#define SSB_SPROM_BASE 0x1000
    #define SSB_SPROM_REVISION 0x107E
    #define SSB_SPROM_REVISION_REV 0x00FF /* SPROM Revision number */
    #define SSB_SPROM_REVISION_CRC 0xFF00 /* SPROM CRC8 value */



    \
     
     \ /
      Last update: 2010-08-06 21:31    [W:0.032 / U:30.888 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site