Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41cc3041 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-4.15-4' of... 

Merge tag 'irqchip-4.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Pull irqchip updates for 4.15, take #4 from Marc Zyngier

 - A core irq fix for legacy cases where the irq trigger is not reported
   by firmware

 - A couple of GICv3/4 fixes (Kconfig, of-node refcount, error handling)

 - Trivial pr_err fixes
parents b29c6ef7 29f41139

drivers/irqchip/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -41,8 +41,15 @@ config ARM_GIC_V3 


config ARM_GIC_V3_ITS

	bool

	select GENERIC_MSI_IRQ_DOMAIN

	default ARM_GIC_V3



config ARM_GIC_V3_ITS_PCI

	bool

	depends on ARM_GIC_V3_ITS

	depends on PCI

	depends on PCI_MSI

	default ARM_GIC_V3_ITS



config ARM_NVIC

	bool

drivers/irqchip/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ obj-$(CONFIG_ARM_GIC_PM) += irq-gic-pm.o 
obj-$(CONFIG_ARCH_REALVIEW)		+= irq-gic-realview.o

obj-$(CONFIG_ARM_GIC_V2M)		+= irq-gic-v2m.o

obj-$(CONFIG_ARM_GIC_V3)		+= irq-gic-v3.o irq-gic-common.o

obj-$(CONFIG_ARM_GIC_V3_ITS)		+= irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o

obj-$(CONFIG_ARM_GIC_V3_ITS)		+= irq-gic-v3-its.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o

obj-$(CONFIG_ARM_GIC_V3_ITS_PCI)	+= irq-gic-v3-its-pci-msi.o

obj-$(CONFIG_PARTITION_PERCPU)		+= irq-partition-percpu.o

obj-$(CONFIG_HISILICON_IRQ_MBIGEN)	+= irq-mbigen.o

obj-$(CONFIG_ARM_NVIC)			+= irq-nvic.o

drivers/irqchip/irq-gic-v3.c

+7 −4
Original line number Diff line number Diff line
@@ -1103,18 +1103,18 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) 
	int nr_parts;

	struct partition_affinity *parts;



	parts_node = of_find_node_by_name(gic_node, "ppi-partitions");

	parts_node = of_get_child_by_name(gic_node, "ppi-partitions");

	if (!parts_node)

		return;



	nr_parts = of_get_child_count(parts_node);



	if (!nr_parts)

		return;

		goto out_put_node;



	parts = kzalloc(sizeof(*parts) * nr_parts, GFP_KERNEL);

	if (WARN_ON(!parts))

		return;

		goto out_put_node;



	for_each_child_of_node(parts_node, child_part) {

		struct partition_affinity *part;
@@ -1181,6 +1181,9 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) 


		gic_data.ppi_descs[i] = desc;

	}



out_put_node:

	of_node_put(parts_node);

}



static void __init gic_of_setup_kvm_info(struct device_node *node)
@@ -1521,7 +1524,7 @@ gic_acpi_init(struct acpi_subtable_header *header, const unsigned long end) 


	err = gic_validate_dist_version(acpi_data.dist_base);

	if (err) {

		pr_err("No distributor detected at @%p, giving up",

		pr_err("No distributor detected at @%p, giving up\n",

		       acpi_data.dist_base);

		goto out_dist_unmap;

	}

drivers/irqchip/irq-gic-v4.c

+6 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map) 
			.map      = map,

		},

	};

	int ret;



	/*

	 * The host will never see that interrupt firing again, so it
@@ -184,7 +185,11 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map) 
	 */

	irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY);



	return irq_set_vcpu_affinity(irq, &info);

	ret = irq_set_vcpu_affinity(irq, &info);

	if (ret)

		irq_clear_status_flags(irq, IRQ_DISABLE_UNLAZY);



	return ret;

}



int its_get_vlpi(int irq, struct its_vlpi_map *map)

drivers/irqchip/irq-s3c24xx.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int s3c_irq_type(struct irq_data *data, unsigned int type) 
		irq_set_handler(data->irq, handle_level_irq);

		break;

	default:

		pr_err("No such irq type %d", type);

		pr_err("No such irq type %d\n", type);

		return -EINVAL;

	}
@@ -204,7 +204,7 @@ static int s3c_irqext_type_set(void __iomem *gpcon_reg, 
			break;



		default:

			pr_err("No such irq type %d", type);

			pr_err("No such irq type %d\n", type);

			return -EINVAL;

	}