From patchwork Thu Dec 24 07:17:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 560809 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DD3D5140C2C for ; Thu, 24 Dec 2015 18:18:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ravellosystems-com.20150623.gappssmtp.com header.i=@ravellosystems-com.20150623.gappssmtp.com header.b=PNw/5hPL; dkim-atps=neutral Received: from localhost ([::1]:59237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aC0AV-0007Pv-PW for incoming@patchwork.ozlabs.org; Thu, 24 Dec 2015 02:18:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aC0A0-0006Nn-Vb for qemu-devel@nongnu.org; Thu, 24 Dec 2015 02:18:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aC09w-00025L-Ch for qemu-devel@nongnu.org; Thu, 24 Dec 2015 02:18:04 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:34709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aC09w-00025H-5e for qemu-devel@nongnu.org; Thu, 24 Dec 2015 02:18:00 -0500 Received: by mail-wm0-x235.google.com with SMTP id l126so170733100wml.1 for ; Wed, 23 Dec 2015 23:18:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravellosystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7+20SpBCwOP49cOqQVi72QnZfX+6WCiujNwKB2Kze38=; b=PNw/5hPLTMBAc0TINbxkzvwvslfyypzm9xwpNSNyvT9RH3LVHadzyCtswvJv5VtGZl Rw0gerQR7N0KFb4XNfk/lAQq3SDaQwssh6wS5L+vFPsyAzdJS/U4WDqLePYp4WOIEiPE Mq7AC93K/KcBaX07gxaDydKIveYljgQEc6KovTWFpTD7k/hBGvAySp/WmwEd9934+emA 6uGc2ZeBQMxNClZhktGGrdICTR/6t+JSrt2XrAig6HESVaI8GUiJ5LRMTc4TXa0jcoeV AswT5JnOwyZPGjr6zmzcMi8JsmLPime78rToH1im2d9i3U3V9No1yGa3KwMzQzyesVHD hRjQ== 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:in-reply-to :references; bh=7+20SpBCwOP49cOqQVi72QnZfX+6WCiujNwKB2Kze38=; b=QesDMh18/UGxLuE/n6ul7aj+L/TN4qEkCTfYPqNbQmyVSwrBwLvmfrt8p8AbyzFVg2 +eBFfQ8DV4MklNmmrkdO93OzDanrQxnc2vXenaF3vsdGfNQ1w/69RrapYCUlxltiE1a/ lhK2eSFrjQUrL1YknGyAnpr2acHtlmjGpMyeQsYRKwI/eZjJRXoAIFTVhZZMCs3d+lMW zOpAVTTPxNGqFQZb0rj4ifDH6J/C25MdPZuHELbiMCWd8dWTcoCuByaOZtAsClP1KnWB KWgaNqXMoGDxZl1eKppYDB0vvhEDhn46ScFly41hvopxm9MI7lsjP0LYmsa58U4z8d26 z42Q== X-Gm-Message-State: ALoCoQmsZ2foCMATu7fDApYfMw+4RdllMvBEib1k/bzHa5y/jK5GJ58+NXQNisJaQ78cz7qP2p44eXFIVsHCFtkrtDn4GvgJ8Q== X-Received: by 10.28.17.83 with SMTP id 80mr37658418wmr.13.1450941479677; Wed, 23 Dec 2015 23:17:59 -0800 (PST) Received: from honey.ravello.local ([213.57.127.2]) by smtp.gmail.com with ESMTPSA id ql10sm40370418wjc.23.2015.12.23.23.17.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 23:17:59 -0800 (PST) From: Shmulik Ladkani To: Jason Wang , Dmitry Fleytman Date: Thu, 24 Dec 2015 09:17:35 +0200 Message-Id: <1450941461-26996-2-git-send-email-shmulik.ladkani@ravellosystems.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450941461-26996-1-git-send-email-shmulik.ladkani@ravellosystems.com> References: <1450941461-26996-1-git-send-email-shmulik.ladkani@ravellosystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Cc: idan.brown@ravellosystems.com, qemu-devel@nongnu.org, Shmulik Ladkani Subject: [Qemu-devel] [PATCH v4 1/7] vmxnet3: Change offsets of msi/msix pci capabilities X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Place device reported PCI capabilities at the same offsets as placed by the VMware virtual hardware: MSI at [84], MSI-X at [9c]. Signed-off-by: Shmulik Ladkani --- hw/net/vmxnet3.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 37373e5..d323895 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -36,6 +36,16 @@ #define VMXNET3_MSIX_BAR_SIZE 0x2000 #define MIN_BUF_SIZE 60 +/* Compatability flags for migration */ +#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT 0 +#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS \ + (1 << VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT) + +#define VMXNET3_MSI_OFFSET(s) \ + ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x50 : 0x84) +#define VMXNET3_MSIX_OFFSET(s) \ + ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0 : 0x9c) + #define VMXNET3_BAR0_IDX (0) #define VMXNET3_BAR1_IDX (1) #define VMXNET3_MSIX_BAR_IDX (2) @@ -313,6 +323,9 @@ typedef struct { MACAddr *mcast_list; uint32_t mcast_list_len; uint32_t mcast_list_buff_size; /* needed for live migration. */ + + /* Compatability flags for migration */ + uint32_t compat_flags; } VMXNET3State; /* Interrupt management */ @@ -2102,7 +2115,7 @@ vmxnet3_init_msix(VMXNET3State *s) VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_TABLE, &s->msix_bar, VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA, - 0); + VMXNET3_MSIX_OFFSET(s)); if (0 > res) { VMW_WRPRN("Failed to initialize MSI-X, error %d", res); @@ -2130,7 +2143,6 @@ vmxnet3_cleanup_msix(VMXNET3State *s) } } -#define VMXNET3_MSI_OFFSET (0x50) #define VMXNET3_USE_64BIT (true) #define VMXNET3_PER_VECTOR_MASK (false) @@ -2140,7 +2152,7 @@ vmxnet3_init_msi(VMXNET3State *s) PCIDevice *d = PCI_DEVICE(s); int res; - res = msi_init(d, VMXNET3_MSI_OFFSET, VMXNET3_MAX_NMSIX_INTRS, + res = msi_init(d, VMXNET3_MSI_OFFSET(s), VMXNET3_MAX_NMSIX_INTRS, VMXNET3_USE_64BIT, VMXNET3_PER_VECTOR_MASK); if (0 > res) { VMW_WRPRN("Failed to initialize MSI, error %d", res);