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

efinet: Check for immediate completition.

Browse source 
This both speeds GRUB up and workarounds unexpected EFI behaviour.
This commit is contained in:
Martin Wilck 2015-03-27 14:27:56 +01:00 • committed by Vladimir Serbinenko
parent 1f23c87c19
commit cf2b4a36c4
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
grub-core/net/drivers/efi/efinet.c
View file

@ -37,11 +37,12 @@ send_card_buffer (struct grub_net_card *dev,
grub_efi_status_t st; grub_efi_status_t st;
grub_efi_simple_network_t *net = dev->efi_net; grub_efi_simple_network_t *net = dev->efi_net;
grub_uint64_t limit_time = grub_get_time_ms () + 4000; grub_uint64_t limit_time = grub_get_time_ms () + 4000;
void *txbuf;
if (dev->txbusy) if (dev->txbusy)
while (1) while (1)
{ {
void *txbuf = NULL; txbuf = NULL;
st = efi_call_3 (net->get_status, net, 0, &txbuf); st = efi_call_3 (net->get_status, net, 0, &txbuf);
if (st != GRUB_EFI_SUCCESS) if (st != GRUB_EFI_SUCCESS)
return grub_error (GRUB_ERR_IO, return grub_error (GRUB_ERR_IO,
@ -74,7 +75,18 @@ send_card_buffer (struct grub_net_card *dev,
dev->txbuf, NULL, NULL, NULL); dev->txbuf, NULL, NULL, NULL);
if (st != GRUB_EFI_SUCCESS) if (st != GRUB_EFI_SUCCESS)
return grub_error (GRUB_ERR_IO, N_("couldn't send network packet")); return grub_error (GRUB_ERR_IO, N_("couldn't send network packet"));
dev->txbusy = 1;
/*
The card may have sent out the packet immediately - set txbusy
to 0 in this case.
Cases were observed where checking txbuf at the next call
of send_card_buffer() is too late: 0 is returned in txbuf and
we run in the GRUB_ERR_TIMEOUT case above.
Perhaps a timeout in the FW has discarded the recycle buffer.
*/
st = efi_call_3 (net->get_status, net, 0, &txbuf);
dev->txbusy = !(st == GRUB_EFI_SUCCESS && txbuf == dev->txbuf);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }