Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac354a89 authored by Mike Habeck's avatar Mike Habeck Committed by Tony Luck
Browse files

[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: default avatarMike Habeck <habeck@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 5f7f5b0c

arch/ia64/sn/pci/pcibr/pcibr_provider.c

+8 −4
Original line number Diff line number Diff line
@@ -24,13 +24,15 @@ sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp) 
{

	struct ia64_sal_retval ret_stuff;

	u64 busnum;

	u64 segment;



	ret_stuff.status = 0;

	ret_stuff.v0 = 0;



	segment = soft->pbi_buscommon.bs_persist_segment;

	busnum = soft->pbi_buscommon.bs_persist_busnum;

	SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, (u64) busnum,

			(u64) device, (u64) resp, 0, 0, 0, 0);

	SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, segment,

			busnum, (u64) device, (u64) resp, 0, 0, 0);



	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;

	u64 busnum;

	u64 segment;



	ret_stuff.status = 0;

	ret_stuff.v0 = 0;



	segment = soft->pbi_buscommon.bs_persist_segment;

	busnum = soft->pbi_buscommon.bs_persist_busnum;

	SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_DISABLE,

			(u64) busnum, (u64) device, (u64) action,

			(u64) resp, 0, 0, 0);

			segment, busnum, (u64) device, (u64) action,

			(u64) resp, 0, 0);



	return (int)ret_stuff.v0;

}