[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>
This commit is contained in:
parent
2074615a13
commit
c2d1d65ad4
|
@ -330,19 +330,6 @@ EXPORT_SYMBOL(tiocx_bus_type);
|
||||||
EXPORT_SYMBOL(tiocx_dma_addr);
|
EXPORT_SYMBOL(tiocx_dma_addr);
|
||||||
EXPORT_SYMBOL(tiocx_swin_base);
|
EXPORT_SYMBOL(tiocx_swin_base);
|
||||||
|
|
||||||
static uint64_t tiocx_get_hubdev_info(u64 handle, u64 address)
|
|
||||||
{
|
|
||||||
|
|
||||||
struct ia64_sal_retval ret_stuff;
|
|
||||||
ret_stuff.status = 0;
|
|
||||||
ret_stuff.v0 = 0;
|
|
||||||
|
|
||||||
ia64_sal_oemcall_nolock(&ret_stuff,
|
|
||||||
SN_SAL_IOIF_GET_HUBDEV_INFO,
|
|
||||||
handle, address, 0, 0, 0, 0, 0);
|
|
||||||
return ret_stuff.v0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void tio_conveyor_set(nasid_t nasid, int enable_flag)
|
static void tio_conveyor_set(nasid_t nasid, int enable_flag)
|
||||||
{
|
{
|
||||||
uint64_t ice_frz;
|
uint64_t ice_frz;
|
||||||
|
@ -477,18 +464,12 @@ static int __init tiocx_init(void)
|
||||||
|
|
||||||
if (nasid & 0x1) { /* TIO's are always odd */
|
if (nasid & 0x1) { /* TIO's are always odd */
|
||||||
struct hubdev_info *hubdev;
|
struct hubdev_info *hubdev;
|
||||||
uint64_t status;
|
|
||||||
struct xwidget_info *widgetp;
|
struct xwidget_info *widgetp;
|
||||||
|
|
||||||
DBG("Found TIO at nasid 0x%x\n", nasid);
|
DBG("Found TIO at nasid 0x%x\n", nasid);
|
||||||
|
|
||||||
hubdev =
|
hubdev =
|
||||||
(struct hubdev_info *)(NODEPDA(cnodeid)->pdinfo);
|
(struct hubdev_info *)(NODEPDA(cnodeid)->pdinfo);
|
||||||
status =
|
|
||||||
tiocx_get_hubdev_info(nasid,
|
|
||||||
(uint64_t) __pa(hubdev));
|
|
||||||
if (status)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
widgetp = &hubdev->hdi_xwidget_info[TIOCX_CORELET];
|
widgetp = &hubdev->hdi_xwidget_info[TIOCX_CORELET];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue