diff for duplicates of <4E1C4E70.8030302@monstr.eu> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..dc96a48 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,6 @@ +Content-Type: text/x-patch; + name="0001-microblaze-move-pci-flag-functions-into-asm-generic.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline; + filename*0="0001-microblaze-move-pci-flag-functions-into-asm-generic.pat"; + filename*1="ch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..4a326d5 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,178 @@ +>From df817b1016d418ed2abff0e1ec175c4e8cb30115 Mon Sep 17 00:00:00 2001 +From: Rob Herring <rob.herring@calxeda.com> +Date: Wed, 29 Jun 2011 11:46:54 -0500 +Subject: [PATCH] microblaze: move pci flag functions into asm-generic + +Move pci_set_flags, pci_add_flags, and pci_has_flag into +asm-generic/pci-bridge.h so other archs can use them. + +Signed-off-by: Rob Herring <rob.herring@calxeda.com> +Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> +Cc: Jesse Barnes <jbarnes@virtuousgeek.org> +Signed-off-by: Michal Simek <monstr@monstr.eu> + +--- +v2: Fix microblaze compilation problems +--- + arch/microblaze/include/asm/pci-bridge.h | 67 ++++------------------------- + include/asm-generic/pci-bridge.h | 62 +++++++++++++++++++++++++++ + 2 files changed, 72 insertions(+), 57 deletions(-) + create mode 100644 include/asm-generic/pci-bridge.h + +diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h +index 746df91..4cae1d5 100644 +--- a/arch/microblaze/include/asm/pci-bridge.h ++++ b/arch/microblaze/include/asm/pci-bridge.h +@@ -10,31 +10,19 @@ + #include <linux/pci.h> + #include <linux/list.h> + #include <linux/ioport.h> ++#include <asm-generic/pci-bridge.h> + + struct device_node; + +-enum { +- /* Force re-assigning all resources (ignore firmware +- * setup completely) +- */ +- PCI_REASSIGN_ALL_RSRC = 0x00000001, +- +- /* Re-assign all bus numbers */ +- PCI_REASSIGN_ALL_BUS = 0x00000002, +- +- /* Do not try to assign, just use existing setup */ +- PCI_PROBE_ONLY = 0x00000004, +- +- /* Don't bother with ISA alignment unless the bridge has +- * ISA forwarding enabled +- */ +- PCI_CAN_SKIP_ISA_ALIGN = 0x00000008, +- +- /* Enable domain numbers in /proc */ +- PCI_ENABLE_PROC_DOMAINS = 0x00000010, +- /* ... except for domain 0 */ +- PCI_COMPAT_DOMAIN_0 = 0x00000020, +-}; ++#ifdef CONFIG_PCI ++extern struct list_head hose_list; ++extern int pcibios_vaddr_is_ioport(void __iomem *address); ++#else ++static inline int pcibios_vaddr_is_ioport(void __iomem *address) ++{ ++ return 0; ++} ++#endif + + /* + * Structure of a PCI controller (host bridge) +@@ -164,40 +152,5 @@ extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev); + extern void pcibios_free_controller(struct pci_controller *phb); + extern void pcibios_setup_phb_resources(struct pci_controller *hose); + +-#ifdef CONFIG_PCI +-extern unsigned int pci_flags; +- +-static inline void pci_set_flags(int flags) +-{ +- pci_flags = flags; +-} +- +-static inline void pci_add_flags(int flags) +-{ +- pci_flags |= flags; +-} +- +-static inline int pci_has_flag(int flag) +-{ +- return pci_flags & flag; +-} +- +-extern struct list_head hose_list; +- +-extern int pcibios_vaddr_is_ioport(void __iomem *address); +-#else +-static inline int pcibios_vaddr_is_ioport(void __iomem *address) +-{ +- return 0; +-} +- +-static inline void pci_set_flags(int flags) { } +-static inline void pci_add_flags(int flags) { } +-static inline int pci_has_flag(int flag) +-{ +- return 0; +-} +-#endif /* CONFIG_PCI */ +- + #endif /* __KERNEL__ */ + #endif /* _ASM_MICROBLAZE_PCI_BRIDGE_H */ +diff --git a/include/asm-generic/pci-bridge.h b/include/asm-generic/pci-bridge.h +new file mode 100644 +index 0000000..4a5aca2 +--- /dev/null ++++ b/include/asm-generic/pci-bridge.h +@@ -0,0 +1,62 @@ ++/* ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++#ifndef _ASM_GENERIC_PCI_BRIDGE_H ++#define _ASM_GENERIC_PCI_BRIDGE_H ++ ++#ifdef __KERNEL__ ++ ++enum { ++ /* Force re-assigning all resources (ignore firmware ++ * setup completely) ++ */ ++ PCI_REASSIGN_ALL_RSRC = 0x00000001, ++ ++ /* Re-assign all bus numbers */ ++ PCI_REASSIGN_ALL_BUS = 0x00000002, ++ ++ /* Do not try to assign, just use existing setup */ ++ PCI_PROBE_ONLY = 0x00000004, ++ ++ /* Don't bother with ISA alignment unless the bridge has ++ * ISA forwarding enabled ++ */ ++ PCI_CAN_SKIP_ISA_ALIGN = 0x00000008, ++ ++ /* Enable domain numbers in /proc */ ++ PCI_ENABLE_PROC_DOMAINS = 0x00000010, ++ /* ... except for domain 0 */ ++ PCI_COMPAT_DOMAIN_0 = 0x00000020, ++}; ++ ++#ifdef CONFIG_PCI ++extern unsigned int pci_flags; ++ ++static inline void pci_set_flags(int flags) ++{ ++ pci_flags = flags; ++} ++ ++static inline void pci_add_flags(int flags) ++{ ++ pci_flags |= flags; ++} ++ ++static inline int pci_has_flag(int flag) ++{ ++ return pci_flags & flag; ++} ++#else ++static inline void pci_set_flags(int flags) { } ++static inline void pci_add_flags(int flags) { } ++static inline int pci_has_flag(int flag) ++{ ++ return 0; ++} ++#endif /* CONFIG_PCI */ ++ ++#endif /* __KERNEL__ */ ++#endif /* _ASM_GENERIC_PCI_BRIDGE_H */ +-- +1.5.5.6 diff --git a/a/content_digest b/N1/content_digest index 6afd25d..f15a1b2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,16 @@ "ref\0201107021124.46953.arnd@arndb.de\0" "ref\04E1B176E.3030503@gmail.com\0" "ref\0201107121502.41570.arnd@arndb.de\0" - "From\0monstr@monstr.eu (Michal Simek)\0" - "Subject\0[PATCH v2 0/6] ARM: make mach/hardware.h optional\0" + "From\0Michal Simek <monstr@monstr.eu>\0" + "Subject\0Re: [PATCH v2 0/6] ARM: make mach/hardware.h optional\0" "Date\0Tue, 12 Jul 2011 15:38:56 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + Rob Herring <robherring2@gmail.com> + Benjamin Herrenschmidt <benh@kernel.crashing.org> + linux-kernel@vger.kernel.org + " nico@fluxnic.net\0" + "\01:1\0" "b\0" "Arnd Bergmann wrote:\n" "> On Monday 11 July 2011, Rob Herring wrote:\n" @@ -49,5 +54,186 @@ "w: www.monstr.eu p: +42-0-721842854\n" "Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/\n" Microblaze U-BOOT custodian + "\01:2\0" + "fn\00001-microblaze-move-pci-flag-functions-into-asm-generic.patch\0" + "b\0" + ">From df817b1016d418ed2abff0e1ec175c4e8cb30115 Mon Sep 17 00:00:00 2001\n" + "From: Rob Herring <rob.herring@calxeda.com>\n" + "Date: Wed, 29 Jun 2011 11:46:54 -0500\n" + "Subject: [PATCH] microblaze: move pci flag functions into asm-generic\n" + "\n" + "Move pci_set_flags, pci_add_flags, and pci_has_flag into\n" + "asm-generic/pci-bridge.h so other archs can use them.\n" + "\n" + "Signed-off-by: Rob Herring <rob.herring@calxeda.com>\n" + "Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>\n" + "Cc: Jesse Barnes <jbarnes@virtuousgeek.org>\n" + "Signed-off-by: Michal Simek <monstr@monstr.eu>\n" + "\n" + "---\n" + "v2: Fix microblaze compilation problems\n" + "---\n" + " arch/microblaze/include/asm/pci-bridge.h | 67 ++++-------------------------\n" + " include/asm-generic/pci-bridge.h | 62 +++++++++++++++++++++++++++\n" + " 2 files changed, 72 insertions(+), 57 deletions(-)\n" + " create mode 100644 include/asm-generic/pci-bridge.h\n" + "\n" + "diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h\n" + "index 746df91..4cae1d5 100644\n" + "--- a/arch/microblaze/include/asm/pci-bridge.h\n" + "+++ b/arch/microblaze/include/asm/pci-bridge.h\n" + "@@ -10,31 +10,19 @@\n" + " #include <linux/pci.h>\n" + " #include <linux/list.h>\n" + " #include <linux/ioport.h>\n" + "+#include <asm-generic/pci-bridge.h>\n" + " \n" + " struct device_node;\n" + " \n" + "-enum {\n" + "-\t/* Force re-assigning all resources (ignore firmware\n" + "-\t * setup completely)\n" + "-\t */\n" + "-\tPCI_REASSIGN_ALL_RSRC\t= 0x00000001,\n" + "-\n" + "-\t/* Re-assign all bus numbers */\n" + "-\tPCI_REASSIGN_ALL_BUS\t= 0x00000002,\n" + "-\n" + "-\t/* Do not try to assign, just use existing setup */\n" + "-\tPCI_PROBE_ONLY\t\t= 0x00000004,\n" + "-\n" + "-\t/* Don't bother with ISA alignment unless the bridge has\n" + "-\t * ISA forwarding enabled\n" + "-\t */\n" + "-\tPCI_CAN_SKIP_ISA_ALIGN\t= 0x00000008,\n" + "-\n" + "-\t/* Enable domain numbers in /proc */\n" + "-\tPCI_ENABLE_PROC_DOMAINS\t= 0x00000010,\n" + "-\t/* ... except for domain 0 */\n" + "-\tPCI_COMPAT_DOMAIN_0\t\t= 0x00000020,\n" + "-};\n" + "+#ifdef CONFIG_PCI\n" + "+extern struct list_head hose_list;\n" + "+extern int pcibios_vaddr_is_ioport(void __iomem *address);\n" + "+#else\n" + "+static inline int pcibios_vaddr_is_ioport(void __iomem *address)\n" + "+{\n" + "+\treturn 0;\n" + "+}\n" + "+#endif\n" + " \n" + " /*\n" + " * Structure of a PCI controller (host bridge)\n" + "@@ -164,40 +152,5 @@ extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev);\n" + " extern void pcibios_free_controller(struct pci_controller *phb);\n" + " extern void pcibios_setup_phb_resources(struct pci_controller *hose);\n" + " \n" + "-#ifdef CONFIG_PCI\n" + "-extern unsigned int pci_flags;\n" + "-\n" + "-static inline void pci_set_flags(int flags)\n" + "-{\n" + "-\tpci_flags = flags;\n" + "-}\n" + "-\n" + "-static inline void pci_add_flags(int flags)\n" + "-{\n" + "-\tpci_flags |= flags;\n" + "-}\n" + "-\n" + "-static inline int pci_has_flag(int flag)\n" + "-{\n" + "-\treturn pci_flags & flag;\n" + "-}\n" + "-\n" + "-extern struct list_head hose_list;\n" + "-\n" + "-extern int pcibios_vaddr_is_ioport(void __iomem *address);\n" + "-#else\n" + "-static inline int pcibios_vaddr_is_ioport(void __iomem *address)\n" + "-{\n" + "-\treturn 0;\n" + "-}\n" + "-\n" + "-static inline void pci_set_flags(int flags) { }\n" + "-static inline void pci_add_flags(int flags) { }\n" + "-static inline int pci_has_flag(int flag)\n" + "-{\n" + "-\treturn 0;\n" + "-}\n" + "-#endif\t/* CONFIG_PCI */\n" + "-\n" + " #endif\t/* __KERNEL__ */\n" + " #endif\t/* _ASM_MICROBLAZE_PCI_BRIDGE_H */\n" + "diff --git a/include/asm-generic/pci-bridge.h b/include/asm-generic/pci-bridge.h\n" + "new file mode 100644\n" + "index 0000000..4a5aca2\n" + "--- /dev/null\n" + "+++ b/include/asm-generic/pci-bridge.h\n" + "@@ -0,0 +1,62 @@\n" + "+/*\n" + "+ * This program is free software; you can redistribute it and/or\n" + "+ * modify it under the terms of the GNU General Public License\n" + "+ * as published by the Free Software Foundation; either version\n" + "+ * 2 of the License, or (at your option) any later version.\n" + "+ */\n" + "+#ifndef _ASM_GENERIC_PCI_BRIDGE_H\n" + "+#define _ASM_GENERIC_PCI_BRIDGE_H\n" + "+\n" + "+#ifdef __KERNEL__\n" + "+\n" + "+enum {\n" + "+\t/* Force re-assigning all resources (ignore firmware\n" + "+\t * setup completely)\n" + "+\t */\n" + "+\tPCI_REASSIGN_ALL_RSRC\t= 0x00000001,\n" + "+\n" + "+\t/* Re-assign all bus numbers */\n" + "+\tPCI_REASSIGN_ALL_BUS\t= 0x00000002,\n" + "+\n" + "+\t/* Do not try to assign, just use existing setup */\n" + "+\tPCI_PROBE_ONLY\t\t= 0x00000004,\n" + "+\n" + "+\t/* Don't bother with ISA alignment unless the bridge has\n" + "+\t * ISA forwarding enabled\n" + "+\t */\n" + "+\tPCI_CAN_SKIP_ISA_ALIGN\t= 0x00000008,\n" + "+\n" + "+\t/* Enable domain numbers in /proc */\n" + "+\tPCI_ENABLE_PROC_DOMAINS\t= 0x00000010,\n" + "+\t/* ... except for domain 0 */\n" + "+\tPCI_COMPAT_DOMAIN_0\t= 0x00000020,\n" + "+};\n" + "+\n" + "+#ifdef CONFIG_PCI\n" + "+extern unsigned int pci_flags;\n" + "+\n" + "+static inline void pci_set_flags(int flags)\n" + "+{\n" + "+\tpci_flags = flags;\n" + "+}\n" + "+\n" + "+static inline void pci_add_flags(int flags)\n" + "+{\n" + "+\tpci_flags |= flags;\n" + "+}\n" + "+\n" + "+static inline int pci_has_flag(int flag)\n" + "+{\n" + "+\treturn pci_flags & flag;\n" + "+}\n" + "+#else\n" + "+static inline void pci_set_flags(int flags) { }\n" + "+static inline void pci_add_flags(int flags) { }\n" + "+static inline int pci_has_flag(int flag)\n" + "+{\n" + "+\treturn 0;\n" + "+}\n" + "+#endif\t/* CONFIG_PCI */\n" + "+\n" + "+#endif\t/* __KERNEL__ */\n" + "+#endif\t/* _ASM_GENERIC_PCI_BRIDGE_H */\n" + "-- \n" + 1.5.5.6 -f4a2dbdc4e13b3ae9f4c5024d706635dd27b3480419bce4a050f6fcf9a77bcc3 +499036929889b7181ca5209562a46f14e004bf1a636a63da8323938be74221ef
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.