mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
[IA64-SGI] pass segment# on SN_SAL_IOIF_SLOT_{DIS,EN}ABLE calls
Bugfix... the altix SN_SAL_IOIF_SLOT_ENABLE & SN_SAL_IOIF_SLOT_DISABLE SAL calls need to pass the segment# down Signed-off-by: Mike Habeck <habeck@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
parent
5f7f5b0c99
commit
ac354a899b
1 changed files with 8 additions and 4 deletions
|
@ -24,13 +24,15 @@ sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp)
|
||||||
{
|
{
|
||||||
struct ia64_sal_retval ret_stuff;
|
struct ia64_sal_retval ret_stuff;
|
||||||
u64 busnum;
|
u64 busnum;
|
||||||
|
u64 segment;
|
||||||
|
|
||||||
ret_stuff.status = 0;
|
ret_stuff.status = 0;
|
||||||
ret_stuff.v0 = 0;
|
ret_stuff.v0 = 0;
|
||||||
|
|
||||||
|
segment = soft->pbi_buscommon.bs_persist_segment;
|
||||||
busnum = soft->pbi_buscommon.bs_persist_busnum;
|
busnum = soft->pbi_buscommon.bs_persist_busnum;
|
||||||
SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, (u64) busnum,
|
SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, segment,
|
||||||
(u64) device, (u64) resp, 0, 0, 0, 0);
|
busnum, (u64) device, (u64) resp, 0, 0, 0);
|
||||||
|
|
||||||
return (int)ret_stuff.v0;
|
return (int)ret_stuff.v0;
|
||||||
}
|
}
|
||||||
|
@ -41,14 +43,16 @@ sal_pcibr_slot_disable(struct pcibus_info *soft, int device, int action,
|
||||||
{
|
{
|
||||||
struct ia64_sal_retval ret_stuff;
|
struct ia64_sal_retval ret_stuff;
|
||||||
u64 busnum;
|
u64 busnum;
|
||||||
|
u64 segment;
|
||||||
|
|
||||||
ret_stuff.status = 0;
|
ret_stuff.status = 0;
|
||||||
ret_stuff.v0 = 0;
|
ret_stuff.v0 = 0;
|
||||||
|
|
||||||
|
segment = soft->pbi_buscommon.bs_persist_segment;
|
||||||
busnum = soft->pbi_buscommon.bs_persist_busnum;
|
busnum = soft->pbi_buscommon.bs_persist_busnum;
|
||||||
SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_DISABLE,
|
SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_DISABLE,
|
||||||
(u64) busnum, (u64) device, (u64) action,
|
segment, busnum, (u64) device, (u64) action,
|
||||||
(u64) resp, 0, 0, 0);
|
(u64) resp, 0, 0);
|
||||||
|
|
||||||
return (int)ret_stuff.v0;
|
return (int)ret_stuff.v0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue