diff options
Diffstat (limited to 'drivers')
30 files changed, 668 insertions, 138 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 11acaee14d66..bf79d83bdfbb 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c | |||
@@ -384,6 +384,27 @@ acpi_pci_free_irq(struct acpi_prt_entry *entry, | |||
384 | return irq; | 384 | return irq; |
385 | } | 385 | } |
386 | 386 | ||
387 | #ifdef CONFIG_X86_IO_APIC | ||
388 | extern int noioapicquirk; | ||
389 | |||
390 | static int bridge_has_boot_interrupt_variant(struct pci_bus *bus) | ||
391 | { | ||
392 | struct pci_bus *bus_it; | ||
393 | |||
394 | for (bus_it = bus ; bus_it ; bus_it = bus_it->parent) { | ||
395 | if (!bus_it->self) | ||
396 | return 0; | ||
397 | |||
398 | printk(KERN_INFO "vendor=%04x device=%04x\n", bus_it->self->vendor, | ||
399 | bus_it->self->device); | ||
400 | |||
401 | if (bus_it->self->irq_reroute_variant) | ||
402 | return bus_it->self->irq_reroute_variant; | ||
403 | } | ||
404 | return 0; | ||
405 | } | ||
406 | #endif /* CONFIG_X86_IO_APIC */ | ||
407 | |||
387 | /* | 408 | /* |
388 | * acpi_pci_irq_lookup | 409 | * acpi_pci_irq_lookup |
389 | * success: return IRQ >= 0 | 410 | * success: return IRQ >= 0 |
@@ -413,6 +434,41 @@ acpi_pci_irq_lookup(struct pci_bus *bus, | |||
413 | } | 434 | } |
414 | 435 | ||
415 | ret = func(entry, triggering, polarity, link); | 436 | ret = func(entry, triggering, polarity, link); |
437 | |||
438 | #ifdef CONFIG_X86_IO_APIC | ||
439 | /* | ||
440 | * Some chipsets (e.g. intel 6700PXH) generate a legacy INTx when the | ||
441 | * IRQ entry in the chipset's IO-APIC is masked (as, e.g. the RT kernel | ||
442 | * does during interrupt handling). When this INTx generation cannot be | ||
443 | * disabled, we reroute these interrupts to their legacy equivalent to | ||
444 | * get rid of spurious interrupts. | ||
445 | */ | ||
446 | if (!noioapicquirk) { | ||
447 | switch (bridge_has_boot_interrupt_variant(bus)) { | ||
448 | case 0: | ||
449 | /* no rerouting necessary */ | ||
450 | break; | ||
451 | |||
452 | case INTEL_IRQ_REROUTE_VARIANT: | ||
453 | /* | ||
454 | * Remap according to INTx routing table in 6700PXH | ||
455 | * specs, intel order number 302628-002, section | ||
456 | * 2.15.2. Other chipsets (80332, ...) have the same | ||
457 | * mapping and are handled here as well. | ||
458 | */ | ||
459 | printk(KERN_INFO "pci irq %d -> rerouted to legacy " | ||
460 | "irq %d\n", ret, (ret % 4) + 16); | ||
461 | ret = (ret % 4) + 16; | ||
462 | break; | ||
463 | |||
464 | default: | ||
465 | printk(KERN_INFO "not rerouting irq %d to legacy irq: " | ||
466 | "unknown mapping\n", ret); | ||
467 | break; | ||
468 | } | ||
469 | } | ||
470 | #endif /* CONFIG_X86_IO_APIC */ | ||
471 | |||
416 | return ret; | 472 | return ret; |
417 | } | 473 | } |
418 | 474 | ||
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 9364dc554257..9f7c543cc04b 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -1693,6 +1693,11 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time) | |||
1693 | for (i = 0; i <= h->highest_lun; i++) { | 1693 | for (i = 0; i <= h->highest_lun; i++) { |
1694 | int j; | 1694 | int j; |
1695 | drv_found = 0; | 1695 | drv_found = 0; |
1696 | |||
1697 | /* skip holes in the array from already deleted drives */ | ||
1698 | if (h->drv[i].raid_level == -1) | ||
1699 | continue; | ||
1700 | |||
1696 | for (j = 0; j < num_luns; j++) { | 1701 | for (j = 0; j < num_luns; j++) { |
1697 | memcpy(&lunid, &ld_buff->LUN[j][0], 4); | 1702 | memcpy(&lunid, &ld_buff->LUN[j][0], 4); |
1698 | lunid = le32_to_cpu(lunid); | 1703 | lunid = le32_to_cpu(lunid); |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 8daf4793ac32..4a597d8c2f70 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
@@ -467,6 +467,17 @@ const char *dmi_get_system_info(int field) | |||
467 | } | 467 | } |
468 | EXPORT_SYMBOL(dmi_get_system_info); | 468 | EXPORT_SYMBOL(dmi_get_system_info); |
469 | 469 | ||
470 | /** | ||
471 | * dmi_name_in_serial - Check if string is in the DMI product serial | ||
472 | * information. | ||
473 | */ | ||
474 | int dmi_name_in_serial(const char *str) | ||
475 | { | ||
476 | int f = DMI_PRODUCT_SERIAL; | ||
477 | if (dmi_ident[f] && strstr(dmi_ident[f], str)) | ||
478 | return 1; | ||
479 | return 0; | ||
480 | } | ||
470 | 481 | ||
471 | /** | 482 | /** |
472 | * dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information. | 483 | * dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information. |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 553dd4bc3075..afa8a12cd009 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -717,7 +717,7 @@ static int i915_getparam(struct drm_device *dev, void *data, | |||
717 | value = dev->pci_device; | 717 | value = dev->pci_device; |
718 | break; | 718 | break; |
719 | case I915_PARAM_HAS_GEM: | 719 | case I915_PARAM_HAS_GEM: |
720 | value = 1; | 720 | value = dev_priv->has_gem; |
721 | break; | 721 | break; |
722 | default: | 722 | default: |
723 | DRM_ERROR("Unknown parameter %d\n", param->param); | 723 | DRM_ERROR("Unknown parameter %d\n", param->param); |
@@ -830,6 +830,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
830 | 830 | ||
831 | dev_priv->regs = ioremap(base, size); | 831 | dev_priv->regs = ioremap(base, size); |
832 | 832 | ||
833 | #ifdef CONFIG_HIGHMEM64G | ||
834 | /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */ | ||
835 | dev_priv->has_gem = 0; | ||
836 | #else | ||
837 | /* enable GEM by default */ | ||
838 | dev_priv->has_gem = 1; | ||
839 | #endif | ||
840 | |||
833 | i915_gem_load(dev); | 841 | i915_gem_load(dev); |
834 | 842 | ||
835 | /* Init HWS */ | 843 | /* Init HWS */ |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index adc972cc6bfc..b3cc4731aa7c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -106,6 +106,8 @@ struct intel_opregion { | |||
106 | typedef struct drm_i915_private { | 106 | typedef struct drm_i915_private { |
107 | struct drm_device *dev; | 107 | struct drm_device *dev; |
108 | 108 | ||
109 | int has_gem; | ||
110 | |||
109 | void __iomem *regs; | 111 | void __iomem *regs; |
110 | drm_local_map_t *sarea; | 112 | drm_local_map_t *sarea; |
111 | 113 | ||
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index ad672d854828..24fe8c10b4b2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -2309,7 +2309,14 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, | |||
2309 | } | 2309 | } |
2310 | 2310 | ||
2311 | obj_priv = obj->driver_private; | 2311 | obj_priv = obj->driver_private; |
2312 | args->busy = obj_priv->active; | 2312 | /* Don't count being on the flushing list against the object being |
2313 | * done. Otherwise, a buffer left on the flushing list but not getting | ||
2314 | * flushed (because nobody's flushing that domain) won't ever return | ||
2315 | * unbusy and get reused by libdrm's bo cache. The other expected | ||
2316 | * consumer of this interface, OpenGL's occlusion queries, also specs | ||
2317 | * that the objects get unbusy "eventually" without any interference. | ||
2318 | */ | ||
2319 | args->busy = obj_priv->active && obj_priv->last_rendering_seqno != 0; | ||
2313 | 2320 | ||
2314 | drm_gem_object_unreference(obj); | 2321 | drm_gem_object_unreference(obj); |
2315 | mutex_unlock(&dev->struct_mutex); | 2322 | mutex_unlock(&dev->struct_mutex); |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index ac89a5deaca2..ab7c8e4a61f9 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -208,16 +208,19 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page) | |||
208 | */ | 208 | */ |
209 | 209 | ||
210 | /* IO operations when bitmap is stored near all superblocks */ | 210 | /* IO operations when bitmap is stored near all superblocks */ |
211 | static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long index) | 211 | static struct page *read_sb_page(mddev_t *mddev, long offset, |
212 | struct page *page, | ||
213 | unsigned long index, int size) | ||
212 | { | 214 | { |
213 | /* choose a good rdev and read the page from there */ | 215 | /* choose a good rdev and read the page from there */ |
214 | 216 | ||
215 | mdk_rdev_t *rdev; | 217 | mdk_rdev_t *rdev; |
216 | struct list_head *tmp; | 218 | struct list_head *tmp; |
217 | struct page *page = alloc_page(GFP_KERNEL); | ||
218 | sector_t target; | 219 | sector_t target; |
219 | 220 | ||
220 | if (!page) | 221 | if (!page) |
222 | page = alloc_page(GFP_KERNEL); | ||
223 | if (!page) | ||
221 | return ERR_PTR(-ENOMEM); | 224 | return ERR_PTR(-ENOMEM); |
222 | 225 | ||
223 | rdev_for_each(rdev, tmp, mddev) { | 226 | rdev_for_each(rdev, tmp, mddev) { |
@@ -227,7 +230,9 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde | |||
227 | 230 | ||
228 | target = rdev->sb_start + offset + index * (PAGE_SIZE/512); | 231 | target = rdev->sb_start + offset + index * (PAGE_SIZE/512); |
229 | 232 | ||
230 | if (sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ)) { | 233 | if (sync_page_io(rdev->bdev, target, |
234 | roundup(size, bdev_hardsect_size(rdev->bdev)), | ||
235 | page, READ)) { | ||
231 | page->index = index; | 236 | page->index = index; |
232 | attach_page_buffers(page, NULL); /* so that free_buffer will | 237 | attach_page_buffers(page, NULL); /* so that free_buffer will |
233 | * quietly no-op */ | 238 | * quietly no-op */ |
@@ -544,7 +549,9 @@ static int bitmap_read_sb(struct bitmap *bitmap) | |||
544 | 549 | ||
545 | bitmap->sb_page = read_page(bitmap->file, 0, bitmap, bytes); | 550 | bitmap->sb_page = read_page(bitmap->file, 0, bitmap, bytes); |
546 | } else { | 551 | } else { |
547 | bitmap->sb_page = read_sb_page(bitmap->mddev, bitmap->offset, 0); | 552 | bitmap->sb_page = read_sb_page(bitmap->mddev, bitmap->offset, |
553 | NULL, | ||
554 | 0, sizeof(bitmap_super_t)); | ||
548 | } | 555 | } |
549 | if (IS_ERR(bitmap->sb_page)) { | 556 | if (IS_ERR(bitmap->sb_page)) { |
550 | err = PTR_ERR(bitmap->sb_page); | 557 | err = PTR_ERR(bitmap->sb_page); |
@@ -957,11 +964,16 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
957 | */ | 964 | */ |
958 | page = bitmap->sb_page; | 965 | page = bitmap->sb_page; |
959 | offset = sizeof(bitmap_super_t); | 966 | offset = sizeof(bitmap_super_t); |
967 | read_sb_page(bitmap->mddev, bitmap->offset, | ||
968 | page, | ||
969 | index, count); | ||
960 | } else if (file) { | 970 | } else if (file) { |
961 | page = read_page(file, index, bitmap, count); | 971 | page = read_page(file, index, bitmap, count); |
962 | offset = 0; | 972 | offset = 0; |
963 | } else { | 973 | } else { |
964 | page = read_sb_page(bitmap->mddev, bitmap->offset, index); | 974 | page = read_sb_page(bitmap->mddev, bitmap->offset, |
975 | NULL, | ||
976 | index, count); | ||
965 | offset = 0; | 977 | offset = 0; |
966 | } | 978 | } |
967 | if (IS_ERR(page)) { /* read error */ | 979 | if (IS_ERR(page)) { /* read error */ |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index d62fd4f6b52e..ee090413e598 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -2008,6 +2008,9 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) | |||
2008 | return FAILED; | 2008 | return FAILED; |
2009 | } | 2009 | } |
2010 | 2010 | ||
2011 | /* make sure we have no outstanding commands at this stage */ | ||
2012 | mptscsih_flush_running_cmds(hd); | ||
2013 | |||
2011 | ioc = hd->ioc; | 2014 | ioc = hd->ioc; |
2012 | printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n", | 2015 | printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n", |
2013 | ioc->name, SCpnt); | 2016 | ioc->name, SCpnt); |
diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c index 533923f83f1a..73b0ca061bb5 100644 --- a/drivers/misc/sgi-gru/gruprocfs.c +++ b/drivers/misc/sgi-gru/gruprocfs.c | |||
@@ -317,7 +317,6 @@ int gru_proc_init(void) | |||
317 | { | 317 | { |
318 | struct proc_entry *p; | 318 | struct proc_entry *p; |
319 | 319 | ||
320 | proc_mkdir("sgi_uv", NULL); | ||
321 | proc_gru = proc_mkdir("sgi_uv/gru", NULL); | 320 | proc_gru = proc_mkdir("sgi_uv/gru", NULL); |
322 | 321 | ||
323 | for (p = proc_files; p->name; p++) | 322 | for (p = proc_files; p->name; p++) |
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h index ed1722e50049..7b4cbd5e03e9 100644 --- a/drivers/misc/sgi-xp/xp.h +++ b/drivers/misc/sgi-xp/xp.h | |||
@@ -194,9 +194,10 @@ enum xp_retval { | |||
194 | xpGruSendMqError, /* 59: gru send message queue related error */ | 194 | xpGruSendMqError, /* 59: gru send message queue related error */ |
195 | 195 | ||
196 | xpBadChannelNumber, /* 60: invalid channel number */ | 196 | xpBadChannelNumber, /* 60: invalid channel number */ |
197 | xpBadMsgType, /* 60: invalid message type */ | 197 | xpBadMsgType, /* 61: invalid message type */ |
198 | xpBiosError, /* 62: BIOS error */ | ||
198 | 199 | ||
199 | xpUnknownReason /* 61: unknown reason - must be last in enum */ | 200 | xpUnknownReason /* 63: unknown reason - must be last in enum */ |
200 | }; | 201 | }; |
201 | 202 | ||
202 | /* | 203 | /* |
@@ -345,6 +346,8 @@ extern unsigned long (*xp_pa) (void *); | |||
345 | extern enum xp_retval (*xp_remote_memcpy) (unsigned long, const unsigned long, | 346 | extern enum xp_retval (*xp_remote_memcpy) (unsigned long, const unsigned long, |
346 | size_t); | 347 | size_t); |
347 | extern int (*xp_cpu_to_nasid) (int); | 348 | extern int (*xp_cpu_to_nasid) (int); |
349 | extern enum xp_retval (*xp_expand_memprotect) (unsigned long, unsigned long); | ||
350 | extern enum xp_retval (*xp_restrict_memprotect) (unsigned long, unsigned long); | ||
348 | 351 | ||
349 | extern u64 xp_nofault_PIOR_target; | 352 | extern u64 xp_nofault_PIOR_target; |
350 | extern int xp_nofault_PIOR(void *); | 353 | extern int xp_nofault_PIOR(void *); |
diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c index 66a1d19e08ad..9a2e77172d94 100644 --- a/drivers/misc/sgi-xp/xp_main.c +++ b/drivers/misc/sgi-xp/xp_main.c | |||
@@ -51,6 +51,13 @@ EXPORT_SYMBOL_GPL(xp_remote_memcpy); | |||
51 | int (*xp_cpu_to_nasid) (int cpuid); | 51 | int (*xp_cpu_to_nasid) (int cpuid); |
52 | EXPORT_SYMBOL_GPL(xp_cpu_to_nasid); | 52 | EXPORT_SYMBOL_GPL(xp_cpu_to_nasid); |
53 | 53 | ||
54 | enum xp_retval (*xp_expand_memprotect) (unsigned long phys_addr, | ||
55 | unsigned long size); | ||
56 | EXPORT_SYMBOL_GPL(xp_expand_memprotect); | ||
57 | enum xp_retval (*xp_restrict_memprotect) (unsigned long phys_addr, | ||
58 | unsigned long size); | ||
59 | EXPORT_SYMBOL_GPL(xp_restrict_memprotect); | ||
60 | |||
54 | /* | 61 | /* |
55 | * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level | 62 | * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level |
56 | * users of XPC. | 63 | * users of XPC. |
diff --git a/drivers/misc/sgi-xp/xp_sn2.c b/drivers/misc/sgi-xp/xp_sn2.c index 1440134caf31..fb3ec9d735a9 100644 --- a/drivers/misc/sgi-xp/xp_sn2.c +++ b/drivers/misc/sgi-xp/xp_sn2.c | |||
@@ -120,6 +120,38 @@ xp_cpu_to_nasid_sn2(int cpuid) | |||
120 | return cpuid_to_nasid(cpuid); | 120 | return cpuid_to_nasid(cpuid); |
121 | } | 121 | } |
122 | 122 | ||
123 | static enum xp_retval | ||
124 | xp_expand_memprotect_sn2(unsigned long phys_addr, unsigned long size) | ||
125 | { | ||
126 | u64 nasid_array = 0; | ||
127 | int ret; | ||
128 | |||
129 | ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_1, | ||
130 | &nasid_array); | ||
131 | if (ret != 0) { | ||
132 | dev_err(xp, "sn_change_memprotect(,, " | ||
133 | "SN_MEMPROT_ACCESS_CLASS_1,) failed ret=%d\n", ret); | ||
134 | return xpSalError; | ||
135 | } | ||
136 | return xpSuccess; | ||
137 | } | ||
138 | |||
139 | static enum xp_retval | ||
140 | xp_restrict_memprotect_sn2(unsigned long phys_addr, unsigned long size) | ||
141 | { | ||
142 | u64 nasid_array = 0; | ||
143 | int ret; | ||
144 | |||
145 | ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_0, | ||
146 | &nasid_array); | ||
147 | if (ret != 0) { | ||
148 | dev_err(xp, "sn_change_memprotect(,, " | ||
149 | "SN_MEMPROT_ACCESS_CLASS_0,) failed ret=%d\n", ret); | ||
150 | return xpSalError; | ||
151 | } | ||
152 | return xpSuccess; | ||
153 | } | ||
154 | |||
123 | enum xp_retval | 155 | enum xp_retval |
124 | xp_init_sn2(void) | 156 | xp_init_sn2(void) |
125 | { | 157 | { |
@@ -132,6 +164,8 @@ xp_init_sn2(void) | |||
132 | xp_pa = xp_pa_sn2; | 164 | xp_pa = xp_pa_sn2; |
133 | xp_remote_memcpy = xp_remote_memcpy_sn2; | 165 | xp_remote_memcpy = xp_remote_memcpy_sn2; |
134 | xp_cpu_to_nasid = xp_cpu_to_nasid_sn2; | 166 | xp_cpu_to_nasid = xp_cpu_to_nasid_sn2; |
167 | xp_expand_memprotect = xp_expand_memprotect_sn2; | ||
168 | xp_restrict_memprotect = xp_restrict_memprotect_sn2; | ||
135 | 169 | ||
136 | return xp_register_nofault_code_sn2(); | 170 | return xp_register_nofault_code_sn2(); |
137 | } | 171 | } |
diff --git a/drivers/misc/sgi-xp/xp_uv.c b/drivers/misc/sgi-xp/xp_uv.c index d9f7ce2510bc..d238576b26fa 100644 --- a/drivers/misc/sgi-xp/xp_uv.c +++ b/drivers/misc/sgi-xp/xp_uv.c | |||
@@ -15,6 +15,11 @@ | |||
15 | 15 | ||
16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
17 | #include <asm/uv/uv_hub.h> | 17 | #include <asm/uv/uv_hub.h> |
18 | #if defined CONFIG_X86_64 | ||
19 | #include <asm/uv/bios.h> | ||
20 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
21 | #include <asm/sn/sn_sal.h> | ||
22 | #endif | ||
18 | #include "../sgi-gru/grukservices.h" | 23 | #include "../sgi-gru/grukservices.h" |
19 | #include "xp.h" | 24 | #include "xp.h" |
20 | 25 | ||
@@ -49,18 +54,79 @@ xp_cpu_to_nasid_uv(int cpuid) | |||
49 | return UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpuid)); | 54 | return UV_PNODE_TO_NASID(uv_cpu_to_pnode(cpuid)); |
50 | } | 55 | } |
51 | 56 | ||
57 | static enum xp_retval | ||
58 | xp_expand_memprotect_uv(unsigned long phys_addr, unsigned long size) | ||
59 | { | ||
60 | int ret; | ||
61 | |||
62 | #if defined CONFIG_X86_64 | ||
63 | ret = uv_bios_change_memprotect(phys_addr, size, UV_MEMPROT_ALLOW_RW); | ||
64 | if (ret != BIOS_STATUS_SUCCESS) { | ||
65 | dev_err(xp, "uv_bios_change_memprotect(,, " | ||
66 | "UV_MEMPROT_ALLOW_RW) failed, ret=%d\n", ret); | ||
67 | return xpBiosError; | ||
68 | } | ||
69 | |||
70 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
71 | u64 nasid_array; | ||
72 | |||
73 | ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_1, | ||
74 | &nasid_array); | ||
75 | if (ret != 0) { | ||
76 | dev_err(xp, "sn_change_memprotect(,, " | ||
77 | "SN_MEMPROT_ACCESS_CLASS_1,) failed ret=%d\n", ret); | ||
78 | return xpSalError; | ||
79 | } | ||
80 | #else | ||
81 | #error not a supported configuration | ||
82 | #endif | ||
83 | return xpSuccess; | ||
84 | } | ||
85 | |||
86 | static enum xp_retval | ||
87 | xp_restrict_memprotect_uv(unsigned long phys_addr, unsigned long size) | ||
88 | { | ||
89 | int ret; | ||
90 | |||
91 | #if defined CONFIG_X86_64 | ||
92 | ret = uv_bios_change_memprotect(phys_addr, size, | ||
93 | UV_MEMPROT_RESTRICT_ACCESS); | ||
94 | if (ret != BIOS_STATUS_SUCCESS) { | ||
95 | dev_err(xp, "uv_bios_change_memprotect(,, " | ||
96 | "UV_MEMPROT_RESTRICT_ACCESS) failed, ret=%d\n", ret); | ||
97 | return xpBiosError; | ||
98 | } | ||
99 | |||
100 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
101 | u64 nasid_array; | ||
102 | |||
103 | ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_0, | ||
104 | &nasid_array); | ||
105 | if (ret != 0) { | ||
106 | dev_err(xp, "sn_change_memprotect(,, " | ||
107 | "SN_MEMPROT_ACCESS_CLASS_0,) failed ret=%d\n", ret); | ||
108 | return xpSalError; | ||
109 | } | ||
110 | #else | ||
111 | #error not a supported configuration | ||
112 | #endif | ||
113 | return xpSuccess; | ||
114 | } | ||
115 | |||
52 | enum xp_retval | 116 | enum xp_retval |
53 | xp_init_uv(void) | 117 | xp_init_uv(void) |
54 | { | 118 | { |
55 | BUG_ON(!is_uv()); | 119 | BUG_ON(!is_uv()); |
56 | 120 | ||
57 | xp_max_npartitions = XP_MAX_NPARTITIONS_UV; | 121 | xp_max_npartitions = XP_MAX_NPARTITIONS_UV; |
58 | xp_partition_id = 0; /* !!! not correct value */ | 122 | xp_partition_id = sn_partition_id; |
59 | xp_region_size = 0; /* !!! not correct value */ | 123 | xp_region_size = sn_region_size; |
60 | 124 | ||
61 | xp_pa = xp_pa_uv; | 125 | xp_pa = xp_pa_uv; |
62 | xp_remote_memcpy = xp_remote_memcpy_uv; | 126 | xp_remote_memcpy = xp_remote_memcpy_uv; |
63 | xp_cpu_to_nasid = xp_cpu_to_nasid_uv; | 127 | xp_cpu_to_nasid = xp_cpu_to_nasid_uv; |
128 | xp_expand_memprotect = xp_expand_memprotect_uv; | ||
129 | xp_restrict_memprotect = xp_restrict_memprotect_uv; | ||
64 | 130 | ||
65 | return xpSuccess; | 131 | return xpSuccess; |
66 | } | 132 | } |
diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h index 619208d61862..a5bd658c2e83 100644 --- a/drivers/misc/sgi-xp/xpc.h +++ b/drivers/misc/sgi-xp/xpc.h | |||
@@ -181,6 +181,18 @@ struct xpc_vars_part_sn2 { | |||
181 | xpc_nasid_mask_nlongs)) | 181 | xpc_nasid_mask_nlongs)) |
182 | 182 | ||
183 | /* | 183 | /* |
184 | * Info pertinent to a GRU message queue using a watch list for irq generation. | ||
185 | */ | ||
186 | struct xpc_gru_mq_uv { | ||
187 | void *address; /* address of GRU message queue */ | ||
188 | unsigned int order; /* size of GRU message queue as a power of 2 */ | ||
189 | int irq; /* irq raised when message is received in mq */ | ||
190 | int mmr_blade; /* blade where watchlist was allocated from */ | ||
191 | unsigned long mmr_offset; /* offset of irq mmr located on mmr_blade */ | ||
192 | int watchlist_num; /* number of watchlist allocatd by BIOS */ | ||
193 | }; | ||
194 | |||
195 | /* | ||
184 | * The activate_mq is used to send/receive GRU messages that affect XPC's | 196 | * The activate_mq is used to send/receive GRU messages that affect XPC's |
185 | * heartbeat, partition active state, and channel state. This is UV only. | 197 | * heartbeat, partition active state, and channel state. This is UV only. |
186 | */ | 198 | */ |
diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c index b4882ccf6344..73b7fb8de47a 100644 --- a/drivers/misc/sgi-xp/xpc_sn2.c +++ b/drivers/misc/sgi-xp/xpc_sn2.c | |||
@@ -553,22 +553,17 @@ static u64 xpc_prot_vec_sn2[MAX_NUMNODES]; | |||
553 | static enum xp_retval | 553 | static enum xp_retval |
554 | xpc_allow_amo_ops_sn2(struct amo *amos_page) | 554 | xpc_allow_amo_ops_sn2(struct amo *amos_page) |
555 | { | 555 | { |
556 | u64 nasid_array = 0; | 556 | enum xp_retval ret = xpSuccess; |
557 | int ret; | ||
558 | 557 | ||
559 | /* | 558 | /* |
560 | * On SHUB 1.1, we cannot call sn_change_memprotect() since the BIST | 559 | * On SHUB 1.1, we cannot call sn_change_memprotect() since the BIST |
561 | * collides with memory operations. On those systems we call | 560 | * collides with memory operations. On those systems we call |
562 | * xpc_allow_amo_ops_shub_wars_1_1_sn2() instead. | 561 | * xpc_allow_amo_ops_shub_wars_1_1_sn2() instead. |
563 | */ | 562 | */ |
564 | if (!enable_shub_wars_1_1()) { | 563 | if (!enable_shub_wars_1_1()) |
565 | ret = sn_change_memprotect(ia64_tpa((u64)amos_page), PAGE_SIZE, | 564 | ret = xp_expand_memprotect(ia64_tpa((u64)amos_page), PAGE_SIZE); |
566 | SN_MEMPROT_ACCESS_CLASS_1, | 565 | |
567 | &nasid_array); | 566 | return ret; |
568 | if (ret != 0) | ||
569 | return xpSalError; | ||
570 | } | ||
571 | return xpSuccess; | ||
572 | } | 567 | } |
573 | 568 | ||
574 | /* | 569 | /* |
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c index 1ac694c01623..91a55b1b1037 100644 --- a/drivers/misc/sgi-xp/xpc_uv.c +++ b/drivers/misc/sgi-xp/xpc_uv.c | |||
@@ -18,7 +18,15 @@ | |||
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
21 | #include <linux/err.h> | ||
21 | #include <asm/uv/uv_hub.h> | 22 | #include <asm/uv/uv_hub.h> |
23 | #if defined CONFIG_X86_64 | ||
24 | #include <asm/uv/bios.h> | ||
25 | #include <asm/uv/uv_irq.h> | ||
26 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
27 | #include <asm/sn/intr.h> | ||
28 | #include <asm/sn/sn_sal.h> | ||
29 | #endif | ||
22 | #include "../sgi-gru/gru.h" | 30 | #include "../sgi-gru/gru.h" |
23 | #include "../sgi-gru/grukservices.h" | 31 | #include "../sgi-gru/grukservices.h" |
24 | #include "xpc.h" | 32 | #include "xpc.h" |
@@ -27,15 +35,17 @@ static atomic64_t xpc_heartbeat_uv; | |||
27 | static DECLARE_BITMAP(xpc_heartbeating_to_mask_uv, XP_MAX_NPARTITIONS_UV); | 35 | static DECLARE_BITMAP(xpc_heartbeating_to_mask_uv, XP_MAX_NPARTITIONS_UV); |
28 | 36 | ||
29 | #define XPC_ACTIVATE_MSG_SIZE_UV (1 * GRU_CACHE_LINE_BYTES) | 37 | #define XPC_ACTIVATE_MSG_SIZE_UV (1 * GRU_CACHE_LINE_BYTES) |
30 | #define XPC_NOTIFY_MSG_SIZE_UV (2 * GRU_CACHE_LINE_BYTES) | 38 | #define XPC_ACTIVATE_MQ_SIZE_UV (4 * XP_MAX_NPARTITIONS_UV * \ |
39 | XPC_ACTIVATE_MSG_SIZE_UV) | ||
40 | #define XPC_ACTIVATE_IRQ_NAME "xpc_activate" | ||
31 | 41 | ||
32 | #define XPC_ACTIVATE_MQ_SIZE_UV (4 * XP_MAX_NPARTITIONS_UV * \ | 42 | #define XPC_NOTIFY_MSG_SIZE_UV (2 * GRU_CACHE_LINE_BYTES) |
33 | XPC_ACTIVATE_MSG_SIZE_UV) | 43 | #define XPC_NOTIFY_MQ_SIZE_UV (4 * XP_MAX_NPARTITIONS_UV * \ |
34 | #define XPC_NOTIFY_MQ_SIZE_UV (4 * XP_MAX_NPARTITIONS_UV * \ | 44 | XPC_NOTIFY_MSG_SIZE_UV) |
35 | XPC_NOTIFY_MSG_SIZE_UV) | 45 | #define XPC_NOTIFY_IRQ_NAME "xpc_notify" |
36 | 46 | ||
37 | static void *xpc_activate_mq_uv; | 47 | static struct xpc_gru_mq_uv *xpc_activate_mq_uv; |
38 | static void *xpc_notify_mq_uv; | 48 | static struct xpc_gru_mq_uv *xpc_notify_mq_uv; |
39 | 49 | ||
40 | static int | 50 | static int |
41 | xpc_setup_partitions_sn_uv(void) | 51 | xpc_setup_partitions_sn_uv(void) |
@@ -52,62 +62,209 @@ xpc_setup_partitions_sn_uv(void) | |||
52 | return 0; | 62 | return 0; |
53 | } | 63 | } |
54 | 64 | ||
55 | static void * | 65 | static int |
56 | xpc_create_gru_mq_uv(unsigned int mq_size, int cpuid, unsigned int irq, | 66 | xpc_get_gru_mq_irq_uv(struct xpc_gru_mq_uv *mq, int cpu, char *irq_name) |
67 | { | ||
68 | #if defined CONFIG_X86_64 | ||
69 | mq->irq = uv_setup_irq(irq_name, cpu, mq->mmr_blade, mq->mmr_offset); | ||
70 | if (mq->irq < 0) { | ||
71 | dev_err(xpc_part, "uv_setup_irq() returned error=%d\n", | ||
72 | mq->irq); | ||
73 | } | ||
74 | |||
75 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
76 | int mmr_pnode; | ||
77 | unsigned long mmr_value; | ||
78 | |||
79 | if (strcmp(irq_name, XPC_ACTIVATE_IRQ_NAME) == 0) | ||
80 | mq->irq = SGI_XPC_ACTIVATE; | ||
81 | else if (strcmp(irq_name, XPC_NOTIFY_IRQ_NAME) == 0) | ||
82 | mq->irq = SGI_XPC_NOTIFY; | ||
83 | else | ||
84 | return -EINVAL; | ||
85 | |||
86 | mmr_pnode = uv_blade_to_pnode(mq->mmr_blade); | ||
87 | mmr_value = (unsigned long)cpu_physical_id(cpu) << 32 | mq->irq; | ||
88 | |||
89 | uv_write_global_mmr64(mmr_pnode, mq->mmr_offset, mmr_value); | ||
90 | #else | ||
91 | #error not a supported configuration | ||
92 | #endif | ||
93 | |||
94 | return 0; | ||
95 | } | ||
96 | |||
97 | static void | ||
98 | xpc_release_gru_mq_irq_uv(struct xpc_gru_mq_uv *mq) | ||
99 | { | ||
100 | #if defined CONFIG_X86_64 | ||
101 | uv_teardown_irq(mq->irq, mq->mmr_blade, mq->mmr_offset); | ||
102 | |||
103 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
104 | int mmr_pnode; | ||
105 | unsigned long mmr_value; | ||
106 | |||
107 | mmr_pnode = uv_blade_to_pnode(mq->mmr_blade); | ||
108 | mmr_value = 1UL << 16; | ||
109 | |||
110 | uv_write_global_mmr64(mmr_pnode, mq->mmr_offset, mmr_value); | ||
111 | #else | ||
112 | #error not a supported configuration | ||
113 | #endif | ||
114 | } | ||
115 | |||
116 | static int | ||
117 | xpc_gru_mq_watchlist_alloc_uv(struct xpc_gru_mq_uv *mq) | ||
118 | { | ||
119 | int ret; | ||
120 | |||
121 | #if defined CONFIG_X86_64 | ||
122 | ret = uv_bios_mq_watchlist_alloc(mq->mmr_blade, uv_gpa(mq->address), | ||
123 | mq->order, &mq->mmr_offset); | ||
124 | if (ret < 0) { | ||
125 | dev_err(xpc_part, "uv_bios_mq_watchlist_alloc() failed, " | ||
126 | "ret=%d\n", ret); | ||
127 | return ret; | ||
128 | } | ||
129 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
130 | ret = sn_mq_watchlist_alloc(mq->mmr_blade, uv_gpa(mq->address), | ||
131 | mq->order, &mq->mmr_offset); | ||
132 | if (ret < 0) { | ||
133 | dev_err(xpc_part, "sn_mq_watchlist_alloc() failed, ret=%d\n", | ||
134 | ret); | ||
135 | return -EBUSY; | ||
136 | } | ||
137 | #else | ||
138 | #error not a supported configuration | ||
139 | #endif | ||
140 | |||
141 | mq->watchlist_num = ret; | ||
142 | return 0; | ||
143 | } | ||
144 | |||
145 | static void | ||
146 | xpc_gru_mq_watchlist_free_uv(struct xpc_gru_mq_uv *mq) | ||
147 | { | ||
148 | int ret; | ||
149 | |||
150 | #if defined CONFIG_X86_64 | ||
151 | ret = uv_bios_mq_watchlist_free(mq->mmr_blade, mq->watchlist_num); | ||
152 | BUG_ON(ret != BIOS_STATUS_SUCCESS); | ||
153 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
154 | ret = sn_mq_watchlist_free(mq->mmr_blade, mq->watchlist_num); | ||
155 | BUG_ON(ret != SALRET_OK); | ||
156 | #else | ||
157 | #error not a supported configuration | ||
158 | #endif | ||
159 | } | ||
160 | |||
161 | static struct xpc_gru_mq_uv * | ||
162 | xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, | ||
57 | irq_handler_t irq_handler) | 163 | irq_handler_t irq_handler) |
58 | { | 164 | { |
165 | enum xp_retval xp_ret; | ||
59 | int ret; | 166 | int ret; |
60 | int nid; | 167 | int nid; |
61 | int mq_order; | 168 | int pg_order; |
62 | struct page *page; | 169 | struct page *page; |
63 | void *mq; | 170 | struct xpc_gru_mq_uv *mq; |
171 | |||
172 | mq = kmalloc(sizeof(struct xpc_gru_mq_uv), GFP_KERNEL); | ||
173 | if (mq == NULL) { | ||
174 | dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to kmalloc() " | ||
175 | "a xpc_gru_mq_uv structure\n"); | ||
176 | ret = -ENOMEM; | ||
177 | goto out_1; | ||
178 | } | ||
179 | |||
180 | pg_order = get_order(mq_size); | ||
181 | mq->order = pg_order + PAGE_SHIFT; | ||
182 | mq_size = 1UL << mq->order; | ||
183 | |||
184 | mq->mmr_blade = uv_cpu_to_blade_id(cpu); | ||
64 | 185 | ||
65 | nid = cpu_to_node(cpuid); | 186 | nid = cpu_to_node(cpu); |
66 | mq_order = get_order(mq_size); | ||
67 | page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, | 187 | page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE, |
68 | mq_order); | 188 | pg_order); |
69 | if (page == NULL) { | 189 | if (page == NULL) { |
70 | dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d " | 190 | dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d " |
71 | "bytes of memory on nid=%d for GRU mq\n", mq_size, nid); | 191 | "bytes of memory on nid=%d for GRU mq\n", mq_size, nid); |
72 | return NULL; | 192 | ret = -ENOMEM; |
193 | goto out_2; | ||
73 | } | 194 | } |
195 | mq->address = page_address(page); | ||
74 | 196 | ||
75 | mq = page_address(page); | 197 | ret = gru_create_message_queue(mq->address, mq_size); |
76 | ret = gru_create_message_queue(mq, mq_size); | ||
77 | if (ret != 0) { | 198 | if (ret != 0) { |
78 | dev_err(xpc_part, "gru_create_message_queue() returned " | 199 | dev_err(xpc_part, "gru_create_message_queue() returned " |
79 | "error=%d\n", ret); | 200 | "error=%d\n", ret); |
80 | free_pages((unsigned long)mq, mq_order); | 201 | ret = -EINVAL; |
81 | return NULL; | 202 | goto out_3; |
82 | } | 203 | } |
83 | 204 | ||
84 | /* !!! Need to do some other things to set up IRQ */ | 205 | /* enable generation of irq when GRU mq operation occurs to this mq */ |
206 | ret = xpc_gru_mq_watchlist_alloc_uv(mq); | ||
207 | if (ret != 0) | ||
208 | goto out_3; | ||
85 | 209 | ||
86 | ret = request_irq(irq, irq_handler, 0, "xpc", NULL); | 210 | ret = xpc_get_gru_mq_irq_uv(mq, cpu, irq_name); |
211 | if (ret != 0) | ||
212 | goto out_4; | ||
213 | |||
214 | ret = request_irq(mq->irq, irq_handler, 0, irq_name, NULL); | ||
87 | if (ret != 0) { | 215 | if (ret != 0) { |
88 | dev_err(xpc_part, "request_irq(irq=%d) returned error=%d\n", | 216 | dev_err(xpc_part, "request_irq(irq=%d) returned error=%d\n", |
89 | irq, ret); | 217 | mq->irq, ret); |
90 | free_pages((unsigned long)mq, mq_order); | 218 | goto out_5; |
91 | return NULL; | ||
92 | } | 219 | } |
93 | 220 | ||
94 | /* !!! enable generation of irq when GRU mq op occurs to this mq */ | 221 | /* allow other partitions to access this GRU mq */ |
95 | 222 | xp_ret = xp_expand_memprotect(xp_pa(mq->address), mq_size); | |
96 | /* ??? allow other partitions to access GRU mq? */ | 223 | if (xp_ret != xpSuccess) { |
224 | ret = -EACCES; | ||
225 | goto out_6; | ||
226 | } | ||
97 | 227 | ||
98 | return mq; | 228 | return mq; |
229 | |||
230 | /* something went wrong */ | ||
231 | out_6: | ||
232 | free_irq(mq->irq, NULL); | ||
233 | out_5: | ||
234 | xpc_release_gru_mq_irq_uv(mq); | ||
235 | out_4: | ||
236 | xpc_gru_mq_watchlist_free_uv(mq); | ||
237 | out_3: | ||
238 | free_pages((unsigned long)mq->address, pg_order); | ||
239 | out_2: | ||
240 | kfree(mq); | ||
241 | out_1: | ||
242 | return ERR_PTR(ret); | ||
99 | } | 243 | } |
100 | 244 | ||
101 | static void | 245 | static void |
102 | xpc_destroy_gru_mq_uv(void *mq, unsigned int mq_size, unsigned int irq) | 246 | xpc_destroy_gru_mq_uv(struct xpc_gru_mq_uv *mq) |
103 | { | 247 | { |
104 | /* ??? disallow other partitions to access GRU mq? */ | 248 | unsigned int mq_size; |
249 | int pg_order; | ||
250 | int ret; | ||
251 | |||
252 | /* disallow other partitions to access GRU mq */ | ||
253 | mq_size = 1UL << mq->order; | ||
254 | ret = xp_restrict_memprotect(xp_pa(mq->address), mq_size); | ||
255 | BUG_ON(ret != xpSuccess); | ||
105 | 256 | ||
106 | /* !!! disable generation of irq when GRU mq op occurs to this mq */ | 257 | /* unregister irq handler and release mq irq/vector mapping */ |
258 | free_irq(mq->irq, NULL); | ||
259 | xpc_release_gru_mq_irq_uv(mq); | ||
107 | 260 | ||
108 | free_irq(irq, NULL); | 261 | /* disable generation of irq when GRU mq op occurs to this mq */ |
262 | xpc_gru_mq_watchlist_free_uv(mq); | ||
109 | 263 | ||
110 | free_pages((unsigned long)mq, get_order(mq_size)); | 264 | pg_order = mq->order - PAGE_SHIFT; |
265 | free_pages((unsigned long)mq->address, pg_order); | ||
266 | |||
267 | kfree(mq); | ||
111 | } | 268 | } |
112 | 269 | ||
113 | static enum xp_retval | 270 | static enum xp_retval |
@@ -402,7 +559,10 @@ xpc_handle_activate_IRQ_uv(int irq, void *dev_id) | |||
402 | struct xpc_partition *part; | 559 | struct xpc_partition *part; |
403 | int wakeup_hb_checker = 0; | 560 | int wakeup_hb_checker = 0; |
404 | 561 | ||
405 | while ((msg_hdr = gru_get_next_message(xpc_activate_mq_uv)) != NULL) { | 562 | while (1) { |
563 | msg_hdr = gru_get_next_message(xpc_activate_mq_uv->address); | ||
564 | if (msg_hdr == NULL) | ||
565 | break; | ||
406 | 566 | ||
407 | partid = msg_hdr->partid; | 567 | partid = msg_hdr->partid; |
408 | if (partid < 0 || partid >= XP_MAX_NPARTITIONS_UV) { | 568 | if (partid < 0 || partid >= XP_MAX_NPARTITIONS_UV) { |
@@ -418,7 +578,7 @@ xpc_handle_activate_IRQ_uv(int irq, void *dev_id) | |||
418 | } | 578 | } |
419 | } | 579 | } |
420 | 580 | ||
421 | gru_free_message(xpc_activate_mq_uv, msg_hdr); | 581 | gru_free_message(xpc_activate_mq_uv->address, msg_hdr); |
422 | } | 582 | } |
423 | 583 | ||
424 | if (wakeup_hb_checker) | 584 | if (wakeup_hb_checker) |
@@ -482,7 +642,7 @@ xpc_send_local_activate_IRQ_uv(struct xpc_partition *part, int act_state_req) | |||
482 | struct xpc_partition_uv *part_uv = &part->sn.uv; | 642 | struct xpc_partition_uv *part_uv = &part->sn.uv; |
483 | 643 | ||
484 | /* | 644 | /* |
485 | * !!! Make our side think that the remote parition sent an activate | 645 | * !!! Make our side think that the remote partition sent an activate |
486 | * !!! message our way by doing what the activate IRQ handler would | 646 | * !!! message our way by doing what the activate IRQ handler would |
487 | * !!! do had one really been sent. | 647 | * !!! do had one really been sent. |
488 | */ | 648 | */ |
@@ -500,14 +660,39 @@ static enum xp_retval | |||
500 | xpc_get_partition_rsvd_page_pa_uv(void *buf, u64 *cookie, unsigned long *rp_pa, | 660 | xpc_get_partition_rsvd_page_pa_uv(void *buf, u64 *cookie, unsigned long *rp_pa, |
501 | size_t *len) | 661 | size_t *len) |
502 | { | 662 | { |
503 | /* !!! call the UV version of sn_partition_reserved_page_pa() */ | 663 | s64 status; |
504 | return xpUnsupported; | 664 | enum xp_retval ret; |
665 | |||
666 | #if defined CONFIG_X86_64 | ||
667 | status = uv_bios_reserved_page_pa((u64)buf, cookie, (u64 *)rp_pa, | ||
668 | (u64 *)len); | ||
669 | if (status == BIOS_STATUS_SUCCESS) | ||
670 | ret = xpSuccess; | ||
671 | else if (status == BIOS_STATUS_MORE_PASSES) | ||
672 | ret = xpNeedMoreInfo; | ||
673 | else | ||
674 | ret = xpBiosError; | ||
675 | |||
676 | #elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV | ||
677 | status = sn_partition_reserved_page_pa((u64)buf, cookie, rp_pa, len); | ||
678 | if (status == SALRET_OK) | ||
679 | ret = xpSuccess; | ||
680 | else if (status == SALRET_MORE_PASSES) | ||
681 | ret = xpNeedMoreInfo; | ||
682 | else | ||
683 | ret = xpSalError; | ||
684 | |||
685 | #else | ||
686 | #error not a supported configuration | ||
687 | #endif | ||
688 | |||
689 | return ret; | ||
505 | } | 690 | } |
506 | 691 | ||
507 | static int | 692 | static int |
508 | xpc_setup_rsvd_page_sn_uv(struct xpc_rsvd_page *rp) | 693 | xpc_setup_rsvd_page_sn_uv(struct xpc_rsvd_page *rp) |
509 | { | 694 | { |
510 | rp->sn.activate_mq_gpa = uv_gpa(xpc_activate_mq_uv); | 695 | rp->sn.activate_mq_gpa = uv_gpa(xpc_activate_mq_uv->address); |
511 | return 0; | 696 | return 0; |
512 | } | 697 | } |
513 | 698 | ||
@@ -1411,22 +1596,18 @@ xpc_init_uv(void) | |||
1411 | return -E2BIG; | 1596 | return -E2BIG; |
1412 | } | 1597 | } |
1413 | 1598 | ||
1414 | /* ??? The cpuid argument's value is 0, is that what we want? */ | 1599 | xpc_activate_mq_uv = xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, 0, |
1415 | /* !!! The irq argument's value isn't correct. */ | 1600 | XPC_ACTIVATE_IRQ_NAME, |
1416 | xpc_activate_mq_uv = xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, 0, 0, | ||
1417 | xpc_handle_activate_IRQ_uv); | 1601 | xpc_handle_activate_IRQ_uv); |
1418 | if (xpc_activate_mq_uv == NULL) | 1602 | if (IS_ERR(xpc_activate_mq_uv)) |
1419 | return -ENOMEM; | 1603 | return PTR_ERR(xpc_activate_mq_uv); |
1420 | 1604 | ||
1421 | /* ??? The cpuid argument's value is 0, is that what we want? */ | 1605 | xpc_notify_mq_uv = xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, 0, |
1422 | /* !!! The irq argument's value isn't correct. */ | 1606 | XPC_NOTIFY_IRQ_NAME, |
1423 | xpc_notify_mq_uv = xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, 0, 0, | ||
1424 | xpc_handle_notify_IRQ_uv); | 1607 | xpc_handle_notify_IRQ_uv); |
1425 | if (xpc_notify_mq_uv == NULL) { | 1608 | if (IS_ERR(xpc_notify_mq_uv)) { |
1426 | /* !!! The irq argument's value isn't correct. */ | 1609 | xpc_destroy_gru_mq_uv(xpc_activate_mq_uv); |
1427 | xpc_destroy_gru_mq_uv(xpc_activate_mq_uv, | 1610 | return PTR_ERR(xpc_notify_mq_uv); |
1428 | XPC_ACTIVATE_MQ_SIZE_UV, 0); | ||
1429 | return -ENOMEM; | ||
1430 | } | 1611 | } |
1431 | 1612 | ||
1432 | return 0; | 1613 | return 0; |
@@ -1435,9 +1616,6 @@ xpc_init_uv(void) | |||
1435 | void | 1616 | void |
1436 | xpc_exit_uv(void) | 1617 | xpc_exit_uv(void) |
1437 | { | 1618 | { |
1438 | /* !!! The irq argument's value isn't correct. */ | 1619 | xpc_destroy_gru_mq_uv(xpc_notify_mq_uv); |
1439 | xpc_destroy_gru_mq_uv(xpc_notify_mq_uv, XPC_NOTIFY_MQ_SIZE_UV, 0); | 1620 | xpc_destroy_gru_mq_uv(xpc_activate_mq_uv); |
1440 | |||
1441 | /* !!! The irq argument's value isn't correct. */ | ||
1442 | xpc_destroy_gru_mq_uv(xpc_activate_mq_uv, XPC_ACTIVATE_MQ_SIZE_UV, 0); | ||
1443 | } | 1621 | } |
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index f9e244da30ae..9bcb6cbd5aa9 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
@@ -113,7 +113,7 @@ struct acpiphp_slot { | |||
113 | 113 | ||
114 | u8 device; /* pci device# */ | 114 | u8 device; /* pci device# */ |
115 | 115 | ||
116 | u32 sun; /* ACPI _SUN (slot unique number) */ | 116 | unsigned long long sun; /* ACPI _SUN (slot unique number) */ |
117 | u32 flags; /* see below */ | 117 | u32 flags; /* see below */ |
118 | }; | 118 | }; |
119 | 119 | ||
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c index 95b536a23d25..43c10bd261b4 100644 --- a/drivers/pci/hotplug/acpiphp_core.c +++ b/drivers/pci/hotplug/acpiphp_core.c | |||
@@ -337,7 +337,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) | |||
337 | slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN; | 337 | slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN; |
338 | 338 | ||
339 | acpiphp_slot->slot = slot; | 339 | acpiphp_slot->slot = slot; |
340 | snprintf(name, SLOT_NAME_SIZE, "%u", slot->acpi_slot->sun); | 340 | snprintf(name, SLOT_NAME_SIZE, "%llu", slot->acpi_slot->sun); |
341 | 341 | ||
342 | retval = pci_hp_register(slot->hotplug_slot, | 342 | retval = pci_hp_register(slot->hotplug_slot, |
343 | acpiphp_slot->bridge->pci_bus, | 343 | acpiphp_slot->bridge->pci_bus, |
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 955aae4071f7..3affc6472e65 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
@@ -255,13 +255,13 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
255 | 255 | ||
256 | bridge->nr_slots++; | 256 | bridge->nr_slots++; |
257 | 257 | ||
258 | dbg("found ACPI PCI Hotplug slot %d at PCI %04x:%02x:%02x\n", | 258 | dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n", |
259 | slot->sun, pci_domain_nr(bridge->pci_bus), | 259 | slot->sun, pci_domain_nr(bridge->pci_bus), |
260 | bridge->pci_bus->number, slot->device); | 260 | bridge->pci_bus->number, slot->device); |
261 | retval = acpiphp_register_hotplug_slot(slot); | 261 | retval = acpiphp_register_hotplug_slot(slot); |
262 | if (retval) { | 262 | if (retval) { |
263 | if (retval == -EBUSY) | 263 | if (retval == -EBUSY) |
264 | warn("Slot %d already registered by another " | 264 | warn("Slot %llu already registered by another " |
265 | "hotplug driver\n", slot->sun); | 265 | "hotplug driver\n", slot->sun); |
266 | else | 266 | else |
267 | warn("acpiphp_register_hotplug_slot failed " | 267 | warn("acpiphp_register_hotplug_slot failed " |
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index c892daae74d6..633e743442ac 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c | |||
@@ -1402,10 +1402,6 @@ static int __init ibmphp_init(void) | |||
1402 | goto error; | 1402 | goto error; |
1403 | } | 1403 | } |
1404 | 1404 | ||
1405 | /* lock ourselves into memory with a module | ||
1406 | * count of -1 so that no one can unload us. */ | ||
1407 | module_put(THIS_MODULE); | ||
1408 | |||
1409 | exit: | 1405 | exit: |
1410 | return rc; | 1406 | return rc; |
1411 | 1407 | ||
@@ -1423,4 +1419,3 @@ static void __exit ibmphp_exit(void) | |||
1423 | } | 1419 | } |
1424 | 1420 | ||
1425 | module_init(ibmphp_init); | 1421 | module_init(ibmphp_init); |
1426 | module_exit(ibmphp_exit); | ||
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 4b23bc39b11e..39cf248d24e3 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
@@ -432,18 +432,19 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ | |||
432 | goto err_out_release_ctlr; | 432 | goto err_out_release_ctlr; |
433 | } | 433 | } |
434 | 434 | ||
435 | /* Check if slot is occupied */ | ||
435 | t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); | 436 | t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); |
436 | 437 | t_slot->hpc_ops->get_adapter_status(t_slot, &value); | |
437 | t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */ | 438 | if (value) { |
438 | if (value && pciehp_force) { | 439 | if (pciehp_force) |
439 | rc = pciehp_enable_slot(t_slot); | 440 | pciehp_enable_slot(t_slot); |
440 | if (rc) /* -ENODEV: shouldn't happen, but deal with it */ | 441 | } else { |
441 | value = 0; | 442 | /* Power off slot if not occupied */ |
442 | } | 443 | if (POWER_CTRL(ctrl)) { |
443 | if ((POWER_CTRL(ctrl)) && !value) { | 444 | rc = t_slot->hpc_ops->power_off_slot(t_slot); |
444 | rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/ | 445 | if (rc) |
445 | if (rc) | 446 | goto err_out_free_ctrl_slot; |
446 | goto err_out_free_ctrl_slot; | 447 | } |
447 | } | 448 | } |
448 | 449 | ||
449 | return 0; | 450 | return 0; |
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index dfc63d01f20a..aac7006949f1 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c | |||
@@ -252,7 +252,7 @@ static void report_resume(struct pci_dev *dev, void *data) | |||
252 | 252 | ||
253 | if (!dev->driver || | 253 | if (!dev->driver || |
254 | !dev->driver->err_handler || | 254 | !dev->driver->err_handler || |
255 | !dev->driver->err_handler->slot_reset) | 255 | !dev->driver->err_handler->resume) |
256 | return; | 256 | return; |
257 | 257 | ||
258 | err_handler = dev->driver->err_handler; | 258 | err_handler = dev->driver->err_handler; |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 5f4f85f56cb7..ce0985615133 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
@@ -606,27 +606,6 @@ static void __init quirk_ioapic_rmw(struct pci_dev *dev) | |||
606 | sis_apic_bug = 1; | 606 | sis_apic_bug = 1; |
607 | } | 607 | } |
608 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw); | 608 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw); |
609 | |||
610 | #define AMD8131_revA0 0x01 | ||
611 | #define AMD8131_revB0 0x11 | ||
612 | #define AMD8131_MISC 0x40 | ||
613 | #define AMD8131_NIOAMODE_BIT 0 | ||
614 | static void quirk_amd_8131_ioapic(struct pci_dev *dev) | ||
615 | { | ||
616 | unsigned char tmp; | ||
617 | |||
618 | if (nr_ioapics == 0) | ||
619 | return; | ||
620 | |||
621 | if (dev->revision == AMD8131_revA0 || dev->revision == AMD8131_revB0) { | ||
622 | dev_info(&dev->dev, "Fixing up AMD8131 IOAPIC mode\n"); | ||
623 | pci_read_config_byte( dev, AMD8131_MISC, &tmp); | ||
624 | tmp &= ~(1 << AMD8131_NIOAMODE_BIT); | ||
625 | pci_write_config_byte( dev, AMD8131_MISC, tmp); | ||
626 | } | ||
627 | } | ||
628 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic); | ||
629 | DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic); | ||
630 | #endif /* CONFIG_X86_IO_APIC */ | 609 | #endif /* CONFIG_X86_IO_APIC */ |
631 | 610 | ||
632 | /* | 611 | /* |
@@ -1423,6 +1402,155 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x2609, quirk_intel_pcie_pm); | |||
1423 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260a, quirk_intel_pcie_pm); | 1402 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260a, quirk_intel_pcie_pm); |
1424 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260b, quirk_intel_pcie_pm); | 1403 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260b, quirk_intel_pcie_pm); |
1425 | 1404 | ||
1405 | #ifdef CONFIG_X86_IO_APIC | ||
1406 | /* | ||
1407 | * Boot interrupts on some chipsets cannot be turned off. For these chipsets, | ||
1408 | * remap the original interrupt in the linux kernel to the boot interrupt, so | ||
1409 | * that a PCI device's interrupt handler is installed on the boot interrupt | ||
1410 | * line instead. | ||
1411 | */ | ||
1412 | static void quirk_reroute_to_boot_interrupts_intel(struct pci_dev *dev) | ||
1413 | { | ||
1414 | if (noioapicquirk || noioapicreroute) | ||
1415 | return; | ||
1416 | |||
1417 | dev->irq_reroute_variant = INTEL_IRQ_REROUTE_VARIANT; | ||
1418 | |||
1419 | printk(KERN_INFO "PCI quirk: reroute interrupts for 0x%04x:0x%04x\n", | ||
1420 | dev->vendor, dev->device); | ||
1421 | return; | ||
1422 | } | ||
1423 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80333_0, quirk_reroute_to_boot_interrupts_intel); | ||
1424 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80333_1, quirk_reroute_to_boot_interrupts_intel); | ||
1425 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, quirk_reroute_to_boot_interrupts_intel); | ||
1426 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXH_0, quirk_reroute_to_boot_interrupts_intel); | ||
1427 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXH_1, quirk_reroute_to_boot_interrupts_intel); | ||
1428 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXHV, quirk_reroute_to_boot_interrupts_intel); | ||
1429 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80332_0, quirk_reroute_to_boot_interrupts_intel); | ||
1430 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80332_1, quirk_reroute_to_boot_interrupts_intel); | ||
1431 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80333_0, quirk_reroute_to_boot_interrupts_intel); | ||
1432 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80333_1, quirk_reroute_to_boot_interrupts_intel); | ||
1433 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, quirk_reroute_to_boot_interrupts_intel); | ||
1434 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXH_0, quirk_reroute_to_boot_interrupts_intel); | ||
1435 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXH_1, quirk_reroute_to_boot_interrupts_intel); | ||
1436 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PXHV, quirk_reroute_to_boot_interrupts_intel); | ||
1437 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80332_0, quirk_reroute_to_boot_interrupts_intel); | ||
1438 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80332_1, quirk_reroute_to_boot_interrupts_intel); | ||
1439 | |||
1440 | /* | ||
1441 | * On some chipsets we can disable the generation of legacy INTx boot | ||
1442 | * interrupts. | ||
1443 | */ | ||
1444 | |||
1445 | /* | ||
1446 | * IO-APIC1 on 6300ESB generates boot interrupts, see intel order no | ||
1447 | * 300641-004US, section 5.7.3. | ||
1448 | */ | ||
1449 | #define INTEL_6300_IOAPIC_ABAR 0x40 | ||
1450 | #define INTEL_6300_DISABLE_BOOT_IRQ (1<<14) | ||
1451 | |||
1452 | static void quirk_disable_intel_boot_interrupt(struct pci_dev *dev) | ||
1453 | { | ||
1454 | u16 pci_config_word; | ||
1455 | |||
1456 | if (noioapicquirk) | ||
1457 | return; | ||
1458 | |||
1459 | pci_read_config_word(dev, INTEL_6300_IOAPIC_ABAR, &pci_config_word); | ||
1460 | pci_config_word |= INTEL_6300_DISABLE_BOOT_IRQ; | ||
1461 | pci_write_config_word(dev, INTEL_6300_IOAPIC_ABAR, pci_config_word); | ||
1462 | |||
1463 | printk(KERN_INFO "disabled boot interrupt on device 0x%04x:0x%04x\n", | ||
1464 | dev->vendor, dev->device); | ||
1465 | } | ||
1466 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_10, quirk_disable_intel_boot_interrupt); | ||
1467 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_10, quirk_disable_intel_boot_interrupt); | ||
1468 | |||
1469 | /* | ||
1470 | * disable boot interrupts on HT-1000 | ||
1471 | */ | ||
1472 | #define BC_HT1000_FEATURE_REG 0x64 | ||
1473 | #define BC_HT1000_PIC_REGS_ENABLE (1<<0) | ||
1474 | #define BC_HT1000_MAP_IDX 0xC00 | ||
1475 | #define BC_HT1000_MAP_DATA 0xC01 | ||
1476 | |||
1477 | static void quirk_disable_broadcom_boot_interrupt(struct pci_dev *dev) | ||
1478 | { | ||
1479 | u32 pci_config_dword; | ||
1480 | u8 irq; | ||
1481 | |||
1482 | if (noioapicquirk) | ||
1483 | return; | ||
1484 | |||
1485 | pci_read_config_dword(dev, BC_HT1000_FEATURE_REG, &pci_config_dword); | ||
1486 | pci_write_config_dword(dev, BC_HT1000_FEATURE_REG, pci_config_dword | | ||
1487 | BC_HT1000_PIC_REGS_ENABLE); | ||
1488 | |||
1489 | for (irq = 0x10; irq < 0x10 + 32; irq++) { | ||
1490 | outb(irq, BC_HT1000_MAP_IDX); | ||
1491 | outb(0x00, BC_HT1000_MAP_DATA); | ||
1492 | } | ||
1493 | |||
1494 | pci_write_config_dword(dev, BC_HT1000_FEATURE_REG, pci_config_dword); | ||
1495 | |||
1496 | printk(KERN_INFO "disabled boot interrupts on PCI device" | ||
1497 | "0x%04x:0x%04x\n", dev->vendor, dev->device); | ||
1498 | } | ||
1499 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000SB, quirk_disable_broadcom_boot_interrupt); | ||
1500 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000SB, quirk_disable_broadcom_boot_interrupt); | ||
1501 | |||
1502 | /* | ||
1503 | * disable boot interrupts on AMD and ATI chipsets | ||
1504 | */ | ||
1505 | /* | ||
1506 | * NOIOAMODE needs to be disabled to disable "boot interrupts". For AMD 8131 | ||
1507 | * rev. A0 and B0, NOIOAMODE needs to be disabled anyway to fix IO-APIC mode | ||
1508 | * (due to an erratum). | ||
1509 | */ | ||
1510 | #define AMD_813X_MISC 0x40 | ||
1511 | #define AMD_813X_NOIOAMODE (1<<0) | ||
1512 | |||
1513 | static void quirk_disable_amd_813x_boot_interrupt(struct pci_dev *dev) | ||
1514 | { | ||
1515 | u32 pci_config_dword; | ||
1516 | |||
1517 | if (noioapicquirk) | ||
1518 | return; | ||
1519 | |||
1520 | pci_read_config_dword(dev, AMD_813X_MISC, &pci_config_dword); | ||
1521 | pci_config_dword &= ~AMD_813X_NOIOAMODE; | ||
1522 | pci_write_config_dword(dev, AMD_813X_MISC, pci_config_dword); | ||
1523 | |||
1524 | printk(KERN_INFO "disabled boot interrupts on PCI device " | ||
1525 | "0x%04x:0x%04x\n", dev->vendor, dev->device); | ||
1526 | } | ||
1527 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_amd_813x_boot_interrupt); | ||
1528 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8132_BRIDGE, quirk_disable_amd_813x_boot_interrupt); | ||
1529 | |||
1530 | #define AMD_8111_PCI_IRQ_ROUTING 0x56 | ||
1531 | |||
1532 | static void quirk_disable_amd_8111_boot_interrupt(struct pci_dev *dev) | ||
1533 | { | ||
1534 | u16 pci_config_word; | ||
1535 | |||
1536 | if (noioapicquirk) | ||
1537 | return; | ||
1538 | |||
1539 | pci_read_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, &pci_config_word); | ||
1540 | if (!pci_config_word) { | ||
1541 | printk(KERN_INFO "boot interrupts on PCI device 0x%04x:0x%04x " | ||
1542 | "already disabled\n", | ||
1543 | dev->vendor, dev->device); | ||
1544 | return; | ||
1545 | } | ||
1546 | pci_write_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, 0); | ||
1547 | printk(KERN_INFO "disabled boot interrupts on PCI device " | ||
1548 | "0x%04x:0x%04x\n", dev->vendor, dev->device); | ||
1549 | } | ||
1550 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS, quirk_disable_amd_8111_boot_interrupt); | ||
1551 | DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS, quirk_disable_amd_8111_boot_interrupt); | ||
1552 | #endif /* CONFIG_X86_IO_APIC */ | ||
1553 | |||
1426 | /* | 1554 | /* |
1427 | * Toshiba TC86C001 IDE controller reports the standard 8-byte BAR0 size | 1555 | * Toshiba TC86C001 IDE controller reports the standard 8-byte BAR0 size |
1428 | * but the PIO transfers won't work if BAR0 falls at the odd 8 bytes. | 1556 | * but the PIO transfers won't work if BAR0 falls at the odd 8 bytes. |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 162cd927d94b..94acbeed4e7c 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -175,8 +175,8 @@ static struct aac_driver_ident aac_drivers[] = { | |||
175 | { aac_rx_init, "percraid", "DELL ", "PERCRAID ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* PERC 3/Di (Boxster/PERC3DiB) */ | 175 | { aac_rx_init, "percraid", "DELL ", "PERCRAID ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* PERC 3/Di (Boxster/PERC3DiB) */ |
176 | { aac_rx_init, "aacraid", "ADAPTEC ", "catapult ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* catapult */ | 176 | { aac_rx_init, "aacraid", "ADAPTEC ", "catapult ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* catapult */ |
177 | { aac_rx_init, "aacraid", "ADAPTEC ", "tomcat ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* tomcat */ | 177 | { aac_rx_init, "aacraid", "ADAPTEC ", "tomcat ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* tomcat */ |
178 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2120S ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2120S (Crusader) */ | 178 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2120S ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Adaptec 2120S (Crusader) */ |
179 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan) */ | 179 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Adaptec 2200S (Vulcan) */ |
180 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan-2m) */ | 180 | { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan-2m) */ |
181 | { aac_rx_init, "aacraid", "Legend ", "Legend S220 ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S220 (Legend Crusader) */ | 181 | { aac_rx_init, "aacraid", "Legend ", "Legend S220 ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S220 (Legend Crusader) */ |
182 | { aac_rx_init, "aacraid", "Legend ", "Legend S230 ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S230 (Legend Vulcan) */ | 182 | { aac_rx_init, "aacraid", "Legend ", "Legend S230 ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S230 (Legend Vulcan) */ |
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c index 2a5b29d12172..e2dd6a45924a 100644 --- a/drivers/scsi/ibmvscsi/ibmvstgt.c +++ b/drivers/scsi/ibmvscsi/ibmvstgt.c | |||
@@ -864,21 +864,23 @@ static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id) | |||
864 | 864 | ||
865 | INIT_WORK(&vport->crq_work, handle_crq); | 865 | INIT_WORK(&vport->crq_work, handle_crq); |
866 | 866 | ||
867 | err = crq_queue_create(&vport->crq_queue, target); | 867 | err = scsi_add_host(shost, target->dev); |
868 | if (err) | 868 | if (err) |
869 | goto free_srp_target; | 869 | goto free_srp_target; |
870 | 870 | ||
871 | err = scsi_add_host(shost, target->dev); | 871 | err = scsi_tgt_alloc_queue(shost); |
872 | if (err) | 872 | if (err) |
873 | goto destroy_queue; | 873 | goto remove_host; |
874 | 874 | ||
875 | err = scsi_tgt_alloc_queue(shost); | 875 | err = crq_queue_create(&vport->crq_queue, target); |
876 | if (err) | 876 | if (err) |
877 | goto destroy_queue; | 877 | goto free_queue; |
878 | 878 | ||
879 | return 0; | 879 | return 0; |
880 | destroy_queue: | 880 | free_queue: |
881 | crq_queue_destroy(target); | 881 | scsi_tgt_free_queue(shost); |
882 | remove_host: | ||
883 | scsi_remove_host(shost); | ||
882 | free_srp_target: | 884 | free_srp_target: |
883 | srp_target_free(target); | 885 | srp_target_free(target); |
884 | put_host: | 886 | put_host: |
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 801c7cf54d2e..3fdee7370ccc 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
@@ -489,12 +489,6 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, | |||
489 | if (!__kfifo_get(session->cmdpool.queue, | 489 | if (!__kfifo_get(session->cmdpool.queue, |
490 | (void*)&task, sizeof(void*))) | 490 | (void*)&task, sizeof(void*))) |
491 | return NULL; | 491 | return NULL; |
492 | |||
493 | if ((hdr->opcode == (ISCSI_OP_NOOP_OUT | ISCSI_OP_IMMEDIATE)) && | ||
494 | hdr->ttt == RESERVED_ITT) { | ||
495 | conn->ping_task = task; | ||
496 | conn->last_ping = jiffies; | ||
497 | } | ||
498 | } | 492 | } |
499 | /* | 493 | /* |
500 | * released in complete pdu for task we expect a response for, and | 494 | * released in complete pdu for task we expect a response for, and |
@@ -703,6 +697,11 @@ static void iscsi_send_nopout(struct iscsi_conn *conn, struct iscsi_nopin *rhdr) | |||
703 | task = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)&hdr, NULL, 0); | 697 | task = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)&hdr, NULL, 0); |
704 | if (!task) | 698 | if (!task) |
705 | iscsi_conn_printk(KERN_ERR, conn, "Could not send nopout\n"); | 699 | iscsi_conn_printk(KERN_ERR, conn, "Could not send nopout\n"); |
700 | else if (!rhdr) { | ||
701 | /* only track our nops */ | ||
702 | conn->ping_task = task; | ||
703 | conn->last_ping = jiffies; | ||
704 | } | ||
706 | } | 705 | } |
707 | 706 | ||
708 | static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr *hdr, | 707 | static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr *hdr, |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index fa45a1a66867..148d3af92aef 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -648,8 +648,8 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) | |||
648 | struct request *req = cmd->request; | 648 | struct request *req = cmd->request; |
649 | unsigned long flags; | 649 | unsigned long flags; |
650 | 650 | ||
651 | scsi_unprep_request(req); | ||
652 | spin_lock_irqsave(q->queue_lock, flags); | 651 | spin_lock_irqsave(q->queue_lock, flags); |
652 | scsi_unprep_request(req); | ||
653 | blk_requeue_request(q, req); | 653 | blk_requeue_request(q, req); |
654 | spin_unlock_irqrestore(q->queue_lock, flags); | 654 | spin_unlock_irqrestore(q->queue_lock, flags); |
655 | 655 | ||
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 526c191e84ea..8dc7109d61b7 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
@@ -44,13 +44,15 @@ | |||
44 | #include <linux/list.h> | 44 | #include <linux/list.h> |
45 | #include <linux/sysdev.h> | 45 | #include <linux/sysdev.h> |
46 | 46 | ||
47 | #include <asm/xen/hypervisor.h> | ||
48 | #include <asm/page.h> | 47 | #include <asm/page.h> |
49 | #include <asm/pgalloc.h> | 48 | #include <asm/pgalloc.h> |
50 | #include <asm/pgtable.h> | 49 | #include <asm/pgtable.h> |
51 | #include <asm/uaccess.h> | 50 | #include <asm/uaccess.h> |
52 | #include <asm/tlb.h> | 51 | #include <asm/tlb.h> |
53 | 52 | ||
53 | #include <asm/xen/hypervisor.h> | ||
54 | #include <asm/xen/hypercall.h> | ||
55 | #include <xen/interface/xen.h> | ||
54 | #include <xen/interface/memory.h> | 56 | #include <xen/interface/memory.h> |
55 | #include <xen/xenbus.h> | 57 | #include <xen/xenbus.h> |
56 | #include <xen/features.h> | 58 | #include <xen/features.h> |
diff --git a/drivers/xen/features.c b/drivers/xen/features.c index 0707714e40d6..99eda169c779 100644 --- a/drivers/xen/features.c +++ b/drivers/xen/features.c | |||
@@ -8,7 +8,11 @@ | |||
8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
9 | #include <linux/cache.h> | 9 | #include <linux/cache.h> |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <asm/xen/hypervisor.h> | 11 | |
12 | #include <asm/xen/hypercall.h> | ||
13 | |||
14 | #include <xen/interface/xen.h> | ||
15 | #include <xen/interface/version.h> | ||
12 | #include <xen/features.h> | 16 | #include <xen/features.h> |
13 | 17 | ||
14 | u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly; | 18 | u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly; |
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 06592b9da83c..7d8f531fb8e8 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <xen/interface/xen.h> | 40 | #include <xen/interface/xen.h> |
41 | #include <xen/page.h> | 41 | #include <xen/page.h> |
42 | #include <xen/grant_table.h> | 42 | #include <xen/grant_table.h> |
43 | #include <asm/xen/hypercall.h> | ||
43 | 44 | ||
44 | #include <asm/pgtable.h> | 45 | #include <asm/pgtable.h> |
45 | #include <asm/sync_bitops.h> | 46 | #include <asm/sync_bitops.h> |