Commit 476cc433 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pci', 'acpi-irq' and 'acpi-assorted' 

* acpi-pci:
  ACPI, PCI, irq: remove redundant check for null string pointer
  ACPI / PCI: Simplify acpi_penalize_isa_irq()
  ACPI, PCI, irq: remove interrupt number restriction
  ACPI, PCI, irq: remove interrupt count restriction

* acpi-irq:
  ACPI / spi: attach GPIO IRQ from ACPI description to SPI device
  ACPI / gpio: Add irq_type when a GPIO is used as an interrupt
  ACPI: Rename acpi_gsi_get_irq_type to acpi_dev_get_irq_type and export symbol

* acpi-assorted:
  ACPI / SBS: fix inconsistent indenting inside if statement
  ACPI: Fix build errors due objects compiled unconditionally
parents 42d287d1 45288978 33ada67d a84bc8cf

drivers/acpi/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT 
#

# ACPI Boot-Time Table Parsing

#

obj-y				+= tables.o

obj-$(CONFIG_ACPI)		+= tables.o

obj-$(CONFIG_X86)		+= blacklist.o



#

# ACPI Core Subsystem (Interpreter)

#

obj-y				+= acpi.o \

obj-$(CONFIG_ACPI)		+= acpi.o \

					acpica/



# All the builtin files are in the "acpi." module_param namespace.
@@ -66,10 +66,10 @@ obj-$(CONFIG_ACPI_FAN) += fan.o 
obj-$(CONFIG_ACPI_VIDEO)	+= video.o

obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o

obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o

obj-y				+= container.o

obj-$(CONFIG_ACPI)		+= container.o

obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o

obj-$(CONFIG_ACPI_NFIT)		+= nfit.o

obj-y				+= acpi_memhotplug.o

obj-$(CONFIG_ACPI)		+= acpi_memhotplug.o

obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

obj-$(CONFIG_ACPI_SBS)		+= sbshc.o

drivers/acpi/gsi.c

+1 −20
Original line number Diff line number Diff line
@@ -17,25 +17,6 @@ enum acpi_irq_model_id acpi_irq_model; 


static struct fwnode_handle *acpi_gsi_domain_id;



static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity)

{

	switch (polarity) {

	case ACPI_ACTIVE_LOW:

		return trigger == ACPI_EDGE_SENSITIVE ?

		       IRQ_TYPE_EDGE_FALLING :

		       IRQ_TYPE_LEVEL_LOW;

	case ACPI_ACTIVE_HIGH:

		return trigger == ACPI_EDGE_SENSITIVE ?

		       IRQ_TYPE_EDGE_RISING :

		       IRQ_TYPE_LEVEL_HIGH;

	case ACPI_ACTIVE_BOTH:

		if (trigger == ACPI_EDGE_SENSITIVE)

			return IRQ_TYPE_EDGE_BOTH;

	default:

		return IRQ_TYPE_NONE;

	}

}



/**

 * acpi_gsi_to_irq() - Retrieve the linux irq number for a given GSI

 * @gsi: GSI IRQ number to map
@@ -82,7 +63,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, 


	fwspec.fwnode = acpi_gsi_domain_id;

	fwspec.param[0] = gsi;

	fwspec.param[1] = acpi_gsi_get_irq_type(trigger, polarity);

	fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);

	fwspec.param_count = 2;



	return irq_create_fwspec_mapping(&fwspec);

drivers/acpi/pci_irq.c

+0 −3
Original line number Diff line number Diff line
@@ -131,9 +131,6 @@ static void do_prt_fixups(struct acpi_prt_entry *entry, 
		quirk = &prt_quirks[i];



		/* All current quirks involve link devices, not GSIs */

		if (!prt->source)

			continue;



		if (dmi_check_system(quirk->system) &&

		    entry->id.segment == quirk->segment &&

		    entry->id.bus == quirk->bus &&

drivers/acpi/pci_link.c

+96 −36
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>

 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 *  Copyright (C) 2002       Dominik Brodowski <devel@brodo.de>

 *  Copyright (c) 2015, The Linux Foundation. All rights reserved.

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *
@@ -67,12 +68,12 @@ static struct acpi_scan_handler pci_link_handler = { 
 * later even the link is disable. Instead, we just repick the active irq

 */

struct acpi_pci_link_irq {

	u8 active;		/* Current IRQ */

	u32 active;		/* Current IRQ */

	u8 triggering;		/* All IRQs */

	u8 polarity;		/* All IRQs */

	u8 resource_type;

	u8 possible_count;

	u8 possible[ACPI_PCI_LINK_MAX_POSSIBLE];

	u32 possible[ACPI_PCI_LINK_MAX_POSSIBLE];

	u8 initialized:1;

	u8 reserved:7;

};
@@ -437,7 +438,6 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) 
 * enabled system.

 */



#define ACPI_MAX_IRQS		256

#define ACPI_MAX_ISA_IRQ	16



#define PIRQ_PENALTY_PCI_AVAILABLE	(0)
@@ -447,7 +447,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) 
#define PIRQ_PENALTY_ISA_USED		(16*16*16*16*16)

#define PIRQ_PENALTY_ISA_ALWAYS		(16*16*16*16*16*16)



static int acpi_irq_penalty[ACPI_MAX_IRQS] = {

static int acpi_irq_isa_penalty[ACPI_MAX_ISA_IRQ] = {

	PIRQ_PENALTY_ISA_ALWAYS,	/* IRQ0 timer */

	PIRQ_PENALTY_ISA_ALWAYS,	/* IRQ1 keyboard */

	PIRQ_PENALTY_ISA_ALWAYS,	/* IRQ2 cascade */
@@ -464,9 +464,68 @@ static int acpi_irq_penalty[ACPI_MAX_IRQS] = { 
	PIRQ_PENALTY_ISA_USED,		/* IRQ13 fpe, sometimes */

	PIRQ_PENALTY_ISA_USED,		/* IRQ14 ide0 */

	PIRQ_PENALTY_ISA_USED,		/* IRQ15 ide1 */

	/* >IRQ15 */

};



struct irq_penalty_info {

	int irq;

	int penalty;

	struct list_head node;

};



static LIST_HEAD(acpi_irq_penalty_list);



static int acpi_irq_get_penalty(int irq)

{

	struct irq_penalty_info *irq_info;



	if (irq < ACPI_MAX_ISA_IRQ)

		return acpi_irq_isa_penalty[irq];



	list_for_each_entry(irq_info, &acpi_irq_penalty_list, node) {

		if (irq_info->irq == irq)

			return irq_info->penalty;

	}



	return 0;

}



static int acpi_irq_set_penalty(int irq, int new_penalty)

{

	struct irq_penalty_info *irq_info;



	/* see if this is a ISA IRQ */

	if (irq < ACPI_MAX_ISA_IRQ) {

		acpi_irq_isa_penalty[irq] = new_penalty;

		return 0;

	}



	/* next, try to locate from the dynamic list */

	list_for_each_entry(irq_info, &acpi_irq_penalty_list, node) {

		if (irq_info->irq == irq) {

			irq_info->penalty  = new_penalty;

			return 0;

		}

	}



	/* nope, let's allocate a slot for this IRQ */

	irq_info = kzalloc(sizeof(*irq_info), GFP_KERNEL);

	if (!irq_info)

		return -ENOMEM;



	irq_info->irq = irq;

	irq_info->penalty = new_penalty;

	list_add_tail(&irq_info->node, &acpi_irq_penalty_list);



	return 0;

}



static void acpi_irq_add_penalty(int irq, int penalty)

{

	int curpen = acpi_irq_get_penalty(irq);



	acpi_irq_set_penalty(irq, curpen + penalty);

}



int __init acpi_irq_penalty_init(void)

{

	struct acpi_pci_link *link;
@@ -487,15 +546,16 @@ int __init acpi_irq_penalty_init(void) 
			    link->irq.possible_count;



			for (i = 0; i < link->irq.possible_count; i++) {

				if (link->irq.possible[i] < ACPI_MAX_ISA_IRQ)

					acpi_irq_penalty[link->irq.

							 possible[i]] +=

					    penalty;

				if (link->irq.possible[i] < ACPI_MAX_ISA_IRQ) {

					int irqpos = link->irq.possible[i];



					acpi_irq_add_penalty(irqpos, penalty);

				}

			}



		} else if (link->irq.active) {

			acpi_irq_penalty[link->irq.active] +=

			    PIRQ_PENALTY_PCI_POSSIBLE;

			acpi_irq_add_penalty(link->irq.active,

					     PIRQ_PENALTY_PCI_POSSIBLE);

		}

	}
@@ -547,12 +607,12 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) 
		 * the use of IRQs 9, 10, 11, and >15.

		 */

		for (i = (link->irq.possible_count - 1); i >= 0; i--) {

			if (acpi_irq_penalty[irq] >

			    acpi_irq_penalty[link->irq.possible[i]])

			if (acpi_irq_get_penalty(irq) >

			    acpi_irq_get_penalty(link->irq.possible[i]))

				irq = link->irq.possible[i];

		}

	}

	if (acpi_irq_penalty[irq] >= PIRQ_PENALTY_ISA_ALWAYS) {

	if (acpi_irq_get_penalty(irq) >= PIRQ_PENALTY_ISA_ALWAYS) {

		printk(KERN_ERR PREFIX "No IRQ available for %s [%s]. "

			    "Try pci=noacpi or acpi=off\n",

			    acpi_device_name(link->device),
@@ -568,7 +628,8 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) 
			    acpi_device_bid(link->device));

		return -ENODEV;

	} else {

		acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;

		acpi_irq_add_penalty(link->irq.active, PIRQ_PENALTY_PCI_USING);



		printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",

		       acpi_device_name(link->device),

		       acpi_device_bid(link->device), link->irq.active);
@@ -778,7 +839,7 @@ static void acpi_pci_link_remove(struct acpi_device *device) 
}



/*

 * modify acpi_irq_penalty[] from cmdline

 * modify penalty from cmdline

 */

static int __init acpi_irq_penalty_update(char *str, int used)

{
@@ -796,13 +857,10 @@ static int __init acpi_irq_penalty_update(char *str, int used) 
		if (irq < 0)

			continue;



		if (irq >= ARRAY_SIZE(acpi_irq_penalty))

			continue;



		if (used)

			acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;

			acpi_irq_add_penalty(irq, PIRQ_PENALTY_ISA_USED);

		else

			acpi_irq_penalty[irq] = PIRQ_PENALTY_PCI_AVAILABLE;

			acpi_irq_set_penalty(irq, PIRQ_PENALTY_PCI_AVAILABLE);



		if (retval != 2)	/* no next number */

			break;
@@ -819,18 +877,15 @@ static int __init acpi_irq_penalty_update(char *str, int used) 
 */

void acpi_penalize_isa_irq(int irq, int active)

{

	if (irq >= 0 && irq < ARRAY_SIZE(acpi_irq_penalty)) {

		if (active)

			acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;

		else

			acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;

	}

	if (irq >= 0)

		acpi_irq_add_penalty(irq, active ?

			PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING);

}



bool acpi_isa_irq_available(int irq)

{

	return irq >= 0 && (irq >= ARRAY_SIZE(acpi_irq_penalty) ||

			    acpi_irq_penalty[irq] < PIRQ_PENALTY_ISA_ALWAYS);

	return irq >= 0 &&

		(acpi_irq_get_penalty(irq) < PIRQ_PENALTY_ISA_ALWAYS);

}



/*
@@ -840,13 +895,18 @@ bool acpi_isa_irq_available(int irq) 
 */

void acpi_penalize_sci_irq(int irq, int trigger, int polarity)

{

	if (irq >= 0 && irq < ARRAY_SIZE(acpi_irq_penalty)) {

	int penalty;



	if (irq < 0)

		return;



	if (trigger != ACPI_MADT_TRIGGER_LEVEL ||

	    polarity != ACPI_MADT_POLARITY_ACTIVE_LOW)

			acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_ALWAYS;

		penalty = PIRQ_PENALTY_ISA_ALWAYS;

	else

			acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;

	}

		penalty = PIRQ_PENALTY_PCI_USING;



	acpi_irq_add_penalty(irq, penalty);

}



/*

drivers/acpi/resource.c

+26 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/export.h>

#include <linux/ioport.h>

#include <linux/slab.h>

#include <linux/irq.h>



#ifdef CONFIG_X86

#define valid_IRQ(i) (((i) != 0) && ((i) != 2))
@@ -336,6 +337,31 @@ unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable) 
}

EXPORT_SYMBOL_GPL(acpi_dev_irq_flags);



/**

 * acpi_dev_get_irq_type - Determine irq type.

 * @triggering: Triggering type as provided by ACPI.

 * @polarity: Interrupt polarity as provided by ACPI.

 */

unsigned int acpi_dev_get_irq_type(int triggering, int polarity)

{

	switch (polarity) {

	case ACPI_ACTIVE_LOW:

		return triggering == ACPI_EDGE_SENSITIVE ?

		       IRQ_TYPE_EDGE_FALLING :

		       IRQ_TYPE_LEVEL_LOW;

	case ACPI_ACTIVE_HIGH:

		return triggering == ACPI_EDGE_SENSITIVE ?

		       IRQ_TYPE_EDGE_RISING :

		       IRQ_TYPE_LEVEL_HIGH;

	case ACPI_ACTIVE_BOTH:

		if (triggering == ACPI_EDGE_SENSITIVE)

			return IRQ_TYPE_EDGE_BOTH;

	default:

		return IRQ_TYPE_NONE;

	}

}

EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type);



static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi)

{

	res->start = gsi;

CRA Git | Maintained and supported by SUSTech CRA and CCSE