Commit f536b3ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc updates from Ben Herrenschmidt:
 "This is the powerpc new goodies for 3.17.  The short story:

  The biggest bit is Michael removing all of pre-POWER4 processor
  support from the 64-bit kernel.  POWER3 and rs64.  This gets rid of a
  ton of old cruft that has been bitrotting in a long while.  It was
  broken for quite a few versions already and nobody noticed.  Nobody
  uses those machines anymore.  While at it, he cleaned up a bunch of
  old dusty cabinets, getting rid of a skeletton or two.

  Then, we have some base VFIO support for KVM, which allows assigning
  of PCI devices to KVM guests, support for large 64-bit BARs on
  "powernv" platforms, support for HMI (Hardware Management Interrupts)
  on those same platforms, some sparse-vmemmap improvements (for memory
  hotplug),

  There is the usual batch of Freescale embedded updates (summary in the
  merge commit) and fixes here or there, I think that's it for the
  highlights"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (102 commits)
  powerpc/eeh: Export eeh_iommu_group_to_pe()
  powerpc/eeh: Add missing #ifdef CONFIG_IOMMU_API
  powerpc: Reduce scariness of interrupt frames in stack traces
  powerpc: start loop at section start of start in vmemmap_populated()
  powerpc: implement vmemmap_free()
  powerpc: implement vmemmap_remove_mapping() for BOOK3S
  powerpc: implement vmemmap_list_free()
  powerpc: Fail remap_4k_pfn() if PFN doesn't fit inside PTE
  powerpc/book3s: Fix endianess issue for HMI handling on napping cpus.
  powerpc/book3s: handle HMIs for cpus in nap mode.
  powerpc/powernv: Invoke opal call to handle hmi.
  powerpc/book3s: Add basic infrastructure to handle HMI in Linux.
  powerpc/iommu: Fix comments with it_page_shift
  powerpc/powernv: Handle compound PE in config accessors
  powerpc/powernv: Handle compound PE for EEH
  powerpc/powernv: Handle compound PE
  powerpc/powernv: Split ioda_eeh_get_state()
  powerpc/powernv: Allow to freeze PE
  powerpc/powernv: Enable M64 aperatus for PHB3
  powerpc/eeh: Aux PE data for error log
  ...
parents e6698305 537e5400

Documentation/devicetree/bindings/powerpc/fsl/board.txt

+16 −0
Original line number Diff line number Diff line
@@ -84,3 +84,19 @@ Example: 
		compatible = "fsl,bsc9132qds-fpga", "fsl,fpga-qixis-i2c";

		reg = <0x66>;

	};



* Freescale on-board CPLD



Some Freescale boards like T1040RDB have an on board CPLD connected.



Required properties:

- compatible: Should be a board-specific string like "fsl,<board>-cpld"

  Example:

	"fsl,t1040rdb-cpld", "fsl,t1042rdb-cpld", "fsl,t1042rdb_pi-cpld"

- reg: should describe CPLD registers



Example:

	cpld@3,0 {

		compatible = "fsl,t1040rdb-cpld";

		reg = <3 0 0x300>;

	};

Documentation/vfio.txt

+84 −3
Original line number Diff line number Diff line
@@ -305,7 +305,15 @@ faster, the map/unmap handling has been implemented in real mode which provides 
an excellent performance which has limitations such as inability to do

locked pages accounting in real time.



So 3 additional ioctls have been added:

4) According to sPAPR specification, A Partitionable Endpoint (PE) is an I/O

subtree that can be treated as a unit for the purposes of partitioning and

error recovery. A PE may be a single or multi-function IOA (IO Adapter), a

function of a multi-function IOA, or multiple IOAs (possibly including switch

and bridge structures above the multiple IOAs). PPC64 guests detect PCI errors

and recover from them via EEH RTAS services, which works on the basis of

additional ioctl commands.



So 4 additional ioctls have been added:



	VFIO_IOMMU_SPAPR_TCE_GET_INFO - returns the size and the start

		of the DMA window on the PCI bus.
@@ -316,9 +324,12 @@ So 3 additional ioctls have been added: 


	VFIO_IOMMU_DISABLE - disables the container.



	VFIO_EEH_PE_OP - provides an API for EEH setup, error detection and recovery.



The code flow from the example above should be slightly changed:



	struct vfio_eeh_pe_op pe_op = { .argsz = sizeof(pe_op), .flags = 0 };



	.....

	/* Add the group to the container */

	ioctl(group, VFIO_GROUP_SET_CONTAINER, &container);
@@ -342,9 +353,79 @@ The code flow from the example above should be slightly changed: 
	dma_map.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE;



	/* Check here is .iova/.size are within DMA window from spapr_iommu_info */



	ioctl(container, VFIO_IOMMU_MAP_DMA, &dma_map);

	.....



	/* Get a file descriptor for the device */

	device = ioctl(group, VFIO_GROUP_GET_DEVICE_FD, "0000:06:0d.0");



	....



	/* Gratuitous device reset and go... */

	ioctl(device, VFIO_DEVICE_RESET);



	/* Make sure EEH is supported */

	ioctl(container, VFIO_CHECK_EXTENSION, VFIO_EEH);



	/* Enable the EEH functionality on the device */

	pe_op.op = VFIO_EEH_PE_ENABLE;

	ioctl(container, VFIO_EEH_PE_OP, &pe_op);



	/* You're suggested to create additional data struct to represent

	 * PE, and put child devices belonging to same IOMMU group to the

	 * PE instance for later reference.

	 */



	/* Check the PE's state and make sure it's in functional state */

	pe_op.op = VFIO_EEH_PE_GET_STATE;

	ioctl(container, VFIO_EEH_PE_OP, &pe_op);



	/* Save device state using pci_save_state().

	 * EEH should be enabled on the specified device.

	 */



	....



	/* When 0xFF's returned from reading PCI config space or IO BARs

	 * of the PCI device. Check the PE's state to see if that has been

	 * frozen.

	 */

	ioctl(container, VFIO_EEH_PE_OP, &pe_op);



	/* Waiting for pending PCI transactions to be completed and don't

	 * produce any more PCI traffic from/to the affected PE until

	 * recovery is finished.

	 */



	/* Enable IO for the affected PE and collect logs. Usually, the

	 * standard part of PCI config space, AER registers are dumped

	 * as logs for further analysis.

	 */

	pe_op.op = VFIO_EEH_PE_UNFREEZE_IO;

	ioctl(container, VFIO_EEH_PE_OP, &pe_op);



	/*

	 * Issue PE reset: hot or fundamental reset. Usually, hot reset

	 * is enough. However, the firmware of some PCI adapters would

	 * require fundamental reset.

	 */

	pe_op.op = VFIO_EEH_PE_RESET_HOT;

	ioctl(container, VFIO_EEH_PE_OP, &pe_op);

	pe_op.op = VFIO_EEH_PE_RESET_DEACTIVATE;

	ioctl(container, VFIO_EEH_PE_OP, &pe_op);



	/* Configure the PCI bridges for the affected PE */

	pe_op.op = VFIO_EEH_PE_CONFIGURE;

	ioctl(container, VFIO_EEH_PE_OP, &pe_op);



	/* Restored state we saved at initialization time. pci_restore_state()

	 * is good enough as an example.

	 */



	/* Hopefully, error is recovered successfully. Now, you can resume to

	 * start PCI traffic to/from the affected PE.

	 */



	....



-------------------------------------------------------------------------------

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -5424,6 +5424,7 @@ F: arch/powerpc/boot/rs6000.h 
LINUX FOR POWERPC (32-BIT AND 64-BIT)

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

M:	Paul Mackerras <paulus@samba.org>

M:	Michael Ellerman <mpe@ellerman.id.au>

W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org

Q:	http://patchwork.ozlabs.org/project/linuxppc-dev/list/
@@ -5465,16 +5466,17 @@ F: arch/powerpc/*/*/*virtex* 


LINUX FOR POWERPC EMBEDDED PPC8XX

M:	Vitaly Bordug <vitb@kernel.crashing.org>

M:	Marcelo Tosatti <marcelo@kvack.org>

W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained

F:	arch/powerpc/platforms/8xx/



LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX

M:	Scott Wood <scottwood@freescale.com>

M:	Kumar Gala <galak@kernel.crashing.org>

W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git

S:	Maintained

F:	arch/powerpc/platforms/83xx/

F:	arch/powerpc/platforms/85xx/

arch/powerpc/boot/dts/fsl/p2041si-post.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ 
			compatible = "fsl,qoriq-core-mux-1.0";

			clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;

			clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";

			clock-output-names = "cmux2";

		};



		mux3: mux3@60 {

arch/powerpc/boot/dts/fsl/t2080si-post.dtsi

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * T2080 Silicon/SoC Device Tree Source (post include)

 *

 * Copyright 2013 Freescale Semiconductor Inc.

 *

 * 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.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



/include/ "t2081si-post.dtsi"



&soc {

/include/ "qoriq-sata2-0.dtsi"

	sata@220000 {

		fsl,iommu-parent = <&pamu1>;

		fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */

	};



/include/ "qoriq-sata2-1.dtsi"

	sata@221000 {

		fsl,iommu-parent = <&pamu1>;

		fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */

	};

};



&rio {

	compatible = "fsl,srio";

	interrupts = <16 2 1 11>;

	#address-cells = <2>;

	#size-cells = <2>;

	ranges;



	port1 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <1>;

	};



	port2 {

		#address-cells = <2>;

		#size-cells = <2>;

		cell-index = <2>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE