From patchwork Mon May 4 07:45:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 6323581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9AFDF9F1C2 for ; Mon, 4 May 2015 07:48:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC99B202DD for ; Mon, 4 May 2015 07:48:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE6C9202C8 for ; Mon, 4 May 2015 07:48:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YpB4w-0004fz-Ox; Mon, 04 May 2015 07:46:14 +0000 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YpB4s-0004Yo-D9 for linux-arm-kernel@lists.infradead.org; Mon, 04 May 2015 07:46:11 +0000 Received: by wiun10 with SMTP id n10so100993649wiu.1 for ; Mon, 04 May 2015 00:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=/x7mwc47iCL9qg6SW0a4cra0msfbWfGnRKO26TsnQx8=; b=ZuPpPUp3mtQGx7ygaNla6jNZNRdFM0JONWVuDh+tVcpnJeBp9lyryn5QugEnNJBuoK Aas0IKgc8r0YjTMMxwl6Kd68uEspqU4cKTwOz06l5tpYaMjoZ0ipOKQNZXOTpkQggC30 fJYvx05qeDxV6s1F5jDuaG9+eyVJzLihFn38DSaYG9FuSW6OVJoxiBAxLo1KOMymhn0X P8xSA9cpkBbLtzrduSDAovI0I8/zIk4+4ZeVDEIFFAIaElreRVq9cdDmIZ8NIT1mdSw5 RWfv/kbpi0z5rTqIUNWYMoWRxn0UAxMmxGptMlLaI0auFIkPXzIKHb8HfTSakv6RMvm4 6MuA== X-Received: by 10.180.96.200 with SMTP id du8mr17662724wib.54.1430725548201; Mon, 04 May 2015 00:45:48 -0700 (PDT) Received: from rric.localhost (f053086081.adsl.alicedsl.de. [78.53.86.81]) by mx.google.com with ESMTPSA id u6sm19301517wjy.13.2015.05.04.00.45.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 May 2015 00:45:47 -0700 (PDT) From: Robert Richter To: Catalin Marinas , Will Deacon , Tejun Heo Subject: [PATCH v2] AHCI: Add generic MSI-X interrupt support to SATA PCI driver Date: Mon, 4 May 2015 09:45:37 +0200 Message-Id: <1430725538-22162-1-git-send-email-rric@kernel.org> X-Mailer: git-send-email 2.1.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150504_004610_622860_9F48D433 X-CRM114-Status: GOOD ( 20.24 ) X-Spam-Score: -0.4 (/) Cc: linux-kernel@vger.kernel.org, Robert Richter , linux-ide@vger.kernel.org, Sunil Goutham , Jiang Liu , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Richter This patch adds generic support for MSI-X interrupts to the SATA PCI driver. Only single interrupt support is implemented. Thus, per-port interrupts can not yet be enabled. The driver now checks the device for the existence of MSI-X and tries to enable the interrupt. Otherwise, if a device is not MSI-X capable, the initialization is skipped and MSI or intx interrupts are configured. This patch also enables AHCI for Cavium Thunder SoCs that uses MSI-X. v2: * determine irq vector from pci_dev->msi_list Based on a patch from Sunil Goutham . Signed-off-by: Robert Richter --- arch/arm64/Kconfig | 1 + drivers/ata/ahci.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b1f9a20a3677..2d95bbc0557e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -157,6 +157,7 @@ config ARCH_THUNDER bool "Cavium Inc. Thunder SoC Family" help This enables support for Cavium's Thunder Family of SoCs. + select SATA_AHCI config ARCH_VEXPRESS bool "ARMv8 software model (Versatile Express)" diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 49f1e6890587..36c88f6d8490 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +53,7 @@ enum { AHCI_PCI_BAR_STA2X11 = 0, + AHCI_PCI_BAR_CAVIUM = 0, AHCI_PCI_BAR_ENMOTUS = 2, AHCI_PCI_BAR_STANDARD = 5, }; @@ -500,6 +502,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { /* Enmotus */ { PCI_DEVICE(0x1c44, 0x8000), board_ahci }, + /* Cavium */ + { PCI_DEVICE(0x177d, 0xa01c), .driver_data = board_ahci }, + /* Generic, PCI class code for AHCI */ { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, @@ -1202,11 +1207,41 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host) {} #endif -static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, - struct ahci_host_priv *hpriv) +static int ahci_init_msix(struct pci_dev *pdev, unsigned int n_ports, + struct ahci_host_priv *hpriv) +{ + int rc, nvec; + struct msix_entry entry = {}; + + /* check if msix is supported */ + nvec = pci_msix_vec_count(pdev); + if (nvec <= 0) + return 0; + + /* per-port msix interrupts are not supported */ + if (n_ports > 1 && nvec >= n_ports) + return -ENOSYS; + + /* only enable the first entry (entry.entry = 0) */ + rc = pci_enable_msix_exact(pdev, &entry, 1); + if (rc < 0) + return rc; + + return 1; +} + +static int __ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, + struct ahci_host_priv *hpriv) { int rc, nvec; + nvec = ahci_init_msix(pdev, n_ports, hpriv); + if (nvec > 0) + return nvec; + + if (nvec && nvec != -ENOSYS) + dev_err(&pdev->dev, "failed to enable MSI-X: %d", nvec); + if (hpriv->flags & AHCI_HFLAG_NO_MSI) goto intx; @@ -1250,6 +1285,35 @@ static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, return 0; } +static struct msi_desc *msix_get_desc(struct pci_dev *dev, u16 entry) +{ + struct msi_desc *desc; + + list_for_each_entry(desc, &dev->msi_list, list) { + if (desc->msi_attrib.entry_nr == entry) + return desc; + } + + return NULL; +} + +static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, + struct ahci_host_priv *hpriv) +{ + struct msi_desc *desc; + + __ahci_init_interrupts(pdev, n_ports, hpriv); + + if (!pdev->msix_enabled) + return pdev->irq; + + desc = msix_get_desc(pdev, 0); /* first entry */ + if (!desc) + return -ENODEV; + + return desc->irq; +} + static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { unsigned int board_id = ent->driver_data; @@ -1260,6 +1324,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) struct ata_host *host; int n_ports, i, rc; int ahci_pci_bar = AHCI_PCI_BAR_STANDARD; + int irq; VPRINTK("ENTER\n"); @@ -1285,11 +1350,13 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev_info(&pdev->dev, "PDC42819 can only drive SATA devices with this driver\n"); - /* Both Connext and Enmotus devices use non-standard BARs */ + /* Some devices use non-standard BARs */ if (pdev->vendor == PCI_VENDOR_ID_STMICRO && pdev->device == 0xCC06) ahci_pci_bar = AHCI_PCI_BAR_STA2X11; else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000) ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS; + else if (pdev->vendor == 0x177d && pdev->device == 0xa01c) + ahci_pci_bar = AHCI_PCI_BAR_CAVIUM; /* * The JMicron chip 361/363 contains one SATA controller and one @@ -1411,7 +1478,9 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) */ n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map)); - ahci_init_interrupts(pdev, n_ports, hpriv); + irq = ahci_init_interrupts(pdev, n_ports, hpriv); + if (irq < 0) + return irq; host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports); if (!host) @@ -1463,7 +1532,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_master(pdev); - return ahci_host_activate(host, pdev->irq, &ahci_sht); + return ahci_host_activate(host, irq, &ahci_sht); } module_pci_driver(ahci_pci_driver);