diff options
| author | Bruce Losure <blosure@sgi.com> | 2005-03-24 14:28:00 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-03 14:58:37 -0400 |
| commit | c2d1d65ad441c8abe624bdb1c2cff2e47c8c1ee1 (patch) | |
| tree | 3d88b27fe6409d1ebc9849e29b0e660d437decce | |
| parent | 2074615a13a4f250e0a4e3f6ec8e3733b950a783 (diff) | |
[IA64-SGI] Altix only: Remove hubdev SAL call
Hi Tony,
This patch against ia64-test-2.6.12 fixes a bug where the tiocx code
was inadvertently un-doing some address modifications done in earlier
fixup code. This patch just removes the offending code.
Signed-off-by: Bruce Losure <blosure@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/sn/kernel/tiocx.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index 66190d7e492..128ccf23973 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c | |||
| @@ -330,19 +330,6 @@ EXPORT_SYMBOL(tiocx_bus_type); | |||
| 330 | EXPORT_SYMBOL(tiocx_dma_addr); | 330 | EXPORT_SYMBOL(tiocx_dma_addr); |
| 331 | EXPORT_SYMBOL(tiocx_swin_base); | 331 | EXPORT_SYMBOL(tiocx_swin_base); |
| 332 | 332 | ||
| 333 | static uint64_t tiocx_get_hubdev_info(u64 handle, u64 address) | ||
| 334 | { | ||
| 335 | |||
| 336 | struct ia64_sal_retval ret_stuff; | ||
| 337 | ret_stuff.status = 0; | ||
| 338 | ret_stuff.v0 = 0; | ||
| 339 | |||
| 340 | ia64_sal_oemcall_nolock(&ret_stuff, | ||
| 341 | SN_SAL_IOIF_GET_HUBDEV_INFO, | ||
| 342 | handle, address, 0, 0, 0, 0, 0); | ||
| 343 | return ret_stuff.v0; | ||
| 344 | } | ||
| 345 | |||
| 346 | static void tio_conveyor_set(nasid_t nasid, int enable_flag) | 333 | static void tio_conveyor_set(nasid_t nasid, int enable_flag) |
| 347 | { | 334 | { |
| 348 | uint64_t ice_frz; | 335 | uint64_t ice_frz; |
| @@ -477,18 +464,12 @@ static int __init tiocx_init(void) | |||
| 477 | 464 | ||
| 478 | if (nasid & 0x1) { /* TIO's are always odd */ | 465 | if (nasid & 0x1) { /* TIO's are always odd */ |
| 479 | struct hubdev_info *hubdev; | 466 | struct hubdev_info *hubdev; |
| 480 | uint64_t status; | ||
| 481 | struct xwidget_info *widgetp; | 467 | struct xwidget_info *widgetp; |
| 482 | 468 | ||
| 483 | DBG("Found TIO at nasid 0x%x\n", nasid); | 469 | DBG("Found TIO at nasid 0x%x\n", nasid); |
| 484 | 470 | ||
| 485 | hubdev = | 471 | hubdev = |
| 486 | (struct hubdev_info *)(NODEPDA(cnodeid)->pdinfo); | 472 | (struct hubdev_info *)(NODEPDA(cnodeid)->pdinfo); |
| 487 | status = | ||
| 488 | tiocx_get_hubdev_info(nasid, | ||
| 489 | (uint64_t) __pa(hubdev)); | ||
| 490 | if (status) | ||
| 491 | continue; | ||
| 492 | 473 | ||
| 493 | widgetp = &hubdev->hdi_xwidget_info[TIOCX_CORELET]; | 474 | widgetp = &hubdev->hdi_xwidget_info[TIOCX_CORELET]; |
| 494 | 475 | ||
