diff options
Diffstat (limited to 'drivers/fpga/dfl.c')
| -rw-r--r-- | drivers/fpga/dfl.c | 38 | 
1 files changed, 22 insertions, 16 deletions
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c index 599bb21d86af..6bff39ff21a0 100644 --- a/drivers/fpga/dfl.c +++ b/drivers/fpga/dfl.c @@ -940,9 +940,12 @@ static int parse_feature_irqs(struct build_feature_devs_info *binfo,  {  	void __iomem *base = binfo->ioaddr + ofst;  	unsigned int i, ibase, inr = 0; +	enum dfl_id_type type;  	int virq;  	u64 v; +	type = feature_dev_id_type(binfo->feature_dev); +  	/*  	 * Ideally DFL framework should only read info from DFL header, but  	 * current version DFL only provides mmio resources information for @@ -957,22 +960,25 @@ static int parse_feature_irqs(struct build_feature_devs_info *binfo,  	 * code will be added. But in order to be compatible to old version  	 * DFL, the driver may still fall back to these quirks.  	 */ -	switch (fid) { -	case PORT_FEATURE_ID_UINT: -		v = readq(base + PORT_UINT_CAP); -		ibase = FIELD_GET(PORT_UINT_CAP_FST_VECT, v); -		inr = FIELD_GET(PORT_UINT_CAP_INT_NUM, v); -		break; -	case PORT_FEATURE_ID_ERROR: -		v = readq(base + PORT_ERROR_CAP); -		ibase = FIELD_GET(PORT_ERROR_CAP_INT_VECT, v); -		inr = FIELD_GET(PORT_ERROR_CAP_SUPP_INT, v); -		break; -	case FME_FEATURE_ID_GLOBAL_ERR: -		v = readq(base + FME_ERROR_CAP); -		ibase = FIELD_GET(FME_ERROR_CAP_INT_VECT, v); -		inr = FIELD_GET(FME_ERROR_CAP_SUPP_INT, v); -		break; +	if (type == PORT_ID) { +		switch (fid) { +		case PORT_FEATURE_ID_UINT: +			v = readq(base + PORT_UINT_CAP); +			ibase = FIELD_GET(PORT_UINT_CAP_FST_VECT, v); +			inr = FIELD_GET(PORT_UINT_CAP_INT_NUM, v); +			break; +		case PORT_FEATURE_ID_ERROR: +			v = readq(base + PORT_ERROR_CAP); +			ibase = FIELD_GET(PORT_ERROR_CAP_INT_VECT, v); +			inr = FIELD_GET(PORT_ERROR_CAP_SUPP_INT, v); +			break; +		} +	} else if (type == FME_ID) { +		if (fid == FME_FEATURE_ID_GLOBAL_ERR) { +			v = readq(base + FME_ERROR_CAP); +			ibase = FIELD_GET(FME_ERROR_CAP_INT_VECT, v); +			inr = FIELD_GET(FME_ERROR_CAP_SUPP_INT, v); +		}  	}  	if (!inr) {  | 
