{"id":2228537,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2228537/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ide/patch/20260426190920.2051289-4-philpem@philpem.me.uk/","project":{"id":13,"url":"http://patchwork.ozlabs.org/api/1.2/projects/13/?format=json","name":"Linux IDE development","link_name":"linux-ide","list_id":"linux-ide.vger.kernel.org","list_email":"linux-ide@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260426190920.2051289-4-philpem@philpem.me.uk>","list_archive_url":null,"date":"2026-04-26T19:09:16","name":"[v3,3/7] ata: libata-scsi: route non-zero LUN commands for multi-LUN ATAPI","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"16cb13b7940923e0e10a4f41640270a0e44f3bae","submitter":{"id":93108,"url":"http://patchwork.ozlabs.org/api/1.2/people/93108/?format=json","name":"Phil Pemberton","email":"philpem@philpem.me.uk"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ide/patch/20260426190920.2051289-4-philpem@philpem.me.uk/mbox/","series":[{"id":501551,"url":"http://patchwork.ozlabs.org/api/1.2/series/501551/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ide/list/?series=501551","date":"2026-04-26T19:09:18","name":"ata: libata-scsi: multi-LUN ATAPI device support","version":3,"mbox":"http://patchwork.ozlabs.org/series/501551/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228537/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228537/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-ide@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=philpem.me.uk header.i=@philpem.me.uk\n header.a=rsa-sha256 header.s=mail header.b=lDUmb9c1;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=linux-ide+bounces-5538-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (1024-bit key) header.d=philpem.me.uk header.i=@philpem.me.uk\n header.b=\"lDUmb9c1\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=178.62.38.78","smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=philpem.me.uk","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=philpem.me.uk"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g3bwH6LkMz1yJ1\n\tfor ; Mon, 27 Apr 2026 05:14:07 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 9259A3051146\n\tfor ; Sun, 26 Apr 2026 19:09:47 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 7EA7737D132;\n\tSun, 26 Apr 2026 19:09:41 +0000 (UTC)","from nick.sneptech.io (nick.sneptech.io [178.62.38.78])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id E4CAE36212D;\n\tSun, 26 Apr 2026 19:09:36 +0000 (UTC)","from wolf.philpem.me.uk (81-187-163-148.ip4.reverse-dns.uk\n [81.187.163.148])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (2048 bits))\n\t(No client certificate requested)\n\t(Authenticated sender: mailrelay_wolf@philpem.me.uk)\n\tby nick.sneptech.io (Postfix) with ESMTPSA id 7A8CCBE5D6;\n\tSun, 26 Apr 2026 19:09:29 +0000 (UTC)","from cheetah.homenet.philpem.me.uk (cheetah.homenet.philpem.me.uk\n [10.0.0.32])\n\tby wolf.philpem.me.uk (Postfix) with ESMTPSA id 1E72A5FC55;\n\tSun, 26 Apr 2026 20:09:29 +0100 (BST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777230581; cv=none;\n b=G/UIt1Exo626Tq3WjVkmPiNns6rp8JLkTCpQCnnxaOF44OTwqkKJLjzTz5rHbKWHBa1z4KuBABpdzYfBl5DI0HH64kLRgAi/DyhONyK7f3L+NtSq2iwTyOgZCvwmJUJ9GLAzXbo2/PD2/cnmv3FczPoz9S5bfkdsL+MPOqpcwMc=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777230581; c=relaxed/simple;\n\tbh=5INEidaxPS3KpBzcwlk1svLm8n+Qi1qL50o+7Kyduc4=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=PyuPc3SwKl1dyuwNe25LS2oQ3Lar9pCZutQzgMbbklQ7gmkekyohATHnjWy8OZVblySmDtI5np4DTa7qoOzyjj8dGtTrJSfM/myS5cRkT0L4RuIwWB1J8tL4d0nIipjxo+pU40U8vf7lhA6CEdHcqRazBdQzJom6ZUlyiiOdiuM=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=philpem.me.uk;\n spf=pass smtp.mailfrom=philpem.me.uk;\n dkim=pass (1024-bit key) header.d=philpem.me.uk header.i=@philpem.me.uk\n header.b=lDUmb9c1; arc=none smtp.client-ip=178.62.38.78","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=philpem.me.uk;\n\ts=mail; t=1777230569;\n\tbh=5INEidaxPS3KpBzcwlk1svLm8n+Qi1qL50o+7Kyduc4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=lDUmb9c1VyrP+q6BiWQBnhA4Z0VMiPbUX6jQvKipIBHM7yFXToWxx2d6jm72RNv1g\n\t Mr+EHq8Mra4RXrdAt32vqshE8VLyrWRo65qSu4gd803c59f8V3Dd5gbiUUbfEnuCvX\n\t kACixhxt3L5amLObMblQ7r0RlZYyAkuRhArtcq+M=","From":"Phil Pemberton ","To":"linux-ide@vger.kernel.org,\n\tlinux-scsi@vger.kernel.org","Cc":"linux-kernel@vger.kernel.org,\n\tDamien Le Moal ,\n\tNiklas Cassel ,\n\t\"James E . J . Bottomley\" ,\n\t\"Martin K . Petersen\" ,\n\tHannes Reinecke ,\n\tPhil Pemberton ","Subject":"[PATCH v3 3/7] ata: libata-scsi: route non-zero LUN commands for\n multi-LUN ATAPI","Date":"Sun, 26 Apr 2026 20:09:16 +0100","Message-ID":"<20260426190920.2051289-4-philpem@philpem.me.uk>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260426190920.2051289-1-philpem@philpem.me.uk>","References":"<20260426190920.2051289-1-philpem@philpem.me.uk>","Precedence":"bulk","X-Mailing-List":"linux-ide@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"Two changes are required to route commands to ATAPI LUNs other than 0:\n\n1. __ata_scsi_find_dev(): The existing code rejects any scsi_device\n with a non-zero LUN, returning NULL and dropping the command on\n the floor. Relax both the PMP and non-PMP branches to allow\n non-zero LUNs through when the underlying ata_device is ATAPI\n class, since ATAPI devices can legitimately expose multiple LUNs.\n\n2. atapi_xlat(): Older ATAPI devices (SCSI-2 era) expect the LUN in\n CDB byte 1 bits 7:5 rather than relying on transport-level LUN\n addressing. Encode scmd->device->lun into those bits, preserving\n the existing command-specific bits in 4:0. This is required by\n both the Panasonic PD/CD combos and Nakamichi CD changers. LUNs\n beyond 7 cannot be encoded in the 3-bit CDB field; reject them\n with AC_ERR_INVALID.\n\nSigned-off-by: Phil Pemberton \n---\n drivers/ata/libata-scsi.c | 17 +++++++++++++++--\n 1 file changed, 15 insertions(+), 2 deletions(-)","diff":"diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c\nindex 317883bac25f..48c7d323d6f9 100644\n--- a/drivers/ata/libata-scsi.c\n+++ b/drivers/ata/libata-scsi.c\n@@ -2951,6 +2951,11 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)\n \tmemset(qc->cdb, 0, dev->cdb_len);\n \tmemcpy(qc->cdb, scmd->cmnd, scmd->cmd_len);\n \n+\t/* SCSI-2 CDB LUN encoding: bits 7:5 of byte 1 (3-bit field) */\n+\tif (scmd->device->lun >= 8)\n+\t\treturn AC_ERR_INVALID;\n+\tqc->cdb[1] = (qc->cdb[1] & 0x1f) | ((u8)scmd->device->lun << 5);\n+\n \tqc->complete_fn = atapi_qc_complete;\n \n \tqc->tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;\n@@ -3059,19 +3064,27 @@ static struct ata_device *ata_find_dev(struct ata_port *ap, unsigned int devno)\n static struct ata_device *__ata_scsi_find_dev(struct ata_port *ap,\n \t\t\t\t\t const struct scsi_device *scsidev)\n {\n+\tstruct ata_device *dev;\n \tint devno;\n \n \t/* skip commands not addressed to targets we simulate */\n \tif (!sata_pmp_attached(ap)) {\n-\t\tif (unlikely(scsidev->channel || scsidev->lun))\n+\t\tif (unlikely(scsidev->channel))\n \t\t\treturn NULL;\n \t\tdevno = scsidev->id;\n \t} else {\n-\t\tif (unlikely(scsidev->id || scsidev->lun))\n+\t\tif (unlikely(scsidev->id))\n \t\t\treturn NULL;\n \t\tdevno = scsidev->channel;\n \t}\n \n+\tif (unlikely(scsidev->lun)) {\n+\t\tdev = ata_find_dev(ap, devno);\n+\t\tif (!dev || dev->class != ATA_DEV_ATAPI)\n+\t\t\treturn NULL;\n+\t\treturn dev;\n+\t}\n+\n \treturn ata_find_dev(ap, devno);\n }\n \n","prefixes":["v3","3/7"]}