common/cnxk: use wider mask to extract RPM ID

Some platforms have more RPMs available than the others. Take than
into account when retrieving id of a particular RPM.

Signed-off-by: Tomasz Duszynski <tduszynski@marvell.com>
Reviewed-by: Jakub Palider <jpalider@marvell.com>
Reviewed-by: Jerin Jacob <jerinj@marvell.com>
Tested-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/drivers/common/cnxk/roc_bphy_cgx.c b/drivers/common/cnxk/roc_bphy_cgx.c
index 19baaa6757f139ac4fea3aebfbe7dee8d3bd37e8..a0a0d22f85ac85594ea23928e714ded908c1b31d 100644 (file)
--- a/drivers/common/cnxk/roc_bphy_cgx.c
+++ b/drivers/common/cnxk/roc_bphy_cgx.c
@@ -173,8 +173,14 @@ out:
 static unsigned int
 roc_bphy_cgx_dev_id(struct roc_bphy_cgx *roc_cgx)
 {
-       uint64_t cgx_id = roc_model_is_cn10k() ? GENMASK_ULL(26, 24) :
-                                                GENMASK_ULL(25, 24);
+       uint64_t cgx_id;
+
+       if (roc_model_is_cnf10kb())
+               cgx_id = GENMASK_ULL(27, 24);
+       else if (roc_model_is_cn10k())
+               cgx_id = GENMASK_ULL(26, 24);
+       else
+               cgx_id = GENMASK_ULL(25, 24);
 
        return FIELD_GET(cgx_id, roc_cgx->bar0_pa);
 }