Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review/opal irq #185

Closed
wants to merge 28 commits into from
Closed

Review/opal irq #185

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
202648a
powerpc: Constify irq_domain_ops
krzk Apr 27, 2015
2222ce0
powerpc/pseries: Fix possible leaked device node reference
nfont Apr 30, 2015
f1e7c20
powerpc: Make STRICT_MM_TYPECHECKS a config option
mpe Mar 25, 2015
5af7a6f
powerpc/pasemi: Only the build the pasemi MSI code for PASEMI=y
mpe Apr 10, 2015
5c0aebf
powerpc: Show utsname->machine in boot-up banner
mpe Apr 15, 2015
e79c838
powerpc: Don't do gcc version checks if we're building with clang
mpe Apr 21, 2015
60e065f
powerpc: Reject binutils 2.24 when building little endian
mpe Apr 23, 2015
63da88d
powerpc/vdso: Remove unused debug code
mpe Apr 22, 2015
6e5c077
powerpc/vdso: Combine start/size variables
mpe Apr 22, 2015
e0d0059
powerpc/vdso: Disable building the 32-bit VDSO on little endian
mpe May 11, 2015
a14ab6b
powerpc/cell: Drop cbe-oss-dev mailing list from MAINTAINERS
mpe May 1, 2015
38c0488
powerpc/powernv: Silence SYSPARAM warning on boot
shenki Apr 30, 2015
ed3e81f
powerpc/eeh: Move PE state constants around
Mar 26, 2015
ec33d36
powerpc/eeh: Introduce eeh_pe_inject_err()
Mar 26, 2015
68cbbc3
drivers/vfio: Support EEH error injection
Mar 26, 2015
3721352
powerpc/eeh: fix start/end/flags type in struct pci_io_addr_range{}
Apr 27, 2015
2ac3990
powerpc/eeh: fix comment for wait_state()
Apr 27, 2015
e17866d
powerpc/eeh: fix powernv_eeh_wait_state delay logic
Apr 27, 2015
f77ceb7
powerpc/eeh: remove unused macro IS_BRIDGE
Apr 27, 2015
636f0ca
powerpc/powernv: Reorder OPAL subsystem initialisation
apopple May 15, 2015
48d4d6a
powerpc/powernv: Add a virtual irqchip for opal events
apopple May 15, 2015
982209d
ipmi/powernv: Convert to irq event interface
apopple May 15, 2015
581db24
hvc: Convert to using interrupts instead of opal events
apopple May 15, 2015
d08367d
powernv/eeh: Update the EEH code to use the opal irq domain
apopple May 15, 2015
b43cd82
powernv/opal: Convert opal message events to opal irq domain
apopple May 15, 2015
f363354
powernv/elog: Convert elog to opal irq domain
apopple May 15, 2015
6afa005
powernv/opal-dump: Convert to irq domain
apopple May 15, 2015
ab7937e
opal: Remove events notifier
apopple May 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
powerpc/pasemi: Only the build the pasemi MSI code for PASEMI=y 
The pasemi MSI code is currently always built when MPIC=y && PCI_MSI=y.
It should not have any effect on other platforms, because it immediately
checks the MPIC's compatible property for "pasemi,pwrficient-openpic".

However it's odd that it's still built even when PASEMI=n. It also
needn't be in sysdev, as it's only used by pasemi. So move it into
platforms/pasemi, whereby it will only be built for PASEMI=y.

Signed-off-by: Michael Ellerman <[email protected]>
  • Loading branch information
@mpe
mpe committed May 11, 2015
commit 5af7a6f3e2d015dcaaeffa48c6d47238415cbe66
1 change: 1 addition & 0 deletions arch/powerpc/platforms/pasemi/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o misc.o
obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
obj-$(CONFIG_PCI_MSI) += msi.o
4 changes: 1 addition & 3 deletions arch/powerpc/sysdev/mpic_pasemi_msi.c → arch/powerpc/platforms/pasemi/msi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*
*/

#undef DEBUG

#include <linux/irq.h>
#include <linux/msi.h>
#include <asm/mpic.h>
Expand All @@ -23,7 +21,7 @@
#include <asm/ppc-pci.h>
#include <asm/msi_bitmap.h>

#include "mpic.h"
#include <sysdev/mpic.h>

/* Allocate 16 interrupts per device, to give an alignment of 16,
* since that's the size of the grouping w.r.t. affinity. If someone
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/sysdev/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror

ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)

mpic-msi-obj-$(CONFIG_PCI_MSI) += mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o
mpic-msi-obj-$(CONFIG_PCI_MSI) += mpic_msi.o mpic_u3msi.o
obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y)
obj-$(CONFIG_MPIC_TIMER) += mpic_timer.o
obj-$(CONFIG_FSL_MPIC_TIMER_WAKEUP) += fsl_mpic_timer_wakeup.o
Expand Down
10 changes: 5 additions & 5 deletions arch/powerpc/sysdev/mpic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
extern void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq);
extern int mpic_msi_init_allocator(struct mpic *mpic);
extern int mpic_u3msi_init(struct mpic *mpic);
extern int mpic_pasemi_msi_init(struct mpic *mpic);
#else
static inline void mpic_msi_reserve_hwirq(struct mpic *mpic,
irq_hw_number_t hwirq)
Expand All @@ -27,11 +26,12 @@ static inline int mpic_u3msi_init(struct mpic *mpic)
{
return -1;
}
#endif

static inline int mpic_pasemi_msi_init(struct mpic *mpic)
{
return -1;
}
#if defined(CONFIG_PCI_MSI) && defined(CONFIG_PPC_PASEMI)
int mpic_pasemi_msi_init(struct mpic *mpic);
#else
static inline int mpic_pasemi_msi_init(struct mpic *mpic) { return -1; }
#endif

extern int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type);
Expand Down