From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id B7E131150 for ; Wed, 16 Jan 2019 19:55:24 +0100 (CET) Received: by mail-pf1-f193.google.com with SMTP id 64so3482758pfr.9 for ; Wed, 16 Jan 2019 10:55:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1OTWqFkbxSHEA9vga/kxXBFsEFto4dN5B1Hjr7D4eK8=; b=VrAixoVAGqYeyTm4U/rf4YMhmHnlcXCAYVNCvfvbO9oUsg3Fz16z6W/wR3piInHLq9 jkXlbpPlRmWECiGTmE+vgNGLGCfuuOrCqFeu4zDs7Eoy2XW3Uw9ci9n8rxaWXLKG7UqI aEs/UAUmZcQVI/I5OANUGwUIczj5lr/It7rVASY6skDUD0KY30xyN0igOa6oUJe/0buh xIjP/lP1p7MH4hYp03GPFn8531INCQYQJ2ucu9Ajv9o9Xm30ws6+BQRXdkCccHLZlQqe fLn5mjxVUy4EVSi0CLPwZmOQvRMQQxsDxiAgK5xb9XmFFh1IGze1Z8JNtlnVYLgOsBV6 /Ljw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1OTWqFkbxSHEA9vga/kxXBFsEFto4dN5B1Hjr7D4eK8=; b=afW4B0A3YMMEFnKw8+lfZ2UfXSz18lEDOXE6xoyFrPpNrBTYRhYnYScGi/vQedZQYR 0/2RxONuo6Fe/VVhz6Y279KcSG8Ij5z+yH4hEqNPqWYliIwB2nk/isX+JhSl12BjB7Cu bdmbHdLVTyKEKUnjoVloZNbfhPG3Lp0g5rMcgGAs0Ai8eJBuZ5ssz2P1aNhKQdvXxQYe WWldIM/geTRBQD0lKTTFUbNVZiKGf2lYyfFcdlzjeipA1ttb91UXZ6iK9QEZA+QuHh2Y hvDAIft58vKlb4G/xUteA7xjcrj/rIAF9zoRyC1dP8QervEZmAwCjnlZmUBMC+hCfA2v Y8qg== X-Gm-Message-State: AJcUukcnaeosJutqd2uP3V/ZKXnERwsFjM9HoC84QRzPAaFV2qR4D1Kr 9/LJdosCZDAmLLN4B92zkiGpdA== X-Google-Smtp-Source: ALg8bN6bn2zU6vm6WpBA3dBtSyT43R8Hvdx+OmWomCzZHo+9NUSRtP8v82dO7o9E/J7BC77ee1PWpA== X-Received: by 2002:a62:5b83:: with SMTP id p125mr11374541pfb.116.1547664923599; Wed, 16 Jan 2019 10:55:23 -0800 (PST) Received: from shemminger-XPS-13-9360 ([167.220.104.105]) by smtp.gmail.com with ESMTPSA id i62sm7130648pge.44.2019.01.16.10.55.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Jan 2019 10:55:23 -0800 (PST) Date: Wed, 16 Jan 2019 10:55:21 -0800 From: Stephen Hemminger To: Ye Xiaolong Cc: dev@dpdk.org, Ferruh Yigit Message-ID: <20190116105521.0254cdb2@shemminger-XPS-13-9360> In-Reply-To: <20190116074836.GB39571@intel.com> References: <20190115154626.34516-1-xiaolong.ye@intel.com> <20190116003452.37403-1-xiaolong.ye@intel.com> <20190115173822.25a4a979@shemminger-XPS-13-9360> <20190116074836.GB39571@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2] igb_uio: remove out-of-date comment X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 18:55:25 -0000 On Wed, 16 Jan 2019 15:48:36 +0800 Ye Xiaolong wrote: > Hi, Stephen > > On 01/15, Stephen Hemminger wrote: > >On Wed, 16 Jan 2019 08:34:52 +0800 > >Xiaolong Ye wrote: > > > >> The comment for igbuio_pci_irqhandler is out of date as the code evolves, > >> remove it to avoid misleading. > >> > >> Signed-off-by: Xiaolong Ye > >> --- > >> kernel/linux/igb_uio/igb_uio.c | 4 ---- > >> 1 file changed, 4 deletions(-) > >> > >> diff --git a/kernel/linux/igb_uio/igb_uio.c b/kernel/linux/igb_uio/igb_uio.c > >> index 3cf394bdf..d6ac51e79 100644 > >> --- a/kernel/linux/igb_uio/igb_uio.c > >> +++ b/kernel/linux/igb_uio/igb_uio.c > >> @@ -185,10 +185,6 @@ igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state) > >> return 0; > >> } > >> > >> -/** > >> - * This is interrupt handler which will check if the interrupt is for the right device. > >> - * If yes, disable it here and will be enable later. > >> - */ > >> static irqreturn_t > >> igbuio_pci_irqhandler(int irq, void *dev_id) > >> { > > > >The comment is partially correct; if you look at the legacy case. > > > >Maybe better to move the comment to pci_check_and_mask_intx in compat.h? > >I see there is another incorrect comment there. > > > > As I tried to understand pci_check_and_mask_intx behavior, I noticed that it > was introduced by commit 399a3f0d ("igb_uio: fix IRQ mode handling"), and it > was derived from igbuio_set_interrupt_mask, however there were two parameters > in igbuio_set_interrupt_mask as below: > > static int > igbuio_set_interrupt_mask(struct rte_uio_pci_dev *udev, int32_t state) > > while the pci_check_and_mask_intx only has 1 parameter, > > static bool pci_check_and_mask_intx(struct pci_dev *pdev) > > but in its function body it still use the "state" accorrding to commit 399a3f0d > > +static bool pci_check_and_mask_intx(struct pci_dev *pdev) > { > - /* Some function names changes between 3.2.0 and 3.3.0... */ > -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) > - pci_unblock_user_cfg_access(pdev); > -#else > - pci_cfg_access_unlock(pdev); > -#endif > + bool pending; > + uint32_t status; > + > + pci_block_user_cfg_access(dev); > + pci_read_config_dword(pdev, PCI_COMMAND, &status); > + > + /* interrupt is not ours, goes to out */ > + pending = (((status >> 16) & PCI_STATUS_INTERRUPT) != 0); > + if (pending) { > + uint16_t old, new; > + > + old = status; > + if (state != 0) <=========================== state still in use > + new = old & (~PCI_COMMAND_INTX_DISABLE); > + else > + new = old | PCI_COMMAND_INTX_DISABLE; > + > + if (old != new) > + pci_write_config_word(pdev, PCI_COMMAND, new); > + } > + pci_unblock_user_cfg_access(dev); > + > + return pending; > > and later this was fixed as a typo in commit 5b2f8137 ("igb_uio: fix typos for > kernel older than 3.3") which seems not correct. > > old = status; > - if (state != 0) > + if (status != 0) > > I feel like that pci_check_and_mask_intx still needs two parameters from code > point of view, please correct me if I was wrong or miss anything, or you think > it's sensible, I'll cook a patch for it. > > Thanks, > Xiaolong This code is copy of upstream kernel function, you should look at that.