- applesmc_update.patch: Make the driver more generic. Should help Apples.

- apple_backlight.patch: Make sure that this loads on all hardware. - efifb_update.patch: Fixes for the 11 inch Macbook Air - acpi_reboot.patch: Should make reboot work better on most hardware - efi_default_physical.patch: Some machines dislike EFI virtual mode
2010-12-16 15:37:54 -05:00 · 2010-12-16 15:37:54 -05:00 · 0988eed04e
parent c6781123e5
commit 0988eed04e
8 changed files with 3725 additions and 2 deletions
--- a/acpi_reboot.patch
+++ b/acpi_reboot.patch
@ -0,0 +1,102 @@
+Improve our reboot handling for compatibility with Windows. Upstream in .38?
+
+diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
+index c495aa8..c770e66 100644
+--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
+@@ -34,7 +34,7 @@ EXPORT_SYMBOL(pm_power_off);
+ 
+ static const struct desc_ptr no_idt = {};
+ static int reboot_mode;
+-enum reboot_type reboot_type = BOOT_KBD;
+enum reboot_type reboot_type = BOOT_ACPI;
+ int reboot_force;
+ 
+ #if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
+@@ -538,9 +538,23 @@ void __attribute__((weak)) mach_reboot_fixups(void)
+ {
+ }
+ 
+/*
+ * Windows does the following on reboot:
+ * 1) If the FADT has the ACPI reboot register flag set, try it
+ * 2) If still alive, write to the keyboard controller
+ * 3) If still alive, write to the ACPI reboot register again
+ * 4) Ig still alive, write to the keyboard controller again
+ *
+ * If the machine is still alive at this stage, it gives up. We default to
+ * following the same pattern, except that if we're still alive after (4) we'll
+ * try to force a triple fault and then cycle between hitting the keyboard
+ * controller and doing that
+ */
+ static void native_machine_emergency_restart(void)
+ {
+ 	int i;
+	int attempt = 0;
+	int orig_reboot_type = reboot_type;
+ 
+ 	if (reboot_emergency)
+ 		emergency_vmx_disable_all();
+@@ -562,6 +576,13 @@ static void native_machine_emergency_restart(void)
+ 				outb(0xfe, 0x64); /* pulse reset low */
+ 				udelay(50);
+ 			}
+			if (attempt == 0 && orig_reboot_type == BOOT_ACPI) {
+				attempt = 1;
+				reboot_type = BOOT_ACPI;
+			} else {
+				reboot_type = BOOT_TRIPLE;
+			}
+			break;
+ 
+ 		case BOOT_TRIPLE:
+ 			load_idt(&no_idt);
+diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
+index 50cc3be..c6a4e63 100644
+--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
+@@ -82,12 +82,11 @@ acpi_status acpi_reset(void)
+ 		/*
+ 		 * For I/O space, write directly to the OSL. This bypasses the port
+ 		 * validation mechanism, which may block a valid write to the reset
+-		 * register.
+		 * register. Spec section 4.7.3.6 requires register width to be 8.
+ 		 */
+ 		status =
+ 		    acpi_os_write_port((acpi_io_address) reset_reg->address,
+-				       acpi_gbl_FADT.reset_value,
+-				       reset_reg->bit_width);
+				       acpi_gbl_FADT.reset_value, 8)
+ 	} else {
+ 		/* Write the reset value to the reset register */
+ 
+diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
+index 93f9114..a6c77e8b 100644
+--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
+@@ -15,9 +15,15 @@ void acpi_reboot(void)
+ 
+ 	rr = &acpi_gbl_FADT.reset_register;
+ 
+-	/* Is the reset register supported? */
+-	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
+-	    rr->bit_width != 8 || rr->bit_offset != 0)
+	/* ACPI reset register was only introduced with v2 of the FADT */
+
+	if (acpi_gbl_FADT.header.revision < 2)
+		return;
+
+	/* Is the reset register supported? The spec says we should be
+	 * checking the bit width and bit offset, but Windows ignores
+	 * these fields */
+	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER))
+ 		return;
+ 
+ 	reset_value = acpi_gbl_FADT.reset_value;
+@@ -45,6 +51,4 @@ void acpi_reboot(void)
+ 		acpi_reset();
+ 		break;
+ 	}
+-	/* Wait ten seconds */
+-	acpi_os_stall(10000000);
+ }
--- a/apple_backlight.patch
+++ b/apple_backlight.patch
@ -0,0 +1,688 @@
+Various fixes to the Apple backlight driver. Upstream in .38?
+
+diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
+index e54a337..fb5df46 100644
+--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
+@@ -236,12 +236,12 @@ config BACKLIGHT_MAX8925
+ 	  If you have a LCD backlight connected to the WLED output of MAX8925
+ 	  WLED output, say Y here to enable this driver.
+ 
+-config BACKLIGHT_MBP_NVIDIA
+-       tristate "MacBook Pro Nvidia Backlight Driver"
+config BACKLIGHT_APPLE
+       tristate "Apple Backlight Driver"
+        depends on X86
+        help
+-         If you have an Apple Macbook Pro with Nvidia graphics hardware say Y
+-	 to enable a driver for its backlight
+         If you have an Intel-based Apple say Y to enable a driver for its
+	 backlight
+ 
+ config BACKLIGHT_TOSA
+ 	tristate "Sharp SL-6000 Backlight Driver"
+diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
+index 44c0f81..ebaecc0 100644
+--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
+@@ -26,7 +26,7 @@ obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
+ obj-$(CONFIG_BACKLIGHT_PWM)	+= pwm_bl.o
+ obj-$(CONFIG_BACKLIGHT_DA903X)	+= da903x_bl.o
+ obj-$(CONFIG_BACKLIGHT_MAX8925)	+= max8925_bl.o
+-obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
+obj-$(CONFIG_BACKLIGHT_APPLE)	+= apple_bl.o
+ obj-$(CONFIG_BACKLIGHT_TOSA)	+= tosa_bl.o
+ obj-$(CONFIG_BACKLIGHT_SAHARA)	+= kb3886_bl.o
+ obj-$(CONFIG_BACKLIGHT_WM831X)	+= wm831x_bl.o
+diff --git a/drivers/video/backlight/apple_bl.c b/drivers/video/backlight/apple_bl.c
+new file mode 100644
+index 0000000..8f808c7
+--- /dev/null
+++ b/drivers/video/backlight/apple_bl.c
+@@ -0,0 +1,240 @@
+/*
+ *  Backlight Driver for Intel-based Apples
+ *
+ *  Copyright (c) Red Hat <mjg@redhat.com>
+ *  Based on code from Pommed:
+ *  Copyright (C) 2006 Nicolas Boichat <nicolas @boichat.ch>
+ *  Copyright (C) 2006 Felipe Alfaro Solana <felipe_alfaro @linuxmail.org>
+ *  Copyright (C) 2007 Julien BLACHE <jb@jblache.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This driver triggers SMIs which cause the firmware to change the
+ *  backlight brightness. This is icky in many ways, but it's impractical to
+ *  get at the firmware code in order to figure out what it's actually doing.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/pci.h>
+#include <linux/acpi.h>
+
+static struct backlight_device *apple_backlight_device;
+
+struct hw_data {
+	/* I/O resource to allocate. */
+	unsigned long iostart;
+	unsigned long iolen;
+	/* Backlight operations structure. */
+	const struct backlight_ops backlight_ops;
+	void (*set_brightness)(int);
+};
+
+static const struct hw_data *hw_data;
+
+#define DRIVER "apple_backlight: "
+
+/* Module parameters. */
+static int debug;
+module_param_named(debug, debug, int, 0644);
+MODULE_PARM_DESC(debug, "Set to one to enable debugging messages.");
+
+/*
+ * Implementation for machines with Intel chipset.
+ */
+static void intel_chipset_set_brightness(int intensity)
+{
+	outb(0x04 | (intensity << 4), 0xb3);
+	outb(0xbf, 0xb2);
+}
+
+static int intel_chipset_send_intensity(struct backlight_device *bd)
+{
+	int intensity = bd->props.brightness;
+
+	if (debug)
+		printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
+		       intensity);
+
+	intel_chipset_set_brightness(intensity);
+	return 0;
+}
+
+static int intel_chipset_get_intensity(struct backlight_device *bd)
+{
+	int intensity;
+
+	outb(0x03, 0xb3);
+	outb(0xbf, 0xb2);
+	intensity = inb(0xb3) >> 4;
+
+	if (debug)
+		printk(KERN_DEBUG DRIVER "read brightness of %d\n",
+		       intensity);
+
+	return intensity;
+}
+
+static const struct hw_data intel_chipset_data = {
+	.iostart = 0xb2,
+	.iolen = 2,
+	.backlight_ops	= {
+		.options	= BL_CORE_SUSPENDRESUME,
+		.get_brightness	= intel_chipset_get_intensity,
+		.update_status	= intel_chipset_send_intensity,
+	},
+	.set_brightness = intel_chipset_set_brightness,
+};
+
+/*
+ * Implementation for machines with Nvidia chipset.
+ */
+static void nvidia_chipset_set_brightness(int intensity)
+{
+	outb(0x04 | (intensity << 4), 0x52f);
+	outb(0xbf, 0x52e);
+}
+
+static int nvidia_chipset_send_intensity(struct backlight_device *bd)
+{
+	int intensity = bd->props.brightness;
+
+	if (debug)
+		printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
+		       intensity);
+
+	nvidia_chipset_set_brightness(intensity);
+	return 0;
+}
+
+static int nvidia_chipset_get_intensity(struct backlight_device *bd)
+{
+	int intensity;
+
+	outb(0x03, 0x52f);
+	outb(0xbf, 0x52e);
+	intensity = inb(0x52f) >> 4;
+
+	if (debug)
+		printk(KERN_DEBUG DRIVER "read brightness of %d\n",
+		       intensity);
+
+	return intensity;
+}
+
+static const struct hw_data nvidia_chipset_data = {
+	.iostart = 0x52e,
+	.iolen = 2,
+	.backlight_ops		= {
+		.options	= BL_CORE_SUSPENDRESUME,
+		.get_brightness	= nvidia_chipset_get_intensity,
+		.update_status	= nvidia_chipset_send_intensity
+	},
+	.set_brightness = nvidia_chipset_set_brightness,
+};
+
+static int __devinit apple_bl_add(struct acpi_device *dev)
+{
+	struct backlight_properties props;
+	struct pci_dev *host;
+	int intensity;
+
+	host = pci_get_bus_and_slot(0, 0);
+
+	if (!host) {
+		printk(KERN_ERR DRIVER "unable to find PCI host\n");
+		return -ENODEV;
+	}
+
+	if (host->vendor == PCI_VENDOR_ID_INTEL)
+		hw_data = &intel_chipset_data;
+	else if (host->vendor == PCI_VENDOR_ID_NVIDIA)
+		hw_data = &nvidia_chipset_data;
+
+	pci_dev_put(host);
+
+	if (!hw_data) {
+		printk(KERN_ERR DRIVER "unknown hardware\n");
+		return -ENODEV;
+	}
+
+	/* Check that the hardware responds - this may not work under EFI */
+
+	intensity = hw_data->backlight_ops.get_brightness(NULL);
+
+	if (!intensity) {
+		hw_data->set_brightness(1);
+		if (!hw_data->backlight_ops.get_brightness(NULL))
+			return -ENODEV;
+
+		hw_data->set_brightness(0);
+	}
+
+	if (!request_region(hw_data->iostart, hw_data->iolen,
+			    "Apple backlight"))
+		return -ENXIO;
+
+	memset(&props, 0, sizeof(struct backlight_properties));
+	props.max_brightness = 15;
+	apple_backlight_device = backlight_device_register("apple_backlight",
+				  NULL, NULL, &hw_data->backlight_ops, &props);
+
+	if (IS_ERR(apple_backlight_device)) {
+		release_region(hw_data->iostart, hw_data->iolen);
+		return PTR_ERR(apple_backlight_device);
+	}
+
+	apple_backlight_device->props.brightness =
+		hw_data->backlight_ops.get_brightness(apple_backlight_device);
+	backlight_update_status(apple_backlight_device);
+
+	return 0;
+}
+
+static int __devexit apple_bl_remove(struct acpi_device *dev, int type)
+{
+	backlight_device_unregister(apple_backlight_device);
+
+	release_region(hw_data->iostart, hw_data->iolen);
+	hw_data = NULL;
+	return 0;
+}
+
+static const struct acpi_device_id apple_bl_ids[] = {
+	{"APP0002", 0},
+	{"", 0},
+};
+
+static struct acpi_driver apple_bl_driver = {
+	.name = "Apple backlight",
+	.ids = apple_bl_ids,
+	.ops = {
+		.add = apple_bl_add,
+		.remove = apple_bl_remove,
+	},
+};
+
+static int __init apple_bl_init(void)
+{
+	return acpi_bus_register_driver(&apple_bl_driver);
+}
+
+static void __exit apple_bl_exit(void)
+{
+	acpi_bus_unregister_driver(&apple_bl_driver);
+}
+
+module_init(apple_bl_init);
+module_exit(apple_bl_exit);
+
+MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
+MODULE_DESCRIPTION("Apple Backlight Driver");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(acpi, apple_bl_ids);
+MODULE_ALIAS("mbp_nvidia_bl");
+diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
+deleted file mode 100644
+index 1485f73..0000000
+--- a/drivers/video/backlight/mbp_nvidia_bl.c
+++ /dev/null
+@@ -1,400 +0,0 @@
+-/*
+- *  Backlight Driver for Nvidia 8600 in Macbook Pro
+- *
+- *  Copyright (c) Red Hat <mjg@redhat.com>
+- *  Based on code from Pommed:
+- *  Copyright (C) 2006 Nicolas Boichat <nicolas @boichat.ch>
+- *  Copyright (C) 2006 Felipe Alfaro Solana <felipe_alfaro @linuxmail.org>
+- *  Copyright (C) 2007 Julien BLACHE <jb@jblache.org>
+- *
+- *  This program is free software; you can redistribute it and/or modify
+- *  it under the terms of the GNU General Public License version 2 as
+- *  published by the Free Software Foundation.
+- *
+- *  This driver triggers SMIs which cause the firmware to change the
+- *  backlight brightness. This is icky in many ways, but it's impractical to
+- *  get at the firmware code in order to figure out what it's actually doing.
+- */
+-
+-#include <linux/module.h>
+-#include <linux/kernel.h>
+-#include <linux/init.h>
+-#include <linux/platform_device.h>
+-#include <linux/backlight.h>
+-#include <linux/err.h>
+-#include <linux/dmi.h>
+-#include <linux/io.h>
+-
+-static struct backlight_device *mbp_backlight_device;
+-
+-/* Structure to be passed to the DMI_MATCH function. */
+-struct dmi_match_data {
+-	/* I/O resource to allocate. */
+-	unsigned long iostart;
+-	unsigned long iolen;
+-	/* Backlight operations structure. */
+-	const struct backlight_ops backlight_ops;
+-};
+-
+-/* Module parameters. */
+-static int debug;
+-module_param_named(debug, debug, int, 0644);
+-MODULE_PARM_DESC(debug, "Set to one to enable debugging messages.");
+-
+-/*
+- * Implementation for MacBooks with Intel chipset.
+- */
+-static int intel_chipset_send_intensity(struct backlight_device *bd)
+-{
+-	int intensity = bd->props.brightness;
+-
+-	if (debug)
+-		printk(KERN_DEBUG "mbp_nvidia_bl: setting brightness to %d\n",
+-		       intensity);
+-
+-	outb(0x04 | (intensity << 4), 0xb3);
+-	outb(0xbf, 0xb2);
+-	return 0;
+-}
+-
+-static int intel_chipset_get_intensity(struct backlight_device *bd)
+-{
+-	int intensity;
+-
+-	outb(0x03, 0xb3);
+-	outb(0xbf, 0xb2);
+-	intensity = inb(0xb3) >> 4;
+-
+-	if (debug)
+-		printk(KERN_DEBUG "mbp_nvidia_bl: read brightness of %d\n",
+-		       intensity);
+-
+-	return intensity;
+-}
+-
+-static const struct dmi_match_data intel_chipset_data = {
+-	.iostart = 0xb2,
+-	.iolen = 2,
+-	.backlight_ops	= {
+-		.options	= BL_CORE_SUSPENDRESUME,
+-		.get_brightness	= intel_chipset_get_intensity,
+-		.update_status	= intel_chipset_send_intensity,
+-	}
+-};
+-
+-/*
+- * Implementation for MacBooks with Nvidia chipset.
+- */
+-static int nvidia_chipset_send_intensity(struct backlight_device *bd)
+-{
+-	int intensity = bd->props.brightness;
+-
+-	if (debug)
+-		printk(KERN_DEBUG "mbp_nvidia_bl: setting brightness to %d\n",
+-		       intensity);
+-
+-	outb(0x04 | (intensity << 4), 0x52f);
+-	outb(0xbf, 0x52e);
+-	return 0;
+-}
+-
+-static int nvidia_chipset_get_intensity(struct backlight_device *bd)
+-{
+-	int intensity;
+-
+-	outb(0x03, 0x52f);
+-	outb(0xbf, 0x52e);
+-	intensity = inb(0x52f) >> 4;
+-
+-	if (debug)
+-		printk(KERN_DEBUG "mbp_nvidia_bl: read brightness of %d\n",
+-		       intensity);
+-
+-	return intensity;
+-}
+-
+-static const struct dmi_match_data nvidia_chipset_data = {
+-	.iostart = 0x52e,
+-	.iolen = 2,
+-	.backlight_ops		= {
+-		.options	= BL_CORE_SUSPENDRESUME,
+-		.get_brightness	= nvidia_chipset_get_intensity,
+-		.update_status	= nvidia_chipset_send_intensity
+-	}
+-};
+-
+-/*
+- * DMI matching.
+- */
+-static /* const */ struct dmi_match_data *driver_data;
+-
+-static int mbp_dmi_match(const struct dmi_system_id *id)
+-{
+-	driver_data = id->driver_data;
+-
+-	printk(KERN_INFO "mbp_nvidia_bl: %s detected\n", id->ident);
+-	return 1;
+-}
+-
+-static const struct dmi_system_id __initdata mbp_device_table[] = {
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 1,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 2,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook2,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 3,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook3,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 4,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 4,2",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4,2"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 1,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro1,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 1,2",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro1,2"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 2,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 2,2",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,2"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 3,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 3,2",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3,2"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 4,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookAir 1,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir1,1"),
+-		},
+-		.driver_data	= (void *)&intel_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 5,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5,1"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 5,2",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5,2"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBook 6,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook6,1"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookAir 2,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2,1"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 5,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,1"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 5,2",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,2"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 5,3",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 5,4",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookPro 5,5",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,5"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookAir 3,1",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,1"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{
+-		.callback	= mbp_dmi_match,
+-		.ident		= "MacBookAir 3,2",
+-		.matches	= {
+-			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,2"),
+-		},
+-		.driver_data	= (void *)&nvidia_chipset_data,
+-	},
+-	{ }
+-};
+-
+-static int __init mbp_init(void)
+-{
+-	struct backlight_properties props;
+-	if (!dmi_check_system(mbp_device_table))
+-		return -ENODEV;
+-
+-	if (!request_region(driver_data->iostart, driver_data->iolen, 
+-						"Macbook Pro backlight"))
+-		return -ENXIO;
+-
+-	memset(&props, 0, sizeof(struct backlight_properties));
+-	props.max_brightness = 15;
+-	mbp_backlight_device = backlight_device_register("mbp_backlight", NULL,
+-							 NULL,
+-							 &driver_data->backlight_ops,
+-							 &props);
+-	if (IS_ERR(mbp_backlight_device)) {
+-		release_region(driver_data->iostart, driver_data->iolen);
+-		return PTR_ERR(mbp_backlight_device);
+-	}
+-
+-	mbp_backlight_device->props.brightness =
+-		driver_data->backlight_ops.get_brightness(mbp_backlight_device);
+-	backlight_update_status(mbp_backlight_device);
+-
+-	return 0;
+-}
+-
+-static void __exit mbp_exit(void)
+-{
+-	backlight_device_unregister(mbp_backlight_device);
+-
+-	release_region(driver_data->iostart, driver_data->iolen);
+-}
+-
+-module_init(mbp_init);
+-module_exit(mbp_exit);
+-
+-MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
+-MODULE_DESCRIPTION("Nvidia-based Macbook Pro Backlight Driver");
+-MODULE_LICENSE("GPL");
+-MODULE_DEVICE_TABLE(dmi, mbp_device_table);
--- a/applesmc_update.patch
+++ b/applesmc_update.patch
--- a/2
+++ b/2
@ -431,7 +431,7 @@ CONFIG_SYSPROF_TRACER=y

 CONFIG_HP_ILO=m

-CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_APPLE=m

 CONFIG_OPROFILE_IBS=y
 CONFIG_MICROCODE_INTEL=y
--- a/2
+++ b/2
@ -342,7 +342,7 @@ CONFIG_SYSPROF_TRACER=y

 CONFIG_X86_MPPARSE=y

-CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_APPLE=m

 CONFIG_OPROFILE_IBS=y
 CONFIG_MICROCODE_INTEL=y
--- a/efi_default_physical.patch
+++ b/efi_default_physical.patch
@ -0,0 +1,403 @@
+Default to physical mode in EFI. Fixes boot problems on some machines,
+upstream will probably head in this direction.
+
+diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
+index 8e4a165..3c62f15 100644
+--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
+@@ -93,6 +93,9 @@ extern int add_efi_memmap;
+ extern void efi_memblock_x86_reserve_range(void);
+ extern void efi_call_phys_prelog(void);
+ extern void efi_call_phys_epilog(void);
+extern void efi_call_phys_prelog_in_physmode(void);
+extern void efi_call_phys_epilog_in_physmode(void);
+extern void efi_pagetable_init(void);
+ 
+ #ifndef CONFIG_EFI
+ /*
+diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
+index 0fe27d7..e1158b0 100644
+--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
+@@ -58,6 +58,7 @@ struct efi_memory_map memmap;
+ 
+ static struct efi efi_phys __initdata;
+ static efi_system_table_t efi_systab __initdata;
+static efi_runtime_services_t phys_runtime;
+ 
+ static int __init setup_noefi(char *arg)
+ {
+@@ -172,7 +173,7 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
+ 	return status;
+ }
+ 
+-static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
+static efi_status_t __init phys_efi_get_time_early(efi_time_t *tm,
+ 					     efi_time_cap_t *tc)
+ {
+ 	efi_status_t status;
+@@ -183,6 +184,112 @@ static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
+ 	return status;
+ }
+ 
+static efi_status_t phys_efi_get_time(efi_time_t *tm,
+				      efi_time_cap_t *tc)
+{
+	efi_status_t status;
+
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys2((void*)phys_runtime.get_time, tm, tc);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static efi_status_t __init phys_efi_set_time(efi_time_t *tm)
+{
+	efi_status_t status;
+
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys1((void*)phys_runtime.set_time, tm);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static efi_status_t phys_efi_get_wakeup_time(efi_bool_t *enabled,
+                                             efi_bool_t *pending,
+                                             efi_time_t *tm)
+{
+	efi_status_t status;
+
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys3((void*)phys_runtime.get_wakeup_time, enabled,
+				pending, tm);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static efi_status_t phys_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
+{
+	efi_status_t status;
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys2((void*)phys_runtime.set_wakeup_time, enabled,
+				tm);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static efi_status_t phys_efi_get_variable(efi_char16_t *name,
+					  efi_guid_t *vendor,
+					  u32 *attr,
+					  unsigned long *data_size,
+					  void *data)
+{
+	efi_status_t status;
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys5((void*)phys_runtime.get_variable, name, vendor,
+				attr, data_size, data);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static efi_status_t phys_efi_get_next_variable(unsigned long *name_size,
+					       efi_char16_t *name,
+					       efi_guid_t *vendor)
+{
+	efi_status_t status;
+
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys3((void*)phys_runtime.get_next_variable,
+				name_size, name, vendor);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static efi_status_t phys_efi_set_variable(efi_char16_t *name,
+					  efi_guid_t *vendor,
+					  unsigned long attr,
+					  unsigned long data_size,
+					  void *data)
+{
+	efi_status_t status;
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys5((void*)phys_runtime.set_variable, name,
+				vendor, attr, data_size, data);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static efi_status_t phys_efi_get_next_high_mono_count(u32 *count)
+{
+	efi_status_t status;
+	efi_call_phys_prelog_in_physmode();
+	status = efi_call_phys1((void*)phys_runtime.get_next_high_mono_count,
+				count);
+	efi_call_phys_epilog_in_physmode();
+	return status;
+}
+
+static void phys_efi_reset_system(int reset_type,
+                                  efi_status_t status,
+                                  unsigned long data_size,
+                                  efi_char16_t *data)
+{
+	efi_call_phys_prelog_in_physmode();
+	efi_call_phys4((void*)phys_runtime.reset_system, reset_type, status,
+				data_size, data);
+	efi_call_phys_epilog_in_physmode();
+}
+
+ int efi_set_rtc_mmss(unsigned long nowtime)
+ {
+ 	int real_seconds, real_minutes;
+@@ -435,7 +542,9 @@ void __init efi_init(void)
+ 		 * Make efi_get_time can be called before entering
+ 		 * virtual mode.
+ 		 */
+-		efi.get_time = phys_efi_get_time;
+		efi.get_time = phys_efi_get_time_early;
+
+		memcpy(&phys_runtime, runtime, sizeof(efi_runtime_services_t));
+ 	} else
+ 		printk(KERN_ERR "Could not map the EFI runtime service "
+ 		       "table!\n");
+@@ -466,6 +575,14 @@ void __init efi_init(void)
+ #if EFI_DEBUG
+ 	print_efi_memmap();
+ #endif
+
+#ifndef CONFIG_X86_64
+	/*
+	 * Only x86_64 supports physical mode as of now. Use virtual mode
+	 * forcibly.
+	 */
+	usevirtefi = 1;
+#endif
+ }
+ 
+ static void __init runtime_code_page_mkexec(void)
+@@ -579,6 +696,27 @@ void __init efi_enter_virtual_mode(void)
+ 	memmap.map = NULL;
+ }
+ 
+void __init efi_setup_physical_mode(void)
+{
+#ifdef CONFIG_X86_64
+	efi_pagetable_init();
+#endif
+	efi.get_time = phys_efi_get_time;
+	efi.set_time = phys_efi_set_time;
+	efi.get_wakeup_time = phys_efi_get_wakeup_time;
+	efi.set_wakeup_time = phys_efi_set_wakeup_time;
+	efi.get_variable = phys_efi_get_variable;
+	efi.get_next_variable = phys_efi_get_next_variable;
+	efi.set_variable = phys_efi_set_variable;
+	efi.get_next_high_mono_count =
+		phys_efi_get_next_high_mono_count;
+	efi.reset_system = phys_efi_reset_system;
+	efi.set_virtual_address_map = NULL; /* Not needed */
+
+	early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);
+	memmap.map = NULL;
+}
+
+ /*
+  * Convenience functions to obtain memory types and attributes
+  */
+diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
+index 5cab48e..90767b1 100644
+--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
+@@ -110,3 +110,7 @@ void efi_call_phys_epilog(void)
+ 
+ 	local_irq_restore(efi_rt_eflags);
+ }
+
+void efi_call_phys_prelog_in_physmode(void) { /* Not supported */ }
+void efi_call_phys_epilog_in_physmode(void) { /* Not supported */ }
+
+diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
+index ac0621a..33a8192 100644
+--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
+@@ -39,7 +39,9 @@
+ #include <asm/fixmap.h>
+ 
+ static pgd_t save_pgd __initdata;
+-static unsigned long efi_flags __initdata;
+static DEFINE_PER_CPU(unsigned long, efi_flags);
+static DEFINE_PER_CPU(unsigned long, save_cr3);
+static pgd_t efi_pgd[PTRS_PER_PGD] __page_aligned_bss;
+ 
+ static void __init early_mapping_set_exec(unsigned long start,
+ 					  unsigned long end,
+@@ -80,7 +82,7 @@ void __init efi_call_phys_prelog(void)
+ 	unsigned long vaddress;
+ 
+ 	early_runtime_code_mapping_set_exec(1);
+-	local_irq_save(efi_flags);
+	local_irq_save(get_cpu_var(efi_flags));
+ 	vaddress = (unsigned long)__va(0x0UL);
+ 	save_pgd = *pgd_offset_k(0x0UL);
+ 	set_pgd(pgd_offset_k(0x0UL), *pgd_offset_k(vaddress));
+@@ -94,10 +96,23 @@ void __init efi_call_phys_epilog(void)
+ 	 */
+ 	set_pgd(pgd_offset_k(0x0UL), save_pgd);
+ 	__flush_tlb_all();
+-	local_irq_restore(efi_flags);
+	local_irq_restore(get_cpu_var(efi_flags));
+ 	early_runtime_code_mapping_set_exec(0);
+ }
+ 
+void efi_call_phys_prelog_in_physmode(void)
+{
+	local_irq_save(get_cpu_var(efi_flags));
+	get_cpu_var(save_cr3)= read_cr3();
+	write_cr3(virt_to_phys(efi_pgd));
+}
+
+void efi_call_phys_epilog_in_physmode(void)
+{
+	write_cr3(get_cpu_var(save_cr3));
+	local_irq_restore(get_cpu_var(efi_flags));
+}
+
+ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
+ 				 u32 type)
+ {
+@@ -112,3 +127,78 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
+ 
+ 	return (void __iomem *)__va(phys_addr);
+ }
+
+static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
+{
+	if (pgd_none(*pgd)) {
+		pud_t *pud = (pud_t *)get_zeroed_page(GFP_ATOMIC);
+		set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
+		if (pud != pud_offset(pgd, 0))
+			printk(KERN_ERR "EFI PAGETABLE BUG #00! %p <-> %p\n",
+			       pud, pud_offset(pgd, 0));
+	}
+	return pud_offset(pgd, vaddr);
+}
+
+static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
+{
+	if (pud_none(*pud)) {
+		pmd_t *pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC);
+		set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
+		if (pmd != pmd_offset(pud, 0))
+			printk(KERN_ERR "EFI PAGETABLE BUG #01! %p <-> %p\n",
+			       pmd, pmd_offset(pud, 0));
+	}
+	return pmd_offset(pud, vaddr);
+}
+
+static pte_t *fill_pte(pmd_t *pmd, unsigned long vaddr)
+{
+	if (pmd_none(*pmd)) {
+		pte_t *pte = (pte_t *)get_zeroed_page(GFP_ATOMIC);
+		set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)));
+		if (pte != pte_offset_kernel(pmd, 0))
+			printk(KERN_ERR "EFI PAGETABLE BUG #02!\n");
+	}
+	return pte_offset_kernel(pmd, vaddr);
+}
+
+void __init efi_pagetable_init(void)
+{
+	efi_memory_desc_t *md;
+	unsigned long size;
+	u64 start_pfn, end_pfn, pfn, vaddr;
+	void *p;
+	pgd_t *pgd;
+	pud_t *pud;
+	pmd_t *pmd;
+	pte_t *pte;
+
+	memset(efi_pgd, 0, sizeof(efi_pgd));
+	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
+		md = p;
+		if ((md->type != EFI_RUNTIME_SERVICES_CODE) &&
+		    (md->type != EFI_RUNTIME_SERVICES_DATA))
+			continue;
+
+		start_pfn = md->phys_addr >> PAGE_SHIFT;
+		size = md->num_pages << EFI_PAGE_SHIFT;
+		end_pfn = PFN_UP(md->phys_addr + size);
+
+		for (pfn = start_pfn; pfn <= end_pfn; pfn++) {
+			vaddr = pfn << PAGE_SHIFT;
+			pgd = efi_pgd + pgd_index(vaddr);
+			pud = fill_pud(pgd, vaddr);
+			pmd = fill_pmd(pud, vaddr);
+			pte = fill_pte(pmd, vaddr);
+			if (md->type == EFI_RUNTIME_SERVICES_CODE)
+				set_pte(pte, pfn_pte(pfn, PAGE_KERNEL_EXEC));
+			else
+				set_pte(pte, pfn_pte(pfn, PAGE_KERNEL));
+		}
+	}
+	pgd = efi_pgd + pgd_index(PAGE_OFFSET);
+	set_pgd(pgd, *pgd_offset_k(PAGE_OFFSET));
+	pgd = efi_pgd + pgd_index(__START_KERNEL_map);
+	set_pgd(pgd, *pgd_offset_k(__START_KERNEL_map));
+}
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index fb737bc..c4e310e 100644
+--- a/include/linux/efi.h
+++ b/include/linux/efi.h
+@@ -290,6 +290,7 @@ extern void efi_map_pal_code (void);
+ extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
+ extern void efi_gettimeofday (struct timespec *ts);
+ extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */
+extern void efi_setup_physical_mode(void);
+ extern u64 efi_get_iobase (void);
+ extern u32 efi_mem_type (unsigned long phys_addr);
+ extern u64 efi_mem_attributes (unsigned long phys_addr);
+diff --git a/include/linux/init.h b/include/linux/init.h
+index 577671c..2f1b28f 100644
+--- a/include/linux/init.h
+++ b/include/linux/init.h
+@@ -149,6 +149,7 @@ extern int do_one_initcall(initcall_t fn);
+ extern char __initdata boot_command_line[];
+ extern char *saved_command_line;
+ extern unsigned int reset_devices;
+extern unsigned int usevirtefi;
+ 
+ /* used by init/main.c */
+ void setup_arch(char **);
+diff --git a/init/main.c b/init/main.c
+index 8646401..726025e 100644
+--- a/init/main.c
+++ b/init/main.c
+@@ -196,6 +196,14 @@ static int __init set_reset_devices(char *str)
+ 
+ __setup("reset_devices", set_reset_devices);
+ 
+unsigned int usevirtefi;
+static int __init set_virt_efi(char *str)
+{
+	usevirtefi = 1;
+	return 1;
+}
+__setup("virtefi", set_virt_efi);
+
+ static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
+ const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
+ static const char *panic_later, *panic_param;
+@@ -668,8 +676,12 @@ asmlinkage void __init start_kernel(void)
+ 	pidmap_init();
+ 	anon_vma_init();
+ #ifdef CONFIG_X86
+-	if (efi_enabled)
+-		efi_enter_virtual_mode();
+	if (efi_enabled) {
+		if (usevirtefi)
+			efi_enter_virtual_mode();
+		else
+			efi_setup_physical_mode();
+	}
+ #endif
+ 	thread_info_cache_init();
+ 	cred_init();
--- a/efifb_update.patch
+++ b/efifb_update.patch
@ -0,0 +1,217 @@
+Fix up efifb so it works properly on the 11" Macbook Air. Upstream in .38?
+
+diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
+index 70477c2..476ffb1 100644
+--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
+@@ -53,6 +53,7 @@ enum {
+ 	M_MB_7_1,	/* MacBook, 7th rev. */
+ 	M_MB_SR,	/* MacBook, 2nd gen, (Santa Rosa) */
+ 	M_MBA,		/* MacBook Air */
+	M_MBA_3,	/* Macbook Air, 3rd rev */
+ 	M_MBP,		/* MacBook Pro */
+ 	M_MBP_2,	/* MacBook Pro 2nd gen */
+ 	M_MBP_2_2,	/* MacBook Pro 2,2nd gen */
+@@ -67,40 +68,49 @@ enum {
+ 	M_UNKNOWN	/* placeholder */
+ };
+ 
+#define OVERRIDE_NONE	0x0
+#define OVERRIDE_BASE	0x1
+#define OVERRIDE_STRIDE	0x2
+#define OVERRIDE_HEIGHT	0x4
+#define OVERRIDE_WIDTH	0x8
+
+ static struct efifb_dmi_info {
+ 	char *optname;
+ 	unsigned long base;
+ 	int stride;
+ 	int width;
+ 	int height;
+	int flags;
+ } dmi_list[] __initdata = {
+-	[M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900 },
+-	[M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
+-	[M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
+-	[M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
+-	[M_I24_8_1] = { "imac8", 0xc0060000, 2048 * 4, 1920, 1200 },
+-	[M_I24_10_1] = { "imac10", 0xc0010000, 2048 * 4, 1920, 1080 },
+-	[M_I27_11_1] = { "imac11", 0xc0010000, 2560 * 4, 2560, 1440 },
+-	[M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
+-	[M_MINI_3_1] = { "mini31", 0x40010000, 1024 * 4, 1024, 768 },
+-	[M_MINI_4_1] = { "mini41", 0xc0010000, 2048 * 4, 1920, 1200 },
+-	[M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
+-	[M_MB_5_1] = { "macbook51", 0x80010000, 2048 * 4, 1280, 800 },
+-	[M_MB_6_1] = { "macbook61", 0x80010000, 2048 * 4, 1280, 800 },
+-	[M_MB_7_1] = { "macbook71", 0x80010000, 2048 * 4, 1280, 800 },
+-	[M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },
+-	[M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
+-	[M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
+-	[M_MBP_2_2] = { "mbp22", 0x80010000, 1472 * 4, 1440, 900 },
+-	[M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
+-	[M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
+-	[M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 },
+-	[M_MBP_5_2] = { "mbp52", 0xc0010000, 2048 * 4, 1920, 1200 },
+-	[M_MBP_5_3] = { "mbp53", 0xd0010000, 2048 * 4, 1440, 900 },
+-	[M_MBP_6_1] = { "mbp61", 0x90030000, 2048 * 4, 1920, 1200 },
+-	[M_MBP_6_2] = { "mbp62", 0x90030000, 2048 * 4, 1680, 1050 },
+-	[M_MBP_7_1] = { "mbp71", 0xc0010000, 2048 * 4, 1280, 800 },
+-	[M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
+	[M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
+	[M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050, OVERRIDE_NONE }, /* guess */
+	[M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050, OVERRIDE_NONE },
+	[M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE }, /* guess */
+	[M_I24_8_1] = { "imac8", 0xc0060000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+	[M_I24_10_1] = { "imac10", 0xc0010000, 2048 * 4, 1920, 1080, OVERRIDE_NONE },
+	[M_I27_11_1] = { "imac11", 0xc0010000, 2560 * 4, 2560, 1440, OVERRIDE_NONE },
+	[M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768, OVERRIDE_NONE },
+	[M_MINI_3_1] = { "mini31", 0x40010000, 1024 * 4, 1024, 768, OVERRIDE_NONE },
+	[M_MINI_4_1] = { "mini41", 0xc0010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+	[M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+	[M_MB_5_1] = { "macbook51", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+	[M_MB_6_1] = { "macbook61", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+	[M_MB_7_1] = { "macbook71", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+	[M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+	/* 11" Macbook Air 3,1 passes the wrong stride */
+	[M_MBA_3] = { "mba3", 0, 2048 * 4, 0, 0, OVERRIDE_STRIDE },
+	[M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
+	[M_MBP_2] = { "mbp2", 0, 0, 0, 0, OVERRIDE_NONE }, /* placeholder */
+	[M_MBP_2_2] = { "mbp22", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
+	[M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
+	[M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+	[M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
+	[M_MBP_5_2] = { "mbp52", 0xc0010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+	[M_MBP_5_3] = { "mbp53", 0xd0010000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
+	[M_MBP_6_1] = { "mbp61", 0x90030000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+	[M_MBP_6_2] = { "mbp62", 0x90030000, 2048 * 4, 1680, 1050, OVERRIDE_NONE },
+	[M_MBP_7_1] = { "mbp71", 0xc0010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+	[M_UNKNOWN] = { NULL, 0, 0, 0, 0, OVERRIDE_NONE }
+ };
+ 
+ static int set_system(const struct dmi_system_id *id);
+@@ -138,6 +148,7 @@ static const struct dmi_system_id dmi_system_table[] __initconst = {
+ 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook6,1", M_MB_6_1),
+ 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook7,1", M_MB_7_1),
+ 	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
+	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir3,1", M_MBA_3),
+ 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
+ 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
+ 	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,2", M_MBP_2_2),
+@@ -154,16 +165,22 @@ static const struct dmi_system_id dmi_system_table[] __initconst = {
+ 	{},
+ };
+ 
+#define choose_value(dmivalue, fwvalue, field, flags) ({	\
+		typeof(fwvalue) _ret_ = fwvalue;		\
+		if ((flags) & (field))				\
+			_ret_ = dmivalue;			\
+		else if ((fwvalue) == 0)			\
+			_ret_ = dmivalue;			\
+		_ret_;						\
+	})
+
+ static int set_system(const struct dmi_system_id *id)
+ {
+ 	struct efifb_dmi_info *info = id->driver_data;
+-	if (info->base == 0)
+-		return 0;
+ 
+-	printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
+-			 "(%dx%d, stride %d)\n", id->ident,
+-			 (void *)info->base, info->width, info->height,
+-			 info->stride);
+	if (info->base == 0 && info->height == 0 && info->width == 0
+			&& info->stride == 0)
+		return 0;
+ 
+ 	/* Trust the bootloader over the DMI tables */
+ 	if (screen_info.lfb_base == 0) {
+@@ -171,40 +188,47 @@ static int set_system(const struct dmi_system_id *id)
+ 		struct pci_dev *dev = NULL;
+ 		int found_bar = 0;
+ #endif
+-		screen_info.lfb_base = info->base;
+		if (info->base) {
+			screen_info.lfb_base = choose_value(info->base,
+				screen_info.lfb_base, OVERRIDE_BASE,
+				info->flags);
+ 
+ #if defined(CONFIG_PCI)
+-		/* make sure that the address in the table is actually on a
+-		 * VGA device's PCI BAR */
+-
+-		for_each_pci_dev(dev) {
+-			int i;
+-			if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
+-				continue;
+-			for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+-				resource_size_t start, end;
+-
+-				start = pci_resource_start(dev, i);
+-				if (start == 0)
+-					break;
+-				end = pci_resource_end(dev, i);
+-				if (screen_info.lfb_base >= start &&
+-						screen_info.lfb_base < end) {
+-					found_bar = 1;
+			/* make sure that the address in the table is actually
+			 * on a VGA device's PCI BAR */
+
+			for_each_pci_dev(dev) {
+				int i;
+				if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
+					continue;
+				for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+					resource_size_t start, end;
+
+					start = pci_resource_start(dev, i);
+					if (start == 0)
+						break;
+					end = pci_resource_end(dev, i);
+					if (screen_info.lfb_base >= start &&
+					    screen_info.lfb_base < end) {
+						found_bar = 1;
+					}
+ 				}
+ 			}
+-		}
+-		if (!found_bar)
+-			screen_info.lfb_base = 0;
+			if (!found_bar)
+				screen_info.lfb_base = 0;
+ #endif
+		}
+ 	}
+ 	if (screen_info.lfb_base) {
+-		if (screen_info.lfb_linelength == 0)
+-			screen_info.lfb_linelength = info->stride;
+-		if (screen_info.lfb_width == 0)
+-			screen_info.lfb_width = info->width;
+-		if (screen_info.lfb_height == 0)
+-			screen_info.lfb_height = info->height;
+		screen_info.lfb_linelength = choose_value(info->stride,
+			screen_info.lfb_linelength, OVERRIDE_STRIDE,
+			info->flags);
+		screen_info.lfb_width = choose_value(info->width,
+			screen_info.lfb_width, OVERRIDE_WIDTH,
+			info->flags);
+		screen_info.lfb_height = choose_value(info->height,
+			screen_info.lfb_height, OVERRIDE_HEIGHT,
+			info->flags);
+ 		if (screen_info.orig_video_isVGA == 0)
+ 			screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;
+ 	} else {
+@@ -214,6 +238,13 @@ static int set_system(const struct dmi_system_id *id)
+ 		screen_info.orig_video_isVGA = 0;
+ 		return 0;
+ 	}
+
+	printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
+			 "(%dx%d, stride %d)\n", id->ident,
+			 (void *)screen_info.lfb_base, screen_info.lfb_width,
+			 screen_info.lfb_height, screen_info.lfb_linelength);
+
+
+ 	return 1;
+ }
+ 
--- a/kernel.spec
+++ b/kernel.spec
@ -697,6 +697,12 @@ Patch12018: neuter_intel_microcode_load.patch

 Patch12030: tpm-fix-stall-on-boot.patch

+Patch12100: applesmc_update.patch
+Patch12101: apple_backlight.patch
+Patch12102: efifb_update.patch
+Patch12200: acpi_reboot.patch
+Patch12210: efi_default_physical.patch
+
 # Runtime power management
 Patch12203: linux-2.6-usb-pci-autosuspend.patch
 Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
@ -1296,6 +1302,13 @@ ApplyPatch neuter_intel_microcode_load.patch
 # try to fix stalls during boot (#530393)
 ApplyPatch tpm-fix-stall-on-boot.patch

+# various fixes for Apple and EFI
+ApplyPatch applesmc_update.patch
+ApplyPatch apple_backlight.patch
+ApplyPatch efifb_update.patch
+ApplyPatch acpi_reboot.patch
+ApplyPatch efi_default_physical.patch
+
 # Runtime PM
 ApplyPatch linux-2.6-usb-pci-autosuspend.patch
 ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch
@ -1927,6 +1940,13 @@ fi
 #                 ||     ||

 %changelog
+* Thu Dec 16 2010 Matthew Garrett <mjg@redhat.com> 2.6.37-0.rc6.git0.2
+- applesmc_update.patch: Make the driver more generic. Should help Apples.
+- apple_backlight.patch: Make sure that this loads on all hardware.
+- efifb_update.patch: Fixes for the 11 inch Macbook Air
+- acpi_reboot.patch: Should make reboot work better on most hardware
+- efi_default_physical.patch: Some machines dislike EFI virtual mode
+
 * Wed Dec 15 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc6.git0.1
 - Linux 2.6.37-rc6
 - Re-activate acpi patch which rejected on the previous commit.