10 files changed, 224 insertions, 21 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 830181cc7a83..32f3e5ae2be5 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -79,6 +79,13 @@ config LIBCRC32C
           require M here.  See Castagnoli93.
           Module will be libcrc32c.
 
+config CRC8
+        tristate "CRC8 function"
+        help
+          This option provides CRC8 function. Drivers may select this
+          when they need to do cyclic redundancy check according CRC8
+          algorithm. Module will be called crc8.
+
 config AUDIT_GENERIC
         bool
         depends on AUDIT && !AUDIT_ARCH
@@ -262,4 +269,11 @@ config AVERAGE
 
           If unsure, say N.
 
+config CORDIC
+        tristate "Cordic function"
+        help
+          The option provides arithmetic function using cordic algorithm
+          so its calculations are in fixed point. Modules can select this
+          when they require this function. Module will be called cordic.
+
 endmenu
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index dd373c8ee943..c0cb9c4bc46d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -227,7 +227,7 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
 config DETECT_HUNG_TASK
         bool "Detect Hung Tasks"
         depends on DEBUG_KERNEL
-        default DETECT_SOFTLOCKUP
+        default LOCKUP_DETECTOR
         help
           Say Y here to enable the kernel to detect "hung tasks",
           which are bugs that cause the task to be stuck in
@@ -648,12 +648,15 @@ config TRACE_IRQFLAGS
           Enables hooks to interrupt enabling and disabling for
           either tracing or lock debugging.
 
-config DEBUG_SPINLOCK_SLEEP
-        bool "Spinlock debugging: sleep-inside-spinlock checking"
+config DEBUG_ATOMIC_SLEEP
+        bool "Sleep inside atomic section checking"
+        select PREEMPT_COUNT
         depends on DEBUG_KERNEL
         help
           If you say Y here, various routines which may sleep will become very
-          noisy if they are called with a spinlock held.
+          noisy if they are called inside atomic sections: when a spinlock is
+          held, inside an rcu read side critical section, inside preempt disabled
+          sections, inside an interrupt, etc...
 
 config DEBUG_LOCKING_API_SELFTESTS
         bool "Locking API boot-time self-tests"
@@ -866,7 +869,7 @@ config BOOT_PRINTK_DELAY
           system, and then set "lpj=M" before setting "boot_delay=N".
           NOTE:  Using this option may adversely affect SMP systems.
           I.e., processors other than the first one may not boot up.
-          BOOT_PRINTK_DELAY also may cause DETECT_SOFTLOCKUP to detect
+          BOOT_PRINTK_DELAY also may cause LOCKUP_DETECTOR to detect
           what it believes to be lockup conditions.
 
 config RCU_TORTURE_TEST
diff --git a/lib/Makefile b/lib/Makefile
index 6b597fdb1898..892f4e282ea1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_CRC_ITU_T)	+= crc-itu-t.o
 obj-$(CONFIG_CRC32)     += crc32.o
 obj-$(CONFIG_CRC7)      += crc7.o
 obj-$(CONFIG_LIBCRC32C) += libcrc32c.o
+obj-$(CONFIG_CRC8)      += crc8.o
 obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o
 
 obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
@@ -112,6 +113,8 @@ obj-$(CONFIG_AVERAGE) += average.o
 
 obj-$(CONFIG_CPU_RMAP) += cpu_rmap.o
 
+obj-$(CONFIG_CORDIC) += cordic.o
+
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
 
diff --git a/lib/checksum.c b/lib/checksum.c
index 097508732f34..8df2f91e6d98 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -49,7 +49,7 @@ static inline unsigned short from32to16(unsigned int x)
 
 static unsigned int do_csum(const unsigned char *buff, int len)
 {
-        int odd, count;
+        int odd;
         unsigned int result = 0;
 
         if (len <= 0)
@@ -64,25 +64,22 @@ static unsigned int do_csum(const unsigned char *buff, int len)
                 len--;
                 buff++;
         }
-        count = len >> 1;               /* nr of 16-bit words.. */
-        if (count) {
+        if (len >= 2) {
                 if (2 & (unsigned long) buff) {
                         result += *(unsigned short *) buff;
-                        count--;
                         len -= 2;
                         buff += 2;
                 }
-                count >>= 1;            /* nr of 32-bit words.. */
-                if (count) {
+                if (len >= 4) {
+                        const unsigned char *end = buff + ((unsigned)len & ~3);
                         unsigned int carry = 0;
                         do {
                                 unsigned int w = *(unsigned int *) buff;
-                                count--;
                                 buff += 4;
                                 result += carry;
                                 result += w;
                                 carry = (w > result);
-                        } while (count);
+                        } while (buff < end);
                         result += carry;
                         result = (result & 0xffff) + (result >> 16);
                 }
diff --git a/lib/cordic.c b/lib/cordic.c
new file mode 100644
index 000000000000..aa27a88d7e04
--- /dev/null
+++ b/lib/cordic.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2011 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <linux/module.h>
+#include <linux/cordic.h>
+
+#define CORDIC_ANGLE_GEN        39797
+#define CORDIC_PRECISION_SHIFT  16
+#define CORDIC_NUM_ITER         (CORDIC_PRECISION_SHIFT + 2)
+
+#define FIXED(X)        ((s32)((X) << CORDIC_PRECISION_SHIFT))
+#define FLOAT(X)        (((X) >= 0) \
+                ? ((((X) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1) \
+                : -((((-(X)) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1))
+
+static const s32 arctan_table[] = {
+        2949120,
+        1740967,
+        919879,
+        466945,
+        234379,
+        117304,
+        58666,
+        29335,
+        14668,
+        7334,
+        3667,
+        1833,
+        917,
+        458,
+        229,
+        115,
+        57,
+        29
+};
+
+/*
+ * cordic_calc_iq() - calculates the i/q coordinate for given angle
+ *
+ * theta: angle in degrees for which i/q coordinate is to be calculated
+ * coord: function output parameter holding the i/q coordinate
+ */
+struct cordic_iq cordic_calc_iq(s32 theta)
+{
+        struct cordic_iq coord;
+        s32 angle, valtmp;
+        unsigned iter;
+        int signx = 1;
+        int signtheta;
+
+        coord.i = CORDIC_ANGLE_GEN;
+        coord.q = 0;
+        angle = 0;
+
+        theta = FIXED(theta);
+        signtheta = (theta < 0) ? -1 : 1;
+        theta = ((theta + FIXED(180) * signtheta) % FIXED(360)) -
+                FIXED(180) * signtheta;
+
+        if (FLOAT(theta) > 90) {
+                theta -= FIXED(180);
+                signx = -1;
+        } else if (FLOAT(theta) < -90) {
+                theta += FIXED(180);
+                signx = -1;
+        }
+
+        for (iter = 0; iter < CORDIC_NUM_ITER; iter++) {
+                if (theta > angle) {
+                        valtmp = coord.i - (coord.q >> iter);
+                        coord.q += (coord.i >> iter);
+                        angle += arctan_table[iter];
+                } else {
+                        valtmp = coord.i + (coord.q >> iter);
+                        coord.q -= (coord.i >> iter);
+                        angle -= arctan_table[iter];
+                }
+                coord.i = valtmp;
+        }
+
+        coord.i *= signx;
+        coord.q *= signx;
+        return coord;
+}
+EXPORT_SYMBOL(cordic_calc_iq);
+
+MODULE_DESCRIPTION("Cordic functions");
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/lib/crc8.c b/lib/crc8.c
new file mode 100644
index 000000000000..87b59cafdb83
--- /dev/null
+++ b/lib/crc8.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2011 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define pr_fmt(fmt)             KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/crc8.h>
+#include <linux/printk.h>
+
+/*
+ * crc8_populate_msb - fill crc table for given polynomial in reverse bit order.
+ *
+ * table:       table to be filled.
+ * polynomial:  polynomial for which table is to be filled.
+ */
+void crc8_populate_msb(u8 table[CRC8_TABLE_SIZE], u8 polynomial)
+{
+        int i, j;
+        const u8 msbit = 0x80;
+        u8 t = msbit;
+
+        table[0] = 0;
+
+        for (i = 1; i < CRC8_TABLE_SIZE; i *= 2) {
+                t = (t << 1) ^ (t & msbit ? polynomial : 0);
+                for (j = 0; j < i; j++)
+                        table[i+j] = table[j] ^ t;
+        }
+}
+EXPORT_SYMBOL(crc8_populate_msb);
+
+/*
+ * crc8_populate_lsb - fill crc table for given polynomial in regular bit order.
+ *
+ * table:       table to be filled.
+ * polynomial:  polynomial for which table is to be filled.
+ */
+void crc8_populate_lsb(u8 table[CRC8_TABLE_SIZE], u8 polynomial)
+{
+        int i, j;
+        u8 t = 1;
+
+        table[0] = 0;
+
+        for (i = (CRC8_TABLE_SIZE >> 1); i; i >>= 1) {
+                t = (t >> 1) ^ (t & 1 ? polynomial : 0);
+                for (j = 0; j < CRC8_TABLE_SIZE; j += 2*i)
+                        table[i+j] = table[j] ^ t;
+        }
+}
+EXPORT_SYMBOL(crc8_populate_lsb);
+
+/*
+ * crc8 - calculate a crc8 over the given input data.
+ *
+ * table: crc table used for calculation.
+ * pdata: pointer to data buffer.
+ * nbytes: number of bytes in data buffer.
+ * crc: previous returned crc8 value.
+ */
+u8 crc8(const u8 table[CRC8_TABLE_SIZE], u8 *pdata, size_t nbytes, u8 crc)
+{
+        /* loop over the buffer data */
+        while (nbytes-- > 0)
+                crc = table[(crc ^ *pdata++) & 0xff];
+
+        return crc;
+}
+EXPORT_SYMBOL(crc8);
+
+MODULE_DESCRIPTION("CRC8 (by Williams, Ross N.) function");
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 9d86e45086f5..a78b7c6e042c 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -198,7 +198,7 @@ static void free_object(struct debug_obj *obj)
          * initialized:
          */
         if (obj_pool_free > ODEBUG_POOL_SIZE && obj_cache)
-                sched = !work_pending(&debug_obj_work);
+                sched = keventd_up() && !work_pending(&debug_obj_work);
         hlist_add_head(&obj->node, &obj_pool);
         obj_pool_free++;
         obj_pool_used--;
diff --git a/lib/iomap.c b/lib/iomap.c
index d32229385151..5dbcb4b2d864 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -224,6 +224,7 @@ EXPORT_SYMBOL(iowrite8_rep);
 EXPORT_SYMBOL(iowrite16_rep);
 EXPORT_SYMBOL(iowrite32_rep);
 
+#ifdef CONFIG_HAS_IOPORT
 /* Create a virtual mapping cookie for an IO port range */
 void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
@@ -238,7 +239,9 @@ void ioport_unmap(void __iomem *addr)
 }
 EXPORT_SYMBOL(ioport_map);
 EXPORT_SYMBOL(ioport_unmap);
+#endif /* CONFIG_HAS_IOPORT */
 
+#ifdef CONFIG_PCI
 /**
  * pci_iomap - create a virtual mapping cookie for a PCI BAR
  * @dev: PCI device that owns the BAR
@@ -280,3 +283,4 @@ void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
 }
 EXPORT_SYMBOL(pci_iomap);
 EXPORT_SYMBOL(pci_iounmap);
+#endif /* CONFIG_PCI */
diff --git a/lib/plist.c b/lib/plist.c
index 0ae7e6431726..a0a4da489c22 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -56,11 +56,6 @@ static void plist_check_list(struct list_head *top)
 
 static void plist_check_head(struct plist_head *head)
 {
-        WARN_ON(head != &test_head && !head->rawlock && !head->spinlock);
-        if (head->rawlock)
-                WARN_ON_SMP(!raw_spin_is_locked(head->rawlock));
-        if (head->spinlock)
-                WARN_ON_SMP(!spin_is_locked(head->spinlock));
         if (!plist_head_empty(head))
                 plist_check_list(&plist_first(head)->prio_list);
         plist_check_list(&head->node_list);
@@ -180,7 +175,7 @@ static int  __init plist_test(void)
         unsigned int r = local_clock();
 
         printk(KERN_INFO "start plist test\n");
-        plist_head_init(&test_head, NULL);
+        plist_head_init(&test_head);
         for (i = 0; i < ARRAY_SIZE(test_node); i++)
                 plist_node_init(test_node + i, 0);
 
diff --git a/lib/xz/xz_private.h b/lib/xz/xz_private.h
index a65633e06962..482b90f363fe 100644
--- a/lib/xz/xz_private.h
+++ b/lib/xz/xz_private.h
@@ -12,7 +12,7 @@
 
 #ifdef __KERNEL__
 #       include <linux/xz.h>
-#       include <asm/byteorder.h>
+#       include <linux/kernel.h>
 #       include <asm/unaligned.h>
         /* XZ_PREBOOT may be defined only via decompress_unxz.c. */
 #       ifndef XZ_PREBOOT