Received: by 2002:ac0:a591:0:0:0:0:0 with SMTP id m17-v6csp1929560imm; Fri, 6 Jul 2018 08:55:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcJK3CHSNHiw1XsNo+JegHoywfsKmpBMAfKtFPAXduXMhYFNMvuNxBkdcSnrxLhE7Mc8QPY X-Received: by 2002:a65:5c83:: with SMTP id a3-v6mr9937442pgt.164.1530892507297; Fri, 06 Jul 2018 08:55:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530892507; cv=none; d=google.com; s=arc-20160816; b=GfBXuhZgqc71/tQNEbZ7/ole2ajf7phNU1gbVVWkDJZCwJPpKYRD9xG2WLJOOYf08e 3M2J7R9pea7WPLRw6i2x85C4K7qQRtuFNKY2fAh2r8CVXm7wQNpjbAUTBDm6anK94GuV YeXPWvWBZUScvkIAeJpsuXEw5bkmVClG1pywBIq1aNscJ/zgCnYvxMVNyre74dPtX4Nc pR+c4FyZw4Nj0JCVkLKOJDkqC7yG+JXXQOPQ6DzTYsJXCbtGf4uFdR+5ppdns9W/yWkV 9+J6MNMyBaDGPGnZ13UprFF1bAdhJ4p9cWHT6RZFI6aM1LX7FBqLiUcCHujn+PfHmqDV QZFA== 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=ib/JA7BsCksZxIrj5/YOaTFIqcA/vBgozfdcrEzrIL4=; b=v62WToTTYMfuW/OM2aaTf1fexRC5SjSH15T8FnGJaMgW/pXWUlJBwoEGUp1LHCt4LG 1dSmbbC8uX+qy/Nkyw4GrlmDYhGHxzzabWtMlSWL+zVda/EGr0Y4GTO4Adn2ebx3Ojz1 zshV/W+AZFoQp4LHdfL9ykjEsad49rw5avvPVHobU6FKnDs/fE0sKrdJaqsuWswuaOeg tU6ZKPEzBCLIg4vv+Sfuss1vJ7MtCmIEETP+pJUAB8N0+WAZ28XMKghKxf9n4/ZuHmQI 5fxKbh16XPh3sT34EpAxKKR0CPt8P3XadB/yFpHCsgXWWiOGQSHMR08ANhfK7A3xrVEc M5Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synopsys.com header.s=mail header.b=FRTCCVxA; 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 q63-v6si8617915pfb.309.2018.07.06.08.54.52; Fri, 06 Jul 2018 08:55:07 -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=FRTCCVxA; 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 S933722AbeGFPwu (ORCPT + 99 others); Fri, 6 Jul 2018 11:52:50 -0400 Received: from smtprelay.synopsys.com ([198.182.47.9]:37562 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933068AbeGFPvl (ORCPT ); Fri, 6 Jul 2018 11:51:41 -0400 Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by smtprelay.synopsys.com (Postfix) with ESMTP id 5434724E08D8; Fri, 6 Jul 2018 08:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1530892301; bh=u9WRqsAagc8JV6dZslHUEEjyk1yE0bLVAqUEEN3mM/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=FRTCCVxAhMNAM4akgOwTz+gALAKU5BFT3oFYRu6jJjrCIAsW5Mbzgv1hjLa1QuTSn USxdT54nGLmmbaOo5O9e3KU5dCZUDPaYFBQqLuenhBZIfbairiqSsNDzQGvo+5St5M /7Sbp2Hm8TfwLW09hfrIUHTWQbjezlfwnT1L+7w13QEoMb9s0e8nfWSZ+RUbfFgjws 72F70CZW8Resm4rxHI0wYjJn52sywfiwI5PHkStsh/vpUJgKkiKPtf12k23vG9eDRp Maswc5EzeA5mU+qvBm/PhGV6VJqN2wGrOESP25py9zTFGmt7IteSMR9+CGiacnZDct umHY60mjvfeQg== Received: from pt02.synopsys.com (pt02.internal.synopsys.com [10.107.23.240]) by mailhost.synopsys.com (Postfix) with ESMTP id B5F835CD2; Fri, 6 Jul 2018 08:51:40 -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 279CF3D253; Fri, 6 Jul 2018 16:51:39 +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, 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 v8 07/11] pci-epf-test/pci_endpoint_test: Use irq_type module parameter Date: Fri, 6 Jul 2018 16:51:30 +0100 Message-Id: <9a81307f792a415f70f2fa2aa215c87c47a8f532.1530891871.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. 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. 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