Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63b40456 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Add missing null terminating entry to bq4802_match[].
  sparc: use the new byteorder headers
  rtc-m48t59: shift zero year to 1968 on sparc (rev 2)
  dbri: check dma_alloc_coherent errors
  sparc64: remove byteshifting from out* helpers
parents eff25028 770a4241

arch/sparc/include/asm/byteorder.h

+8 −14
Original line number Diff line number Diff line
@@ -4,15 +4,14 @@ 
#include <asm/types.h>

#include <asm/asi.h>



#ifdef __GNUC__

#define __BIG_ENDIAN



#ifdef CONFIG_SPARC32

#define __SWAB_64_THRU_32__

#endif



#ifdef CONFIG_SPARC64



static inline __u16 ___arch__swab16p(const __u16 *addr)

static inline __u16 __arch_swab16p(const __u16 *addr)

{

	__u16 ret;
@@ -21,8 +20,9 @@ static inline __u16 ___arch__swab16p(const __u16 *addr) 
			      : "r" (addr), "i" (ASI_PL));

	return ret;

}

#define __arch_swab16p __arch_swab16p



static inline __u32 ___arch__swab32p(const __u32 *addr)

static inline __u32 __arch_swab32p(const __u32 *addr)

{

	__u32 ret;
@@ -31,8 +31,9 @@ static inline __u32 ___arch__swab32p(const __u32 *addr) 
			      : "r" (addr), "i" (ASI_PL));

	return ret;

}

#define __arch_swab32p __arch_swab32p



static inline __u64 ___arch__swab64p(const __u64 *addr)

static inline __u64 __arch_swab64p(const __u64 *addr)

{

	__u64 ret;
@@ -41,17 +42,10 @@ static inline __u64 ___arch__swab64p(const __u64 *addr) 
			      : "r" (addr), "i" (ASI_PL));

	return ret;

}



#define __arch__swab16p(x) ___arch__swab16p(x)

#define __arch__swab32p(x) ___arch__swab32p(x)

#define __arch__swab64p(x) ___arch__swab64p(x)

#define __arch_swab64p __arch_swab64p



#endif /* CONFIG_SPARC64 */



#define __BYTEORDER_HAS_U64__



#endif



#include <linux/byteorder/big_endian.h>

#include <linux/byteorder.h>



#endif /* _SPARC_BYTEORDER_H */

arch/sparc/kernel/time.c

+4 −23
Original line number Diff line number Diff line
@@ -119,35 +119,16 @@ static unsigned char mostek_read_byte(struct device *dev, u32 ofs) 
{

	struct platform_device *pdev = to_platform_device(dev);

	struct m48t59_plat_data *pdata = pdev->dev.platform_data;

	void __iomem *regs = pdata->ioaddr;

	unsigned char val = readb(regs + ofs);



	/* the year 0 is 1968 */

	if (ofs == pdata->offset + M48T59_YEAR) {

		val += 0x68;

		if ((val & 0xf) > 9)

			val += 6;

	}

	return val;



	return readb(pdata->ioaddr + ofs);

}



static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct m48t59_plat_data *pdata = pdev->dev.platform_data;

	void __iomem *regs = pdata->ioaddr;



	if (ofs == pdata->offset + M48T59_YEAR) {

		if (val < 0x68)

			val += 0x32;

		else

			val -= 0x68;

		if ((val & 0xf) > 9)

			val += 6;

		if ((val & 0xf0) > 0x9A)

			val += 0x60;

	}

	writeb(val, regs + ofs);

	writeb(val, pdata->ioaddr + ofs);

}



static struct m48t59_plat_data m48t59_data = {

arch/sparc64/kernel/time.c

+6 −28
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ static struct of_device_id __initdata bq4802_match[] = { 
		.name = "rtc",

		.compatible = "bq4802",

	},

	{},

};



static struct of_platform_driver bq4802_driver = {
@@ -503,39 +504,16 @@ static struct of_platform_driver bq4802_driver = { 
static unsigned char mostek_read_byte(struct device *dev, u32 ofs)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct m48t59_plat_data *pdata = pdev->dev.platform_data;

	void __iomem *regs;

	unsigned char val;



	regs = (void __iomem *) pdev->resource[0].start;

	val = readb(regs + ofs);

	void __iomem *regs = (void __iomem *) pdev->resource[0].start;



	/* the year 0 is 1968 */

	if (ofs == pdata->offset + M48T59_YEAR) {

		val += 0x68;

		if ((val & 0xf) > 9)

			val += 6;

	}

	return val;

	return readb(regs + ofs);

}



static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct m48t59_plat_data *pdata = pdev->dev.platform_data;

	void __iomem *regs;



	regs = (void __iomem *) pdev->resource[0].start;

	if (ofs == pdata->offset + M48T59_YEAR) {

		if (val < 0x68)

			val += 0x32;

		else

			val -= 0x68;

		if ((val & 0xf) > 9)

			val += 6;

		if ((val & 0xf0) > 0x9A)

			val += 0x60;

	}

	void __iomem *regs = (void __iomem *) pdev->resource[0].start;



	writeb(val, regs + ofs);

}

arch/sparc64/lib/PeeCeeI.c

+47 −92
Original line number Diff line number Diff line
@@ -20,109 +20,64 @@ void outsw(unsigned long __addr, const void *src, unsigned long count) 
{

	void __iomem *addr = (void __iomem *) __addr;



	if (count) {

		u16 *ps = (u16 *)src;

		u32 *pi;



		if (((u64)src) & 0x2) {

			u16 val = le16_to_cpup(ps);

			outw(val, addr);

			ps++;

			count--;

		}

		pi = (u32 *)ps;

		while (count >= 2) {

			u32 w = le32_to_cpup(pi);



			pi++;

			outw(w >> 0, addr);

			outw(w >> 16, addr);

			count -= 2;

		}

		ps = (u16 *)pi;

		if (count) {

			u16 val = le16_to_cpup(ps);

			outw(val, addr);

		}

	while (count--) {

		__raw_writew(*(u16 *)src, addr);

		src += sizeof(u16);

	}

}



void outsl(unsigned long __addr, const void *src, unsigned long count)

{

	void __iomem *addr = (void __iomem *) __addr;

	u32 l, l2;



	if (count) {

		if ((((u64)src) & 0x3) == 0) {

			u32 *p = (u32 *)src;

	if (!count)

		return;



	switch (((unsigned long)src) & 0x3) {

	case 0x0:

		/* src is naturally aligned */

		while (count--) {

				u32 val = cpu_to_le32p(p);

				outl(val, addr);

				p++;

			__raw_writel(*(u32 *)src, addr);

			src += sizeof(u32);

		}

		} else {

			u8 *pb;

			u16 *ps = (u16 *)src;

			u32 l = 0, l2;

			u32 *pi;



			switch (((u64)src) & 0x3) {

		break;

	case 0x2:

				count -= 1;

				l = cpu_to_le16p(ps) << 16;

				ps++;

				pi = (u32 *)ps;

		/* 2-byte alignment */

		while (count--) {

					l2 = cpu_to_le32p(pi);

					pi++;

					outl(((l >> 16) | (l2 << 16)), addr);

					l = l2;

			l = (*(u16 *)src) << 16;

			l |= *(u16 *)(src + sizeof(u16));

			__raw_writel(l, addr);

			src += sizeof(u32);

		}

				ps = (u16 *)pi;

				l2 = cpu_to_le16p(ps);

				outl(((l >> 16) | (l2 << 16)), addr);

		break;



	case 0x1:

				count -= 1;

				pb = (u8 *)src;

				l = (*pb++ << 8);

				ps = (u16 *)pb;

				l2 = cpu_to_le16p(ps);

				ps++;

				l |= (l2 << 16);

				pi = (u32 *)ps;

		/* Hold three bytes in l each time, grab a byte from l2 */

		l = (*(u8 *)src) << 24;

		l |= (*(u16 *)(src + sizeof(u8))) << 8;

		src += sizeof(u8) + sizeof(u16);

		while (count--) {

					l2 = cpu_to_le32p(pi);

					pi++;

					outl(((l >> 8) | (l2 << 24)), addr);

					l = l2;

			l2 = *(u32 *)src;

			l |= (l2 >> 24);

			__raw_writel(l, addr);

			l = l2 << 8;

			src += sizeof(u32);

		}

				pb = (u8 *)pi;

				outl(((l >> 8) | (*pb << 24)), addr);

		break;



	case 0x3:

				count -= 1;

				pb = (u8 *)src;

				l = (*pb++ << 24);

				pi = (u32 *)pb;

		/* Hold a byte in l each time, grab 3 bytes from l2 */

		l = (*(u8 *)src) << 24;

		src += sizeof(u8);

		while (count--) {

					l2 = cpu_to_le32p(pi);

					pi++;

					outl(((l >> 24) | (l2 << 8)), addr);

					l = l2;

			l2 = *(u32 *)src;

			l |= (l2 >> 8);

			__raw_writel(l, addr);

			l = l2 << 24;

			src += sizeof(u32);

		}

				ps = (u16 *)pi;

				l2 = cpu_to_le16p(ps);

				ps++;

				pb = (u8 *)ps;

				l2 |= (*pb << 16);

				outl(((l >> 24) | (l2 << 8)), addr);

		break;

	}

}

	}

}



void insb(unsigned long __addr, void *dst, unsigned long count)

{

drivers/rtc/rtc-m48t59.c

+30 −4
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ static int m48t59_rtc_read_time(struct device *dev, struct rtc_time *tm) 
		dev_dbg(dev, "Century bit is enabled\n");

		tm->tm_year += 100;	/* one century */

	}

#ifdef CONFIG_SPARC

	/* Sun SPARC machines count years since 1968 */

	tm->tm_year += 68;

#endif



	tm->tm_wday	= bcd2bin(val & 0x07);

	tm->tm_hour	= bcd2bin(M48T59_READ(M48T59_HOUR) & 0x3F);
@@ -110,11 +114,20 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	struct m48t59_private *m48t59 = platform_get_drvdata(pdev);

	unsigned long flags;

	u8 val = 0;

	int year = tm->tm_year;



#ifdef CONFIG_SPARC

	/* Sun SPARC machines count years since 1968 */

	year -= 68;

#endif



	dev_dbg(dev, "RTC set time %04d-%02d-%02d %02d/%02d/%02d\n",

		tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,

		year + 1900, tm->tm_mon, tm->tm_mday,

		tm->tm_hour, tm->tm_min, tm->tm_sec);



	if (year < 0)

		return -EINVAL;



	spin_lock_irqsave(&m48t59->lock, flags);

	/* Issue the WRITE command */

	M48T59_SET_BITS(M48T59_CNTL_WRITE, M48T59_CNTL);
@@ -125,9 +138,9 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	M48T59_WRITE((bin2bcd(tm->tm_mday) & 0x3F), M48T59_MDAY);

	/* tm_mon is 0-11 */

	M48T59_WRITE((bin2bcd(tm->tm_mon + 1) & 0x1F), M48T59_MONTH);

	M48T59_WRITE(bin2bcd(tm->tm_year % 100), M48T59_YEAR);

	M48T59_WRITE(bin2bcd(year % 100), M48T59_YEAR);



	if (pdata->type == M48T59RTC_TYPE_M48T59 && (tm->tm_year / 100))

	if (pdata->type == M48T59RTC_TYPE_M48T59 && (year / 100))

		val = (M48T59_WDAY_CEB | M48T59_WDAY_CB);

	val |= (bin2bcd(tm->tm_wday) & 0x07);

	M48T59_WRITE(val, M48T59_WDAY);
@@ -159,6 +172,10 @@ static int m48t59_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL);



	tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR));

#ifdef CONFIG_SPARC

	/* Sun SPARC machines count years since 1968 */

	tm->tm_year += 68;

#endif

	/* tm_mon is 0-11 */

	tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1;
@@ -192,11 +209,20 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	struct rtc_time *tm = &alrm->time;

	u8 mday, hour, min, sec;

	unsigned long flags;

	int year = tm->tm_year;



#ifdef CONFIG_SPARC

	/* Sun SPARC machines count years since 1968 */

	year -= 68;

#endif



	/* If no irq, we don't support ALARM */

	if (m48t59->irq == NO_IRQ)

		return -EIO;



	if (year < 0)

		return -EINVAL;



	/*

	 * 0xff means "always match"

	 */
@@ -228,7 +254,7 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	spin_unlock_irqrestore(&m48t59->lock, flags);



	dev_dbg(dev, "RTC set alarm time %04d-%02d-%02d %02d/%02d/%02d\n",

		tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,

		year + 1900, tm->tm_mon, tm->tm_mday,

		tm->tm_hour, tm->tm_min, tm->tm_sec);

	return 0;

}