From 60587dbbe6505df9e02599413f1c1ff6114c4189 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 13 May 2015 08:21:45 +0200 Subject: [PATCH 1/5] microblaze: Add missing release version code Add missing release version code for v9.4 and v9.5. Signed-off-by: Michal Simek --- arch/microblaze/kernel/cpu/cpuinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c index d1dd6e83d59b..b70bb538f001 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo.c +++ b/arch/microblaze/kernel/cpu/cpuinfo.c @@ -47,6 +47,8 @@ const struct cpu_ver_key cpu_ver_lookup[] = { {"9.1", 0x1d}, {"9.2", 0x1f}, {"9.3", 0x20}, + {"9.4", 0x21}, + {"9.5", 0x22}, {NULL, 0}, }; From 55ae2f3b88421256e0a785320f7067bc58c1b0cd Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 5 Jun 2015 10:35:31 +0200 Subject: [PATCH 2/5] microblaze: Label local function static Warnings found by sparse: arch/microblaze/kernel/dma.c:157:5: warning: symbol 'dma_direct_mmap_coherent' was not declared. Should it be static? arch/microblaze/kernel/kgdb.c:35:14: warning: symbol 'pvr' was not declared. Should it be static? Signed-off-by: Michal Simek --- arch/microblaze/kernel/dma.c | 1 + arch/microblaze/kernel/kgdb.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c index ed7ba8a11822..bf4dec229437 100644 --- a/arch/microblaze/kernel/dma.c +++ b/arch/microblaze/kernel/dma.c @@ -154,6 +154,7 @@ dma_direct_sync_sg_for_device(struct device *dev, __dma_sync(sg->dma_address, sg->length, direction); } +static int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t handle, size_t size, struct dma_attrs *attrs) diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c index 8736af5806ae..6366f69d118e 100644 --- a/arch/microblaze/kernel/kgdb.c +++ b/arch/microblaze/kernel/kgdb.c @@ -32,7 +32,7 @@ #define GDB_RTLBHI 56 /* keep pvr separately because it is unchangeble */ -struct pvr_s pvr; +static struct pvr_s pvr; void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) { From de093d3ea1938cc1d1b4c28e3b88b085a110154b Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 4 Jun 2015 16:49:29 -0500 Subject: [PATCH 3/5] microblaze/PCI: Remove unused declarations The following declarations were copied from powerpc but are unused on microblaze: struct pci_controller *init_phb_dynamic(struct device_node *dn) int remove_phb_dynamic(struct pci_controller *phb) struct pci_dev *of_create_pci_dev(struct device_node *node, ...) void of_scan_pci_bridge(struct device_node *node, ...) void of_scan_bus(struct device_node *node, struct pci_bus *bus) void of_rescan_bus(struct device_node *node, struct pci_bus *bus) Remove them. Signed-off-by: Bjorn Helgaas CC: Michal Simek Signed-off-by: Michal Simek --- arch/microblaze/include/asm/pci.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 468aca8cec0d..b6b5b3c2fef0 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -102,18 +102,6 @@ extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); extern void pcibios_resource_survey(void); -extern struct pci_controller *init_phb_dynamic(struct device_node *dn); -extern int remove_phb_dynamic(struct pci_controller *phb); - -extern struct pci_dev *of_create_pci_dev(struct device_node *node, - struct pci_bus *bus, int devfn); - -extern void of_scan_pci_bridge(struct device_node *node, - struct pci_dev *dev); - -extern void of_scan_bus(struct device_node *node, struct pci_bus *bus); -extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus); - extern int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); From 99fdc6b9bd022ab5fb0f2e45f11a5a53697221fb Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 4 Jun 2015 16:49:36 -0500 Subject: [PATCH 4/5] microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration pci_bus_find_capability() is declared in include/linux/pci.h. Remove the pci_bus_find_capability() declaration from arch/microblaze/include/asm/pci.h. Signed-off-by: Bjorn Helgaas CC: Michal Simek Signed-off-by: Michal Simek --- arch/microblaze/include/asm/pci.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index b6b5b3c2fef0..541400d0c03e 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -102,9 +102,6 @@ extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); extern void pcibios_resource_survey(void); -extern int pci_bus_find_capability(struct pci_bus *bus, - unsigned int devfn, int cap); - struct file; extern pgprot_t pci_phys_mem_access_prot(struct file *file, unsigned long pfn, From c4fa9a6ae285ec4777d0524a4ee9c9039a5a4c28 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 4 Jun 2015 16:49:43 -0500 Subject: [PATCH 5/5] microblaze/PCI: Remove unnecessary struct pci_dev declaration All users of arch/microblaze/include/asm/pci.h get it by including include/linux/pci.h, which in turn includes after it declares struct pci_dev. The forward declaration here is unnecessary, so remove it. Signed-off-by: Bjorn Helgaas CC: Michal Simek Signed-off-by: Michal Simek --- arch/microblaze/include/asm/pci.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 541400d0c03e..67224d3d4d7d 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -27,8 +27,6 @@ #define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_MEM 0x10000000 -struct pci_dev; - /* Values for the `which' argument to sys_pciconfig_iobase syscall. */ #define IOBASE_BRIDGE_NUMBER 0 #define IOBASE_MEMORY 1