[commit] r1368 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service
Author: mcayland
Date: Mon Jan 4 13:03:32 2016
New Revision: 1368
URL: http://tracker.coreboot.org/trac/openbios/changeset/1368
Log:
libopenbios: introduce new get_path_from_ph() helper function
This helper function returns the full device path for the device with the
given phandle as a string.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Reviewed-by: Alexander Graf <agraf(a)suse.de>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/include/libopenbios/bindings.h
trunk/openbios-devel/libopenbios/bindings.c
Modified: trunk/openbios-devel/include/libopenbios/bindings.h
==============================================================================
--- trunk/openbios-devel/include/libopenbios/bindings.h Mon Jan 4 13:03:29 2016 (r1367)
+++ trunk/openbios-devel/include/libopenbios/bindings.h Mon Jan 4 13:03:32 2016 (r1368)
@@ -56,6 +56,7 @@
extern ihandle_t open_dev( const char *spec );
extern void close_package( ihandle_t ih );
extern void close_dev( ihandle_t ih );
+extern char *get_path_from_ph( phandle_t ph );
/* property access */
extern void set_property( phandle_t ph, const char *name,
Modified: trunk/openbios-devel/libopenbios/bindings.c
==============================================================================
--- trunk/openbios-devel/libopenbios/bindings.c Mon Jan 4 13:03:29 2016 (r1367)
+++ trunk/openbios-devel/libopenbios/bindings.c Mon Jan 4 13:03:32 2016 (r1368)
@@ -366,6 +366,14 @@
return ret;
}
+char *
+get_path_from_ph( phandle_t ph )
+{
+ PUSH(ph);
+ fword("get-package-path");
+ return pop_fstr_copy();
+}
+
phandle_t
dt_iter_begin( void )
{
4 years, 1 month
- 1
- 0
[commit] r1367 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Mon Jan 4 13:03:29 2016
New Revision: 1367
URL: http://tracker.coreboot.org/trac/openbios/changeset/1367
Log:
ide: use REGISTER_NAMED_NODE_PHANDLE rather than REGISTER_NAMED_NODE
There already exists a macro to create the device node and return its phandle,
so use this directly rather than having to create the node and then navigate
to its full path separately.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Reviewed-by: Alexander Graf <agraf(a)suse.de>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/drivers/ide.c
Modified: trunk/openbios-devel/drivers/ide.c
==============================================================================
--- trunk/openbios-devel/drivers/ide.c Tue Dec 29 16:50:44 2015 (r1366)
+++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:29 2016 (r1367)
@@ -1424,9 +1424,7 @@
snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path,
current_channel);
- REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff);
-
- dnode = find_dev(nodebuff);
+ REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode);
#if !defined(CONFIG_PPC) && !defined(CONFIG_SPARC64)
props[0]=14; props[1]=0;
@@ -1471,8 +1469,7 @@
snprintf(nodebuff, sizeof(nodebuff),
"%s/" DEV_NAME "/%s", path, current_channel,
media);
- REGISTER_NAMED_NODE(ob_ide, nodebuff);
- dnode=find_dev(nodebuff);
+ REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode);
set_int_property(dnode, "reg", j);
/* create aliases */
@@ -1596,9 +1593,7 @@
snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path,
current_channel);
- REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff);
-
- dnode = find_dev(nodebuff);
+ REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode);
set_property(dnode, "compatible", (is_oldworld() ?
"heathrow-ata" : "keylargo-ata"), 13);
@@ -1694,8 +1689,7 @@
snprintf(nodebuff, sizeof(nodebuff),
"%s/" DEV_NAME "/%s", path, current_channel,
media);
- REGISTER_NAMED_NODE(ob_ide, nodebuff);
- dnode = find_dev(nodebuff);
+ REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode);
set_int_property(dnode, "reg", j);
/* create aliases */
4 years, 1 month
- 1
- 0
[PATCH 0/5] macio: switch over to use 2 ata-3 controllers
by Mark Cave-Ayland
Further work on Darwin/OS X shows that IOKit expects both the hard disk and
cdrom to be attached to the ata-3 controller for QEMU's mac99 machine.
Currently OpenBIOS generates an ata-3 and an ata-4 controller (and by default
attaches the cdrom to the ata-4 controller) meaning that IOKit would fail to
locate and mount the cdrom on boot. Resolve this by instantiating 2 ata-3
controller nodes instead which also is a better match for a real device tree.
The relevant changes to the device tree are shown below:
Before:
fff542a8 /pci@80000000/mac-io@3/ata-3@20000 (ata)
fff54540 /pci@80000000/mac-io@3/ata-4@21000 (ata)
fff547d8 /pci@80000000/mac-io@3/ata-4@21000/cdrom@0 (block)
After:
fff542a8 /pci@80000000/mac-io@3/ata-3@20000 (ata)
fff54540 /pci@80000000/mac-io@3/ata-3@21000 (ata)
fff547d8 /pci@80000000/mac-io@3/ata-3@21000/cdrom@0 (block)
The OpenBIOS IDE code currently works by using the device name internally to
reference the controller node, which of course breaks when 2 nodes are given
the same name property. Patches 1-4 switch the OpenBIOS IDE code over to
reference controller nodes by phandle rather than name, while patch 5 does
the actual switch from 1 ata-3 and 1 ata-4 controller to 2 ata-3 controllers.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Mark Cave-Ayland (5):
ide: use REGISTER_NAMED_NODE_PHANDLE rather than REGISTER_NAMED_NODE
libopenbios: introduce new get_path_from_ph() helper function
ide: switch IDE init functions over to use new get_path_from_ph()
helper
ide: reference IDE channels by phandle, not device name
macio: switch over to use 2 ata-3 ide controllers
openbios-devel/drivers/ide.c | 46 +++++++++----------------
openbios-devel/drivers/ide.h | 2 +-
openbios-devel/drivers/pci.c | 8 ++---
openbios-devel/include/libopenbios/bindings.h | 1 +
openbios-devel/libopenbios/bindings.c | 8 +++++
5 files changed, 31 insertions(+), 34 deletions(-)
--
1.7.10.4
4 years, 1 month
- 3
- 7