Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/955588/?format=api
{ "id": 955588, "url": "http://patchwork.ozlabs.org/api/patches/955588/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180809132903.22819-2-anirudh.venkataramanan@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180809132903.22819-2-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-08-09T13:28:51", "name": "[v4,01/13] ice: Fix multiple static analyser warnings", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8e822db0f723ab857a7d92208d04134aec9a7756", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180809132903.22819-2-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 60077, "url": "http://patchwork.ozlabs.org/api/series/60077/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=60077", "date": "2018-08-09T13:28:50", "name": "Bug fixes for ice", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/60077/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/955588/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/955588/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41mTcc40qlz9s1x\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 9 Aug 2018 23:29:19 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8880F879CF;\n\tThu, 9 Aug 2018 13:29:18 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id VWZcYgkiGiC6; Thu, 9 Aug 2018 13:29:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D11DA8790E;\n\tThu, 9 Aug 2018 13:29:15 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id CCEE11C3F93\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id CA8F6240C4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:14 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id uphp+ddxjOFX for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:14 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 28D23220E2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:14 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t09 Aug 2018 06:29:14 -0700", "from kyungmin-mobl.amr.corp.intel.com (HELO\n\tavenkata-mobl4.localdomain) ([10.254.101.153])\n\tby orsmga004.jf.intel.com with ESMTP; 09 Aug 2018 06:29:12 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,215,1531810800\"; d=\"scan'208\";a=\"223273511\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 9 Aug 2018 06:28:51 -0700", "Message-Id": "<20180809132903.22819-2-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20180809132903.22819-1-anirudh.venkataramanan@intel.com>", "References": "<20180809132903.22819-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v4 01/13] ice: Fix multiple static\n\tanalyser warnings", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This patch fixes the following smatch errors:\n\n1) Fix \"odd binop '0x0 & 0xc'\" when performing the bitwise-and with a\n constant value of zero (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128_FLAG).\n Remove a similar bitwise-and with 0 in ice_add_marker_act() and use the\n right mask ICE_LG_ACT_GENERIC_OFFSET_M in the expression.\n\n2) Fix a similar issue \"odd binop '0x0 & 0x1800' in ice_req_irq_msix_misc.\n\n3) Fix \"odd binop '0x380000 & 0x7fff8'\" in ice_add_marker_act(). Also, use\n a new define ICE_LG_ACT_GENERIC_OFF_RX_DESC_PROF_IDX instead of magic\n number '7'.\n\n4) Fix warn: odd binop '0x0 & 0x18' in ice_set_dflt_vsi_ctx() by removing\n unnecessary logic to explicitly unset bits 3 and 4 in port_vlan_bits.\n These bits are unset already by the memset on ctxt->info.\n\nReported-by: Dan Carpenter <dan.carpenter@oracle.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n .../net/ethernet/intel/ice/ice_adminq_cmd.h | 1 +\n drivers/net/ethernet/intel/ice/ice_common.c | 25 +++++++++++--------\n drivers/net/ethernet/intel/ice/ice_main.c | 19 ++++++--------\n drivers/net/ethernet/intel/ice/ice_switch.c | 4 +--\n 4 files changed, 25 insertions(+), 24 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 7541ec2270b3..6d3e11659ba5 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -594,6 +594,7 @@ struct ice_sw_rule_lg_act {\n #define ICE_LG_ACT_GENERIC_OFFSET_M\t(0x7 << ICE_LG_ACT_GENERIC_OFFSET_S)\n #define ICE_LG_ACT_GENERIC_PRIORITY_S\t22\n #define ICE_LG_ACT_GENERIC_PRIORITY_M\t(0x7 << ICE_LG_ACT_GENERIC_PRIORITY_S)\n+#define ICE_LG_ACT_GENERIC_OFF_RX_DESC_PROF_IDX\t7\n \n \t/* Action = 7 - Set Stat count */\n #define ICE_LG_ACT_STAT_COUNT\t\t0x7\ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex 71d032cc5fa7..d5300b606d5a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -1619,20 +1619,23 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, u16 vsi_id, u8 lut_type, u8 *lut,\n \t}\n \n \t/* LUT size is only valid for Global and PF table types */\n-\tif (lut_size == ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128) {\n-\t\tflags |= (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128_FLAG <<\n-\t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) &\n-\t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M;\n-\t} else if (lut_size == ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512) {\n+\tswitch (lut_size) {\n+\tcase ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_128:\n+\t\tbreak;\n+\tcase ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512:\n \t\tflags |= (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_512_FLAG <<\n \t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) &\n \t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M;\n-\t} else if ((lut_size == ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K) &&\n-\t\t (lut_type == ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF)) {\n-\t\tflags |= (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K_FLAG <<\n-\t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) &\n-\t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M;\n-\t} else {\n+\t\tbreak;\n+\tcase ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K:\n+\t\tif (lut_type == ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF) {\n+\t\t\tflags |= (ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_2K_FLAG <<\n+\t\t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_S) &\n+\t\t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_SIZE_M;\n+\t\t\tbreak;\n+\t\t}\n+\t\t/* fall-through */\n+\tdefault:\n \t\tstatus = ICE_ERR_PARAM;\n \t\tgoto ice_aq_get_set_rss_lut_exit;\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 5299caf55a7f..186e764a469a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -1352,14 +1352,13 @@ static void ice_set_dflt_vsi_ctx(struct ice_vsi_ctx *ctxt)\n \tctxt->info.sw_flags = ICE_AQ_VSI_SW_FLAG_SRC_PRUNE;\n \t/* Traffic from VSI can be sent to LAN */\n \tctxt->info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;\n-\t/* Allow all packets untagged/tagged */\n+\t/* By default bits 3 and 4 in port_vlan_flags are 0's which results in\n+\t * legacy behavior (show VLAN, DEI, and UP) in descriptor. Also, allow\n+\t * all packets untagged/tagged.\n+\t */\n \tctxt->info.port_vlan_flags = ((ICE_AQ_VSI_PVLAN_MODE_ALL &\n \t\t\t\t ICE_AQ_VSI_PVLAN_MODE_M) >>\n \t\t\t\t ICE_AQ_VSI_PVLAN_MODE_S);\n-\t/* Show VLAN/UP from packets in Rx descriptors */\n-\tctxt->info.port_vlan_flags |= ((ICE_AQ_VSI_PVLAN_EMOD_STR_BOTH &\n-\t\t\t\t\tICE_AQ_VSI_PVLAN_EMOD_M) >>\n-\t\t\t\t ICE_AQ_VSI_PVLAN_EMOD_S);\n \t/* Have 1:1 UP mapping for both ingress/egress tables */\n \ttable |= ICE_UP_TABLE_TRANSLATE(0, 0);\n \ttable |= ICE_UP_TABLE_TRANSLATE(1, 1);\n@@ -2058,15 +2057,13 @@ static int ice_req_irq_msix_misc(struct ice_pf *pf)\n skip_req_irq:\n \tice_ena_misc_vector(pf);\n \n-\tval = (pf->oicr_idx & PFINT_OICR_CTL_MSIX_INDX_M) |\n-\t (ICE_RX_ITR & PFINT_OICR_CTL_ITR_INDX_M) |\n-\t PFINT_OICR_CTL_CAUSE_ENA_M;\n+\tval = ((pf->oicr_idx & PFINT_OICR_CTL_MSIX_INDX_M) |\n+\t PFINT_OICR_CTL_CAUSE_ENA_M);\n \twr32(hw, PFINT_OICR_CTL, val);\n \n \t/* This enables Admin queue Interrupt causes */\n-\tval = (pf->oicr_idx & PFINT_FW_CTL_MSIX_INDX_M) |\n-\t (ICE_RX_ITR & PFINT_FW_CTL_ITR_INDX_M) |\n-\t PFINT_FW_CTL_CAUSE_ENA_M;\n+\tval = ((pf->oicr_idx & PFINT_FW_CTL_MSIX_INDX_M) |\n+\t PFINT_FW_CTL_CAUSE_ENA_M);\n \twr32(hw, PFINT_FW_CTL, val);\n \n \titr_gran = hw->itr_gran_200;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c\nindex 723d15f1e90b..6b7ec2ae5ad6 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.c\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.c\n@@ -645,14 +645,14 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,\n \tact |= (1 << ICE_LG_ACT_GENERIC_VALUE_S) & ICE_LG_ACT_GENERIC_VALUE_M;\n \tlg_act->pdata.lg_act.act[1] = cpu_to_le32(act);\n \n-\tact = (7 << ICE_LG_ACT_GENERIC_OFFSET_S) & ICE_LG_ACT_GENERIC_VALUE_M;\n+\tact = (ICE_LG_ACT_GENERIC_OFF_RX_DESC_PROF_IDX <<\n+\t ICE_LG_ACT_GENERIC_OFFSET_S) & ICE_LG_ACT_GENERIC_OFFSET_M;\n \n \t/* Third action Marker value */\n \tact |= ICE_LG_ACT_GENERIC;\n \tact |= (sw_marker << ICE_LG_ACT_GENERIC_VALUE_S) &\n \t\tICE_LG_ACT_GENERIC_VALUE_M;\n \n-\tact |= (0 << ICE_LG_ACT_GENERIC_OFFSET_S) & ICE_LG_ACT_GENERIC_VALUE_M;\n \tlg_act->pdata.lg_act.act[2] = cpu_to_le32(act);\n \n \t/* call the fill switch rule to fill the lookup tx rx structure */\n", "prefixes": [ "v4", "01/13" ] }