* [PATCH V3 0/2] pm80xx : Updates for the driver version 0.1.39.
@ 2020-07-20 13:53 Deepak Ukey
2020-07-20 13:53 ` [PATCH V3 1/2] pm80xx : Support for get phy profile functionality Deepak Ukey
2020-07-20 13:53 ` [PATCH V3 2/2] pm80xx : Staggered spin up support Deepak Ukey
0 siblings, 2 replies; 6+ messages in thread
From: Deepak Ukey @ 2020-07-20 13:53 UTC (permalink / raw)
To: linux-scsi
Cc: Vasanthalakshmi.Tharmarajan, Viswas.G, deepak.ukey, jinpu.wang,
martin.petersen, yuuzheng, auradkar, vishakhavc, bjashnani,
radha, akshatzen
From: Deepak Ukey <Deepak.Ukey@microchip.com>
This patch set includes some bug fixes and features for pm80xx driver.
Changes from V2:
For "Support for get phy profile functionality."
-Added fix for Wmissing-prototypes warning reported by
kernel test robot
For "Staggered spin up support."
-Added fix for Wmissing-prototypes warning reported by
kernel test robot
For "Wait for PHY startup before draining libsas queue."
-Removed the patch from patchset. According to recommendation
we need to fix this using udev so planning to submit in future.
Viswas G (2):
pm80xx : Support for get phy profile functionality.
pm80xx : Staggered spin up support.
drivers/scsi/pm8001/pm8001_ctl.h | 20 ++++
drivers/scsi/pm8001/pm8001_defs.h | 3 +
drivers/scsi/pm8001/pm8001_hwi.c | 14 ++-
drivers/scsi/pm8001/pm8001_init.c | 55 +++++++++-
drivers/scsi/pm8001/pm8001_sas.c | 36 ++++++-
drivers/scsi/pm8001/pm8001_sas.h | 18 ++++
drivers/scsi/pm8001/pm80xx_hwi.c | 208 ++++++++++++++++++++++++++++++++++----
drivers/scsi/pm8001/pm80xx_hwi.h | 2 +
8 files changed, 331 insertions(+), 25 deletions(-)
--
2.16.3
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH V3 1/2] pm80xx : Support for get phy profile functionality. 2020-07-20 13:53 [PATCH V3 0/2] pm80xx : Updates for the driver version 0.1.39 Deepak Ukey @ 2020-07-20 13:53 ` Deepak Ukey 2020-07-20 18:44 ` kernel test robot 2020-07-21 7:17 ` Jinpu Wang 2020-07-20 13:53 ` [PATCH V3 2/2] pm80xx : Staggered spin up support Deepak Ukey 1 sibling, 2 replies; 6+ messages in thread From: Deepak Ukey @ 2020-07-20 13:53 UTC (permalink / raw) To: linux-scsi Cc: Vasanthalakshmi.Tharmarajan, Viswas.G, deepak.ukey, jinpu.wang, martin.petersen, yuuzheng, auradkar, vishakhavc, bjashnani, radha, akshatzen From: Viswas G <Viswas.G@microchip.com> Added the support to get the phy profile which gives information about the phy states, port and errors on phy. Signed-off-by: Deepak Ukey <deepak.ukey@microchip.com> Signed-off-by: Viswas G <Viswas.G@microchip.com> Signed-off-by: Radha Ramachandran <radha@google.com> Signed-off-by: kernel test robot <lkp@intel.com> --- drivers/scsi/pm8001/pm8001_ctl.h | 20 ++++++++++ drivers/scsi/pm8001/pm8001_init.c | 2 + drivers/scsi/pm8001/pm8001_sas.h | 5 +++ drivers/scsi/pm8001/pm80xx_hwi.c | 83 ++++++++++++++++++++++++++++++++++++++- drivers/scsi/pm8001/pm80xx_hwi.h | 2 + 5 files changed, 110 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_ctl.h b/drivers/scsi/pm8001/pm8001_ctl.h index d0d43a250b9e..02dc04a1fbe8 100644 --- a/drivers/scsi/pm8001/pm8001_ctl.h +++ b/drivers/scsi/pm8001/pm8001_ctl.h @@ -41,6 +41,26 @@ #ifndef PM8001_CTL_H_INCLUDED #define PM8001_CTL_H_INCLUDED +struct phy_status { + char phy_id; + unsigned int phy_state:4; + unsigned int nlr:4; + unsigned int plr:4; + unsigned int reserved1:12; + unsigned char port_id; + unsigned int prts:4; + unsigned int reserved2:20; +} __packed; + +struct phy_errcnt { + unsigned int InvalidDword; + unsigned int runningDisparityError; + unsigned int codeViolation; + unsigned int LossOfSyncDW; + unsigned int phyResetProblem; + unsigned int inboundCRCError; +}; + #define IOCTL_BUF_SIZE 4096 #define HEADER_LEN 28 #define SIZE_OFFSET 16 diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 9e99262a2b9d..ff65d6cf6d31 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -398,6 +398,8 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha, pm8001_ha->ccb_info[i].task = NULL; pm8001_ha->ccb_info[i].ccb_tag = 0xffffffff; pm8001_ha->ccb_info[i].device = NULL; + pm8001_ha->ccb_info[i].completion = NULL; + pm8001_ha->ccb_info[i].resp_buf = NULL; ++pm8001_ha->tags_num; } pm8001_ha->flags = PM8001F_INIT_TIME; diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h index ae7ba9b3c4bc..488af79dec47 100644 --- a/drivers/scsi/pm8001/pm8001_sas.h +++ b/drivers/scsi/pm8001/pm8001_sas.h @@ -56,6 +56,7 @@ #include <scsi/sas_ata.h> #include <linux/atomic.h> #include "pm8001_defs.h" +#include "pm8001_ctl.h" #define DRV_NAME "pm80xx" #define DRV_VERSION "0.1.39" @@ -244,6 +245,8 @@ struct pm8001_dispatch { int (*sas_diag_execute_req)(struct pm8001_hba_info *pm8001_ha, u32 state); int (*sas_re_init_req)(struct pm8001_hba_info *pm8001_ha); + int (*get_phy_profile_req)(struct pm8001_hba_info *pm8001_ha, + int phy, int page, struct completion *comp, void *buf); }; struct pm8001_chip_info { @@ -318,6 +321,8 @@ struct pm8001_ccb_info { struct pm8001_prd buf_prd[PM8001_MAX_DMA_SG]; struct fw_control_ex *fw_control_context; u8 open_retry; + struct completion *completion; + void *resp_buf; }; struct mpi_mem { diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index 4d205ebaee87..c1662e949847 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -3792,7 +3792,6 @@ static int mpi_set_controller_config_resp(struct pm8001_hba_info *pm8001_ha, PM8001_MSG_DBG(pm8001_ha, pm8001_printk( "SET CONTROLLER RESP: status 0x%x qlfr_pgcd 0x%x\n", status, err_qlfr_pgcd)); - return 0; } @@ -3818,9 +3817,58 @@ static int mpi_get_controller_config_resp(struct pm8001_hba_info *pm8001_ha, static int mpi_get_phy_profile_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) { + u32 tag, page_code; + struct phy_status *phy_status, *phy_stat; + struct phy_errcnt *phy_err, *phy_err_cnt; + struct pm8001_ccb_info *ccb; + struct get_phy_profile_resp *pPayload = + (struct get_phy_profile_resp *)(piomb + 4); + u32 status = le32_to_cpu(pPayload->status); + + page_code = (u8)((pPayload->ppc_phyid & 0xFF00) >> 8); + PM8001_MSG_DBG(pm8001_ha, - pm8001_printk(" pm80xx_addition_functionality\n")); + pm8001_printk(" pm80xx_addition_functionality\n")); + if (status) { + /* status is FAILED */ + PM8001_FAIL_DBG(pm8001_ha, pm8001_printk( + "mpiGetPhyProfileReq failed with status 0x%08x\n", + status)); + } + tag = le32_to_cpu(pPayload->tag); + ccb = &pm8001_ha->ccb_info[tag]; + if (ccb->completion != NULL) { + if (status) { + /* signal fail status */ + memset(&ccb->resp_buf, 0xff, sizeof(ccb->resp_buf)); + } else if (page_code == SAS_PHY_GENERAL_STATUS_PAGE) { + phy_status = (struct phy_status *)ccb->resp_buf; + phy_stat = + (struct phy_status *)pPayload->ppc_specific_rsp; + phy_status->phy_id = le32_to_cpu(phy_stat->phy_id); + phy_status->phy_state = + le32_to_cpu(phy_stat->phy_state); + phy_status->plr = le32_to_cpu(phy_stat->plr); + phy_status->nlr = le32_to_cpu(phy_stat->nlr); + phy_status->port_id = le32_to_cpu(phy_stat->port_id); + phy_status->prts = le32_to_cpu(phy_stat->prts); + } else if (page_code == SAS_PHY_ERR_COUNTERS_PAGE) { + phy_err = (struct phy_errcnt *)ccb->resp_buf; + phy_err_cnt = + (struct phy_errcnt *)pPayload->ppc_specific_rsp; + phy_err->InvalidDword = + le32_to_cpu(phy_err_cnt->InvalidDword); + phy_err->runningDisparityError = + le32_to_cpu(phy_err_cnt->runningDisparityError); + phy_err->LossOfSyncDW = + le32_to_cpu(phy_err_cnt->LossOfSyncDW); + phy_err->phyResetProblem = + le32_to_cpu(phy_err_cnt->phyResetProblem); + } + complete(ccb->completion); + } + pm8001_tag_free(pm8001_ha, tag); return 0; } @@ -5013,6 +5061,36 @@ pm80xx_chip_isr(struct pm8001_hba_info *pm8001_ha, u8 vec) return IRQ_HANDLED; } +static int pm8001_chip_get_phy_profile(struct pm8001_hba_info *pm8001_ha, + int phy_id, int page_code, struct completion *comp, void *buf) +{ + u32 tag; + struct get_phy_profile_req payload; + struct inbound_queue_table *circularQ; + struct pm8001_ccb_info *ccb; + int rc, ppc_phyid; + u32 opc = OPC_INB_GET_PHY_PROFILE; + + memset(&payload, 0, sizeof(payload)); + + rc = pm8001_tag_alloc(pm8001_ha, &tag); + if (rc) + PM8001_FAIL_DBG(pm8001_ha, pm8001_printk("Invalid tag\n")); + + ccb = &pm8001_ha->ccb_info[tag]; + ccb->completion = comp; + ccb->resp_buf = buf; + circularQ = &pm8001_ha->inbnd_q_tbl[0]; + + payload.tag = cpu_to_le32(tag); + ppc_phyid = (page_code & 0xFF) << 8 | (phy_id & 0xFF); + payload.ppc_phyid = cpu_to_le32(ppc_phyid); + + pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload, + sizeof(payload), 0); + return rc; +} + void mpi_set_phy_profile_req(struct pm8001_hba_info *pm8001_ha, u32 operation, u32 phyid, u32 length, u32 *buf) { @@ -5113,4 +5191,5 @@ const struct pm8001_dispatch pm8001_80xx_dispatch = { .set_nvmd_req = pm8001_chip_set_nvmd_req, .fw_flash_update_req = pm8001_chip_fw_flash_update_req, .set_dev_state_req = pm8001_chip_set_dev_state_req, + .get_phy_profile_req = pm8001_chip_get_phy_profile, }; diff --git a/drivers/scsi/pm8001/pm80xx_hwi.h b/drivers/scsi/pm8001/pm80xx_hwi.h index 701951a0f715..b5119c5479da 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.h +++ b/drivers/scsi/pm8001/pm80xx_hwi.h @@ -175,7 +175,9 @@ #define PHY_STOP_ERR_DEVICE_ATTACHED 0x1046 /* phy_profile */ +#define SAS_PHY_ERR_COUNTERS_PAGE 0x01 #define SAS_PHY_ANALOG_SETTINGS_PAGE 0x04 +#define SAS_PHY_GENERAL_STATUS_PAGE 0x05 #define PHY_DWORD_LENGTH 0xC /* Thermal related */ -- 2.16.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V3 1/2] pm80xx : Support for get phy profile functionality. 2020-07-20 13:53 ` [PATCH V3 1/2] pm80xx : Support for get phy profile functionality Deepak Ukey @ 2020-07-20 18:44 ` kernel test robot 2020-07-21 7:17 ` Jinpu Wang 1 sibling, 0 replies; 6+ messages in thread From: kernel test robot @ 2020-07-20 18:44 UTC (permalink / raw) To: Deepak Ukey, linux-scsi Cc: kbuild-all, Vasanthalakshmi.Tharmarajan, Viswas.G, deepak.ukey, jinpu.wang, martin.petersen, yuuzheng, auradkar, vishakhavc, bjashnani [-- Attachment #1: Type: text/plain, Size: 22144 bytes --] Hi Deepak, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on v5.8-rc6] [also build test WARNING on next-20200720] [cannot apply to mkp-scsi/for-next scsi/for-next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Deepak-Ukey/pm80xx-Updates-for-the-driver-version-0-1-39/20200720-214608 base: ba47d845d715a010f7b51f6f89bae32845e6acb7 config: x86_64-randconfig-s022-20200719 (attached as .config) compiler: gcc-9 (Debian 9.3.0-14) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.2-49-g707c5017-dirty # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> sparse warnings: (new ones prefixed by >>) drivers/scsi/pm8001/pm80xx_hwi.c:81:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:81:39: sparse: expected unsigned int [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:81:39: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:69:6: sparse: sparse: symbol 'pm80xx_pci_mem_copy' was not declared. Should it be static? drivers/scsi/pm8001/pm80xx_hwi.c:1213:27: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 @@ got unsigned int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1213:27: sparse: expected restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:1213:27: sparse: got unsigned int drivers/scsi/pm8001/pm80xx_hwi.c:1215:27: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1215:27: sparse: expected restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:1215:27: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1255:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] pageCode @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1255:39: sparse: expected restricted __le32 [addressable] [usertype] pageCode drivers/scsi/pm8001/pm80xx_hwi.c:1255:39: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1256:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] MST_MSI @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1256:39: sparse: expected restricted __le32 [addressable] [usertype] MST_MSI drivers/scsi/pm8001/pm80xx_hwi.c:1256:39: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1257:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] STP_SSP_MCT_TMO @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1257:39: sparse: expected restricted __le32 [addressable] [usertype] STP_SSP_MCT_TMO drivers/scsi/pm8001/pm80xx_hwi.c:1257:39: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1258:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] STP_FRM_TMO @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1258:39: sparse: expected restricted __le32 [addressable] [usertype] STP_FRM_TMO drivers/scsi/pm8001/pm80xx_hwi.c:1258:39: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1260:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] STP_IDLE_TMO @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1260:39: sparse: expected restricted __le32 [addressable] [usertype] STP_IDLE_TMO drivers/scsi/pm8001/pm80xx_hwi.c:1260:39: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1262:26: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:1263:44: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] STP_IDLE_TMO @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1263:44: sparse: expected restricted __le32 [addressable] [usertype] STP_IDLE_TMO drivers/scsi/pm8001/pm80xx_hwi.c:1263:44: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1266:41: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] OPNRJT_RTRY_INTVL @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1266:41: sparse: expected restricted __le32 [addressable] [usertype] OPNRJT_RTRY_INTVL drivers/scsi/pm8001/pm80xx_hwi.c:1266:41: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1268:48: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] Data_Cmd_OPNRJT_RTRY_TMO @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1268:48: sparse: expected restricted __le32 [addressable] [usertype] Data_Cmd_OPNRJT_RTRY_TMO drivers/scsi/pm8001/pm80xx_hwi.c:1268:48: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1270:48: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] Data_Cmd_OPNRJT_RTRY_THR @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1270:48: sparse: expected restricted __le32 [addressable] [usertype] Data_Cmd_OPNRJT_RTRY_THR drivers/scsi/pm8001/pm80xx_hwi.c:1270:48: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1272:31: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [usertype] MAX_AIP @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1272:31: sparse: expected restricted __le32 [addressable] [usertype] MAX_AIP drivers/scsi/pm8001/pm80xx_hwi.c:1272:31: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1425:33: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] new_curidx_ksop @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:1425:33: sparse: expected restricted __le32 [addressable] [assigned] [usertype] new_curidx_ksop drivers/scsi/pm8001/pm80xx_hwi.c:1425:33: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:1869:40: sparse: sparse: invalid assignment: |= drivers/scsi/pm8001/pm80xx_hwi.c:1869:40: sparse: left side has type restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:1869:40: sparse: right side has type int drivers/scsi/pm8001/pm80xx_hwi.c:3037:63: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned long long [usertype] address @@ got restricted __le64 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:3037:63: sparse: expected unsigned long long [usertype] address drivers/scsi/pm8001/pm80xx_hwi.c:3037:63: sparse: got restricted __le64 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:3828:35: sparse: sparse: restricted __le32 degrades to integer >> drivers/scsi/pm8001/pm80xx_hwi.c:3849:46: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3851:41: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3852:43: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3853:43: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3854:47: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3855:44: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3861:25: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3863:25: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3865:25: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:3867:25: sparse: sparse: cast to restricted __le32 drivers/scsi/pm8001/pm80xx_hwi.c:4359:46: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned long long [usertype] address @@ got restricted __le64 [assigned] [usertype] tmp_addr @@ drivers/scsi/pm8001/pm80xx_hwi.c:4359:46: sparse: expected unsigned long long [usertype] address drivers/scsi/pm8001/pm80xx_hwi.c:4359:46: sparse: got restricted __le64 [assigned] [usertype] tmp_addr drivers/scsi/pm8001/pm80xx_hwi.c:4534:36: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned long long [usertype] start_addr @@ got restricted __le64 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4534:36: sparse: expected unsigned long long [usertype] start_addr drivers/scsi/pm8001/pm80xx_hwi.c:4534:36: sparse: got restricted __le64 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4535:57: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:4536:38: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_low @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4536:38: sparse: expected unsigned int [usertype] end_addr_low drivers/scsi/pm8001/pm80xx_hwi.c:4536:38: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4537:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_high @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4537:39: sparse: expected unsigned int [usertype] end_addr_high drivers/scsi/pm8001/pm80xx_hwi.c:4537:39: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4538:53: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:4564:35: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] key_cmode @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:4564:35: sparse: expected restricted __le32 [addressable] [assigned] [usertype] key_cmode drivers/scsi/pm8001/pm80xx_hwi.c:4564:35: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:4593:36: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned long long [usertype] start_addr @@ got restricted __le64 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4593:36: sparse: expected unsigned long long [usertype] start_addr drivers/scsi/pm8001/pm80xx_hwi.c:4593:36: sparse: got restricted __le64 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4594:57: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:4595:38: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_low @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4595:38: sparse: expected unsigned int [usertype] end_addr_low drivers/scsi/pm8001/pm80xx_hwi.c:4595:38: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4596:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_high @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4596:39: sparse: expected unsigned int [usertype] end_addr_high drivers/scsi/pm8001/pm80xx_hwi.c:4596:39: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4597:53: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:4701:47: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_low @@ got unsigned int [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4701:47: sparse: expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_low drivers/scsi/pm8001/pm80xx_hwi.c:4701:47: sparse: got unsigned int [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4702:48: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_high @@ got unsigned int [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4702:48: sparse: expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_high drivers/scsi/pm8001/pm80xx_hwi.c:4702:48: sparse: got unsigned int [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4706:47: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_low @@ got unsigned int [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4706:47: sparse: expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_low drivers/scsi/pm8001/pm80xx_hwi.c:4706:47: sparse: got unsigned int [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4707:48: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_high @@ got unsigned int [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4707:48: sparse: expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_high drivers/scsi/pm8001/pm80xx_hwi.c:4707:48: sparse: got unsigned int [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4711:36: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned long long [usertype] start_addr @@ got restricted __le64 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4711:36: sparse: expected unsigned long long [usertype] start_addr drivers/scsi/pm8001/pm80xx_hwi.c:4711:36: sparse: got restricted __le64 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4712:58: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:4713:38: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_low @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4713:38: sparse: expected unsigned int [usertype] end_addr_low drivers/scsi/pm8001/pm80xx_hwi.c:4713:38: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4714:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_high @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4714:39: sparse: expected unsigned int [usertype] end_addr_high drivers/scsi/pm8001/pm80xx_hwi.c:4714:39: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4715:54: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:4728:55: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_low @@ got unsigned int [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4728:55: sparse: expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_low drivers/scsi/pm8001/pm80xx_hwi.c:4728:55: sparse: got unsigned int [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4730:56: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_high @@ got unsigned int [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4730:56: sparse: expected restricted __le32 [addressable] [assigned] [usertype] enc_addr_high drivers/scsi/pm8001/pm80xx_hwi.c:4730:56: sparse: got unsigned int [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4742:41: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] key_index_mode @@ got int @@ drivers/scsi/pm8001/pm80xx_hwi.c:4742:41: sparse: expected restricted __le32 [addressable] [assigned] [usertype] key_index_mode drivers/scsi/pm8001/pm80xx_hwi.c:4742:41: sparse: got int drivers/scsi/pm8001/pm80xx_hwi.c:4777:36: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned long long [usertype] start_addr @@ got restricted __le64 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4777:36: sparse: expected unsigned long long [usertype] start_addr drivers/scsi/pm8001/pm80xx_hwi.c:4777:36: sparse: got restricted __le64 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4778:58: sparse: sparse: restricted __le32 degrades to integer drivers/scsi/pm8001/pm80xx_hwi.c:4779:38: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_low @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4779:38: sparse: expected unsigned int [usertype] end_addr_low drivers/scsi/pm8001/pm80xx_hwi.c:4779:38: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:4780:39: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int [usertype] end_addr_high @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:4780:39: sparse: expected unsigned int [usertype] end_addr_high drivers/scsi/pm8001/pm80xx_hwi.c:4780:39: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:5109:27: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] ppc_phyid @@ got unsigned int @@ drivers/scsi/pm8001/pm80xx_hwi.c:5109:27: sparse: expected restricted __le32 [addressable] [assigned] [usertype] ppc_phyid drivers/scsi/pm8001/pm80xx_hwi.c:5109:27: sparse: got unsigned int drivers/scsi/pm8001/pm80xx_hwi.c:5114:37: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:5114:37: sparse: expected unsigned int drivers/scsi/pm8001/pm80xx_hwi.c:5114:37: sparse: got restricted __le32 [usertype] drivers/scsi/pm8001/pm80xx_hwi.c:5094:6: sparse: sparse: symbol 'mpi_set_phy_profile_req' was not declared. Should it be static? drivers/scsi/pm8001/pm80xx_hwi.c:5154:27: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted __le32 [addressable] [assigned] [usertype] ppc_phyid @@ got unsigned int @@ drivers/scsi/pm8001/pm80xx_hwi.c:5154:27: sparse: expected restricted __le32 [addressable] [assigned] [usertype] ppc_phyid drivers/scsi/pm8001/pm80xx_hwi.c:5154:27: sparse: got unsigned int drivers/scsi/pm8001/pm80xx_hwi.c:5158:37: sparse: sparse: incorrect type in assignment (different base types) @@ expected unsigned int @@ got restricted __le32 [usertype] @@ drivers/scsi/pm8001/pm80xx_hwi.c:5158:37: sparse: expected unsigned int drivers/scsi/pm8001/pm80xx_hwi.c:5158:37: sparse: got restricted __le32 [usertype] vim +3849 drivers/scsi/pm8001/pm80xx_hwi.c 3811 3812 /** 3813 * mpi_get_phy_profile_resp - SPCv specific 3814 * @pm8001_ha: our hba card information 3815 * @piomb: IO message buffer 3816 */ 3817 static int mpi_get_phy_profile_resp(struct pm8001_hba_info *pm8001_ha, 3818 void *piomb) 3819 { 3820 u32 tag, page_code; 3821 struct phy_status *phy_status, *phy_stat; 3822 struct phy_errcnt *phy_err, *phy_err_cnt; 3823 struct pm8001_ccb_info *ccb; 3824 struct get_phy_profile_resp *pPayload = 3825 (struct get_phy_profile_resp *)(piomb + 4); 3826 u32 status = le32_to_cpu(pPayload->status); 3827 3828 page_code = (u8)((pPayload->ppc_phyid & 0xFF00) >> 8); 3829 3830 PM8001_MSG_DBG(pm8001_ha, 3831 pm8001_printk(" pm80xx_addition_functionality\n")); 3832 if (status) { 3833 /* status is FAILED */ 3834 PM8001_FAIL_DBG(pm8001_ha, pm8001_printk( 3835 "mpiGetPhyProfileReq failed with status 0x%08x\n", 3836 status)); 3837 } 3838 3839 tag = le32_to_cpu(pPayload->tag); 3840 ccb = &pm8001_ha->ccb_info[tag]; 3841 if (ccb->completion != NULL) { 3842 if (status) { 3843 /* signal fail status */ 3844 memset(&ccb->resp_buf, 0xff, sizeof(ccb->resp_buf)); 3845 } else if (page_code == SAS_PHY_GENERAL_STATUS_PAGE) { 3846 phy_status = (struct phy_status *)ccb->resp_buf; 3847 phy_stat = 3848 (struct phy_status *)pPayload->ppc_specific_rsp; > 3849 phy_status->phy_id = le32_to_cpu(phy_stat->phy_id); 3850 phy_status->phy_state = 3851 le32_to_cpu(phy_stat->phy_state); 3852 phy_status->plr = le32_to_cpu(phy_stat->plr); 3853 phy_status->nlr = le32_to_cpu(phy_stat->nlr); 3854 phy_status->port_id = le32_to_cpu(phy_stat->port_id); 3855 phy_status->prts = le32_to_cpu(phy_stat->prts); 3856 } else if (page_code == SAS_PHY_ERR_COUNTERS_PAGE) { 3857 phy_err = (struct phy_errcnt *)ccb->resp_buf; 3858 phy_err_cnt = 3859 (struct phy_errcnt *)pPayload->ppc_specific_rsp; 3860 phy_err->InvalidDword = 3861 le32_to_cpu(phy_err_cnt->InvalidDword); 3862 phy_err->runningDisparityError = 3863 le32_to_cpu(phy_err_cnt->runningDisparityError); 3864 phy_err->LossOfSyncDW = 3865 le32_to_cpu(phy_err_cnt->LossOfSyncDW); 3866 phy_err->phyResetProblem = 3867 le32_to_cpu(phy_err_cnt->phyResetProblem); 3868 } 3869 complete(ccb->completion); 3870 } 3871 pm8001_tag_free(pm8001_ha, tag); 3872 return 0; 3873 } 3874 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 33351 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V3 1/2] pm80xx : Support for get phy profile functionality. 2020-07-20 13:53 ` [PATCH V3 1/2] pm80xx : Support for get phy profile functionality Deepak Ukey 2020-07-20 18:44 ` kernel test robot @ 2020-07-21 7:17 ` Jinpu Wang 1 sibling, 0 replies; 6+ messages in thread From: Jinpu Wang @ 2020-07-21 7:17 UTC (permalink / raw) To: Deepak Ukey Cc: Linux SCSI Mailinglist, Vasanthalakshmi.Tharmarajan, Viswas G, Jinpu Wang, Martin K. Petersen, yuuzheng, Vikram Auradkar, vishakhavc, bjashnani, Radha Ramachandran, akshatzen Hi Deepak, On Mon, Jul 20, 2020 at 3:43 PM Deepak Ukey <deepak.ukey@microchip.com> wrote: > > From: Viswas G <Viswas.G@microchip.com> > > Added the support to get the phy profile which gives information > about the phy states, port and errors on phy. > > Signed-off-by: Deepak Ukey <deepak.ukey@microchip.com> > Signed-off-by: Viswas G <Viswas.G@microchip.com> > Signed-off-by: Radha Ramachandran <radha@google.com> > Signed-off-by: kernel test robot <lkp@intel.com> please check and fix the sparse warnings reported by test robot. Thanks ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH V3 2/2] pm80xx : Staggered spin up support. 2020-07-20 13:53 [PATCH V3 0/2] pm80xx : Updates for the driver version 0.1.39 Deepak Ukey 2020-07-20 13:53 ` [PATCH V3 1/2] pm80xx : Support for get phy profile functionality Deepak Ukey @ 2020-07-20 13:53 ` Deepak Ukey 2020-07-21 7:28 ` Jinpu Wang 1 sibling, 1 reply; 6+ messages in thread From: Deepak Ukey @ 2020-07-20 13:53 UTC (permalink / raw) To: linux-scsi Cc: Vasanthalakshmi.Tharmarajan, Viswas.G, deepak.ukey, jinpu.wang, martin.petersen, yuuzheng, auradkar, vishakhavc, bjashnani, radha, akshatzen From: Viswas G <Viswas.G@microchip.com> As a part of drive discovery, driver will initaite the drive spin up. If all drives do spin up together, it will result in large power consumption. To reduce the power consumption, driver provide an option to make a small group of drives (say 3 or 4 drives together) to do the spin up. The delay between two spin up group and no of drives to spin up (group) can be programmed by the customer in seeprom and driver will use it to control the spinup. Signed-off-by: Viswas G <Viswas.G@microchip.com> Signed-off-by: Radha Ramachandran <radha@google.com> Signed-off-by: Deepak Ukey <Deepak.Ukey@microchip.com> Signed-off-by: kernel test robot <lkp@intel.com> --- drivers/scsi/pm8001/pm8001_defs.h | 3 + drivers/scsi/pm8001/pm8001_hwi.c | 14 ++++- drivers/scsi/pm8001/pm8001_init.c | 53 +++++++++++++++- drivers/scsi/pm8001/pm8001_sas.c | 36 ++++++++++- drivers/scsi/pm8001/pm8001_sas.h | 13 ++++ drivers/scsi/pm8001/pm80xx_hwi.c | 125 +++++++++++++++++++++++++++++++++----- 6 files changed, 221 insertions(+), 23 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_defs.h b/drivers/scsi/pm8001/pm8001_defs.h index 1c7f15fd69ce..fd700ce5e80c 100644 --- a/drivers/scsi/pm8001/pm8001_defs.h +++ b/drivers/scsi/pm8001/pm8001_defs.h @@ -101,6 +101,9 @@ enum port_type { #define USI_MAX_MEMCNT (PI + PM8001_MAX_SPCV_OUTB_NUM) #define CONFIG_SCSI_PM8001_MAX_DMA_SG 528 #define PM8001_MAX_DMA_SG CONFIG_SCSI_PM8001_MAX_DMA_SG +#define SPINUP_DELAY_OFFSET 0x890 /* 0x890 - delay */ +#define SPINUP_GROUP_OFFSET 0x892 /* 0x892 - group */ +#define PM80XX_MAX_SPINUP_DELAY 10000 /* 10000 ms */ enum memory_region_num { AAP1 = 0x0, /* application acceleration processor */ IOP, /* IO processor */ diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index fb9848e1d481..6378c8e8d6b2 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -3237,7 +3237,7 @@ int pm8001_mpi_local_phy_ctl(struct pm8001_hba_info *pm8001_ha, void *piomb) (struct local_phy_ctl_resp *)(piomb + 4); u32 status = le32_to_cpu(pPayload->status); u32 phy_id = le32_to_cpu(pPayload->phyop_phyid) & ID_BITS; - u32 phy_op = le32_to_cpu(pPayload->phyop_phyid) & OP_BITS; + u32 phy_op = (le32_to_cpu(pPayload->phyop_phyid) & OP_BITS) >> 8; tag = le32_to_cpu(pPayload->tag); if (status != 0) { PM8001_MSG_DBG(pm8001_ha, @@ -3248,6 +3248,13 @@ int pm8001_mpi_local_phy_ctl(struct pm8001_hba_info *pm8001_ha, void *piomb) pm8001_printk("%x phy execute %x phy op success!\n", phy_id, phy_op)); pm8001_ha->phy[phy_id].reset_success = true; + if (phy_op == PHY_NOTIFY_ENABLE_SPINUP && + !pm8001_ha->reset_in_progress){ + /* Notify the sas layer to discover + * the the whole sas domain + */ + pm8001_bytes_dmaed(pm8001_ha, phy_id); + } } if (pm8001_ha->phy[phy_id].enable_completion) { complete(pm8001_ha->phy[phy_id].enable_completion); @@ -3643,7 +3650,10 @@ int pm8001_mpi_reg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) pm8001_printk("DEVREG_FAILURE_DEVICE_TYPE_NOT_SUPPORTED\n")); break; } - complete(pm8001_dev->dcompletion); + if (pm8001_dev->dcompletion) { + complete(pm8001_dev->dcompletion); + pm8001_dev->dcompletion = NULL; + } ccb->task = NULL; ccb->ccb_tag = 0xFFFFFFFF; pm8001_tag_free(pm8001_ha, htag); diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index ff65d6cf6d31..05f1b355d68e 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -55,6 +55,12 @@ MODULE_PARM_DESC(link_rate, "Enable link rate.\n" " 4: Link rate 6.0G\n" " 8: Link rate 12.0G\n"); +bool staggered_spinup; +module_param(staggered_spinup, bool, 0644); +MODULE_PARM_DESC(staggered_spinup, "enable the staggered spinup feature.\n" + " 0/N: false\n" + " 1/Y: true\n"); + static struct scsi_transport_template *pm8001_stt; /** @@ -165,7 +171,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha) if (!pm8001_ha) return; - + del_timer(&pm8001_ha->spinup_timer); for (i = 0; i < USI_MAX_MEMCNT; i++) { if (pm8001_ha->memoryMap.region[i].virt_ptr != NULL) { dma_free_coherent(&pm8001_ha->pdev->dev, @@ -489,6 +495,7 @@ static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev, pm8001_ha->shost = shost; pm8001_ha->id = pm8001_id++; pm8001_ha->logging_level = logging_level; + pm8001_ha->staggered_spinup = staggered_spinup; pm8001_ha->non_fatal_count = 0; if (link_rate >= 1 && link_rate <= 15) pm8001_ha->link_rate = (link_rate << 8); @@ -622,7 +629,8 @@ static void pm8001_post_sas_ha_init(struct Scsi_Host *shost, * Currently we just set the fixed SAS address to our HBA,for manufacture, * it should read from the EEPROM */ -static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha) +static void pm8001_init_sas_add_and_spinup_config + (struct pm8001_hba_info *pm8001_ha) { u8 i, j; u8 sas_add[8]; @@ -708,6 +716,45 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha) memcpy(pm8001_ha->sas_addr, &pm8001_ha->phy[0].dev_sas_addr, SAS_ADDR_SIZE); #endif + + /* For spinning up drives in group */ + pm8001_ha->phy_head = -1; + pm8001_ha->phy_tail = -1; + + for (i = 0; i < PM8001_MAX_PHYS; i++) + pm8001_ha->phy_up[i] = 0xff; + + timer_setup(&pm8001_ha->spinup_timer, + (void *)pm8001_spinup_timedout, 0); + + if (pm8001_ha->staggered_spinup == true) { + /* spinup interval in unit of 100 ms */ + pm8001_ha->spinup_interval = + payload.func_specific[SPINUP_DELAY_OFFSET] * 100; + pm8001_ha->spinup_group = + payload.func_specific[SPINUP_GROUP_OFFSET]; + } else { + pm8001_ha->spinup_interval = 0; + pm8001_ha->spinup_group = pm8001_ha->chip->n_phy; + } + + if (pm8001_ha->spinup_interval > PM80XX_MAX_SPINUP_DELAY) { + PM8001_DISC_DBG(pm8001_ha, pm8001_printk( + "Spinup delay from Seeprom is %d ms, reset to %d ms\n", + pm8001_ha->spinup_interval * 100, PM80XX_MAX_SPINUP_DELAY)); + pm8001_ha->spinup_interval = PM80XX_MAX_SPINUP_DELAY; + } + + if (pm8001_ha->spinup_group > pm8001_ha->chip->n_phy) { + PM8001_DISC_DBG(pm8001_ha, pm8001_printk( + "Spinup group from Seeprom is %d, reset to %d\n", + pm8001_ha->spinup_group, pm8001_ha->chip->n_phy)); + pm8001_ha->spinup_group = pm8001_ha->chip->n_phy; + } + + PM8001_MSG_DBG(pm8001_ha, pm8001_printk( + "Spinup interval : %d Spinup group %d\n", + pm8001_ha->spinup_interval, pm8001_ha->spinup_group)); } /* @@ -1106,7 +1153,7 @@ static int pm8001_pci_probe(struct pci_dev *pdev, pm80xx_set_thermal_config(pm8001_ha); } - pm8001_init_sas_add(pm8001_ha); + pm8001_init_sas_add_and_spinup_config(pm8001_ha); /* phy setting support for motherboard controller */ if (pm8001_configure_phy_settings(pm8001_ha)) goto err_out_shost; diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index b7cbc312843e..cf1c5e68953b 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -265,14 +265,39 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, void pm8001_scan_start(struct Scsi_Host *shost) { int i; + unsigned long lock_flags; struct pm8001_hba_info *pm8001_ha; struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); + DECLARE_COMPLETION(comp); pm8001_ha = sha->lldd_ha; /* SAS_RE_INITIALIZATION not available in SPCv/ve */ if (pm8001_ha->chip_id == chip_8001) PM8001_CHIP_DISP->sas_re_init_req(pm8001_ha); - for (i = 0; i < pm8001_ha->chip->n_phy; ++i) - PM8001_CHIP_DISP->phy_start_req(pm8001_ha, i); + + if (pm8001_ha->pdev->device == 0x8001 || + pm8001_ha->pdev->device == 0x8081 || + (pm8001_ha->spinup_interval != 0)) { + for (i = 0; i < pm8001_ha->chip->n_phy; ++i) + PM8001_CHIP_DISP->phy_start_req(pm8001_ha, i); + } else { + for (i = 0; i < pm8001_ha->chip->n_phy; ++i) { + spin_lock_irqsave(&pm8001_ha->lock, lock_flags); + pm8001_ha->phy_started = i; + pm8001_ha->scan_completion = ∁ + pm8001_ha->phystart_timedout = 1; + spin_unlock_irqrestore(&pm8001_ha->lock, lock_flags); + PM8001_CHIP_DISP->phy_start_req(pm8001_ha, i); + wait_for_completion_timeout(&comp, + msecs_to_jiffies(500)); + if (pm8001_ha->phystart_timedout) + PM8001_MSG_DBG(pm8001_ha, pm8001_printk( + "Timeout happened for phyid = %d\n", i)); + } + spin_lock_irqsave(&pm8001_ha->lock, lock_flags); + pm8001_ha->phy_started = -1; + pm8001_ha->scan_completion = NULL; + spin_unlock_irqrestore(&pm8001_ha->lock, lock_flags); + } } int pm8001_scan_finished(struct Scsi_Host *shost, unsigned long time) @@ -662,6 +687,13 @@ static int pm8001_dev_found_notify(struct domain_device *dev) flag = 1; /* directly sata */ } } /*register this device to HBA*/ + + if (pm8001_ha->phy_started == pm8001_device->attached_phy) { + if (pm8001_ha->scan_completion != NULL) { + pm8001_ha->phystart_timedout = 0; + complete(pm8001_ha->scan_completion); + } + } PM8001_DISC_DBG(pm8001_ha, pm8001_printk("Found device\n")); PM8001_CHIP_DISP->reg_dev_req(pm8001_ha, pm8001_device, flag); spin_unlock_irqrestore(&pm8001_ha->lock, flags); diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h index 488af79dec47..d2d73cba7f41 100644 --- a/drivers/scsi/pm8001/pm8001_sas.h +++ b/drivers/scsi/pm8001/pm8001_sas.h @@ -261,6 +261,7 @@ struct pm8001_port { u8 port_attached; u16 wide_port_phymap; u8 port_state; + u8 port_id; struct list_head list; }; @@ -566,6 +567,17 @@ struct pm8001_hba_info { u32 reset_in_progress; u32 non_fatal_count; u32 non_fatal_read_length; + bool staggered_spinup; + struct completion *scan_completion; + u32 phy_started; + u16 phystart_timedout; + int spinup_group; + int spinup_interval; + int phy_up[PM8001_MAX_PHYS]; + struct timer_list spinup_timer; + int phy_head; + int phy_tail; + spinlock_t phy_q_lock; }; struct pm8001_work { @@ -684,6 +696,7 @@ void pm8001_open_reject_retry( int pm8001_mem_alloc(struct pci_dev *pdev, void **virt_addr, dma_addr_t *pphys_addr, u32 *pphys_addr_hi, u32 *pphys_addr_lo, u32 mem_size, u32 align); +void pm8001_spinup_timedout(struct timer_list *t); void pm8001_chip_iounmap(struct pm8001_hba_info *pm8001_ha); int pm8001_mpi_build_cmd(struct pm8001_hba_info *pm8001_ha, diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index c1662e949847..c0dde1330e50 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -46,6 +46,72 @@ #define SMP_DIRECT 1 #define SMP_INDIRECT 2 +static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, + u32 phyId, u32 phy_op); + +static void pm8001_queue_phyup(struct pm8001_hba_info *pm8001_ha, int phy_id) +{ + int i; + + if (pm8001_ha->phy_head == -1) { + pm8001_ha->phy_head = pm8001_ha->phy_tail = 0; + } else { + /* If the phy id is already queued , discard the phy up */ + for (i = 0; i < pm8001_ha->chip->n_phy; i++) + if (pm8001_ha->phy_up[i] == phy_id) + return; + pm8001_ha->phy_tail = + (pm8001_ha->phy_tail + 1) % PM8001_MAX_PHYS; + } + pm8001_ha->phy_up[pm8001_ha->phy_tail] = phy_id; +} + +void pm8001_spinup_timedout(struct timer_list *t) +{ + struct pm8001_hba_info *pm8001_ha = + from_timer(pm8001_ha, t, spinup_timer); + struct pm8001_phy *phy; + unsigned long flags; + int i = 0, phy_id = 0xff; + + spin_lock_irqsave(&pm8001_ha->phy_q_lock, flags); + + do { + if (i++ >= pm8001_ha->spinup_group && pm8001_ha->spinup_group) + break; + + if (pm8001_ha->phy_head == -1 || pm8001_ha->reset_in_progress) + break; /* No phys to spinup */ + + phy_id = pm8001_ha->phy_up[pm8001_ha->phy_head]; + /* Processed phy id, make it invalid 0xff for + * checking repeated phy ups + */ + pm8001_ha->phy_up[pm8001_ha->phy_head] = 0xff; + if (pm8001_ha->phy_head == pm8001_ha->phy_tail) { + pm8001_ha->phy_head = pm8001_ha->phy_tail = -1; + } else { + pm8001_ha->phy_head = + (pm8001_ha->phy_head+1) % PM8001_MAX_PHYS; + } + + if (phy_id == 0xff) + break; + phy = &pm8001_ha->phy[phy_id]; + if (phy->phy_type & PORT_TYPE_SAS) { + PM8001_CHIP_DISP->phy_ctl_req(pm8001_ha, phy_id, + PHY_NOTIFY_ENABLE_SPINUP); + } else { + PM8001_CHIP_DISP->phy_ctl_req(pm8001_ha, phy_id, + PHY_LINK_RESET); + } + } while (1); + + if (pm8001_ha->phy_head != -1 && pm8001_ha->spinup_group) + mod_timer(&pm8001_ha->spinup_timer, + jiffies + msecs_to_jiffies(pm8001_ha->spinup_interval)); + spin_unlock_irqrestore(&pm8001_ha->phy_q_lock, flags); +} int pm80xx_bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shift_value) { @@ -3302,11 +3368,12 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) port->port_state = portstate; port->wide_port_phymap |= (1U << phy_id); phy->phy_state = PHY_STATE_LINK_UP_SPCV; + phy->port = port; PM8001_MSG_DBG(pm8001_ha, pm8001_printk( "portid:%d; phyid:%d; linkrate:%d; " "portstate:%x; devicetype:%x\n", port_id, phy_id, link_rate, portstate, deviceType)); - + port->port_id = port_id; switch (deviceType) { case SAS_PHY_UNUSED: PM8001_MSG_DBG(pm8001_ha, @@ -3314,8 +3381,12 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) break; case SAS_END_DEVICE: PM8001_MSG_DBG(pm8001_ha, pm8001_printk("end device.\n")); - pm80xx_chip_phy_ctl_req(pm8001_ha, phy_id, - PHY_NOTIFY_ENABLE_SPINUP); + spin_lock_irqsave(&pm8001_ha->phy_q_lock, flags); + pm8001_queue_phyup(pm8001_ha, phy_id); + spin_unlock_irqrestore(&pm8001_ha->phy_q_lock, flags); + if (!timer_pending(&pm8001_ha->spinup_timer)) + mod_timer(&pm8001_ha->spinup_timer, + jiffies + msecs_to_jiffies(pm8001_ha->spinup_interval)); port->port_attached = 1; pm8001_get_lrate_mode(phy, link_rate); break; @@ -3351,9 +3422,10 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) phy->frame_rcvd_size = sizeof(struct sas_identify_frame) - 4; pm8001_get_attached_sas_addr(phy, phy->sas_phy.attached_sas_addr); spin_unlock_irqrestore(&phy->sas_phy.frame_rcvd_lock, flags); - if (pm8001_ha->flags == PM8001F_RUN_TIME) - msleep(200);/*delay a moment to wait disk to spinup*/ - pm8001_bytes_dmaed(pm8001_ha, phy_id); + if (!pm8001_ha->reset_in_progress) { + if (deviceType != SAS_END_DEVICE) + pm8001_bytes_dmaed(pm8001_ha, phy_id); + } } /** @@ -3388,11 +3460,17 @@ hw_event_sata_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) port->port_state = portstate; phy->phy_state = PHY_STATE_LINK_UP_SPCV; port->port_attached = 1; + phy->port = port; + port->port_id = port_id; pm8001_get_lrate_mode(phy, link_rate); phy->phy_type |= PORT_TYPE_SATA; phy->phy_attached = 1; phy->sas_phy.oob_mode = SATA_OOB_MODE; - sas_ha->notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE); + if (!pm8001_ha->reset_in_progress) { + sas_ha->notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE); + } else + PM8001_MSG_DBG(pm8001_ha, pm8001_printk( + "HW_EVENT_PHY_UP: not notified to host\n")); spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags); memcpy(phy->frame_rcvd, ((u8 *)&pPayload->sata_fis - 4), sizeof(struct dev_to_host_fis)); @@ -3401,7 +3479,8 @@ hw_event_sata_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) phy->identify.device_type = SAS_SATA_DEV; pm8001_get_attached_sas_addr(phy, phy->sas_phy.attached_sas_addr); spin_unlock_irqrestore(&phy->sas_phy.frame_rcvd_lock, flags); - pm8001_bytes_dmaed(pm8001_ha, phy_id); + if (!pm8001_ha->reset_in_progress) + pm8001_bytes_dmaed(pm8001_ha, phy_id); } /** @@ -3497,12 +3576,14 @@ static int mpi_phy_start_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) status, phy_id)); if (status == 0) { phy->phy_state = PHY_LINK_DOWN; - if (pm8001_ha->flags == PM8001F_RUN_TIME && - phy->enable_completion != NULL) { - complete(phy->enable_completion); - phy->enable_completion = NULL; - } } + + if (pm8001_ha->flags == PM8001F_RUN_TIME && + phy->enable_completion != NULL) { + complete(phy->enable_completion); + phy->enable_completion = NULL; + } + return 0; } @@ -3580,7 +3661,14 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) case HW_EVENT_SATA_SPINUP_HOLD: PM8001_MSG_DBG(pm8001_ha, pm8001_printk("HW_EVENT_SATA_SPINUP_HOLD\n")); - sas_ha->notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD); + spin_lock_irqsave(&pm8001_ha->phy_q_lock, flags); + pm8001_queue_phyup(pm8001_ha, phy_id); + spin_unlock_irqrestore(&pm8001_ha->phy_q_lock, flags); + + /* Start the timer if not started */ + if (!timer_pending(&pm8001_ha->spinup_timer)) + mod_timer(&pm8001_ha->spinup_timer, + jiffies + msecs_to_jiffies(pm8001_ha->spinup_interval)); break; case HW_EVENT_PHY_DOWN: PM8001_MSG_DBG(pm8001_ha, @@ -4888,7 +4976,7 @@ pm80xx_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id) PM8001_INIT_DBG(pm8001_ha, pm8001_printk("PHY START REQ for phy_id %d\n", phy_id)); - payload.ase_sh_lm_slr_phyid = cpu_to_le32(SPINHOLD_DISABLE | + payload.ase_sh_lm_slr_phyid = cpu_to_le32(SPINHOLD_ENABLE | LINKMODE_AUTO | pm8001_ha->link_rate | phy_id); /* SSC Disable and SAS Analog ST configuration */ /** @@ -4950,6 +5038,8 @@ static int pm80xx_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, u16 ITNT = 2000; struct domain_device *dev = pm8001_dev->sas_device; struct domain_device *parent_dev = dev->parent; + struct pm8001_phy *phy; + struct pm8001_port *port; circularQ = &pm8001_ha->inbnd_q_tbl[0]; memset(&payload, 0, sizeof(payload)); @@ -4981,8 +5071,11 @@ static int pm80xx_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, linkrate = (pm8001_dev->sas_device->linkrate < dev->port->linkrate) ? pm8001_dev->sas_device->linkrate : dev->port->linkrate; + phy = &pm8001_ha->phy[phy_id]; + port = phy->port; + payload.phyid_portid = - cpu_to_le32(((pm8001_dev->sas_device->port->id) & 0xFF) | + cpu_to_le32(((port->port_id) & 0xFF) | ((phy_id & 0xFF) << 8)); payload.dtype_dlr_mcn_ir_retry = cpu_to_le32((retryFlag & 0x01) | -- 2.16.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V3 2/2] pm80xx : Staggered spin up support. 2020-07-20 13:53 ` [PATCH V3 2/2] pm80xx : Staggered spin up support Deepak Ukey @ 2020-07-21 7:28 ` Jinpu Wang 0 siblings, 0 replies; 6+ messages in thread From: Jinpu Wang @ 2020-07-21 7:28 UTC (permalink / raw) To: Deepak Ukey Cc: Linux SCSI Mailinglist, Vasanthalakshmi.Tharmarajan, Viswas G, Jinpu Wang, Martin K. Petersen, yuuzheng, Vikram Auradkar, vishakhavc, bjashnani, Radha Ramachandran, akshatzen On Mon, Jul 20, 2020 at 3:43 PM Deepak Ukey <deepak.ukey@microchip.com> wrote: > > From: Viswas G <Viswas.G@microchip.com> > > As a part of drive discovery, driver will initaite the drive spin up. > If all drives do spin up together, it will result in large power > consumption. To reduce the power consumption, driver provide an option > to make a small group of drives (say 3 or 4 drives together) to do the > spin up. The delay between two spin up group and no of drives to > spin up (group) can be programmed by the customer in seeprom and > driver will use it to control the spinup. > > Signed-off-by: Viswas G <Viswas.G@microchip.com> > Signed-off-by: Radha Ramachandran <radha@google.com> > Signed-off-by: Deepak Ukey <Deepak.Ukey@microchip.com> > Signed-off-by: kernel test robot <lkp@intel.com> Thanks, Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-21 7:28 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-07-20 13:53 [PATCH V3 0/2] pm80xx : Updates for the driver version 0.1.39 Deepak Ukey 2020-07-20 13:53 ` [PATCH V3 1/2] pm80xx : Support for get phy profile functionality Deepak Ukey 2020-07-20 18:44 ` kernel test robot 2020-07-21 7:17 ` Jinpu Wang 2020-07-20 13:53 ` [PATCH V3 2/2] pm80xx : Staggered spin up support Deepak Ukey 2020-07-21 7:28 ` Jinpu Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).