Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 7597,
    "url": "http://patches.dpdk.org/api/patches/7597/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1444804479-14840-35-git-send-email-wenzhuo.lu@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<1444804479-14840-35-git-send-email-wenzhuo.lu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1444804479-14840-35-git-send-email-wenzhuo.lu@intel.com",
    "date": "2015-10-14T06:34:39",
    "name": "[dpdk-dev,34/34] e1000/base: some minor change",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "cf87010e0eec3125e697820a4ae6b4d66f5eebad",
    "submitter": {
        "id": 258,
        "url": "http://patches.dpdk.org/api/people/258/?format=api",
        "name": "Wenzhuo Lu",
        "email": "wenzhuo.lu@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1444804479-14840-35-git-send-email-wenzhuo.lu@intel.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/7597/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/7597/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id BF41C926A;\n\tWed, 14 Oct 2015 08:36:07 +0200 (CEST)",
            "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 7B5659268\n\tfor <dev@dpdk.org>; Wed, 14 Oct 2015 08:36:05 +0200 (CEST)",
            "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga103.fm.intel.com with ESMTP; 13 Oct 2015 23:36:05 -0700",
            "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga002.fm.intel.com with ESMTP; 13 Oct 2015 23:36:04 -0700",
            "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t9E6a2Ej001843;\n\tWed, 14 Oct 2015 14:36:02 +0800",
            "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t9E6ZxSi015115; Wed, 14 Oct 2015 14:36:01 +0800",
            "(from wenzhuol@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t9E6Zwsu015111; \n\tWed, 14 Oct 2015 14:35:58 +0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.17,681,1437462000\"; d=\"scan'208\";a=\"826490856\"",
        "From": "Wenzhuo Lu <wenzhuo.lu@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Wed, 14 Oct 2015 14:34:39 +0800",
        "Message-Id": "<1444804479-14840-35-git-send-email-wenzhuo.lu@intel.com>",
        "X-Mailer": "git-send-email 1.7.4.1",
        "In-Reply-To": "<1444804479-14840-1-git-send-email-wenzhuo.lu@intel.com>",
        "References": "<1444804479-14840-1-git-send-email-wenzhuo.lu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 34/34] e1000/base: some minor change",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <dev.dpdk.org>",
        "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Some minor code change. No functionality impact.\n\nSigned-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>\n---\n drivers/net/e1000/base/e1000_ich8lan.c | 27 ++++++++++++---------------\n drivers/net/e1000/base/e1000_ich8lan.h |  1 +\n 2 files changed, 13 insertions(+), 15 deletions(-)",
    "diff": "diff --git a/drivers/net/e1000/base/e1000_ich8lan.c b/drivers/net/e1000/base/e1000_ich8lan.c\nindex f62ad0b..89d07e9 100644\n--- a/drivers/net/e1000/base/e1000_ich8lan.c\n+++ b/drivers/net/e1000/base/e1000_ich8lan.c\n@@ -1442,7 +1442,6 @@ STATIC s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)\n \t\t\tret_val = e1000_disable_ulp_lpt_lp(hw, false);\n \t\telse\n \t\t\tret_val = e1000_enable_ulp_lpt_lp(hw, false);\n-\n \t\tif (ret_val)\n \t\t\treturn ret_val;\n \t}\n@@ -2979,7 +2978,6 @@ STATIC s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)\n \tu16 oem_reg;\n \n \tDEBUGFUNC(\"e1000_set_lplu_state_pchlan\");\n-\n \tret_val = hw->phy.ops.read_reg(hw, HV_OEM_BITS, &oem_reg);\n \tif (ret_val)\n \t\treturn ret_val;\n@@ -3199,6 +3197,7 @@ STATIC s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)\n \tstruct e1000_nvm_info *nvm = &hw->nvm;\n \tu32 bank1_offset = nvm->flash_bank_size * sizeof(u16);\n \tu32 act_offset = E1000_ICH_NVM_SIG_WORD * 2 + 1;\n+\tu32 nvm_dword = 0;\n \tu8 sig_byte = 0;\n \ts32 ret_val;\n \n@@ -3506,12 +3505,10 @@ STATIC s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,\n \t\thsflctl.hsf_ctrl.fldbcount = size - 1;\n \t\thsflctl.hsf_ctrl.flcycle = ICH_CYCLE_READ;\n \t\tE1000_WRITE_FLASH_REG16(hw, ICH_FLASH_HSFCTL, hsflctl.regval);\n-\n \t\tE1000_WRITE_FLASH_REG(hw, ICH_FLASH_FADDR, flash_linear_addr);\n \n-\t\tret_val =\n-\t\t    e1000_flash_cycle_ich8lan(hw,\n-\t\t\t\t\t      ICH_FLASH_READ_COMMAND_TIMEOUT);\n+\t\tret_val = e1000_flash_cycle_ich8lan(hw,\n+\t\t\t\t\t\tICH_FLASH_READ_COMMAND_TIMEOUT);\n \n \t\t/* Check if FCERR is set to 1, if set to 1, clear it\n \t\t * and try the whole sequence a few more times, else\n@@ -3546,6 +3543,7 @@ STATIC s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,\n \treturn ret_val;\n }\n \n+\n /**\n  *  e1000_write_nvm_ich8lan - Write word(s) to the NVM\n  *  @hw: pointer to the HW structure\n@@ -3599,7 +3597,7 @@ STATIC s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)\n \tstruct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;\n \tu32 i, act_offset, new_bank_offset, old_bank_offset, bank;\n \ts32 ret_val;\n-\tu16 data;\n+\tu16 data = 0;\n \n \tDEBUGFUNC(\"e1000_update_nvm_checksum_ich8lan\");\n \n@@ -3635,12 +3633,7 @@ STATIC s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)\n \t\tif (ret_val)\n \t\t\tgoto release;\n \t}\n-\n \tfor (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {\n-\t\t/* Determine whether to write the value stored\n-\t\t * in the other NVM bank or a modified value stored\n-\t\t * in the shadow RAM\n-\t\t */\n \t\tif (dev_spec->shadow_ram[i].modified) {\n \t\t\tdata = dev_spec->shadow_ram[i].value;\n \t\t} else {\n@@ -3650,7 +3643,6 @@ STATIC s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)\n \t\t\tif (ret_val)\n \t\t\t\tbreak;\n \t\t}\n-\n \t\t/* If the word is 0x13, then make sure the signature bits\n \t\t * (15:14) are 11b until the commit has completed.\n \t\t * This will allow us to write 10b which indicates the\n@@ -3665,6 +3657,7 @@ STATIC s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)\n \t\tact_offset = (i + new_bank_offset) << 1;\n \n \t\tusec_delay(100);\n+\n \t\t/* Write the bytes to the new bank. */\n \t\tret_val = e1000_retry_write_flash_byte_ich8lan(hw,\n \t\t\t\t\t\t\t       act_offset,\n@@ -3699,8 +3692,7 @@ STATIC s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)\n \t\tgoto release;\n \n \tdata &= 0xBFFF;\n-\tret_val = e1000_retry_write_flash_byte_ich8lan(hw,\n-\t\t\t\t\t\t       act_offset * 2 + 1,\n+\tret_val = e1000_retry_write_flash_byte_ich8lan(hw, act_offset * 2 + 1,\n \t\t\t\t\t\t       (u8)(data >> 8));\n \tif (ret_val)\n \t\tgoto release;\n@@ -3711,7 +3703,9 @@ STATIC s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)\n \t * to 1's. We can write 1's to 0's without an erase\n \t */\n \tact_offset = (old_bank_offset + E1000_ICH_NVM_SIG_WORD) * 2 + 1;\n+\n \tret_val = e1000_retry_write_flash_byte_ich8lan(hw, act_offset, 0);\n+\n \tif (ret_val)\n \t\tgoto release;\n \n@@ -3865,6 +3859,7 @@ STATIC s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,\n \treturn ret_val;\n }\n \n+\n /**\n  *  e1000_write_flash_byte_ich8lan - Write a single byte to NVM\n  *  @hw: pointer to the HW structure\n@@ -3883,6 +3878,8 @@ STATIC s32 e1000_write_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,\n \treturn e1000_write_flash_data_ich8lan(hw, offset, 1, word);\n }\n \n+\n+\n /**\n  *  e1000_retry_write_flash_byte_ich8lan - Writes a single byte to NVM\n  *  @hw: pointer to the HW structure\ndiff --git a/drivers/net/e1000/base/e1000_ich8lan.h b/drivers/net/e1000/base/e1000_ich8lan.h\nindex c54e4e7..33e77fb 100644\n--- a/drivers/net/e1000/base/e1000_ich8lan.h\n+++ b/drivers/net/e1000/base/e1000_ich8lan.h\n@@ -117,6 +117,7 @@ POSSIBILITY OF SUCH DAMAGE.\n #define E1000_FEXTNVM6_K1_OFF_ENABLE\t0x80000000\n /* bit for disabling packet buffer read */\n #define E1000_FEXTNVM7_DISABLE_PB_READ\t0x00040000\n+#define E1000_FEXTNVM7_SIDE_CLK_UNGATE\t0x00000004\n #if !defined(EXTERNAL_RELEASE) || defined(ULP_SUPPORT)\n #define E1000_FEXTNVM7_DISABLE_SMB_PERST\t0x00000020\n #endif /* !EXTERNAL_RELEASE || ULP_SUPPORT */\n",
    "prefixes": [
        "dpdk-dev",
        "34/34"
    ]
}