mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-28 00:35:01 +00:00
Merge branch '6.13/scsi-queue' into 6.13/scsi-fixes
Pull in outstanding changes from 6.13/scsi-queue. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
commit
e7d3b4079d
@ -137,7 +137,7 @@ static const struct scsi_host_template mptfc_driver_template = {
|
||||
* Supported hardware
|
||||
*/
|
||||
|
||||
static struct pci_device_id mptfc_pci_table[] = {
|
||||
static const struct pci_device_id mptfc_pci_table[] = {
|
||||
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC909,
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC919,
|
||||
|
@ -5377,7 +5377,7 @@ static void mptsas_remove(struct pci_dev *pdev)
|
||||
mptscsih_remove(pdev);
|
||||
}
|
||||
|
||||
static struct pci_device_id mptsas_pci_table[] = {
|
||||
static const struct pci_device_id mptsas_pci_table[] = {
|
||||
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
|
||||
|
@ -1238,7 +1238,7 @@ static struct spi_function_template mptspi_transport_functions = {
|
||||
* Supported hardware
|
||||
*/
|
||||
|
||||
static struct pci_device_id mptspi_pci_table[] = {
|
||||
static const struct pci_device_id mptspi_pci_table[] = {
|
||||
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
{ PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
|
||||
|
@ -219,44 +219,6 @@ fc_plogi_x_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id,
|
||||
return sizeof(struct fc_logi_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_flogi_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id,
|
||||
u16 ox_id, wwn_t port_name, wwn_t node_name, u16 pdu_size,
|
||||
u8 set_npiv, u8 set_auth, u16 local_bb_credits)
|
||||
{
|
||||
u32 d_id = bfa_hton3b(FC_FABRIC_PORT);
|
||||
__be32 *vvl_info;
|
||||
|
||||
memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));
|
||||
|
||||
flogi->els_cmd.els_code = FC_ELS_FLOGI;
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
flogi->csp.rxsz = flogi->class3.rxsz = cpu_to_be16(pdu_size);
|
||||
flogi->port_name = port_name;
|
||||
flogi->node_name = node_name;
|
||||
|
||||
/*
|
||||
* Set the NPIV Capability Bit ( word 1, bit 31) of Common
|
||||
* Service Parameters.
|
||||
*/
|
||||
flogi->csp.ciro = set_npiv;
|
||||
|
||||
/* set AUTH capability */
|
||||
flogi->csp.security = set_auth;
|
||||
|
||||
flogi->csp.bbcred = cpu_to_be16(local_bb_credits);
|
||||
|
||||
/* Set brcd token in VVL */
|
||||
vvl_info = (u32 *)&flogi->vvl[0];
|
||||
|
||||
/* set the flag to indicate the presence of VVL */
|
||||
flogi->csp.npiv_supp = 1; /* @todo. field name is not correct */
|
||||
vvl_info[0] = cpu_to_be32(FLOGI_VVL_BRCD);
|
||||
|
||||
return sizeof(struct fc_logi_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_flogi_acc_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id,
|
||||
__be16 ox_id, wwn_t port_name, wwn_t node_name,
|
||||
@ -279,24 +241,6 @@ fc_flogi_acc_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id,
|
||||
return sizeof(struct fc_logi_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_fdisc_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id,
|
||||
u16 ox_id, wwn_t port_name, wwn_t node_name, u16 pdu_size)
|
||||
{
|
||||
u32 d_id = bfa_hton3b(FC_FABRIC_PORT);
|
||||
|
||||
memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));
|
||||
|
||||
flogi->els_cmd.els_code = FC_ELS_FDISC;
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
flogi->csp.rxsz = flogi->class3.rxsz = cpu_to_be16(pdu_size);
|
||||
flogi->port_name = port_name;
|
||||
flogi->node_name = node_name;
|
||||
|
||||
return sizeof(struct fc_logi_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_plogi_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id,
|
||||
u16 ox_id, wwn_t port_name, wwn_t node_name,
|
||||
@ -315,40 +259,6 @@ fc_plogi_acc_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id,
|
||||
node_name, pdu_size, bb_cr, FC_ELS_ACC);
|
||||
}
|
||||
|
||||
enum fc_parse_status
|
||||
fc_plogi_rsp_parse(struct fchs_s *fchs, int len, wwn_t port_name)
|
||||
{
|
||||
struct fc_els_cmd_s *els_cmd = (struct fc_els_cmd_s *) (fchs + 1);
|
||||
struct fc_logi_s *plogi;
|
||||
struct fc_ls_rjt_s *ls_rjt;
|
||||
|
||||
switch (els_cmd->els_code) {
|
||||
case FC_ELS_LS_RJT:
|
||||
ls_rjt = (struct fc_ls_rjt_s *) (fchs + 1);
|
||||
if (ls_rjt->reason_code == FC_LS_RJT_RSN_LOGICAL_BUSY)
|
||||
return FC_PARSE_BUSY;
|
||||
else
|
||||
return FC_PARSE_FAILURE;
|
||||
case FC_ELS_ACC:
|
||||
plogi = (struct fc_logi_s *) (fchs + 1);
|
||||
if (len < sizeof(struct fc_logi_s))
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if (!wwn_is_equal(plogi->port_name, port_name))
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if (!plogi->class3.class_valid)
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if (be16_to_cpu(plogi->class3.rxsz) < (FC_MIN_PDUSZ))
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
return FC_PARSE_OK;
|
||||
default:
|
||||
return FC_PARSE_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
enum fc_parse_status
|
||||
fc_plogi_parse(struct fchs_s *fchs)
|
||||
{
|
||||
@ -421,21 +331,6 @@ fc_prli_rsp_parse(struct fc_prli_s *prli, int len)
|
||||
return FC_PARSE_OK;
|
||||
}
|
||||
|
||||
enum fc_parse_status
|
||||
fc_prli_parse(struct fc_prli_s *prli)
|
||||
{
|
||||
if (prli->parampage.type != FC_TYPE_FCP)
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if (!prli->parampage.imagepair)
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if (!prli->parampage.servparams.initiator)
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
return FC_PARSE_OK;
|
||||
}
|
||||
|
||||
u16
|
||||
fc_logo_build(struct fchs_s *fchs, struct fc_logo_s *logo, u32 d_id, u32 s_id,
|
||||
u16 ox_id, wwn_t port_name)
|
||||
@ -506,84 +401,6 @@ fc_adisc_rsp_parse(struct fc_adisc_s *adisc, int len, wwn_t port_name,
|
||||
return FC_PARSE_OK;
|
||||
}
|
||||
|
||||
enum fc_parse_status
|
||||
fc_adisc_parse(struct fchs_s *fchs, void *pld, u32 host_dap, wwn_t node_name,
|
||||
wwn_t port_name)
|
||||
{
|
||||
struct fc_adisc_s *adisc = (struct fc_adisc_s *) pld;
|
||||
|
||||
if (adisc->els_cmd.els_code != FC_ELS_ACC)
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if ((adisc->nport_id == (host_dap))
|
||||
&& wwn_is_equal(adisc->orig_port_name, port_name)
|
||||
&& wwn_is_equal(adisc->orig_node_name, node_name))
|
||||
return FC_PARSE_OK;
|
||||
|
||||
return FC_PARSE_FAILURE;
|
||||
}
|
||||
|
||||
enum fc_parse_status
|
||||
fc_pdisc_parse(struct fchs_s *fchs, wwn_t node_name, wwn_t port_name)
|
||||
{
|
||||
struct fc_logi_s *pdisc = (struct fc_logi_s *) (fchs + 1);
|
||||
|
||||
if (pdisc->class3.class_valid != 1)
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if ((be16_to_cpu(pdisc->class3.rxsz) <
|
||||
(FC_MIN_PDUSZ - sizeof(struct fchs_s)))
|
||||
|| (pdisc->class3.rxsz == 0))
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if (!wwn_is_equal(pdisc->port_name, port_name))
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
if (!wwn_is_equal(pdisc->node_name, node_name))
|
||||
return FC_PARSE_FAILURE;
|
||||
|
||||
return FC_PARSE_OK;
|
||||
}
|
||||
|
||||
u16
|
||||
fc_abts_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id)
|
||||
{
|
||||
memcpy(fchs, &fc_bls_req_tmpl, sizeof(struct fchs_s));
|
||||
fchs->cat_info = FC_CAT_ABTS;
|
||||
fchs->d_id = (d_id);
|
||||
fchs->s_id = (s_id);
|
||||
fchs->ox_id = cpu_to_be16(ox_id);
|
||||
|
||||
return sizeof(struct fchs_s);
|
||||
}
|
||||
|
||||
enum fc_parse_status
|
||||
fc_abts_rsp_parse(struct fchs_s *fchs, int len)
|
||||
{
|
||||
if ((fchs->cat_info == FC_CAT_BA_ACC)
|
||||
|| (fchs->cat_info == FC_CAT_BA_RJT))
|
||||
return FC_PARSE_OK;
|
||||
|
||||
return FC_PARSE_FAILURE;
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rrq_build(struct fchs_s *fchs, struct fc_rrq_s *rrq, u32 d_id, u32 s_id,
|
||||
u16 ox_id, u16 rrq_oxid)
|
||||
{
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
/*
|
||||
* build rrq payload
|
||||
*/
|
||||
memcpy(rrq, &rrq_tmpl, sizeof(struct fc_rrq_s));
|
||||
rrq->s_id = (s_id);
|
||||
rrq->ox_id = cpu_to_be16(rrq_oxid);
|
||||
rrq->rx_id = FC_RXID_ANY;
|
||||
|
||||
return sizeof(struct fc_rrq_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_logo_acc_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id,
|
||||
__be16 ox_id)
|
||||
@ -658,30 +475,6 @@ fc_logout_params_pages(struct fchs_s *fc_frame, u8 els_code)
|
||||
return num_pages;
|
||||
}
|
||||
|
||||
u16
|
||||
fc_tprlo_acc_build(struct fchs_s *fchs, struct fc_tprlo_acc_s *tprlo_acc,
|
||||
u32 d_id, u32 s_id, __be16 ox_id, int num_pages)
|
||||
{
|
||||
int page;
|
||||
|
||||
fc_els_rsp_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
memset(tprlo_acc, 0, (num_pages * 16) + 4);
|
||||
tprlo_acc->command = FC_ELS_ACC;
|
||||
|
||||
tprlo_acc->page_len = 0x10;
|
||||
tprlo_acc->payload_len = cpu_to_be16((num_pages * 16) + 4);
|
||||
|
||||
for (page = 0; page < num_pages; page++) {
|
||||
tprlo_acc->tprlo_acc_params[page].opa_valid = 0;
|
||||
tprlo_acc->tprlo_acc_params[page].rpa_valid = 0;
|
||||
tprlo_acc->tprlo_acc_params[page].fc4type_csp = FC_TYPE_FCP;
|
||||
tprlo_acc->tprlo_acc_params[page].orig_process_assc = 0;
|
||||
tprlo_acc->tprlo_acc_params[page].resp_process_assc = 0;
|
||||
}
|
||||
return be16_to_cpu(tprlo_acc->payload_len);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_prlo_acc_build(struct fchs_s *fchs, struct fc_prlo_acc_s *prlo_acc, u32 d_id,
|
||||
u32 s_id, __be16 ox_id, int num_pages)
|
||||
@ -706,20 +499,6 @@ fc_prlo_acc_build(struct fchs_s *fchs, struct fc_prlo_acc_s *prlo_acc, u32 d_id,
|
||||
return be16_to_cpu(prlo_acc->payload_len);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rnid_build(struct fchs_s *fchs, struct fc_rnid_cmd_s *rnid, u32 d_id,
|
||||
u32 s_id, u16 ox_id, u32 data_format)
|
||||
{
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
memset(rnid, 0, sizeof(struct fc_rnid_cmd_s));
|
||||
|
||||
rnid->els_cmd.els_code = FC_ELS_RNID;
|
||||
rnid->node_id_data_format = data_format;
|
||||
|
||||
return sizeof(struct fc_rnid_cmd_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rnid_acc_build(struct fchs_s *fchs, struct fc_rnid_acc_s *rnid_acc, u32 d_id,
|
||||
u32 s_id, __be16 ox_id, u32 data_format,
|
||||
@ -748,18 +527,6 @@ fc_rnid_acc_build(struct fchs_s *fchs, struct fc_rnid_acc_s *rnid_acc, u32 d_id,
|
||||
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rpsc_build(struct fchs_s *fchs, struct fc_rpsc_cmd_s *rpsc, u32 d_id,
|
||||
u32 s_id, u16 ox_id)
|
||||
{
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
memset(rpsc, 0, sizeof(struct fc_rpsc_cmd_s));
|
||||
|
||||
rpsc->els_cmd.els_code = FC_ELS_RPSC;
|
||||
return sizeof(struct fc_rpsc_cmd_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rpsc2_build(struct fchs_s *fchs, struct fc_rpsc2_cmd_s *rpsc2, u32 d_id,
|
||||
u32 s_id, u32 *pid_list, u16 npids)
|
||||
@ -801,115 +568,6 @@ fc_rpsc_acc_build(struct fchs_s *fchs, struct fc_rpsc_acc_s *rpsc_acc,
|
||||
return sizeof(struct fc_rpsc_acc_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_pdisc_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id,
|
||||
wwn_t port_name, wwn_t node_name, u16 pdu_size)
|
||||
{
|
||||
struct fc_logi_s *pdisc = (struct fc_logi_s *) (fchs + 1);
|
||||
|
||||
memcpy(pdisc, &plogi_tmpl, sizeof(struct fc_logi_s));
|
||||
|
||||
pdisc->els_cmd.els_code = FC_ELS_PDISC;
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
pdisc->csp.rxsz = pdisc->class3.rxsz = cpu_to_be16(pdu_size);
|
||||
pdisc->port_name = port_name;
|
||||
pdisc->node_name = node_name;
|
||||
|
||||
return sizeof(struct fc_logi_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_pdisc_rsp_parse(struct fchs_s *fchs, int len, wwn_t port_name)
|
||||
{
|
||||
struct fc_logi_s *pdisc = (struct fc_logi_s *) (fchs + 1);
|
||||
|
||||
if (len < sizeof(struct fc_logi_s))
|
||||
return FC_PARSE_LEN_INVAL;
|
||||
|
||||
if (pdisc->els_cmd.els_code != FC_ELS_ACC)
|
||||
return FC_PARSE_ACC_INVAL;
|
||||
|
||||
if (!wwn_is_equal(pdisc->port_name, port_name))
|
||||
return FC_PARSE_PWWN_NOT_EQUAL;
|
||||
|
||||
if (!pdisc->class3.class_valid)
|
||||
return FC_PARSE_NWWN_NOT_EQUAL;
|
||||
|
||||
if (be16_to_cpu(pdisc->class3.rxsz) < (FC_MIN_PDUSZ))
|
||||
return FC_PARSE_RXSZ_INVAL;
|
||||
|
||||
return FC_PARSE_OK;
|
||||
}
|
||||
|
||||
u16
|
||||
fc_prlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id,
|
||||
int num_pages)
|
||||
{
|
||||
struct fc_prlo_s *prlo = (struct fc_prlo_s *) (fchs + 1);
|
||||
int page;
|
||||
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
memset(prlo, 0, (num_pages * 16) + 4);
|
||||
prlo->command = FC_ELS_PRLO;
|
||||
prlo->page_len = 0x10;
|
||||
prlo->payload_len = cpu_to_be16((num_pages * 16) + 4);
|
||||
|
||||
for (page = 0; page < num_pages; page++) {
|
||||
prlo->prlo_params[page].type = FC_TYPE_FCP;
|
||||
prlo->prlo_params[page].opa_valid = 0;
|
||||
prlo->prlo_params[page].rpa_valid = 0;
|
||||
prlo->prlo_params[page].orig_process_assc = 0;
|
||||
prlo->prlo_params[page].resp_process_assc = 0;
|
||||
}
|
||||
|
||||
return be16_to_cpu(prlo->payload_len);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_tprlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id,
|
||||
int num_pages, enum fc_tprlo_type tprlo_type, u32 tpr_id)
|
||||
{
|
||||
struct fc_tprlo_s *tprlo = (struct fc_tprlo_s *) (fchs + 1);
|
||||
int page;
|
||||
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
memset(tprlo, 0, (num_pages * 16) + 4);
|
||||
tprlo->command = FC_ELS_TPRLO;
|
||||
tprlo->page_len = 0x10;
|
||||
tprlo->payload_len = cpu_to_be16((num_pages * 16) + 4);
|
||||
|
||||
for (page = 0; page < num_pages; page++) {
|
||||
tprlo->tprlo_params[page].type = FC_TYPE_FCP;
|
||||
tprlo->tprlo_params[page].opa_valid = 0;
|
||||
tprlo->tprlo_params[page].rpa_valid = 0;
|
||||
tprlo->tprlo_params[page].orig_process_assc = 0;
|
||||
tprlo->tprlo_params[page].resp_process_assc = 0;
|
||||
if (tprlo_type == FC_GLOBAL_LOGO) {
|
||||
tprlo->tprlo_params[page].global_process_logout = 1;
|
||||
} else if (tprlo_type == FC_TPR_LOGO) {
|
||||
tprlo->tprlo_params[page].tpo_nport_valid = 1;
|
||||
tprlo->tprlo_params[page].tpo_nport_id = (tpr_id);
|
||||
}
|
||||
}
|
||||
|
||||
return be16_to_cpu(tprlo->payload_len);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_ba_rjt_build(struct fchs_s *fchs, u32 d_id, u32 s_id, __be16 ox_id,
|
||||
u32 reason_code, u32 reason_expl)
|
||||
{
|
||||
struct fc_ba_rjt_s *ba_rjt = (struct fc_ba_rjt_s *) (fchs + 1);
|
||||
|
||||
fc_bls_rsp_build(fchs, d_id, s_id, ox_id);
|
||||
|
||||
fchs->cat_info = FC_CAT_BA_RJT;
|
||||
ba_rjt->reason_code = reason_code;
|
||||
ba_rjt->reason_expl = reason_expl;
|
||||
return sizeof(struct fc_ba_rjt_s);
|
||||
}
|
||||
|
||||
static void
|
||||
fc_gs_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code)
|
||||
{
|
||||
@ -973,35 +631,6 @@ fc_gpnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id,
|
||||
return sizeof(fcgs_gpnid_req_t) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_gnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id,
|
||||
u32 port_id)
|
||||
{
|
||||
struct ct_hdr_s *cthdr = (struct ct_hdr_s *) pyld;
|
||||
fcgs_gnnid_req_t *gnnid = (fcgs_gnnid_req_t *) (cthdr + 1);
|
||||
u32 d_id = bfa_hton3b(FC_NAME_SERVER);
|
||||
|
||||
fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);
|
||||
fc_gs_cthdr_build(cthdr, s_id, GS_GNN_ID);
|
||||
|
||||
memset(gnnid, 0, sizeof(fcgs_gnnid_req_t));
|
||||
gnnid->dap = port_id;
|
||||
return sizeof(fcgs_gnnid_req_t) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_ct_rsp_parse(struct ct_hdr_s *cthdr)
|
||||
{
|
||||
if (be16_to_cpu(cthdr->cmd_rsp_code) != CT_RSP_ACCEPT) {
|
||||
if (cthdr->reason_code == CT_RSN_LOGICAL_BUSY)
|
||||
return FC_PARSE_BUSY;
|
||||
else
|
||||
return FC_PARSE_FAILURE;
|
||||
}
|
||||
|
||||
return FC_PARSE_OK;
|
||||
}
|
||||
|
||||
u16
|
||||
fc_gs_rjt_build(struct fchs_s *fchs, struct ct_hdr_s *cthdr,
|
||||
u32 d_id, u32 s_id, u16 ox_id, u8 reason_code,
|
||||
@ -1034,26 +663,6 @@ fc_scr_build(struct fchs_s *fchs, struct fc_scr_s *scr,
|
||||
return sizeof(struct fc_scr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rscn_build(struct fchs_s *fchs, struct fc_rscn_pl_s *rscn,
|
||||
u32 s_id, u16 ox_id)
|
||||
{
|
||||
u32 d_id = bfa_hton3b(FC_FABRIC_CONTROLLER);
|
||||
u16 payldlen;
|
||||
|
||||
fc_els_req_build(fchs, d_id, s_id, ox_id);
|
||||
rscn->command = FC_ELS_RSCN;
|
||||
rscn->pagelen = sizeof(rscn->event[0]);
|
||||
|
||||
payldlen = sizeof(u32) + rscn->pagelen;
|
||||
rscn->payldlen = cpu_to_be16(payldlen);
|
||||
|
||||
rscn->event[0].format = FC_RSCN_FORMAT_PORTID;
|
||||
rscn->event[0].portid = s_id;
|
||||
|
||||
return struct_size(rscn, event, 1);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rftid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id,
|
||||
enum bfa_lport_role roles)
|
||||
@ -1078,26 +687,6 @@ fc_rftid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id,
|
||||
return sizeof(struct fcgs_rftid_req_s) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rftid_build_sol(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id,
|
||||
u8 *fc4_bitmap, u32 bitmap_size)
|
||||
{
|
||||
struct ct_hdr_s *cthdr = (struct ct_hdr_s *) pyld;
|
||||
struct fcgs_rftid_req_s *rftid = (struct fcgs_rftid_req_s *)(cthdr + 1);
|
||||
u32 d_id = bfa_hton3b(FC_NAME_SERVER);
|
||||
|
||||
fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);
|
||||
fc_gs_cthdr_build(cthdr, s_id, GS_RFT_ID);
|
||||
|
||||
memset(rftid, 0, sizeof(struct fcgs_rftid_req_s));
|
||||
|
||||
rftid->dap = s_id;
|
||||
memcpy((void *)rftid->fc4_type, (void *)fc4_bitmap,
|
||||
(bitmap_size < 32 ? bitmap_size : 32));
|
||||
|
||||
return sizeof(struct fcgs_rftid_req_s) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rffid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id,
|
||||
u8 fc4_type, u8 fc4_ftrs)
|
||||
@ -1181,24 +770,6 @@ fc_gid_ft_build(struct fchs_s *fchs, void *pyld, u32 s_id, u8 fc4_type)
|
||||
return sizeof(struct fcgs_gidft_req_s) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rpnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id,
|
||||
wwn_t port_name)
|
||||
{
|
||||
struct ct_hdr_s *cthdr = (struct ct_hdr_s *) pyld;
|
||||
struct fcgs_rpnid_req_s *rpnid = (struct fcgs_rpnid_req_s *)(cthdr + 1);
|
||||
u32 d_id = bfa_hton3b(FC_NAME_SERVER);
|
||||
|
||||
fc_gs_fchdr_build(fchs, d_id, s_id, 0);
|
||||
fc_gs_cthdr_build(cthdr, s_id, GS_RPN_ID);
|
||||
|
||||
memset(rpnid, 0, sizeof(struct fcgs_rpnid_req_s));
|
||||
rpnid->port_id = port_id;
|
||||
rpnid->port_name = port_name;
|
||||
|
||||
return sizeof(struct fcgs_rpnid_req_s) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id,
|
||||
wwn_t node_name)
|
||||
@ -1217,59 +788,6 @@ fc_rnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id,
|
||||
return sizeof(struct fcgs_rnnid_req_s) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rcsid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id,
|
||||
u32 cos)
|
||||
{
|
||||
struct ct_hdr_s *cthdr = (struct ct_hdr_s *) pyld;
|
||||
struct fcgs_rcsid_req_s *rcsid =
|
||||
(struct fcgs_rcsid_req_s *) (cthdr + 1);
|
||||
u32 d_id = bfa_hton3b(FC_NAME_SERVER);
|
||||
|
||||
fc_gs_fchdr_build(fchs, d_id, s_id, 0);
|
||||
fc_gs_cthdr_build(cthdr, s_id, GS_RCS_ID);
|
||||
|
||||
memset(rcsid, 0, sizeof(struct fcgs_rcsid_req_s));
|
||||
rcsid->port_id = port_id;
|
||||
rcsid->cos = cos;
|
||||
|
||||
return sizeof(struct fcgs_rcsid_req_s) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_rptid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id,
|
||||
u8 port_type)
|
||||
{
|
||||
struct ct_hdr_s *cthdr = (struct ct_hdr_s *) pyld;
|
||||
struct fcgs_rptid_req_s *rptid = (struct fcgs_rptid_req_s *)(cthdr + 1);
|
||||
u32 d_id = bfa_hton3b(FC_NAME_SERVER);
|
||||
|
||||
fc_gs_fchdr_build(fchs, d_id, s_id, 0);
|
||||
fc_gs_cthdr_build(cthdr, s_id, GS_RPT_ID);
|
||||
|
||||
memset(rptid, 0, sizeof(struct fcgs_rptid_req_s));
|
||||
rptid->port_id = port_id;
|
||||
rptid->port_type = port_type;
|
||||
|
||||
return sizeof(struct fcgs_rptid_req_s) + sizeof(struct ct_hdr_s);
|
||||
}
|
||||
|
||||
u16
|
||||
fc_ganxt_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id)
|
||||
{
|
||||
struct ct_hdr_s *cthdr = (struct ct_hdr_s *) pyld;
|
||||
struct fcgs_ganxt_req_s *ganxt = (struct fcgs_ganxt_req_s *)(cthdr + 1);
|
||||
u32 d_id = bfa_hton3b(FC_NAME_SERVER);
|
||||
|
||||
fc_gs_fchdr_build(fchs, d_id, s_id, 0);
|
||||
fc_gs_cthdr_build(cthdr, s_id, GS_GA_NXT);
|
||||
|
||||
memset(ganxt, 0, sizeof(struct fcgs_ganxt_req_s));
|
||||
ganxt->port_id = port_id;
|
||||
|
||||
return sizeof(struct ct_hdr_s) + sizeof(struct fcgs_ganxt_req_s);
|
||||
}
|
||||
|
||||
/*
|
||||
* Builds fc hdr and ct hdr for FDMI requests.
|
||||
*/
|
||||
|
@ -127,15 +127,6 @@ struct fc_templates_s {
|
||||
|
||||
void fcbuild_init(void);
|
||||
|
||||
u16 fc_flogi_build(struct fchs_s *fchs, struct fc_logi_s *flogi,
|
||||
u32 s_id, u16 ox_id, wwn_t port_name, wwn_t node_name,
|
||||
u16 pdu_size, u8 set_npiv, u8 set_auth,
|
||||
u16 local_bb_credits);
|
||||
|
||||
u16 fc_fdisc_build(struct fchs_s *buf, struct fc_logi_s *flogi, u32 s_id,
|
||||
u16 ox_id, wwn_t port_name, wwn_t node_name,
|
||||
u16 pdu_size);
|
||||
|
||||
u16 fc_flogi_acc_build(struct fchs_s *fchs, struct fc_logi_s *flogi,
|
||||
u32 s_id, __be16 ox_id,
|
||||
wwn_t port_name, wwn_t node_name,
|
||||
@ -148,14 +139,6 @@ u16 fc_plogi_build(struct fchs_s *fchs, void *pld, u32 d_id,
|
||||
|
||||
enum fc_parse_status fc_plogi_parse(struct fchs_s *fchs);
|
||||
|
||||
u16 fc_abts_build(struct fchs_s *buf, u32 d_id, u32 s_id,
|
||||
u16 ox_id);
|
||||
|
||||
enum fc_parse_status fc_abts_rsp_parse(struct fchs_s *buf, int len);
|
||||
|
||||
u16 fc_rrq_build(struct fchs_s *buf, struct fc_rrq_s *rrq, u32 d_id,
|
||||
u32 s_id, u16 ox_id, u16 rrq_oxid);
|
||||
|
||||
u16 fc_rspnid_build(struct fchs_s *fchs, void *pld, u32 s_id,
|
||||
u16 ox_id, u8 *name);
|
||||
u16 fc_rsnn_nn_build(struct fchs_s *fchs, void *pld, u32 s_id,
|
||||
@ -164,10 +147,6 @@ u16 fc_rsnn_nn_build(struct fchs_s *fchs, void *pld, u32 s_id,
|
||||
u16 fc_rftid_build(struct fchs_s *fchs, void *pld, u32 s_id,
|
||||
u16 ox_id, enum bfa_lport_role role);
|
||||
|
||||
u16 fc_rftid_build_sol(struct fchs_s *fchs, void *pyld, u32 s_id,
|
||||
u16 ox_id, u8 *fc4_bitmap,
|
||||
u32 bitmap_size);
|
||||
|
||||
u16 fc_rffid_build(struct fchs_s *fchs, void *pyld, u32 s_id,
|
||||
u16 ox_id, u8 fc4_type, u8 fc4_ftrs);
|
||||
|
||||
@ -193,9 +172,6 @@ u16 fc_adisc_build(struct fchs_s *fchs, struct fc_adisc_s *adisc,
|
||||
u32 d_id, u32 s_id, __be16 ox_id, wwn_t port_name,
|
||||
wwn_t node_name);
|
||||
|
||||
enum fc_parse_status fc_adisc_parse(struct fchs_s *fchs, void *pld,
|
||||
u32 host_dap, wwn_t node_name, wwn_t port_name);
|
||||
|
||||
enum fc_parse_status fc_adisc_rsp_parse(struct fc_adisc_s *adisc, int len,
|
||||
wwn_t port_name, wwn_t node_name);
|
||||
|
||||
@ -216,10 +192,6 @@ u16 fc_prli_acc_build(struct fchs_s *fchs, void *pld, u32 d_id,
|
||||
u32 s_id, __be16 ox_id,
|
||||
enum bfa_lport_role role);
|
||||
|
||||
u16 fc_rnid_build(struct fchs_s *fchs, struct fc_rnid_cmd_s *rnid,
|
||||
u32 d_id, u32 s_id, u16 ox_id,
|
||||
u32 data_format);
|
||||
|
||||
u16 fc_rnid_acc_build(struct fchs_s *fchs,
|
||||
struct fc_rnid_acc_s *rnid_acc, u32 d_id, u32 s_id,
|
||||
__be16 ox_id, u32 data_format,
|
||||
@ -228,29 +200,15 @@ u16 fc_rnid_acc_build(struct fchs_s *fchs,
|
||||
|
||||
u16 fc_rpsc2_build(struct fchs_s *fchs, struct fc_rpsc2_cmd_s *rps2c,
|
||||
u32 d_id, u32 s_id, u32 *pid_list, u16 npids);
|
||||
u16 fc_rpsc_build(struct fchs_s *fchs, struct fc_rpsc_cmd_s *rpsc,
|
||||
u32 d_id, u32 s_id, u16 ox_id);
|
||||
u16 fc_rpsc_acc_build(struct fchs_s *fchs,
|
||||
struct fc_rpsc_acc_s *rpsc_acc, u32 d_id, u32 s_id,
|
||||
__be16 ox_id, struct fc_rpsc_speed_info_s *oper_speed);
|
||||
u16 fc_gid_ft_build(struct fchs_s *fchs, void *pld, u32 s_id,
|
||||
u8 fc4_type);
|
||||
|
||||
u16 fc_rpnid_build(struct fchs_s *fchs, void *pyld, u32 s_id,
|
||||
u32 port_id, wwn_t port_name);
|
||||
|
||||
u16 fc_rnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id,
|
||||
u32 port_id, wwn_t node_name);
|
||||
|
||||
u16 fc_rcsid_build(struct fchs_s *fchs, void *pyld, u32 s_id,
|
||||
u32 port_id, u32 cos);
|
||||
|
||||
u16 fc_rptid_build(struct fchs_s *fchs, void *pyld, u32 s_id,
|
||||
u32 port_id, u8 port_type);
|
||||
|
||||
u16 fc_ganxt_build(struct fchs_s *fchs, void *pyld, u32 s_id,
|
||||
u32 port_id);
|
||||
|
||||
u16 fc_logo_build(struct fchs_s *fchs, struct fc_logo_s *logo, u32 d_id,
|
||||
u32 s_id, u16 ox_id, wwn_t port_name);
|
||||
|
||||
@ -267,46 +225,16 @@ void fc_get_fc4type_bitmask(u8 fc4_type, u8 *bit_mask);
|
||||
void fc_els_req_build(struct fchs_s *fchs, u32 d_id, u32 s_id,
|
||||
__be16 ox_id);
|
||||
|
||||
enum fc_parse_status fc_plogi_rsp_parse(struct fchs_s *fchs, int len,
|
||||
wwn_t port_name);
|
||||
|
||||
enum fc_parse_status fc_prli_parse(struct fc_prli_s *prli);
|
||||
|
||||
enum fc_parse_status fc_pdisc_parse(struct fchs_s *fchs, wwn_t node_name,
|
||||
wwn_t port_name);
|
||||
|
||||
u16 fc_ba_acc_build(struct fchs_s *fchs, struct fc_ba_acc_s *ba_acc, u32 d_id,
|
||||
u32 s_id, __be16 ox_id, u16 rx_id);
|
||||
|
||||
int fc_logout_params_pages(struct fchs_s *fc_frame, u8 els_code);
|
||||
|
||||
u16 fc_tprlo_acc_build(struct fchs_s *fchs, struct fc_tprlo_acc_s *tprlo_acc,
|
||||
u32 d_id, u32 s_id, __be16 ox_id, int num_pages);
|
||||
|
||||
u16 fc_prlo_acc_build(struct fchs_s *fchs, struct fc_prlo_acc_s *prlo_acc,
|
||||
u32 d_id, u32 s_id, __be16 ox_id, int num_pages);
|
||||
|
||||
u16 fc_pdisc_build(struct fchs_s *fchs, u32 d_id, u32 s_id,
|
||||
u16 ox_id, wwn_t port_name, wwn_t node_name,
|
||||
u16 pdu_size);
|
||||
|
||||
u16 fc_pdisc_rsp_parse(struct fchs_s *fchs, int len, wwn_t port_name);
|
||||
|
||||
u16 fc_prlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id,
|
||||
u16 ox_id, int num_pages);
|
||||
|
||||
u16 fc_tprlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id,
|
||||
u16 ox_id, int num_pages, enum fc_tprlo_type tprlo_type,
|
||||
u32 tpr_id);
|
||||
|
||||
u16 fc_ba_rjt_build(struct fchs_s *fchs, u32 d_id, u32 s_id,
|
||||
__be16 ox_id, u32 reason_code, u32 reason_expl);
|
||||
|
||||
u16 fc_gnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id,
|
||||
u32 port_id);
|
||||
|
||||
u16 fc_ct_rsp_parse(struct ct_hdr_s *cthdr);
|
||||
|
||||
u16 fc_rscn_build(struct fchs_s *fchs, struct fc_rscn_pl_s *rscn, u32 s_id,
|
||||
u16 ox_id);
|
||||
#endif
|
||||
|
@ -242,7 +242,7 @@ lpfc_nvme_remoteport_delete(struct nvme_fc_remote_port *remoteport)
|
||||
* @phba: pointer to lpfc hba data structure.
|
||||
* @axchg: pointer to exchange context for the NVME LS request
|
||||
*
|
||||
* This routine is used for processing an asychronously received NVME LS
|
||||
* This routine is used for processing an asynchronously received NVME LS
|
||||
* request. Any remaining validation is done and the LS is then forwarded
|
||||
* to the nvme-fc transport via nvme_fc_rcv_ls_req().
|
||||
*
|
||||
|
@ -2142,7 +2142,7 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba)
|
||||
* @phba: pointer to lpfc hba data structure.
|
||||
* @axchg: pointer to exchange context for the NVME LS request
|
||||
*
|
||||
* This routine is used for processing an asychronously received NVME LS
|
||||
* This routine is used for processing an asynchronously received NVME LS
|
||||
* request. Any remaining validation is done and the LS is then forwarded
|
||||
* to the nvmet-fc transport via nvmet_fc_rcv_ls_req().
|
||||
*
|
||||
|
@ -8907,8 +8907,11 @@ megasas_aen_polling(struct work_struct *work)
|
||||
(ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),
|
||||
(ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL),
|
||||
0);
|
||||
if (sdev1)
|
||||
if (sdev1) {
|
||||
mutex_unlock(&instance->reset_mutex);
|
||||
megasas_remove_scsi_device(sdev1);
|
||||
mutex_lock(&instance->reset_mutex);
|
||||
}
|
||||
|
||||
event_type = SCAN_VD_CHANNEL;
|
||||
break;
|
||||
|
@ -116,12 +116,12 @@ struct device_reg {
|
||||
uint16_t id_h; /* ID high */
|
||||
uint16_t cfg_0; /* Configuration 0 */
|
||||
#define ISP_CFG0_HWMSK 0x000f /* Hardware revision mask */
|
||||
#define ISP_CFG0_1020 BIT_0 /* ISP1020 */
|
||||
#define ISP_CFG0_1020A BIT_1 /* ISP1020A */
|
||||
#define ISP_CFG0_1040 BIT_2 /* ISP1040 */
|
||||
#define ISP_CFG0_1040A BIT_3 /* ISP1040A */
|
||||
#define ISP_CFG0_1040B BIT_4 /* ISP1040B */
|
||||
#define ISP_CFG0_1040C BIT_5 /* ISP1040C */
|
||||
#define ISP_CFG0_1020 1 /* ISP1020 */
|
||||
#define ISP_CFG0_1020A 2 /* ISP1020A */
|
||||
#define ISP_CFG0_1040 3 /* ISP1040 */
|
||||
#define ISP_CFG0_1040A 4 /* ISP1040A */
|
||||
#define ISP_CFG0_1040B 5 /* ISP1040B */
|
||||
#define ISP_CFG0_1040C 6 /* ISP1040C */
|
||||
uint16_t cfg_1; /* Configuration 1 */
|
||||
#define ISP_CFG1_F128 BIT_6 /* 128-byte FIFO threshold */
|
||||
#define ISP_CFG1_F64 BIT_4|BIT_5 /* 128-byte FIFO threshold */
|
||||
|
@ -361,7 +361,7 @@ static const struct genl_multicast_group tcmu_mcgrps[] = {
|
||||
[TCMU_MCGRP_CONFIG] = { .name = "config", },
|
||||
};
|
||||
|
||||
static struct nla_policy tcmu_attr_policy[TCMU_ATTR_MAX+1] = {
|
||||
static const struct nla_policy tcmu_attr_policy[TCMU_ATTR_MAX + 1] = {
|
||||
[TCMU_ATTR_DEVICE] = { .type = NLA_STRING },
|
||||
[TCMU_ATTR_MINOR] = { .type = NLA_U32 },
|
||||
[TCMU_ATTR_CMD_STATUS] = { .type = NLA_S32 },
|
||||
@ -2430,7 +2430,7 @@ enum {
|
||||
Opt_cmd_ring_size_mb, Opt_err,
|
||||
};
|
||||
|
||||
static match_table_t tokens = {
|
||||
static const match_table_t tokens = {
|
||||
{Opt_dev_config, "dev_config=%s"},
|
||||
{Opt_dev_size, "dev_size=%s"},
|
||||
{Opt_hw_block_size, "hw_block_size=%d"},
|
||||
|
@ -170,7 +170,7 @@ static int ufs_bsg_request(struct bsg_job *job)
|
||||
break;
|
||||
case UPIU_TRANSACTION_UIC_CMD:
|
||||
memcpy(&uc, &bsg_request->upiu_req.uc, UIC_CMD_SIZE);
|
||||
ret = ufshcd_send_uic_cmd(hba, &uc);
|
||||
ret = ufshcd_send_bsg_uic_cmd(hba, &uc);
|
||||
if (ret)
|
||||
dev_err(hba->dev, "send uic cmd: error code %d\n", ret);
|
||||
|
||||
|
@ -84,6 +84,7 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
|
||||
u8 **buf, bool ascii);
|
||||
|
||||
int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd);
|
||||
int ufshcd_send_bsg_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd);
|
||||
|
||||
int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba,
|
||||
struct utp_upiu_req *req_upiu,
|
||||
|
@ -4319,6 +4319,42 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* ufshcd_send_bsg_uic_cmd - Send UIC commands requested via BSG layer and retrieve the result
|
||||
* @hba: per adapter instance
|
||||
* @uic_cmd: UIC command
|
||||
*
|
||||
* Return: 0 only if success.
|
||||
*/
|
||||
int ufshcd_send_bsg_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (hba->quirks & UFSHCD_QUIRK_BROKEN_UIC_CMD)
|
||||
return 0;
|
||||
|
||||
ufshcd_hold(hba);
|
||||
|
||||
if (uic_cmd->argument1 == UIC_ARG_MIB(PA_PWRMODE) &&
|
||||
uic_cmd->command == UIC_CMD_DME_SET) {
|
||||
ret = ufshcd_uic_pwr_ctrl(hba, uic_cmd);
|
||||
goto out;
|
||||
}
|
||||
|
||||
mutex_lock(&hba->uic_cmd_mutex);
|
||||
ufshcd_add_delay_before_dme_cmd(hba);
|
||||
|
||||
ret = __ufshcd_send_uic_cmd(hba, uic_cmd);
|
||||
if (!ret)
|
||||
ret = ufshcd_wait_for_uic_cmd(hba, uic_cmd);
|
||||
|
||||
mutex_unlock(&hba->uic_cmd_mutex);
|
||||
|
||||
out:
|
||||
ufshcd_release(hba);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* ufshcd_uic_change_pwr_mode - Perform the UIC power mode chage
|
||||
* using DME_SET primitives.
|
||||
@ -10195,6 +10231,7 @@ void ufshcd_remove(struct ufs_hba *hba)
|
||||
ufs_hwmon_remove(hba);
|
||||
ufs_bsg_remove(hba);
|
||||
ufs_sysfs_remove_nodes(hba->dev);
|
||||
cancel_delayed_work_sync(&hba->ufs_rtc_update_work);
|
||||
blk_mq_destroy_queue(hba->tmf_queue);
|
||||
blk_put_queue(hba->tmf_queue);
|
||||
blk_mq_free_tag_set(&hba->tmf_tag_set);
|
||||
|
@ -307,9 +307,7 @@ static int cdns_ufs_pltfrm_probe(struct platform_device *pdev)
|
||||
*/
|
||||
static void cdns_ufs_pltfrm_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {
|
||||
@ -321,7 +319,7 @@ static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {
|
||||
|
||||
static struct platform_driver cdns_ufs_pltfrm_driver = {
|
||||
.probe = cdns_ufs_pltfrm_probe,
|
||||
.remove_new = cdns_ufs_pltfrm_remove,
|
||||
.remove = cdns_ufs_pltfrm_remove,
|
||||
.driver = {
|
||||
.name = "cdns-ufshcd",
|
||||
.pm = &cdns_ufs_dev_pm_ops,
|
||||
|
@ -76,10 +76,7 @@ static int tc_dwc_g210_pltfm_probe(struct platform_device *pdev)
|
||||
*/
|
||||
static void tc_dwc_g210_pltfm_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
|
||||
pm_runtime_get_sync(&(pdev)->dev);
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {
|
||||
@ -89,7 +86,7 @@ static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {
|
||||
|
||||
static struct platform_driver tc_dwc_g210_pltfm_driver = {
|
||||
.probe = tc_dwc_g210_pltfm_probe,
|
||||
.remove_new = tc_dwc_g210_pltfm_remove,
|
||||
.remove = tc_dwc_g210_pltfm_remove,
|
||||
.driver = {
|
||||
.name = "tc-dwc-g210-pltfm",
|
||||
.pm = &tc_dwc_g210_pltfm_pm_ops,
|
||||
|
@ -83,7 +83,7 @@ MODULE_DEVICE_TABLE(of, ti_j721e_ufs_of_match);
|
||||
|
||||
static struct platform_driver ti_j721e_ufs_driver = {
|
||||
.probe = ti_j721e_ufs_probe,
|
||||
.remove_new = ti_j721e_ufs_remove,
|
||||
.remove = ti_j721e_ufs_remove,
|
||||
.driver = {
|
||||
.name = "ti-j721e-ufs",
|
||||
.of_match_table = ti_j721e_ufs_of_match,
|
||||
|
@ -1992,8 +1992,7 @@ static void exynos_ufs_remove(struct platform_device *pdev)
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
struct exynos_ufs *ufs = ufshcd_get_variant(hba);
|
||||
|
||||
pm_runtime_get_sync(&(pdev)->dev);
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
|
||||
phy_power_off(ufs->phy);
|
||||
phy_exit(ufs->phy);
|
||||
@ -2166,7 +2165,7 @@ static const struct dev_pm_ops exynos_ufs_pm_ops = {
|
||||
|
||||
static struct platform_driver exynos_ufs_pltform = {
|
||||
.probe = exynos_ufs_probe,
|
||||
.remove_new = exynos_ufs_remove,
|
||||
.remove = exynos_ufs_remove,
|
||||
.driver = {
|
||||
.name = "exynos-ufshc",
|
||||
.pm = &exynos_ufs_pm_ops,
|
||||
|
@ -576,9 +576,7 @@ static int ufs_hisi_probe(struct platform_device *pdev)
|
||||
|
||||
static void ufs_hisi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops ufs_hisi_pm_ops = {
|
||||
@ -590,7 +588,7 @@ static const struct dev_pm_ops ufs_hisi_pm_ops = {
|
||||
|
||||
static struct platform_driver ufs_hisi_pltform = {
|
||||
.probe = ufs_hisi_probe,
|
||||
.remove_new = ufs_hisi_remove,
|
||||
.remove = ufs_hisi_remove,
|
||||
.driver = {
|
||||
.name = "ufshcd-hisi",
|
||||
.pm = &ufs_hisi_pm_ops,
|
||||
|
@ -1879,10 +1879,7 @@ static int ufs_mtk_probe(struct platform_device *pdev)
|
||||
*/
|
||||
static void ufs_mtk_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
|
||||
pm_runtime_get_sync(&(pdev)->dev);
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
@ -1962,7 +1959,7 @@ static const struct dev_pm_ops ufs_mtk_pm_ops = {
|
||||
|
||||
static struct platform_driver ufs_mtk_pltform = {
|
||||
.probe = ufs_mtk_probe,
|
||||
.remove_new = ufs_mtk_remove,
|
||||
.remove = ufs_mtk_remove,
|
||||
.driver = {
|
||||
.name = "ufshcd-mtk",
|
||||
.pm = &ufs_mtk_pm_ops,
|
||||
|
@ -1861,10 +1861,11 @@ static int ufs_qcom_probe(struct platform_device *pdev)
|
||||
static void ufs_qcom_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
|
||||
|
||||
pm_runtime_get_sync(&(pdev)->dev);
|
||||
ufshcd_remove(hba);
|
||||
platform_device_msi_free_irqs_all(hba->dev);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
if (host->esi_enabled)
|
||||
platform_device_msi_free_irqs_all(hba->dev);
|
||||
}
|
||||
|
||||
static const struct of_device_id ufs_qcom_of_match[] __maybe_unused = {
|
||||
@ -1897,7 +1898,7 @@ static const struct dev_pm_ops ufs_qcom_pm_ops = {
|
||||
|
||||
static struct platform_driver ufs_qcom_pltform = {
|
||||
.probe = ufs_qcom_probe,
|
||||
.remove_new = ufs_qcom_remove,
|
||||
.remove = ufs_qcom_remove,
|
||||
.driver = {
|
||||
.name = "ufshcd-qcom",
|
||||
.pm = &ufs_qcom_pm_ops,
|
||||
|
@ -397,14 +397,12 @@ static int ufs_renesas_probe(struct platform_device *pdev)
|
||||
|
||||
static void ufs_renesas_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
}
|
||||
|
||||
static struct platform_driver ufs_renesas_platform = {
|
||||
.probe = ufs_renesas_probe,
|
||||
.remove_new = ufs_renesas_remove,
|
||||
.remove = ufs_renesas_remove,
|
||||
.driver = {
|
||||
.name = "ufshcd-renesas",
|
||||
.of_match_table = of_match_ptr(ufs_renesas_of_match),
|
||||
|
@ -427,10 +427,7 @@ static int ufs_sprd_probe(struct platform_device *pdev)
|
||||
|
||||
static void ufs_sprd_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
|
||||
pm_runtime_get_sync(&(pdev)->dev);
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_pltfrm_remove(pdev);
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops ufs_sprd_pm_ops = {
|
||||
@ -442,7 +439,7 @@ static const struct dev_pm_ops ufs_sprd_pm_ops = {
|
||||
|
||||
static struct platform_driver ufs_sprd_pltform = {
|
||||
.probe = ufs_sprd_probe,
|
||||
.remove_new = ufs_sprd_remove,
|
||||
.remove = ufs_sprd_remove,
|
||||
.driver = {
|
||||
.name = "ufshcd-sprd",
|
||||
.pm = &ufs_sprd_pm_ops,
|
||||
|
@ -524,6 +524,22 @@ int ufshcd_pltfrm_init(struct platform_device *pdev,
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ufshcd_pltfrm_init);
|
||||
|
||||
/**
|
||||
* ufshcd_pltfrm_remove - Remove ufshcd platform
|
||||
* @pdev: pointer to Platform device handle
|
||||
*/
|
||||
void ufshcd_pltfrm_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ufs_hba *hba = platform_get_drvdata(pdev);
|
||||
|
||||
pm_runtime_get_sync(&pdev->dev);
|
||||
ufshcd_remove(hba);
|
||||
ufshcd_dealloc_host(hba);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
pm_runtime_put_noidle(&pdev->dev);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ufshcd_pltfrm_remove);
|
||||
|
||||
MODULE_AUTHOR("Santosh Yaragnavi <santosh.sy@samsung.com>");
|
||||
MODULE_AUTHOR("Vinayak Holikatti <h.vinayak@samsung.com>");
|
||||
MODULE_DESCRIPTION("UFS host controller Platform bus based glue driver");
|
||||
|
@ -31,6 +31,7 @@ int ufshcd_negotiate_pwr_params(const struct ufs_host_params *host_params,
|
||||
void ufshcd_init_host_params(struct ufs_host_params *host_params);
|
||||
int ufshcd_pltfrm_init(struct platform_device *pdev,
|
||||
const struct ufs_hba_variant_ops *vops);
|
||||
void ufshcd_pltfrm_remove(struct platform_device *pdev);
|
||||
int ufshcd_populate_vreg(struct device *dev, const char *name,
|
||||
struct ufs_vreg **out_vreg, bool skip_current);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user