Commit bf52e27b authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski

net: ipa: rename interconnect settings

Use "bandwidth" rather than "rate" in describing the average and
peak values to use for IPA interconnects.  They should have been
named that way to begin with.
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 213b97b1
...@@ -109,20 +109,20 @@ static int ipa_interconnect_enable(struct ipa *ipa) ...@@ -109,20 +109,20 @@ static int ipa_interconnect_enable(struct ipa *ipa)
int ret; int ret;
data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY]; data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY];
ret = icc_set_bw(clock->memory_path, data->average_rate, ret = icc_set_bw(clock->memory_path, data->average_bandwidth,
data->peak_rate); data->peak_bandwidth);
if (ret) if (ret)
return ret; return ret;
data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM]; data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM];
ret = icc_set_bw(clock->imem_path, data->average_rate, ret = icc_set_bw(clock->imem_path, data->average_bandwidth,
data->peak_rate); data->peak_bandwidth);
if (ret) if (ret)
goto err_memory_path_disable; goto err_memory_path_disable;
data = &clock->interconnect_data[IPA_INTERCONNECT_CONFIG]; data = &clock->interconnect_data[IPA_INTERCONNECT_CONFIG];
ret = icc_set_bw(clock->config_path, data->average_rate, ret = icc_set_bw(clock->config_path, data->average_bandwidth,
data->peak_rate); data->peak_bandwidth);
if (ret) if (ret)
goto err_imem_path_disable; goto err_imem_path_disable;
...@@ -159,12 +159,12 @@ static int ipa_interconnect_disable(struct ipa *ipa) ...@@ -159,12 +159,12 @@ static int ipa_interconnect_disable(struct ipa *ipa)
err_imem_path_reenable: err_imem_path_reenable:
data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM]; data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM];
(void)icc_set_bw(clock->imem_path, data->average_rate, (void)icc_set_bw(clock->imem_path, data->average_bandwidth,
data->peak_rate); data->peak_bandwidth);
err_memory_path_reenable: err_memory_path_reenable:
data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY]; data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY];
(void)icc_set_bw(clock->memory_path, data->average_rate, (void)icc_set_bw(clock->memory_path, data->average_bandwidth,
data->peak_rate); data->peak_bandwidth);
return ret; return ret;
} }
......
...@@ -311,20 +311,20 @@ static struct ipa_mem_data ipa_mem_data = { ...@@ -311,20 +311,20 @@ static struct ipa_mem_data ipa_mem_data = {
static struct ipa_clock_data ipa_clock_data = { static struct ipa_clock_data ipa_clock_data = {
.core_clock_rate = 100 * 1000 * 1000, /* Hz */ .core_clock_rate = 100 * 1000 * 1000, /* Hz */
/* Interconnect rates are in 1000 byte/second units */ /* Interconnect bandwidths are in 1000 byte/second units */
.interconnect = { .interconnect = {
[IPA_INTERCONNECT_MEMORY] = { [IPA_INTERCONNECT_MEMORY] = {
.peak_rate = 465000, /* 465 MBps */ .peak_bandwidth = 465000, /* 465 MBps */
.average_rate = 80000, /* 80 MBps */ .average_bandwidth = 80000, /* 80 MBps */
}, },
/* Average rate is unused for the next two interconnects */ /* Average bandwidth unused for the next two interconnects */
[IPA_INTERCONNECT_IMEM] = { [IPA_INTERCONNECT_IMEM] = {
.peak_rate = 68570, /* 68.570 MBps */ .peak_bandwidth = 68570, /* 68.57 MBps */
.average_rate = 0, /* unused */ .average_bandwidth = 0, /* unused */
}, },
[IPA_INTERCONNECT_CONFIG] = { [IPA_INTERCONNECT_CONFIG] = {
.peak_rate = 30000, /* 30 MBps */ .peak_bandwidth = 30000, /* 30 MBps */
.average_rate = 0, /* unused */ .average_bandwidth = 0, /* unused */
}, },
}, },
}; };
......
...@@ -331,20 +331,20 @@ static struct ipa_mem_data ipa_mem_data = { ...@@ -331,20 +331,20 @@ static struct ipa_mem_data ipa_mem_data = {
static struct ipa_clock_data ipa_clock_data = { static struct ipa_clock_data ipa_clock_data = {
.core_clock_rate = 75 * 1000 * 1000, /* Hz */ .core_clock_rate = 75 * 1000 * 1000, /* Hz */
/* Interconnect rates are in 1000 byte/second units */ /* Interconnect bandwidths are in 1000 byte/second units */
.interconnect = { .interconnect = {
[IPA_INTERCONNECT_MEMORY] = { [IPA_INTERCONNECT_MEMORY] = {
.peak_rate = 600000, /* 600 MBps */ .peak_bandwidth = 600000, /* 600 MBps */
.average_rate = 80000, /* 80 MBps */ .average_bandwidth = 80000, /* 80 MBps */
}, },
/* Average rate is unused for the next two interconnects */ /* Average bandwidth unused for the next two interconnects */
[IPA_INTERCONNECT_IMEM] = { [IPA_INTERCONNECT_IMEM] = {
.peak_rate = 350000, /* 350 MBps */ .peak_bandwidth = 350000, /* 350 MBps */
.average_rate = 0, /* unused */ .average_bandwidth = 0, /* unused */
}, },
[IPA_INTERCONNECT_CONFIG] = { [IPA_INTERCONNECT_CONFIG] = {
.peak_rate = 40000, /* 40 MBps */ .peak_bandwidth = 40000, /* 40 MBps */
.average_rate = 0, /* unused */ .average_bandwidth = 0, /* unused */
}, },
}, },
}; };
......
...@@ -267,13 +267,13 @@ enum ipa_interconnect_id { ...@@ -267,13 +267,13 @@ enum ipa_interconnect_id {
}; };
/** /**
* struct ipa_interconnect_data - description of IPA interconnect rates * struct ipa_interconnect_data - description of IPA interconnect bandwidths
* @peak_rate: Peak interconnect bandwidth (in 1000 byte/sec units) * @peak_bandwidth: Peak interconnect bandwidth (in 1000 byte/sec units)
* @average_rate: Average interconnect bandwidth (in 1000 byte/sec units) * @average_bandwidth: Average interconnect bandwidth (in 1000 byte/sec units)
*/ */
struct ipa_interconnect_data { struct ipa_interconnect_data {
u32 peak_rate; u32 peak_bandwidth;
u32 average_rate; u32 average_bandwidth;
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment