[PATCH] ixgb: Fix EEPROM functions to be endian-aware

Fix EEPROM functions to be endian-aware

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ee.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ee.c

diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index 653e99f919cee638c23be7da3f02dc734b4ea00f..3aae110c55606ced13769acddf7d87c2649d1a4f 100644 (file)
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -411,7 +411,7 @@ ixgb_write_eeprom(struct ixgb_hw *hw, uint16_t offset, uint16_t data)
        ixgb_cleanup_eeprom(hw);
 
        /* clear the init_ctrl_reg_1 to signify that the cache is invalidated */
        ixgb_cleanup_eeprom(hw);
 
        /* clear the init_ctrl_reg_1 to signify that the cache is invalidated */

-       ee_map->init_ctrl_reg_1 = EEPROM_ICW1_SIGNATURE_CLEAR;
+       ee_map->init_ctrl_reg_1 = le16_to_cpu(EEPROM_ICW1_SIGNATURE_CLEAR);

 
        return;
 }
 
        return;
 }


@@ -483,7 +483,7 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw)
                DEBUGOUT("ixgb_ee: Checksum invalid.\n");
                /* clear the init_ctrl_reg_1 to signify that the cache is
                 * invalidated */
                DEBUGOUT("ixgb_ee: Checksum invalid.\n");
                /* clear the init_ctrl_reg_1 to signify that the cache is
                 * invalidated */

-               ee_map->init_ctrl_reg_1 = EEPROM_ICW1_SIGNATURE_CLEAR;
+               ee_map->init_ctrl_reg_1 = le16_to_cpu(EEPROM_ICW1_SIGNATURE_CLEAR);

                return (FALSE);
        }
 
                return (FALSE);
        }
 


@@ -579,7 +579,7 @@ ixgb_get_ee_compatibility(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->compatibility);
+               return (le16_to_cpu(ee_map->compatibility));

 
        return(0);
 }
 
        return(0);
 }


@@ -616,7 +616,7 @@ ixgb_get_ee_init_ctrl_reg_1(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->init_ctrl_reg_1);
+               return (le16_to_cpu(ee_map->init_ctrl_reg_1));

 
        return(0);
 }
 
        return(0);
 }


@@ -635,7 +635,7 @@ ixgb_get_ee_init_ctrl_reg_2(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->init_ctrl_reg_2);
+               return (le16_to_cpu(ee_map->init_ctrl_reg_2));

 
        return(0);
 }
 
        return(0);
 }


@@ -654,7 +654,7 @@ ixgb_get_ee_subsystem_id(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-          return(ee_map->subsystem_id);
+               return (le16_to_cpu(ee_map->subsystem_id));

 
        return(0);
 }
 
        return(0);
 }


@@ -673,7 +673,7 @@ ixgb_get_ee_subvendor_id(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->subvendor_id);
+               return (le16_to_cpu(ee_map->subvendor_id));

 
        return(0);
 }
 
        return(0);
 }


@@ -692,7 +692,7 @@ ixgb_get_ee_device_id(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->device_id);
+               return (le16_to_cpu(ee_map->device_id));

 
        return(0);
 }
 
        return(0);
 }


@@ -711,7 +711,7 @@ ixgb_get_ee_vendor_id(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->vendor_id);
+               return (le16_to_cpu(ee_map->vendor_id));

 
        return(0);
 }
 
        return(0);
 }


@@ -730,7 +730,7 @@ ixgb_get_ee_swdpins_reg(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->swdpins_reg);
+               return (le16_to_cpu(ee_map->swdpins_reg));

 
        return(0);
 }
 
        return(0);
 }


@@ -749,7 +749,7 @@ ixgb_get_ee_d3_power(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->d3_power);
+               return (le16_to_cpu(ee_map->d3_power));

 
        return(0);
 }
 
        return(0);
 }


@@ -768,7 +768,7 @@ ixgb_get_ee_d0_power(struct ixgb_hw *hw)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)
        struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
        if(ixgb_check_and_get_eeprom_data(hw) == TRUE)

-               return(ee_map->d0_power);
+               return (le16_to_cpu(ee_map->d0_power));

 
        return(0);
 }
 
        return(0);
 }