From 50ff51e118b8c1dc098fd2d26d2235bd1add458c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 12 Jan 2016 20:52:19 +0000 Subject: kernel/4.3: update to version 4.3.3 Signed-off-by: Hauke Mehrtens drivers/net/ethernet/intel/igb/e1000_phy.h | 6 ++- 3 files changed, 58 insertions(+), 26 deletions(-) -Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_82575.c -=================================================================== ---- linux-4.3.orig/drivers/net/ethernet/intel/igb/e1000_82575.c 2015-11-01 16:05:25.000000000 -0800 -+++ linux-4.3/drivers/net/ethernet/intel/igb/e1000_82575.c 2015-12-18 10:43:28.000000000 -0800 -@@ -2153,7 +2153,7 @@ +--- a/drivers/net/ethernet/intel/igb/e1000_82575.c ++++ b/drivers/net/ethernet/intel/igb/e1000_82575.c +@@ -2153,7 +2153,7 @@ static s32 igb_read_phy_reg_82580(struct if (ret_val) goto out; @@ -27,7 +25,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_82575.c hw->phy.ops.release(hw); -@@ -2178,7 +2178,7 @@ +@@ -2178,7 +2178,7 @@ static s32 igb_write_phy_reg_82580(struc if (ret_val) goto out; @@ -36,11 +34,9 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_82575.c hw->phy.ops.release(hw); -Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c -=================================================================== ---- linux-4.3.orig/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-12-18 10:39:44.931158318 -0800 -+++ linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c 2015-12-18 10:39:44.939158318 -0800 -@@ -126,9 +126,8 @@ +--- a/drivers/net/ethernet/intel/igb/e1000_phy.c ++++ b/drivers/net/ethernet/intel/igb/e1000_phy.c +@@ -126,9 +126,8 @@ out: * Reads the MDI control regsiter in the PHY at offset and stores the * information read to data. **/ @@ -51,7 +47,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c u32 i, mdicnfg, mdic = 0; s32 ret_val = 0; -@@ -147,14 +146,14 @@ +@@ -147,14 +146,14 @@ s32 igb_read_phy_reg_mdic(struct e1000_h case e1000_i211: mdicnfg = rd32(E1000_MDICNFG); mdicnfg &= ~(E1000_MDICNFG_PHY_MASK); @@ -68,7 +64,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c (E1000_MDIC_OP_READ)); break; } -@@ -208,9 +207,8 @@ +@@ -208,9 +207,8 @@ out: * * Writes data to MDI control register in the PHY at offset. **/ @@ -79,7 +75,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c u32 i, mdicnfg, mdic = 0; s32 ret_val = 0; -@@ -229,7 +227,7 @@ +@@ -229,7 +227,7 @@ s32 igb_write_phy_reg_mdic(struct e1000_ case e1000_i211: mdicnfg = rd32(E1000_MDICNFG); mdicnfg &= ~(E1000_MDICNFG_PHY_MASK); @@ -88,7 +84,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c wr32(E1000_MDICNFG, mdicnfg); mdic = (((u32)data) | (offset << E1000_MDIC_REG_SHIFT) | -@@ -238,7 +236,7 @@ +@@ -238,7 +236,7 @@ s32 igb_write_phy_reg_mdic(struct e1000_ default: mdic = (((u32)data) | (offset << E1000_MDIC_REG_SHIFT) | @@ -97,7 +93,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c (E1000_MDIC_OP_WRITE)); break; } -@@ -458,7 +456,7 @@ +@@ -458,7 +456,7 @@ s32 igb_read_phy_reg_igp(struct e1000_hw goto out; if (offset > MAX_PHY_MULTI_PAGE_REG) { @@ -106,7 +102,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c IGP01E1000_PHY_PAGE_SELECT, (u16)offset); if (ret_val) { -@@ -467,8 +465,8 @@ +@@ -467,8 +465,8 @@ s32 igb_read_phy_reg_igp(struct e1000_hw } } @@ -117,7 +113,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c hw->phy.ops.release(hw); -@@ -497,7 +495,7 @@ +@@ -497,7 +495,7 @@ s32 igb_write_phy_reg_igp(struct e1000_h goto out; if (offset > MAX_PHY_MULTI_PAGE_REG) { @@ -126,7 +122,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c IGP01E1000_PHY_PAGE_SELECT, (u16)offset); if (ret_val) { -@@ -506,8 +504,8 @@ +@@ -506,8 +504,8 @@ s32 igb_write_phy_reg_igp(struct e1000_h } } @@ -137,7 +133,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c hw->phy.ops.release(hw); -@@ -2547,8 +2545,9 @@ +@@ -2547,8 +2545,9 @@ out: } /** @@ -148,7 +144,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c * @offset: lower half is register offset to write to * upper half is page to use. * @data: data to write at register offset -@@ -2556,7 +2555,7 @@ +@@ -2556,7 +2555,7 @@ out: * Acquires semaphore, if necessary, then writes the data to PHY register * at the offset. Release any acquired semaphores before exiting. **/ @@ -157,7 +153,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c { s32 ret_val; u16 page = offset >> GS40G_PAGE_SHIFT; -@@ -2566,10 +2565,10 @@ +@@ -2566,10 +2565,10 @@ s32 igb_write_phy_reg_gs40g(struct e1000 if (ret_val) return ret_val; @@ -170,7 +166,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c release: hw->phy.ops.release(hw); -@@ -2577,8 +2576,24 @@ +@@ -2577,8 +2576,24 @@ release: } /** @@ -196,7 +192,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c * @offset: lower half is register offset to read to * upper half is page to use. * @data: data to read at register offset -@@ -2586,7 +2601,7 @@ +@@ -2586,7 +2601,7 @@ release: * Acquires semaphore, if necessary, then reads the data in the PHY register * at the offset. Release any acquired semaphores before exiting. **/ @@ -205,7 +201,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c { s32 ret_val; u16 page = offset >> GS40G_PAGE_SHIFT; -@@ -2596,10 +2611,10 @@ +@@ -2596,10 +2611,10 @@ s32 igb_read_phy_reg_gs40g(struct e1000_ if (ret_val) return ret_val; @@ -218,7 +214,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c release: hw->phy.ops.release(hw); -@@ -2607,6 +2622,21 @@ +@@ -2607,6 +2622,21 @@ release: } /** @@ -240,11 +236,9 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.c * igb_set_master_slave_mode - Setup PHY for Master/slave mode * @hw: pointer to the HW structure * -Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.h -=================================================================== ---- linux-4.3.orig/drivers/net/ethernet/intel/igb/e1000_phy.h 2015-11-01 16:05:25.000000000 -0800 -+++ linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.h 2015-12-18 10:39:44.939158318 -0800 -@@ -62,8 +62,8 @@ +--- a/drivers/net/ethernet/intel/igb/e1000_phy.h ++++ b/drivers/net/ethernet/intel/igb/e1000_phy.h +@@ -62,8 +62,8 @@ void igb_power_up_phy_copper(struct e100 void igb_power_down_phy_copper(struct e1000_hw *hw); s32 igb_phy_init_script_igp3(struct e1000_hw *hw); s32 igb_initialize_M88E1512_phy(struct e1000_hw *hw); @@ -255,7 +249,7 @@ Index: linux-4.3/drivers/net/ethernet/intel/igb/e1000_phy.h s32 igb_read_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 *data); s32 igb_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data); s32 igb_read_sfp_data_byte(struct e1000_hw *hw, u16 offset, u8 *data); -@@ -73,6 +73,8 @@ +@@ -73,6 +73,8 @@ s32 igb_phy_force_speed_duplex_82580(st s32 igb_get_cable_length_82580(struct e1000_hw *hw); s32 igb_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data); s32 igb_write_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 data); -- cgit v1.2.3