vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ofnet: Do not set SUFFIX for sun4v network devices

Browse source 
sun4v vnet devices do not implement the support of duplex and speed
instance attributes. An attempt to open such a device with
the attributes will fail:

ok select net:speed=auto,duplex=auto
Unknown key 'speed'
Unknown key 'duplex'
Manual Configuration: Host IP, boot server and filename must be specified
WARNING: /virtual-devices@100/channel-devices@200/network@0: Can't open OBP standard TFTP package

Can't open device
ok

Therefore, let's not set SUFFIX for such devices.

Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
This commit is contained in:
Stanislav Kholmanskikh 2015-09-07 14:13:11 +03:00 committed by Andrei Borzenkov
parent 8cb4c4edbe
commit ee67bcf31e
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
grub-core/net/drivers/ieee1275/ofnet.c
View file

@ -305,6 +305,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
grub_uint64_t prop; grub_uint64_t prop;
grub_uint8_t *pprop; grub_uint8_t *pprop;
char *shortname; char *shortname;
char need_suffix = 1;
if (grub_strcmp (alias->type, "network") != 0) if (grub_strcmp (alias->type, "network") != 0)
return 0; return 0;
@ -325,7 +326,43 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
#define SUFFIX ":speed=auto,duplex=auto,1.1.1.1,dummy,1.1.1.1,1.1.1.1,5,5,1.1.1.1,512" #define SUFFIX ":speed=auto,duplex=auto,1.1.1.1,dummy,1.1.1.1,1.1.1.1,5,5,1.1.1.1,512"
if (!grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_OFNET_SUFFIX)) if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_OFNET_SUFFIX))
need_suffix = 0;
/* sun4v vnet devices do not support setting duplex/speed */
{
char *ptr;
grub_ieee1275_finddevice (alias->path, &devhandle);
grub_ieee1275_get_property_length (devhandle, "compatible", &prop_size);
if (prop_size > 0)
{
pprop = grub_malloc (prop_size);
if (!pprop)
{
grub_free (card);
grub_free (ofdata);
grub_print_error ();
return 1;
}
if (!grub_ieee1275_get_property (devhandle, "compatible",
pprop, prop_size, NULL))
{
for (ptr = (char *) pprop; ptr - (char *) pprop < prop_size;
ptr += grub_strlen (ptr) + 1)
{
if (!grub_strcmp(ptr, "SUNW,sun4v-network"))
need_suffix = 0;
}
}
grub_free (pprop);
}
}
if (need_suffix)
ofdata->path = grub_malloc (grub_strlen (alias->path) + sizeof (SUFFIX)); ofdata->path = grub_malloc (grub_strlen (alias->path) + sizeof (SUFFIX));
else else
ofdata->path = grub_malloc (grub_strlen (alias->path) + 1); ofdata->path = grub_malloc (grub_strlen (alias->path) + 1);
@ -335,7 +372,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
return 0; return 0;
} }
ofdata->suffix = grub_stpcpy (ofdata->path, alias->path); ofdata->suffix = grub_stpcpy (ofdata->path, alias->path);
if (!grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_OFNET_SUFFIX)) if (need_suffix)
grub_memcpy (ofdata->suffix, SUFFIX, sizeof (SUFFIX)); grub_memcpy (ofdata->suffix, SUFFIX, sizeof (SUFFIX));
else else
*ofdata->suffix = '\0'; *ofdata->suffix = '\0';