Commit 8f81dd14 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

PNP: notice whether we have PNP devices (PNPBIOS or PNPACPI) 



This series converts i386 and x86_64 legacy serial ports to be platform
devices and prevents probing for them if we have PNP.

This prevents double discovery, where a device was found both by the legacy
probe and by 8250_pnp.

This also prevents the serial driver from claiming IRDA devices (unless they
have a UART PNP ID).  The serial legacy probe sometimes assumed the wrong IRQ,
so the user had to use "setserial" to fix it.

Removing the need for setserial to make IRDA devices work seems good, but it
does break some things.  In particular, you may need to keep setserial from
poking legacy UART stuff back in by doing something like "dpkg-reconfigure
setserial" with the "kernel" option.  Otherwise, the setserial-discovered
"UART" will claim resources and prevent the IRDA driver from loading.

This patch:

If we can discover devices using PNP, we can skip some legacy probes.  This
flag ("pnp_platform_devices") indicates that PNPBIOS or PNPACPI is enabled and
should tell us about builtin devices.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Keith Owens <kaos@ocs.com.au>
Cc: Len Brown <lenb@kernel.org>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Jean Tourrilhes <jt@hpl.hp.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Russell King <rmk+serial@arm.linux.org.uk>
Cc: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cab9bdd1

drivers/pnp/core.c

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,14 @@ static LIST_HEAD(pnp_protocols); 
LIST_HEAD(pnp_global);

DEFINE_SPINLOCK(pnp_lock);



/*

 * ACPI or PNPBIOS should tell us about all platform devices, so we can

 * skip some blind probes.  ISAPNP typically enumerates only plug-in ISA

 * devices, not built-in things like COM ports.

 */

int pnp_platform_devices;

EXPORT_SYMBOL(pnp_platform_devices);



void *pnp_alloc(long size)

{

	void *result;

drivers/pnp/pnpacpi/core.c

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ static int __init pnpacpi_init(void) 
	acpi_get_devices(NULL, pnpacpi_add_device_handler, NULL, NULL);

	pnp_info("PnP ACPI: found %d devices", num);

	unregister_acpi_bus_type(&acpi_pnp_bus);

	pnp_platform_devices = 1;

	return 0;

}

subsys_initcall(pnpacpi_init);

drivers/pnp/pnpbios/core.c

+1 −0
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ static int __init pnpbios_init(void) 
	/* scan for pnpbios devices */

	build_devlist();



	pnp_platform_devices = 1;

	return 0;

}

include/linux/pnp.h

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ int pnp_add_device(struct pnp_dev *dev); 
int pnp_device_attach(struct pnp_dev *pnp_dev);

void pnp_device_detach(struct pnp_dev *pnp_dev);

extern struct list_head pnp_global;

extern int pnp_platform_devices;



/* multidevice card support */

int pnp_add_card(struct pnp_card *card);
@@ -411,6 +412,7 @@ static inline int pnp_init_device(struct pnp_dev *dev) { return -ENODEV; } 
static inline int pnp_add_device(struct pnp_dev *dev) { return -ENODEV; }

static inline int pnp_device_attach(struct pnp_dev *pnp_dev) { return -ENODEV; }

static inline void pnp_device_detach(struct pnp_dev *pnp_dev) { ; }

#define pnp_platform_devices 0



/* multidevice card support */

static inline int pnp_add_card(struct pnp_card *card) { return -ENODEV; }

CRA Git | Maintained and supported by SUSTech CRA and CCSE