Skip to contentSkip to conversation

scsi: sr: Return appropriate error code when disk is ejected

PATCH New Sasha Levin 1 participant 2 messages Jun 28, 2021

Subsystems (2)
Stable branch SCSI
lore
Share & tools
lore

Sasha Levin

author maintainer
#0 lore raw

PATCH 1/2 scsi: sr: Return appropriate error code when disk is ejected

From: ManYi Li <[email protected]>

[ Upstream commit 7dd753ca59d6c8cc09aa1ed24f7657524803c7f3 ]

Handle a reported media event code of 3. This indicates that the media has been removed from the drive and user intervention is required to proceed. Return DISK_EVENT_EJECT_REQUEST in that case.

Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by ManYi Li <[email protected]>
Signed-off-by Martin K. Petersen <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
---
 drivers/scsi/sr.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/scsi/sr.c +2 -0
index 67a73ea0a615..5e51a39a0c27 100644
@@ -216,6 +216,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev)
 		return DISK_EVENT_EJECT_REQUEST;
 	else if (med->media_event_code == 2)
 		return DISK_EVENT_MEDIA_CHANGE;
+	else if (med->media_event_code == 3)
+		return DISK_EVENT_EJECT_REQUEST;
 	return 0;
 }
Signature · 1 line
2.30.2
author maintainer
#1 lore raw

PATCH 2/2 drm/nouveau: fix dma_address check for CPU/GPU sync

From: Christian König <[email protected]>

[ Upstream commit d330099115597bbc238d6758a4930e72b49ea9ba ]

AGP for example doesn't have a dma_address array.

Signed-off-by Christian König <[email protected]>
Acked-by Alex Deucher <[email protected]>
Link https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by Sasha Levin <[email protected]>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -2
index a2e6a81669e7..94b7798bdea4 100644
@@ -447,7 +447,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
 	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
 	int i;
 
-	if (!ttm_dma)
+	if (!ttm_dma || !ttm_dma->dma_address)
 		return;
 
 	/* Don't waste time looping if the object is coherent */

@@ -467,7 +467,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
 	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
 	int i;
 
-	if (!ttm_dma)
+	if (!ttm_dma || !ttm_dma->dma_address)
 		return;
 
 	/* Don't waste time looping if the object is coherent */
Signature · 1 line
2.30.2