The patch titled
update legacy io handling for pmac
has been removed from the -mm tree. Its filename is
update-legacy-io-handling-for-pmac.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: update legacy io handling for pmac
From: Olaf Hering <olaf@xxxxxxxxx>
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: Olaf Hering <olaf@xxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Adam Belay <ambx1@xxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/platforms/pseries/setup.c | 6 ++++++
drivers/input/serio/i8042-io.h | 15 ++++++---------
drivers/parport/parport_pc.c | 4 ++++
drivers/pnp/pnpbios/core.c | 8 ++++++++
include/asm-powerpc/io.h | 2 ++
5 files changed, 26 insertions(+), 9 deletions(-)
diff -puN arch/powerpc/platforms/pseries/setup.c~update-legacy-io-handling-for-pmac arch/powerpc/platforms/pseries/setup.c
--- a/arch/powerpc/platforms/pseries/setup.c~update-legacy-io-handling-for-pmac
+++ a/arch/powerpc/platforms/pseries/setup.c
@@ -415,6 +415,12 @@ static int pSeries_check_legacy_ioport(u
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;
}
diff -puN drivers/input/serio/i8042-io.h~update-legacy-io-handling-for-pmac drivers/input/serio/i8042-io.h
--- a/drivers/input/serio/i8042-io.h~update-legacy-io-handling-for-pmac
+++ a/drivers/input/serio/i8042-io.h
@@ -67,25 +67,22 @@ static inline int i8042_platform_init(vo
* 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
}
diff -puN drivers/parport/parport_pc.c~update-legacy-io-handling-for-pmac drivers/parport/parport_pc.c
--- a/drivers/parport/parport_pc.c~update-legacy-io-handling-for-pmac
+++ a/drivers/parport/parport_pc.c
@@ -3374,6 +3374,10 @@ __setup("parport_init_mode=",parport_ini
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;
diff -puN drivers/pnp/pnpbios/core.c~update-legacy-io-handling-for-pmac drivers/pnp/pnpbios/core.c
--- a/drivers/pnp/pnpbios/core.c~update-legacy-io-handling-for-pmac
+++ a/drivers/pnp/pnpbios/core.c
@@ -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
diff -puN include/asm-powerpc/io.h~update-legacy-io-handling-for-pmac include/asm-powerpc/io.h
--- a/include/asm-powerpc/io.h~update-legacy-io-handling-for-pmac
+++ a/include/asm-powerpc/io.h
@@ -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>
_
Patches currently in -mm which might be from olaf@xxxxxxxxx are
origin.patch
git-powerpc.patch
pcie_portdrv_restore_config-undefined-without-config_pm.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
