Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp948978imm; Fri, 13 Jul 2018 08:57:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdiYEu9ruBh/0AoqPK/ux1hGsaDPG3+cdmIs9w8VEOe90TEw6dX+PzQDnVfIdncnTJxecJR X-Received: by 2002:a62:3f99:: with SMTP id z25-v6mr7738080pfj.250.1531497474753; Fri, 13 Jul 2018 08:57:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531497474; cv=none; d=google.com; s=arc-20160816; b=j6S4ouJgPl/RnolyAHCnARk7yIwBBZs0NYA5RyfbSJGSor1lk42EpEFk/zgHt60rl7 3Nraa7E31USgjvGF+xUgggmzoDvlhgvguBtp6fLKlvsB+ECAvUn9WExpvuiQh/BZFfed ZFQTg1vn9lze831cb5DZKZ5Vlj54yW4mX+kAtmveTJAaQCnMopkOOsoRGMeUE2IkLAX+ oifn/r9fRDlJVzabq+5aiCbwswwEhSzX8ZsiKW69InkrwXxo51sG2prdPAjM+BjkSH2C KvzL/v2G0LB6fQASrBOKyMFdtY9FhEA0NvRKFTXKMopGfPYUJI6so+/AA/9OxQI3t610 OMJw== 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=rHUaRRTn7yTi320Ed7ln/Kgf5b1Rgc3zF4HDR6rcfCU=; b=i32a5Awp30Xqb+GU1Wtdf790RIJ1rMokRMbrPLKaFeY5T64oZXMX6um2tPTmFuqY2Y Ekl7JlbsbBDXpmCDBw9bQKgTNda4rPxdkzDnJdmQPi6KWndpsP+Fe/fcGirMCh93kSOh KSvkrBCES8RDLPWqO5P2iJbIUf8DUlq5lvp8qNtmHoTVloxnAS5uinQsoW2mC8DItVF+ /reeYP03vAiaOxGwoegMRzKhq+tBksCG8xboR7ilmhKMzjFrr2aZBmWQut8JSwDFVrFB ITQqzOTxmJ8EB2sJdBZkDEutQN7ZDnSz/Vh9ubv2t8+K/HT7GvlINYZrCKXyT5kLuf4h OD4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=Aw1EqnQr; 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 64-v6si4196521plk.257.2018.07.13.08.57.39; Fri, 13 Jul 2018 08:57:54 -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=Aw1EqnQr; 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 S1731946AbeGMQMF (ORCPT + 99 others); Fri, 13 Jul 2018 12:12:05 -0400 Received: from smtprelay.synopsys.com ([198.182.47.9]:57999 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731342AbeGMQME (ORCPT ); Fri, 13 Jul 2018 12:12:04 -0400 Received: from mailhost.synopsys.com (mailhost2.synopsys.com [10.13.184.66]) by smtprelay.synopsys.com (Postfix) with ESMTP id BE73224E2447; Fri, 13 Jul 2018 08:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1531497411; bh=lupjxiKNJVsF/0lEFxxMA3Sscf98xapCByq6Lp1t4PE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=Aw1EqnQrYZewtTKLrSUFOK+qG3CobZgspRUK8orETvqtx6gzr7wv4aS9PaBe/5pFN t1TthWn2vz1qUc7Rke2neCw3kJ0AnUSwVQM6gPZSbiieO5tVSQYrvb3eVCykZsbWnP xFIS6kF17jmcdct4Gx7fIJaeyD7+SEPcjoqIhuAq5GQVOVmAN1mf+yA4Yp/ji5kUTK Bvbj2mge1CcenJD0BIS+g/2eZn+SwxLeADOSBKX2UlQVDtDq+atvNyoEzWEM8VAOcE rouvRfhjMUU4KCjBWtfWJifT3favYxrqCEmW1H7aBc6TdTTIOWLg1I8gymTVfz2OwV iSkaqB23rRU9g== Received: from de02.synopsys.com (germany.internal.synopsys.com [10.225.17.21]) by mailhost.synopsys.com (Postfix) with ESMTP id 780A03BC7; Fri, 13 Jul 2018 08:56:51 -0700 (PDT) Received: from de02dwia024.internal.synopsys.com (de02dwia024.internal.synopsys.com [10.225.19.81]) by de02.synopsys.com (Postfix) with ESMTP id 54DE43E8EB; Fri, 13 Jul 2018 17:56:49 +0200 (CEST) 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, shawn.lin@rock-chips.com Cc: linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Gustavo Pimentel Subject: [PATCH v10 08/12] pci-epf-test/pci_endpoint_test: Use irq_type module parameter Date: Fri, 13 Jul 2018 17:56:40 +0200 Message-Id: <8aaaf78d7c81c50e67faec353353c0dd03cf0928.1531496321.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 Acked-by: Kishon Vijay Abraham I --- 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. Change v5->v6: - Nothing changed, just to follow the patch set version. Change v6->v7: - Removed unnecessary set to zero variable. - Removed empty line. Change v7->v8: - Re-sending the patch series. Change v8->v9: - Nothing changed, just to follow the patch set version. Change v9->v10: - Nothing changed, just to follow the patch set version. drivers/misc/pci_endpoint_test.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index 35fbfbd..349794c 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,11 +533,17 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, pci_set_master(pdev); - if (!no_msi) { + switch (irq_type) { + case IRQ_TYPE_LEGACY: + 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, -- 2.7.4