While most registers accesses don't need the use of the MCRX register (upper 24 bits of address) the MCRX register should be protected. The reference code could be doing accesses to registers that initialized the MCRX register. Thus, any access after that should ensure the MCRX register is initialized appropriately. BUG=None BRANCH=None TEST=Verified assembly output. Also, built and booted through depthcharge. Change-Id: I4d6cfbe6bb1666790c69778b8f2c8baeaf015264 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/174643 Reviewed-by: Shawn Nematbakhsh <shawnn@chromium.org> Reviewed-on: http://review.coreboot.org/4909 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
124 lines
3.3 KiB
C
124 lines
3.3 KiB
C
/*
|
|
* This file is part of the coreboot project.
|
|
*
|
|
* Copyright (C) 2013 Google, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied wacbmem_entryanty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <arch/io.h>
|
|
#include <baytrail/iosf.h>
|
|
|
|
#if !defined(__PRE_RAM__)
|
|
#define IOSF_PCI_BASE (CONFIG_MMCONF_BASE_ADDRESS + (IOSF_PCI_DEV << 12))
|
|
|
|
static inline void write_iosf_reg(int reg, uint32_t value)
|
|
{
|
|
write32(IOSF_PCI_BASE + reg, value);
|
|
}
|
|
static inline uint32_t read_iosf_reg(int reg)
|
|
{
|
|
return read32(IOSF_PCI_BASE + reg);
|
|
}
|
|
#else
|
|
static inline void write_iosf_reg(int reg, uint32_t value)
|
|
{
|
|
pci_write_config32(IOSF_PCI_DEV, reg, value);
|
|
}
|
|
static inline uint32_t read_iosf_reg(int reg)
|
|
{
|
|
return pci_read_config32(IOSF_PCI_DEV, reg);
|
|
}
|
|
#endif
|
|
|
|
uint32_t iosf_bunit_read(int reg)
|
|
{
|
|
uint32_t cr = IOSF_OPCODE(IOSF_OP_READ_BUNIT) |
|
|
IOSF_PORT(IOSF_PORT_BUNIT) | IOSF_REG(reg) | IOSF_BYTE_EN;
|
|
|
|
write_iosf_reg(MCRX_REG, IOSF_REG_UPPER(reg));
|
|
write_iosf_reg(MCR_REG, cr);
|
|
return read_iosf_reg(MDR_REG);
|
|
}
|
|
|
|
void iosf_bunit_write(int reg, uint32_t val)
|
|
{
|
|
uint32_t cr = IOSF_OPCODE(IOSF_OP_WRITE_BUNIT) |
|
|
IOSF_PORT(IOSF_PORT_BUNIT) | IOSF_REG(reg) | IOSF_BYTE_EN;
|
|
|
|
write_iosf_reg(MDR_REG, val);
|
|
write_iosf_reg(MCRX_REG, IOSF_REG_UPPER(reg));
|
|
write_iosf_reg(MCR_REG, cr);
|
|
}
|
|
|
|
uint32_t iosf_dunit_read(int reg)
|
|
{
|
|
uint32_t cr = IOSF_OPCODE(IOSF_OP_READ_SYSMEMC) |
|
|
IOSF_PORT(IOSF_PORT_SYSMEMC) | IOSF_REG(reg) |
|
|
IOSF_BYTE_EN;
|
|
|
|
write_iosf_reg(MCRX_REG, IOSF_REG_UPPER(reg));
|
|
write_iosf_reg(MCR_REG, cr);
|
|
return read_iosf_reg(MDR_REG);
|
|
}
|
|
|
|
uint32_t iosf_dunit_ch0_read(int reg)
|
|
{
|
|
return iosf_dunit_read(reg);
|
|
}
|
|
|
|
uint32_t iosf_dunit_ch1_read(int reg)
|
|
{
|
|
uint32_t cr = IOSF_OPCODE(IOSF_OP_READ_SYSMEMC) |
|
|
IOSF_PORT(IOSF_PORT_DUNIT_CH1) | IOSF_REG(reg) |
|
|
IOSF_BYTE_EN;
|
|
|
|
write_iosf_reg(MCRX_REG, IOSF_REG_UPPER(reg));
|
|
write_iosf_reg(MCR_REG, cr);
|
|
return read_iosf_reg(MDR_REG);
|
|
}
|
|
|
|
void iosf_dunit_write(int reg, uint32_t val)
|
|
{
|
|
uint32_t cr = IOSF_OPCODE(IOSF_OP_WRITE_SYSMEMC) |
|
|
IOSF_PORT(IOSF_PORT_SYSMEMC) | IOSF_REG(reg) |
|
|
IOSF_BYTE_EN;
|
|
|
|
write_iosf_reg(MDR_REG, val);
|
|
write_iosf_reg(MCRX_REG, IOSF_REG_UPPER(reg));
|
|
write_iosf_reg(MCR_REG, cr);
|
|
}
|
|
|
|
uint32_t iosf_punit_read(int reg)
|
|
{
|
|
uint32_t cr = IOSF_OPCODE(IOSF_OP_READ_PMC) |
|
|
IOSF_PORT(IOSF_PORT_PMC) | IOSF_REG(reg) |
|
|
IOSF_BYTE_EN;
|
|
|
|
write_iosf_reg(MCRX_REG, IOSF_REG_UPPER(reg));
|
|
write_iosf_reg(MCR_REG, cr);
|
|
return read_iosf_reg(MDR_REG);
|
|
}
|
|
|
|
void iosf_punit_write(int reg, uint32_t val)
|
|
{
|
|
uint32_t cr = IOSF_OPCODE(IOSF_OP_WRITE_PMC) |
|
|
IOSF_PORT(IOSF_PORT_PMC) | IOSF_REG(reg) |
|
|
IOSF_BYTE_EN;
|
|
|
|
write_iosf_reg(MDR_REG, val);
|
|
write_iosf_reg(MCRX_REG, IOSF_REG_UPPER(reg));
|
|
write_iosf_reg(MCR_REG, cr);
|
|
}
|