rpms/kernel/devel kernel-2.6.spec, 1.2109, 1.2110 linux-2.6-hvc-console.patch, 1.3, 1.4 linux-2.6-cell-is-cbea.patch, 1.2, NONE linux-2.6-cell-spiderpic-no-devtree.patch, 1.1, NONE linux-2.6-hvc-rtas-console.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13379

Modified Files:
	kernel-2.6.spec linux-2.6-hvc-console.patch 
Removed Files:
	linux-2.6-cell-is-cbea.patch 
	linux-2.6-cell-spiderpic-no-devtree.patch 
	linux-2.6-hvc-rtas-console.patch 
Log Message:
sync cell stuff


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2109
retrieving revision 1.2110
diff -u -r1.2109 -r1.2110
--- kernel-2.6.spec	31 Mar 2006 20:07:18 -0000	1.2109
+++ kernel-2.6.spec	31 Mar 2006 20:48:15 -0000	1.2110
@@ -236,11 +236,8 @@
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6-cell-numa-init.patch
-Patch302: linux-2.6-cell-is-cbea.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
-Patch310: linux-2.6-cell-spiderpic-no-devtree.patch
-Patch313: linux-2.6-hvc-rtas-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
 
@@ -744,16 +741,10 @@
 #
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
-# IBM will use 'IBM,CBEA' for future Cell systems
-#%patch302 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
 %patch305 -p1
 # Make HVC console generic; support simulator console device using it.
-#%patch306 -p1
-# Hardcode PIC addresses for Cell spiderpic
-#%patch310 -p1
-# RTAS console support
-#%patch313 -p1
+%patch306 -p1
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 # No input layer on iseries

linux-2.6-hvc-console.patch:
 linux-2.6.14/drivers/char/hvc_fss.c    |  149 +++++++++++++++++++++++++++++++++
 linux-2.6.16.ppc/drivers/char/Kconfig  |    9 +
 linux-2.6.16.ppc/drivers/char/Makefile |    1 
 3 files changed, 159 insertions(+)

Index: linux-2.6-hvc-console.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-hvc-console.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-hvc-console.patch	10 Jan 2006 01:45:59 -0000	1.3
+++ linux-2.6-hvc-console.patch	31 Mar 2006 20:48:15 -0000	1.4
@@ -1,153 +1,3 @@
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.c linux-2.6.14/drivers/char/hvc_console.c
---- linux-2.6.14.cons/drivers/char/hvc_console.c	2005-12-07 16:33:35.000000000 +0100
-+++ linux-2.6.14/drivers/char/hvc_console.c	2005-12-07 16:33:56.000000000 +0100
-@@ -40,7 +40,7 @@
- #include <linux/spinlock.h>
- #include <linux/delay.h>
- #include <asm/uaccess.h>
--#include <asm/hvconsole.h>
-+#include "hvc_console.h"
- 
- #define HVC_MAJOR	229
- #define HVC_MINOR	0
-@@ -61,11 +61,6 @@
-  */
- #define HVC_ALLOC_TTY_ADAPTERS	8
- 
--#define N_OUTBUF	16
--#define N_INBUF		16
--
--#define __ALIGNED__	__attribute__((__aligned__(8)))
--
- static struct tty_driver *hvc_driver;
- static struct task_struct *hvc_task;
- 
-@@ -76,22 +71,6 @@
- static int sysrq_pressed;
- #endif
- 
--struct hvc_struct {
--	spinlock_t lock;
--	int index;
--	struct tty_struct *tty;
--	unsigned int count;
--	int do_wakeup;
--	char outbuf[N_OUTBUF] __ALIGNED__;
--	int n_outbuf;
--	uint32_t vtermno;
--	struct hv_ops *ops;
--	int irq_requested;
--	int irq;
--	struct list_head next;
--	struct kobject kobj; /* ref count & hvc_struct lifetime */
--};
--
- /* dynamic list of hvc_struct instances */
- static struct list_head hvc_structs = LIST_HEAD_INIT(hvc_structs);
- 
-@@ -136,7 +115,6 @@
- 	return hp;
- }
- 
--
- /*
-  * Initial console vtermnos for console API usage prior to full console
-  * initialization.  Any vty adapter outside this range will not have usable
-@@ -154,6 +132,7 @@
- 
- void hvc_console_print(struct console *co, const char *b, unsigned count)
- {
-+	/* This [16] should probably use a #define */
- 	char c[16] __ALIGNED__;
- 	unsigned i = 0, n = 0;
- 	int r, donecr = 0, index = co->index;
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.h linux-2.6.14/drivers/char/hvc_console.h
---- linux-2.6.14.cons/drivers/char/hvc_console.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.14/drivers/char/hvc_console.h	2005-12-07 16:33:56.000000000 +0100
-@@ -0,0 +1,83 @@
-+/*
-+ * hvc_console.h
-+ * Copyright (C) 2005 IBM Corporation
-+ *
-+ * Author(s):
-+ * 	Ryan S. Arnold <rsa us ibm com>
-+ *
-+ * hvc_console header information:
-+ *      moved here from include/asm-ppc64/hvconsole.h
-+ *      and drivers/char/hvc_console.c
-+ *
-+ * 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.
-+ *
-+ * 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, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ */
-+
-+#ifndef HVC_CONSOLE_H
-+#define HVC_CONSOLE_H
-+
-+#include <linux/spinlock.h>
-+#include <linux/list.h>
-+#include <linux/kobject.h>
-+
-+/*
-+ * This is the max number of console adapters that can/will be found as
-+ * console devices on first stage console init.  Any number beyond this range
-+ * can't be used as a console device but is still a valid tty device.
-+ */
-+#define MAX_NR_HVC_CONSOLES	16
-+
-+/*
-+ * This is a design shortcoming, the number '16' is a vio required buffer
-+ * size.  This should be changeable per architecture, but hvc_struct relies
-+ * upon it and that struct is used by all hvc_console backend drivers.  This
-+ * needs to be fixed.
-+ */
-+#define N_OUTBUF	16
-+#define N_INBUF		16
-+
-+#define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
-+
-+/* implemented by a low level driver */
-+struct hv_ops {
-+	int (*get_chars)(uint32_t vtermno, char *buf, int count);
-+	int (*put_chars)(uint32_t vtermno, const char *buf, int count);
-+};
-+
-+struct hvc_struct {
-+	spinlock_t lock;
-+	int index;
-+	struct tty_struct *tty;
-+	unsigned int count;
-+	int do_wakeup;
-+	char outbuf[N_OUTBUF] __ALIGNED__;
-+	int n_outbuf;
-+	uint32_t vtermno;
-+	struct hv_ops *ops;
-+	int irq_requested;
-+	int irq;
-+	struct list_head next;
-+	struct kobject kobj; /* ref count & hvc_struct lifetime */
-+};
-+
-+/* Register a vterm and a slot index for use as a console (console_init) */
-+extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
-+
-+/* register a vterm for hvc tty operation (module_init or hotplug add) */
-+extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
-+						 struct hv_ops *ops);
-+/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
-+extern int __devexit hvc_remove(struct hvc_struct *hp);
-+
-+#endif // HVC_CONSOLE_H
 diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_fss.c linux-2.6.14/drivers/char/hvc_fss.c
 --- linux-2.6.14.cons/drivers/char/hvc_fss.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.14/drivers/char/hvc_fss.c	2005-12-07 16:34:02.000000000 +0100
@@ -301,26 +151,23 @@
 +	return 0;
 +}
 +console_initcall(hvc_fss_console_init);
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Kconfig linux-2.6.14/drivers/char/Kconfig
---- linux-2.6.14.cons/drivers/char/Kconfig	2005-12-07 16:33:33.000000000 +0100
-+++ linux-2.6.14/drivers/char/Kconfig	2005-12-07 16:33:58.000000000 +0100
-@@ -552,14 +552,27 @@
- 
- 	  If unsure, say N.
- 
-+config HVC_DRIVER
-+	bool
-+	depends on PPC_PSERIES || PPC_CELL || PPC_RTAS
-+
- config HVC_CONSOLE
- 	bool "pSeries Hypervisor Virtual Console support"
- 	depends on PPC_PSERIES
-+	select HVC_DRIVER
+--- linux-2.6.16.ppc/drivers/char/Makefile~	2006-03-31 20:44:59.000000000 +0100
++++ linux-2.6.16.ppc/drivers/char/Makefile	2006-03-31 21:28:29.000000000 +0100
+@@ -44,6 +44,7 @@ obj-$(CONFIG_RIO)		+= rio/ generic_seria
+ obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
+ obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi.o
+ obj-$(CONFIG_HVC_RTAS)		+= hvc_rtas.o
++obj-$(CONFIG_HVC_FSS)		+= hvc_fss.o
+ obj-$(CONFIG_RAW_DRIVER)	+= raw.o
+ obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
+ obj-$(CONFIG_MMTIMER)		+= mmtimer.o
+--- linux-2.6.16.ppc/drivers/char/Kconfig~	2006-03-31 20:44:59.000000000 +0100
++++ linux-2.6.16.ppc/drivers/char/Kconfig	2006-03-31 21:29:05.000000000 +0100
+@@ -588,6 +588,15 @@ config HVC_RTAS
  	help
- 	  pSeries machines when partitioned support a hypervisor virtual
- 	  console. This driver allows each pSeries partition to have a console
- 	  which is accessed via the HMC.
+ 	  IBM Console device driver which makes use of RTAS
  
++
 +config HVC_FSS
 +	bool "IBM Full System Simulator Console support"
 +	depends on MAMBO
@@ -332,66 +179,3 @@
  config HVCS
  	tristate "IBM Hypervisor Virtual Console Server support"
  	depends on PPC_PSERIES
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Makefile linux-2.6.14/drivers/char/Makefile
---- linux-2.6.14.cons/drivers/char/Makefile	2005-12-07 16:33:33.000000000 +0100
-+++ linux-2.6.14/drivers/char/Makefile	2005-12-07 16:33:58.000000000 +0100
-@@ -40,11 +40,13 @@
- obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
- obj-$(CONFIG_SX)		+= sx.o generic_serial.o
- obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
--obj-$(CONFIG_HVC_CONSOLE)	+= hvc_console.o hvc_vio.o hvsi.o
-+obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
-+obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi.o
-+obj-$(CONFIG_HVC_FSS)		+= hvc_fss.o
- obj-$(CONFIG_RAW_DRIVER)	+= raw.o
- obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
- obj-$(CONFIG_MMTIMER)		+= mmtimer.o
--obj-$(CONFIG_VIOCONS) += viocons.o
-+obj-$(CONFIG_VIOCONS)		+= viocons.o
- obj-$(CONFIG_VIOTAPE)		+= viotape.o
- obj-$(CONFIG_HVCS)		+= hvcs.o
- obj-$(CONFIG_SGI_MBCS)		+= mbcs.o
-diff -uNr --exclude '*.orig' linux-2.6.14.cons/include/asm-powerpc/hvconsole.h linux-2.6.14/include/asm-powerpc/hvconsole.h
---- linux-2.6.14.cons/include/asm-powerpc/hvconsole.h	2005-12-07 16:33:35.000000000 +0100
-+++ linux-2.6.14/include/asm-powerpc/hvconsole.h	2005-12-07 16:33:56.000000000 +0100
-@@ -22,30 +22,9 @@
- #ifndef _PPC64_HVCONSOLE_H
- #define _PPC64_HVCONSOLE_H
- #ifdef __KERNEL__
- 
--/*
-- * This is the max number of console adapters that can/will be found as
-- * console devices on first stage console init.  Any number beyond this range
-- * can't be used as a console device but is still a valid tty device.
-- */
--#define MAX_NR_HVC_CONSOLES	16
--
--/* implemented by a low level driver */
--struct hv_ops {
--	int (*get_chars)(uint32_t vtermno, char *buf, int count);
--	int (*put_chars)(uint32_t vtermno, const char *buf, int count);
--};
- extern int hvc_get_chars(uint32_t vtermno, char *buf, int count);
- extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count);
- 
--struct hvc_struct;
--
--/* Register a vterm and a slot index for use as a console (console_init) */
--extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
--/* register a vterm for hvc tty operation (module_init or hotplug add) */
--extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
--						 struct hv_ops *ops);
--/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
--extern int __devexit hvc_remove(struct hvc_struct *hp);
- #endif /* __KERNEL__ */
- #endif /* _PPC64_HVCONSOLE_H */
---- linux-2.6.14/drivers/char/hvc_vio.c~	2005-12-07 17:46:48.000000000 +0100
-+++ linux-2.6.14/drivers/char/hvc_vio.c	2005-12-07 18:03:23.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <asm/hvconsole.h>
- #include <asm/vio.h>
- #include <asm/prom.h>
-+#include "hvc_console.h"
- 
- char hvc_driver_name[] = "hvc_console";
- 


--- linux-2.6-cell-is-cbea.patch DELETED ---


--- linux-2.6-cell-spiderpic-no-devtree.patch DELETED ---


--- linux-2.6-hvc-rtas-console.patch DELETED ---