From patchwork Thu Feb 15 19:56:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 201727 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp85330dyb; Thu, 15 Feb 2024 11:58:18 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV75PBdj/GuRgqdl98TnIS9SqMyyOcXTE7FUZtla/+Rta6607/Avup8el/KCeVFcOUheib0/uV/Vm6qWDm73fQMg9zFwg== X-Google-Smtp-Source: AGHT+IGvDc3G4ZhswjSmgO8L9j8VOZtLaGaQs2S3Dc3j/N6nmAj3L5Qul+MTcnX0ZlYrZ37vN3J3 X-Received: by 2002:a17:903:1103:b0:1db:4245:454b with SMTP id n3-20020a170903110300b001db4245454bmr3360000plh.57.1708027098226; Thu, 15 Feb 2024 11:58:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708027098; cv=pass; d=google.com; s=arc-20160816; b=hfIEM5w9hAFmVwnqlrYOTgAsDHIi7KsZBf58TBP3hFZDoVEoceHNeVGoPQFTujW8lJ uUCv1/iLnViR97swQGf2GLdpuImvd9qmNfwJ5bYCtgNe9N8HEPdK48dHRRtX9HDTeOWs uWs2QVzHEQwK77wRHBmNPzPmU7dZzF0oSiQ3vu0PweBsdLFScdTlCXA/9Gv2YnSHIdyA gypOLRDrKDyJ9GkPdwBnIPrmMHJJQ79kNSfYS21RTfCeyg8w5woyn6HvW+9hJdniQx/0 e4zx5ZNgFk/JI0eyUbjEF7LkNXE/MwVTtzDAC+xXwZxFUWzIlNLcfgypXj2p8sBf+JVs e8xQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=ePc7duUErdFHn02Yhoblfga7WwrJ8JliqVSXzIVyRKU=; fh=LU6lT0PDYxSjx39eUa7M+LyV2rE4/Fllc4BDCj6L/a8=; b=Tnfs7B5Z7jiPPibNE4SKGEwM0FdLwIS/2rWEbxPFywMScaCcQ/PCGTbYyLRsVUhZoL kLQS8HaTUvew+zWllgum51VKjDvHDhT6A+e4riAbMDkdevgeLHMSBll4VlmusftjMWn7 zbFNdqkunUAd/uAShMV+eSO2YdugLOWuNawai+/qZgaY8GIPs/6KAeE3wkTPZ+w0t8dW f/yMSRJHR6VUWE33cfossOHWCbDKS0DjUXfBUPrv47qGxVR+Q60Ee4jWv8If3XrzFD3Q RpPYyn7MU5TOvcg3qaLgKommixnJW9mp076gXG00jg/xaqc/i9LpFZwwx9ZwfdwDBeQ7 5OxQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ZfP0KVV5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-67620-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67620-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id j7-20020a170902690700b001da1b31fc38si1591807plk.497.2024.02.15.11.58.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 11:58:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67620-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ZfP0KVV5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-67620-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67620-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 0D809286191 for ; Thu, 15 Feb 2024 19:58:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2FD041419A2; Thu, 15 Feb 2024 19:57:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ZfP0KVV5"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="dGpVmmF+" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B76E2138497; Thu, 15 Feb 2024 19:57:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708027022; cv=none; b=bRNFml3whB3VEjXFdhnBkikh5pIRGIx1Jb2xE88Q8vvP6Qg+RokQx6QNDH227qp+RBeq88h9DG/34uue9PZx3bSs5GjP3/e8flMipwasmakbAOmVIPh8q4qP+T5gDla9EQAFShsGRDItNWpqUxRnsROYbEWwcgqOFiA5XscJ/GI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708027022; c=relaxed/simple; bh=v47pHAasn8MdjYA+f3l9jeSxWB4YEIsd1dzvoMOTMrs=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=KzeTTRKgDF4OwQ5n81V4C74i0WCxxqaQ8Am7zSGsHrLF1on4NOQeqsdHOGWrwAqZ64qUFUtGSwvQxCrBDjTKEJB3XiJGzF1cGvqiTOhb4kTKF/s40OdqRFPrG/WMNdgi9hswmZfQ3bYrWyO6nQ3zvHHmTqeC4caF+HS+lJ8kF2A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ZfP0KVV5; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=dGpVmmF+; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Thu, 15 Feb 2024 19:56:58 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708027018; 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=ePc7duUErdFHn02Yhoblfga7WwrJ8JliqVSXzIVyRKU=; b=ZfP0KVV5Icv0+0mzzUd3Q+La/rwtXbIGfz7kxD3EPwkknDOKDWDDnra7yc2cLpZKhEbF2P jb0wOe6YPGMwsCOJ/DoprC30ZTu64TzAV72ShmQe4CxmkfsU28OazJhQfLlZczcapo2mBF nB+lknudKkEhkBXLs6ZgDQP6K+2C0wPWHLz6AwlKBky9qmdZPz2lEz5Q0izEpmz3RRBaA2 0bt6fIe/1qPNhFcjsxEqCRNfXZTmttXALPqcyn/Jcf3QKO0RTyOXl8NKqGyoTptFj73l0K OEh7qdDYWwYx4k8aII5BeaOd3rkE/UTk3QBfcp5cEoOO92FkDKP/xRbs1672Rg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708027018; 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=ePc7duUErdFHn02Yhoblfga7WwrJ8JliqVSXzIVyRKU=; b=dGpVmmF+8oKWtI7RRlcA4hV/LqHKEFvfnR5FeNdJEYOwNxDaERjfa7Y2XxWvdise30bXjD SAT3f/ywUH7ZHcDA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/msi] genirq/msi: Provide allocation/free functions for "wired" MSI interrupts Cc: Thomas Gleixner , Anup Patel , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240127161753.114685-12-apatel@ventanamicro.com> References: <20240127161753.114685-12-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170802701803.398.1858299374515135823.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789261277375851427 X-GMAIL-MSGID: 1790996222774322178 The following commit has been merged into the irq/msi branch of tip: Commit-ID: 0ee1578b00bcf5ef8e7955f0c6f02a624443eb29 Gitweb: https://git.kernel.org/tip/0ee1578b00bcf5ef8e7955f0c6f02a624443eb29 Author: Thomas Gleixner AuthorDate: Sat, 27 Jan 2024 21:47:39 +05:30 Committer: Thomas Gleixner CommitterDate: Thu, 15 Feb 2024 17:55:41 +01:00 genirq/msi: Provide allocation/free functions for "wired" MSI interrupts To support wire to MSI bridges proper in the MSI core infrastructure it is required to have separate allocation/free interfaces which can be invoked from the regular irqdomain allocaton/free functions. The mechanism for allocation is: - Allocate the next free MSI descriptor index in the domain - Store the hardware interrupt number and the trigger type which was extracted by the irqdomain core from the firmware spec in the MSI descriptor device cookie so it can be retrieved by the underlying interrupt domain and interrupt chip - Use the regular MSI allocation mechanism for the newly allocated index which returns a fully initialized Linux interrupt on succes This works because: - the domains have a fixed size - each hardware interrupt is only allocated once - the underlying domain does not care about the MSI index it only cares about the hardware interrupt number and the trigger type The free function looks up the MSI index in the MSI descriptor of the provided Linux interrupt number and uses the regular index based free functions of the MSI core. Signed-off-by: Thomas Gleixner Signed-off-by: Anup Patel Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20240127161753.114685-12-apatel@ventanamicro.com --- include/linux/irqdomain.h | 17 ++++++++++- kernel/irq/msi.c | 68 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+) diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index ee0a82c..21ecf58 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -619,6 +619,23 @@ static inline bool irq_domain_is_msi_device(struct irq_domain *domain) #endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */ +#ifdef CONFIG_GENERIC_MSI_IRQ +int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, + unsigned int type); +void msi_device_domain_free_wired(struct irq_domain *domain, unsigned int virq); +#else +static inline int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, + unsigned int type) +{ + WARN_ON_ONCE(1); + return -EINVAL; +} +static inline void msi_device_domain_free_wired(struct irq_domain *domain, unsigned int virq) +{ + WARN_ON_ONCE(1); +} +#endif + #else /* CONFIG_IRQ_DOMAIN */ static inline void irq_dispose_mapping(unsigned int virq) { } static inline struct irq_domain *irq_find_matching_fwnode( diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 5289fc2..07e9daa 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -1540,6 +1540,50 @@ struct msi_map msi_domain_alloc_irq_at(struct device *dev, unsigned int domid, u return map; } +/** + * msi_device_domain_alloc_wired - Allocate a "wired" interrupt on @domain + * @domain: The domain to allocate on + * @hwirq: The hardware interrupt number to allocate for + * @type: The interrupt type + * + * This weirdness supports wire to MSI controllers like MBIGEN. + * + * @hwirq is the hardware interrupt number which is handed in from + * irq_create_fwspec_mapping(). As the wire to MSI domain is sparse, but + * sized in firmware, the hardware interrupt number cannot be used as MSI + * index. For the underlying irq chip the MSI index is irrelevant and + * all it needs is the hardware interrupt number. + * + * To handle this the MSI index is allocated with MSI_ANY_INDEX and the + * hardware interrupt number is stored along with the type information in + * msi_desc::cookie so the underlying interrupt chip and domain code can + * retrieve it. + * + * Return: The Linux interrupt number (> 0) or an error code + */ +int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, + unsigned int type) +{ + unsigned int domid = MSI_DEFAULT_DOMAIN; + union msi_instance_cookie icookie = { }; + struct device *dev = domain->dev; + struct msi_map map = { }; + + if (WARN_ON_ONCE(!dev || domain->bus_token != DOMAIN_BUS_WIRED_TO_MSI)) + return -EINVAL; + + icookie.value = ((u64)type << 32) | hwirq; + + msi_lock_descs(dev); + if (WARN_ON_ONCE(msi_get_device_domain(dev, domid) != domain)) + map.index = -EINVAL; + else + map = __msi_domain_alloc_irq_at(dev, domid, MSI_ANY_INDEX, NULL, &icookie); + msi_unlock_descs(dev); + + return map.index >= 0 ? map.virq : map.index; +} + static void __msi_domain_free_irqs(struct device *dev, struct irq_domain *domain, struct msi_ctrl *ctrl) { @@ -1666,6 +1710,30 @@ void msi_domain_free_irqs_all(struct device *dev, unsigned int domid) } /** + * msi_device_domain_free_wired - Free a wired interrupt in @domain + * @domain: The domain to free the interrupt on + * @virq: The Linux interrupt number to free + * + * This is the counterpart of msi_device_domain_alloc_wired() for the + * weird wired to MSI converting domains. + */ +void msi_device_domain_free_wired(struct irq_domain *domain, unsigned int virq) +{ + struct msi_desc *desc = irq_get_msi_desc(virq); + struct device *dev = domain->dev; + + if (WARN_ON_ONCE(!dev || !desc || domain->bus_token != DOMAIN_BUS_WIRED_TO_MSI)) + return; + + msi_lock_descs(dev); + if (!WARN_ON_ONCE(msi_get_device_domain(dev, MSI_DEFAULT_DOMAIN) != domain)) { + msi_domain_free_irqs_range_locked(dev, MSI_DEFAULT_DOMAIN, desc->msi_index, + desc->msi_index); + } + msi_unlock_descs(dev); +} + +/** * msi_get_domain_info - Get the MSI interrupt domain info for @domain * @domain: The interrupt domain to retrieve data from *