Skip to content

L
linux
Commit de6d7547 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Martin K. Petersen
Browse files
Options

scsi: pm80xx: Switch back to original libsas event notifiers 

libsas event notifiers required an extension where gfp_t flags must be
explicitly passed. For bisectability, a temporary _gfp() variant of such
functions were added. All call sites then got converted use the _gfp()
variants and explicitly pass GFP context. Having no callers left, the
original libsas notifiers were then modified to accept gfp_t flags by
default.

Switch back to the original libas API, while still passing GFP context.
The libsas _gfp() variants will be removed afterwards.

Link: https://lore.kernel.org/r/20210118100955.1761652-16-a.darwish@linutronix.de
Cc: Jack Wang <jinpu.wang@cloud.ionos.com>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarAhmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 093289e4
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 41 deletions
drivers/scsi/pm8001/pm8001_hwi.c
View file @ de6d7547
...@@ -3185,7 +3185,7 @@ void pm8001_bytes_dmaed(struct pm8001_hba_info *pm8001_ha, int i) ...@@ -3185,7 +3185,7 @@ void pm8001_bytes_dmaed(struct pm8001_hba_info *pm8001_ha, int i)
pm8001_dbg(pm8001_ha, MSG, "phy %d byte dmaded.\n", i); pm8001_dbg(pm8001_ha, MSG, "phy %d byte dmaded.\n", i);
sas_phy->frame_rcvd_size = phy->frame_rcvd_size; sas_phy->frame_rcvd_size = phy->frame_rcvd_size;
sas_notify_port_event_gfp(sas_phy, PORTE_BYTES_DMAED, GFP_ATOMIC); sas_notify_port_event(sas_phy, PORTE_BYTES_DMAED, GFP_ATOMIC);
} }
/* Get the link rate speed */ /* Get the link rate speed */
...@@ -3342,7 +3342,7 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3342,7 +3342,7 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb)
else if (phy->identify.device_type != SAS_PHY_UNUSED) else if (phy->identify.device_type != SAS_PHY_UNUSED)
phy->identify.target_port_protocols = SAS_PROTOCOL_SMP; phy->identify.target_port_protocols = SAS_PROTOCOL_SMP;
phy->sas_phy.oob_mode = SAS_OOB_MODE; phy->sas_phy.oob_mode = SAS_OOB_MODE;
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC); sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC);
spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags); spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags);
memcpy(phy->frame_rcvd, &pPayload->sas_identify, memcpy(phy->frame_rcvd, &pPayload->sas_identify,
sizeof(struct sas_identify_frame)-4); sizeof(struct sas_identify_frame)-4);
...@@ -3385,7 +3385,7 @@ hw_event_sata_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3385,7 +3385,7 @@ hw_event_sata_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb)
phy->phy_type |= PORT_TYPE_SATA; phy->phy_type |= PORT_TYPE_SATA;
phy->phy_attached = 1; phy->phy_attached = 1;
phy->sas_phy.oob_mode = SATA_OOB_MODE; phy->sas_phy.oob_mode = SATA_OOB_MODE;
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC); sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC);
spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags); spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags);
memcpy(phy->frame_rcvd, ((u8 *)&pPayload->sata_fis - 4), memcpy(phy->frame_rcvd, ((u8 *)&pPayload->sata_fis - 4),
sizeof(struct dev_to_host_fis)); sizeof(struct dev_to_host_fis));
...@@ -3732,12 +3732,12 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3732,12 +3732,12 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
break; break;
case HW_EVENT_SATA_SPINUP_HOLD: case HW_EVENT_SATA_SPINUP_HOLD:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_SATA_SPINUP_HOLD\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_SATA_SPINUP_HOLD\n");
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_SPINUP_HOLD, sas_notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PHY_DOWN: case HW_EVENT_PHY_DOWN:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_DOWN\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_DOWN\n");
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL, sas_notify_phy_event(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL,
GFP_ATOMIC); GFP_ATOMIC);
phy->phy_attached = 0; phy->phy_attached = 0;
phy->phy_state = 0; phy->phy_state = 0;
...@@ -3747,7 +3747,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3747,7 +3747,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PORT_INVALID\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PORT_INVALID\n");
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
/* the broadcast change primitive received, tell the LIBSAS this event /* the broadcast change primitive received, tell the LIBSAS this event
...@@ -3759,22 +3759,21 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3759,22 +3759,21 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
spin_lock_irqsave(&sas_phy->sas_prim_lock, flags); spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);
sas_phy->sas_prim = HW_EVENT_BROADCAST_CHANGE; sas_phy->sas_prim = HW_EVENT_BROADCAST_CHANGE;
spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags); spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);
sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PHY_ERROR: case HW_EVENT_PHY_ERROR:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_ERROR\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_ERROR\n");
sas_phy_disconnected(&phy->sas_phy); sas_phy_disconnected(&phy->sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_ERROR, sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_ERROR, GFP_ATOMIC);
GFP_ATOMIC);
break; break;
case HW_EVENT_BROADCAST_EXP: case HW_EVENT_BROADCAST_EXP:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_BROADCAST_EXP\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_BROADCAST_EXP\n");
spin_lock_irqsave(&sas_phy->sas_prim_lock, flags); spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);
sas_phy->sas_prim = HW_EVENT_BROADCAST_EXP; sas_phy->sas_prim = HW_EVENT_BROADCAST_EXP;
spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags); spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);
sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_LINK_ERR_INVALID_DWORD: case HW_EVENT_LINK_ERR_INVALID_DWORD:
...@@ -3784,7 +3783,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3784,7 +3783,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
HW_EVENT_LINK_ERR_INVALID_DWORD, port_id, phy_id, 0, 0); HW_EVENT_LINK_ERR_INVALID_DWORD, port_id, phy_id, 0, 0);
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_LINK_ERR_DISPARITY_ERROR: case HW_EVENT_LINK_ERR_DISPARITY_ERROR:
...@@ -3795,7 +3794,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3795,7 +3794,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
port_id, phy_id, 0, 0); port_id, phy_id, 0, 0);
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_LINK_ERR_CODE_VIOLATION: case HW_EVENT_LINK_ERR_CODE_VIOLATION:
...@@ -3806,7 +3805,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3806,7 +3805,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
port_id, phy_id, 0, 0); port_id, phy_id, 0, 0);
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_LINK_ERR_LOSS_OF_DWORD_SYNCH: case HW_EVENT_LINK_ERR_LOSS_OF_DWORD_SYNCH:
...@@ -3817,7 +3816,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3817,7 +3816,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
port_id, phy_id, 0, 0); port_id, phy_id, 0, 0);
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_MALFUNCTION: case HW_EVENT_MALFUNCTION:
...@@ -3828,7 +3827,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3828,7 +3827,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
spin_lock_irqsave(&sas_phy->sas_prim_lock, flags); spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);
sas_phy->sas_prim = HW_EVENT_BROADCAST_SES; sas_phy->sas_prim = HW_EVENT_BROADCAST_SES;
spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags); spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);
sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_INBOUND_CRC_ERROR: case HW_EVENT_INBOUND_CRC_ERROR:
...@@ -3839,14 +3838,13 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3839,14 +3838,13 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
break; break;
case HW_EVENT_HARD_RESET_RECEIVED: case HW_EVENT_HARD_RESET_RECEIVED:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_HARD_RESET_RECEIVED\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_HARD_RESET_RECEIVED\n");
sas_notify_port_event_gfp(sas_phy, PORTE_HARD_RESET, sas_notify_port_event(sas_phy, PORTE_HARD_RESET, GFP_ATOMIC);
GFP_ATOMIC);
break; break;
case HW_EVENT_ID_FRAME_TIMEOUT: case HW_EVENT_ID_FRAME_TIMEOUT:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_ID_FRAME_TIMEOUT\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_ID_FRAME_TIMEOUT\n");
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_LINK_ERR_PHY_RESET_FAILED: case HW_EVENT_LINK_ERR_PHY_RESET_FAILED:
...@@ -3857,14 +3855,14 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3857,14 +3855,14 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
port_id, phy_id, 0, 0); port_id, phy_id, 0, 0);
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PORT_RESET_TIMER_TMO: case HW_EVENT_PORT_RESET_TIMER_TMO:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PORT_RESET_TIMER_TMO\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PORT_RESET_TIMER_TMO\n");
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PORT_RECOVERY_TIMER_TMO: case HW_EVENT_PORT_RECOVERY_TIMER_TMO:
...@@ -3872,7 +3870,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) ...@@ -3872,7 +3870,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
"HW_EVENT_PORT_RECOVERY_TIMER_TMO\n"); "HW_EVENT_PORT_RECOVERY_TIMER_TMO\n");
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PORT_RECOVER: case HW_EVENT_PORT_RECOVER:
......
drivers/scsi/pm8001/pm8001_sas.c
View file @ de6d7547
...@@ -207,7 +207,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, ...@@ -207,7 +207,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
if (pm8001_ha->phy[phy_id].phy_state == if (pm8001_ha->phy[phy_id].phy_state ==
PHY_STATE_LINK_UP_SPCV) { PHY_STATE_LINK_UP_SPCV) {
sas_phy_disconnected(&phy->sas_phy); sas_phy_disconnected(&phy->sas_phy);
sas_notify_phy_event_gfp(&phy->sas_phy, sas_notify_phy_event(&phy->sas_phy,
PHYE_LOSS_OF_SIGNAL, GFP_KERNEL); PHYE_LOSS_OF_SIGNAL, GFP_KERNEL);
phy->phy_attached = 0; phy->phy_attached = 0;
} }
...@@ -215,7 +215,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, ...@@ -215,7 +215,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
if (pm8001_ha->phy[phy_id].phy_state == if (pm8001_ha->phy[phy_id].phy_state ==
PHY_STATE_LINK_UP_SPC) { PHY_STATE_LINK_UP_SPC) {
sas_phy_disconnected(&phy->sas_phy); sas_phy_disconnected(&phy->sas_phy);
sas_notify_phy_event_gfp(&phy->sas_phy, sas_notify_phy_event(&phy->sas_phy,
PHYE_LOSS_OF_SIGNAL, GFP_KERNEL); PHYE_LOSS_OF_SIGNAL, GFP_KERNEL);
phy->phy_attached = 0; phy->phy_attached = 0;
} }
...@@ -1350,4 +1350,3 @@ int pm8001_clear_task_set(struct domain_device *dev, u8 *lun) ...@@ -1350,4 +1350,3 @@ int pm8001_clear_task_set(struct domain_device *dev, u8 *lun)
tmf_task.tmf = TMF_CLEAR_TASK_SET; tmf_task.tmf = TMF_CLEAR_TASK_SET;
return pm8001_issue_ssp_tmf(dev, lun, &tmf_task); return pm8001_issue_ssp_tmf(dev, lun, &tmf_task);
} }
drivers/scsi/pm8001/pm80xx_hwi.c
View file @ de6d7547
...@@ -3338,7 +3338,7 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3338,7 +3338,7 @@ hw_event_sas_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb)
else if (phy->identify.device_type != SAS_PHY_UNUSED) else if (phy->identify.device_type != SAS_PHY_UNUSED)
phy->identify.target_port_protocols = SAS_PROTOCOL_SMP; phy->identify.target_port_protocols = SAS_PROTOCOL_SMP;
phy->sas_phy.oob_mode = SAS_OOB_MODE; phy->sas_phy.oob_mode = SAS_OOB_MODE;
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC); sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC);
spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags); spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags);
memcpy(phy->frame_rcvd, &pPayload->sas_identify, memcpy(phy->frame_rcvd, &pPayload->sas_identify,
sizeof(struct sas_identify_frame)-4); sizeof(struct sas_identify_frame)-4);
...@@ -3385,7 +3385,7 @@ hw_event_sata_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3385,7 +3385,7 @@ hw_event_sata_phy_up(struct pm8001_hba_info *pm8001_ha, void *piomb)
phy->phy_type |= PORT_TYPE_SATA; phy->phy_type |= PORT_TYPE_SATA;
phy->phy_attached = 1; phy->phy_attached = 1;
phy->sas_phy.oob_mode = SATA_OOB_MODE; phy->sas_phy.oob_mode = SATA_OOB_MODE;
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC); sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_DONE, GFP_ATOMIC);
spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags); spin_lock_irqsave(&phy->sas_phy.frame_rcvd_lock, flags);
memcpy(phy->frame_rcvd, ((u8 *)&pPayload->sata_fis - 4), memcpy(phy->frame_rcvd, ((u8 *)&pPayload->sata_fis - 4),
sizeof(struct dev_to_host_fis)); sizeof(struct dev_to_host_fis));
...@@ -3468,8 +3468,8 @@ hw_event_phy_down(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3468,8 +3468,8 @@ hw_event_phy_down(struct pm8001_hba_info *pm8001_ha, void *piomb)
} }
if (port_sata && (portstate != PORT_IN_RESET)) if (port_sata && (portstate != PORT_IN_RESET))
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL, sas_notify_phy_event(&phy->sas_phy, PHYE_LOSS_OF_SIGNAL,
GFP_ATOMIC); GFP_ATOMIC);
} }
static int mpi_phy_start_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) static int mpi_phy_start_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
...@@ -3567,7 +3567,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3567,7 +3567,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
break; break;
case HW_EVENT_SATA_SPINUP_HOLD: case HW_EVENT_SATA_SPINUP_HOLD:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_SATA_SPINUP_HOLD\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_SATA_SPINUP_HOLD\n");
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_SPINUP_HOLD, sas_notify_phy_event(&phy->sas_phy, PHYE_SPINUP_HOLD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PHY_DOWN: case HW_EVENT_PHY_DOWN:
...@@ -3584,7 +3584,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3584,7 +3584,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PORT_INVALID\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PORT_INVALID\n");
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
/* the broadcast change primitive received, tell the LIBSAS this event /* the broadcast change primitive received, tell the LIBSAS this event
...@@ -3596,22 +3596,21 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3596,22 +3596,21 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
spin_lock_irqsave(&sas_phy->sas_prim_lock, flags); spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);
sas_phy->sas_prim = HW_EVENT_BROADCAST_CHANGE; sas_phy->sas_prim = HW_EVENT_BROADCAST_CHANGE;
spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags); spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);
sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PHY_ERROR: case HW_EVENT_PHY_ERROR:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_ERROR\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_ERROR\n");
sas_phy_disconnected(&phy->sas_phy); sas_phy_disconnected(&phy->sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_phy_event_gfp(&phy->sas_phy, PHYE_OOB_ERROR, sas_notify_phy_event(&phy->sas_phy, PHYE_OOB_ERROR, GFP_ATOMIC);
GFP_ATOMIC);
break; break;
case HW_EVENT_BROADCAST_EXP: case HW_EVENT_BROADCAST_EXP:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_BROADCAST_EXP\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_BROADCAST_EXP\n");
spin_lock_irqsave(&sas_phy->sas_prim_lock, flags); spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);
sas_phy->sas_prim = HW_EVENT_BROADCAST_EXP; sas_phy->sas_prim = HW_EVENT_BROADCAST_EXP;
spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags); spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);
sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_LINK_ERR_INVALID_DWORD: case HW_EVENT_LINK_ERR_INVALID_DWORD:
...@@ -3649,7 +3648,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3649,7 +3648,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
spin_lock_irqsave(&sas_phy->sas_prim_lock, flags); spin_lock_irqsave(&sas_phy->sas_prim_lock, flags);
sas_phy->sas_prim = HW_EVENT_BROADCAST_SES; sas_phy->sas_prim = HW_EVENT_BROADCAST_SES;
spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags); spin_unlock_irqrestore(&sas_phy->sas_prim_lock, flags);
sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_INBOUND_CRC_ERROR: case HW_EVENT_INBOUND_CRC_ERROR:
...@@ -3660,14 +3659,13 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3660,14 +3659,13 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
break; break;
case HW_EVENT_HARD_RESET_RECEIVED: case HW_EVENT_HARD_RESET_RECEIVED:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_HARD_RESET_RECEIVED\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_HARD_RESET_RECEIVED\n");
sas_notify_port_event_gfp(sas_phy, PORTE_HARD_RESET, sas_notify_port_event(sas_phy, PORTE_HARD_RESET, GFP_ATOMIC);
GFP_ATOMIC);
break; break;
case HW_EVENT_ID_FRAME_TIMEOUT: case HW_EVENT_ID_FRAME_TIMEOUT:
pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_ID_FRAME_TIMEOUT\n"); pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_ID_FRAME_TIMEOUT\n");
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_LINK_ERR_PHY_RESET_FAILED: case HW_EVENT_LINK_ERR_PHY_RESET_FAILED:
...@@ -3678,7 +3676,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3678,7 +3676,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
port_id, phy_id, 0, 0); port_id, phy_id, 0, 0);
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
break; break;
case HW_EVENT_PORT_RESET_TIMER_TMO: case HW_EVENT_PORT_RESET_TIMER_TMO:
...@@ -3687,7 +3685,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3687,7 +3685,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
port_id, phy_id, 0, 0); port_id, phy_id, 0, 0);
sas_phy_disconnected(sas_phy); sas_phy_disconnected(sas_phy);
phy->phy_attached = 0; phy->phy_attached = 0;
sas_notify_port_event_gfp(sas_phy, PORTE_LINK_RESET_ERR, sas_notify_port_event(sas_phy, PORTE_LINK_RESET_ERR,
GFP_ATOMIC); GFP_ATOMIC);
if (pm8001_ha->phy[phy_id].reset_completion) { if (pm8001_ha->phy[phy_id].reset_completion) {
pm8001_ha->phy[phy_id].port_reset_status = pm8001_ha->phy[phy_id].port_reset_status =
...@@ -3705,7 +3703,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) ...@@ -3705,7 +3703,7 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
for (i = 0; i < pm8001_ha->chip->n_phy; i++) { for (i = 0; i < pm8001_ha->chip->n_phy; i++) {
if (port->wide_port_phymap & (1 << i)) { if (port->wide_port_phymap & (1 << i)) {
phy = &pm8001_ha->phy[i]; phy = &pm8001_ha->phy[i];
sas_notify_phy_event_gfp(&phy->sas_phy, sas_notify_phy_event(&phy->sas_phy,
PHYE_LOSS_OF_SIGNAL, GFP_ATOMIC); PHYE_LOSS_OF_SIGNAL, GFP_ATOMIC);
port->wide_port_phymap &= ~(1 << i); port->wide_port_phymap &= ~(1 << i);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7