erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libpayload: Fix pointer related casts

Browse source 
Fix pointer related casts since this can create a problem for 64-bit systems.

BUG=None
BRANCH=None
TEST=Compiled successfully for link, nyan using emerge-* libpayload

Change-Id: I4cbd2d9f1efaaac87c3eba69204337fd6893ed66
Reviewed-on: https://chromium-review.googlesource.com/199564
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
This commit is contained in:
Furquan Shaikh 2014-05-13 13:47:32 -07:00 • committed by chrome-internal-fetch
commit 914b118a64
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
payloads/libpayload/drivers/usb/xhci.c
View file

@ -127,7 +127,7 @@ xhci_init (void *bar)
controller->destroy_intr_queue = xhci_destroy_intr_queue;
controller->poll_intr_queue = xhci_poll_intr_queue;
controller->reg_base = (u32)bar;
controller->reg_base = (uintptr_t)bar;
controller->instance = xzalloc(sizeof(xhci_t));
xhci_t *const xhci = (xhci_t *)controller->instance;

3
payloads/libpayload/include/usb/usb.h
View file

@ -31,6 +31,7 @@
#define __USB_H
#include <libpayload.h>
#include <pci/pci.h>
#include <stdint.h>
typedef enum { host_to_device = 0, device_to_host = 1 } dev_req_dir;
typedef enum { standard_type = 0, class_type = 1, vendor_type =
@ -210,7 +211,7 @@ typedef enum { OHCI = 0, UHCI = 1, EHCI = 2, XHCI = 3} hc_type;
struct usbdev_hc {
hci_t *next;
u32 reg_base;
uintptr_t reg_base;
hc_type type;
int latest_address;
usbdev_t *devices[128]; // dev 0 is root hub, 127 is last addressable

9
payloads/libpayload/libc/malloc.c
View file

@ -44,6 +44,7 @@
#define IN_MALLOC_C
#include <libpayload.h>
#include <stdint.h>
struct memory_type {
void *start;
@ -162,7 +163,7 @@ static void *alloc(int len, struct memory_type *type)
if (header & FLAG_FREE) {
if (len <= size) {
hdrtype_t volatile *nptr = (hdrtype_t volatile *)((int)ptr + HDRSIZE + len);
hdrtype_t volatile *nptr = (hdrtype_t volatile *)((uintptr_t)ptr + HDRSIZE + len);
int nsize = size - (HDRSIZE + len);
/* If there is still room in this block,
@ -181,11 +182,11 @@ static void *alloc(int len, struct memory_type *type)
*ptr = USED_BLOCK(size);
}
return (void *)((int)ptr + HDRSIZE);
return (void *)((uintptr_t)ptr + HDRSIZE);
}
}
ptr = (hdrtype_t volatile *)((int)ptr + HDRSIZE + size);
ptr = (hdrtype_t volatile *)((uintptr_t)ptr + HDRSIZE + size);
} while (ptr < (hdrtype_t *) type->end);
@ -357,7 +358,7 @@ static struct align_region_t *allocate_region(int alignment, int num_elements, s
free(new_region);
return NULL;
}
new_region->start_data = (void*)((u32)(new_region->start + num_elements + alignment - 1) & (~(alignment-1)));
new_region->start_data = (void*)((uintptr_t)(new_region->start + num_elements + alignment - 1) & (~(alignment-1)));
new_region->size = num_elements * alignment;
new_region->free = num_elements;
new_region->next = type->align_regions;

13
payloads/libpayload/libcbfs/cbfs.c
View file

@ -135,21 +135,21 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name)
cbfs_get_file_content(media, name, CBFS_TYPE_STAGE);
/* this is a mess. There is no ntohll. */
/* for now, assume compatible byte order until we solve this. */
uint32_t entry;
uintptr_t entry;
if (stage == NULL)
return (void *) -1;
LOG("loading stage %s @ 0x%x (%d bytes), entry @ 0x%llx\n",
LOG("loading stage %s @ 0x%p (%d bytes), entry @ 0x%llx\n",
name,
(uint32_t) stage->load, stage->memlen,
(void*)(uintptr_t) stage->load, stage->memlen,
stage->entry);
memset((void *) (uint32_t) stage->load, 0, stage->memlen);
memset((void *) (uintptr_t) stage->load, 0, stage->memlen);
if (cbfs_decompress(stage->compression,
((unsigned char *) stage) +
sizeof(struct cbfs_stage),
(void *) (uint32_t) stage->load,
(void *) (uintptr_t) stage->load,
stage->len))
return (void *) -1;
@ -175,8 +175,7 @@ int cbfs_execute_stage(struct cbfs_media *media, const char *name)
return 1;
}
/* FIXME: This isn't right */
LOG("run @ %p\n", (void *) ntohl((uint32_t) stage->entry));
LOG("run @ %p\n", (void *)(uintptr_t)ntohll(stage->entry));
return run_address((void *)(uintptr_t)ntohll(stage->entry));
}