Message ID | 1612826906-25356-1-git-send-email-rahul.lakkireddy@chelsio.com |
---|---|
State | New |
Headers | show |
Series | [net-next] cxgb4: collect serial config version from register | expand |
On Mon, Feb 8, 2021 at 3:48 PM Rahul Lakkireddy <rahul.lakkireddy@chelsio.com> wrote: > > Collect serial config version information directly from an internal > register, instead of explicitly resizing VPD. > > Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com> > --- > .../net/ethernet/chelsio/cxgb4/cudbg_entity.h | 3 --- > .../net/ethernet/chelsio/cxgb4/cudbg_lib.c | 24 +++---------------- > drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 2 ++ > 3 files changed, 5 insertions(+), 24 deletions(-) > > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h b/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h > index 876f90e5795e..d5218e74284c 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h > +++ b/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h > @@ -220,9 +220,6 @@ struct cudbg_mps_tcam { > u8 reserved[2]; > }; > > -#define CUDBG_VPD_PF_SIZE 0x800 > -#define CUDBG_SCFG_VER_ADDR 0x06 > -#define CUDBG_SCFG_VER_LEN 4 > #define CUDBG_VPD_VER_ADDR 0x18c7 > #define CUDBG_VPD_VER_LEN 2 > > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c > index 75474f810249..6c85a10f465c 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c > +++ b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c > @@ -2686,10 +2686,10 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init, > struct adapter *padap = pdbg_init->adap; > struct cudbg_buffer temp_buff = { 0 }; > char vpd_str[CUDBG_VPD_VER_LEN + 1]; > - u32 scfg_vers, vpd_vers, fw_vers; > struct cudbg_vpd_data *vpd_data; > struct vpd_params vpd = { 0 }; > - int rc, ret; > + u32 vpd_vers, fw_vers; > + int rc; > > rc = t4_get_raw_vpd_params(padap, &vpd); > if (rc) > @@ -2699,24 +2699,6 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init, > if (rc) > return rc; > > - /* Serial Configuration Version is located beyond the PF's vpd size. > - * Temporarily give access to entire EEPROM to get it. > - */ > - rc = pci_set_vpd_size(padap->pdev, EEPROMVSIZE); > - if (rc < 0) > - return rc; > - > - ret = cudbg_read_vpd_reg(padap, CUDBG_SCFG_VER_ADDR, CUDBG_SCFG_VER_LEN, > - &scfg_vers); > - > - /* Restore back to original PF's vpd size */ > - rc = pci_set_vpd_size(padap->pdev, CUDBG_VPD_PF_SIZE); > - if (rc < 0) > - return rc; > - > - if (ret) > - return ret; > - > rc = cudbg_read_vpd_reg(padap, CUDBG_VPD_VER_ADDR, CUDBG_VPD_VER_LEN, > vpd_str); > if (rc) > @@ -2737,7 +2719,7 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init, > memcpy(vpd_data->bn, vpd.pn, PN_LEN + 1); > memcpy(vpd_data->na, vpd.na, MACADDR_LEN + 1); > memcpy(vpd_data->mn, vpd.id, ID_LEN + 1); > - vpd_data->scfg_vers = scfg_vers; > + vpd_data->scfg_vers = t4_read_reg(padap, PCIE_STATIC_SPARE2_A); > vpd_data->vpd_vers = vpd_vers; > vpd_data->fw_major = FW_HDR_FW_VER_MAJOR_G(fw_vers); > vpd_data->fw_minor = FW_HDR_FW_VER_MINOR_G(fw_vers); All of the above looks good to me. > diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h > index b11a172b5174..2d7bb8b66a3e 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h > +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h > @@ -884,6 +884,8 @@ > #define TDUE_V(x) ((x) << TDUE_S) > #define TDUE_F TDUE_V(1U) > > +#define PCIE_STATIC_SPARE2_A 0x5bfc > + > /* registers for module MC */ > #define MC_INT_CAUSE_A 0x7518 > #define MC_P_INT_CAUSE_A 0x41318 I cannot say I am a fan of the naming. I assume that is the name of an existing register that someone claimed to use to store the serial config version? A comment explaining what all is stored in the register might be useful since the name doesn't imply anything related to a serial config version is stored there.
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h b/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h index 876f90e5795e..d5218e74284c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h @@ -220,9 +220,6 @@ struct cudbg_mps_tcam { u8 reserved[2]; }; -#define CUDBG_VPD_PF_SIZE 0x800 -#define CUDBG_SCFG_VER_ADDR 0x06 -#define CUDBG_SCFG_VER_LEN 4 #define CUDBG_VPD_VER_ADDR 0x18c7 #define CUDBG_VPD_VER_LEN 2 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c index 75474f810249..6c85a10f465c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c @@ -2686,10 +2686,10 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init, struct adapter *padap = pdbg_init->adap; struct cudbg_buffer temp_buff = { 0 }; char vpd_str[CUDBG_VPD_VER_LEN + 1]; - u32 scfg_vers, vpd_vers, fw_vers; struct cudbg_vpd_data *vpd_data; struct vpd_params vpd = { 0 }; - int rc, ret; + u32 vpd_vers, fw_vers; + int rc; rc = t4_get_raw_vpd_params(padap, &vpd); if (rc) @@ -2699,24 +2699,6 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init, if (rc) return rc; - /* Serial Configuration Version is located beyond the PF's vpd size. - * Temporarily give access to entire EEPROM to get it. - */ - rc = pci_set_vpd_size(padap->pdev, EEPROMVSIZE); - if (rc < 0) - return rc; - - ret = cudbg_read_vpd_reg(padap, CUDBG_SCFG_VER_ADDR, CUDBG_SCFG_VER_LEN, - &scfg_vers); - - /* Restore back to original PF's vpd size */ - rc = pci_set_vpd_size(padap->pdev, CUDBG_VPD_PF_SIZE); - if (rc < 0) - return rc; - - if (ret) - return ret; - rc = cudbg_read_vpd_reg(padap, CUDBG_VPD_VER_ADDR, CUDBG_VPD_VER_LEN, vpd_str); if (rc) @@ -2737,7 +2719,7 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init, memcpy(vpd_data->bn, vpd.pn, PN_LEN + 1); memcpy(vpd_data->na, vpd.na, MACADDR_LEN + 1); memcpy(vpd_data->mn, vpd.id, ID_LEN + 1); - vpd_data->scfg_vers = scfg_vers; + vpd_data->scfg_vers = t4_read_reg(padap, PCIE_STATIC_SPARE2_A); vpd_data->vpd_vers = vpd_vers; vpd_data->fw_major = FW_HDR_FW_VER_MAJOR_G(fw_vers); vpd_data->fw_minor = FW_HDR_FW_VER_MINOR_G(fw_vers); diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h index b11a172b5174..2d7bb8b66a3e 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h @@ -884,6 +884,8 @@ #define TDUE_V(x) ((x) << TDUE_S) #define TDUE_F TDUE_V(1U) +#define PCIE_STATIC_SPARE2_A 0x5bfc + /* registers for module MC */ #define MC_INT_CAUSE_A 0x7518 #define MC_P_INT_CAUSE_A 0x41318
Collect serial config version information directly from an internal register, instead of explicitly resizing VPD. Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com> --- .../net/ethernet/chelsio/cxgb4/cudbg_entity.h | 3 --- .../net/ethernet/chelsio/cxgb4/cudbg_lib.c | 24 +++---------------- drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 2 ++ 3 files changed, 5 insertions(+), 24 deletions(-)