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

Commit 02fd4e76 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pci', 'acpi-soc' and 'pnp' 

* acpi-pci:
  x86/ACPI/PCI: Recognize that Interrupt Line 255 means "not connected"

* acpi-soc:
  i2c: designware: Add device HID for future AMD I2C controller

* pnp:
  PNP / ACPI: add ACPI_RESOURCE_TYPE_SERIAL_BUS as a valid type
parents 6a8ccb1d e237a551 e4e666ba 86e75410

drivers/acpi/acpi_apd.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { 
	/* Generic apd devices */

#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE

	{ "AMD0010", APD_ADDR(cz_i2c_desc) },

	{ "AMDI0010", APD_ADDR(cz_i2c_desc) },

	{ "AMD0020", APD_ADDR(cz_uart_desc) },

	{ "AMD0030", },

#endif

drivers/acpi/pci_irq.c

+25 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/pci.h>

#include <linux/acpi.h>

#include <linux/slab.h>

#include <linux/interrupt.h>



#define PREFIX "ACPI: "
@@ -387,6 +388,23 @@ static inline int acpi_isa_register_gsi(struct pci_dev *dev) 
}

#endif



static inline bool acpi_pci_irq_valid(struct pci_dev *dev, u8 pin)

{

#ifdef CONFIG_X86

	/*

	 * On x86 irq line 0xff means "unknown" or "no connection"

	 * (PCI 3.0, Section 6.2.4, footnote on page 223).

	 */

	if (dev->irq == 0xff) {

		dev->irq = IRQ_NOTCONNECTED;

		dev_warn(&dev->dev, "PCI INT %c: not connected\n",

			 pin_name(pin));

		return false;

	}

#endif

	return true;

}



int acpi_pci_irq_enable(struct pci_dev *dev)

{

	struct acpi_prt_entry *entry;
@@ -431,11 +449,14 @@ int acpi_pci_irq_enable(struct pci_dev *dev) 
	} else

		gsi = -1;



	if (gsi < 0) {

		/*

		 * No IRQ known to the ACPI subsystem - maybe the BIOS /

		 * driver reported one, then use it. Exit in any case.

		 */

	if (gsi < 0) {

		if (!acpi_pci_irq_valid(dev, pin))

			return 0;



		if (acpi_isa_register_gsi(dev))

			dev_warn(&dev->dev, "PCI INT %c: no GSI\n",

				 pin_name(pin));

drivers/i2c/busses/i2c-designware-platdrv.c

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { 
	{ "80860F41", 0 },

	{ "808622C1", 0 },

	{ "AMD0010", ACCESS_INTR_MASK },

	{ "AMDI0010", ACCESS_INTR_MASK },

	{ "AMDI0510", 0 },

	{ "APMC0D0F", 0 },

	{ }

drivers/pnp/pnpacpi/rsparser.c

+4 −0
Original line number Diff line number Diff line
@@ -252,6 +252,10 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 
	case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:

		break;



	case ACPI_RESOURCE_TYPE_SERIAL_BUS:

		/* serial bus connections (I2C/SPI/UART) are not pnp */

		break;



	default:

		dev_warn(&dev->dev, "unknown resource type %d in _CRS\n",

			 res->type);

include/linux/interrupt.h

+10 −0
Original line number Diff line number Diff line
@@ -125,6 +125,16 @@ struct irqaction { 


extern irqreturn_t no_action(int cpl, void *dev_id);



/*

 * If a (PCI) device interrupt is not connected we set dev->irq to

 * IRQ_NOTCONNECTED. This causes request_irq() to fail with -ENOTCONN, so we

 * can distingiush that case from other error returns.

 *

 * 0x80000000 is guaranteed to be outside the available range of interrupts

 * and easy to distinguish from other possible incorrect values.

 */

#define IRQ_NOTCONNECTED	(1U << 31)



extern int __must_check

request_threaded_irq(unsigned int irq, irq_handler_t handler,

		     irq_handler_t thread_fn,