x86/PCI: Remove unused HyperTransport interrupt support (fd2fa6c1) · Commits · 戴 / test

arch/x86/include/asm/hw_irq.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -99,14 +99,6 @@ struct irq_alloc_info {
		void *dmar_data;
		};
		#endif
		#ifdef CONFIG_HT_IRQ
		struct {
		int ht_pos;
		int ht_idx;
		struct pci_dev *ht_dev;
		void *ht_update;
		};
		#endif
		#ifdef CONFIG_X86_UV
		struct {
		int uv_limit;

arch/x86/include/asm/hypertransport.h

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#ifndef _ASM_X86_HYPERTRANSPORT_H
		#define _ASM_X86_HYPERTRANSPORT_H

		/*
		* Constants for x86 Hypertransport Interrupts.
		*/

		#define HT_IRQ_LOW_BASE 0xf8000000

		#define HT_IRQ_LOW_VECTOR_SHIFT 16
		#define HT_IRQ_LOW_VECTOR_MASK 0x00ff0000
		#define HT_IRQ_LOW_VECTOR(v) \
		(((v) << HT_IRQ_LOW_VECTOR_SHIFT) & HT_IRQ_LOW_VECTOR_MASK)

		#define HT_IRQ_LOW_DEST_ID_SHIFT 8
		#define HT_IRQ_LOW_DEST_ID_MASK 0x0000ff00
		#define HT_IRQ_LOW_DEST_ID(v) \
		(((v) << HT_IRQ_LOW_DEST_ID_SHIFT) & HT_IRQ_LOW_DEST_ID_MASK)

		#define HT_IRQ_LOW_DM_PHYSICAL 0x0000000
		#define HT_IRQ_LOW_DM_LOGICAL 0x0000040

		#define HT_IRQ_LOW_RQEOI_EDGE 0x0000000
		#define HT_IRQ_LOW_RQEOI_LEVEL 0x0000020


		#define HT_IRQ_LOW_MT_FIXED 0x0000000
		#define HT_IRQ_LOW_MT_ARBITRATED 0x0000004
		#define HT_IRQ_LOW_MT_SMI 0x0000008
		#define HT_IRQ_LOW_MT_NMI 0x000000c
		#define HT_IRQ_LOW_MT_INIT 0x0000010
		#define HT_IRQ_LOW_MT_STARTUP 0x0000014
		#define HT_IRQ_LOW_MT_EXTINT 0x0000018
		#define HT_IRQ_LOW_MT_LINT1 0x000008c
		#define HT_IRQ_LOW_MT_LINT0 0x0000098

		#define HT_IRQ_LOW_IRQ_MASKED 0x0000001


		#define HT_IRQ_HIGH_DEST_ID_SHIFT 0
		#define HT_IRQ_HIGH_DEST_ID_MASK 0x00ffffff
		#define HT_IRQ_HIGH_DEST_ID(v) \
		((((v) >> 8) << HT_IRQ_HIGH_DEST_ID_SHIFT) & HT_IRQ_HIGH_DEST_ID_MASK)

		#endif /* _ASM_X86_HYPERTRANSPORT_H */

arch/x86/include/asm/irqdomain.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -56,10 +56,4 @@ extern void arch_init_msi_domain(struct irq_domain *domain);
		static inline void arch_init_msi_domain(struct irq_domain *domain) { }
		#endif

		#ifdef CONFIG_HT_IRQ
		extern void arch_init_htirq_domain(struct irq_domain *domain);
		#else
		static inline void arch_init_htirq_domain(struct irq_domain *domain) { }
		#endif

		#endif

arch/x86/kernel/apic/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ obj-y += hw_nmi.o

		obj-$(CONFIG_X86_IO_APIC) += io_apic.o
		obj-$(CONFIG_PCI_MSI) += msi.o
		obj-$(CONFIG_HT_IRQ) += htirq.o
		obj-$(CONFIG_SMP) += ipi.o

		ifeq ($(CONFIG_X86_64),y)

arch/x86/kernel/apic/htirq.c

deleted100644 → 0

+0 −198

Original line number	Diff line number	Diff line
		/*
		* Support Hypertransport IRQ
		*
		* Copyright (C) 1997, 1998, 1999, 2000, 2009 Ingo Molnar, Hajnalka Szabo
		* Moved from arch/x86/kernel/apic/io_apic.c.
		* Jiang Liu <jiang.liu@linux.intel.com>
		* Add support of hierarchical irqdomain
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <linux/mm.h>
		#include <linux/interrupt.h>
		#include <linux/init.h>
		#include <linux/device.h>
		#include <linux/pci.h>
		#include <linux/htirq.h>
		#include <asm/irqdomain.h>
		#include <asm/hw_irq.h>
		#include <asm/apic.h>
		#include <asm/hypertransport.h>

		static struct irq_domain *htirq_domain;

		/*
		* Hypertransport interrupt support
		*/
		static int
		ht_set_affinity(struct irq_data data, const struct cpumask mask, bool force)
		{
		struct irq_data *parent = data->parent_data;
		int ret;

		ret = parent->chip->irq_set_affinity(parent, mask, force);
		if (ret >= 0) {
		struct ht_irq_msg msg;
		struct irq_cfg *cfg = irqd_cfg(data);

		fetch_ht_irq_msg(data->irq, &msg);
		msg.address_lo &= ~(HT_IRQ_LOW_VECTOR_MASK \|
		HT_IRQ_LOW_DEST_ID_MASK);
		msg.address_lo \|= HT_IRQ_LOW_VECTOR(cfg->vector) \|
		HT_IRQ_LOW_DEST_ID(cfg->dest_apicid);
		msg.address_hi &= ~(HT_IRQ_HIGH_DEST_ID_MASK);
		msg.address_hi \|= HT_IRQ_HIGH_DEST_ID(cfg->dest_apicid);
		write_ht_irq_msg(data->irq, &msg);
		}

		return ret;
		}

		static struct irq_chip ht_irq_chip = {
		.name = "PCI-HT",
		.irq_mask = mask_ht_irq,
		.irq_unmask = unmask_ht_irq,
		.irq_ack = irq_chip_ack_parent,
		.irq_set_affinity = ht_set_affinity,
		.irq_retrigger = irq_chip_retrigger_hierarchy,
		.flags = IRQCHIP_SKIP_SET_WAKE,
		};

		static int htirq_domain_alloc(struct irq_domain *domain, unsigned int virq,
		unsigned int nr_irqs, void *arg)
		{
		struct ht_irq_cfg *ht_cfg;
		struct irq_alloc_info *info = arg;
		struct pci_dev *dev;
		irq_hw_number_t hwirq;
		int ret;

		if (nr_irqs > 1 \|\| !info)
		return -EINVAL;

		dev = info->ht_dev;
		hwirq = (info->ht_idx & 0xFF) \|
		PCI_DEVID(dev->bus->number, dev->devfn) << 8 \|
		(pci_domain_nr(dev->bus) & 0xFFFFFFFF) << 24;
		if (irq_find_mapping(domain, hwirq) > 0)
		return -EEXIST;

		ht_cfg = kmalloc(sizeof(*ht_cfg), GFP_KERNEL);
		if (!ht_cfg)
		return -ENOMEM;

		ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, info);
		if (ret < 0) {
		kfree(ht_cfg);
		return ret;
		}

		/* Initialize msg to a value that will never match the first write. */
		ht_cfg->msg.address_lo = 0xffffffff;
		ht_cfg->msg.address_hi = 0xffffffff;
		ht_cfg->dev = info->ht_dev;
		ht_cfg->update = info->ht_update;
		ht_cfg->pos = info->ht_pos;
		ht_cfg->idx = 0x10 + (info->ht_idx * 2);
		irq_domain_set_info(domain, virq, hwirq, &ht_irq_chip, ht_cfg,
		handle_edge_irq, ht_cfg, "edge");

		return 0;
		}

		static void htirq_domain_free(struct irq_domain *domain, unsigned int virq,
		unsigned int nr_irqs)
		{
		struct irq_data *irq_data = irq_domain_get_irq_data(domain, virq);

		BUG_ON(nr_irqs != 1);
		kfree(irq_data->chip_data);
		irq_domain_free_irqs_top(domain, virq, nr_irqs);
		}

		static int htirq_domain_activate(struct irq_domain *domain,
		struct irq_data *irq_data, bool early)
		{
		struct ht_irq_msg msg;
		struct irq_cfg *cfg = irqd_cfg(irq_data);

		msg.address_hi = HT_IRQ_HIGH_DEST_ID(cfg->dest_apicid);
		msg.address_lo =
		HT_IRQ_LOW_BASE \|
		HT_IRQ_LOW_DEST_ID(cfg->dest_apicid) \|
		HT_IRQ_LOW_VECTOR(cfg->vector) \|
		((apic->irq_dest_mode == 0) ?
		HT_IRQ_LOW_DM_PHYSICAL :
		HT_IRQ_LOW_DM_LOGICAL) \|
		HT_IRQ_LOW_RQEOI_EDGE \|
		((apic->irq_delivery_mode != dest_LowestPrio) ?
		HT_IRQ_LOW_MT_FIXED :
		HT_IRQ_LOW_MT_ARBITRATED) \|
		HT_IRQ_LOW_IRQ_MASKED;
		write_ht_irq_msg(irq_data->irq, &msg);
		return 0;
		}

		static void htirq_domain_deactivate(struct irq_domain *domain,
		struct irq_data *irq_data)
		{
		struct ht_irq_msg msg;

		memset(&msg, 0, sizeof(msg));
		write_ht_irq_msg(irq_data->irq, &msg);
		}

		static const struct irq_domain_ops htirq_domain_ops = {
		.alloc = htirq_domain_alloc,
		.free = htirq_domain_free,
		.activate = htirq_domain_activate,
		.deactivate = htirq_domain_deactivate,
		};

		void __init arch_init_htirq_domain(struct irq_domain *parent)
		{
		struct fwnode_handle *fn;

		if (disable_apic)
		return;

		fn = irq_domain_alloc_named_fwnode("PCI-HT");
		if (!fn)
		goto warn;

		htirq_domain = irq_domain_create_tree(fn, &htirq_domain_ops, NULL);
		irq_domain_free_fwnode(fn);
		if (!htirq_domain)
		goto warn;

		htirq_domain->parent = parent;
		return;

		warn:
		pr_warn("Failed to initialize irqdomain for HTIRQ.\n");
		}

		int arch_setup_ht_irq(int idx, int pos, struct pci_dev *dev,
		ht_irq_update_t *update)
		{
		struct irq_alloc_info info;

		if (!htirq_domain)
		return -ENOSYS;

		init_irq_alloc_info(&info, NULL);
		info.ht_idx = idx;
		info.ht_pos = pos;
		info.ht_dev = dev;
		info.ht_update = update;

		return irq_domain_alloc_irqs(htirq_domain, 1, dev_to_node(&dev->dev),
		&info);
		}

		void arch_teardown_ht_irq(unsigned int irq)
		{
		irq_domain_free_irqs(irq, 1);
		}

Admin message