From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EBA1329373 for ; Thu, 23 Apr 2026 20:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975665; cv=none; b=klA3e8sG/9huLsUzuZEE3rWrx9EUA3hW52QIBZsK8KpoefqPCEdYBWnF3MPsmye0CbIA3qmsMjVP+lND1uBxMqz1iMdP2T82BYORICbujmaFh5aEaspu467pijq2iY1GRVB3Yffjwe5NjaN2sjHjsY8tzXSgmGiOacbIO5lekGI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975665; c=relaxed/simple; bh=qXIKkX4h7OUd60DQ2fKPN5FHdbGxmbN3u0xWQKFzdCQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aajHvM5tO7HdslGq1TQ+fTTvIvshU4lRSCLF4TOaXq+BlOX/0iNE0khwFLSPH1d0frjNBo38SRzAkx4aVsrPzT6+7MlIAUs2sju8aIYFZOaZbbBHkm09x/J/nzrx/YZtDm2rEG0pQniBC3Yu6dufAqntUKdYAiIP0rsAM5PUv/8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EsW+ClON; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EsW+ClON" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4838c15e3cbso66733655e9.3 for ; Thu, 23 Apr 2026 13:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776975663; x=1777580463; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wL3tWq3fcfB8j/Jja0BNy+0Edqs7WrfstTJmG5tBxQw=; b=EsW+ClONHjmF60uY82w+6IkqP56ogNbo/gTCgnK1t4snsPUlgVsLH+uaY9xLWK9son 2DZN0ikGZpyw503+HBtt5qsE4ghA9RIirNQaupCY2J/vbPkaYuxWVB3wGtpf9oe4WVGf OlLGiKYfkavJi24EvDJhK4o6mzYbMRUNgFpFkVKeXkt9B27UWdWmjgeXloSlLLFDv43P 4SoROzxs1GBZleNAf7BpFPiOq0fVXaO2IM9vt9CK/ofkMka3jswO9d820S0yLE4KIuFj LIsft+qFJW1ysEytnsM1VbR3VYelozpPdZy9DtZES4qEedez12XlLIaUX11+MzSS36JL CuPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776975663; x=1777580463; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wL3tWq3fcfB8j/Jja0BNy+0Edqs7WrfstTJmG5tBxQw=; b=F7+HQfxA2AyPQ9tpRh2Y9fPhXOGmby/OIePWGBKvp5GdxNk5CjhL8EUEyVAa6MG4ux 5nJESUut8J2fqLKbAC/05BIVuAfxPSVdKUOjnzaXyWkxvkL+0tsD4kLHxh+1qUoxKh8J APDy7XISv/BcvkIP/DiuOdy5bPDnlLCTIFwuCiIp3lU1GncV+AwSWvIJF+h3REZ6BJw2 7mGMPdPjRgW9RgNYMqIELHKaPM/almpqD6bPy8CoIC2EpyKp28eJNOJgt8meCuy9jptV p7YEaHD+udHmAUlz2iSFgFw/ELB6p+Ute3P2KQ68M077aXXxioyRGc7bbrd6IZM9gT2r OJcg== X-Forwarded-Encrypted: i=1; AFNElJ9PuIqACFgJTMo+PYXJeS0hxleWLWE6jYIEonzZz9o+8weG8TmbW6mmAdyg9BCJmefMZjrWZ5H+PLlFdeU=@vger.kernel.org X-Gm-Message-State: AOJu0YzT2sxjp8Fljz0CTIqCLpVlyUkrYx0qa3jUcMwKA8Ht32NLIfzE +gyKPGXZRhTDN6UfYVcy3pEK2d8v4e5gZkPKIRIqV3Ek5MOGbIVW4DQ= X-Gm-Gg: AeBDietdLyXxa46IYeFkubyC21/UexsL1rbo5W1fgtXLvT9y9+tZD0TqSi0ny/t4LA7 jt+Eqqg89EOU2mWtwsTv5HxYoGnmNtPxvX4fJAnq1IUzDhsxIsfKlneDQODa7e/urB2S/8d8djC Av/Bg47e9x5buY62bx4kUfivVUyCpnJy3erYdGS4TM9Tm+zBnD4B31hC6lmTBc0rQ2s9sJGfi3U t4WiIfGJMyeAv03HfquuELqlmDdG4+GSM8q9eZ8XA5Hefz8CrLHJSlpirfd4AzsNi8qLxZr2LqM XWD3z/pGn7oxfm4eYzWnNYCNKgliBXc8rEUCTy15r/ghbGBFUuJVxrT3ejLvXaKRC7ch4sgf6+n 3Kqg+0GwysC0NATXBWS6BgJ4IbgegFVFNT+EeB4jX6MY1BDD96oo4hf7u2QwIiMEIfZlzxND0ji owBQ3hPkUw3uUXrF2B9D6RTLwts1pyKnD5p9GALCMCZ0eI2H/HhHJLZMNFc6yUMPfQpODsjqDC/ FPrCd7sMmSiNMijarfZ+NG8QkM= X-Received: by 2002:a05:600c:a106:b0:48a:58ae:9933 with SMTP id 5b1f17b1804b1-48a58ae9fbdmr108145875e9.18.1776975662557; Thu, 23 Apr 2026 13:21:02 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb97:cfb5:53a1:28]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48a5aa3ae83sm271709905e9.12.2026.04.23.13.21.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Apr 2026 13:21:02 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: Adrian McMenamin , linux-kernel@vger.kernel.org, Florian Fuchs Subject: [PATCH v3 3/3] cdrom: gdrom: verify device access after disc swap Date: Thu, 23 Apr 2026 21:41:32 +0200 Message-ID: <20260423194132.693271-4-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423194132.693271-1-fuchsfl@gmail.com> References: <20260423194132.693271-1-fuchsfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Artur Rojek To ready the drive for cdrom_open(), this driver sends a spin disc command. However, if the cd lid has been opened and the disc de-spinned, the very next SPI command will return UNIT_ATTENTION sense error, resulting in a failure to mount the disc. Fix this by sending a dummy TEST_UNIT command, which will catch the above error, and allow subsequent commands to execute correctly. Signed-off-by: Artur Rojek Signed-off-by: Florian Fuchs --- v3: new patch added from Artur Rojek and also verified that it works. drivers/cdrom/gdrom.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 1e73617b39ac..21ef4657dd2b 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -219,6 +219,33 @@ static char gdrom_execute_diagnostic(void) return __raw_readb(GDROM_ERROR_REG); } +/* + * Test unit command + * byte 0 = 0x0 + * + * This command verifies whether device can be accessed. + * + * -EIO indicates that device is not ready for operation. + */ +static int gdrom_test_unit_cmd(void) +{ + struct packet_command *test_command; + + test_command = kzalloc_obj(struct packet_command); + if (!test_command) + return -ENOMEM; + test_command->cmd[0] = 0x0; + test_command->buflen = 0; + gd.pending = 1; + gdrom_packetcommand(gd.cd_info, test_command); + wait_event_interruptible_timeout(command_queue, gd.pending == 0, + GDROM_DEFAULT_TIMEOUT); + gd.pending = 0; + kfree(test_command); + + return gd.status & 0x1 ? -EIO : 0; +} + /* * Prepare disk command * byte 0 = 0x70 @@ -353,6 +380,9 @@ static int gdrom_get_last_session(struct cdrom_device_info *cd_info, static int gdrom_open(struct cdrom_device_info *cd_info, int purpose) { + /* Sink pending UNIT_ATTENTION sense error after a disc swap. */ + (void)gdrom_test_unit_cmd(); + /* spin up the disk */ return gdrom_preparedisk_cmd(); } -- 2.43.0