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

Commit 30cbc222 authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

[PATCH] update legacy io handling for pmac 



ppc can boot one single binary on prep, chrp and pmac boards.  ppc64 can
boot one single binary on pseries and G5 boards.  pmac has no legacy io,
probing for PC style legacy hardware (or accessing the legacy io area
regulary) may lead to a hard crash:

* add check for parport_pc, exit on pmac.  32bit chrp has no
  ->check_legacy_ioport, the probe is always called.  64bit chrp has
  check_legacy_ioport, check for a "parallel" node

* add check for isapnp, only PReP boards may have real ISA slots.  32bit
  PReP will have no ->check_legacy_ioport, the probe is always called.

* update code in i8042_platform_init.  Run ->check_legacy_ioport first,
  always call request_region.  No functional change.  Remove whitespace
  before i8042_reset init.

Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c69c3127

arch/powerpc/platforms/pseries/setup.c

+6 −0
Original line number Diff line number Diff line
@@ -415,6 +415,12 @@ static int pSeries_check_legacy_ioport(unsigned int baseport) 
			return -ENODEV;

		of_node_put(np);

		break;

	case PARALLEL_BASE:

		np = of_find_node_by_type(NULL, "parallel");

		if (np == NULL)

			return -ENODEV;

		of_node_put(np);

		break;

	}

	return 0;

}

drivers/input/serio/i8042-io.h

+6 −9
Original line number Diff line number Diff line
@@ -67,25 +67,22 @@ static inline int i8042_platform_init(void) 
 * On some platforms touching the i8042 data register region can do really

 * bad things. Because of this the region is always reserved on such boxes.

 */

#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC_MERGE)

	if (!request_region(I8042_DATA_REG, 16, "i8042"))

		return -EBUSY;

#endif



        i8042_reset = 1;



#if defined(CONFIG_PPC_MERGE)

	if (check_legacy_ioport(I8042_DATA_REG))

		return -EBUSY;

		return -ENODEV;

#endif

#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__)

	if (!request_region(I8042_DATA_REG, 16, "i8042"))

		return -EBUSY;

#endif



	i8042_reset = 1;

	return 0;

}



static inline void i8042_platform_exit(void)

{

#if !defined(__sh__) && !defined(__alpha__) && !defined(CONFIG_PPC64)

#if !defined(__sh__) && !defined(__alpha__)

	release_region(I8042_DATA_REG, 16);

#endif

}

drivers/parport/parport_pc.c

+4 −0
Original line number Diff line number Diff line
@@ -3374,6 +3374,10 @@ __setup("parport_init_mode=",parport_init_mode_setup); 


static int __init parport_pc_init(void)

{

#if defined(CONFIG_PPC_MERGE)

	if (check_legacy_ioport(PARALLEL_BASE))

		return -ENODEV;

#endif

	if (parse_parport_params())

		return -EINVAL;

drivers/pnp/pnpbios/core.c

+8 −0
Original line number Diff line number Diff line
@@ -526,6 +526,10 @@ static int __init pnpbios_init(void) 
{

	int ret;



#if defined(CONFIG_PPC_MERGE)

	if (check_legacy_ioport(PNPBIOS_BASE))

		return -ENODEV;

#endif

	if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table)) {

		printk(KERN_INFO "PnPBIOS: Disabled\n");

		return -ENODEV;
@@ -575,6 +579,10 @@ subsys_initcall(pnpbios_init); 


static int __init pnpbios_thread_init(void)

{

#if defined(CONFIG_PPC_MERGE)

	if (check_legacy_ioport(PNPBIOS_BASE))

		return 0;

#endif

	if (pnpbios_disabled)

		return 0;

#ifdef CONFIG_HOTPLUG

include/asm-powerpc/io.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


/* Check of existence of legacy devices */

extern int check_legacy_ioport(unsigned long base_port);

#define PARALLEL_BASE	0x378

#define PNPBIOS_BASE	0xf000	/* only relevant for PReP */



#ifndef CONFIG_PPC64

#include <asm-ppc/io.h>