From patchwork Wed Nov 25 09:00:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 7696541 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 11A55BF90C for ; Wed, 25 Nov 2015 09:01:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A7D720838 for ; Wed, 25 Nov 2015 09:01:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B0D020835 for ; Wed, 25 Nov 2015 09:01:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932096AbbKYJBB (ORCPT ); Wed, 25 Nov 2015 04:01:01 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:36517 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932089AbbKYJBA (ORCPT ); Wed, 25 Nov 2015 04:01:00 -0500 Received: by wmww144 with SMTP id w144so170755040wmw.1 for ; Wed, 25 Nov 2015 01:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=EYCimkxxrOpzDnj4BcpLK8efE+QqnIyfr4h9CPqnbaM=; b=WH7NsGVvEL5Y3iJJ0egaMc+B50i/vqZhFW/cRod6HU+fipLQqScj81I6jUMpCmtCx+ G6tS4UIi896ncn2opkIuCw3it2+RHBe2bQrTGTH0wjcK7jE8ocVv4EmyGAOLcqSLlMpX lMVJNzpbQC40otSdMNMtLYsac5BATWk3lamBE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=EYCimkxxrOpzDnj4BcpLK8efE+QqnIyfr4h9CPqnbaM=; b=PRj4a0dS+NFyKWEMQo8ZzR1YPqUnJ/mfRL/60i/TfGna9Yu9ovEUK6W3dL/x2LywLO nSz/qHJ8boOWmvsPa1p8u4FEjn78ySI0aVb4M3pIRQz2Zj7Yi7sTEykqINViuF1RXC3V 0r6A5nuClNvQPVa6g8bxKLhuzd9eJFs+QOhXTc4VjzspAWT+YU3JV/rZPAgYgNSO30Ih 8FKbySbzpTe28Q8dkMHwO27ct+JWlEvCHHcpCglm68rgiMaBvm/1T//YK4DrDvw+1PIG xmQxa1y2nlTUT0InjFuPhN74V/3+LiPShgcGuZPwdZZR4YenigtosP/6Feu5YRc5O4rq DlVg== X-Gm-Message-State: ALoCoQnt2mMhuIJwO7oJzS2eYAaeVgg51zaia6tgiJSNVLj6xfcnsGkN8srXlNJPi8uKgJRgsrLx X-Received: by 10.28.35.66 with SMTP id j63mr3225868wmj.10.1448442059329; Wed, 25 Nov 2015 01:00:59 -0800 (PST) Received: from localhost.localdomain (6164198-cl69.boa.fiberby.dk. [193.106.164.198]) by smtp.gmail.com with ESMTPSA id s189sm2437011wmf.16.2015.11.25.01.00.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Nov 2015 01:00:58 -0800 (PST) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com Cc: hch@infradead.org, keith.busch@intel.com, elliott@hpe.com, =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH v2] lightnvm: refactor and change vendor id for qemu Date: Wed, 25 Nov 2015 10:00:53 +0100 Message-Id: <1448442053-29867-1-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The QEMU NVMe implementation uses Intel vendor, Intel device id, and the first vendor specific byte to identify a LightNVM compatible NVMe instance. Instead of using the Intel specific, use a preallocated from CNEX Labs. This lets us uniquely identify a QEMU lightnvm device without breaking other vendor specific work in the qemu device driver. Reported-by: Christoph Hellwig Signed-off-by: Matias Bjørling --- drivers/nvme/host/lightnvm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 07451d6..b9e5cc7 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -569,18 +569,25 @@ void nvme_nvm_unregister(struct request_queue *q, char *disk_name) nvm_unregister(disk_name); } +/* move to shared place when used in multiple places. */ +#define PCI_VENDOR_ID_CNEX 0x1d1d +#define PCI_DEVICE_ID_CNEX_WL 0x2807 +#define PCI_DEVICE_ID_CNEX_QEMU 0x1f1f + int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id) { struct nvme_dev *dev = ns->dev; struct pci_dev *pdev = to_pci_dev(dev->dev); /* QEMU NVMe simulator - PCI ID + Vendor specific bit */ - if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x5845 && + if (pdev->vendor == PCI_VENDOR_ID_CNEX && + pdev->device == PCI_DEVICE_ID_CNEX_QEMU && id->vs[0] == 0x1) return 1; /* CNEX Labs - PCI ID + Vendor specific bit */ - if (pdev->vendor == 0x1d1d && pdev->device == 0x2807 && + if (pdev->vendor == PCI_VENDOR_ID_CNEX && + pdev->device == PCI_DEVICE_ID_CNEX_WL && id->vs[0] == 0x1) return 1;