From patchwork Sat Dec 22 09:50:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1017818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::12; helo=lists.nongnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OYj3Q4Fp"; dkim-atps=neutral Received: from lists.nongnu.org (lists.nongnu.org [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43MLd43MzRz9sPd for ; Sat, 22 Dec 2018 21:02:00 +1100 (AEDT) Received: from localhost ([::1]:50604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gae6Y-00065s-3e for incoming@patchwork.ozlabs.org; Sat, 22 Dec 2018 05:01:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gadvz-0006HP-QG for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gadvy-0006T3-Tp for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:03 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:35991) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gadvy-0006SG-Ns for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:02 -0500 Received: by mail-wr1-x441.google.com with SMTP id u4so7504689wrp.3 for ; Sat, 22 Dec 2018 01:51:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BikPm4y4AmQ6P/GRrvceGnIfEEOHD3twxfku3ohsQcI=; b=OYj3Q4Fphmy/rdAfoBJwVzpNKa9OUjbFue59PYw5QfvbReetMgeY89RZ6yyMZ+akLw p+r+tfYDE6/UqIsBNAhp8juejceHdfj/F8al0wBqfTcjG4XJBhLaOpce3XJ/AYIctWhy kKm4Lhh8XMT+AtC61jZsKWcnz2anfEXboZXX7CxROMR0tYxCixv5L/P/NpjWh+EQaYJN Qjd7ZREt8K96cOnUYRmXl0SphSAvOKCArykGRlie8Eki7iVlNh+6OoCbADagjD+PcQXM hQgwV/s2TCMTQElpBgJ8w/FgRI06J7r2Jd/nGOL6ccTEGiZ1jFG0Sa7H7nGTWok3cTgu JwvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BikPm4y4AmQ6P/GRrvceGnIfEEOHD3twxfku3ohsQcI=; b=suiyD3hvFF+TRIPJJP3BiVT1D9GzRpYhW2eY3zLh6C3QWb+zCXo5DjpZ9yY8Cyiy2B CzPc+tsCcorXzVjhOIM8wXg5c0GiHLgus4AAn9fhr5+1t/GiVEMpWU1ssBUFr0ODSbBH 62PtlB22kX6Fk4eaBvwWa0fyhC8n/wO+yblfGk3zN111Ld1oJ3tzSYCws1FoqVq2bWDe 2QcvWwpWN0QUGVCQBI60O9LsY8jIR9BRTmQ/+QGIFp2eKVUAfQyaqE1Cf/L/DpW3Iksd MLJ7G8sb1pdW/Hm38Ylk2yRRwrxQMCqRZDrVOcQ+dulHS/15xuBpNkuY9nGdKXMBDXLg htdg== X-Gm-Message-State: AJcUukcnxb6KkzT8y7bFeZsXmXOHVOBdSUx7SAh9qatJ39re1DsBu9sc F5c5lfnc6r8kQaXYit16pHmy4OVl X-Google-Smtp-Source: ALg8bN53oPl4vdGjumvYWHh9lVrBw49ZIj7/tARuNNV9Va3f4x6f6yV+KN7Cg/61kWJ7utOoMg+9iQ== X-Received: by 2002:adf:93e2:: with SMTP id 89mr5930590wrp.129.1545472261563; Sat, 22 Dec 2018 01:51:01 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id s3sm9557371wmj.23.2018.12.22.01.51.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Dec 2018 01:51:01 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 22 Dec 2018 11:50:20 +0200 Message-Id: <20181222095036.29743-16-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> References: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH PULL 15/31] hw/rdma: Initialize node_guid from vmxnet3 mac address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yuval.shaia@oracle.com, pjp@fedoraproject.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia node_guid should be set once device is load. Make node_guid be GID format (32 bit) of PCI function 0 vmxnet3 device's MAC. A new function was added to do the conversion. So for example the MAC 56:b6:44:e9:62:dc will be converted to GID 54b6:44ff:fee9:62dc. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_utils.h | 9 +++++++++ hw/rdma/vmw/pvrdma_cmd.c | 10 ---------- hw/rdma/vmw/pvrdma_main.c | 5 ++++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index 062e2cd688..4490ea0b94 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -63,4 +63,13 @@ extern unsigned long pr_dbg_cnt; void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen); void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); +static inline void addrconf_addr_eui48(uint8_t *eui, const char *addr) +{ + memcpy(eui, addr, 3); + eui[3] = 0xFF; + eui[4] = 0xFE; + memcpy(eui + 5, addr + 3, 3); + eui[0] ^= 2; +} + #endif diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index a334f6205e..2979582fac 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -592,16 +592,6 @@ static int create_bind(PVRDMADev *dev, union pvrdma_cmd_req *req, return -EINVAL; } - /* TODO: Since drivers stores node_guid at load_dsr phase then this - * assignment is not relevant, i need to figure out a way how to - * retrieve MAC of our netdev */ - if (!cmd->index) { - dev->node_guid = - dev->rdma_dev_res.ports[0].gid_tbl[0].gid.global.interface_id; - pr_dbg("dev->node_guid=0x%llx\n", - (long long unsigned int)be64_to_cpu(dev->node_guid)); - } - return 0; } diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index b35b5dc5f0..150404dfa6 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -264,7 +264,7 @@ static void init_dsr_dev_caps(PVRDMADev *dev) dsr->caps.sys_image_guid = 0; pr_dbg("sys_image_guid=%" PRIx64 "\n", dsr->caps.sys_image_guid); - dsr->caps.node_guid = cpu_to_be64(dev->node_guid); + dsr->caps.node_guid = dev->node_guid; pr_dbg("node_guid=%" PRIx64 "\n", be64_to_cpu(dsr->caps.node_guid)); dsr->caps.phys_port_cnt = MAX_PORTS; @@ -588,6 +588,9 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) } dev->func0 = VMXNET3(func0); + addrconf_addr_eui48((unsigned char *)&dev->node_guid, + (const char *)&dev->func0->conf.macaddr.a); + memdev_root = object_resolve_path("/objects", NULL); if (memdev_root) { object_child_foreach(memdev_root, pvrdma_check_ram_shared, &ram_shared);