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

tegra132: use pointers in funitcfg 

Just use direct pointers to the registers in the pre-filled
data structures. In 64-bit the sizes increase, but it's small.
The fields now directly point to the correct register so no
need to do any arithmetic to identify the correct register.

BUG=chrome-os-partner:31251
BRANCH=None
TEST=Built and booted on ryu into recovery.

Change-Id: I0de85c486c005aed23b6118ec91b45dd39acdfb0
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 358b78c1c4cb72e0166f91b36011676e65576666
Original-Change-Id: I186bf5d145437472126067960e62d7ed6a25f295
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/212166
Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/8931
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Aaron Durbin 2014-08-13 14:36:23 -05:00 committed by Patrick Georgi
parent 65627dd6bd
commit 662d3bb982
1 changed files with 41 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/soc/nvidia/tegra132/funitcfg.c
View File

@ -24,15 +24,15 @@
#include <soc/padconfig.h> #include <soc/padconfig.h>
#include <string.h> #include <string.h>
struct clk_set_data { struct clk_dev_control {
size_t clk_enb_set_offset; uint32_t *clk_enb_set;
size_t rst_dev_clr_offset; uint32_t *rst_dev_clr;
}; };
struct funit_cfg_data { struct funit_cfg_data {
const char *name; const char *name;
size_t clk_src_offset; uint32_t *clk_src_reg;
uint8_t clk_data_index; const struct clk_dev_control * const dev_control;
uint32_t clk_enb_val; uint32_t clk_enb_val;
}; };
@ -45,45 +45,40 @@ enum {
CLK_X_SET = 5, CLK_X_SET = 5,
}; };
#define CLK_SET_OFFSETS(x) \ #define CLK_RST_REG(field_) \
{ \ &(((struct clk_rst_ctlr *)TEGRA_CLK_RST_BASE)->field_)
offsetof(struct clk_rst_ctlr, clk_enb_##x##_set), \
offsetof(struct clk_rst_ctlr, rst_dev_##x##_clr) \ #define CLK_SET_REGS(x) \
{ \
CLK_RST_REG(clk_enb_##x##_set), \
CLK_RST_REG(rst_dev_##x##_clr), \
} }
static const struct clk_set_data clk_data_arr[] = { static const struct clk_dev_control clk_data_arr[] = {
[CLK_L_SET] = CLK_SET_OFFSETS(l), [CLK_L_SET] = CLK_SET_REGS(l),
[CLK_H_SET] = CLK_SET_OFFSETS(h), [CLK_H_SET] = CLK_SET_REGS(h),
[CLK_U_SET] = CLK_SET_OFFSETS(u), [CLK_U_SET] = CLK_SET_REGS(u),
[CLK_V_SET] = CLK_SET_OFFSETS(v), [CLK_V_SET] = CLK_SET_REGS(v),
[CLK_W_SET] = CLK_SET_OFFSETS(w), [CLK_W_SET] = CLK_SET_REGS(w),
[CLK_X_SET] = CLK_SET_OFFSETS(x), [CLK_X_SET] = CLK_SET_REGS(x),
}; };
static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; #define FUNIT_DATA(funit_, loname_, clk_set_) \
[FUNIT_INDEX(funit_)] = { \
.name = STRINGIFY(loname_), \
.clk_src_reg = CLK_RST_REG(clk_src_##loname_), \
.dev_control = &clk_data_arr[CLK_##clk_set_##_SET], \
.clk_enb_val = CLK_##clk_set_##_##funit_, \
}
static const struct funit_cfg_data funit_data[] = { static const struct funit_cfg_data funit_data[] = {
[FUNIT_SBC1] = {"sbc1", offsetof(struct clk_rst_ctlr, clk_src_sbc1), FUNIT_DATA(SBC1, sbc1, H),
CLK_H_SET, FUNIT_DATA(SBC4, sbc4, U),
CLK_H_SBC1}, FUNIT_DATA(I2C2, i2c2, H),
[FUNIT_SBC4] = {"sbc4", offsetof(struct clk_rst_ctlr, clk_src_sbc4), FUNIT_DATA(I2C3, i2c3, U),
CLK_U_SET, FUNIT_DATA(I2C5, i2c5, H),
CLK_U_SBC4}, FUNIT_DATA(SDMMC3, sdmmc3, U),
[FUNIT_I2C2] = {"i2c2", offsetof(struct clk_rst_ctlr, clk_src_i2c2), FUNIT_DATA(SDMMC4, sdmmc4, L),
CLK_H_SET,
CLK_H_I2C2},
[FUNIT_I2C3] = {"i2c3", offsetof(struct clk_rst_ctlr, clk_src_i2c3),
CLK_U_SET,
CLK_U_I2C3},
[FUNIT_I2C5] = {"i2c5", offsetof(struct clk_rst_ctlr, clk_src_i2c5),
CLK_H_SET,
CLK_H_I2C5},
[FUNIT_SDMMC3] = {"sdmmc3", offsetof(struct clk_rst_ctlr, clk_src_sdmmc3),
CLK_U_SET,
CLK_U_SDMMC3},
[FUNIT_SDMMC4] = {"sdmmc4", offsetof(struct clk_rst_ctlr, clk_src_sdmmc4),
CLK_L_SET,
CLK_L_SDMMC4},
}; };
static inline uint32_t get_clk_src_freq(uint32_t clk_src) static inline uint32_t get_clk_src_freq(uint32_t clk_src)
@ -112,13 +107,10 @@ void soc_configure_funits(const struct funit_cfg * const entries, size_t num)
uint32_t clk_div; uint32_t clk_div;
uint32_t clk_div_mask; uint32_t clk_div_mask;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
uint8_t *rst_base = (uint8_t*)clk_rst;
const struct funit_cfg * const entry = &entries[i]; const struct funit_cfg * const entry = &entries[i];
const struct funit_cfg_data *funit; const struct funit_cfg_data *funit;
const struct clk_set_data *clk_data; const struct clk_dev_control *dev_control;
uint32_t *clk_src_reg, *clk_enb_set_reg, *rst_dev_clr_reg;
uint32_t clk_src_freq; uint32_t clk_src_freq;
if (entry->funit_index >= FUNIT_INDEX_MAX) { if (entry->funit_index >= FUNIT_INDEX_MAX) {
@ -127,13 +119,7 @@ void soc_configure_funits(const struct funit_cfg * const entries, size_t num)
} }
funit = &funit_data[entry->funit_index]; funit = &funit_data[entry->funit_index];
clk_data = &clk_data_arr[funit->clk_data_index]; dev_control = funit->dev_control;
clk_src_reg = (uint32_t*)(rst_base + funit->clk_src_offset);
clk_enb_set_reg = (uint32_t*)(rst_base
+ clk_data->clk_enb_set_offset);
rst_dev_clr_reg = (uint32_t*)(rst_base
+ clk_data->rst_dev_clr_offset);
clk_src_freq = get_clk_src_freq(entry->clk_src_id); clk_src_freq = get_clk_src_freq(entry->clk_src_id);
@ -144,16 +130,17 @@ void soc_configure_funits(const struct funit_cfg * const entries, size_t num)
clk_div_mask = CLK_DIV_MASK_I2C; clk_div_mask = CLK_DIV_MASK_I2C;
} else { } else {
/* Non I2C */ /* Non I2C */
clk_div = get_clk_div(clk_src_freq,entry->clk_dev_freq_khz); clk_div = get_clk_div(clk_src_freq,
entry->clk_dev_freq_khz);
clk_div_mask = CLK_DIV_MASK; clk_div_mask = CLK_DIV_MASK;
} }
_clock_set_div(clk_src_reg,funit->name,clk_div, _clock_set_div(funit->clk_src_reg, funit->name, clk_div,
clk_div_mask,entry->clk_src_id); clk_div_mask, entry->clk_src_id);
clock_grp_enable_clear_reset(funit->clk_enb_val, clock_grp_enable_clear_reset(funit->clk_enb_val,
clk_enb_set_reg, dev_control->clk_enb_set,
rst_dev_clr_reg); dev_control->rst_dev_clr);
soc_configure_pads(entry->pad_cfg,entry->pad_cfg_size); soc_configure_pads(entry->pad_cfg,entry->pad_cfg_size);
} }