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

Commit f90aa8c4 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Tony Luck
Browse files

[IA64] Tollhouse HP: IA64 arch changes 



arch/ia64/sn and include/asm-ia64/sn changes required to support Tollhouse
system PCI hotplug, fixes the ia64_sn_sysctl_ioboard_get call, and introduces
the PRF_HOTPLUG_SUPPORT feature bit.

Signed-off-by: default avatarPrarit Bhargava <prarit@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent b17ea91a

arch/ia64/sn/kernel/io_init.c

+29 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <asm/sn/sn_feature_sets.h>

#include <asm/sn/geo.h>

#include <asm/sn/io.h>

#include <asm/sn/l1.h>

#include <asm/sn/module.h>

#include <asm/sn/pcibr_provider.h>

#include <asm/sn/pcibus_provider_defs.h>

#include <asm/sn/pcidev.h>
@@ -710,9 +712,36 @@ cnodeid_get_geoid(cnodeid_t cnode) 
	return hubdev->hdi_geoid;

}



void sn_generate_path(struct pci_bus *pci_bus, char *address)

{

	nasid_t nasid;

	cnodeid_t cnode;

	geoid_t geoid;

	moduleid_t moduleid;

	u16 bricktype;



	nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base);

	cnode = nasid_to_cnodeid(nasid);

	geoid = cnodeid_get_geoid(cnode);

	moduleid = geo_module(geoid);



	sprintf(address, "module_%c%c%c%c%.2d",

		'0'+RACK_GET_CLASS(MODULE_GET_RACK(moduleid)),

		'0'+RACK_GET_GROUP(MODULE_GET_RACK(moduleid)),

		'0'+RACK_GET_NUM(MODULE_GET_RACK(moduleid)),

		MODULE_GET_BTCHAR(moduleid), MODULE_GET_BPOS(moduleid));



	/* Tollhouse requires slot id to be displayed */

	bricktype = MODULE_GET_BTYPE(moduleid);

	if ((bricktype == L1_BRICKTYPE_191010) ||

	    (bricktype == L1_BRICKTYPE_1932))

			sprintf(address, "%s^%d", address, geo_slot(geoid));

}



subsys_initcall(sn_pci_init);

EXPORT_SYMBOL(sn_pci_fixup_slot);

EXPORT_SYMBOL(sn_pci_unfixup_slot);

EXPORT_SYMBOL(sn_pci_controller_fixup);

EXPORT_SYMBOL(sn_bus_store_sysdata);

EXPORT_SYMBOL(sn_bus_free_sysdata);

EXPORT_SYMBOL(sn_generate_path);

arch/ia64/sn/kernel/tiocx.c

+8 −2
Original line number Diff line number Diff line
@@ -369,9 +369,15 @@ static void tio_corelet_reset(nasid_t nasid, int corelet) 


static int is_fpga_tio(int nasid, int *bt)

{

	int ioboard_type;

	u16 ioboard_type;

	s64 rc;



	ioboard_type = ia64_sn_sysctl_ioboard_get(nasid);

	rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard_type);

	if (rc) {

		printk(KERN_WARNING "ia64_sn_sysctl_ioboard_get failed: %ld\n",

		       rc);

		return 0;

	}



	switch (ioboard_type) {

	case L1_BRICKTYPE_SA:

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

+17 −0
Original line number Diff line number Diff line
@@ -74,6 +74,22 @@ static int sal_pcibr_error_interrupt(struct pcibus_info *soft) 
	return (int)ret_stuff.v0;

}



u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus)

{

	s64 rc;

	u16 ioboard;

	nasid_t nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base);



	rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard);

	if (rc) {

		printk(KERN_WARNING "ia64_sn_sysctl_ioboard_get failed: %ld\n",

		       rc);

		return 0;

	}



	return ioboard;

}



/* 

 * PCI Bridge Error interrupt handler.  Gets invoked whenever a PCI 

 * bridge sends an error interrupt.
@@ -255,3 +271,4 @@ pcibr_init_provider(void) 


EXPORT_SYMBOL_GPL(sal_pcibr_slot_enable);

EXPORT_SYMBOL_GPL(sal_pcibr_slot_disable);

EXPORT_SYMBOL_GPL(sn_ioboard_to_pci_bus);

include/asm-ia64/sn/l1.h

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#define L1_BRICKTYPE_IA		0x6b            /* k */

#define L1_BRICKTYPE_ATHENA	0x2b            /* + */

#define L1_BRICKTYPE_DAYTONA	0x7a            /* z */

#define L1_BRICKTYPE_1932	0x2c		/* . */

#define L1_BRICKTYPE_191010	0x2e		/* , */



/* board type response codes */

#define L1_BOARDTYPE_IP69       0x0100          /* CA */
@@ -46,5 +48,4 @@ 
#define L1_BOARDTYPE_DAYTONA    0x0800          /* AD */

#define L1_BOARDTYPE_INVAL      (-1)            /* invalid brick type */





#endif /* _ASM_IA64_SN_L1_H */

include/asm-ia64/sn/pcibr_provider.h

+1 −0
Original line number Diff line number Diff line
@@ -144,4 +144,5 @@ extern int sal_pcibr_slot_enable(struct pcibus_info *soft, int device, 
				 void *resp);

extern int sal_pcibr_slot_disable(struct pcibus_info *soft, int device,

				  int action, void *resp);

extern u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus);

#endif