From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754350AbbKWTfL (ORCPT <rfc822;w@1wt.eu>);
	Mon, 23 Nov 2015 14:35:11 -0500
Received: from mout.kundenserver.de ([217.72.192.75]:57780 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754169AbbKWTfH (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 23 Nov 2015 14:35:07 -0500
From: Arnd Bergmann <arnd@arndb.de>
To: Dan Williams <dan.j.williams@intel.com>
Cc: Tejun Heo <tj@kernel.org>,
        IDE/ATA development list <linux-ide@vger.kernel.org>,
        Ricardo Neri <ricardo.neri@intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH] ahci: don't use MSI when PCI is disabled
Date: Mon, 23 Nov 2015 20:34:30 +0100
Message-ID: <6160865.VIglm5oKj3@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <CAPcyv4gSjWZ7OPqp9fwtc9yGV9g5AKkkCLDnU-F71XsHBgYUQA@mail.gmail.com>
References: <4754092.OYovO36g28@wuerfel> <CAPcyv4gSjWZ7OPqp9fwtc9yGV9g5AKkkCLDnU-F71XsHBgYUQA@mail.gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:2hVlx+ongesf04kD197U7g6YP68jyYNaOneuZN01BX+VWwM7kzn
 Bx7ncD3hvYyTl/OLn3CMMNnBjHRjFoPdDcTYzYqli2RLl4Fv8acClb9CNOGgoImQW69Cwaj
 1fy5jp+0DbBGeNu4BvLUPoRnupkPn2QhG82ZTXb6gxE+nYTmhY2+Gp7IaRx/lDgBiHO5SrB
 QZGTq5zuctPHxQ6IHNWaQ==
X-UI-Out-Filterresults: notjunk:1;V01:K0:O+2ox+tCHoI=:YYHGi1ARgnVpNRYbtNwgmU
 Xlr2ucdOUvXdYB2xWYfE4XCS8Tu+x3YAhxKgMTfUWH9B/IuqppUmE5WDdygL8HN9cOLAxO4Lo
 u79g2GzdEldZm7lYBdJgFAzLszm+5Dxdb9ifAAt+nsiVDxqZLHa+Yfi+wEbYexyvCUjSQifPC
 tFzr8ptzzLgHgYoOasAVdC3qSaG/6dlKUCrHQ348/u8WaDCYCrx/3uJk24Y8pJQnnvizxzjas
 duyt8ZsU4q9KpIeI23GfRf8xKJqSIpQlDwObUi1+K14KLepuwv9mUDqbY8jpytza3iwQavkyy
 KrLJ2hTXpgCqNUh+Bju7KMwcCjQQNjDu9cs9tsKITUVzjw2TkyGxoJGyNfvGUHWfn5v+vR5mP
 TiVISZY97N9eNxAUHG/dOM3EiCLD7kXC6s53q10ZONTRgpYtMsBATY2zB+3nxBfEdKpnh6O68
 bLNdW/aBfpXf3GRkp7V8qBRbkG9CAVCjN3Ji6IUB2CM5CnXJbMzEon4cMqDIN0SjM5zCPBzBe
 YC3VzAlaXfQ8lUmmDWr8Zl703EBCw4uFP4t/IxQSYkUl8EfA8FPIIzFGrZjVJoiLxF53DeEMr
 a84dSEKnMcQ6vYBO+YRmuEVLKj+FE1dgdPhorcWd/7bcY0WT+IngKQM9tl/hEXdC7cRQEDFBz
 nXiMAyzUNijlnTHmnR5AftWldY6035VVfh2Jf4qPXJZf0HEy6MaNQgZlDkcuEkgk0vSDQtU7J
 z592LJuxJWkzuIKp
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Monday 23 November 2015 09:25:38 Dan Williams wrote:
> 
> If we had an "static inline ahci_irq_vector(int port)"  helper to
> compile out the struct msix_entry de-reference would that be
> sufficient?

Yes, that is probably a nicer way to do it. We should then also do
something like this:

@@ -2510,7 +2513,8 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht)
 	int irq = hpriv->irq;
 	int rc;
 
-	if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX))
+	if (IS_ENABLED(CONFIG_PCI_MSI) && \
+	    hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX))
 		rc = ahci_host_activate_multi_irqs(host, sht);
 	else if (hpriv->flags & AHCI_HFLAG_EDGE_IRQ)
 		rc = ata_host_activate(host, irq, ahci_single_edge_irq_intr,

which will let gcc leave out the entire ahci_host_activate_multi_irqs()
function but still flag compile errors in it even if CONFIG_PCI is
disabled.

	Arnd