IB/ipath: More changes to support InfiniPath on PowerPC 970 systems (eb9dc6f4) · Commits · 戴 / test

drivers/infiniband/hw/ipath/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ ipath_core-y := \
		ipath_user_pages.o

		ipath_core-$(CONFIG_X86_64) += ipath_wc_x86_64.o
		ipath_core-$(CONFIG_PPC64) += ipath_wc_ppc64.o

		ib_ipath-y := \
		ipath_cq.o \

drivers/infiniband/hw/ipath/ipath_driver.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -440,7 +440,13 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
		}
		dd->ipath_pcirev = rev;

		#if defined(__powerpc__)
		/* There isn't a generic way to specify writethrough mappings */
		dd->ipath_kregbase = __ioremap(addr, len,
		(_PAGE_NO_CACHE\|_PAGE_WRITETHRU));
		#else
		dd->ipath_kregbase = ioremap_nocache(addr, len);
		#endif

		if (!dd->ipath_kregbase) {
		ipath_dbg("Unable to map io addr %llx to kvirt, failing\n",

drivers/infiniband/hw/ipath/ipath_file_ops.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -985,6 +985,13 @@ static int mmap_piobufs(struct vm_area_struct *vma,
		* write combining behavior we want on the PIO buffers!
		*/

		#if defined(__powerpc__)
		/* There isn't a generic way to specify writethrough mappings */
		pgprot_val(vma->vm_page_prot) \|= _PAGE_NO_CACHE;
		pgprot_val(vma->vm_page_prot) \|= _PAGE_WRITETHRU;
		pgprot_val(vma->vm_page_prot) &= ~_PAGE_GUARDED;
		#endif

		if (vma->vm_flags & VM_READ) {
		dev_info(&dd->pcidev->dev,
		"Can't map piobufs as readable (flags=%lx)\n",

drivers/infiniband/hw/ipath/ipath_wc_ppc64.c

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2006 QLogic, Inc. All rights reserved.
		*
		* This software is available to you under a choice of one of two
		* licenses. You may choose to be licensed under the terms of the GNU
		* General Public License (GPL) Version 2, available from the file
		* COPYING in the main directory of this source tree, or the
		* OpenIB.org BSD license below:
		*
		* Redistribution and use in source and binary forms, with or
		* without modification, are permitted provided that the following
		* conditions are met:
		*
		* - Redistributions of source code must retain the above
		* copyright notice, this list of conditions and the following
		* disclaimer.
		*
		* - Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials
		* provided with the distribution.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
		* SOFTWARE.
		*/

		/*
		* This file is conditionally built on PowerPC only. Otherwise weak symbol
		* versions of the functions exported from here are used.
		*/

		#include "ipath_kernel.h"

		/**
		* ipath_unordered_wc - indicate whether write combining is ordered
		*
		* PowerPC systems (at least those in the 970 processor family)
		* write partially filled store buffers in address order, but will write
		* completely filled store buffers in "random" order, and therefore must
		* have serialization for correctness with current InfiniPath chips.
		*
		*/
		int ipath_unordered_wc(void)
		{
		return 1;
		}

Admin message