GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nb/intel/ironlake: Clean up cosmetics of early ME functions

Browse source 
Tested with BUILD_TIMELESS=1, Packard Bell MS2290 remains identical.

Change-Id: Ic766345b58c59f3d3c3570741c0eb0ad4e53ed79
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45366
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Angel Pons 2020-09-14 19:18:11 +02:00 committed by Patrick Georgi
parent 55f11e29e4
commit eb53793fdb
1 changed files with 38 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/northbridge/intel/ironlake/raminit.c
View file

@ -1623,8 +1623,8 @@ static void wait_heci_ready(void)
{ {
while (!(read32(DEFAULT_HECIBAR + 0xc) & 8)) // = 0x8000000c while (!(read32(DEFAULT_HECIBAR + 0xc) & 8)) // = 0x8000000c
; ;
write32((DEFAULT_HECIBAR + 0x4),
(read32(DEFAULT_HECIBAR + 0x4) & ~0x10) | 0xc); write32((DEFAULT_HECIBAR + 0x4), (read32(DEFAULT_HECIBAR + 0x4) & ~0x10) | 0xc);
} }
/* FIXME: add timeout. */ /* FIXME: add timeout. */
@ -1638,12 +1638,10 @@ static void wait_heci_cb_avail(int len)
while (!(read32(DEFAULT_HECIBAR + 0xc) & 8)) while (!(read32(DEFAULT_HECIBAR + 0xc) & 8))
; ;
do do {
csr.raw = read32(DEFAULT_HECIBAR + 0x4); csr.raw = read32(DEFAULT_HECIBAR + 0x4);
while (len > } while (len > csr.csr.buffer_depth - (csr.csr.buffer_write_ptr -
csr.csr.buffer_depth - (csr.csr.buffer_write_ptr - csr.csr.buffer_read_ptr));
csr.csr.buffer_read_ptr))
;
} }
static void send_heci_packet(struct mei_header *head, u32 *payload) static void send_heci_packet(struct mei_header *head, u32 *payload)
@ -1662,8 +1660,7 @@ static void send_heci_packet(struct mei_header *head, u32 *payload)
write32(DEFAULT_HECIBAR + 0x4, read32(DEFAULT_HECIBAR + 0x4) | 0x4); write32(DEFAULT_HECIBAR + 0x4, read32(DEFAULT_HECIBAR + 0x4) | 0x4);
} }
static void static void send_heci_message(u8 *msg, int len, u8 hostaddress, u8 clientaddress)
send_heci_message(u8 *msg, int len, u8 hostaddress, u8 clientaddress)
{ {
struct mei_header head; struct mei_header head;
int maxlen; int maxlen;
@ -1689,9 +1686,7 @@ send_heci_message(u8 *msg, int len, u8 hostaddress, u8 clientaddress)
} }
/* FIXME: Add timeout. */ /* FIXME: Add timeout. */
static int static int recv_heci_packet(struct mei_header *head, u32 *packet, u32 *packet_size)
recv_heci_packet(struct mei_header *head, u32 *packet,
u32 *packet_size)
{ {
union { union {
struct mei_csr csr; struct mei_csr csr;
@ -1702,27 +1697,23 @@ recv_heci_packet(struct mei_header *head, u32 *packet,
write32(DEFAULT_HECIBAR + 0x4, read32(DEFAULT_HECIBAR + 0x4) | 2); write32(DEFAULT_HECIBAR + 0x4, read32(DEFAULT_HECIBAR + 0x4) | 2);
do { do {
csr.raw = read32(DEFAULT_HECIBAR + 0xc); csr.raw = read32(DEFAULT_HECIBAR + 0xc);
} } while (csr.csr.buffer_write_ptr == csr.csr.buffer_read_ptr);
while (csr.csr.buffer_write_ptr == csr.csr.buffer_read_ptr)
;
*(u32 *) head = read32(DEFAULT_HECIBAR + 0x8); *(u32 *) head = read32(DEFAULT_HECIBAR + 0x8);
if (!head->length) { if (!head->length) {
write32(DEFAULT_HECIBAR + 0x4, write32(DEFAULT_HECIBAR + 0x4, read32(DEFAULT_HECIBAR + 0x4) | 2);
read32(DEFAULT_HECIBAR + 0x4) | 2);
*packet_size = 0; *packet_size = 0;
return 0; return 0;
} }
if (head->length + 4 > 4 * csr.csr.buffer_depth if (head->length + 4 > 4 * csr.csr.buffer_depth || head->length > *packet_size) {
|| head->length > *packet_size) {
*packet_size = 0; *packet_size = 0;
return -1; return -1;
} }
do do {
csr.raw = read32(DEFAULT_HECIBAR + 0xc); csr.raw = read32(DEFAULT_HECIBAR + 0xc);
while (((head->length + 3) >> 2) > } while (((head->length + 3) >> 2) >
(csr.csr.buffer_write_ptr - csr.csr.buffer_read_ptr)) (csr.csr.buffer_write_ptr - csr.csr.buffer_read_ptr));
;
for (i = 0; i < (head->length + 3) >> 2; i++) for (i = 0; i < (head->length + 3) >> 2; i++)
packet[i++] = read32(DEFAULT_HECIBAR + 0x8); packet[i++] = read32(DEFAULT_HECIBAR + 0x8);
@ -1734,8 +1725,7 @@ recv_heci_packet(struct mei_header *head, u32 *packet,
} }
/* FIXME: Add timeout. */ /* FIXME: Add timeout. */
static int static int recv_heci_message(u32 *message, u32 *message_size)
recv_heci_message(u32 *message, u32 *message_size)
{ {
struct mei_header head; struct mei_header head;
int current_position; int current_position;
@ -1784,18 +1774,24 @@ static void send_heci_uma_message(const u64 heci_uma_addr, const unsigned int he
u8 result; u8 result;
u32 c2; u32 c2;
u64 heci_uma_addr; u64 heci_uma_addr;
u32 memory_reserved_for_heci_mb; u32 heci_uma_size;
u16 c3; u16 c3;
} __packed msg = { } __packed msg = {
0, MKHI_SET_UMA, 0, 0, .group_id = 0,
0x82, .cmd = MKHI_SET_UMA,
heci_uma_addr, heci_uma_size, 0}; .reserved = 0,
.result = 0,
.c2 = 0x82,
.heci_uma_addr = heci_uma_addr,
.heci_uma_size = heci_uma_size,
.c3 = 0,
};
u32 reply_size; u32 reply_size;
send_heci_message((u8 *) & msg, sizeof(msg), 0, 7); send_heci_message((u8 *) &msg, sizeof(msg), 0, 7);
reply_size = sizeof(reply); reply_size = sizeof(reply);
if (recv_heci_message((u32 *) & reply, &reply_size) == -1) if (recv_heci_message((u32 *) &reply, &reply_size) == -1)
return; return;
if (reply.command != (MKHI_SET_UMA | (1 << 7))) if (reply.command != (MKHI_SET_UMA | (1 << 7)))
@ -1809,30 +1805,23 @@ static void setup_heci_uma(struct raminfo *info)
const u64 heci_uma_addr = const u64 heci_uma_addr =
((u64) ((u64)
((((u64) pci_read_config16(NORTHBRIDGE, TOM)) << 6) - ((((u64)pci_read_config16(NORTHBRIDGE, TOM)) << 6) -
info->memory_reserved_for_heci_mb)) << 20; info->memory_reserved_for_heci_mb)) << 20;
pci_read_config32(NORTHBRIDGE, DMIBAR); pci_read_config32(NORTHBRIDGE, DMIBAR);
if (info->memory_reserved_for_heci_mb) { if (info->memory_reserved_for_heci_mb) {
write32(DEFAULT_DMIBAR + 0x14, write32(DEFAULT_DMIBAR + 0x14, read32(DEFAULT_DMIBAR + 0x14) & ~0x80);
read32(DEFAULT_DMIBAR + 0x14) & ~0x80); write32(DEFAULT_RCBA + 0x14, read32(DEFAULT_RCBA + 0x14) & ~0x80);
write32(DEFAULT_RCBA + 0x14, write32(DEFAULT_DMIBAR + 0x20, read32(DEFAULT_DMIBAR + 0x20) & ~0x80);
read32(DEFAULT_RCBA + 0x14) & ~0x80); write32(DEFAULT_RCBA + 0x20, read32(DEFAULT_RCBA + 0x20) & ~0x80);
write32(DEFAULT_DMIBAR + 0x20, write32(DEFAULT_DMIBAR + 0x2c, read32(DEFAULT_DMIBAR + 0x2c) & ~0x80);
read32(DEFAULT_DMIBAR + 0x20) & ~0x80); write32(DEFAULT_RCBA + 0x30, read32(DEFAULT_RCBA + 0x30) & ~0x80);
write32(DEFAULT_RCBA + 0x20, write32(DEFAULT_DMIBAR + 0x38, read32(DEFAULT_DMIBAR + 0x38) & ~0x80);
read32(DEFAULT_RCBA + 0x20) & ~0x80); write32(DEFAULT_RCBA + 0x40, read32(DEFAULT_RCBA + 0x40) & ~0x80);
write32(DEFAULT_DMIBAR + 0x2c,
read32(DEFAULT_DMIBAR + 0x2c) & ~0x80);
write32(DEFAULT_RCBA + 0x30,
read32(DEFAULT_RCBA + 0x30) & ~0x80);
write32(DEFAULT_DMIBAR + 0x38,
read32(DEFAULT_DMIBAR + 0x38) & ~0x80);
write32(DEFAULT_RCBA + 0x40,
read32(DEFAULT_RCBA + 0x40) & ~0x80);
write32(DEFAULT_RCBA + 0x40, 0x87000080); // OK write32(DEFAULT_RCBA + 0x40, 0x87000080); // OK
write32(DEFAULT_DMIBAR + 0x38, 0x87000080); // OK write32(DEFAULT_DMIBAR + 0x38, 0x87000080); // OK
while ((read16(DEFAULT_RCBA + 0x46) & 2) && while ((read16(DEFAULT_RCBA + 0x46) & 2) &&
read16(DEFAULT_DMIBAR + 0x3e) & 2) read16(DEFAULT_DMIBAR + 0x3e) & 2)
; ;
@ -1844,7 +1833,6 @@ static void setup_heci_uma(struct raminfo *info)
pci_write_config32(HECIDEV, 0x10, 0x0); pci_write_config32(HECIDEV, 0x10, 0x0);
pci_write_config8(HECIDEV, 0x4, 0x0); pci_write_config8(HECIDEV, 0x4, 0x0);
} }
static int have_match_ranks(struct raminfo *info, int channel, int ranks) static int have_match_ranks(struct raminfo *info, int channel, int ranks)