From patchwork Fri Oct 15 10:54:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1541571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=k7ZvvIdj; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HW37W3V6gz9t0k for ; Fri, 15 Oct 2021 21:54:46 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mbKrE-0007n4-Cz; Fri, 15 Oct 2021 10:54:36 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mbKrC-0007mn-Mx for kernel-team@lists.ubuntu.com; Fri, 15 Oct 2021 10:54:34 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id EB7473FFF6 for ; Fri, 15 Oct 2021 10:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1634295272; bh=/nDYwGpqtchwtppCQp6VLpQ39aEMBL/K8bX1qLUefbY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=k7ZvvIdjL0zdDFxfGFaTutTl0vxS+DP3GfPN08pRUnf29XvZ3qWnibtIfpmGg/cDx nlbXuLHMvcytY0Pi0DaXCUyHeJXoSEt0P96V8vjo9OEHKwOvlAPIzkRRNCL2/k7F1a gHQsmZVoUg9xaggqc79DfsW0PkN0NdqM/djKAOUomHQpwxjEpBqVh0s5CwkjC0zBfc 5R6zKZwXIkBBitEyjPjNzN4PyK180u+Ifl5uH5olP1ZQWqM+ImPYy231Z/5pIF0p7O 3S0anF+IHzJdsBRiOdTA1/0lV1N2dV6rKTdz2pXa/o7lILmV6baZ3WtawwR1gQ+w62 X3Oo1pbrvAZ6w== Received: by mail-wm1-f69.google.com with SMTP id m1-20020a7bca41000000b00322ee09ca1aso69891wml.9 for ; Fri, 15 Oct 2021 03:54:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/nDYwGpqtchwtppCQp6VLpQ39aEMBL/K8bX1qLUefbY=; b=rdOA9INHtnausmS0Rl566ObFfOOTP197FD/cjwzBIK01R1UQb3KsIf78F0hQNouDQb /dz3dJ2No89szu9IlRXOeH3EwbDjfCgnFQqFQcgqzf9Et7VzB4b5U0FfLVWYd/vwcvRy 3bEHSHC89fG60wN4EvWLXGWz3VQS2Jh947x9gKbIRcA4mZhP4I4tLjoA7NZ911JiFolU qa5aaDRiahoXTI4Pk0CQ90J+HQDGV59oicS4QEEwsEdXM8yk6uD4dNnjF/wNf/5+IsV2 9S8Q0jJOwkn1yo1IqW6jRVkGvJMtf7J34ABsoK28Z/vCXt6VmfA4ol0ATYWlb+LwfwaC e3Qw== X-Gm-Message-State: AOAM532hM0Bd522rEfNCu5jL1Ef359O7s3IFVqpszGHbhoSjCNxT0Ib9 OTMLl0dFtvLkz12GApQ/pTfpcVEp9hni68RJyh8xfXKXCuLUwshECfkkAMbvs9iPJuvGBYgP/Dk G2fpGHAj/fa6bM2Qy/FhziFXRVWx+WAwkAgqKoOMWdQ== X-Received: by 2002:a7b:ca56:: with SMTP id m22mr11877969wml.34.1634295272663; Fri, 15 Oct 2021 03:54:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaH+jDbvYJvhCewTJswQ3V0QR7GCzdwWa8KhxZibpUpiJDQeRL0h2nTUJaPkuPIxrnOX/RXw== X-Received: by 2002:a7b:ca56:: with SMTP id m22mr11877954wml.34.1634295272507; Fri, 15 Oct 2021 03:54:32 -0700 (PDT) Received: from callisto.. (p5087f4eb.dip0.t-ipconnect.de. [80.135.244.235]) by smtp.gmail.com with ESMTPSA id f184sm4250626wmf.22.2021.10.15.03.54.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 03:54:32 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/2] UBUNTU: SAUCE: Revert "PCI/MSI: Enforce MSI[X] entry updates to be visible" Date: Fri, 15 Oct 2021 12:54:28 +0200 Message-Id: <20211015105429.183146-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211015105429.183146-1-kleber.souza@canonical.com> References: <20211015105429.183146-1-kleber.souza@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/1946149 This reverts commit 2478f358c2b35fea04e005447ce99ad8dc53fd5d. Revert upstream commit b9255a7cb51754e8d2645b65dd31805e282b4f3e in a preparation for reverting upstream commit da181dc974ad667579baece33c2c8d2d1e4558d5 ("PCI/MSI: Enforce that MSI-X table entry is masked for update") which is causing boot issues on some platforms. Signed-off-by: Kleber Sacilotto de Souza --- drivers/pci/msi.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 0b44d224f464..7497c37a1e48 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -322,9 +322,6 @@ void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) if (unmasked) __pci_msix_desc_mask_irq(entry, 0); - - /* Ensure that the writes are visible in the device */ - readl(base + PCI_MSIX_ENTRY_DATA); } else { int pos = dev->msi_cap; u16 msgctl; @@ -345,8 +342,6 @@ void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) pci_write_config_word(dev, pos + PCI_MSI_DATA_32, msg->data); } - /* Ensure that the writes are visible in the device */ - pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl); } entry->msg = *msg; }