frodovdr
/
dddvb
mirror of https://github.com/DigitalDevices/dddvb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

oops, wrong id

This commit is contained in:
none 2019-11-14 14:00:41 +01:00
parent 5a536040b5
commit 154ea8f3c9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ddbridge/ddbridge-mci.c
View File

@ -48,7 +48,7 @@ static int mci_reset(struct mci *state)
} }
if ((status & MCI_CONTROL_READY) == 0 ) if ((status & MCI_CONTROL_READY) == 0 )
return -1; return -1;
if (link->ids.device == 0x0009 || link->ids.device == 0x000a) if (link->ids.device == 0x0009 || link->ids.device == 0x000b)
ddblwritel(link, SX8_TSCONFIG_MODE_NORMAL, SX8_TSCONFIG); ddblwritel(link, SX8_TSCONFIG_MODE_NORMAL, SX8_TSCONFIG);
return 0; return 0;
} }
@ -57,7 +57,7 @@ int ddb_mci_config(struct mci *state, u32 config)
{ {
struct ddb_link *link = state->base->link; struct ddb_link *link = state->base->link;
if (link->ids.device != 0x0009 && link->ids.device != 0x000a) if (link->ids.device != 0x0009 && link->ids.device != 0x000b)
return -EINVAL; return -EINVAL;
ddblwritel(link, config, SX8_TSCONFIG); ddblwritel(link, config, SX8_TSCONFIG);
return 0; return 0;
@ -87,14 +87,16 @@ static int ddb_mci_cmd_raw_unlocked(struct mci *state,
printk("MCI timeout\n"); printk("MCI timeout\n");
val = ddblreadl(link, MCI_CONTROL); val = ddblreadl(link, MCI_CONTROL);
if (val == 0xffffffff) if (val == 0xffffffff) {
printk("Lost PCIe link!\n"); printk("Lost PCIe link!\n");
else { return -EIO;
printk("DDBridge IRS %08x\n", istat); } else {
printk("DDBridge IRS %08x link %u\n", istat, link->nr);
if (istat & 1) if (istat & 1)
ddblwritel(link, istat & 1, INTERRUPT_ACK); ddblwritel(link, istat, INTERRUPT_ACK);
if (link->nr)
ddbwritel(link->dev, 0xffffff, INTERRUPT_ACK);
} }
return -EIO;
} }
if (res && res_len) if (res && res_len)
for (i = 0; i < res_len; i++) for (i = 0; i < res_len; i++)