| Message ID | 20170826225110.7381-9-xypron.glpk@gmx.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | Alexander Graf |
| Headers | show |
On 27 August 2017 at 06:51, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > In efi_install_protocol_interface support creating > a new handle. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > lib/efi_loader/efi_boottime.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org> The use of void ** seems odd. Is that mandated by EFI? Is there no way to use a proper type? > diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c > index 96cb1fa410..9f8d64659f 100644 > --- a/lib/efi_loader/efi_boottime.c > +++ b/lib/efi_loader/efi_boottime.c > @@ -238,6 +238,23 @@ static efi_status_t EFIAPI efi_free_pool_ext(void *buffer) > return EFI_EXIT(r); > } > > +static efi_status_t efi_create_handle(void **handle) > +{ > + struct efi_object *obj; > + efi_status_t r; > + > + r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, > + sizeof(struct efi_object), > + (void **)&obj); > + if (r != EFI_SUCCESS) > + return r; > + memset(obj, 0, sizeof(struct efi_object)); > + obj->handle = obj; > + list_add_tail(&obj->link, &efi_obj_list); > + *handle = obj; > + return r; > +} > + > /* > * Our event capabilities are very limited. Only a small limited > * number of events is allowed to coexist. > @@ -497,8 +514,9 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle, > > /* Create new handle if requested. */ > if (!*handle) { > - r = EFI_OUT_OF_RESOURCES; > - goto out; > + r = efi_create_handle(handle); > + if (r != EFI_SUCCESS) > + goto out; > } > > /* Find object. */ > -- > 2.14.1 >
On Thu, Aug 31, 2017 at 8:51 AM, Simon Glass <sjg@chromium.org> wrote: > On 27 August 2017 at 06:51, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: >> In efi_install_protocol_interface support creating >> a new handle. >> >> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> >> --- >> lib/efi_loader/efi_boottime.c | 22 ++++++++++++++++++++-- >> 1 file changed, 20 insertions(+), 2 deletions(-) >> > Reviewed-by: Simon Glass <sjg@chromium.org> > > The use of void ** seems odd. Is that mandated by EFI? Is there no way > to use a proper type? There is in fact an efi_handle_t, which we should probably start using.. Anyways, turns out SCT needed this patch, so Heinrich, you can add my: Tested-by: Rob Clark <robdclark@gmail.com> >> diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c >> index 96cb1fa410..9f8d64659f 100644 >> --- a/lib/efi_loader/efi_boottime.c >> +++ b/lib/efi_loader/efi_boottime.c >> @@ -238,6 +238,23 @@ static efi_status_t EFIAPI efi_free_pool_ext(void *buffer) >> return EFI_EXIT(r); >> } >> >> +static efi_status_t efi_create_handle(void **handle) >> +{ >> + struct efi_object *obj; >> + efi_status_t r; >> + >> + r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, >> + sizeof(struct efi_object), >> + (void **)&obj); >> + if (r != EFI_SUCCESS) >> + return r; >> + memset(obj, 0, sizeof(struct efi_object)); >> + obj->handle = obj; >> + list_add_tail(&obj->link, &efi_obj_list); >> + *handle = obj; >> + return r; >> +} >> + >> /* >> * Our event capabilities are very limited. Only a small limited >> * number of events is allowed to coexist. >> @@ -497,8 +514,9 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle, >> >> /* Create new handle if requested. */ >> if (!*handle) { >> - r = EFI_OUT_OF_RESOURCES; >> - goto out; >> + r = efi_create_handle(handle); >> + if (r != EFI_SUCCESS) >> + goto out; >> } >> >> /* Find object. */ >> -- >> 2.14.1 >>
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 96cb1fa410..9f8d64659f 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -238,6 +238,23 @@ static efi_status_t EFIAPI efi_free_pool_ext(void *buffer) return EFI_EXIT(r); } +static efi_status_t efi_create_handle(void **handle) +{ + struct efi_object *obj; + efi_status_t r; + + r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, + sizeof(struct efi_object), + (void **)&obj); + if (r != EFI_SUCCESS) + return r; + memset(obj, 0, sizeof(struct efi_object)); + obj->handle = obj; + list_add_tail(&obj->link, &efi_obj_list); + *handle = obj; + return r; +} + /* * Our event capabilities are very limited. Only a small limited * number of events is allowed to coexist. @@ -497,8 +514,9 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle, /* Create new handle if requested. */ if (!*handle) { - r = EFI_OUT_OF_RESOURCES; - goto out; + r = efi_create_handle(handle); + if (r != EFI_SUCCESS) + goto out; } /* Find object. */
In efi_install_protocol_interface support creating a new handle. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- lib/efi_loader/efi_boottime.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)