[commit] r1375 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Fri Jan 8 13:09:44 2016
New Revision: 1375
URL: http://tracker.coreboot.org/trac/openbios/changeset/1375
Log:
pci: enable AAPL,address property for all Apple PPC machines
The property appears in device trees for both Old World and New World Macs
so let's do the same.
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/pci.c
Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:41 2016 (r1374)
+++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:44 2016 (r1375)
@@ -1020,7 +1020,10 @@
}
pci_set_assigned_addresses(phandle, config, num_bars);
- OLDWORLD(pci_set_AAPL_address(config));
+
+ if (is_apple()) {
+ pci_set_AAPL_address(config);
+ }
PCI_DPRINTF("\n");
}
4 years, 1 month
- 1
- 0
[commit] r1374 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Fri Jan 8 13:09:41 2016
New Revision: 1374
URL: http://tracker.coreboot.org/trac/openbios/changeset/1374
Log:
pci: fix AAPL,address property for IO space mappings
According to "Designing PCI Cards and Drivers for Power Macintosh Computers" the
AAPL,address property should be an array of virtual addresses representing the
bus addresses in the assigned-addresses array.
While this works for PCI memory addresses, IO addresses are incorrect because
the calculated address is still the PCI bus address. Switch over to using the
new space-aware pci_bus_addr_to_host_addr() so that addresses in both memory
and IO space are correctly calculated.
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/pci.c
Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:38 2016 (r1373)
+++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:41 2016 (r1374)
@@ -597,13 +597,18 @@
{
phandle_t dev = get_cur_dev();
cell props[7];
- int ncells, i;
+ uint32_t mask;
+ int ncells, i, flags, space_code;
ncells = 0;
for (i = 0; i < 6; i++) {
if (!config->assigned[i] || !config->sizes[i])
continue;
- props[ncells++] = config->assigned[i] & ~0x0000000F;
+ pci_decode_pci_addr(config->assigned[i],
+ &flags, &space_code, &mask);
+
+ props[ncells++] = pci_bus_addr_to_host_addr(space_code,
+ config->assigned[i] & ~mask);
}
if (ncells)
set_property(dev, "AAPL,address", (char *)props,
4 years, 1 month
- 1
- 0
[commit] r1373 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Fri Jan 8 13:09:38 2016
New Revision: 1373
URL: http://tracker.coreboot.org/trac/openbios/changeset/1373
Log:
pci: support PCI spaces other than memory in pci_bus_addr_to_host_addr()
Currently only PCI memory space is mapped in ob_pci_map_in(). By adding
multi-space support to pci_bus_addr_to_host_addr(), it becomes possible
to translate physical addresses for both memory and IO space.
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/pci.c
trunk/openbios-devel/drivers/pci.h
Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:35 2016 (r1372)
+++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:38 2016 (r1373)
@@ -144,9 +144,16 @@
}
#endif
-static unsigned long pci_bus_addr_to_host_addr(uint32_t ba)
+static unsigned long pci_bus_addr_to_host_addr(int space, uint32_t ba)
{
- return arch->host_pci_base + (unsigned long)ba;
+ if (space == IO_SPACE) {
+ return arch->io_base + (unsigned long)ba;
+ } else if (space == MEMORY_SPACE_32) {
+ return arch->host_pci_base + (unsigned long)ba;
+ } else {
+ /* Return unaltered to aid debugging property values */
+ return (unsigned long)ba;
+ }
}
static void
@@ -347,16 +354,20 @@
{
phys_addr_t phys;
uint32_t ba;
- ucell size, virt;
+ ucell size, virt, tmp;
+ int space;
PCI_DPRINTF("ob_pci_bar_map_in idx=%p\n", idx);
size = POP();
- POP();
+ tmp = POP();
POP();
ba = POP();
- phys = pci_bus_addr_to_host_addr(ba);
+ /* Get the space from the pci-addr.hi */
+ space = ((tmp & PCI_RANGE_TYPE_MASK) >> 24);
+
+ phys = pci_bus_addr_to_host_addr(space, ba);
#if defined(CONFIG_OFMEM)
ofmem_claim_phys(phys, size, 0);
@@ -753,13 +764,19 @@
int vga_config_cb (const pci_config_t *config)
{
unsigned long rom;
- uint32_t rom_size, size;
+ uint32_t rom_size, size, mask;
+ int flags, space_code;
phandle_t ph;
if (config->assigned[0] != 0x00000000) {
setup_video();
- rom = pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F);
+ pci_decode_pci_addr(config->assigned[1],
+ &flags, &space_code, &mask);
+
+ rom = pci_bus_addr_to_host_addr(space_code,
+ config->assigned[1] & ~0x0000000F);
+
rom_size = config->sizes[1];
ph = get_cur_dev();
Modified: trunk/openbios-devel/drivers/pci.h
==============================================================================
--- trunk/openbios-devel/drivers/pci.h Fri Jan 8 13:09:35 2016 (r1372)
+++ trunk/openbios-devel/drivers/pci.h Fri Jan 8 13:09:38 2016 (r1373)
@@ -59,6 +59,15 @@
#define PCI_MIN_GNT 0x3e /* 8 bits */
#define PCI_MAX_LAT 0x3f /* 8 bits */
+#define PCI_RANGE_RELOCATABLE 0x80000000
+#define PCI_RANGE_PREFETCHABLE 0x40000000
+#define PCI_RANGE_ALIASED 0x20000000
+#define PCI_RANGE_TYPE_MASK 0x03000000
+#define PCI_RANGE_MMIO_64BIT 0x03000000
+#define PCI_RANGE_MMIO 0x02000000
+#define PCI_RANGE_IOPORT 0x01000000
+#define PCI_RANGE_CONFIG 0x00000000
+
typedef struct {
u16 signature;
u8 reserved[0x16];
4 years, 1 month
- 1
- 0
[commit] r1372 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Fri Jan 8 13:09:35 2016
New Revision: 1372
URL: http://tracker.coreboot.org/trac/openbios/changeset/1372
Log:
pci: switch ob_pci_map_in() to use physical addresses rather than region and size
This matches the parameters for the map-in word as defined in the IEEE-1275
PCI bindings and provides extra information about the address space in use to
be used later. Even better this allows us to considerably simplify the Forth.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/drivers/pci.c
trunk/openbios-devel/drivers/pci.fs
trunk/openbios-devel/drivers/vga.fs
Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c Mon Jan 4 13:03:40 2016 (r1371)
+++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:35 2016 (r1372)
@@ -340,7 +340,7 @@
ss, dev, fn, buf);
}
-/* ( pci-addr.lo pci-addr.hi size -- virt ) */
+/* ( pci-addr.lo pci-addr.mid pci-addr.hi size -- virt ) */
static void
ob_pci_map_in(int *idx)
@@ -353,6 +353,7 @@
size = POP();
POP();
+ POP();
ba = POP();
phys = pci_bus_addr_to_host_addr(ba);
Modified: trunk/openbios-devel/drivers/pci.fs
==============================================================================
--- trunk/openbios-devel/drivers/pci.fs Mon Jan 4 13:03:40 2016 (r1371)
+++ trunk/openbios-devel/drivers/pci.fs Fri Jan 8 13:09:35 2016 (r1372)
@@ -12,59 +12,19 @@
rot encode-int encode+
;
-\ Get region offset for BAR reg
-: pci-bar-offset@ ( bar-reg -- off.lo off.hi -1 | 0 )
- " reg" active-package get-package-property 0= if
- begin
- decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi )
- ff and 5 pick = if
- >r >r 3drop r> r>
- -1 exit
- else
- 2drop
- then
- \ Drop the size as we don't need it
- decode-int drop decode-int drop
- dup 0=
- until
- 3drop
- 0 exit
- else
- 0
- then
- ;
-
-\ Get region size for BAR reg
-: pci-bar-size@ ( bar-reg -- size )
- " reg" active-package get-package-property 0= if
- begin
- decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi )
- ff and 5 pick = if
- 2drop decode-int drop
- decode-int
- >r 3drop r>
- exit
- else
- 2drop decode-int drop
- decode-int drop
- then
- dup 0=
- until
- 3drop
- 0 \ default size of 0 if BAR not found
- then
- ;
-
-\ Get base address for configured BAR reg
-: pci-bar-base@ ( bar-reg -- addr.lo addr.hi -1 | 0 )
+\ Get PCI physical address and size for configured BAR reg
+: pci-bar>pci-addr ( bar-reg -- addr.lo addr.mid addr.hi size -1 | 0 )
" assigned-addresses" active-package get-package-property 0= if
begin
decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi )
- ff and 5 pick = if
- >r >r 3drop r> r>
+ dup ff and 6 pick = if
+ >r >r >r rot drop
+ decode-int drop decode-int
+ -rot 2drop
+ r> swap r> r> rot
-1 exit
else
- 2drop
+ 3drop
then
\ Drop the size as we don't need it
decode-int drop decode-int drop
@@ -77,16 +37,4 @@
then
;
-\ Get PCI bus address and size for configured BAR reg
-: pci-bar>pci-region ( bar-reg -- addr.lo addr.hi size )
- dup
- >r pci-bar-offset@ if
- swap r@ pci-bar-base@ if
- swap d+
- then
- swap r@ pci-bar-size@
- then
- r> drop
- ;
-
[THEN]
Modified: trunk/openbios-devel/drivers/vga.fs
==============================================================================
--- trunk/openbios-devel/drivers/vga.fs Mon Jan 4 13:03:40 2016 (r1371)
+++ trunk/openbios-devel/drivers/vga.fs Fri Jan 8 13:09:35 2016 (r1372)
@@ -109,16 +109,17 @@
\ PCI
\
-" pci-bar>pci-region" (find-xt) value pci-bar>pci-region-xt
-: pci-bar>pci-region pci-bar>pci-region-xt execute ;
+" pci-bar>pci-addr" (find-xt) value pci-bar>pci-addr-xt
+: pci-bar>pci-addr pci-bar>pci-addr-xt execute ;
h# 10 constant cfg-bar0 \ Framebuffer BAR
-1 value fb-addr
: map-fb ( -- )
- cfg-bar0 pci-bar>pci-region \ ( pci-addr.lo pci-addr.hi size )
- " pci-map-in" $call-parent
- to fb-addr
+ cfg-bar0 pci-bar>pci-addr if \ ( pci-addr.lo pci-addr.mid pci-addr.hi size )
+ " pci-map-in" $call-parent
+ to fb-addr
+ then
;
\
4 years, 1 month
- 1
- 0
[PATCHv2 0/6] PCI address and property fixes
by Mark Cave-Ayland
This patchset is a result of work to fix the rtl8139 card under Apple PPC
machines in QEMU (both g3beige and mac99).
Primarily it fixes up pci_bus_addr_to_host_addr() to support both memory
and IO spaces in order to generate a correct AAPL,address
property for IO space mappings. As well as this, it removes the
configuration space range from the PCI host bridge for all machines except
SPARC64 which fixes an issue with Darwin/OS X calculating the wrong address
spaces for PCI accesses.
As a final tidy-up the last patch in the series is a nice rework which
properly generates the PCI node interrupt-map property from the device tree
rather than using hardcoded (and incorrect) properties for openpic.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
v2:
- Updated cover letter
- Remove OLDWORLD() macro typo
- Add constants suggested by Alex
- Include extra patch to tidy up interrupt-map property
Mark Cave-Ayland (6):
pci: switch ob_pci_map_in() to use physical addresses rather than
region and size
pci: support PCI spaces other than memory in
pci_bus_addr_to_host_addr()
pci: fix AAPL,address property for IO space mappings
pci: enable AAPL,address property for all Apple PPC machines
pci: remove the configuration space range from the PCI host bridge by
default
pci: don't hard-code PCI interrupt maps by default
openbios-devel/drivers/pci.c | 130 ++++++++++++++++++++++++-----------------
openbios-devel/drivers/pci.fs | 68 +++------------------
openbios-devel/drivers/pci.h | 9 +++
openbios-devel/drivers/vga.fs | 11 ++--
4 files changed, 100 insertions(+), 118 deletions(-)
--
1.7.10.4
4 years, 1 month
- 3
- 14
Re: [OpenBIOS] Emaculation bug reports
by Programmingkid
On Jan 3, 2016, at 2:27 PM, Mark Cave-Ayland wrote:
> On 03/01/16 19:01, Programmingkid wrote:
>
>>>> The rtl8139 did not work on the mac99 target. I didn't see the timeout message.
>>>> I did use your rtl8139 patchset fix.
>>>
>>> I think this might be because we're missing an interrupt mapping as they
>>> are currently hard-coded in OpenBIOS.
>>>
>>> Quick hack alert: take a look at OpenBIOS's drivers/pci.c and in
>>> particular ob_pci_host_set_interrupt_map(). See how at the moment we
>>> patch in hard-coded interrupt-parent nodes to link each device node to
>>> the interrupt controller? Maybe try adding something like the following
>>> for the rtl8139 card:
>>>
>>> target_node = find_dev("/pci/pci10ec,8139");
>>> set_int_property(target_node, "interrupt-parent", dnode);
>>>
>>> Does that then get the rtl8139 card to work under -M mac99 correctly?
>>
>> Sorry it doesn't. I paste your code right below the "if (dnode) {".
>
> Ah well. Thought it was worth a quick shot.
I did find out that the driver's init() and start() methods are never called. Using the ioreg command I can see the rtl8139 in the PCI slot. The NIC does work in Linux using the mac99 target. Note: I implemented your second set of patches for the rtl8139 and the booting from cd patchset.
4 years, 1 month
- 2
- 2
[PATCH 0/5] PCI address and property fixes
by Mark Cave-Ayland
This patchset primarily fixes up pci_bus_addr_to_host_addr() to support
both memory and IO spaces in order to generate a correct AAPL,address
property for IO space mappings. As well as this, it removes the
configuration space range from the PCI host bridge for all machines except
SPARC64 which fixes an issue with Darwin/OS X calculating the wrong address
spaces for PCI accesses.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Mark Cave-Ayland (5):
pci: switch ob_pci_map_in() to use physical addresses rather than
region and size
pci: support PCI spaces other than memory in
pci_bus_addr_to_host_addr()
pci: fix AAPL,address property for IO space mappings
pci: enable AAPL,address property for all Apple PPC machines
pci: remove the configuration space range from the PCI host bridge by
default
openbios-devel/drivers/pci.c | 56 ++++++++++++++++++++++++---------
openbios-devel/drivers/pci.fs | 68 +++++------------------------------------
openbios-devel/drivers/vga.fs | 11 ++++---
3 files changed, 56 insertions(+), 79 deletions(-)
--
1.7.10.4
4 years, 1 month
- 4
- 21
[commit] r1371 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Mon Jan 4 13:03:40 2016
New Revision: 1371
URL: http://tracker.coreboot.org/trac/openbios/changeset/1371
Log:
macio: switch over to use 2 ata-3 ide controllers
This better matches real device trees and fixes Darwin/OS X boot from CDROM
under the QEMU mac99 machine (it seems that IOKit will only detect macio IDE
devices connected to an ata-3 ide controller rather than the previous ata-4
ide controller).
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
trunk/openbios-devel/drivers/pci.c
Modified: trunk/openbios-devel/drivers/ide.c
==============================================================================
--- trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:37 2016 (r1370)
+++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:40 2016 (r1371)
@@ -1542,10 +1542,10 @@
struct ide_channel *chan;
/* IDE ports on Macs are numbered from 3.
- * Also see comments in macio.c:openpic_init() */
+ * Also see comments in pci.c:ob_pci_host_set_interrupt_map() */
current_channel = 3;
- for (i = 0; i < nb_channels; i++, current_channel++) {
+ for (i = 0; i < nb_channels; i++) {
chan = malloc(sizeof(struct ide_channel));
@@ -1651,7 +1651,7 @@
OLDWORLD(set_property(dnode, "AAPL,address",
(char *)&props, 2*sizeof(props[0])));
- props[0] = 0;
+ props[0] = i;
set_property(dnode, "AAPL,bus-id", (char*)props,
1 * sizeof(props[0]));
IDE_DPRINTF(DEV_NAME": [io ports 0x%lx]\n",
Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c Mon Jan 4 13:03:37 2016 (r1370)
+++ trunk/openbios-devel/drivers/pci.c Mon Jan 4 13:03:40 2016 (r1371)
@@ -1430,12 +1430,12 @@
/* On a new world Mac these are not numbered but named by the
* ATA version they support. Thus we have: ata-3, ata-3, ata-4
* On g3beige they all called just ide.
- * We take ata-3 and ata-4 which seems to work for both
- * at least for clients we care about */
- target_node = find_dev("/pci/mac-io/ata-3");
+ * We take 2 x ata-3 buses which seems to work for
+ * at least the clients we care about */
+ target_node = find_dev("/pci/mac-io/ata-3@20000");
set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci/mac-io/ata-4");
+ target_node = find_dev("/pci/mac-io/ata-3@21000");
set_int_property(target_node, "interrupt-parent", dnode);
target_node = find_dev("/pci/mac-io/via-cuda");
4 years, 1 month
- 1
- 0
[commit] r1370 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Mon Jan 4 13:03:37 2016
New Revision: 1370
URL: http://tracker.coreboot.org/trac/openbios/changeset/1370
Log:
ide: reference IDE channels by phandle, not device name
Otherwise when two device nodes have the same name property we are unable
to distinguish between them.
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
trunk/openbios-devel/drivers/ide.h
Modified: trunk/openbios-devel/drivers/ide.c
==============================================================================
--- trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:34 2016 (r1369)
+++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:37 2016 (r1370)
@@ -73,13 +73,13 @@
channels = chan;
}
-static struct ide_channel *ide_seek_channel(const char *name)
+static struct ide_channel *ide_seek_channel(phandle_t ph)
{
struct ide_channel *current;
current = channels;
while (current) {
- if (!strcmp(current->name, name))
+ if (current->ph == ph)
return current;
current = current->next;
}
@@ -1247,11 +1247,10 @@
static void
ob_ide_open(int *idx)
{
- int ret=1, len;
+ int ret=1;
phandle_t ph;
struct ide_drive *drive;
struct ide_channel *chan;
- char *idename;
int unit;
fword("my-unit");
@@ -1260,9 +1259,8 @@
fword("my-parent");
fword("ihandle>phandle");
ph=(phandle_t)POP();
- idename=get_property(ph, "name", &len);
- chan = ide_seek_channel(idename);
+ chan = ide_seek_channel(ph);
drive = &chan->drives[unit];
*(struct ide_drive **)idx = drive;
@@ -1380,9 +1378,6 @@
chan = malloc(sizeof(struct ide_channel));
- snprintf(chan->name, sizeof(chan->name),
- DEV_NAME, current_channel);
-
chan->mmio = 0;
for (j = 0; j < 8; j++)
@@ -1426,6 +1421,8 @@
current_channel);
REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode);
+ chan->ph = dnode;
+
#if !defined(CONFIG_PPC) && !defined(CONFIG_SPARC64)
props[0]=14; props[1]=0;
set_property(dnode, "interrupts",
@@ -1552,9 +1549,6 @@
chan = malloc(sizeof(struct ide_channel));
- snprintf(chan->name, sizeof(chan->name),
- DEV_NAME, current_channel);
-
chan->mmio = addr + MACIO_IDE_OFFSET + i * MACIO_IDE_SIZE;
chan->obide_inb = macio_ide_inb;
@@ -1594,6 +1588,8 @@
current_channel);
REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode);
+ chan->ph = dnode;
+
set_property(dnode, "compatible", (is_oldworld() ?
"heathrow-ata" : "keylargo-ata"), 13);
Modified: trunk/openbios-devel/drivers/ide.h
==============================================================================
--- trunk/openbios-devel/drivers/ide.h Mon Jan 4 13:03:34 2016 (r1369)
+++ trunk/openbios-devel/drivers/ide.h Mon Jan 4 13:03:37 2016 (r1370)
@@ -167,7 +167,7 @@
struct ide_channel {
- char name[32];
+ phandle_t ph;
struct ide_channel *next;
/*
4 years, 1 month
- 1
- 0
[commit] r1369 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Mon Jan 4 13:03:34 2016
New Revision: 1369
URL: http://tracker.coreboot.org/trac/openbios/changeset/1369
Log:
ide: switch IDE init functions over to use new get_path_from_ph() helper
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 Mon Jan 4 13:03:32 2016 (r1368)
+++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:34 2016 (r1369)
@@ -1466,9 +1466,8 @@
break;
}
IDE_DPRINTF("%s]: %s\n", media, drive->model);
- snprintf(nodebuff, sizeof(nodebuff),
- "%s/" DEV_NAME "/%s", path, current_channel,
- media);
+ snprintf(nodebuff, sizeof(nodebuff), "%s/%s",
+ get_path_from_ph(dnode), media);
REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode);
set_int_property(dnode, "reg", j);
@@ -1686,9 +1685,8 @@
break;
}
IDE_DPRINTF("%s]: %s\n", media, drive->model);
- snprintf(nodebuff, sizeof(nodebuff),
- "%s/" DEV_NAME "/%s", path, current_channel,
- media);
+ snprintf(nodebuff, sizeof(nodebuff), "%s/%s",
+ get_path_from_ph(dnode), media);
REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode);
set_int_property(dnode, "reg", j);
4 years, 1 month
- 1
- 0