![Linus Torvalds](/assets/img/avatar_default.png)
Pull ARM updates from Russell King: "Included in this series are: 1. BE8 (modern big endian) changes for ARM from Ben Dooks 2. big.Little support from Nicolas Pitre and Dave Martin 3. support for LPAE systems with all system memory above 4GB 4. Perf updates from Will Deacon 5. Additional prefetching and other performance improvements from Will. 6. Neon-optimised AES implementation fro Ard. 7. A number of smaller fixes scattered around the place. There is a rather horrid merge conflict in tools/perf - I was never notified of the conflict because it originally occurred between Will's tree and other stuff. Consequently I have a resolution which Will forwarded me, which I'll forward on immediately after sending this mail. The other notable thing is I'm expecting some build breakage in the crypto stuff on ARM only with Ard's AES patches. These were merged into a stable git branch which others had already pulled, so there's little I can do about this. The problem is caused because these patches have a dependency on some code in the crypto git tree - I tried requesting a branch I can pull to resolve these, and all I got each time from the crypto people was "we'll revert our patches then" which would only make things worse since I still don't have the dependent patches. I've no idea what's going on there or how to resolve that, and since I can't split these patches from the rest of this pull request, I'm rather stuck with pushing this as-is or reverting Ard's patches. Since it should "come out in the wash" I've left them in - the only build problems they seem to cause at the moment are with randconfigs, and since it's a new feature anyway. However, if by -rc1 the dependencies aren't in, I think it'd be best to revert Ard's patches" I resolved the perf conflict roughly as per the patch sent by Russell, but there may be some differences. Any errors are likely mine. Let's see how the crypto issues work out.. * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (110 commits) ARM: 7868/1: arm/arm64: remove atomic_clear_mask() in "include/asm/atomic.h" ARM: 7867/1: include: asm: use 'int' instead of 'unsigned long' for 'oldval' in atomic_cmpxchg(). ARM: 7866/1: include: asm: use 'long long' instead of 'u64' within atomic.h ARM: 7871/1: amba: Extend number of IRQS ARM: 7887/1: Don't smp_cross_call() on UP devices in arch_irq_work_raise() ARM: 7872/1: Support arch_irq_work_raise() via self IPIs ARM: 7880/1: Clear the IT state independent of the Thumb-2 mode ARM: 7878/1: nommu: Implement dummy early_paging_init() ARM: 7876/1: clear Thumb-2 IT state on exception handling ARM: 7874/2: bL_switcher: Remove cpu_hotplug_driver_{lock,unlock}() ARM: footbridge: fix build warnings for netwinder ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu ARM: fix misplaced arch_virt_to_idmap() ARM: 7848/1: mcpm: Implement cpu_kill() to synchronise on powerdown ARM: 7847/1: mcpm: Factor out logical-to-physical CPU translation ARM: 7869/1: remove unused XSCALE_PMU Kconfig param ARM: 7864/1: Handle 64-bit memory in case of 32-bit phys_addr_t ARM: 7863/1: Let arm_add_memory() always use 64-bit arguments ARM: 7862/1: pcpu: replace __get_cpu_var_uses ARM: 7861/1: cacheflush: consolidate single-CPU ARMv7 cache disabling code ...
147 lines
4.8 KiB
C
147 lines
4.8 KiB
C
/*
|
|
* linux/include/amba/bus.h
|
|
*
|
|
* This device type deals with ARM PrimeCells and anything else that
|
|
* presents a proper CID (0xB105F00D) at the end of the I/O register
|
|
* region or that is derived from a PrimeCell.
|
|
*
|
|
* Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#ifndef ASMARM_AMBA_H
|
|
#define ASMARM_AMBA_H
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/device.h>
|
|
#include <linux/mod_devicetable.h>
|
|
#include <linux/err.h>
|
|
#include <linux/resource.h>
|
|
#include <linux/regulator/consumer.h>
|
|
|
|
#define AMBA_NR_IRQS 9
|
|
#define AMBA_CID 0xb105f00d
|
|
|
|
struct clk;
|
|
|
|
struct amba_device {
|
|
struct device dev;
|
|
struct resource res;
|
|
struct clk *pclk;
|
|
unsigned int periphid;
|
|
unsigned int irq[AMBA_NR_IRQS];
|
|
};
|
|
|
|
struct amba_driver {
|
|
struct device_driver drv;
|
|
int (*probe)(struct amba_device *, const struct amba_id *);
|
|
int (*remove)(struct amba_device *);
|
|
void (*shutdown)(struct amba_device *);
|
|
int (*suspend)(struct amba_device *, pm_message_t);
|
|
int (*resume)(struct amba_device *);
|
|
const struct amba_id *id_table;
|
|
};
|
|
|
|
enum amba_vendor {
|
|
AMBA_VENDOR_ARM = 0x41,
|
|
AMBA_VENDOR_ST = 0x80,
|
|
};
|
|
|
|
extern struct bus_type amba_bustype;
|
|
|
|
#define to_amba_device(d) container_of(d, struct amba_device, dev)
|
|
|
|
#define amba_get_drvdata(d) dev_get_drvdata(&d->dev)
|
|
#define amba_set_drvdata(d,p) dev_set_drvdata(&d->dev, p)
|
|
|
|
int amba_driver_register(struct amba_driver *);
|
|
void amba_driver_unregister(struct amba_driver *);
|
|
struct amba_device *amba_device_alloc(const char *, resource_size_t, size_t);
|
|
void amba_device_put(struct amba_device *);
|
|
int amba_device_add(struct amba_device *, struct resource *);
|
|
int amba_device_register(struct amba_device *, struct resource *);
|
|
struct amba_device *amba_apb_device_add(struct device *parent, const char *name,
|
|
resource_size_t base, size_t size,
|
|
int irq1, int irq2, void *pdata,
|
|
unsigned int periphid);
|
|
struct amba_device *amba_ahb_device_add(struct device *parent, const char *name,
|
|
resource_size_t base, size_t size,
|
|
int irq1, int irq2, void *pdata,
|
|
unsigned int periphid);
|
|
struct amba_device *
|
|
amba_apb_device_add_res(struct device *parent, const char *name,
|
|
resource_size_t base, size_t size, int irq1,
|
|
int irq2, void *pdata, unsigned int periphid,
|
|
struct resource *resbase);
|
|
struct amba_device *
|
|
amba_ahb_device_add_res(struct device *parent, const char *name,
|
|
resource_size_t base, size_t size, int irq1,
|
|
int irq2, void *pdata, unsigned int periphid,
|
|
struct resource *resbase);
|
|
void amba_device_unregister(struct amba_device *);
|
|
struct amba_device *amba_find_device(const char *, struct device *, unsigned int, unsigned int);
|
|
int amba_request_regions(struct amba_device *, const char *);
|
|
void amba_release_regions(struct amba_device *);
|
|
|
|
#define amba_pclk_enable(d) \
|
|
(IS_ERR((d)->pclk) ? 0 : clk_enable((d)->pclk))
|
|
|
|
#define amba_pclk_disable(d) \
|
|
do { if (!IS_ERR((d)->pclk)) clk_disable((d)->pclk); } while (0)
|
|
|
|
/* Some drivers don't use the struct amba_device */
|
|
#define AMBA_CONFIG_BITS(a) (((a) >> 24) & 0xff)
|
|
#define AMBA_REV_BITS(a) (((a) >> 20) & 0x0f)
|
|
#define AMBA_MANF_BITS(a) (((a) >> 12) & 0xff)
|
|
#define AMBA_PART_BITS(a) ((a) & 0xfff)
|
|
|
|
#define amba_config(d) AMBA_CONFIG_BITS((d)->periphid)
|
|
#define amba_rev(d) AMBA_REV_BITS((d)->periphid)
|
|
#define amba_manf(d) AMBA_MANF_BITS((d)->periphid)
|
|
#define amba_part(d) AMBA_PART_BITS((d)->periphid)
|
|
|
|
#define __AMBA_DEV(busid, data, mask) \
|
|
{ \
|
|
.coherent_dma_mask = mask, \
|
|
.init_name = busid, \
|
|
.platform_data = data, \
|
|
}
|
|
|
|
/*
|
|
* APB devices do not themselves have the ability to address memory,
|
|
* so DMA masks should be zero (much like USB peripheral devices.)
|
|
* The DMA controller DMA masks should be used instead (much like
|
|
* USB host controllers in conventional PCs.)
|
|
*/
|
|
#define AMBA_APB_DEVICE(name, busid, id, base, irqs, data) \
|
|
struct amba_device name##_device = { \
|
|
.dev = __AMBA_DEV(busid, data, 0), \
|
|
.res = DEFINE_RES_MEM(base, SZ_4K), \
|
|
.irq = irqs, \
|
|
.periphid = id, \
|
|
}
|
|
|
|
/*
|
|
* AHB devices are DMA capable, so set their DMA masks
|
|
*/
|
|
#define AMBA_AHB_DEVICE(name, busid, id, base, irqs, data) \
|
|
struct amba_device name##_device = { \
|
|
.dev = __AMBA_DEV(busid, data, ~0ULL), \
|
|
.res = DEFINE_RES_MEM(base, SZ_4K), \
|
|
.irq = irqs, \
|
|
.periphid = id, \
|
|
}
|
|
|
|
/*
|
|
* module_amba_driver() - Helper macro for drivers that don't do anything
|
|
* special in module init/exit. This eliminates a lot of boilerplate. Each
|
|
* module may only use this macro once, and calling it replaces module_init()
|
|
* and module_exit()
|
|
*/
|
|
#define module_amba_driver(__amba_drv) \
|
|
module_driver(__amba_drv, amba_driver_register, amba_driver_unregister)
|
|
|
|
#endif
|