From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754198AbaLOPNb (ORCPT ); Mon, 15 Dec 2014 10:13:31 -0500 Received: from 8bytes.org ([81.169.241.247]:48633 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752363AbaLOPN3 (ORCPT ); Mon, 15 Dec 2014 10:13:29 -0500 From: Joerg Roedel To: Thomas Gleixner , Ingo Molnar , hpa@zytor.com, x86@kernel.org, Joerg Roedel , Jiang Liu , Borislav Petkov Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Joerg Roedel Subject: [PATCH 4/5] iommu/amd: Check for irq-remap support amd_iommu_prepare() Date: Mon, 15 Dec 2014 16:13:23 +0100 Message-Id: <1418656404-28575-5-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418656404-28575-1-git-send-email-joro@8bytes.org> References: <1418656404-28575-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel This allows to get rid of the irq_remapping_supported() function and all its call-backs into the Intel and AMD IOMMU drivers. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index de3390a..fa63016 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2127,6 +2127,9 @@ static int __init iommu_go_to_state(enum iommu_init_state state) #ifdef CONFIG_IRQ_REMAP int __init amd_iommu_prepare(void) { + if (!amd_iommu_irq_remap) + return -1; + return iommu_go_to_state(IOMMU_ACPI_FINISHED); } -- 1.9.1