From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0591FC43334 for ; Tue, 4 Sep 2018 14:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A59C2086A for ; Tue, 4 Sep 2018 14:12:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZzLcPbXP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A59C2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727397AbeIDShq (ORCPT ); Tue, 4 Sep 2018 14:37:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:55662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726956AbeIDShq (ORCPT ); Tue, 4 Sep 2018 14:37:46 -0400 Received: from localhost (173-25-171-118.client.mchsi.com [173.25.171.118]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF4282075E; Tue, 4 Sep 2018 14:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1536070349; bh=JLZe4wXv3wGZpUwynvzJivyw1vdpAZTnMc22Aqy3lJ0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZzLcPbXPmFzP/R/jIaFOK+mbXJajaQw919ILydbou4roKOSbG58uQnGSyhGf/s+Kk WWnawqyecxgXTX/eW9wOA3h4glATFbEpX1ylQ+3GQpmgvil0ak0TyRh0PMow+yZ6L2 e9zyx092jURAMxQUkQn+DRkRG4Du153W/mrMWzqQ= Date: Tue, 4 Sep 2018 09:12:27 -0500 From: Bjorn Helgaas To: Bharat Kumar Gogada Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, bhelgaas@google.com, rgummal@xilinx.com Subject: Re: [PATCH 3/4] PCI/portdrv: Check platform supported service IRQ's Message-ID: <20180904141227.GD107892@bhelgaas-glaptop.roam.corp.google.com> References: <1533915580-31805-1-git-send-email-bharat.kumar.gogada@xilinx.com> <1533915580-31805-4-git-send-email-bharat.kumar.gogada@xilinx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1533915580-31805-4-git-send-email-bharat.kumar.gogada@xilinx.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 10, 2018 at 09:09:39PM +0530, Bharat Kumar Gogada wrote: > Platforms may have dedicated IRQ lines for PCIe services like > AER/PME etc., check for such IRQ lines. > Check mask and fill legacy irq line for services other than Capitalize "IRQ" consistently in English text like this. Insert blank lines between paragraphs. Add a reference to the relevant spec sections. PCIe r4.0, sec 6.2.4.1.2, 6.2.6, 7.5.3.12 seem pertinent. > platform supported service IRQ number. > > Signed-off-by: Bharat Kumar Gogada > --- > drivers/pci/pcie/portdrv_core.c | 19 +++++++++++++++++-- > 1 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c > index e0261ad..a7d024c 100644 > --- a/drivers/pci/pcie/portdrv_core.c > +++ b/drivers/pci/pcie/portdrv_core.c > @@ -166,6 +166,19 @@ static int pcie_init_service_irqs(struct pci_dev *dev, int *irqs, int mask) > irqs[i] = -1; > > /* > + * Some platforms have dedicated interrupt line from root complex to > + * interrupt controller for PCIe services like AER/PME etc., check > + * if platform registered with any such IRQ. > + */ > + if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) { > + int plat_mask; > + > + plat_mask = pci_check_platform_service_irqs(dev, irqs, mask); > + if (plat_mask > 0) Masks should be unsigned and tested for zero or "mask & bit". The rest of this file uses "int", which is sloppy because it does the wrong thing if we happen to use the high-order bit in the mask. > + mask = mask & plat_mask; > + } I think these platform IRQs are neither MSI-X/MSI nor PCI INTx wires. But as written, I think this patch executes pcie_port_enable_irq_vec(), which only does MSI-X/MSI stuff. So this must rely on that failing? And then we fall through to run pci_alloc_irq_vectors(), which is for PCI INTx interrupts, which doesn't seem appropriate either. It seems like this platform IRQ case should be completely separated from the other MSI/INTx cases, i.e., set irqs[PCIE_PORT_SERVICE_AER_SHIFT] directly (I think you already do this inside pci_check_platform_service_irqs()) and immediately return. Then I think you wouldn't need the other hunk below. > + > + /* > * If we support PME but can't use MSI/MSI-X for it, we have to > * fall back to INTx or other interrupts, e.g., a system shared > * interrupt. > @@ -183,8 +196,10 @@ static int pcie_init_service_irqs(struct pci_dev *dev, int *irqs, int mask) > if (ret < 0) > return -ENODEV; > > - for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) > - irqs[i] = pci_irq_vector(dev, 0); > + for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) { > + if (mask & (1 << i)) > + irqs[i] = pci_irq_vector(dev, 0); > + } > > return 0; > } > -- > 1.7.1 >