linux-mips-commits Mailing List for Linux Mips (Page 103)

Brought to you by: jsimmons, lethal

linux-mips-commits — CVS Commit Patches

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (165)	Sep (240)	Oct (424)	Nov (526)	Dec (293)
2002	Jan (242)	Feb (149)	Mar (143)	Apr (143)	May (76)	Jun (59)	Jul (20)	Aug (2)	Sep (49)	Oct (1)	Nov (4)	Dec
2003	Jan (1)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2004	Jan	Feb	Mar	Apr (2)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (3)	Nov	Dec
2009	Jan	Feb	Mar	Apr	May (1)	Jun (72)	Jul (36)	Aug (9)	Sep (16)	Oct (23)	Nov (9)	Dec (3)
2010	Jan	Feb (1)	Mar (35)	Apr (44)	May (56)	Jun (71)	Jul (41)	Aug (41)	Sep (22)	Oct (3)	Nov (1)	Dec (1)
2011	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2014	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct (1)	Nov (1)	Dec
2016	Jan	Feb	Mar	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar (1)	Apr (1)	May (1)	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov	Dec
2021	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (25)	Oct (105)	Nov (15)	Dec
2025	Jan (1)	Feb	Mar	Apr	May (4)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 101 102 103 104 105 > >> (Page 103 of 105)

[Linux-mips-commits] CVS: linux/include/asm-mips au1000_dma.h,1.1,1.2

From: Steve L. <slo...@us...> - 2001-08-23 17:10:46

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv24086/include/asm-mips

Modified Files:
	au1000_dma.h 
Log Message:
Renamed the Au1000 dma functions to not collide with kernel/dma.c.
Also, /proc/dma will show the output from kernel/dma.c:get_dma_list(),
not the Au1000 dma list. To fix requires a change to fs/proc/proc_misc.c.


Index: au1000_dma.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000_dma.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** au1000_dma.h	2001/08/17 22:53:26	1.1
--- au1000_dma.h	2001/08/23 17:10:44	1.2
***************
*** 40,44 ****
  #include <asm/system.h>
  
! #define MAX_AU1000_DMA_CHANNELS	8
  
  /* DMA Channel Base Addresses */
--- 40,44 ----
  #include <asm/system.h>
  
! #define NUM_AU1000_DMA_CHANNELS	8
  
  /* DMA Channel Base Addresses */
***************
*** 113,127 ****
  
  /* These are in arch/mips/au1000/common/dma.c */
! extern int request_dma(int dev_id, const char * dev_str); // reserve a channel
! extern void free_dma(unsigned int dmanr);	// release a channel
! extern void dump_dma_channel(unsigned int dmanr); // dump DMA channel registers
! extern struct dma_chan * get_dma_chan (unsigned int dmanr);
! extern spinlock_t  dma_spin_lock;
  
  
  static __inline__ unsigned long claim_dma_lock(void)
  {
      unsigned long flags;
!     spin_lock_irqsave(&dma_spin_lock, flags);
      return flags;
  }
--- 113,137 ----
  
  /* These are in arch/mips/au1000/common/dma.c */
! extern struct dma_chan au1000_dma_table[];
! extern int request_au1000_dma(int dev_id, const char * dev_str);
! extern void free_au1000_dma(unsigned int dmanr);
! extern int au1000_dma_read_proc (char *buf, char **start, off_t fpos,
! 				 int length, int *eof, void *data);
! extern void dump_au1000_dma_channel(unsigned int dmanr);
! extern spinlock_t  au1000_dma_spin_lock;
  
  
+ static __inline__ struct dma_chan *
+ get_dma_chan (unsigned int dmanr)
+ {
+     if (dmanr > NUM_AU1000_DMA_CHANNELS || au1000_dma_table[dmanr].dev_id < 0)
+ 	return NULL;
+     return &au1000_dma_table[dmanr];
+ }
+ 
  static __inline__ unsigned long claim_dma_lock(void)
  {
      unsigned long flags;
!     spin_lock_irqsave(&au1000_dma_spin_lock, flags);
      return flags;
  }
***************
*** 129,133 ****
  static __inline__ void release_dma_lock(unsigned long flags)
  {
!     spin_unlock_irqrestore(&dma_spin_lock, flags);
  }
  
--- 139,143 ----
  static __inline__ void release_dma_lock(unsigned long flags)
  {
!     spin_unlock_irqrestore(&au1000_dma_spin_lock, flags);
  }

[Linux-mips-commits] CVS: linux/arch/mips/au1000/common dma.c,1.1,1.2 usbdev.c,1.1,1.2

From: Steve L. <slo...@us...> - 2001-08-23 17:10:46

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv24086/arch/mips/au1000/common

Modified Files:
	dma.c usbdev.c 
Log Message:
Renamed the Au1000 dma functions to not collide with kernel/dma.c.
Also, /proc/dma will show the output from kernel/dma.c:get_dma_list(),
not the Au1000 dma list. To fix requires a change to fs/proc/proc_misc.c.


Index: dma.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/dma.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dma.c	2001/08/17 22:53:26	1.1
--- dma.c	2001/08/23 17:10:44	1.2
***************
*** 59,71 ****
  
  
! spinlock_t dma_spin_lock = SPIN_LOCK_UNLOCKED;
! 
! /*
!  *	If our port doesn't define this it has no Au1000 DMA
!  */
! 
! #ifdef MAX_AU1000_DMA_CHANNELS
  
! static struct dma_chan dma_table[MAX_AU1000_DMA_CHANNELS] = {
      {dev_id: -1,},
      {dev_id: -1,},
--- 59,65 ----
  
  
! spinlock_t au1000_dma_spin_lock = SPIN_LOCK_UNLOCKED;
  
! struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
      {dev_id: -1,},
      {dev_id: -1,},
***************
*** 100,140 ****
      { I2S_DATA, DMA_DR | DMA_DW32 | DMA_NC }
  };
-    
  
- struct dma_chan *
- get_dma_chan (unsigned int dmanr)
- {
-     if (dmanr > MAX_AU1000_DMA_CHANNELS ||
- 	dma_table[dmanr].dev_id < 0)
- 	return NULL;
-     return &dma_table[dmanr];
- }
  
! int get_dma_list(char *buf)
  {
!     int i, len;
      struct dma_chan * chan;
      
!     len = sprintf(buf,      "Au1000 Allocated DMA Channels:\n");
!     len += sprintf(buf+len, "------------------------------\n");
! 
!     for (i = 0 ; i < MAX_AU1000_DMA_CHANNELS ; i++) {
  	if ((chan = get_dma_chan(i)) != NULL) {
! 	    len += sprintf(buf+len, "%2d: %s\n",
! 			   i,
! 			   chan->dev_str);
  	}
      }
      return len;
! } /* get_dma_list */
  
  
! void dump_dma_channel(unsigned int dmanr)
  {
      struct dma_chan * chan;
  
!     if (dmanr > MAX_AU1000_DMA_CHANNELS)
  	return;
!     chan = &dma_table[dmanr];
  
      printk(KERN_INFO "Au1000 DMA%d Register Dump:\n", dmanr);
--- 94,131 ----
      { I2S_DATA, DMA_DR | DMA_DW32 | DMA_NC }
  };
  
  
! int au1000_dma_read_proc (char *buf, char **start, off_t fpos,
! 			  int length, int *eof, void *data)
  {
!     int i, len=0;
      struct dma_chan * chan;
      
!     for (i = 0 ; i < NUM_AU1000_DMA_CHANNELS ; i++) {
  	if ((chan = get_dma_chan(i)) != NULL) {
! 	    len += sprintf(buf+len, "%2d: %s\n", i, chan->dev_str);
  	}
      }
+ 
+     if (fpos >= len) {
+         *start = buf;
+         *eof = 1;
+         return 0;
+     }
+     *start = buf + fpos;
+     if ((len -= fpos) > length)
+         return length;
+     *eof = 1;
      return len;
! }
  
  
! void dump_au1000_dma_channel(unsigned int dmanr)
  {
      struct dma_chan * chan;
  
!     if (dmanr > NUM_AU1000_DMA_CHANNELS)
  	return;
!     chan = &au1000_dma_table[dmanr];
  
      printk(KERN_INFO "Au1000 DMA%d Register Dump:\n", dmanr);
***************
*** 152,156 ****
   * Returns the allocated channel number, or negative on error.
   */
! int request_dma(int dev_id, const char * dev_str)
  {
      struct dma_chan * chan;
--- 143,147 ----
   * Returns the allocated channel number, or negative on error.
   */
! int request_au1000_dma(int dev_id, const char * dev_str)
  {
      struct dma_chan * chan;
***************
*** 160,171 ****
  	return -EINVAL;
  
!     for (i = 0 ; i < MAX_AU1000_DMA_CHANNELS ; i++) {
! 	if (dma_table[i].dev_id < 0)
  	    break;
      }
!     if (i == MAX_AU1000_DMA_CHANNELS)
  	return -ENODEV;
  
!     chan = &dma_table[i];
  
      // fill it in
--- 151,162 ----
  	return -EINVAL;
  
!     for (i = 0 ; i < NUM_AU1000_DMA_CHANNELS ; i++) {
! 	if (au1000_dma_table[i].dev_id < 0)
  	    break;
      }
!     if (i == NUM_AU1000_DMA_CHANNELS)
  	return -ENODEV;
  
!     chan = &au1000_dma_table[i];
  
      // fill it in
***************
*** 181,185 ****
  
  
! void free_dma(unsigned int dmanr)
  {
      struct dma_chan * chan = get_dma_chan(dmanr);
--- 172,176 ----
  
  
! void free_au1000_dma(unsigned int dmanr)
  {
      struct dma_chan * chan = get_dma_chan(dmanr);
***************
*** 193,212 ****
      chan->dev_id = -1;
  } /* free_dma */
- 
- #else
- 
- int request_dma(unsigned int dmanr, const char *device_id)
- {
- 	return -EINVAL;
- }
- 
- void free_dma(unsigned int dmanr)
- {
- }
- 
- int get_dma_list(char *buf)
- {	
- 	strcpy(buf, "No DMA\n");
- 	return 7;
- }
- #endif
--- 184,185 ----

Index: usbdev.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/usbdev.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usbdev.c	2001/08/17 22:53:26	1.1
--- usbdev.c	2001/08/23 17:10:44	1.2
***************
*** 1077,1081 ****
  	
  	// SETUP packet received ?
! 	if (cs & USBDEV_CS_SU) {
  	    if (pkt->size == sizeof(devrequest)) {
  		devrequest setup;
--- 1077,1081 ----
  	
  	// SETUP packet received ?
! 	//if (cs & USBDEV_CS_SU) { FIXME: uncomment!
  	    if (pkt->size == sizeof(devrequest)) {
  		devrequest setup;
***************
*** 1086,1095 ****
  		memcpy(&setup, pkt->bufptr, sizeof(devrequest));
  		process_setup(serial, &setup);
! 	    } else
! 		dbg(__FUNCTION__ ": wrong size SETUP received");
! 	} else {
! 	    // DATAx packet received on endpoint 0
! 	    // FIXME: will need a state machine for control OUT transactions
! 	    dbg("got DATAx on EP0, size=%d, cs=%08x", pkt->size, cs);
  	}
  	
--- 1086,1095 ----
  		memcpy(&setup, pkt->bufptr, sizeof(devrequest));
  		process_setup(serial, &setup);
! 		//} else  FIXME: uncomment!
! 		//dbg(__FUNCTION__ ": wrong size SETUP received");
! 	    } else {
! 		// DATAx packet received on endpoint 0
! 		// FIXME: will need a state machine for control OUT transactions
! 		dbg("got DATAx on EP0, size=%d, cs=%08x", pkt->size, cs);
  	}
  	
***************
*** 1581,1586 ****
      free_irq(ep->inirq, &usbserial);
      //free_irq(ep->outirq, &usbserial);
!     free_dma(ep->indma);
!     free_dma(ep->outdma);
      endpoint_flush(ep);
  
--- 1581,1586 ----
      free_irq(ep->inirq, &usbserial);
      //free_irq(ep->outirq, &usbserial);
!     free_au1000_dma(ep->indma);
!     free_au1000_dma(ep->outdma);
      endpoint_flush(ep);
  
***************
*** 1590,1594 ****
  	ep = &usbserial.port[i].ep_bulkin;
  	free_irq(ep->inirq, &usbserial);
! 	free_dma(ep->indma);
  	endpoint_flush(ep);
  	
--- 1590,1594 ----
  	ep = &usbserial.port[i].ep_bulkin;
  	free_irq(ep->inirq, &usbserial);
! 	free_au1000_dma(ep->indma);
  	endpoint_flush(ep);
  	
***************
*** 1596,1600 ****
  	ep = &usbserial.port[i].ep_bulkout;
  	//free_irq(ep->outirq, &usbserial);
! 	free_dma(ep->outdma);
  	endpoint_flush(ep);
  
--- 1596,1600 ----
  	ep = &usbserial.port[i].ep_bulkout;
  	//free_irq(ep->outirq, &usbserial);
! 	free_au1000_dma(ep->outdma);
  	endpoint_flush(ep);
  
***************
*** 1689,1697 ****
      ep->max_pkt_size = usbserial.dev_desc->bMaxPacketSize0;
      ep->indma = ep->outdma = -1;
!     if ((ep->indma = request_dma(ep_dma_id[0].id, ep_dma_id[0].str)) < 0) {
  	err("Can't get %s DMA\n", ep_dma_id[0].str);
  	goto err_out;
      }
!     if ((ep->outdma = request_dma(ep_dma_id[1].id, ep_dma_id[1].str)) < 0) {
  	err("Can't get %s DMA\n", ep_dma_id[1].str);
  	goto err_out;
--- 1689,1699 ----
      ep->max_pkt_size = usbserial.dev_desc->bMaxPacketSize0;
      ep->indma = ep->outdma = -1;
!     if ((ep->indma = request_au1000_dma(ep_dma_id[0].id,
! 					ep_dma_id[0].str)) < 0) {
  	err("Can't get %s DMA\n", ep_dma_id[0].str);
  	goto err_out;
      }
!     if ((ep->outdma = request_au1000_dma(ep_dma_id[1].id,
! 					 ep_dma_id[1].str)) < 0) {
  	err("Can't get %s DMA\n", ep_dma_id[1].str);
  	goto err_out;
***************
*** 1735,1740 ****
  	ep->max_pkt_size = ep->desc->wMaxPacketSize;
  	ep->indma = ep->outdma = -1;
! 	if ((ep->indma = request_dma(ep_dma_id[2+NUM_PORTS*i].id,
! 				     ep_dma_id[2+NUM_PORTS*i].str)) < 0) {
  	    err("Can't get %s DMA\n", ep_dma_id[2+NUM_PORTS*i].str);
  	    goto err_out;
--- 1737,1743 ----
  	ep->max_pkt_size = ep->desc->wMaxPacketSize;
  	ep->indma = ep->outdma = -1;
! 	if ((ep->indma =
! 	     request_au1000_dma(ep_dma_id[2+NUM_PORTS*i].id,
! 				ep_dma_id[2+NUM_PORTS*i].str)) < 0) {
  	    err("Can't get %s DMA\n", ep_dma_id[2+NUM_PORTS*i].str);
  	    goto err_out;
***************
*** 1754,1759 ****
  	ep->max_pkt_size = ep->desc->wMaxPacketSize;
  	ep->indma = ep->outdma = -1;
! 	if ((ep->outdma = request_dma(ep_dma_id[2+NUM_PORTS*i + 1].id,
! 				      ep_dma_id[2+NUM_PORTS*i + 1].str)) < 0) {
  	    err("Can't get %s DMA\n", ep_dma_id[2+NUM_PORTS*i + 1].str);
  	    goto err_out;
--- 1757,1763 ----
  	ep->max_pkt_size = ep->desc->wMaxPacketSize;
  	ep->indma = ep->outdma = -1;
! 	if ((ep->outdma =
! 	     request_au1000_dma(ep_dma_id[2+NUM_PORTS*i + 1].id,
! 				ep_dma_id[2+NUM_PORTS*i + 1].str)) < 0) {
  	    err("Can't get %s DMA\n", ep_dma_id[2+NUM_PORTS*i + 1].str);
  	    goto err_out;

[Linux-mips-commits] CVS: linux/arch/mips/ddb5xxx/common irq.c,NONE,1.1 Makefile,1.1.1.1,1.2 rtc_ds1386.c,1.1.1.1,1.2

From: Jun S. <ju...@us...> - 2001-08-23 04:20:18

Update of /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common
In directory usw-pr-cvs1:/tmp/cvs-serv32754/arch/mips/ddb5xxx/common

Modified Files:
	Makefile rtc_ds1386.c 
Added Files:
	irq.c 
Log Message:
Move to_tm() to common time.c file.  Some related ddb5477 changes.


--- NEW FILE: irq.c ---
/***********************************************************************
 *
 * Copyright 2001 MontaVista Software Inc.
 * Author: js...@mv... or js...@ju...
 *
 * arch/mips/ddb5xxx/common/irq.c
 *     Common irq code for DDB boards.  This really should belong
 *	arch/mips/kernel/irq.c.  Need to talk to Ralf.
 *
 * This program is free software; you can redistribute  it and/or modify it
 * under  the terms of  the GNU General  Public License as published by the
 * Free Software Foundation;  either version 2 of the  License, or (at your
 * option) any later version.
 *
 ***********************************************************************
 */

#include <linux/config.h>
#include <linux/init.h>			/* for __init */

void (*irq_setup)(void);

void __init init_IRQ(void)
{

#ifdef CONFIG_REMOTE_DEBUG
        extern void breakpoint(void);
        extern void set_debug_traps(void);

        printk("Wait for gdb client connection ...\n");
        set_debug_traps();
        breakpoint();
#endif

        /* invoke board-specific irq setup */
        irq_setup();
}


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	2001/06/22 02:29:31	1.1.1.1
--- Makefile	2001/08/23 04:20:15	1.2
***************
*** 14,18 ****
  O_TARGET:= ddb5xxx.o
  
! obj-y	 += irq_cpu.o nile4.o prom.o pci.o pci_auto.o rtc_ds1386.o
  
  include $(TOPDIR)/Rules.make
--- 14,18 ----
  O_TARGET:= ddb5xxx.o
  
! obj-y	 += irq.o irq_cpu.o nile4.o prom.o pci.o pci_auto.o rtc_ds1386.o
  
  include $(TOPDIR)/Rules.make

Index: rtc_ds1386.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common/rtc_ds1386.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rtc_ds1386.c	2001/06/22 02:29:31	1.1.1.1
--- rtc_ds1386.c	2001/08/23 04:20:15	1.2
***************
*** 24,28 ****
  #include <linux/types.h>
  #include <linux/time.h>
- #include <linux/rtc.h>
  
  #include <asm/time.h>
--- 24,27 ----
***************
*** 83,87 ****
  }
  
- void to_tm(unsigned long tim, struct rtc_time * tm);
  static int 
  rtc_ds1386_set_time(unsigned long t)
--- 82,85 ----
***************
*** 173,267 ****
  
  
- /* ================================================== */
- #define TICK_SIZE tick
- #define FEBRUARY        2
- #define STARTOFTIME     1970
- #define SECDAY          86400L
- #define SECYR           (SECDAY * 365)
- #define leapyear(year)          ((year) % 4 == 0)
- #define days_in_year(a)         (leapyear(a) ? 366 : 365)
- #define days_in_month(a)        (month_days[(a) - 1])
- 
- static int month_days[12] = {
-         31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
- };
- 
- /*
-  * This only works for the Gregorian calendar - i.e. after 1752 (in the UK)
-  */
- static void 
- GregorianDay(struct rtc_time * tm)
- {
-         int leapsToDate;
-         int lastYear;
-         int day;
-         int MonthOffset[] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
- 
-         lastYear=tm->tm_year-1;
- 
-         /*
-          * Number of leap corrections to apply up to end of last year
-          */
-         leapsToDate = lastYear/4 - lastYear/100 + lastYear/400;
- 
-         /*
-          * This year is a leap year if it is divisible by 4 except when it is
-          * divisible by 100 unless it is divisible by 400
-          *
-          * e.g. 1904 was a leap year, 1900 was not, 1996 is, and 2000 will be
-          */
-         if((tm->tm_year%4==0) &&
-            ((tm->tm_year%100!=0) || (tm->tm_year%400==0)) &&
-            (tm->tm_mon>2))
-         {
-                 /*
-                  * We are past Feb. 29 in a leap year
-                  */
-                 day=1;
-         }
-         else
-         {
-                 day=0;
-         }
- 
-         day += lastYear*365 + leapsToDate + MonthOffset[tm->tm_mon-1] +
-                    tm->tm_mday;
- 
-         tm->tm_wday=day%7;
- }
- 
- 
- void to_tm(unsigned long tim, struct rtc_time * tm)
- {
-         register int    i;
-         register long   hms, day;
- 
-         day = tim / SECDAY;
-         hms = tim % SECDAY;
- 
-         /* Hours, minutes, seconds are easy */
-         tm->tm_hour = hms / 3600;
-         tm->tm_min = (hms % 3600) / 60;
-         tm->tm_sec = (hms % 3600) % 60;
- 
-         /* Number of years in days */
-         for (i = STARTOFTIME; day >= days_in_year(i); i++)
-                 day -= days_in_year(i);
-         tm->tm_year = i;
- 
-         /* Number of months in days left */
-         if (leapyear(tm->tm_year))
-                 days_in_month(FEBRUARY) = 29;
-         for (i = 1; day >= days_in_month(i); i++)
-                 day -= days_in_month(i);
-         days_in_month(FEBRUARY) = 28;
-         tm->tm_mon = i;
- 
-         /* Days are what is left over (+1) from all that. */
-         tm->tm_mday = day + 1;
- 
-         /*
-          * Determine the day of week
-          */
-         GregorianDay(tm);
- }
--- 171,172 ----

[Linux-mips-commits] CVS: linux/arch/mips/ddb5xxx/ddb5477 irq.c,1.2,1.3

From: Jun S. <ju...@us...> - 2001-08-23 04:20:18

Update of /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/ddb5477
In directory usw-pr-cvs1:/tmp/cvs-serv32754/arch/mips/ddb5xxx/ddb5477

Modified Files:
	irq.c 
Log Message:
Move to_tm() to common time.c file.  Some related ddb5477 changes.


Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/ddb5477/irq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** irq.c	2001/08/03 21:26:26	1.2
--- irq.c	2001/08/23 04:20:15	1.3
***************
*** 164,184 ****
  	}
  }
- 
- void (*irq_setup)(void);
- 
- void __init init_IRQ(void)
- {
- 
- #ifdef CONFIG_REMOTE_DEBUG
-         extern void breakpoint(void);
-         extern void set_debug_traps(void);
- 
-         printk("Wait for gdb client connection ...\n");
-         set_debug_traps();
-         breakpoint();
- #endif
- 
-         /* invoke board-specific irq setup */
-         irq_setup();
- }
-  
--- 164,165 ----

[Linux-mips-commits] CVS: linux/arch/mips/kernel time.c,1.5,1.6

From: Jun S. <ju...@us...> - 2001-08-23 04:20:18

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv32754/arch/mips/kernel

Modified Files:
	time.c 
Log Message:
Move to_tm() to common time.c file.  Some related ddb5477 changes.


Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/time.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** time.c	2001/08/22 18:18:14	1.5
--- time.c	2001/08/23 04:20:15	1.6
***************
*** 3,7 ****
   * Author: Jun Sun, js...@mv... or js...@ju...
   *
!  * Common time service routines for MIPS machines. See Documents/MIPS/time.txt. 
   *
   * This program is free software; you can redistribute  it and/or modify it
--- 3,8 ----
   * Author: Jun Sun, js...@mv... or js...@ju...
   *
!  * Common time service routines for MIPS machines. See 
!  * Documents/MIPS/README.txt. 
   *
   * This program is free software; you can redistribute  it and/or modify it
***************
*** 460,461 ****
--- 461,511 ----
  	board_timer_setup(&timer_irqaction);
  }
+ 
+ /* ================================================== */
+ #define FEBRUARY        2
+ #define STARTOFTIME     1970
+ #define SECDAY          86400L
+ #define SECYR           (SECDAY * 365)
+ #define leapyear(year)          ((year) % 4 == 0)
+ #define days_in_year(a)         (leapyear(a) ? 366 : 365)
+ #define days_in_month(a)        (month_days[(a) - 1])
+ 
+ static int month_days[12] = {
+         31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+ };
+ 
+ void to_tm(unsigned long tim, struct rtc_time * tm)
+ {
+         register int    i;
+         register long   hms, day;
+ 
+         day = tim / SECDAY;
+         hms = tim % SECDAY;
+ 
+         /* Hours, minutes, seconds are easy */
+         tm->tm_hour = hms / 3600;
+         tm->tm_min = (hms % 3600) / 60;
+         tm->tm_sec = (hms % 3600) % 60;
+ 
+         /* Number of years in days */
+         for (i = STARTOFTIME; day >= days_in_year(i); i++)
+                 day -= days_in_year(i);
+         tm->tm_year = i;
+ 
+         /* Number of months in days left */
+         if (leapyear(tm->tm_year))
+                 days_in_month(FEBRUARY) = 29;
+         for (i = 1; day >= days_in_month(i); i++)
+                 day -= days_in_month(i);
+         days_in_month(FEBRUARY) = 28;
+         tm->tm_mon = i;
+ 
+         /* Days are what is left over (+1) from all that. */
+         tm->tm_mday = day + 1;
+ 
+         /*
+          * Determine the day of week
+          */
+ 	tm->tm_wday = (day + 3) % 7;
+ }
+

[Linux-mips-commits] CVS: linux/include/asm-mips time.h,1.2,1.3

From: Jun S. <ju...@us...> - 2001-08-23 04:20:18

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv32754/include/asm-mips

Added Files:
	time.h 
Log Message:
Move to_tm() to common time.c file.  Some related ddb5477 changes.

[Linux-mips-commits] CVS: linux Makefile,1.1,1.2

From: Jun S. <ju...@us...> - 2001-08-23 03:17:37

Update of /cvsroot/linux-mips/linux
In directory usw-pr-cvs1:/tmp/cvs-serv21628

Modified Files:
	Makefile 
Log Message:
Fix arch to 'mips' so that we don't have to modify it in cross-compile case.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	2001/08/20 15:55:09	1.1
--- Makefile	2001/08/23 03:17:33	1.2
***************
*** 6,10 ****
  KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  
! ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
  
  CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
--- 6,10 ----
  KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  
! ARCH := mips
  
  CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \

[Linux-mips-commits] CVS: linux/arch/mips/kernel old-irq.c,1.2,1.3 old-time.c,1.3,1.4

From: James S. <jsi...@us...> - 2001-08-22 18:19:20

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv16178/arch/mips/kernel

Added Files:
	old-irq.c old-time.c 
Log Message:
Synced to Ralph's tree

[Linux-mips-commits] CVS: linux/arch/mips/baget ld.script.balo,NONE,1.1

From: James S. <jsi...@us...> - 2001-08-22 18:19:20

Update of /cvsroot/linux-mips/linux/arch/mips/baget
In directory usw-pr-cvs1:/tmp/cvs-serv16178/arch/mips/baget

Added Files:
	ld.script.balo 
Log Message:
Synced to Ralph's tree

--- NEW FILE: ld.script.balo ---
OUTPUT_FORMAT("elf32-bigmips")
OUTPUT_ARCH(mips)
ENTRY(balo_entry)
SECTIONS
{
  /* Read-only sections, merged into text segment: */
  . = 0x80400000;
  .rel.text      : { *(.rel.text)	}
  .rela.text     : { *(.rela.text) 	}
  .rel.data      : { *(.rel.data)	}
  .rela.data     : { *(.rela.data) 	}
  .rel.rodata    : { *(.rel.rodata) 	}
  .rela.rodata   : { *(.rela.rodata) 	}
  .rel.got       : { *(.rel.got)	}
  .rela.got      : { *(.rela.got)	}
  .rel.ctors     : { *(.rel.ctors)	}
  .rela.ctors    : { *(.rela.ctors)	}
  .rel.dtors     : { *(.rel.dtors)	}
  .rela.dtors    : { *(.rela.dtors)	}
  .rel.init      : { *(.rel.init)	}
  .rela.init     : { *(.rela.init)	}
  .rel.fini      : { *(.rel.fini)	}
  .rela.fini     : { *(.rela.fini)	}
  .rel.bss       : { *(.rel.bss)	}
  .rela.bss      : { *(.rela.bss)	}
  .rel.plt       : { *(.rel.plt)	}
  .rela.plt      : { *(.rela.plt)	}
  .init          : { *(.init)		} =0
  .text      :
  {
    _ftext = . ;
    *(.text)
    *(.rodata)
    *(.rodata.*)
    *(.rodata1)
    /* .gnu.warning sections are handled specially by elf32.em.  */
    *(.gnu.warning)

  _etext = .;
  PROVIDE (etext = .);

  /* Startup code */
  . = ALIGN(4096);
  __init_begin = .;
  *(.text.init) 
  *(.data.init) 
  . = ALIGN(4096);	/* Align double page for init_task_union */
  __init_end = .;

   *(.fini)    
  *(.reginfo) 
  /* Adjust the address for the data segment.  We want to adjust up to
     the same address within the page on the next page up.  It would
     be more correct to do this:
       . = .;
     The current expression does not correctly handle the case of a
     text segment ending precisely at the end of a page; it causes the
     data segment to skip a page.  The above expression does not have
     this problem, but it will currently (2/95) cause BFD to allocate
     a single segment, combining both text and data, for this case.
     This will prevent the text segment from being shared among
     multiple executions of the program; I think that is more
     important than losing a page of the virtual address space (note
     that no actual memory is lost; the page which is skipped can not
     be referenced).  */
  . = .;
    _fdata = . ;
    *(.data)
    CONSTRUCTORS

  *(.data1) 
  _gp = . + 0x8000;
  *(.lit8) 
  *(.lit4) 
  *(.ctors)   
  *(.dtors)   
  *(.got.plt) *(.got) 
  *(.dynamic) 
  /* We want the small data sections together, so single-instruction offsets
     can access them all, and initialized data all before uninitialized, so
     we can shorten the on-disk segment size.  */
  *(.sdata) 
  _edata  =  .;
  PROVIDE (edata = .);

  __bss_start = .;
  _fbss = .;

   *(.dynbss)
   *(.bss)
   *(COMMON)
  _end = . ;
  PROVIDE (end = .);
   *(.sbss)
   *(.scommon)

  /* These are needed for ELF backends which have not yet been
     converted to the new style linker.  */
  *(.stab) 
  *(.stabstr) 
  /* DWARF debug sections.
     Symbols in the .debug DWARF section are relative to the beginning of the
     section so we begin .debug at 0.  It's not clear yet what needs to happen
     for the others.   */
  *(.debug) 
  *(.debug_srcinfo) 
  *(.debug_aranges) 
  *(.debug_pubnames) 
  *(.debug_sfnames) 
  *(.line) 
  /* These must appear regardless of  .  */
  *(.gptab.data) *(.gptab.sdata) 
  *(.gptab.bss) *(.gptab.sbss) 

  _vmlinux_start = .;
  *(.vmlinux)
  _vmlinux_end = .;

  _ramdisk_start = .;
  *(.ramdisk)
  _ramdisk_end = .;

} =0

}

[Linux-mips-commits] CVS: linux/arch/mips64/sgi-ip27 ip27-timer.c,NONE,1.1

From: James S. <jsi...@us...> - 2001-08-22 18:19:20

Update of /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27
In directory usw-pr-cvs1:/tmp/cvs-serv16178/arch/mips64/sgi-ip27

Added Files:
	ip27-timer.c 
Log Message:
Synced to Ralph's tree

--- NEW FILE: ip27-timer.c ---
/*
 * Copytight (C) 1999, 2000 Ralf Baechle (ra...@gn...)
 * Copytight (C) 1999, 2000 Silicon Graphics, Inc.
 */
#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <linux/param.h>
#include <linux/timex.h>
#include <linux/mm.h>		

#include <asm/pgtable.h>
#include <asm/sgialib.h>
#include <asm/sn/ioc3.h>
#include <asm/m48t35.h>
#include <asm/sn/klconfig.h>
#include <asm/sn/arch.h>
#include <asm/sn/addrs.h>
#include <asm/sn/sn_private.h>
#include <asm/sn/sn0/ip27.h>
#include <asm/sn/sn0/hub.h>

/*
 * This is a hack; we really need to figure these values out dynamically
 * 
 * Since 800 ns works very well with various HUB frequencies, such as
 * 360, 380, 390 and 400 MHZ, we use 800 ns rtc cycle time.
 *
 * Ralf: which clock rate is used to feed the counter?
 */
#define NSEC_PER_CYCLE		800
#define NSEC_PER_SEC		1000000000
#define CYCLES_PER_SEC		(NSEC_PER_SEC/NSEC_PER_CYCLE)
#define CYCLES_PER_JIFFY	(CYCLES_PER_SEC/HZ)

static unsigned long ct_cur[NR_CPUS];	/* What counter should be at next timer irq */
static long last_rtc_update;		/* Last time the rtc clock got updated */

extern rwlock_t xtime_lock;
extern volatile unsigned long wall_jiffies;


static int set_rtc_mmss(unsigned long nowtime)
{
	int retval = 0;
	int real_seconds, real_minutes, cmos_minutes;
	struct m48t35_rtc *rtc;
	nasid_t nid;

	nid = get_nasid();
	rtc = (struct m48t35_rtc *)(KL_CONFIG_CH_CONS_INFO(nid)->memory_base + 
							IOC3_BYTEBUS_DEV0);

	rtc->control |= M48T35_RTC_READ;
	cmos_minutes = rtc->min;
	BCD_TO_BIN(cmos_minutes);
	rtc->control &= ~M48T35_RTC_READ;

	/*
	 * Since we're only adjusting minutes and seconds, don't interfere with
	 * hour overflow. This avoids messing with unknown time zones but
	 * requires your RTC not to be off by more than 15 minutes
	 */
	real_seconds = nowtime % 60;
	real_minutes = nowtime / 60;
	if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
		real_minutes += 30;	/* correct for half hour time zone */
	real_minutes %= 60;

	if (abs(real_minutes - cmos_minutes) < 30) {
		BIN_TO_BCD(real_seconds);
		BIN_TO_BCD(real_minutes);
		rtc->control |= M48T35_RTC_SET;
		rtc->sec = real_seconds;
		rtc->min = real_minutes;
		rtc->control &= ~M48T35_RTC_SET;
	} else {
		printk(KERN_WARNING
		       "set_rtc_mmss: can't update from %d to %d\n",
		       cmos_minutes, real_minutes);
		retval = -1;
	}

	return retval;
}

void rt_timer_interrupt(struct pt_regs *regs)
{
	int cpu = smp_processor_id();
	int cpuA = ((cputoslice(cpu)) == 0);
	int irq = 7;				/* XXX Assign number */

	write_lock(&xtime_lock);

again:
	LOCAL_HUB_S(cpuA ? PI_RT_PEND_A : PI_RT_PEND_B, 0);	/* Ack  */
	ct_cur[cpu] += CYCLES_PER_JIFFY;
	LOCAL_HUB_S(cpuA ? PI_RT_COMPARE_A : PI_RT_COMPARE_B, ct_cur[cpu]);

	if (LOCAL_HUB_L(PI_RT_COUNT) >= ct_cur[cpu])
		goto again;

	kstat.irqs[cpu][irq]++;		/* kstat only for bootcpu? */

	if (cpu == 0)
		do_timer(regs);

#ifdef CONFIG_SMP
	{
		int user = user_mode(regs);

		/*
		 * update_process_times() expects us to have done irq_enter().
		 * Besides, if we don't timer interrupts ignore the global
		 * interrupt lock, which is the WrongThing (tm) to do.
		 * Picked from i386 code.
		 */
		irq_enter(cpu, 0);
		update_process_times(user);
		irq_exit(cpu, 0);
	}
#endif /* CONFIG_SMP */
	
	/*
	 * If we have an externally synchronized Linux clock, then update
	 * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
	 * called as close as possible to when a second starts.
	 */
	if ((time_status & STA_UNSYNC) == 0 &&
	    xtime.tv_sec > last_rtc_update + 660) {
		if (xtime.tv_usec >= 1000000 - ((unsigned) tick) / 2) {
			if (set_rtc_mmss(xtime.tv_sec + 1) == 0)
				last_rtc_update = xtime.tv_sec;
			else    
				last_rtc_update = xtime.tv_sec - 600;
		} else if (xtime.tv_usec <= ((unsigned) tick) / 2) {
			if (set_rtc_mmss(xtime.tv_sec) == 0)
				last_rtc_update = xtime.tv_sec;
			else    
				last_rtc_update = xtime.tv_sec - 600;
		}
        }

	write_unlock(&xtime_lock);

	if (softirq_pending(cpu))
		do_softirq();
}

unsigned long inline do_gettimeoffset(void)
{
	unsigned long ct_cur1;
	ct_cur1 = REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT) + CYCLES_PER_JIFFY;
	return (ct_cur1 - ct_cur[0]) * NSEC_PER_CYCLE / 1000;
}

void do_gettimeofday(struct timeval *tv)
{
	unsigned long flags;
	unsigned long usec, sec;

	read_lock_irqsave(&xtime_lock, flags);
	usec = do_gettimeoffset();
	{
		unsigned long lost = jiffies - wall_jiffies;
		if (lost)
			usec += lost * (1000000 / HZ);
	}
	sec = xtime.tv_sec;
	usec += xtime.tv_usec;
	read_unlock_irqrestore(&xtime_lock, flags);

	while (usec >= 1000000) {
		usec -= 1000000;
		sec++;
	}

	tv->tv_sec = sec;
	tv->tv_usec = usec;
}

void do_settimeofday(struct timeval *tv)
{
	write_lock_irq(&xtime_lock);
	tv->tv_usec -= do_gettimeoffset();
	tv->tv_usec -= (jiffies - wall_jiffies) * (1000000 / HZ);

	while (tv->tv_usec < 0) {
		tv->tv_usec += 1000000;
		tv->tv_sec--;
	}

	xtime = *tv;
	time_adjust = 0;		/* stop active adjtime() */
	time_status |= STA_UNSYNC;
	time_maxerror = NTP_PHASE_LIMIT;
	time_esterror = NTP_PHASE_LIMIT;
	write_unlock_irq(&xtime_lock);
}

/* Includes for ioc3_init().  */
#include <asm/sn/types.h>
#include <asm/sn/sn0/addrs.h>
#include <asm/sn/sn0/hubni.h>
#include <asm/sn/sn0/hubio.h>
#include <asm/pci/bridge.h>

static __init unsigned long get_m48t35_time(void)
{
        unsigned int year, month, date, hour, min, sec;
	struct m48t35_rtc *rtc;
	nasid_t nid;

	nid = get_nasid();
	rtc = (struct m48t35_rtc *)(KL_CONFIG_CH_CONS_INFO(nid)->memory_base + 
							IOC3_BYTEBUS_DEV0);

	rtc->control |= M48T35_RTC_READ;
	sec = rtc->sec;
	min = rtc->min;
	hour = rtc->hour;
	date = rtc->date;
	month = rtc->month;
	year = rtc->year;
	rtc->control &= ~M48T35_RTC_READ;

        BCD_TO_BIN(sec);
        BCD_TO_BIN(min);
        BCD_TO_BIN(hour);
        BCD_TO_BIN(date);
        BCD_TO_BIN(month);
        BCD_TO_BIN(year);

        year += 1970;

        return mktime(year, month, date, hour, min, sec);
}

void __init time_init(void)
{
	xtime.tv_sec = get_m48t35_time();
	xtime.tv_usec = 0;
}

void __init cpu_time_init(void)
{
	lboard_t *board;
	klcpu_t *cpu;
	int cpuid;

	/* Don't use ARCS.  ARCS is fragile.  Klconfig is simple and sane.  */
	board = find_lboard(KL_CONFIG_INFO(get_nasid()), KLTYPE_IP27);
	if (!board)
		panic("Can't find board info for myself.");

	cpuid = LOCAL_HUB_L(PI_CPU_NUM) ? IP27_CPU0_INDEX : IP27_CPU1_INDEX;
	cpu = (klcpu_t *) KLCF_COMP(board, cpuid);
	if (!cpu)
		panic("No information about myself?");

	printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed);

	set_cp0_status(SRB_TIMOCLK, SRB_TIMOCLK);
}

void __init hub_rtc_init(cnodeid_t cnode)
{
	/*
	 * We only need to initialize the current node.
	 * If this is not the current node then it is a cpuless
	 * node and timeouts will not happen there.
	 */
	if (get_compact_nodeid() == cnode) {
		int cpu = smp_processor_id();
		LOCAL_HUB_S(PI_RT_EN_A, 1);
		LOCAL_HUB_S(PI_RT_EN_B, 1);
		LOCAL_HUB_S(PI_PROF_EN_A, 0);
		LOCAL_HUB_S(PI_PROF_EN_B, 0);
		ct_cur[cpu] = CYCLES_PER_JIFFY;
		LOCAL_HUB_S(PI_RT_COMPARE_A, ct_cur[cpu]);
		LOCAL_HUB_S(PI_RT_COUNT, 0);
		LOCAL_HUB_S(PI_RT_PEND_A, 0);
		LOCAL_HUB_S(PI_RT_COMPARE_B, ct_cur[cpu]);
		LOCAL_HUB_S(PI_RT_COUNT, 0);
		LOCAL_HUB_S(PI_RT_PEND_B, 0);
	}
}

[Linux-mips-commits] CVS: linux/drivers/net Config.in,1.4,1.5 ioc3-eth.c,1.2,1.3 saa9730.c,1.3,1.4