Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp975623imm; Wed, 20 Jun 2018 09:31:05 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJtk/4FpyCUh7XPvo08a10U3qW/Iv9ZIsTX3f4PtUILhmNO120PMqnwTVyRNp9AKf5rAbor X-Received: by 2002:a63:9246:: with SMTP id s6-v6mr2498382pgn.35.1529512265592; Wed, 20 Jun 2018 09:31:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529512265; cv=none; d=google.com; s=arc-20160816; b=mQwU2LF+fJ5s6WEn/nyKh/TWqd5kwXmD5HgEEbhhtyRlk+t8wjEsmE6JCeYSgtY1eF 3qpyFqpMcqv88TxRoUnpT5oFJlwuMbPvceCS8DRIgvyMmTUPSuYVMau7ViZ+MGiIXhhn nfCWR1waq+rT/UCsJEjCRlx8OGKHKSK/TFvFkL+pDXzc6hZAGaKDdvPo2II+Fo1EC/3n nNUEoJExPl6UwXlFjk/Bs4lmir6I6QLC5vZrmY/KSmHCJo+5GKAv5QcsRXOkKHlMyXP4 IPC4scV3umVm9HtodDqAveGd+/aF9g6innSR7BQVGC6bc7lxU8nqFUewM7cs/OHE/389 FZeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=jud/E7haju+gRB4uhUyVFwwyL6VSsTsrQbmUgQF9oRE=; b=sZrLZX/9iCkbZDCoXEddOrqNPu7tX6WQgCaRq6qq2biSd4AL6jmVetJclMX/Ak6hpC h18GBRWYL5NZkJPXrowO0Vo7zDUZm8SewrA6PwvBOf6oSDjAWriW5JxqJTScPRr6+del w8LmHzOahgbPoCs4X0vlZXhDE4vJLyZJcHU2IDWN7ZAzCyOjJ8YcrDMSazkxTsbmem63 rm0sUeiRGGokD42qpPK5MyDmo/aCbwqH2pA23fIeBMyvbHyBxDgg0hYF1jb9/kOW9kW3 LvFc7VfY1xNERUflTGF9533dpFM/eBZaGWa+B2oUneYnwm6X1Ze3n+G0JF0hXG1UuhuG 0k3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=mBXVozHl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q72-v6si2691418pfi.183.2018.06.20.09.30.51; Wed, 20 Jun 2018 09:31:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=mBXVozHl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=synopsys.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932742AbeFTQ3g (ORCPT + 99 others); Wed, 20 Jun 2018 12:29:36 -0400 Received: from smtprelay6.synopsys.com ([198.182.37.59]:52410 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932383AbeFTQ2r (ORCPT ); Wed, 20 Jun 2018 12:28:47 -0400 Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by smtprelay.synopsys.com (Postfix) with ESMTP id 104EA1E16D4; Wed, 20 Jun 2018 18:28:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1529512124; bh=HaSwa6U81zOx99Pb8IOJv20QkWJk4iJ2XVr8LaBmqBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=mBXVozHl6NmS/d8O1FPxVua5r+TPMm20oyUwWgHsqOcsVfCKltdj+CePyc99hCUsW czjre35wS49QXBnc/tqXTqFi65RlidLAlmSJtbuOljmDTyczAqFoupHHpaObfTY8e5 Tl/hDDFwYpwXPIPLPRGD+fSMEcFt8vlhrtQaRnIe07xtE/tPg2wjJTbi03T/u3eCuJ 7nGdnJVi3Rt5F51DP9aDzVkhFZPg9i4w4hsphIIN3NSgtVwRciS21aPJwrdSWIble9 dY3mnH67IwVqR5Zf6nQCj/Ze/CPATI1hnvNkn5evya1ZLF4uivvpTIyquqRLfhaBLQ DVSVOEdhfYh3g== Received: from pt02.synopsys.com (pt02.internal.synopsys.com [10.107.23.240]) by mailhost.synopsys.com (Postfix) with ESMTP id F29D737B8; Wed, 20 Jun 2018 09:28:42 -0700 (PDT) Received: from UbuntuMate-64Bits.internal.synopsys.com (gustavo-e7480.internal.synopsys.com [10.107.25.102]) by pt02.synopsys.com (Postfix) with ESMTP id 3E3CB3D4FE; Wed, 20 Jun 2018 17:28:41 +0100 (WEST) From: Gustavo Pimentel To: bhelgaas@google.com, lorenzo.pieralisi@arm.com, Joao.Pinto@synopsys.com, jingoohan1@gmail.com, kishon@ti.com, adouglas@cadence.com, jesper.nilsson@axis.com, sboyd@codeaurora.org Cc: linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Gustavo Pimentel Subject: [PATCH v5 07/11] pci-epf-test/pci_endpoint_test: Use irq_type module parameter Date: Wed, 20 Jun 2018 17:28:29 +0100 Message-Id: <99e94309e651dbc4d5fac25134b21685956e18ab.1529507416.git.gustavo.pimentel@synopsys.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add new driver parameter to allow interruption type selection. Signed-off-by: Gustavo Pimentel --- Change v2->v3: - New patch file created base on the previous patch "misc: pci_endpoint_test: Add MSI-X support" patch file following Kishon's suggestion. Change v3->v4: - Rebased to Lorenzo's master branch v4.18-rc1. Change v4->v5: - Nothing changed, just to follow the patch set version. drivers/misc/pci_endpoint_test.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index 35fbfbd..4d2c9cb 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -82,6 +82,10 @@ static bool no_msi; module_param(no_msi, bool, 0444); MODULE_PARM_DESC(no_msi, "Disable MSI interrupt in pci_endpoint_test"); +static int irq_type = IRQ_TYPE_MSI; +module_param(irq_type, int, 0444); +MODULE_PARM_DESC(irq_type, "IRQ mode selection in pci_endpoint_test (0 - Legacy, 1 - MSI)"); + enum pci_barno { BAR_0, BAR_1, @@ -108,7 +112,7 @@ struct pci_endpoint_test { struct pci_endpoint_test_data { enum pci_barno test_reg_bar; size_t alignment; - bool no_msi; + int irq_type; }; static inline u32 pci_endpoint_test_readl(struct pci_endpoint_test *test, @@ -291,8 +295,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, size_t size) pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_SIZE, size); - pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE, - no_msi ? IRQ_TYPE_LEGACY : IRQ_TYPE_MSI); + pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE, irq_type); pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_NUMBER, 1); pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_COMMAND, COMMAND_COPY); @@ -361,8 +364,7 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test, size_t size) pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_SIZE, size); - pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE, - no_msi ? IRQ_TYPE_LEGACY : IRQ_TYPE_MSI); + pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE, irq_type); pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_NUMBER, 1); pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_COMMAND, COMMAND_READ); @@ -419,8 +421,7 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test, size_t size) pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_SIZE, size); - pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE, - no_msi ? IRQ_TYPE_LEGACY : IRQ_TYPE_MSI); + pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE, irq_type); pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_NUMBER, 1); pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_COMMAND, COMMAND_WRITE); @@ -505,11 +506,14 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, test->alignment = 0; test->pdev = pdev; + if (no_msi) + irq_type = IRQ_TYPE_LEGACY; + data = (struct pci_endpoint_test_data *)ent->driver_data; if (data) { test_reg_bar = data->test_reg_bar; test->alignment = data->alignment; - no_msi = data->no_msi; + irq_type = data->irq_type; } init_completion(&test->irq_raised); @@ -529,13 +533,21 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, pci_set_master(pdev); - if (!no_msi) { + switch (irq_type) { + case IRQ_TYPE_LEGACY: + irq = 0; + break; + case IRQ_TYPE_MSI: irq = pci_alloc_irq_vectors(pdev, 1, 32, PCI_IRQ_MSI); if (irq < 0) dev_err(dev, "Failed to get MSI interrupts\n"); test->num_irqs = irq; + break; + default: + dev_err(dev, "Invalid IRQ type selected\n"); } + err = devm_request_irq(dev, pdev->irq, pci_endpoint_test_irqhandler, IRQF_SHARED, DRV_MODULE_NAME, test); if (err) { -- 2.7.4