[PATCH] sun partition map support

[PATCH] sun partition map support

[Vincent Pelletier]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

Hello.
Here is my first work about porting grub2 to ultrasparc : sun's
partition map support.
The code was inspired by libparted (structs and the checksum function
that I slightly modified).
This patch also enables i386-pc to test it, maybe it should also be done
for apple. Tested to work with parted-generated disk images, not tested
with a real disk.

2005-01-02  Vincent Pelletier  <subdino2004@yahoo.fr>
	* partmap/sun.c: Added
	* conf/i386-pc.rmk, include/grub/partition.h, util/grub-emu.c:
	References to partmap/sun.c added

Vincent Pelletier


[-- Attachment #2: partmap_sun.diff --]
[-- Type: text/plain, Size: 9195 bytes --]

Index: conf/i386-pc.rmk
===================================================================
RCS file: /cvsroot/grub/grub2/conf/i386-pc.rmk,v
retrieving revision 1.23
diff -u -p -r1.23 i386-pc.rmk
--- conf/i386-pc.rmk	4 Dec 2004 18:45:45 -0000	1.23
+++ conf/i386-pc.rmk	2 Jan 2005 17:41:34 -0000
@@ -62,6 +62,7 @@ grub_setup_SOURCES = util/i386/pc/grub-s
 	util/misc.c util/i386/pc/getroot.c kern/device.c kern/disk.c \
 	kern/err.c kern/misc.c fs/fat.c fs/ext2.c \
 	kern/partition.c partmap/amiga.c partmap/apple.c partmap/pc.c \
+	partmap/sun.c \
 	fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c fs/fshelp.c
 
 # For grub
@@ -70,6 +71,7 @@ grub_emu_SOURCES = kern/main.c kern/devi
         kern/misc.c kern/loader.c kern/rescue.c kern/term.c		\
 	kern/partition.c kern/env.c commands/ls.c partmap/amiga.c	\
 	partmap/pc.c partmap/apple.c					\
+	partmap/sun.c \
 	commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c		\
 	util/i386/pc/biosdisk.c fs/fat.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c fs/iso9660.c \
 	normal/cmdline.c normal/command.c normal/main.c normal/menu.c normal/arg.c	\
@@ -83,7 +85,7 @@ genmoddep_SOURCES = util/genmoddep.c
 pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
 	hfs.mod jfs.mod normal.mod hello.mod vga.mod font.mod _multiboot.mod ls.mod \
 	boot.mod cmp.mod cat.mod terminal.mod fshelp.mod chain.mod multiboot.mod \
-	amiga.mod apple.mod pc.mod
+	amiga.mod apple.mod pc.mod sun.mod
 
 # For _chain.mod.
 _chain_mod_SOURCES = loader/i386/pc/chainloader.c
@@ -190,3 +192,12 @@ apple_mod_CFLAGS = $(COMMON_CFLAGS)
 # For pc.mod
 pc_mod_SOURCES = partmap/pc.c
 pc_mod_CFLAGS = $(COMMON_CFLAGS)
+
+# For sun.mod
+sun_mod_SOURCES = partmap/sun.c
+sun_mod_CFLAGS = $(COMMON_CFLAGS)
+
Index: include/grub/partition.h
===================================================================
RCS file: /cvsroot/grub/grub2/include/grub/partition.h,v
retrieving revision 1.1
diff -u -p -r1.1 partition.h
--- include/grub/partition.h	4 Dec 2004 18:45:45 -0000	1.1
+++ include/grub/partition.h	2 Jan 2005 17:41:35 -0000
@@ -89,6 +89,8 @@ void grub_amiga_partition_map_init (void
 void grub_amiga_partition_map_fini (void);
 void grub_apple_partition_map_init (void);
 void grub_apple_partition_map_fini (void);
+void grub_sun_partition_map_init (void);
+void grub_sun_partition_map_fini (void);
#endif
 \f
 static inline unsigned long
Index: partmap/sun.c
===================================================================
RCS file: partmap/sun.c
diff -N partmap/sun.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ partmap/sun.c	2 Jan 2005 17:41:37 -0000
@@ -0,0 +1,204 @@
+/* sun.c - Read SUN style partition tables.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ *
+ *  GRUB 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 GRUB; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <grub/partition.h>
+#include <grub/disk.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/dl.h>
+
+#include <grub/symbol.h>
+#include <grub/types.h>
+#include <grub/err.h>
+
+#define GRUB_PARTMAP_SUN_MAGIC 0xDABE
+#define WHOLE_DISK_ID 0x05
+
+
+struct grub_sun_partition_info{
+  grub_uint8_t spare1;
+  grub_uint8_t id;
+  grub_uint8_t spare2;
+  grub_uint8_t flags;
+}__attribute__ ((packed));
+
+struct grub_sun_partition_descriptor{
+  grub_uint32_t start_cylinder;
+  grub_uint32_t num_sectors;
+}__attribute__ ((packed));
+
+struct grub_sun_block {
+  grub_uint8_t  info[128]; /* Informative text string */
+  grub_uint8_t  spare0[14];
+  struct grub_sun_partition_info infos[8];
+  grub_uint8_t  spare1[246]; /* Boot information etc. */
+  grub_uint16_t  rspeed; /* Disk rotational speed */
+  grub_uint16_t  pcylcount; /* Physical cylinder count */
+  grub_uint16_t  sparecyl; /* extra sects per cylinder */
+  grub_uint8_t  spare2[4]; /* More magic... */
+  grub_uint16_t  ilfact; /* Interleave factor */
+  grub_uint16_t  ncyl; /* Data cylinder count */
+  grub_uint16_t  nacyl; /* Alt. cylinder count */
+  grub_uint16_t  ntrks; /* Tracks per cylinder */
+  grub_uint16_t  nsect; /* Sectors per track */
+  grub_uint8_t  spare3[4]; /* Even more magic... */
+  struct grub_sun_partition_descriptor partitions[8];
+  grub_uint16_t  magic; /* Magic number */
+  grub_uint16_t  csum; /* Label xor'd checksum */
+}__attribute__ ((packed));
+
+static struct grub_partition_map grub_sun_partition_map;
+#ifndef GRUB_UTIL
+static grub_dl_t my_mod;
+#endif
+
+/* Verify checksum (true=ok) */
+static int grub_sun_is_valid(struct grub_sun_block *label)
+{
+  grub_uint16_t *pos;
+  grub_uint16_t sum=0;
+  for(pos=(grub_uint16_t *)label;pos<(grub_uint16_t *)(label+1);pos++)
+    sum^=*pos;
+  return !sum;
+}
+
+static grub_err_t
+sun_partition_map_iterate (grub_disk_t disk,
+			  int (*hook) (const grub_partition_t partition))
+{
+  struct grub_partition *p;
+  struct grub_disk raw;
+  struct grub_sun_block block;
+  int partnum;
+  raw=*disk;
+  raw.partition=0;
+  p=(struct grub_partition *)grub_malloc(sizeof(struct grub_partition));
+  if(p)
+  {
+    p->offset=0;
+    p->data=0;
+    p->partmap=&grub_sun_partition_map;
+    if(grub_disk_read(&raw,0,0,sizeof(struct grub_sun_block),(char *)&block)==GRUB_ERR_NONE)
+    {
+      if(GRUB_PARTMAP_SUN_MAGIC!=grub_be_to_cpu16(block.magic))
+        grub_error(GRUB_ERR_BAD_PART_TABLE,"no signature");
+      if(!grub_sun_is_valid(&block))
+        grub_error(GRUB_ERR_BAD_PART_TABLE,"invalid checksum"); /* another value ? */
+      for(partnum=0;partnum<8;partnum++)
+      {
+        if(block.infos[partnum].id==0 || block.infos[partnum].id==WHOLE_DISK_ID)
+          continue;
+        p->start=grub_be_to_cpu32(block.partitions[partnum].start_cylinder)*
+          grub_be_to_cpu16(block.ntrks)*
+          grub_be_to_cpu16(block.nsect);
+        p->len=grub_be_to_cpu32(block.partitions[partnum].num_sectors);
+        p->index=partnum;
+	if(p->len)
+        {
+          if(hook(p))
+            partnum=8;
+        }
+      }
+    }
+    grub_free(p);
+  }
+  return grub_errno;
+}
+
+static grub_partition_t
+sun_partition_map_probe (grub_disk_t disk, const char *str)
+{
+  grub_partition_t p=0;
+  int partnum = 0;
+  char *s = (char *) str;
+
+  auto int find_func (const grub_partition_t partition);
+  int find_func (const grub_partition_t partition)
+  {
+    if (partnum==partition->index)
+    {
+      p=(grub_partition_t)grub_malloc(sizeof(*p));
+      if(p)
+        grub_memcpy(p,partition,sizeof(*p));
+      return 1;
+    }
+    return 0;
+  }
+  grub_errno=GRUB_ERR_NONE;
+  partnum=grub_strtoul(s,0,10);
+  if(grub_errno==GRUB_ERR_NONE)
+  {
+    if(sun_partition_map_iterate(disk,find_func))
+    {
+      grub_free(p);
+      p=0;
+    }
+  }
+  else
+  {
+    grub_error(GRUB_ERR_BAD_FILENAME,"invalid partition");
+    p=0;
+  }
+  return p;
+}
+
+static char *
+sun_partition_map_get_name (const grub_partition_t p)
+{
+  char *name;
+  name = grub_malloc (13);
+  if (name)
+    grub_sprintf (name, "%d", p->index);
+  return name;
+}
+
+/* Partition map type.  */
+static struct grub_partition_map grub_sun_partition_map =
+  {
+    .name = "sun_partition_map",
+    .iterate = sun_partition_map_iterate,
+    .probe = sun_partition_map_probe,
+    .get_name = sun_partition_map_get_name
+  };
+
+#ifdef GRUB_UTIL
+void
+grub_sun_partition_map_init (void)
+{
+  grub_partition_map_register (&grub_sun_partition_map);
+}
+
+void
+grub_sun_partition_map_fini (void)
+{
+  grub_partition_map_unregister (&grub_sun_partition_map);
+}
+#else
+GRUB_MOD_INIT
+{
+  grub_partition_map_register (&grub_sun_partition_map);
+  my_mod = mod;
+}
+
+GRUB_MOD_FINI
+{
+  grub_partition_map_unregister (&grub_sun_partition_map);
+}
+#endif
Index: util/grub-emu.c
===================================================================
RCS file: /cvsroot/grub/grub2/util/grub-emu.c,v
retrieving revision 1.9
diff -u -p -r1.9 grub-emu.c
--- util/grub-emu.c	4 Dec 2004 18:45:45 -0000	1.9
+++ util/grub-emu.c	2 Jan 2005 17:41:37 -0000
@@ -156,6 +156,8 @@ main (int argc, char *argv[])
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (args.dev_map);
   grub_pc_partition_map_init ();
+  grub_sun_partition_map_init ();
   grub_amiga_partition_map_init ();
   grub_apple_partition_map_init ();
 
@@ -192,6 +193,8 @@ main (int argc, char *argv[])
   grub_cat_fini ();
   grub_terminal_fini ();
   grub_amiga_partition_map_fini ();
+  grub_sun_partition_map_fini ();
   grub_pc_partition_map_fini ();
   grub_apple_partition_map_fini ();
   

Re: [PATCH] sun partition map support

[Vincent Pelletier]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

(up)

Any comments about this patch ?
Any problems with the code from libparted ?

Vincent Pelletier
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFB7+LWFEQoKRQyjtURAnRjAJwJAnQSwoDJdHaLTlo5k8Ha51/FHQCfaepf
V24cJc12JDTLv/wwAO4S5JY=
=481o
-----END PGP SIGNATURE-----

Re: [PATCH] sun partition map support

[Yoshinori K. Okuji]

On Thursday 20 January 2005 17:56, Vincent Pelletier wrote:
> Any comments about this patch ?
> Any problems with the code from libparted ?

No problem.

BTW, I think it is better to give you a write permission to the CVS, 
because your assignment is finished. Marco, would you like to do this?

Okuji

Re: [PATCH] sun partition map support

[Marco Gerards]

Vincent Pelletier <subdino2004@yahoo.fr> writes:

> Any comments about this patch ?

You never sent it in for inclusion, IIRC, just to me.

> Any problems with the code from libparted ?

It looks like the copyrights for parted are assigned.  Okuji, is it ok
if we use code from parted?

Thanks,
Marco

Re: [PATCH] sun partition map support

[Marco Gerards]

"Yoshinori K. Okuji" <okuji@enbug.org> writes:

> On Thursday 20 January 2005 17:56, Vincent Pelletier wrote:
>> Any comments about this patch ?
>> Any problems with the code from libparted ?
>
> No problem.
>
> BTW, I think it is better to give you a write permission to the CVS, 
> because your assignment is finished. Marco, would you like to do this?

Sure.

--
Marco

Re: [PATCH] sun partition map support

[Marco Gerards]

Marco Gerards <metgerards@student.han.nl> writes:

> "Yoshinori K. Okuji" <okuji@enbug.org> writes:
>
>> On Thursday 20 January 2005 17:56, Vincent Pelletier wrote:
>>> Any comments about this patch ?
>>> Any problems with the code from libparted ?
>>
>> No problem.
>>
>> BTW, I think it is better to give you a write permission to the CVS, 
>> because your assignment is finished. Marco, would you like to do this?
>
> Sure.

Done.  Welcome on board Vincent. :)

--
Marco

Re: [PATCH] sun partition map support

[Marco Gerards]

Vincent Pelletier <subdino2004@yahoo.fr> writes:

> Any comments about this patch ?
> Any problems with the code from libparted ?

Unfortunately I did not receive this email, but I had a quick look in
the archives.  The main problems with it are some GCS related things.

There is currently a problem with the partition code.  Can you send in
a new patch after these problems are solved?  After that I will review
the patch and I make sure it can go in.

Thanks,
Marco

Re: [PATCH] sun partition map support

[Vincent Pelletier]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Here is the second version, with changes requested by Marco.

2005-02-07  Vincent Pelletier  <subdino2004@yahoo.fr>
~    * partmap/sun.c: File added.
~    * conf/i386-pc.rmk: References to partmap/sun.c added.
~      include/grub/partition.h, util/grub-emu.c: Likewise.

References to sun partition map may also have to be added to apple rmk
file, but as I can't test it I didn't.

Vincent Pelletier
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCB7rDFEQoKRQyjtURAmxHAJ9MCQmGHUbc3pTPy8vAI7OQFrUk2gCgnjbZ
tjKXOpgFm96mrrNp6C/26G8=
=Qboo
-----END PGP SIGNATURE-----

[-- Attachment #2: partmap_sun.diff --]
[-- Type: audio/x-mp3, Size: 10393 bytes --]

Re: [PATCH] sun partition map support

[Marco Gerards]

Vincent Pelletier <subdino2004@yahoo.fr> writes:

> Here is the second version, with changes requested by Marco.

Great!  Thanks! :)

This patch will be committed on Friday, if I don't hear anything
before then.

> 2005-02-07  Vincent Pelletier  <subdino2004@yahoo.fr>
> ~    * partmap/sun.c: File added.
> ~    * conf/i386-pc.rmk: References to partmap/sun.c added.
> ~      include/grub/partition.h, util/grub-emu.c: Likewise.

It's not clear where it got added from this.  I'll fix this when
committing the patch.

> References to sun partition map may also have to be added to apple rmk
> file, but as I can't test it I didn't.

Sure, I'll do that.

In the code you had:

+  p = (struct grub_partition *) grub_malloc (sizeof (struct grub_partition));
+  if (p)
+    {

That indents a huge block of code.  I will change that to:

+  p = (struct grub_partition *) grub_malloc (sizeof (struct grub_partition));
+  if (!p)
+    return grub_errno;

Please send patches using the content-type text/x-patch.  You send it
as audio/x-mp3 so it started some audio player here when I tried
viewing it. :-/

Thanks,
Marco

Re: [PATCH] sun partition map support

[Vincent Pelletier]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Marco Gerards wrote:
| It's not clear where it got added from this.  I'll fix this when
| committing the patch.

Thanks.

| Please send patches using the content-type text/x-patch.  You send it
| as audio/x-mp3 so it started some audio player here when I tried
| viewing it. :-/

Weird 8| .
There was some problems when I tried to send it,Thunderbird refused to
read the file twice, and worked once I renamed it. And I don't know how
is the mime detected - beyond "badly" :) .
Maybe should I learn how to send mails from emacs ;) .

Vincent Pelletier
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCB+QTFEQoKRQyjtURAtjFAJwPqO/nToHyHC5gVKVZSO+d8IXg9gCcCxUV
dLl5wXLo0iCM2L34vvui1Yk=
=4iti
-----END PGP SIGNATURE-----

Re: [PATCH] sun partition map support

[Vincent Pelletier]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Marco Gerards wrote:
| This patch will be committed on Friday, if I don't hear anything
| before then.

Ping ? :)

Vincent Pelletier
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCGjW0FEQoKRQyjtURAi8iAJ49gGmU4MEL5psu11lAq69Exefh6QCfUomn
CVvkdQ388bGdAg1LtTreI+U=
=iIWb
-----END PGP SIGNATURE-----

Re: [PATCH] sun partition map support

[Marco Gerards]

Vincent Pelletier <subdino2004@yahoo.fr> writes:

> Marco Gerards wrote:
> | This patch will be committed on Friday, if I don't hear anything
> | before then.
>
> Ping ? :)

Whoops!  I have committed your patch.  Thanks again and sorry for the
delay.

--
Marco

Re: [PATCH] sun partition map support

[Yoshinori K. Okuji]

On Monday 21 February 2005 20:25, Vincent Pelletier wrote:
> Ping ? :)

I want to ping you as well.

Okuji