linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
	David Miller <davem@davemloft.net>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Wei Yang <weiyang@linux.vnet.ibm.com>, TJ <linux@iam.tj>,
	Yijing Wang <wangyijing@huawei.com>,
	Khalid Aziz <khalid.aziz@oracle.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>,
	Paul Mackerras <paulus@samba.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Gavin Shan <gwshan@linux.vnet.ibm.com>,
	Anton Blanchard <anton@samba.org>,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v9 09/60] powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
Date: Thu, 10 Dec 2015 21:06:05 -0800	[thread overview]
Message-ID: <1449810416-2950-10-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1449810416-2950-1-git-send-email-yinghai@kernel.org>

For device resource PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource, so set
IORESOUCE_MEM_64 for 64bit resource during of device resource flags
parsing.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261
Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
---
 arch/powerpc/kernel/pci_of_scan.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 349ed11..d7305d7 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -44,8 +44,10 @@ static unsigned int pci_parse_of_flags(u32 addr0, int bridge)
 
 	if (addr0 & 0x02000000) {
 		flags = IORESOURCE_MEM | PCI_BASE_ADDRESS_SPACE_MEMORY;
-		flags |= (addr0 >> 22) & PCI_BASE_ADDRESS_MEM_TYPE_64;
 		flags |= (addr0 >> 28) & PCI_BASE_ADDRESS_MEM_TYPE_1M;
+		if (addr0 & 0x01000000)
+			flags |= IORESOURCE_MEM_64
+				 | PCI_BASE_ADDRESS_MEM_TYPE_64;
 		if (addr0 & 0x40000000)
 			flags |= IORESOURCE_PREFETCH
 				 | PCI_BASE_ADDRESS_MEM_PREFETCH;
-- 
1.8.4.5


  parent reply	other threads:[~2015-12-11  5:25 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-11  5:05 [PATCH v9 00/60] PCI: Resource allocation cleanup for v4.5 Yinghai Lu
2015-12-11  5:05 ` [PATCH v9 01/60] PCI: Add pci_find_root_bus_resource() Yinghai Lu
2015-12-11  5:05 ` [PATCH v9 02/60] sparc/PCI: Use correct bus address to resource offset Yinghai Lu
2015-12-11  5:05 ` [PATCH v9 03/60] sparc/PCI: Reserve legacy mmio after PCI mmio Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 04/60] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 05/60] sparc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 06/60] PCI: Kill wrong quirk about M7101 Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 07/60] PCI: Ignore BAR for ALi M1533 PCI-ISA bridge Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 08/60] powerpc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2015-12-11  5:06 ` Yinghai Lu [this message]
2015-12-11  5:06 ` [PATCH v9 10/60] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 11/60] PCI: Check pref compatible bit for mem64 resource of PCIe device Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 12/60] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64 Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 13/60] PCI: Add has_mem64 for struct host_bridge Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 14/60] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 15/60] PCI: Restore pref MMIO allocation logic for host bridge without mmio64 Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 16/60] PCI: Don't release fixed resource for realloc Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 17/60] PCI: Claim fixed resource during remove/rescan path Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 18/60] PCI: Set resource to FIXED for LSI devices Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 19/60] PCI: Separate realloc list checking after allocation Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 20/60] PCI: Treat optional as required in first try for bridge rescan Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 21/60] PCI: Get new realloc size for bridge for last try Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 22/60] PCI: Don't release sibling bridge resources during hotplug Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 23/60] PCI: Cleanup res_to_dev_res() printout Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 24/60] PCI: Reuse res_to_dev_res() in reassign_resources_sorted() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 25/60] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 26/60] PCI: Optimize bus min_align/size calculation during sizing Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 27/60] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 28/60] PCI: Don't add too much optional size for hotplug bridge MMIO Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 29/60] PCI: Reorder resources list for required/optional resources Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 30/60] PCI: Remove duplicated code for resource sorting Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 31/60] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 32/60] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 33/60] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 34/60] PCI: Simplify res reference using in __assign_resources_sorted() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 35/60] PCI: Add __add_to_list() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 36/60] PCI: Cache window alignment value during bus sizing Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 37/60] PCI: Check if resource is allocated before trying to assign one Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 38/60] PCI: Separate out save_resources()/restore_resources() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 39/60] PCI: Move comment to pci_need_to_release() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 40/60] PCI: Separate required+optional assigning to another function Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 41/60] PCI: Skip required+optional if there is no optional Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 42/60] PCI: Move saved required resource list out of required+optional assigning Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 43/60] PCI: Add alt_size ressource allocation support Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 44/60] PCI: Add support for more than two alt_size entries under same bridge Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 45/60] PCI: Fix size calculation with old_size on rescan path Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 46/60] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 47/60] PCI: Move ISA io port align out of calculate_iosize() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 48/60] PCI: Don't add too much io port for hotplug bridge with old size Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 49/60] PCI: Unify calculate_size() for io port and MMIO Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 50/60] PCI: Allow bridge optional only io port resource required size to be 0 Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 51/60] PCI: Unify skip_ioresource_align() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 52/60] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 53/60] resources: Split out __allocate_resource() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 54/60] resources: Make allocate_resource() return best fit resource Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 55/60] PCI, x86: Allocate from high in available window for MMIO Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 56/60] PCI: Add debug print out for min_align and alt_size Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 57/60] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 58/60] PCI: Introduce resource_disabled() Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 59/60] PCI: Don't set flags to 0 when assign resource fail Yinghai Lu
2015-12-11  5:06 ` [PATCH v9 60/60] PCI: Only try to assign io port only for root bus that support it Yinghai Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449810416-2950-10-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=anton@samba.org \
    --cc=benh@kernel.crashing.org \
    --cc=bhelgaas@google.com \
    --cc=davem@davemloft.net \
    --cc=gwshan@linux.vnet.ibm.com \
    --cc=khalid.aziz@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux@iam.tj \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    --cc=wangyijing@huawei.com \
    --cc=weiyang@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).