From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DATE_IN_FUTURE_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6538C76194 for ; Thu, 25 Jul 2019 11:27:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6CA772081B for ; Thu, 25 Jul 2019 11:27:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="KRk632ja" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391453AbfGYL1O (ORCPT ); Thu, 25 Jul 2019 07:27:14 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34041 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391876AbfGYL1O (ORCPT ); Thu, 25 Jul 2019 07:27:14 -0400 Received: by mail-pg1-f195.google.com with SMTP id n9so16673119pgc.1 for ; Thu, 25 Jul 2019 04:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=oOy2/w31W9prrf1qRc4uM+eKhTQbKI+KZqbKGj7rGkQ=; b=KRk632jafTWXzbt9QpM3Zs7F1+q7Lo3h5MjlVwdu/ixd5Zts6twKsDYRmrvrWYo2bN gaVJRa0JbAHWHdNF3qBqOJQ7lotftk4HgZKM1cAVakcTfubdlQA4dFqMfQ8Bo10tyGn7 o+H1aSz8+lr6ikvJ+tk5mr70aj/mGmFc2JC4s= 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; bh=oOy2/w31W9prrf1qRc4uM+eKhTQbKI+KZqbKGj7rGkQ=; b=O0Vn7zxhy/RXWkHmnyiyaPuwaHZRT79AdtyOoqWiOZo/ml9bIH7iZ22KyAyiMl6Fwm xesYA7+VD3o0KAnzc98RTYhtaFyR9nkrgwhXrb0QDpChO/yD7kwDdhNi917SspXxenbc J4wL8mrmlWc0AE/RdiZn8U535azZS45sr9pGLvUh/uOp2wZTVwZBg4CnL12rH8dGCLFK lDSOs/eKxo7M3pTdW0e36a7uJ4osEMIrZiIDP5Frz8PgfF764pGP2roYf9ySLjPa1Jc/ l1OktXjdTf61PNcYbsTlzSnX1IlsulR798x2hEgAhRUsla6O7mBRrFddj78ATQUZLb7U ylLQ== X-Gm-Message-State: APjAAAWF4tQ4Fe/IxQw/mP933PGP4lXmM3Shr9aapeJI5IhFPp4qyoS/ 6Yde1REmwex2Yy57TVghkKTi6Q== X-Google-Smtp-Source: APXvYqycVbrheRWmSuI10jLm9yQOIA3BdFr8deqlfTumx2u6Pn+8hcM8H4pPBeNr76mcEsvZcvylgw== X-Received: by 2002:a17:90a:8a84:: with SMTP id x4mr90838017pjn.105.1564054033314; Thu, 25 Jul 2019 04:27:13 -0700 (PDT) Received: from dhcp-10-123-20-16.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id h1sm67214752pfo.152.2019.07.25.04.27.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 04:27:12 -0700 (PDT) From: Sumit Saxena To: helgaas@kernel.org, Christian.Koenig@amd.com Cc: linux-pci@vger.kernel.org, Sumit Saxena , stable@vger.kernel.org Subject: [PATCH V2] PCI: set BAR size bits correctly in Resize BAR control register Date: Fri, 26 Jul 2019 00:55:52 +0530 Message-Id: <20190725192552.24295-1-sumit.saxena@broadcom.com> X-Mailer: git-send-email 2.18.1 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In Resize BAR control register, bits[8:12] represents size of BAR. As per PCIe specification, below is encoded values in register bits to actual BAR size table: Bits BAR size 0 1 MB 1 2 MB 2 4 MB 3 8 MB -- For 1 MB BAR size, BAR size bits should be set to 0 but incorrectly these bits are set to "1f". Latest megaraid_sas and mpt3sas adapters which support Resizable BAR with 1 MB BAR size fails to initialize during system resume from S3 sleep. Fix: Correctly calculate BAR size bits for Resize BAR control register. V2: -Simplified calculation of BAR size bits as suggested by Christian Koenig. CC: stable@vger.kernel.org # v4.16+ Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203939 Fixes: d3252ace0bc652a1a244455556b6a549f969bf99 ("PCI: Restore resized BAR state on resume") Signed-off-by: Sumit Saxena --- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 29ed5ec1ac27..e59921296125 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1438,7 +1438,7 @@ static void pci_restore_rebar_state(struct pci_dev *pdev) pci_read_config_dword(pdev, pos + PCI_REBAR_CTRL, &ctrl); bar_idx = ctrl & PCI_REBAR_CTRL_BAR_IDX; res = pdev->resource + bar_idx; - size = order_base_2((resource_size(res) >> 20) | 1) - 1; + size = order_base_2(resource_size(res) >> 20); ctrl &= ~PCI_REBAR_CTRL_BAR_SIZE; ctrl |= size << PCI_REBAR_CTRL_BAR_SHIFT; pci_write_config_dword(pdev, pos + PCI_REBAR_CTRL, ctrl); -- 2.18.1