lkml.org 
[lkml]   [2012]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[v2.6.34-stable 041/165] e1000: Fix driver to be used on PA RISC C8000 workstations
    Date
    From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 upstream.

    The checksum field in the EEPROM on HPPA is really not a
    checksum but a signature (0x16d6). So allow 0x16d6 as the
    matching checksum on HPPA systems.

    This issue is present on longterm/stable kernels, I have
    verified that this patch is applicable back to at least
    2.6.32.y kernels.

    v2- changed ifdef to use CONFIG_PARISC instead of __hppa__

    CC: Guy Martin <gmsoft@tuxicoman.be>
    CC: Rolf Eike Beer <eike-kernel@sf-tec.de>
    CC: Matt Turner <mattst88@gmail.com>
    Reported-by: Mikulas Patocka <mikulas@artax.kerlin.mff.cuni.cz>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/net/e1000/e1000_hw.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
    index 8d7d87f..0d82be0 100644
    --- a/drivers/net/e1000/e1000_hw.c
    +++ b/drivers/net/e1000/e1000_hw.c
    @@ -3842,6 +3842,12 @@ s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
    checksum += eeprom_data;
    }

    +#ifdef CONFIG_PARISC
    + /* This is a signature and not a checksum on HP c8000 */
    + if ((hw->subsystem_vendor_id == 0x103C) && (eeprom_data == 0x16d6))
    + return E1000_SUCCESS;
    +
    +#endif
    if (checksum == (u16) EEPROM_SUM)
    return E1000_SUCCESS;
    else {
    --
    1.7.12.rc2


    \
     
     \ /
      Last update: 2012-08-15 23:43    [W:4.131 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site