[IA64] Altix patch for fpga reset
1) workaround a h/w reset issue 2) to improve the determination of FPGA-based h/w in the arch/ia64/sn/kernel/tiocx code. Signed-off-by: Bruce Losure <blosure@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:

committed by
Tony Luck

orang tua
4706df3d3c
melakukan
25732ad493
@@ -183,11 +183,12 @@ int cx_driver_unregister(struct cx_drv *cx_driver)
|
||||
* @part_num: device's part number
|
||||
* @mfg_num: device's manufacturer number
|
||||
* @hubdev: hub info associated with this device
|
||||
* @bt: board type of the device
|
||||
*
|
||||
*/
|
||||
int
|
||||
cx_device_register(nasid_t nasid, int part_num, int mfg_num,
|
||||
struct hubdev_info *hubdev)
|
||||
struct hubdev_info *hubdev, int bt)
|
||||
{
|
||||
struct cx_dev *cx_dev;
|
||||
|
||||
@@ -200,6 +201,7 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num,
|
||||
cx_dev->cx_id.mfg_num = mfg_num;
|
||||
cx_dev->cx_id.nasid = nasid;
|
||||
cx_dev->hubdev = hubdev;
|
||||
cx_dev->bt = bt;
|
||||
|
||||
cx_dev->dev.parent = NULL;
|
||||
cx_dev->dev.bus = &tiocx_bus_type;
|
||||
@@ -238,7 +240,8 @@ static int cx_device_reload(struct cx_dev *cx_dev)
|
||||
{
|
||||
cx_device_unregister(cx_dev);
|
||||
return cx_device_register(cx_dev->cx_id.nasid, cx_dev->cx_id.part_num,
|
||||
cx_dev->cx_id.mfg_num, cx_dev->hubdev);
|
||||
cx_dev->cx_id.mfg_num, cx_dev->hubdev,
|
||||
cx_dev->bt);
|
||||
}
|
||||
|
||||
static inline uint64_t tiocx_intr_alloc(nasid_t nasid, int widget,
|
||||
@@ -365,26 +368,20 @@ static void tio_corelet_reset(nasid_t nasid, int corelet)
|
||||
udelay(2000);
|
||||
}
|
||||
|
||||
static int tiocx_btchar_get(int nasid)
|
||||
static int is_fpga_tio(int nasid, int *bt)
|
||||
{
|
||||
moduleid_t module_id;
|
||||
geoid_t geoid;
|
||||
int cnodeid;
|
||||
int ioboard_type;
|
||||
|
||||
cnodeid = nasid_to_cnodeid(nasid);
|
||||
geoid = cnodeid_get_geoid(cnodeid);
|
||||
module_id = geo_module(geoid);
|
||||
return MODULE_GET_BTCHAR(module_id);
|
||||
}
|
||||
ioboard_type = ia64_sn_sysctl_ioboard_get(nasid);
|
||||
|
||||
static int is_fpga_brick(int nasid)
|
||||
{
|
||||
switch (tiocx_btchar_get(nasid)) {
|
||||
switch (ioboard_type) {
|
||||
case L1_BRICKTYPE_SA:
|
||||
case L1_BRICKTYPE_ATHENA:
|
||||
case L1_BRICKTYPE_DAYTONA:
|
||||
case L1_BOARDTYPE_DAYTONA:
|
||||
*bt = ioboard_type;
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -407,16 +404,22 @@ static int tiocx_reload(struct cx_dev *cx_dev)
|
||||
|
||||
if (bitstream_loaded(nasid)) {
|
||||
uint64_t cx_id;
|
||||
int rv;
|
||||
|
||||
cx_id =
|
||||
*(volatile uint64_t *)(TIO_SWIN_BASE(nasid, TIOCX_CORELET) +
|
||||
rv = ia64_sn_sysctl_tio_clock_reset(nasid);
|
||||
if (rv) {
|
||||
printk(KERN_ALERT "CX port JTAG reset failed.\n");
|
||||
} else {
|
||||
cx_id = *(volatile uint64_t *)
|
||||
(TIO_SWIN_BASE(nasid, TIOCX_CORELET) +
|
||||
WIDGET_ID);
|
||||
part_num = XWIDGET_PART_NUM(cx_id);
|
||||
mfg_num = XWIDGET_MFG_NUM(cx_id);
|
||||
DBG("part= 0x%x, mfg= 0x%x\n", part_num, mfg_num);
|
||||
/* just ignore it if it's a CE */
|
||||
if (part_num == TIO_CE_ASIC_PARTNUM)
|
||||
return 0;
|
||||
part_num = XWIDGET_PART_NUM(cx_id);
|
||||
mfg_num = XWIDGET_MFG_NUM(cx_id);
|
||||
DBG("part= 0x%x, mfg= 0x%x\n", part_num, mfg_num);
|
||||
/* just ignore it if it's a CE */
|
||||
if (part_num == TIO_CE_ASIC_PARTNUM)
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
cx_dev->cx_id.part_num = part_num;
|
||||
@@ -436,10 +439,10 @@ static ssize_t show_cxdev_control(struct device *dev, struct device_attribute *a
|
||||
{
|
||||
struct cx_dev *cx_dev = to_cx_dev(dev);
|
||||
|
||||
return sprintf(buf, "0x%x 0x%x 0x%x %d\n",
|
||||
return sprintf(buf, "0x%x 0x%x 0x%x 0x%x\n",
|
||||
cx_dev->cx_id.nasid,
|
||||
cx_dev->cx_id.part_num, cx_dev->cx_id.mfg_num,
|
||||
tiocx_btchar_get(cx_dev->cx_id.nasid));
|
||||
cx_dev->bt);
|
||||
}
|
||||
|
||||
static ssize_t store_cxdev_control(struct device *dev, struct device_attribute *attr, const char *buf,
|
||||
@@ -488,11 +491,12 @@ static int __init tiocx_init(void)
|
||||
|
||||
for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) {
|
||||
nasid_t nasid;
|
||||
int bt;
|
||||
|
||||
if ((nasid = cnodeid_to_nasid(cnodeid)) < 0)
|
||||
break; /* No more nasids .. bail out of loop */
|
||||
|
||||
if ((nasid & 0x1) && is_fpga_brick(nasid)) {
|
||||
if ((nasid & 0x1) && is_fpga_tio(nasid, &bt)) {
|
||||
struct hubdev_info *hubdev;
|
||||
struct xwidget_info *widgetp;
|
||||
|
||||
@@ -512,7 +516,7 @@ static int __init tiocx_init(void)
|
||||
|
||||
if (cx_device_register
|
||||
(nasid, widgetp->xwi_hwid.part_num,
|
||||
widgetp->xwi_hwid.mfg_num, hubdev) < 0)
|
||||
widgetp->xwi_hwid.mfg_num, hubdev, bt) < 0)
|
||||
return -ENXIO;
|
||||
else
|
||||
found_tiocx_device++;
|
||||
|
Reference in New Issue
Block a user