From patchwork Thu Aug 8 22:45:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 265864 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 922282C01B2 for ; Fri, 9 Aug 2013 08:45:41 +1000 (EST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe005.messaging.microsoft.com [216.32.181.185]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "MSIT Machine Auth CA 2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 4E3092C00AC for ; Fri, 9 Aug 2013 08:45:12 +1000 (EST) Received: from mail86-ch1-R.bigfish.com (10.43.68.240) by CH1EHSOBE011.bigfish.com (10.43.70.61) with Microsoft SMTP Server id 14.1.225.22; Thu, 8 Aug 2013 22:45:08 +0000 Received: from mail86-ch1 (localhost [127.0.0.1]) by mail86-ch1-R.bigfish.com (Postfix) with ESMTP id 3847C2A005C; Thu, 8 Aug 2013 22:45:08 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -1 X-BigFish: VS-1(zz936eIzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz8275dh1de097hz2dh2a8h668h839h944hd25hf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h14ddh1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1fe8h1155h) Received: from mail86-ch1 (localhost.localdomain [127.0.0.1]) by mail86-ch1 (MessageSwitch) id 1376001906386943_29751; Thu, 8 Aug 2013 22:45:06 +0000 (UTC) Received: from CH1EHSMHS004.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.248]) by mail86-ch1.bigfish.com (Postfix) with ESMTP id 53D27420047; Thu, 8 Aug 2013 22:45:06 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS004.bigfish.com (10.43.70.4) with Microsoft SMTP Server (TLS) id 14.16.227.3; Thu, 8 Aug 2013 22:45:06 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.3.136.1; Thu, 8 Aug 2013 22:45:05 +0000 Received: from home.buserror.net ([10.214.86.46]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r78Mj1kC025421; Thu, 8 Aug 2013 15:45:03 -0700 Date: Thu, 8 Aug 2013 17:45:01 -0500 From: Scott Wood To: Subject: Pull request: scottwood/linux.git next Message-ID: <20130808224501.GA8925@home.buserror.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b: Linux 3.11-rc2 (2013-07-21 12:05:29 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git next for you to fetch changes up to c8db32c8669f7de05b820ee4934926405af52188: powerpc/e500: Update compilation flags with core specific options (2013-08-07 18:49:44 -0500) ---------------------------------------------------------------- Catalin Udma (2): powerpc/perf: increase the perf HW events to 6 powerpc/e500: Update compilation flags with core specific options Dongsheng Wang (1): powerpc/mpc85xx: invalidate TLB after hibernation resume Haijun.Zhang (2): powerpc/85xx: add P1020RDB-PD platform support powerpc/85xx: add the P1020RDB-PD DTS support Hongtao Jia (3): powerpc: Move opcode definitions from kvm/emulate.c to asm/ppc-opcode.h powerpc/85xx: Add machine check handler to fix PCIe erratum on mpc85xx powerpc/msi: Fix compile error on mpc83xx Ian Campbell (1): powerpc/fsl-booke: Rename b4qds.dts -> b4qds.dtsi. Kevin Hao (3): powerpc/mpc85xx: remove the unneeded pci init functions for corenet ds board powerpc/fsl-pci: fix the unreachable warning message powerpc/fsl-pci: enable SWIOTLB in function setup_pci_atmu Laurentiu TUDOR (1): powerpc/85xx: Move ePAPR paravirt initialization earlier Lijun Pan (2): powerpc/perf: correct typos in counter enumeration powerpc/perf: add 2 additional performance monitor counters for e6500 core Minghuan Lian (3): powerpc/dts: update MSI bindings doc for MPIC v4.3 powerpc/dts: add MPIC v4.3 dts node powerpc/fsl_msi: add MSIIR1 support for MPIC v4.3 Priyanka Jain (1): powerpc/perf: Add e6500 PMU driver Wei Yongjun (1): powerpc/fsl_msi: fix error return code in fsl_of_msi_probe() Yuanquan Chen (1): powerpc/pci: fix PCI-e check link issue Zhenhua Luo (1): powerpc/fsl: Enable CONFIG_DEVTMPFS_MOUNT so /dev can be mounted correctly .../devicetree/bindings/powerpc/fsl/msi-pic.txt | 53 +++- arch/powerpc/Makefile | 18 +- arch/powerpc/boot/dts/b4420qds.dts | 2 +- arch/powerpc/boot/dts/b4860qds.dts | 2 +- arch/powerpc/boot/dts/{b4qds.dts => b4qds.dtsi} | 0 arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 2 +- arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi | 149 +++++++++++ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 2 +- arch/powerpc/boot/dts/p1020rdb-pd.dts | 280 +++++++++++++++++++++ arch/powerpc/configs/85xx/p1023rds_defconfig | 1 + arch/powerpc/configs/corenet32_smp_defconfig | 1 + arch/powerpc/configs/corenet64_smp_defconfig | 1 + arch/powerpc/configs/mpc83xx_defconfig | 1 + arch/powerpc/configs/mpc85xx_defconfig | 1 + arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + arch/powerpc/include/asm/epapr_hcalls.h | 6 + arch/powerpc/include/asm/mpic.h | 7 + arch/powerpc/include/asm/perf_event_fsl_emb.h | 2 +- arch/powerpc/include/asm/ppc-opcode.h | 47 ++++ arch/powerpc/include/asm/reg_fsl_emb.h | 24 +- arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- arch/powerpc/kernel/cputable.c | 2 +- arch/powerpc/kernel/epapr_paravirt.c | 28 ++- arch/powerpc/kernel/setup_32.c | 4 +- arch/powerpc/kernel/setup_64.c | 3 + arch/powerpc/kernel/swsusp_booke.S | 8 + arch/powerpc/kernel/traps.c | 3 + arch/powerpc/kvm/emulate.c | 45 +--- arch/powerpc/oprofile/op_model_fsl_emb.c | 30 +++ arch/powerpc/perf/Makefile | 2 +- arch/powerpc/perf/core-fsl-emb.c | 30 +++ arch/powerpc/perf/e6500-pmu.c | 121 +++++++++ arch/powerpc/platforms/85xx/corenet_ds.c | 6 - arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 22 ++ arch/powerpc/sysdev/fsl_msi.c | 137 +++++++--- arch/powerpc/sysdev/fsl_msi.h | 10 +- arch/powerpc/sysdev/fsl_pci.c | 184 ++++++++++++-- arch/powerpc/sysdev/fsl_pci.h | 6 + 38 files changed, 1088 insertions(+), 155 deletions(-) rename arch/powerpc/boot/dts/{b4qds.dts => b4qds.dtsi} (100%) create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi create mode 100644 arch/powerpc/boot/dts/p1020rdb-pd.dts create mode 100644 arch/powerpc/perf/e6500-pmu.c