Commit 205b9c9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc fixes from Benjamin Herrenschmidt:
 "Here are a few fixes for powerpc.  Note the addition to the generic
  irq.h.  This is part of a 3-patches regression fix for mpic due to
  changes in how IRQ_TYPE_NONE is being handled.  Thomas agreed to the
  addition of the new IRQ_TYPE_DEFAULT contant, however he hasn't
  replied with an Ack to the actual patch yet.  I don't to wait much
  longer with these patches tho."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/mpic: Properly set default triggers
  irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers
  powerpc/mpic: Fix confusion between hw_irq and virq
  powerpc/pmac: Don't add_timer() twice
  powerpc/eeh: Fix crash caused by null eeh_dev
  powerpc/mpc85xx: add MPIC message dts node
  powerpc/mpic_msgr: fix offset error when setting mer register
  powerpc/mpic_msgr: add lock for MPIC message global variable
  powerpc/mpic_msgr: fix compile error when SMP disabled
  powerpc: fix build when CONFIG_BOOKE_WDT is enabled
  powerpc/85xx: don't call of_platform_bus_probe() twice
parents 7e296295 446f6d06

arch/powerpc/boot/dts/fsl/pq3-mpic-message-B.dtsi

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

 * PQ3 MPIC Message (Group B) device tree stub [ controller @ offset 0x42400 ]

 *

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

 */



message@42400 {

	compatible = "fsl,mpic-v3.1-msgr";

	reg = <0x42400 0x200>;

	interrupts = <

		0xb4 2 0 0

		0xb5 2 0 0

		0xb6 2 0 0

		0xb7 2 0 0>;

};

arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -53,6 +53,16 @@ timer@41100 { 
		      3 0 3 0>;

};



message@41400 {

	compatible = "fsl,mpic-v3.1-msgr";

	reg = <0x41400 0x200>;

	interrupts = <

		0xb0 2 0 0

		0xb1 2 0 0

		0xb2 2 0 0

		0xb3 2 0 0>;

};



msi@41600 {

	compatible = "fsl,mpic-msi";

	reg = <0x41600 0x80>;

arch/powerpc/include/asm/mpic.h

+0 −18
Original line number Diff line number Diff line
@@ -275,9 +275,6 @@ struct mpic 
	unsigned int		isu_mask;

	/* Number of sources */

	unsigned int		num_sources;

	/* default senses array */

	unsigned char		*senses;

	unsigned int		senses_count;



	/* vector numbers used for internal sources (ipi/timers) */

	unsigned int		ipi_vecs[4];
@@ -415,21 +412,6 @@ extern struct mpic *mpic_alloc(struct device_node *node, 
extern void mpic_assign_isu(struct mpic *mpic, unsigned int isu_num,

			    phys_addr_t phys_addr);



/* Set default sense codes

 *

 * @mpic:	controller

 * @senses:	array of sense codes

 * @count:	size of above array

 *

 * Optionally provide an array (indexed on hardware interrupt numbers

 * for this MPIC) of default sense codes for the chip. Those are linux

 * sense codes IRQ_TYPE_*

 *

 * The driver gets ownership of the pointer, don't dispose of it or

 * anything like that. __init only.

 */

extern void mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count);





/* Initialize the controller. After this has been called, none of the above

 * should be called again for this mpic

arch/powerpc/include/asm/mpic_msgr.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/types.h>

#include <linux/spinlock.h>

#include <asm/smp.h>



struct mpic_msgr {

	u32 __iomem *base;

arch/powerpc/include/asm/reg_booke.h

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 
#ifndef __ASM_POWERPC_REG_BOOKE_H__

#define __ASM_POWERPC_REG_BOOKE_H__



#ifdef CONFIG_BOOKE_WDT

extern u32 booke_wdt_enabled;

extern u32 booke_wdt_period;

#endif /* CONFIG_BOOKE_WDT */



/* Machine State Register (MSR) Fields */

#define MSR_GS		(1<<28) /* Guest state */

#define MSR_UCLE	(1<<26)	/* User-mode cache lock enable */

CRA Git | Maintained and supported by SUSTech CRA and CCSE