diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/kernel/reboot_fixups_32.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/kernel/reboot_fixups_32.c')
| -rw-r--r-- | arch/x86/kernel/reboot_fixups_32.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c index fda313ebbb03..c8e41e90f59c 100644 --- a/arch/x86/kernel/reboot_fixups_32.c +++ b/arch/x86/kernel/reboot_fixups_32.c | |||
| @@ -43,17 +43,33 @@ static void rdc321x_reset(struct pci_dev *dev) | |||
| 43 | outb(1, 0x92); | 43 | outb(1, 0x92); |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | static void ce4100_reset(struct pci_dev *dev) | ||
| 47 | { | ||
| 48 | int i; | ||
| 49 | |||
| 50 | for (i = 0; i < 10; i++) { | ||
| 51 | outb(0x2, 0xcf9); | ||
| 52 | udelay(50); | ||
| 53 | } | ||
| 54 | } | ||
| 55 | |||
| 46 | struct device_fixup { | 56 | struct device_fixup { |
| 47 | unsigned int vendor; | 57 | unsigned int vendor; |
| 48 | unsigned int device; | 58 | unsigned int device; |
| 49 | void (*reboot_fixup)(struct pci_dev *); | 59 | void (*reboot_fixup)(struct pci_dev *); |
| 50 | }; | 60 | }; |
| 51 | 61 | ||
| 62 | /* | ||
| 63 | * PCI ids solely used for fixups_table go here | ||
| 64 | */ | ||
| 65 | #define PCI_DEVICE_ID_INTEL_CE4100 0x0708 | ||
| 66 | |||
| 52 | static const struct device_fixup fixups_table[] = { | 67 | static const struct device_fixup fixups_table[] = { |
| 53 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, | 68 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, |
| 54 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, | 69 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, |
| 55 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, | 70 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, |
| 56 | { PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, rdc321x_reset }, | 71 | { PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, rdc321x_reset }, |
| 72 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CE4100, ce4100_reset }, | ||
| 57 | }; | 73 | }; |
| 58 | 74 | ||
| 59 | /* | 75 | /* |