From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B467C433E2 for ; Wed, 16 Sep 2020 15:50:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC7B6223E8 for ; Wed, 16 Sep 2020 15:50:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="V4uR/X/6"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="gTXkv4E+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726265AbgIPPt4 (ORCPT ); Wed, 16 Sep 2020 11:49:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726217AbgIPPa1 (ORCPT ); Wed, 16 Sep 2020 11:30:27 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50E37C02C295; Wed, 16 Sep 2020 08:20:16 -0700 (PDT) Date: Wed, 16 Sep 2020 15:12:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1600269140; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6vKGXw8m7MF/r4QcKnfdlHekF8HSLx0KrGTxNClskA=; b=V4uR/X/6QGIuUIhXKtMS8YcNyLYXevipUEJPDTJmj9bEEzlNIOZTZg6zlbPPFwoW/7ED+T ByKwUUUvu0UGhISHlPCt7zskt93Nm1NyNe6KcJUd+IcUm6nWfUQF7bDMZmOSqHmgYTmsiM TpF8cBQe1v9Y6n7CvsGEFYzrSAtbQoaztRiQ3P+F6p8NZ864tFHSBc9cK1JngCtg0mrcE8 cDhHJ7NGLmw0/zOpDtqNyLQdOb/ZAZl4bf6gr6GuNmu+CtsJw3GENJPNFsg8Ty/7e6+lf2 +ziKZgs+bjQFmwZVx+S2rFK0/Zk0zuhOPGkOMYgy35LvY3Cpok5eXgMgjiu9UA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1600269140; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6vKGXw8m7MF/r4QcKnfdlHekF8HSLx0KrGTxNClskA=; b=gTXkv4E+u/NG4vn4tz3h6izaQ15nxeODzLtrH7mvF/7jAViJL7V3YE7vkLpYBU1s22gLLW XBh9Iwl0tzJBYZDA== From: "tip-bot2 for Thomas Gleixner" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/irq] x86/irq: Consolidate DMAR irq allocation Cc: Thomas Gleixner , x86 , LKML In-Reply-To: <20200826112332.163462706@linutronix.de> References: <20200826112332.163462706@linutronix.de> MIME-Version: 1.0 Message-ID: <160026913952.15536.1109103652937370652.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/irq branch of tip: Commit-ID: 55e039157281f9d8ee7d595c2529a3fd4e790b52 Gitweb: https://git.kernel.org/tip/55e039157281f9d8ee7d595c2529a3fd4e790b52 Author: Thomas Gleixner AuthorDate: Wed, 26 Aug 2020 13:16:43 +02:00 Committer: Thomas Gleixner CommitterDate: Wed, 16 Sep 2020 16:52:33 +02:00 x86/irq: Consolidate DMAR irq allocation None of the DMAR specific fields are required. Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20200826112332.163462706@linutronix.de --- arch/x86/include/asm/hw_irq.h | 6 ------ arch/x86/kernel/apic/msi.c | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 641bc14..79f6d1d 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -83,12 +83,6 @@ struct irq_alloc_info { irq_hw_number_t msi_hwirq; }; #endif -#ifdef CONFIG_DMAR_TABLE - struct { - int dmar_id; - void *dmar_data; - }; -#endif #ifdef CONFIG_X86_UV struct { int uv_limit; diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index da68d08..ebf57db 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -326,15 +326,15 @@ static struct irq_chip dmar_msi_controller = { static irq_hw_number_t dmar_msi_get_hwirq(struct msi_domain_info *info, msi_alloc_info_t *arg) { - return arg->dmar_id; + return arg->hwirq; } static int dmar_msi_init(struct irq_domain *domain, struct msi_domain_info *info, unsigned int virq, irq_hw_number_t hwirq, msi_alloc_info_t *arg) { - irq_domain_set_info(domain, virq, arg->dmar_id, info->chip, NULL, - handle_edge_irq, arg->dmar_data, "edge"); + irq_domain_set_info(domain, virq, arg->devid, info->chip, NULL, + handle_edge_irq, arg->data, "edge"); return 0; } @@ -381,8 +381,8 @@ int dmar_alloc_hwirq(int id, int node, void *arg) init_irq_alloc_info(&info, NULL); info.type = X86_IRQ_ALLOC_TYPE_DMAR; - info.dmar_id = id; - info.dmar_data = arg; + info.devid = id; + info.data = arg; return irq_domain_alloc_irqs(domain, 1, node, &info); }