diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootstrap.h | 11 | ||||
| -rw-r--r-- | include/driver.h | 5 | ||||
| -rw-r--r-- | include/led.h | 3 | ||||
| -rw-r--r-- | include/linux/barebox-wrapper.h | 4 | ||||
| -rw-r--r-- | include/linux/log2.h | 9 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 5 | ||||
| -rw-r--r-- | include/linux/pstore.h | 90 | ||||
| -rw-r--r-- | include/linux/pstore_ram.h | 87 | ||||
| -rw-r--r-- | include/linux/rslib.h | 103 | ||||
| -rw-r--r-- | include/net.h | 4 | ||||
| -rw-r--r-- | include/of.h | 19 | ||||
| -rw-r--r-- | include/printk.h | 3 | ||||
| -rw-r--r-- | include/rtc.h | 2 | ||||
| -rw-r--r-- | include/sntp.h | 8 | ||||
| -rw-r--r-- | include/stdio.h | 1 |
15 files changed, 343 insertions, 11 deletions
diff --git a/include/bootstrap.h b/include/bootstrap.h index 28852c0cb6..d3ee6be47c 100644 --- a/include/bootstrap.h +++ b/include/bootstrap.h @@ -11,13 +11,14 @@ #define bootstrap_err(fmt, arg...) printf(fmt, ##arg) -void bootstrap_boot(int (*func)(void), bool barebox); +typedef void (*kernel_entry_func)(int zero, int arch, void *params); +void bootstrap_boot(kernel_entry_func func, bool barebox); #ifdef CONFIG_BOOTSTRAP_DEVFS -void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, +void* bootstrap_read_devfs(const char *devname, bool use_bb, int offset, int default_size, int max_size); #else -static inline void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, +static inline void* bootstrap_read_devfs(const char *devname, bool use_bb, int offset, int default_size, int max_size) { return NULL; @@ -25,9 +26,9 @@ static inline void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, #endif #ifdef CONFIG_BOOTSTRAP_DISK -void* bootstrap_read_disk(char *devname, char *fstype); +void* bootstrap_read_disk(const char *devname, const char *fstype); #else -static inline void* bootstrap_read_disk(char *devname, char *fstype) +static inline void* bootstrap_read_disk(const char *devname, const char *fstype) { return NULL; } diff --git a/include/driver.h b/include/driver.h index 046dd9079d..31c673452f 100644 --- a/include/driver.h +++ b/include/driver.h @@ -450,13 +450,18 @@ struct cdev { int open; struct mtd_info *mtd; u8 dos_partition_type; + struct cdev *link; + struct list_head link_entry, links; }; int devfs_create(struct cdev *); +int devfs_create_link(struct cdev *, const char *name); int devfs_remove(struct cdev *); int cdev_find_free_index(const char *); struct cdev *device_find_partition(struct device_d *dev, const char *name); struct cdev *cdev_by_name(const char *filename); +struct cdev *lcdev_by_name(const char *filename); +struct cdev *cdev_readlink(struct cdev *cdev); struct cdev *cdev_by_device_node(struct device_node *node); struct cdev *cdev_open(const char *name, unsigned long flags); int cdev_do_open(struct cdev *, unsigned long flags); diff --git a/include/led.h b/include/led.h index ddf8d90084..000267cdc5 100644 --- a/include/led.h +++ b/include/led.h @@ -1,7 +1,10 @@ #ifndef __LED_H #define __LED_H +#include <linux/list.h> + #include <errno.h> +#include <of.h> struct led { void (*set)(struct led *, unsigned int value); diff --git a/include/linux/barebox-wrapper.h b/include/linux/barebox-wrapper.h index 3859185186..5fe7971018 100644 --- a/include/linux/barebox-wrapper.h +++ b/include/linux/barebox-wrapper.h @@ -39,8 +39,8 @@ typedef int spinlock_t; #define spin_lock_init(...) #define spin_lock(...) #define spin_unlock(...) -static inline void spin_lock_irqsave(spinlock_t *lock, unsigned long flags) {} -static inline void spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) {} +#define spin_lock_irqsave(lock, flags) do { flags = 0; } while (0) +#define spin_unlock_irqrestore(lock, flags) do { flags = flags; } while (0) #define mutex_init(...) #define mutex_lock(...) diff --git a/include/linux/log2.h b/include/linux/log2.h index d9913f06bd..36519e3aa3 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -63,6 +63,15 @@ unsigned long __roundup_pow_of_two(unsigned long n) return 1UL << fls(n - 1); } +/* + * round down to nearest power of two + */ +static inline __attribute__((const)) +unsigned long __rounddown_pow_of_two(unsigned long n) +{ + return 1UL << (fls_long(n) - 1); +} + /** * ilog2 - log of base 2 of 32-bit or a 64-bit unsigned value * @n - parameter diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index f126cd9fbf..83d664e7ee 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -46,6 +46,11 @@ extern int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len); /* unlocks specified locked blocks */ extern int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len); +extern int nand_check_erased_ecc_chunk(void *data, int datalen, + void *ecc, int ecclen, + void *extraoob, int extraooblen, + int bitflips_threshold); + /* The maximum number of NAND chips in an array */ #define NAND_MAX_CHIPS 8 diff --git a/include/linux/pstore.h b/include/linux/pstore.h new file mode 100644 index 0000000000..a925e14397 --- /dev/null +++ b/include/linux/pstore.h @@ -0,0 +1,90 @@ +/* + * Persistent Storage - pstore.h + * + * Copyright (C) 2010 Intel Corporation <tony.luck@intel.com> + * + * This code is the generic layer to export data records from platform + * level persistent storage via a file system. + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + */ +#ifndef _LINUX_PSTORE_H +#define _LINUX_PSTORE_H + +#include <linux/time.h> +#include <linux/types.h> +#include <asm-generic/errno.h> + +/* types */ +enum pstore_type_id { + PSTORE_TYPE_DMESG = 0, + PSTORE_TYPE_MCE = 1, + PSTORE_TYPE_CONSOLE = 2, + PSTORE_TYPE_FTRACE = 3, + /* PPC64 partition types */ + PSTORE_TYPE_PPC_RTAS = 4, + PSTORE_TYPE_PPC_OF = 5, + PSTORE_TYPE_PPC_COMMON = 6, + PSTORE_TYPE_PMSG = 7, + PSTORE_TYPE_UNKNOWN = 255 +}; + +enum kmsg_dump_reason { + KMSG_DUMP_UNDEF, +}; + +struct module; + +struct pstore_info { + struct module *owner; + char *name; + char *buf; + size_t bufsize; + int flags; + int (*open)(struct pstore_info *psi); + int (*close)(struct pstore_info *psi); + ssize_t (*read)(u64 *id, enum pstore_type_id *type, + int *count, char **buf, bool *compressed, + struct pstore_info *psi); + int (*write)(enum pstore_type_id type, + enum kmsg_dump_reason reason, u64 *id, + unsigned int part, int count, bool compressed, + size_t size, struct pstore_info *psi); + int (*write_buf)(enum pstore_type_id type, + enum kmsg_dump_reason reason, u64 *id, + unsigned int part, const char *buf, bool compressed, + size_t size, struct pstore_info *psi); + int (*erase)(enum pstore_type_id type, u64 id, + int count, struct pstore_info *psi); + void *data; +}; + +#define PSTORE_FLAGS_FRAGILE 1 + +#ifdef CONFIG_FS_PSTORE +extern int pstore_register(struct pstore_info *); +extern bool pstore_cannot_block_path(enum kmsg_dump_reason reason); +#else +static inline int +pstore_register(struct pstore_info *psi) +{ + return -ENODEV; +} +static inline bool +pstore_cannot_block_path(enum kmsg_dump_reason reason) +{ + return false; +} +#endif + +#endif /*_LINUX_PSTORE_H*/ diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h new file mode 100644 index 0000000000..5ef823a57b --- /dev/null +++ b/include/linux/pstore_ram.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com> + * Copyright (C) 2011 Kees Cook <keescook@chromium.org> + * Copyright (C) 2011 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#ifndef __LINUX_PSTORE_RAM_H__ +#define __LINUX_PSTORE_RAM_H__ + +#include <linux/kernel.h> +#include <linux/list.h> +#include <linux/types.h> + +struct persistent_ram_buffer; +struct rs_control; + +struct persistent_ram_ecc_info { + int block_size; + int ecc_size; + int symsize; + int poly; +}; + +struct persistent_ram_zone { + phys_addr_t paddr; + size_t size; + struct persistent_ram_buffer *buffer; + size_t buffer_size; + struct resource *res; + + /* ECC correction */ + char *par_buffer; + char *par_header; + struct rs_control *rs_decoder; + int corrected_bytes; + int bad_blocks; + struct persistent_ram_ecc_info ecc_info; + + char *old_log; + size_t old_log_size; +}; + +struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, + u32 sig, struct persistent_ram_ecc_info *ecc_info, + unsigned int memtype); +void persistent_ram_free(struct persistent_ram_zone *prz); +void persistent_ram_zap(struct persistent_ram_zone *prz); + +int persistent_ram_write(struct persistent_ram_zone *prz, const void *s, + unsigned int count); + +void persistent_ram_save_old(struct persistent_ram_zone *prz); +size_t persistent_ram_old_size(struct persistent_ram_zone *prz); +void *persistent_ram_old(struct persistent_ram_zone *prz); +void persistent_ram_free_old(struct persistent_ram_zone *prz); +ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz, + char *str, size_t len); + +/* + * Ramoops platform data + * @mem_size memory size for ramoops + * @mem_address physical memory address to contain ramoops + */ + +struct ramoops_platform_data { + unsigned long mem_size; + unsigned long mem_address; + unsigned int mem_type; + unsigned long record_size; + unsigned long console_size; + unsigned long ftrace_size; + unsigned long pmsg_size; + int dump_oops; + struct persistent_ram_ecc_info ecc_info; +}; + +#endif diff --git a/include/linux/rslib.h b/include/linux/rslib.h new file mode 100644 index 0000000000..b5e3ffd0de --- /dev/null +++ b/include/linux/rslib.h @@ -0,0 +1,103 @@ +/* + * include/linux/rslib.h + * + * Overview: + * Generic Reed Solomon encoder / decoder library + * + * Copyright (C) 2004 Thomas Gleixner (tglx@linutronix.de) + * + * RS code lifted from reed solomon library written by Phil Karn + * Copyright 2002 Phil Karn, KA9Q + * + * $Id: rslib.h,v 1.4 2005/11/07 11:14:52 gleixner Exp $ + * + * 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 _RSLIB_H_ +#define _RSLIB_H_ + +#include <linux/list.h> + +/** + * struct rs_control - rs control structure + * + * @mm: Bits per symbol + * @nn: Symbols per block (= (1<<mm)-1) + * @alpha_to: log lookup table + * @index_of: Antilog lookup table + * @genpoly: Generator polynomial + * @nroots: Number of generator roots = number of parity symbols + * @fcr: First consecutive root, index form + * @prim: Primitive element, index form + * @iprim: prim-th root of 1, index form + * @gfpoly: The primitive generator polynominal + * @gffunc: Function to generate the field, if non-canonical representation + * @users: Users of this structure + * @list: List entry for the rs control list +*/ +struct rs_control { + int mm; + int nn; + uint16_t *alpha_to; + uint16_t *index_of; + uint16_t *genpoly; + int nroots; + int fcr; + int prim; + int iprim; + int gfpoly; + int (*gffunc)(int); + int users; + struct list_head list; +}; + +#ifdef CONFIG_REED_SOLOMON +/* General purpose RS codec, 8-bit data width, symbol width 1-15 bit */ +int encode_rs8(struct rs_control *rs, uint8_t *data, int len, uint16_t *par, + uint16_t invmsk); +int decode_rs8(struct rs_control *rs, uint8_t *data, uint16_t *par, int len, + uint16_t *s, int no_eras, int *eras_pos, uint16_t invmsk, + uint16_t *corr); + +/* General purpose RS codec, 16-bit data width, symbol width 1-15 bit */ +int encode_rs16(struct rs_control *rs, uint16_t *data, int len, uint16_t *par, + uint16_t invmsk); +int decode_rs16(struct rs_control *rs, uint16_t *data, uint16_t *par, int len, + uint16_t *s, int no_eras, int *eras_pos, uint16_t invmsk, + uint16_t *corr); +#endif /* CONFIG_REED_SOLOMON */ + +/* Create or get a matching rs control structure */ +struct rs_control *init_rs(int symsize, int gfpoly, int fcr, int prim, + int nroots); +struct rs_control *init_rs_non_canonical(int symsize, int (*func)(int), + int fcr, int prim, int nroots); + +/* Release a rs control structure */ +void free_rs(struct rs_control *rs); + +/** modulo replacement for galois field arithmetics + * + * @rs: the rs control structure + * @x: the value to reduce + * + * where + * rs->mm = number of bits per symbol + * rs->nn = (2^rs->mm) - 1 + * + * Simple arithmetic modulo would return a wrong result for values + * >= 3 * rs->nn +*/ +static inline int rs_modnn(struct rs_control *rs, int x) +{ + while (x >= rs->nn) { + x -= rs->nn; + x = (x >> rs->mm) + (x & rs->nn); + } + return x; +} + +#endif diff --git a/include/net.h b/include/net.h index 2a37a43a5c..13e335aac2 100644 --- a/include/net.h +++ b/include/net.h @@ -315,9 +315,9 @@ int string_to_ethaddr(const char *str, u8 enetaddr[6]); void ethaddr_to_string(const u8 enetaddr[6], char *str); #ifdef CONFIG_NET_RESOLV -IPaddr_t resolv(char *host); +IPaddr_t resolv(const char *host); #else -static inline IPaddr_t resolv(char *host) +static inline IPaddr_t resolv(const char *host) { IPaddr_t ip = 0; string_to_ip(host, &ip); diff --git a/include/of.h b/include/of.h index e60fe89825..75cc3c11c1 100644 --- a/include/of.h +++ b/include/of.h @@ -641,9 +641,13 @@ static inline struct device_node *of_find_node_by_path_or_alias( #define for_each_node_by_name_from(dn, root, name) \ for (dn = of_find_node_by_name(root, name); dn; \ dn = of_find_node_by_name(dn, name)) -#define for_each_compatible_node(dn, type, compatible) \ - for (dn = of_find_compatible_node(NULL, type, compatible); dn; \ +/* Iterate over compatible nodes starting from given root */ +#define for_each_compatible_node_from(dn, root, type, compatible) \ + for (dn = of_find_compatible_node(root, type, compatible); dn; \ dn = of_find_compatible_node(dn, type, compatible)) +/* Iterate over compatible nodes in default device tree */ +#define for_each_compatible_node(dn, type, compatible) \ + for_each_compatible_node_from(dn, NULL, type, compatible) static inline struct device_node *of_find_matching_node( struct device_node *from, const struct of_device_id *matches) @@ -732,6 +736,17 @@ static inline int of_property_read_u32(const struct device_node *np, s; \ s = of_prop_next_string(prop, s)) +/* + * struct device_node *n; + * + * of_property_for_each_phandle(np, root, "propname", n) + * printk("phandle points to: %s\n", n->full_name); + */ +#define of_property_for_each_phandle(np, root, propname, n) \ + for (int _i = 0; \ + (n = of_parse_phandle_from(np, root, propname, _i));\ + _i++) + static inline int of_property_write_u8(struct device_node *np, const char *propname, u8 value) { diff --git a/include/printk.h b/include/printk.h index a27ad514cf..822f64c61f 100644 --- a/include/printk.h +++ b/include/printk.h @@ -1,6 +1,8 @@ #ifndef __PRINTK_H #define __PRINTK_H +#include <linux/list.h> + #define MSG_EMERG 0 /* system is unusable */ #define MSG_ALERT 1 /* action must be taken immediately */ #define MSG_CRIT 2 /* critical conditions */ @@ -20,6 +22,7 @@ #endif /* debugging and troubleshooting/diagnostic helpers. */ +struct device_d; #ifndef CONFIG_CONSOLE_NONE int dev_printf(int level, const struct device_d *dev, const char *format, ...) diff --git a/include/rtc.h b/include/rtc.h index e2414fb7b1..600dc46c41 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -55,4 +55,6 @@ unsigned long mktime (unsigned int, unsigned int, unsigned int, extern struct rtc_device *rtc_lookup(const char *name); +const char *time_str(struct rtc_time *tm); + #endif /* _RTC_H_ */ diff --git a/include/sntp.h b/include/sntp.h new file mode 100644 index 0000000000..bfcfcfa8c8 --- /dev/null +++ b/include/sntp.h @@ -0,0 +1,8 @@ +#ifndef __SNTP_H +#define __SNTP_H + +#include <types.h> + +s64 sntp(const char *server); + +#endif /* __SNTP_H */ diff --git a/include/stdio.h b/include/stdio.h index f190911762..d0817bd071 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -13,6 +13,7 @@ void serial_printf(const char *fmt, ...) __attribute__ ((format(__printf__, 1, 2 int sprintf(char *buf, const char *fmt, ...) __attribute__ ((format(__printf__, 2, 3))); int snprintf(char *buf, size_t size, const char *fmt, ...) __attribute__ ((format(__printf__, 3, 4))); +int scnprintf(char *buf, size_t size, const char *fmt, ...) __attribute__ ((format(__printf__, 3, 4))); int vsprintf(char *buf, const char *fmt, va_list args); char *asprintf(const char *fmt, ...) __attribute__ ((format(__printf__, 1, 2))); char *vasprintf(const char *fmt, va_list ap); |