From patchwork Sun Apr 26 20:42:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1277230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499Kbq14xXz9sSk; Mon, 27 Apr 2020 06:42:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jSo6t-0003Ex-MZ; Sun, 26 Apr 2020 20:42:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jSo6q-0003DW-1t for kernel-team@lists.ubuntu.com; Sun, 26 Apr 2020 20:42:40 +0000 Received: from mail-qv1-f70.google.com ([209.85.219.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jSo6p-0001N8-Ml for kernel-team@lists.ubuntu.com; Sun, 26 Apr 2020 20:42:39 +0000 Received: by mail-qv1-f70.google.com with SMTP id f4so16326486qvu.19 for ; Sun, 26 Apr 2020 13:42:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w4FIyCLtxcWc3Dzp2bMDG0sKsEUbfSpTfVevzUFiR68=; b=jY/PM5vvCO9/6pX4hov9QNVkxENsfBsT+2KVBm1jLbuqgh5FhL/BFKmkwfr1bwSRl5 735JYNaUtbamrbzKp+OYVQq+MB7pqWLrU9Tri+Ed2lAhwFjHwLhO4kfp8gbHtMzbO4of b1LfJR10tsxn/7LA8rsFtrvFw8QQ9ykYQStTmW2RSo9f4qdy7pGBgiVcIfuz6q00ir4O BhZ3oLqr/q5btx/zFfqpQI3zF2R5viFODmZjBomgKCQOsb0liKgVI8L1YqsDi0Udnmv5 MJNS18TfVStxOt9altvszAS0jtAJpfctUmW5QapfRbw4rbSB6Jp2uJ3JddYJQUvlQ786 nD+w== X-Gm-Message-State: AGi0PuamGEEGLvWHYa2MhaeVr+OB4JqILSkAxq8M0JyBGLICqOBbqZK8 0DoXpBhEUy8Hy/0lnr23PBvLYVs5RqWV0Wa7UxvS51aIYkfBn7SlbPf0mNDq6aDWIvsBq/5V/hN xfGAbH+J5tEP/V0CrSgBX1kFW6e4YWaXDVAOezBwC X-Received: by 2002:a05:620a:158a:: with SMTP id d10mr18989385qkk.259.1587933758428; Sun, 26 Apr 2020 13:42:38 -0700 (PDT) X-Google-Smtp-Source: APiQypKnHVkK+n5Utw5UYAHQ9WjMC5xoh5UR2sJP4u7eS6D3i5Tjthi8Jgn1rULnbjEpgw0lusLBKA== X-Received: by 2002:a05:620a:158a:: with SMTP id d10mr18989374qkk.259.1587933758116; Sun, 26 Apr 2020 13:42:38 -0700 (PDT) Received: from gallifrey.lan ([201.82.186.200]) by smtp.gmail.com with ESMTPSA id m7sm8321858qke.124.2020.04.26.13.42.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 13:42:37 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic:linux-azure-4.15][PATCH 2/5] Revert "PCI: hv: Use bytes 4 and 5 from instance ID as the PCI domain numbers" Date: Sun, 26 Apr 2020 17:42:26 -0300 Message-Id: <20200426204229.119093-3-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200426204229.119093-1-marcelo.cerri@canonical.com> References: <20200426203646.115503-1-marcelo.cerri@canonical.com> <20200426204229.119093-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1867220 This reverts commit ee4ee1df60eacc03ea478a7155269a3836ec4324. Signed-off-by: Marcelo Henrique Cerri --- drivers/pci/host/pci-hyperv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index f14eb17972b6..d7df3aa1860e 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c @@ -2588,8 +2588,8 @@ static int hv_pci_probe(struct hv_device *hdev, * between domains derived from these instance IDs in the same * VM. */ - hbus->sysdata.domain = hdev->dev_instance.b[4] | - hdev->dev_instance.b[5] << 8; + hbus->sysdata.domain = hdev->dev_instance.b[9] | + hdev->dev_instance.b[8] << 8; hbus->hdev = hdev; atomic_inc(&hbus->remove_lock);