From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Klaus Jensen <its@irrelevant.dk>,
qemu-devel@nongnu.org, Jason Wang <jasowang@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-block@nongnu.org, Klaus Jensen <k.jensen@samsung.com>,
Gollu Appalanaidu <anaidu.gollu@samsung.com>,
Max Reitz <mreitz@redhat.com>, Keith Busch <kbusch@kernel.org>
Subject: Re: [PATCH v2] hw/block/nvme: use locally assigned QEMU IEEE OUI
Date: Tue, 9 Feb 2021 12:10:05 +0100 [thread overview]
Message-ID: <55a9c72c-f79c-5cb5-6c69-ad7008fd8e6f@redhat.com> (raw)
In-Reply-To: <20210209104520.579084-1-its@irrelevant.dk>
On 2/9/21 11:45 AM, Klaus Jensen wrote:
> From: Gollu Appalanaidu <anaidu.gollu@samsung.com>
>
> Commit 6eb7a071292a ("hw/block/nvme: change controller pci id") changed
> the controller to use a Red Hat assigned PCI Device and Vendor ID, but
> did not change the IEEE OUI away from the Intel IEEE OUI.
>
> Fix that and use the locally assigned QEMU IEEE OUI instead if the
> `use-intel-id` parameter is not explicitly set. Also reverse the Intel
> IEEE OUI bytes.
>
> Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
> Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
> ---
>
> v2: drop telemetry and add a check on the use_intel_id parameter.
>
> hw/block/nvme.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index c2f0c88fbf39..870e9d8e1c17 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -4685,9 +4685,17 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
> id->cntlid = cpu_to_le16(n->cntlid);
>
> id->rab = 6;
> - id->ieee[0] = 0x00;
> - id->ieee[1] = 0x02;
> - id->ieee[2] = 0xb3;
> +
> + if (n->params.use_intel_id) {
> + id->ieee[0] = 0xb3;
> + id->ieee[1] = 0x02;
> + id->ieee[2] = 0x00;
> + } else {
> + id->ieee[0] = 0x00;
> + id->ieee[1] = 0x54;
> + id->ieee[2] = 0x52;
> + }
Correct.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Ideally we should have definitions and use them here and in
qemu_macaddr_default_if_unset() instead of this magic values.
> +
> id->mdts = n->params.mdts;
> id->ver = cpu_to_le32(NVME_SPEC_VER);
> id->oacs = cpu_to_le16(0);
>
next prev parent reply other threads:[~2021-02-09 11:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 10:45 [PATCH v2] hw/block/nvme: use locally assigned QEMU IEEE OUI Klaus Jensen
2021-02-09 11:10 ` Philippe Mathieu-Daudé [this message]
2021-02-10 20:57 ` Klaus Jensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55a9c72c-f79c-5cb5-6c69-ad7008fd8e6f@redhat.com \
--to=philmd@redhat.com \
--cc=anaidu.gollu@samsung.com \
--cc=its@irrelevant.dk \
--cc=jasowang@redhat.com \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).