From patchwork Thu Jan 11 13:23:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10157995 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7AEF160170 for ; Thu, 11 Jan 2018 13:23:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E48F28700 for ; Thu, 11 Jan 2018 13:23:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 330132878C; Thu, 11 Jan 2018 13:23:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABB3D28700 for ; Thu, 11 Jan 2018 13:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933507AbeAKNXi (ORCPT ); Thu, 11 Jan 2018 08:23:38 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:37549 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753517AbeAKNXg (ORCPT ); Thu, 11 Jan 2018 08:23:36 -0500 Received: by mail-wr0-f195.google.com with SMTP id f8so2145370wre.4; Thu, 11 Jan 2018 05:23:36 -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 :mime-version:content-transfer-encoding; bh=j3bbINIZkKyctbMlFzu70EFk3ATBmCDDlcVz/gyeXsg=; b=pB8xnbgf47E13QFjsU7yOCzS5jznRb6UgzC8iJVA4hOgWl/O1aRuRHfrI001I9iR+0 jjX6tAiZi6lynjCqAyEryAV2m1NGw6ZKPzzJ/NSvNP/TL5yFFjsTDU9feg/25HQQwIcX OHNofHQw2Y2/UDD1HWOAXZhNBRzW1LTPpIgw+WMiDBAKZ2L1XOzHYJM/WjaPytr+Mfcd aMFxQLISUFIyp96YX1u1DqKYO9jmeVgC2CiY9hhxoc+L5Dif+aQdDz3ckFgYjvFjFa5W q1LplvzybiwjOQhYOtsUELNGF0mR+aMj/8Esm3qeqBqnbe26eN6QU48iPbkCYFWfyDyG CB0A== 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:mime-version:content-transfer-encoding; bh=j3bbINIZkKyctbMlFzu70EFk3ATBmCDDlcVz/gyeXsg=; b=pMavDH6NRGyQPAv+ROaTMxeOK4QPiHoxklw10MoLiGPrazzfGc24oZpzGQo81lSspt Hq4wzBq5Df5JrdC6T6DhDhilS50o2qc53DLiMMouhaRCZr6sJjiPRftyuzHoESQtBLUN JraeUySYaefYJBhuUNuozJed3wukXQCfCHHOhAuP/7gnNni99mQi/3FxfaxzlBjuDxxW sDa51BJalTfD5DMtIC0r/D+C8rvoBlU6fC9t/J/pHvtaiehWUwU7QLbCoSbonVeJI0bP xz1DV8ugfHTcwLQfTRlnPfriNzYvFUpJ51jRakSDKdrVeHja/zbEHukPyREs3zoK6aBM uncA== X-Gm-Message-State: AKwxyteBGmF2PlLE+rUS01/d/tghNSWwviwjPE2cmcfDcwWR8hWmGHVJ 6g/U8FiBlbDrxzNpI/vxLKY= X-Google-Smtp-Source: ACJfBouSDZQwUjIjYcozgHG/7E5tm2zl8l0DxKtd5TNbwLgrIZe4gFZtrgE1zYABWuU42J/gZC5wKg== X-Received: by 10.223.184.58 with SMTP id h55mr4629067wrf.110.1515677015530; Thu, 11 Jan 2018 05:23:35 -0800 (PST) Received: from localhost.localdomain ([2a02:908:1251:8fc0:2199:5620:a0d:dbf6]) by smtp.gmail.com with ESMTPSA id a126sm357583wma.11.2018.01.11.05.23.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 05:23:34 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: bhelgaas@google.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Cc: torvalds@linux-foundation.org, aaro.koskinen@iki.fi, andy.shevchenko@gmail.com, boris.ostrovsky@oracle.com, jgross@suse.com, alexander.deucher@amd.com, airlied@linux.ie Subject: [PATCH 2/2] x86/PCI: limit the size of the 64bit window to 256GB v3 Date: Thu, 11 Jan 2018 14:23:30 +0100 Message-Id: <20180111132330.2682-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180111132330.2682-1-christian.koenig@amd.com> References: <20180111132330.2682-1-christian.koenig@amd.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Avoid problems with BIOS implementations which don't report all used resources to the OS by only allocating a 256GB window directly below the hardware limit. For the full hardware documentation see: https://support.amd.com/TechDocs/49125_15h_Models_30h-3Fh_BKDG.pdf Fixes a silent reboot loop reported by Aaro Koskinen on an AMD-based MSI MS-7699/760GA-P43(FX) system. v2: cleanup code a bit more, update comment and explain the hw limit v3: improve commit message Link: https://lkml.kernel.org/r/20180105220412.fzpwqe4zljdawr36@darkstar.musicnaut.iki.fi Reported-by: Aaro Koskinen Signed-off-by: Christian König --- arch/x86/pci/fixup.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index a91280da2ea1..9c1c98d7e3a7 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -662,10 +662,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid); */ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) { - unsigned i; u32 base, limit, high; - struct resource *res, *conflict; struct pci_dev *other; + struct resource *res; + unsigned i; + int r; if (!(pci_probe & PCI_BIG_ROOT_WINDOW)) return; @@ -702,19 +703,17 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) if (!res) return; + /* Allocate a 256GB window directly below the 0xfd00000000 hw limit */ res->name = "PCI Bus 0000:00"; res->flags = IORESOURCE_PREFETCH | IORESOURCE_MEM | IORESOURCE_MEM_64 | IORESOURCE_WINDOW; - res->start = 0x100000000ull; + res->start = 0xbd00000000ull; res->end = 0xfd00000000ull - 1; - /* Just grab the free area behind system memory for this */ - while ((conflict = request_resource_conflict(&iomem_resource, res))) { - if (conflict->end >= res->end) { - kfree(res); - return; - } - res->start = conflict->end + 1; + r = request_resource(&iomem_resource, res); + if (r) { + kfree(res); + return; } dev_info(&dev->dev, "adding root bus resource %pR\n", res);