From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by dpdk.org (Postfix) with ESMTP id 37CCA2C36 for ; Sun, 23 Jul 2017 21:08:14 +0200 (CEST) Received: by mail-pg0-f65.google.com with SMTP id d193so9796776pgc.2 for ; Sun, 23 Jul 2017 12:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zOHhuhkVSSHWR/K/Lb3Q8kBqlZ5QRJ+NoxGxZ4mLJuc=; b=FN06PL96/rgIn/H9/PBGW2Ae7SltyxkTzfss2FtJMMuD7/Lh0FUveH3/R22FDOAvJL 1OGt9fHw238W7lvOzv4KZDMD0gKltn8uYLQ5JI9CpI/ZhN6lgWsaCAAjU1AyUV6HrG26 CXbeoBZprDCj+uGceJdM3hQ2ASsRLee/OhCCuJQsnQSvkC31mVVxfU7Ducwu1azjUmkh o85Q331iF7Du+2Vc+6iLNOg1mrA5wEB3NGT9USnwcGjoBXJDmNIbTCc9fbc6jRaJfUp8 IxvA2f8Sms71wRA/1pMoe9gftC/CVfH2baVrpgbN4OKdnI2Izt5nQJbfdRqM2fvf+0jO b6pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zOHhuhkVSSHWR/K/Lb3Q8kBqlZ5QRJ+NoxGxZ4mLJuc=; b=EVwFuBcsK2G+7cRllZRYN0EqFQnQXjMUIJuGc5IA5RxHqN5HeEE8RGymHfvSbwRJea 8zOVdgAUY8B6dTg7mwZrnQ2WakCvN94oEh2s8CNCvZZmYp5TRpa33PldxYupI0NPsGWD Vngn2PH9Clg6kWcGsgNmyiwp29H05FTN+g+h00cwD8P+Hcy0yCnBBJ8ADziqv+U1NbhT tqmdohh38YDDw/0jQCFmmPeXoqXyCkqXvhbhrdcEWlJrxSPCF15uqn62T5U+m4sLuoOM 0pqHdR/Xh4IUjyzSBL9bXHVBz91JjwdehAHpbnp3lL6OAKld2JdcY5seubJNzOFFo4EV w/YA== X-Gm-Message-State: AIVw113k1RON63Wa5UXjKu/18i1z1IXvATY/gCGTUF3tILsp1/nKMWrX HKSdOFC2f6myaW/k X-Received: by 10.84.131.163 with SMTP id d32mr15047709pld.16.1500836893471; Sun, 23 Jul 2017 12:08:13 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id h125sm16827454pfe.178.2017.07.23.12.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Jul 2017 12:08:12 -0700 (PDT) From: Yuanhan Liu To: Jingjing Wu Cc: Wenzhuo Lu , dpdk stable Date: Mon, 24 Jul 2017 03:07:27 +0800 Message-Id: <1500836852-3563-2-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500836852-3563-1-git-send-email-yliu@fridaylinux.org> References: <1500836852-3563-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/e1000: fix LSC interrupt' has been queued to LTS release 16.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2017 19:08:14 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/27/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 379145b8b31c122cbf8507e111f57f897315ff95 Mon Sep 17 00:00:00 2001 From: Jingjing Wu Date: Thu, 13 Jul 2017 17:43:23 +0800 Subject: [PATCH] net/e1000: fix LSC interrupt [ upstream commit 5ed76cd749ae90206e3e58444c76faae6aa7deae ] If LSC flag is changed to off at last device start, the enable flag is not cleared in HW. This patch fixes it. Fixes: c3cd3de0ab50 ("igb: enable Rx queue interrupts for PF") Signed-off-by: Jingjing Wu Acked-by: Wenzhuo Lu --- drivers/net/e1000/igb_ethdev.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 0a94ecc..9cf619f 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -129,7 +129,7 @@ static int eth_igb_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); static int eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); -static int eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev); +static int eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on); static int eth_igb_rxq_interrupt_setup(struct rte_eth_dev *dev); static int eth_igb_interrupt_get_status(struct rte_eth_dev *dev); static int eth_igb_interrupt_action(struct rte_eth_dev *dev); @@ -1381,7 +1381,9 @@ eth_igb_start(struct rte_eth_dev *dev) if (rte_intr_allow_others(intr_handle)) { /* check if lsc interrupt is enabled */ if (dev->data->dev_conf.intr_conf.lsc != 0) - eth_igb_lsc_interrupt_setup(dev); + eth_igb_lsc_interrupt_setup(dev, TRUE); + else + eth_igb_lsc_interrupt_setup(dev, FALSE); } else { rte_intr_callback_unregister(intr_handle, eth_igb_interrupt_handler, @@ -2543,18 +2545,23 @@ eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask) * * @param dev * Pointer to struct rte_eth_dev. + * @param on + * Enable or Disable * * @return * - On success, zero. * - On failure, a negative value. */ static int -eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev) +eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on) { struct e1000_interrupt *intr = E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private); - intr->mask |= E1000_ICR_LSC; + if (on) + intr->mask |= E1000_ICR_LSC; + else + intr->mask &= ~E1000_ICR_LSC; return 0; } -- 2.7.4