Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp4029293imm; Mon, 18 Jun 2018 08:03:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLrUehorkgHbsc5xu6LJF8NwiHn9daxKVdcwShY4qgBY+g514EYGGZZSZAStHd12jgDwbjS X-Received: by 2002:a62:4653:: with SMTP id t80-v6mr13715286pfa.58.1529334211552; Mon, 18 Jun 2018 08:03:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529334211; cv=none; d=google.com; s=arc-20160816; b=ztel47bcu2ytAUk5ZhUSYYkH7FA9LZhp3qJWV4n9f8zZj9+96v/ITM6IwJo9SaQUxc 70TFLr7YWoBYijw+g4Pq1PsYcWK878EetvPwusbJ/0UgTCvEz21Ljwy9Om45Pt6+IZSH PWz13Hw140ie+v86iLvocRamPjjg70VvUPOcayTuSEPwDtDcQs5uU0RqkCRSwo8WJbDn Bd593AMkWLa2RexPazIOe4H0nknR58mcdbHe6B8F2t33r4D4ddveWC7srOCJnji6gSb7 08OfZHZVw5isOUOmZBRDTOQgnGoH1QtWvlfwRlgfLbOEPk6CrYRqzBABJwt9+WDkUKlV Rtnw== 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=e+5CN4L2kPDteydtRirJJG6rqbiAOM4Hm0N+pczsUyM=; b=AWc9Iv4RBUI7ovCgdAQevC4pAk6U7j6WschmaYo7HNOz8NsMhjmQIHOjaqljCLFwHH bkNr0Yne5URuI8IrxnvxQzt1ffmZNcAT0BsuTNVuqT7qGE1/LGnUZOpwz/M4X0iVs3nX gbhkdg6HclV88xSZHyBHYqwkrcCMpxq6Lp+AKptBQOh4qbkbCRpqxjyAu/eif8SBkzvU dNy/nj1MhSFPsQ8N9vBTps3kc2SCi6dF1lLSfcyvU/phtAjOvDiXzotOJ43hix9FmBFF H4XU973ZBVdlBVE9rvcb/65q8qRmpGtBW4A46uzm7vxYBAFAlvXpIJeu9IQMVtoolZHV QmbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=lnWYnndV; 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 j10-v6si15637072plg.396.2018.06.18.08.03.12; Mon, 18 Jun 2018 08:03:31 -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=lnWYnndV; 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 S965170AbeFRPB7 (ORCPT + 99 others); Mon, 18 Jun 2018 11:01:59 -0400 Received: from smtprelay.synopsys.com ([198.182.37.59]:42216 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964945AbeFRPBG (ORCPT ); Mon, 18 Jun 2018 11:01:06 -0400 Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by smtprelay.synopsys.com (Postfix) with ESMTP id CC34F1E16D3; Mon, 18 Jun 2018 17:01:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1529334063; bh=+UsyaUpWA7WFaacEto1jknApLP3CO+2QQ8/C2XMoOlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=lnWYnndV212H0PTn8Bh1DauA960J6HOx0DaqGgoxC8a6vNbCLyuzovo/SUQNaQwCE RxnmnKns8fJFa3OxE236tVXXZlNskIj+HK/cV5lvtxLTraA9JXjs2vlkFXRBxOWarz JhaXRsu62Bqb4Yu6AmBpAO3a+oPzuQFe10w37abTwzt95ZJ5dvWi1XI4uu3RlzYtMe 4Vfr4N0xcJFLHt1XwntpmRWAJIi9pQyIRt65EKXhzeiqWnCi15t/O5mJVzFsA6Ybcu yx7fOzd6qJcuiV8ZLv+itUeQ1JezkRua3JCSI6Fv8H+77mz2bRGwCJSciTXjuJYadK zWbeJ2kHZhZPg== Received: from pt02.synopsys.com (pt02.internal.synopsys.com [10.107.23.240]) by mailhost.synopsys.com (Postfix) with ESMTP id B4CE2381E; Mon, 18 Jun 2018 08:01:01 -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 6CB7B3D761; Mon, 18 Jun 2018 16:01:00 +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 Cc: linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Gustavo Pimentel Subject: [PATCH v4 07/10] pci-epf-test/pci_endpoint_test: Use irq_type module parameter Date: Mon, 18 Jun 2018 16:00:26 +0100 Message-Id: <42d6a09a1189a26a9b6dffa5ba60ae0f29d21922.1529329262.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. 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 56be808..8f2061a 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -81,6 +81,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, @@ -107,7 +111,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, @@ -290,8 +294,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); @@ -360,8 +363,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); @@ -418,8 +420,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); @@ -504,11 +505,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); @@ -528,13 +532,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