Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42625 )
Change subject: lynxpoint/wildcatpoint: Factor out IOBP ......................................................................
lynxpoint/wildcatpoint: Factor out IOBP
Change-Id: Id1abb8ce630c8232812f3a892224b37f55273b4a Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/southbridge/intel/lynxpoint/iobp.c M src/southbridge/intel/lynxpoint/iobp.h M src/southbridge/intel/lynxpoint/pch.h M src/southbridge/intel/wildcatpoint/Makefile.inc D src/southbridge/intel/wildcatpoint/iobp.c M src/southbridge/intel/wildcatpoint/iobp.h 6 files changed, 36 insertions(+), 152 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/42625/1
diff --git a/src/southbridge/intel/lynxpoint/iobp.c b/src/southbridge/intel/lynxpoint/iobp.c index 3df6940..ee5518e 100644 --- a/src/southbridge/intel/lynxpoint/iobp.c +++ b/src/southbridge/intel/lynxpoint/iobp.c @@ -2,8 +2,8 @@
#include <console/console.h> #include <delay.h> -#include "pch.h" -#include "iobp.h" +#include <southbridge/intel/lynxpoint/iobp.h> +#include <southbridge/intel/lynxpoint/pch.h>
#define IOBP_RETRY 1000
@@ -109,3 +109,31 @@
pch_iobp_write(address, data); } + +void pch_iobp_exec(u32 addr, u16 op_code, u8 route_id, u32 *data, u8 *resp) +{ + if (!data || !resp) + return; + + *resp = -1; + if (!iobp_poll()) + return; + + /* RCBA2330[31:0] = Address */ + RCBA32(IOBPIRI) = addr; + /* RCBA2338[15:8] = opcode */ + RCBA16(IOBPS) = (RCBA16(IOBPS) & 0x00ff) | op_code; + /* RCBA233A[15:8] = 0xf0 RCBA233A[7:0] = Route ID */ + RCBA16(IOBPU) = IOBPU_MAGIC | route_id; + + if (op_code == IOBP_PCICFG_WRITE) + RCBA32(IOBPD) = *data; + /* Set RCBA2338[0] to trigger IOBP transaction*/ + RCBA16(IOBPS) = RCBA16(IOBPS) | 0x1; + + if (!iobp_poll()) + return; + + *resp = (RCBA16(IOBPS) & IOBPS_TX_MASK) >> 1; + *data = RCBA32(IOBPD); +} diff --git a/src/southbridge/intel/lynxpoint/iobp.h b/src/southbridge/intel/lynxpoint/iobp.h index c8669ba..458e6be 100644 --- a/src/southbridge/intel/lynxpoint/iobp.h +++ b/src/southbridge/intel/lynxpoint/iobp.h @@ -8,5 +8,6 @@ u32 pch_iobp_read(u32 address); void pch_iobp_write(u32 address, u32 data); void pch_iobp_update(u32 address, u32 andvalue, u32 orvalue); +void pch_iobp_exec(u32 addr, u16 op_dcode, u8 route_id, u32 *data, u8 *resp);
#endif diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h index f9a5562..291a554 100644 --- a/src/southbridge/intel/lynxpoint/pch.h +++ b/src/southbridge/intel/lynxpoint/pch.h @@ -521,6 +521,8 @@ #define IOBPS_WRITE 0x0700 #define IOBPU 0x233a #define IOBPU_MAGIC 0xf000 +#define IOBP_PCICFG_READ 0x0400 +#define IOBP_PCICFG_WRITE 0x0500
#define D31IP 0x3100 /* 32bit */ #define D31IP_TTIP 24 /* Thermal Throttle Pin */ diff --git a/src/southbridge/intel/wildcatpoint/Makefile.inc b/src/southbridge/intel/wildcatpoint/Makefile.inc index 49a2094..b98493b 100644 --- a/src/southbridge/intel/wildcatpoint/Makefile.inc +++ b/src/southbridge/intel/wildcatpoint/Makefile.inc @@ -11,8 +11,8 @@ romstage-y += gpio.c smm-y += gpio.c ramstage-y += hda.c -ramstage-y += iobp.c -romstage-y += iobp.c +ramstage-y += ../lynxpoint/iobp.c +romstage-y += ../lynxpoint/iobp.c ramstage-y += lpc.c ramstage-y += me.c ramstage-y += me_status.c diff --git a/src/southbridge/intel/wildcatpoint/iobp.c b/src/southbridge/intel/wildcatpoint/iobp.c deleted file mode 100644 index 51dd8a6..0000000 --- a/src/southbridge/intel/wildcatpoint/iobp.c +++ /dev/null @@ -1,139 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <console/console.h> -#include <delay.h> -#include <southbridge/intel/wildcatpoint/iobp.h> -#include <southbridge/intel/wildcatpoint/rcba.h> - -#define IOBP_RETRY 1000 - -static inline int iobp_poll(void) -{ - unsigned int try; - - for (try = IOBP_RETRY; try > 0; try--) { - u16 status = RCBA16(IOBPS); - if ((status & IOBPS_READY) == 0) - return 1; - udelay(10); - } - - printk(BIOS_ERR, "IOBP: timeout waiting for transaction to complete\n"); - return 0; -} - -u32 pch_iobp_read(u32 address) -{ - u16 status; - - if (!iobp_poll()) - return 0; - - /* Set the address */ - RCBA32(IOBPIRI) = address; - - /* READ OPCODE */ - status = RCBA16(IOBPS); - status &= ~IOBPS_MASK; - status |= IOBPS_READ; - RCBA16(IOBPS) = status; - - /* Undocumented magic */ - RCBA16(IOBPU) = IOBPU_MAGIC; - - /* Set ready bit */ - status = RCBA16(IOBPS); - status |= IOBPS_READY; - RCBA16(IOBPS) = status; - - if (!iobp_poll()) - return 0; - - /* Check for successful transaction */ - status = RCBA16(IOBPS); - if (status & IOBPS_TX_MASK) { - printk(BIOS_ERR, "IOBP: read 0x%08x failed\n", address); - return 0; - } - - /* Read IOBP data */ - return RCBA32(IOBPD); -} - -void pch_iobp_write(u32 address, u32 data) -{ - u16 status; - - if (!iobp_poll()) - return; - - /* Set the address */ - RCBA32(IOBPIRI) = address; - - /* WRITE OPCODE */ - status = RCBA16(IOBPS); - status &= ~IOBPS_MASK; - status |= IOBPS_WRITE; - RCBA16(IOBPS) = status; - - RCBA32(IOBPD) = data; - - /* Undocumented magic */ - RCBA16(IOBPU) = IOBPU_MAGIC; - - /* Set ready bit */ - status = RCBA16(IOBPS); - status |= IOBPS_READY; - RCBA16(IOBPS) = status; - - if (!iobp_poll()) - return; - - /* Check for successful transaction */ - status = RCBA16(IOBPS); - if (status & IOBPS_TX_MASK) { - printk(BIOS_ERR, "IOBP: write 0x%08x failed\n", address); - return; - } - - printk(BIOS_INFO, "IOBP: set 0x%08x to 0x%08x\n", address, data); -} - -void pch_iobp_update(u32 address, u32 andvalue, u32 orvalue) -{ - u32 data = pch_iobp_read(address); - - /* Update the data */ - data &= andvalue; - data |= orvalue; - - pch_iobp_write(address, data); -} - -void pch_iobp_exec(u32 addr, u16 op_code, u8 route_id, u32 *data, u8 *resp) -{ - if (!data || !resp) - return; - - *resp = -1; - if (!iobp_poll()) - return; - - /* RCBA2330[31:0] = Address */ - RCBA32(IOBPIRI) = addr; - /* RCBA2338[15:8] = opcode */ - RCBA16(IOBPS) = (RCBA16(IOBPS) & 0x00ff) | op_code; - /* RCBA233A[15:8] = 0xf0 RCBA233A[7:0] = Route ID */ - RCBA16(IOBPU) = IOBPU_MAGIC | route_id; - - if (op_code == IOBP_PCICFG_WRITE) - RCBA32(IOBPD) = *data; - /* Set RCBA2338[0] to trigger IOBP transaction*/ - RCBA16(IOBPS) = RCBA16(IOBPS) | 0x1; - - if (!iobp_poll()) - return; - - *resp = (RCBA16(IOBPS) & IOBPS_TX_MASK) >> 1; - *data = RCBA32(IOBPD); -} diff --git a/src/southbridge/intel/wildcatpoint/iobp.h b/src/southbridge/intel/wildcatpoint/iobp.h index e3a6993..a0bdd33 100644 --- a/src/southbridge/intel/wildcatpoint/iobp.h +++ b/src/southbridge/intel/wildcatpoint/iobp.h @@ -1,11 +1,3 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef _BROADWELL_IOBP_H_ -#define _BROADWELL_IOBP_H_ - -u32 pch_iobp_read(u32 address); -void pch_iobp_write(u32 address, u32 data); -void pch_iobp_update(u32 address, u32 andvalue, u32 orvalue); -void pch_iobp_exec(u32 addr, u16 op_dcode, u8 route_id, u32 *data, u8 *resp); - -#endif +#include <southbridge/intel/lynxpoint/iobp.h>
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42625
to look at the new patch set (#4).
Change subject: lynxpoint/wildcatpoint: Factor out IOBP ......................................................................
lynxpoint/wildcatpoint: Factor out IOBP
Change-Id: Id1abb8ce630c8232812f3a892224b37f55273b4a Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/southbridge/intel/lynxpoint/iobp.c M src/southbridge/intel/lynxpoint/iobp.h M src/southbridge/intel/lynxpoint/pch.h M src/southbridge/intel/wildcatpoint/Makefile.inc D src/southbridge/intel/wildcatpoint/iobp.c M src/southbridge/intel/wildcatpoint/iobp.h 6 files changed, 36 insertions(+), 152 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/42625/4
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42625
to look at the new patch set (#7).
Change subject: lynxpoint/wildcatpoint: Factor out IOBP ......................................................................
lynxpoint/wildcatpoint: Factor out IOBP
Change-Id: Id1abb8ce630c8232812f3a892224b37f55273b4a Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/southbridge/intel/lynxpoint/iobp.c M src/southbridge/intel/lynxpoint/iobp.h M src/southbridge/intel/lynxpoint/pch.h M src/southbridge/intel/wildcatpoint/Makefile.inc D src/southbridge/intel/wildcatpoint/iobp.c M src/southbridge/intel/wildcatpoint/iobp.h 6 files changed, 36 insertions(+), 152 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/42625/7
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42625
to look at the new patch set (#8).
Change subject: lynxpoint/wildcatpoint: Factor out IOBP ......................................................................
lynxpoint/wildcatpoint: Factor out IOBP
Change-Id: Id1abb8ce630c8232812f3a892224b37f55273b4a Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/southbridge/intel/lynxpoint/iobp.c M src/southbridge/intel/lynxpoint/iobp.h M src/southbridge/intel/lynxpoint/pch.h M src/southbridge/intel/wildcatpoint/Makefile.inc D src/southbridge/intel/wildcatpoint/iobp.c M src/southbridge/intel/wildcatpoint/iobp.h 6 files changed, 36 insertions(+), 152 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/42625/8
Angel Pons has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42625 )
Change subject: lynxpoint/wildcatpoint: Factor out IOBP ......................................................................
Abandoned
-
Angel Pons (Code Review)