Re: [PATCH] FreeBSD 64-bit kernel support

[phcoder <phcoder@gmail.com>]

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

Try this
Joey Korkames wrote:
> phcoder writes:
> 
>> Joey Korkames wrote:
>>> Hmm, FreeBSD seems to choke when trying to load the grub-bootstrapped 
>>> mfsroot.gz (as the root device - haven't tried loading without 
>>> rooting from it)...
> 
>> Thank you for the testing. Can you define "choke" more exactly?
>>>
> 
> Hmm, did my log attachment not make it? I'll inline it below.
> 
> "md0: Preloaded image <mfsroot.gz> 11771904 bytes at 0x7380afd000"
> I gunzipped the mfsroot.gz on my PXE server, this reported size matches 
> the uncompressed mfsroot file.
> 
>>>
>> Just run commands I gave you. You also need ruby to regenerate all 
>> these autogenerated files.
> 
> All things Ruby (including the *.rmk files) purposefully try to escape 
> my attention ;-)
> adding maintainer-clean before autogen in my build scripts fixed the 
> issue -thanks.
> 
> 
> "Choking":
> 
> Copyright (c) 1992-2009 The FreeBSD Project.
> Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
>        The Regents of the University of California. All rights reserved.
> FreeBSD is a registered trademark of The FreeBSD Foundation.
> FreeBSD 7.1-RELEASE #0: Thu Jan  1 08:58:24 UTC 2009
>    root@driscoll.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC
> Timecounter "i8254" frequency 1193182 Hz quality 0
> CPU: Intel(R) Xeon(R) CPU            5140  @ 2.33GHz (2333.35-MHz 
> K8-class CPU)
>  Origin = "GenuineIntel"  Id = 0x6f6  Stepping = 6
>  Features=0xbfebfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,DTS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE> 
> 
>  Features2=0x4e3bd<SSE3,RSVD2,MON,DS_CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,DCA> 
> 
>  AMD Features=0x20000800<SYSCALL,LM>
>  AMD Features2=0x1<LAHF>
>  Cores per package: 2
> usable memory = 17155354624 (16360 MB)
> avail memory  = 16608129024 (15838 MB)
> ACPI APIC Table: <PTLTD          APIC  >
> FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
> cpu0 (BSP): APIC ID:  0
> cpu1 (AP): APIC ID:  1
> ioapic0 <Version 2.0> irqs 0-23 on motherboard
> ioapic1 <Version 2.0> irqs 24-47 on motherboard
> kbd1 at kbdmux0
> ath_hal: 0.9.20.3 (AR5210, AR5211, AR5212, RF5111, RF5112, RF2413, RF5413)
> acpi0: <PTLTD   RSDT> on motherboard
> acpi0: [ITHREAD]
> acpi0: Power Button (fixed)
> Timecounter "ACPI-safe" frequency 3579545 Hz quality 850
> acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
> pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
> pci0: <ACPI PCI bus> on pcib0
> pcib1: <ACPI PCI-PCI bridge> at device 2.0 on pci0
> pci1: <ACPI PCI bus> on pcib1
> pcib2: <ACPI PCI-PCI bridge> irq 16 at device 0.0 on pci1
> pci2: <ACPI PCI bus> on pcib2
> pcib3: <ACPI PCI-PCI bridge> irq 16 at device 0.0 on pci2
> pci3: <ACPI PCI bus> on pcib3
> pcib4: <ACPI PCI-PCI bridge> at device 0.0 on pci3
> pci4: <ACPI PCI bus> on pcib4
> ahd0: <Adaptec AIC7902 Ultra320 SCSI adapter> port 
> 0x2400-0x24ff,0x2000-0x20ff mem 0xc8200000-0xc8201fff irq 16 at device 
> 2.0 on pci4
> ahd0: [ITHREAD]
> aic7902: Ultra320 Wide Channel A, SCSI Id=7, PCI-X 67-100Mhz, 512 SCBs
> ahd1: <Adaptec AIC7902 Ultra320 SCSI adapter> port 
> 0x2c00-0x2cff,0x2800-0x28ff mem 0xc8202000-0xc8203fff irq 17 at device 
> 2.1 on pci4
> ahd1: [ITHREAD]
> aic7902: Ultra320 Wide Channel B, SCSI Id=7, PCI-X 67-100Mhz, 512 SCBs
> pcib5: <ACPI PCI-PCI bridge> at device 0.2 on pci3
> pci5: <ACPI PCI bus> on pcib5
> pcib6: <ACPI PCI-PCI bridge> irq 18 at device 2.0 on pci2
> pci6: <ACPI PCI bus> on pcib6
> em0: <Intel(R) PRO/1000 Network Connection 6.9.6> port 0x3000-0x301f mem 
> 0xc8300000-0xc831ffff irq 18 at device 0.0 on pci6
> em0: Using MSI interrupt
> em0: [FILTER]
> em0: Ethernet address: 00:30:48:31:6b:10
> em1: <Intel(R) PRO/1000 Network Connection 6.9.6> port 0x3020-0x303f mem 
> 0xc8320000-0xc833ffff irq 19 at device 0.1 on pci6
> em1: Using MSI interrupt
> em1: [FILTER]
> em1: Ethernet address: 00:30:48:31:6b:11
> pcib7: <ACPI PCI-PCI bridge> at device 0.3 on pci1
> pci7: <ACPI PCI bus> on pcib7
> mpt0: <LSILogic SAS/SATA Adapter> port 0x4000-0x40ff mem 
> 0xc8410000-0xc8413fff,0xc8400000-0xc840ffff irq 24 at device 1.0 on pci7
> mpt0: [ITHREAD]
> mpt0: MPI Version=1.5.13.0
> mpt0: Capabilities: ( RAID-0 RAID-1E RAID-1 )
> mpt0: 0 Active Volumes (2 Max)
> mpt0: 0 Hidden Drive Members (10 Max)
> pcib8: <ACPI PCI-PCI bridge> at device 4.0 on pci0
> pci8: <ACPI PCI bus> on pcib8
> pcib9: <ACPI PCI-PCI bridge> at device 6.0 on pci0
> pci9: <ACPI PCI bus> on pcib9
> pci0: <base peripheral> at device 8.0 (no driver attached)
> pcib10: <ACPI PCI-PCI bridge> irq 17 at device 28.0 on pci0
> pci10: <ACPI PCI bus> on pcib10
> uhci0: <Intel 631XESB/632XESB/3100 USB controller USB-1> port 
> 0x1800-0x181f irq 17 at device 29.0 on pci0
> uhci0: [GIANT-LOCKED]
> uhci0: [ITHREAD]
> usb0: <Intel 631XESB/632XESB/3100 USB controller USB-1> on uhci0
> usb0: USB revision 1.0
> uhub0: <Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1> on usb0
> uhub0: 2 ports with 2 removable, self powered
> uhci1: <Intel 631XESB/632XESB/3100 USB controller USB-2> port 
> 0x1820-0x183f irq 19 at device 29.1 on pci0
> uhci1: [GIANT-LOCKED]
> uhci1: [ITHREAD]
> usb1: <Intel 631XESB/632XESB/3100 USB controller USB-2> on uhci1
> usb1: USB revision 1.0
> uhub1: <Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1> on usb1
> uhub1: 2 ports with 2 removable, self powered
> uhci2: <Intel 631XESB/632XESB/3100 USB controller USB-3> port 
> 0x1840-0x185f irq 18 at device 29.2 on pci0
> uhci2: [GIANT-LOCKED]
> uhci2: [ITHREAD]
> usb2: <Intel 631XESB/632XESB/3100 USB controller USB-3> on uhci2
> usb2: USB revision 1.0
> uhub2: <Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1> on usb2
> uhub2: 2 ports with 2 removable, self powered
> ehci0: <Intel 63XXESB USB 2.0 controller> mem 0xc8000000-0xc80003ff irq 
> 17 at device 29.7 on pci0
> ehci0: [GIANT-LOCKED]
> ehci0: [ITHREAD]
> usb3: EHCI version 1.0
> usb3: companion controllers, 2 ports each: usb0 usb1 usb2
> usb3: <Intel 63XXESB USB 2.0 controller> on ehci0
> usb3: USB revision 2.0
> uhub3: <Intel EHCI root hub, class 9/0, rev 2.00/1.00, addr 1> on usb3
> uhub3: 6 ports with 6 removable, self powered
> pcib11: <ACPI PCI-PCI bridge> at device 30.0 on pci0
> pci11: <ACPI PCI bus> on pcib11
> vgapci0: <VGA-compatible display> port 0x5000-0x50ff mem 
> 0xd0000000-0xd7ffffff,0xc8500000-0xc850ffff irq 18 at device 1.0 on pci11
> isab0: <PCI-ISA bridge> at device 31.0 on pci0
> isa0: <ISA bus> on isab0
> atapci0: <Intel 63XXESB2 UDMA100 controller> port 
> 0x1f0-0x1f7,0x3f6,0x170-0x177,0x376,0x1860-0x186f at device 31.1 on pci0
> ata0: <ATA channel 0> on atapci0
> ata0: [ITHREAD]
> ata1: <ATA channel 1> on atapci0
> ata1: [ITHREAD]
> pci0: <serial bus, SMBus> at device 31.3 (no driver attached)
> acpi_button0: <Power Button> on acpi0
> atkbdc0: <Keyboard controller (i8042)> port 0x60,0x64 irq 1 on acpi0
> atkbd0: <AT Keyboard> irq 1 on atkbdc0
> kbd0 at atkbd0
> atkbd0: [GIANT-LOCKED]
> atkbd0: [ITHREAD]
> sio0: configured irq 4 not in bitmap of probed irqs 0
> sio0: port may not be enabled
> sio0: configured irq 4 not in bitmap of probed irqs 0
> sio0: port may not be enabled
> sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on 
> acpi0
> sio0: type 16550A, console
> sio0: [FILTER]
> sio1: configured irq 3 not in bitmap of probed irqs 0
> sio1: port may not be enabled
> sio1: configured irq 3 not in bitmap of probed irqs 0
> sio1: port may not be enabled
> sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
> sio1: type 16550A
> sio1: [FILTER]
> fdc0: <floppy drive controller> port 0x3f0-0x3f5,0x3f7 irq 6 drq 2 on acpi0
> fdc0: [FILTER]
> ppc0: <Parallel port> port 0x378-0x37f,0x778-0x77f irq 7 drq 3 on acpi0
> ppc0: SMC-like chipset (ECP/EPP/PS2/NIBBLE) in COMPATIBLE mode
> ppc0: FIFO with 16/16/9 bytes threshold
> ppbus0: <Parallel port bus> on ppc0
> ppbus0: [ITHREAD]
> plip0: <PLIP network interface> on ppbus0
> plip0: WARNING: using obsoleted IFF_NEEDSGIANT flag
> lpt0: <Printer> on ppbus0
> lpt0: Interrupt-driven port
> ppi0: <Parallel I/O> on ppbus0
> ppc0: [GIANT-LOCKED]
> ppc0: [ITHREAD]
> cpu0: <ACPI CPU> on acpi0
> est0: <Enhanced SpeedStep Frequency Control> on cpu0
> est: CPU supports Enhanced Speedstep, but is not recognized.
> est: cpu_vendor GenuineIntel, msr 728072806000728
> device_attach: est0 attach returned 6
> p4tcc0: <CPU Frequency Thermal Control> on cpu0
> cpu1: <ACPI CPU> on acpi0
> est1: <Enhanced SpeedStep Frequency Control> on cpu1
> est: CPU supports Enhanced Speedstep, but is not recognized.
> est: cpu_vendor GenuineIntel, msr 728072806000728
> device_attach: est1 attach returned 6
> p4tcc1: <CPU Frequency Thermal Control> on cpu1
> orm0: <ISA Option ROMs> at iomem 
> 0xc0000-0xcafff,0xcb000-0xcbfff,0xcc000-0xcc7ff on isa0
> sc0: <System console> at flags 0x100 on isa0
> sc0: VGA <16 virtual consoles, flags=0x300>
> vga0: <Generic ISA VGA> at port 0x3c0-0x3df iomem 0xa0000-0xbffff on isa0
> Timecounters tick every 1.000 msec
> md0: Preloaded image <mfsroot.gz> 11771904 bytes at 0x7380afd000
> 
> 
> Fatal trap 12: page fault while in kernel mode
> cpuid = 0; apic id = 00
> fault virtual address   = 0x7380afd000
> fault code              = supervisor read data, page not present
> instruction pointer     = 0x8:0xffffffff80789636
> stack pointer           = 0x10:0xffffffffaeee2bd0
> frame pointer           = 0x10:0xffffff000420a800
> code segment            = base 0x0, limit 0xfffff, type 0x1b
>                        = DPL 0, pres 1, long 1, def32 0, gran 1
> processor eflags        = interrupt enabled, resume, IOPL = 0
> current process         = 47 (md0)
> trap number             = 12
> panic: page fault
> cpuid = 0
> Uptime: 1s
> Cannot dump. No dump device defined.
> Automatic reboot in 15 seconds - press a key on the console to abort
> --> Press a key on the console to reboot,
> --> or switch off the system now.
> 
> 
> 
> 
> 
> 
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel


-- 

Regards
Vladimir 'phcoder' Serbinenko

[-- Attachment #2: bsd64fix.diff --]
[-- Type: text/x-diff, Size: 1267 bytes --]

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 8c59c1b..8e9bb17 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -219,11 +219,27 @@ grub_freebsd_add_meta_module (int is_kern, int argc, char **argv,
 	    ((is_64bit) ? FREEBSD_MODTYPE_KERNEL64 : FREEBSD_MODTYPE_KERNEL)
 	    : FREEBSD_MODTYPE_RAW);
 
-  if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
+  if (is_64bit)
+    {
+      grub_uint64_t addr64 = addr, size64 = size; 
+      if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
 			      grub_strlen (type) + 1)) ||
-      (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr, sizeof (addr))) ||
-      (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size, sizeof (size))))
-    return grub_errno;
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr64, 
+				  sizeof (addr64))) ||
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size64, 
+				  sizeof (size64))))
+	return grub_errno;
+    }
+  else
+    {
+      if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
+				  grub_strlen (type) + 1)) ||
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr, 
+				  sizeof (addr))) ||
+	  (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size, 
+				  sizeof (size))))
+	return grub_errno;
+    }
 
   if (argc)
     {