From patchwork Wed Nov 29 14:12:27 2017 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: 842572 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CUYkwuYj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yn2d82VhRz9s4s for ; Thu, 30 Nov 2017 01:15:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755179AbdK2OMi (ORCPT ); Wed, 29 Nov 2017 09:12:38 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:45672 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755176AbdK2OMg (ORCPT ); Wed, 29 Nov 2017 09:12:36 -0500 Received: by mail-wr0-f193.google.com with SMTP id h1so3495511wre.12; Wed, 29 Nov 2017 06:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GTkE7y71MCuhz9/aGVPdkn3KJIvnVkmKK+q+PVLpIqo=; b=CUYkwuYjjixa1i2+41vYnnzZhb5pQCRKonaL+qf5Y2rbHf6/pVtzzd6fjy+2K/Ucz0 xgCSKLIv/6h7fmILKNSqzUFs86pCz9U+V5qNJ7C7wY1mA+bS3nNfEMlFHhEGWhvlXt1O Djl1Q7Wl/ux51jLRGYSVlWXdO0S+siqYNlyi0VHmEN20jXg5ezmgWKq14KJn+RYDiYZJ B8ebZY2b7Z4A+4pLF5Y2Tgdeg+689+xviybkCGx56gdnCyTI/9FsurO0VfRnGTx0YjcL itZg29RRXE66dSGniBtjvtNHhFlK8+SKfvDXHoDUN5TSNky9iBH5L67yb5E55DbDX66+ CZPQ== 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=GTkE7y71MCuhz9/aGVPdkn3KJIvnVkmKK+q+PVLpIqo=; b=EEOKddT4c3/dvmP29jHJS/t/aFGlLt2PoSESMPRFOMPQcyK8w/I0R8CruOOPAL2qfv LUBrRvVlSc8uHoLonLJZ1Bp032VLgAdAPlyEV8kEWPM9UrzsGX8aUy6wmt+yLWjhKrnr Jpfxa3xptLxH9H1S7PA1hsrw8IWQhPSOi2LCMqigjhRatO0c5F2QLE8BpWhEtT50ujxY 6N4I61Z3jluixSwUEOsfui4DZeACw4uTSHIBrA2bG4k49MPJTk7nTs5WMb6jFADD2MSp gs1GNc/WHCfRte5+ohSAGzcx1QIkON+kZGvzJA2azX3a6Mq97i6NTtHwj41CCyX1uraZ XDEQ== X-Gm-Message-State: AJaThX6e7XTQ4pHV+By4pIrOl8JfgqPu7ZI7pdrdoS6HTmOKOdUuzoiq TR3MHH1+qUWAmLQEtHmLDtBQKA== X-Google-Smtp-Source: AGs4zMZfqYqUwMMGkAaqbU4Ymre9JxMeEWGNtXL6pn+lzfi8FfW8tLJoapNCtjK7fVrO+kBTfG0ezw== X-Received: by 10.223.176.121 with SMTP id g54mr2513865wra.165.1511964755535; Wed, 29 Nov 2017 06:12:35 -0800 (PST) Received: from localhost.localdomain ([2a02:908:1251:7981:a0f4:e653:80fe:4e7d]) by smtp.gmail.com with ESMTPSA id n12sm2533445wrn.76.2017.11.29.06.12.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 06:12:34 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: helgaas@kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] x86/PCI: fix infinity loop in search for 64bit BAR placement Date: Wed, 29 Nov 2017 15:12:27 +0100 Message-Id: <20171129141229.6107-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171129141229.6107-1-christian.koenig@amd.com> References: <20171129141229.6107-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 Break the loop if we can't find some address space for a 64bit BAR. Signed-off-by: Christian König --- arch/x86/pci/fixup.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index e59378bf37d9..e857b3ac5755 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -695,8 +695,13 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) res->end = 0xfd00000000ull - 1; /* Just grab the free area behind system memory for this */ - while ((conflict = request_resource_conflict(&iomem_resource, res))) + while ((conflict = request_resource_conflict(&iomem_resource, res))) { + if (conflict->end >= res->end) { + kfree(res); + return; + } res->start = conflict->end + 1; + } dev_info(&dev->dev, "adding root bus resource %pR\n", res); From patchwork Wed Nov 29 14:12:28 2017 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: 842566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f4AXwtR7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yn2Zn4l4Wz9t16 for ; Thu, 30 Nov 2017 01:13:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755196AbdK2OMj (ORCPT ); Wed, 29 Nov 2017 09:12:39 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36325 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755158AbdK2OMh (ORCPT ); Wed, 29 Nov 2017 09:12:37 -0500 Received: by mail-wr0-f194.google.com with SMTP id v105so3525636wrc.3; Wed, 29 Nov 2017 06:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nvTXZoufWzrJO+LDeiMqNHJeBGYJU0/WVyQ1Ajxwq0Q=; b=f4AXwtR7nptTpU3/n46R+xdQHsZ0pVB15MY4B5V665tabJGoDNakAp+RE55ht/ddGL 6h6uwQMBajjaA/l9XcfX22FCmpBz1YI3bQpRfa12JHQgd6uW741Bt+S3p90UQ3K89i7I yp5cEzgxa9rNLZBdhqYWitNyZFdCI/v3VSlPOpQSN1vbOryuLrZ/7lMrEZw/TPaqliC2 Ox1Vu6HWinhKGnYAoUVj0JOSE0/2YZyX4oLOKlqGFNvqPvyP7m0OlPNVgV4G8gQend2I xrCut71TetQmgiEEOYG3mk1o1q/iWgb/JoPm2Xi0O0mMtjI7KyRLWhZLECa28Nqov4a0 QGow== 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=nvTXZoufWzrJO+LDeiMqNHJeBGYJU0/WVyQ1Ajxwq0Q=; b=Lcfa2gH0RghgUD/dQKSr3wSwNV1rOB+l/bCciGlIpDI5uULQdrO9dIhhK1qvNaZc7L 2MzylgrX2rHbEd4zextrotLeS3sNx/jQRY5M9Rb+qqmBtbFHre4R/jROTeMwwbvNjWVE CWb/Voym2RhN/N+2nC75LzVeVbQAaPSEn6gxsruHYrgoxXFZ0qOfVUp260xR5vpXWXj4 6S5wIrgo/8xs8jDqK+WVA1r5+lDOmY/AxEOS4oHVNOVeQt2xejSgC/v+3D4g9dDwKxK8 SACsxiVFIkSORH0BL5bsPjmREbkzjtoKkDleM1wSBRTdzHhYVRTPGXMe1FgL+/4xFN5Y bnMg== X-Gm-Message-State: AJaThX62ZR9XFz85vagQpuTTFjWxTRBnOIISCY9nAoF2MN1TeacTQ+ZT XVz4tdUUD+ucyrmtb3WNpzc= X-Google-Smtp-Source: AGs4zMY2OAeYSr7IkvwKUeF9ZSoli1xQp2MqH4zihkyZlb+cZG3E4BHvvMXvowVI13T16i0MjXh2Fw== X-Received: by 10.223.138.182 with SMTP id y51mr2806383wry.273.1511964756366; Wed, 29 Nov 2017 06:12:36 -0800 (PST) Received: from localhost.localdomain ([2a02:908:1251:7981:a0f4:e653:80fe:4e7d]) by smtp.gmail.com with ESMTPSA id n12sm2533445wrn.76.2017.11.29.06.12.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 06:12:35 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: helgaas@kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] x86/PCI: only enable a 64bit BAR on single socket AMD Family 15h systems Date: Wed, 29 Nov 2017 15:12:28 +0100 Message-Id: <20171129141229.6107-3-christian.koenig@amd.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171129141229.6107-1-christian.koenig@amd.com> References: <20171129141229.6107-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 When we have a multi socket system each CPU core needs the same setup. Since this is tricky to do in the fixup code disable enabling a 64bit BAR on multi socket systems for now. Signed-off-by: Christian König --- arch/x86/pci/fixup.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index e857b3ac5755..c817ab85dc82 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -664,6 +664,16 @@ 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; + + /* Check that we are the only device of that type */ + other = pci_get_device(dev->vendor, dev->device, NULL); + if (other != dev || + (other = pci_get_device(dev->vendor, dev->device, other))) { + /* This is a multi socket system, don't touch it for now */ + pci_dev_put(other); + return; + } for (i = 0; i < 8; i++) { pci_read_config_dword(dev, AMD_141b_MMIO_BASE(i), &base); @@ -718,10 +728,10 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) pci_bus_add_resource(dev->bus, res, 0); } -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1401, pci_amd_enable_64bit_bar); -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x141b, pci_amd_enable_64bit_bar); -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1571, pci_amd_enable_64bit_bar); -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar); -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1401, pci_amd_enable_64bit_bar); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x141b, pci_amd_enable_64bit_bar); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1571, pci_amd_enable_64bit_bar); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar); #endif From patchwork Wed Nov 29 14:12:29 2017 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: 842571 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RQ6xr9Yv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yn2d24680z9t16 for ; Thu, 30 Nov 2017 01:15:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752496AbdK2OPe (ORCPT ); Wed, 29 Nov 2017 09:15:34 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:40391 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755177AbdK2OMi (ORCPT ); Wed, 29 Nov 2017 09:12:38 -0500 Received: by mail-wm0-f65.google.com with SMTP id v19so6219827wmh.5; Wed, 29 Nov 2017 06:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Xln0oqFk9lBSidtyef33RJAT/t+eYSTzjPxSU3zbPWc=; b=RQ6xr9Yvo6hd3aKZb/OJlI+FN5pNtIdOHpkjzAPBx2u9/ReoaHla3V0D/pRJYw5oyN FHgdnyg/d4oef0VxxaGyXyj5BF10ldpSZqdL8mQS7JQqS7bWADlGa+aevBZXBHZGsM4q vpGsnemS93+swk3me60slGa8G5QrmLaLGXmyUpP2Wq6ffmcSO7jbFJxcPvN90jG8+RgF 0X/AnjEhUU5vlyrF7ZCYzpNsiv9wXtmuXWGHJ9ocXssqErMadYpntshZyHNYzB4lwXpx 2iO7c37R1tffU5K9tPe25Ysfk1zo6eB+Rx1KKP7P/13Pf+5NMWyw2ZdAA/WxwRkllpD/ +0/g== 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=Xln0oqFk9lBSidtyef33RJAT/t+eYSTzjPxSU3zbPWc=; b=rDVbGg3Adb3hvJVcUkj5QStzYvFX4cZGJTiOBB2pcc9s/2y4xEmr5rhaPqN4KGtrmJ sy8RkLyXe/pc6m0nwOq3aapYwx6/698rfLv09Vm3ErOJASwzJ/32XvfqCHEUa/czILvT XJKhxE6FyUcAyCxtvpLh4tFrzZVRM1tc2gTvZAfXx99fNnJUV8thmBraVRP4iyZ35mhy VKfAjeDLxf9fhI8Q02IhPtaOUsuwcq/0dqnlldnoU6dQTywhe8c/tGLsfLwedFSRP9Je upCP+M7MxidF6QX4cmwagDadhbAjMInRC/23uxLJCncV5HDE/jf7BBeU/xDhBhWJJzTP IF+w== X-Gm-Message-State: AJaThX57F+DI7P2dmpSTscb9ieodrSxwHLLXOOuWbjgiqUHK+VoOgmSr 6c2zs78arahWnNyY4xKsf1JIFg== X-Google-Smtp-Source: AGs4zMYgpAQ+Tvky5g3i8WaeFV7KXGE9yfk2E0gfofVRfKW1BHQxVjD0viXjYSHjEeRlMqYHyPPKUw== X-Received: by 10.28.144.67 with SMTP id s64mr2812204wmd.83.1511964757438; Wed, 29 Nov 2017 06:12:37 -0800 (PST) Received: from localhost.localdomain ([2a02:908:1251:7981:a0f4:e653:80fe:4e7d]) by smtp.gmail.com with ESMTPSA id n12sm2533445wrn.76.2017.11.29.06.12.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 06:12:36 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: helgaas@kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] x86/PCI: limit the size of the 64bit BAR to 256GB Date: Wed, 29 Nov 2017 15:12:29 +0100 Message-Id: <20171129141229.6107-4-christian.koenig@amd.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171129141229.6107-1-christian.koenig@amd.com> References: <20171129141229.6107-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 This avoids problems with Xen which hides some memory resources from the OS and potentially also allows memory hotplug while this fixup is enabled. Signed-off-by: Christian König --- arch/x86/pci/fixup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index c817ab85dc82..149adbc7f2a3 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -701,7 +701,7 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) 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 */