net: ipa: interconnect improvements
Subsystems (3)
cover net: ipa: interconnect improvements
The main outcome of this series is to allow the number of interconnects used by the IPA to differ from the three that are implemented now. With this series in place, any number of interconnects can now be used, all specified in the configuration data for a specific platform.
A few minor interconnect-related cleanups are implemented as well.
-Alex
Alex Elder (7):
net: ipa: rename interconnect settings
net: ipa: don't return an error from ipa_interconnect_disable()
net: ipa: introduce an IPA interconnect structure
net: ipa: store average and peak interconnect bandwidth
net: ipa: add interconnect name to configuration data
net: ipa: clean up interconnect initialization
net: ipa: allow arbitrary number of interconnects
drivers/net/ipa/ipa_clock.c | 192 ++++++++++++++++-------------- drivers/net/ipa/ipa_data-sc7180.c | 38 +++--- drivers/net/ipa/ipa_data-sdm845.c | 38 +++--- drivers/net/ipa/ipa_data.h | 26 ++-- 4 files changed, 157 insertions(+), 137 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/7 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.
--- drivers/net/ipa/ipa_clock.c | 20 ++++++++++---------- drivers/net/ipa/ipa_data-sc7180.c | 16 ++++++++-------- drivers/net/ipa/ipa_data-sdm845.c | 16 ++++++++-------- drivers/net/ipa/ipa_data.h | 10 +++++----- 4 files changed, 31 insertions(+), 31 deletions(-)
drivers/net/ipa/ipa_clock.c +10 -10
@@ -109,20 +109,20 @@ static int ipa_interconnect_enable(struct ipa *ipa)int ret; data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY ]; - ret =icc_set_bw (clock->memory_path, data->average_rate, - data->peak_rate); + ret =icc_set_bw (clock->memory_path, data->average_bandwidth, + data->peak_bandwidth);if (ret)return ret; data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM ]; - ret =icc_set_bw (clock->imem_path, data->average_rate, - data->peak_rate); + ret =icc_set_bw (clock->imem_path, data->average_bandwidth, + data->peak_bandwidth);if (ret) goto err_memory_path_disable; data = &clock->interconnect_data[IPA_INTERCONNECT_CONFIG ]; - ret =icc_set_bw (clock->config_path, data->average_rate, - data->peak_rate); + ret =icc_set_bw (clock->config_path, data->average_bandwidth, + data->peak_bandwidth);if (ret) goto err_imem_path_disable;
@@ -159,12 +159,12 @@ static int ipa_interconnect_disable(struct ipa *ipa) err_imem_path_reenable: data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM ]; - (void )icc_set_bw (clock->imem_path, data->average_rate, - data->peak_rate); + (void )icc_set_bw (clock->imem_path, data->average_bandwidth, + data->peak_bandwidth); err_memory_path_reenable: data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY ]; - (void )icc_set_bw (clock->memory_path, data->average_rate, - data->peak_rate); + (void )icc_set_bw (clock->memory_path, data->average_bandwidth, + data->peak_bandwidth);return ret; }
drivers/net/ipa/ipa_data-sc7180.c +8 -8
@@ -311,20 +311,20 @@ static struct ipa_mem_data ipa_mem_data = {static struct ipa_clock_data ipa_clock_data = { .core_clock_rate =100 *1000 *1000 ,/* Hz */ -/* Interconnect rates are in 1000 byte/second units */ +/* Interconnect bandwidths are in 1000 byte/second units */ .interconnect = { [IPA_INTERCONNECT_MEMORY ] = { - .peak_rate =465000 ,/* 465 MBps */ - .average_rate =80000 ,/* 80 MBps */ + .peak_bandwidth =465000 ,/* 465 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 ] = { - .peak_rate =68570 ,/* 68.570 MBps */ - .average_rate =0 ,/* unused */ + .peak_bandwidth =68570 ,/* 68.57 MBps */ + .average_bandwidth =0 ,/* unused */ }, [IPA_INTERCONNECT_CONFIG ] = { - .peak_rate =30000 ,/* 30 MBps */ - .average_rate =0 ,/* unused */ + .peak_bandwidth =30000 ,/* 30 MBps */ + .average_bandwidth =0 ,/* unused */ }, }, };
drivers/net/ipa/ipa_data-sdm845.c +8 -8
@@ -331,20 +331,20 @@ static struct ipa_mem_data ipa_mem_data = {static struct ipa_clock_data ipa_clock_data = { .core_clock_rate =75 *1000 *1000 ,/* Hz */ -/* Interconnect rates are in 1000 byte/second units */ +/* Interconnect bandwidths are in 1000 byte/second units */ .interconnect = { [IPA_INTERCONNECT_MEMORY ] = { - .peak_rate =600000 ,/* 600 MBps */ - .average_rate =80000 ,/* 80 MBps */ + .peak_bandwidth =600000 ,/* 600 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 ] = { - .peak_rate =350000 ,/* 350 MBps */ - .average_rate =0 ,/* unused */ + .peak_bandwidth =350000 ,/* 350 MBps */ + .average_bandwidth =0 ,/* unused */ }, [IPA_INTERCONNECT_CONFIG ] = { - .peak_rate =40000 ,/* 40 MBps */ - .average_rate =0 ,/* unused */ + .peak_bandwidth =40000 ,/* 40 MBps */ + .average_bandwidth =0 ,/* unused */ }, }, };
drivers/net/ipa/ipa_data.h +5 -5
@@ -267,13 +267,13 @@ enum ipa_interconnect_id { };/** -* struct ipa_interconnect_data - description of IPA interconnect rates -* @peak_rate: Peak interconnect bandwidth (in 1000 byte/sec units) -* @average_rate: Average interconnect bandwidth (in 1000 byte/sec units) +* struct ipa_interconnect_data - description of IPA interconnect bandwidths +* @peak_bandwidth: Peak interconnect bandwidth (in 1000 byte/sec units) +* @average_bandwidth: Average interconnect bandwidth (in 1000 byte/sec units) */ struct ipa_interconnect_data { -u32 peak_rate; -u32 average_rate; +u32 peak_bandwidth; +u32 average_bandwidth; };/**
Signature · 1 line
2.20.1
PATCH 2/7 net: ipa: don't return an error from ipa_interconnect_disable()
In reply to Alex ElderIf disabling interconnects fails there's not a lot we can do. The only two callers of ipa_interconnect_disable() ignore the return value, so just give the function a void return type.
Print an error message if disabling any of the interconnects is not successful. Return (and print) only the first error seen.
--- drivers/net/ipa/ipa_clock.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-)
drivers/net/ipa/ipa_clock.c +11 -20
@@ -137,36 +137,27 @@ static int ipa_interconnect_enable(struct ipa *ipa) }/* To disable an interconnect, we just its bandwidth to 0 */ -static int ipa_interconnect_disable (struct ipa *ipa) +static void ipa_interconnect_disable (struct ipa *ipa) { -const struct ipa_interconnect_data *data;struct ipa_clock *clock = ipa->clock; +int result =0 ;int ret; ret =icc_set_bw (clock->memory_path,0 ,0 );if (ret) -return ret; + result = ret; ret =icc_set_bw (clock->imem_path,0 ,0 ); -if (ret) - goto err_memory_path_reenable; +if (ret && !result) + result = ret; ret =icc_set_bw (clock->config_path,0 ,0 ); -if (ret) - goto err_imem_path_reenable; +if (ret && !result) + result = ret; -return 0 ; - -err_imem_path_reenable: - data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM ]; - (void )icc_set_bw (clock->imem_path, data->average_bandwidth, - data->peak_bandwidth); -err_memory_path_reenable: - data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY ]; - (void )icc_set_bw (clock->memory_path, data->average_bandwidth, - data->peak_bandwidth); - -return ret; +if (result) +dev_err (&ipa->pdev->dev, +"error %d disabling IPA interconnects\n" , ret); }/* Turn on IPA clocks, including interconnects */
@@ -189,7 +180,7 @@ static int ipa_clock_enable(struct ipa *ipa)static void ipa_clock_disable (struct ipa *ipa) {clk_disable_unprepare (ipa->clock->core); - (void )ipa_interconnect_disable (ipa); +ipa_interconnect_disable (ipa); }/* Get an IPA clock reference, but only if the reference count is
Signature · 1 line
2.20.1
PATCH 3/7 net: ipa: introduce an IPA interconnect structure
In reply to Alex ElderRather than having separate pointers for the memory, imem, and config interconnect paths, maintain an array of ipa_interconnect structures each of which contains a pointer to a path.
--- drivers/net/ipa/ipa_clock.c | 59 +++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 25 deletions(-)
drivers/net/ipa/ipa_clock.c +34 -25
@@ -30,23 +30,27 @@* An IPA clock reference must be held for any access to IPA hardware. */ +/** +* struct ipa_interconnect - IPA interconnect information +* @path: Interconnect path +*/ +struct ipa_interconnect { +struct icc_path *path; +}; +/** * struct ipa_clock - IPA clocking information * @count: Clocking reference count * @mutex: Protects clock enable/disable * @core: IPA core clock -* @memory_path: Memory interconnect -* @imem_path: Internal memory interconnect -* @config_path: Configuration space interconnect +* @interconnect: Interconnect array * @interconnect_data: Interconnect configuration data */ struct ipa_clock {refcount_t count;struct mutex mutex;/* protects clock enable/disable */ struct clk *core; -struct icc_path *memory_path; -struct icc_path *imem_path; -struct icc_path *config_path; +struct ipa_interconnect *interconnect[IPA_INTERCONNECT_COUNT ];const struct ipa_interconnect_data *interconnect_data; };
@@ -71,24 +75,24 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev) path =ipa_interconnect_init_one (dev,"memory" );if (IS_ERR (path)) goto err_return; - clock->memory_path = path; + clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path = path; path =ipa_interconnect_init_one (dev,"imem" );if (IS_ERR (path)) goto err_memory_path_put; - clock->imem_path = path; + clock->interconnect[IPA_INTERCONNECT_IMEM ]->path = path; path =ipa_interconnect_init_one (dev,"config" );if (IS_ERR (path)) goto err_imem_path_put; - clock->config_path = path; + clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path = path;return 0 ; err_imem_path_put: -icc_put (clock->imem_path); +icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path); err_memory_path_put: -icc_put (clock->memory_path); +icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path); err_return:return PTR_ERR (path); }
@@ -96,9 +100,9 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev)/* Inverse of ipa_interconnect_init() */ static void ipa_interconnect_exit (struct ipa_clock *clock) { -icc_put (clock->config_path); -icc_put (clock->imem_path); -icc_put (clock->memory_path); +icc_put (clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path); +icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path); +icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path); }/* Currently we only use one bandwidth level, so just "enable" interconnects */
@@ -109,29 +113,31 @@ static int ipa_interconnect_enable(struct ipa *ipa)int ret; data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY ]; - ret =icc_set_bw (clock->memory_path, data->average_bandwidth, - data->peak_bandwidth); + ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path, + data->average_bandwidth, data->peak_bandwidth);if (ret)return ret; data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM ]; - ret =icc_set_bw (clock->imem_path, data->average_bandwidth, - data->peak_bandwidth); + ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path, + data->average_bandwidth, data->peak_bandwidth);if (ret) goto err_memory_path_disable; data = &clock->interconnect_data[IPA_INTERCONNECT_CONFIG ]; - ret =icc_set_bw (clock->config_path, data->average_bandwidth, - data->peak_bandwidth); + ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path, + data->average_bandwidth, data->peak_bandwidth);if (ret) goto err_imem_path_disable;return 0 ; err_imem_path_disable: - (void )icc_set_bw (clock->imem_path,0 ,0 ); + (void )icc_set_bw (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path, +0 ,0 ); err_memory_path_disable: - (void )icc_set_bw (clock->memory_path,0 ,0 ); + (void )icc_set_bw (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path, +0 ,0 );return ret; }
@@ -143,15 +149,18 @@ static void ipa_interconnect_disable(struct ipa *ipa)int result =0 ;int ret; - ret =icc_set_bw (clock->memory_path,0 ,0 ); + ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path, +0 ,0 );if (ret) result = ret; - ret =icc_set_bw (clock->imem_path,0 ,0 ); + ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path, +0 ,0 );if (ret && !result) result = ret; - ret =icc_set_bw (clock->config_path,0 ,0 ); + ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path, +0 ,0 );if (ret && !result) result = ret;
Signature · 1 line
2.20.1
PATCH 4/7 net: ipa: store average and peak interconnect bandwidth
In reply to Alex ElderAdd fields in the ipa_interconnect structure to hold the average and peak bandwidth values for the interconnect. Pass the configuring data for interconnects to ipa_interconnect_init() so these values can be recorded, and use them when enabling the interconnects.
There's no longer any need to keep a copy of the interconnect data after initialization.
--- drivers/net/ipa/ipa_clock.c | 88 ++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 36 deletions(-)
drivers/net/ipa/ipa_clock.c +52 -36
@@ -33,9 +33,13 @@/** * struct ipa_interconnect - IPA interconnect information * @path: Interconnect path +* @average_bandwidth: Average interconnect bandwidth (KB/second) +* @peak_bandwidth: Peak interconnect bandwidth (KB/second) */ struct ipa_interconnect {struct icc_path *path; +u32 average_bandwidth; +u32 peak_bandwidth; };/**
@@ -44,14 +48,12 @@ struct ipa_interconnect {* @mutex: Protects clock enable/disable * @core: IPA core clock * @interconnect: Interconnect array -* @interconnect_data: Interconnect configuration data */ struct ipa_clock {refcount_t count;struct mutex mutex;/* protects clock enable/disable */ struct clk *core; -struct ipa_interconnect *interconnect[IPA_INTERCONNECT_COUNT ]; -const struct ipa_interconnect_data *interconnect_data; +struct ipa_interconnect interconnect[IPA_INTERCONNECT_COUNT ]; }; static struct icc_path *
@@ -61,38 +63,52 @@ ipa_interconnect_init_one(struct device *dev, const char *name) path =of_icc_get (dev, name);if (IS_ERR (path)) -dev_err (dev,"error %ld getting %s interconnect\n" , -PTR_ERR (path), name); +dev_err (dev,"error %d getting %s interconnect\n" , + (int )PTR_ERR (path), name);return path; }/* Initialize interconnects required for IPA operation */ -static int ipa_interconnect_init (struct ipa_clock *clock,struct device *dev) +static int ipa_interconnect_init (struct ipa_clock *clock,struct device *dev, +const struct ipa_interconnect_data *data) { +struct ipa_interconnect *interconnect;struct icc_path *path; path =ipa_interconnect_init_one (dev,"memory" );if (IS_ERR (path)) goto err_return; - clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path = path; + interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; + interconnect->path = path; + interconnect->average_bandwidth = data->average_bandwidth; + interconnect->peak_bandwidth = data->peak_bandwidth; + data++; path =ipa_interconnect_init_one (dev,"imem" );if (IS_ERR (path)) goto err_memory_path_put; - clock->interconnect[IPA_INTERCONNECT_IMEM ]->path = path; + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; + interconnect->path = path; + interconnect->average_bandwidth = data->average_bandwidth; + interconnect->peak_bandwidth = data->peak_bandwidth; + data++; path =ipa_interconnect_init_one (dev,"config" );if (IS_ERR (path)) goto err_imem_path_put; - clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path = path; + interconnect = &clock->interconnect[IPA_INTERCONNECT_CONFIG ]; + interconnect->path = path; + interconnect->average_bandwidth = data->average_bandwidth; + interconnect->peak_bandwidth = data->peak_bandwidth; + data++;return 0 ; err_imem_path_put: -icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path); +icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ].path); err_memory_path_put: -icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path); +icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ].path); err_return:return PTR_ERR (path); }
@@ -100,44 +116,44 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev)/* Inverse of ipa_interconnect_init() */ static void ipa_interconnect_exit (struct ipa_clock *clock) { -icc_put (clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path); -icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path); -icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path); +icc_put (clock->interconnect[IPA_INTERCONNECT_CONFIG ].path); +icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ].path); +icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ].path); }/* Currently we only use one bandwidth level, so just "enable" interconnects */ static int ipa_interconnect_enable (struct ipa *ipa) { -const struct ipa_interconnect_data *data; +struct ipa_interconnect *interconnect;struct ipa_clock *clock = ipa->clock;int ret; - data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY ]; - ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path, - data->average_bandwidth, data->peak_bandwidth); + interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; + ret =icc_set_bw (interconnect->path, interconnect->average_bandwidth, + interconnect->peak_bandwidth);if (ret)return ret; - data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM ]; - ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path, - data->average_bandwidth, data->peak_bandwidth); + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; + ret =icc_set_bw (interconnect->path, interconnect->average_bandwidth, + interconnect->peak_bandwidth);if (ret) goto err_memory_path_disable; - data = &clock->interconnect_data[IPA_INTERCONNECT_CONFIG ]; - ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path, - data->average_bandwidth, data->peak_bandwidth); + interconnect = &clock->interconnect[IPA_INTERCONNECT_CONFIG ]; + ret =icc_set_bw (interconnect->path, interconnect->average_bandwidth, + interconnect->peak_bandwidth);if (ret) goto err_imem_path_disable;return 0 ; err_imem_path_disable: - (void )icc_set_bw (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path, -0 ,0 ); + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; + (void )icc_set_bw (interconnect->path,0 ,0 ); err_memory_path_disable: - (void )icc_set_bw (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path, -0 ,0 ); + interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; + (void )icc_set_bw (interconnect->path,0 ,0 );return ret; }
@@ -145,22 +161,23 @@ static int ipa_interconnect_enable(struct ipa *ipa)/* To disable an interconnect, we just its bandwidth to 0 */ static void ipa_interconnect_disable (struct ipa *ipa) { +struct ipa_interconnect *interconnect;struct ipa_clock *clock = ipa->clock;int result =0 ;int ret; - ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_MEMORY ]->path, -0 ,0 ); + interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; + ret =icc_set_bw (interconnect->path,0 ,0 );if (ret) result = ret; - ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_IMEM ]->path, -0 ,0 ); + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; + ret =icc_set_bw (interconnect->path,0 ,0 );if (ret && !result) result = ret; - ret =icc_set_bw (clock->interconnect[IPA_INTERCONNECT_CONFIG ]->path, -0 ,0 ); + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; + ret =icc_set_bw (interconnect->path,0 ,0 );if (ret && !result) result = ret;
@@ -286,9 +303,8 @@ ipa_clock_init(struct device *dev, const struct ipa_clock_data *data) goto err_clk_put; } clock->core = clk; - clock->interconnect_data = data->interconnect; - ret =ipa_interconnect_init (clock, dev); + ret =ipa_interconnect_init (clock, dev, data->interconnect);if (ret) goto err_kfree;
Signature · 1 line
2.20.1
PATCH 5/7 net: ipa: add interconnect name to configuration data
In reply to Alex ElderAdd the name to the configuration data for each interconnect. Use this information rather than a constant string during initialization.
--- drivers/net/ipa/ipa_clock.c | 6 +++--- drivers/net/ipa/ipa_data-sc7180.c | 3 +++ drivers/net/ipa/ipa_data-sdm845.c | 3 +++ drivers/net/ipa/ipa_data.h | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-)
drivers/net/ipa/ipa_clock.c +3 -3
@@ -76,7 +76,7 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev,struct ipa_interconnect *interconnect;struct icc_path *path; - path =ipa_interconnect_init_one (dev,"memory" ); + path =ipa_interconnect_init_one (dev, data->name);if (IS_ERR (path)) goto err_return; interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ];
@@ -85,7 +85,7 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev, interconnect->peak_bandwidth = data->peak_bandwidth; data++; - path =ipa_interconnect_init_one (dev,"imem" ); + path =ipa_interconnect_init_one (dev, data->name);if (IS_ERR (path)) goto err_memory_path_put; interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ];
@@ -94,7 +94,7 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev, interconnect->peak_bandwidth = data->peak_bandwidth; data++; - path =ipa_interconnect_init_one (dev,"config" ); + path =ipa_interconnect_init_one (dev, data->name);if (IS_ERR (path)) goto err_imem_path_put; interconnect = &clock->interconnect[IPA_INTERCONNECT_CONFIG ];
drivers/net/ipa/ipa_data-sc7180.c +3 -0
@@ -314,15 +314,18 @@ static struct ipa_clock_data ipa_clock_data = {/* Interconnect bandwidths are in 1000 byte/second units */ .interconnect = { [IPA_INTERCONNECT_MEMORY] = { + .name = "memory", .peak_bandwidth = 465000, /* 465 MBps */ .average_bandwidth = 80000, /* 80 MBps */ },/* Average bandwidth unused for the next two interconnects */ [IPA_INTERCONNECT_IMEM] = { + .name = "imem", .peak_bandwidth = 68570, /* 68.57 MBps */ .average_bandwidth = 0, /* unused */ }, [IPA_INTERCONNECT_CONFIG] = { + .name = "config", .peak_bandwidth = 30000, /* 30 MBps */ .average_bandwidth = 0, /* unused */ },
drivers/net/ipa/ipa_data-sdm845.c +3 -0
@@ -334,15 +334,18 @@ static struct ipa_clock_data ipa_clock_data = {/* Interconnect bandwidths are in 1000 byte/second units */ .interconnect = { [IPA_INTERCONNECT_MEMORY] = { + .name = "memory", .peak_bandwidth = 600000, /* 600 MBps */ .average_bandwidth = 80000, /* 80 MBps */ },/* Average bandwidth unused for the next two interconnects */ [IPA_INTERCONNECT_IMEM] = { + .name = "imem", .peak_bandwidth = 350000, /* 350 MBps */ .average_bandwidth = 0, /* unused */ }, [IPA_INTERCONNECT_CONFIG] = { + .name = "config", .peak_bandwidth = 40000, /* 40 MBps */ .average_bandwidth = 0, /* unused */ },
drivers/net/ipa/ipa_data.h +2 -0
@@ -268,10 +268,12 @@ enum ipa_interconnect_id {/** * struct ipa_interconnect_data - description of IPA interconnect bandwidths +* @name: Interconnect name (matches interconnect-name in DT) * @peak_bandwidth: Peak interconnect bandwidth (in 1000 byte/sec units) * @average_bandwidth: Average interconnect bandwidth (in 1000 byte/sec units) */ struct ipa_interconnect_data { +const char *name;u32 peak_bandwidth;u32 average_bandwidth; };
Signature · 1 line
2.20.1
PATCH 6/7 net: ipa: clean up interconnect initialization
In reply to Alex ElderPass an the address of an IPA interconnect structure and its configuration data to ipa_interconnect_init_one() and have that function initialize all the structure's fields. Change the function to simply return an error code.
Introduce ipa_interconnect_exit_one() to encapsulate the cleanup of an IPA interconnect structure.
--- drivers/net/ipa/ipa_clock.c | 83 +++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 36 deletions(-)
drivers/net/ipa/ipa_clock.c +47 -36
@@ -56,17 +56,33 @@ struct ipa_clock {struct ipa_interconnect interconnect[IPA_INTERCONNECT_COUNT ]; }; -static struct icc_path * -ipa_interconnect_init_one (struct device *dev,const char *name) +static int ipa_interconnect_init_one (struct device *dev, +struct ipa_interconnect *interconnect, +const struct ipa_interconnect_data *data) {struct icc_path *path; - path =of_icc_get (dev, name); -if (IS_ERR (path)) -dev_err (dev,"error %d getting %s interconnect\n" , - (int )PTR_ERR (path), name); + path =of_icc_get (dev, data->name); +if (IS_ERR (path)) { +int ret =PTR_ERR (path); -return path; +dev_err (dev,"error %d getting %s interconnect\n" , ret, + data->name); + +return ret; + } + + interconnect->path = path; + interconnect->average_bandwidth = data->average_bandwidth; + interconnect->peak_bandwidth = data->peak_bandwidth; + +return 0 ; +} + +static void ipa_interconnect_exit_one (struct ipa_interconnect *interconnect) +{ +icc_put (interconnect->path); +memset (interconnect,0 ,sizeof (*interconnect)); }/* Initialize interconnects required for IPA operation */
@@ -74,51 +90,46 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev, const struct ipa_interconnect_data *data) {struct ipa_interconnect *interconnect; -struct icc_path *path; +int ret; - path =ipa_interconnect_init_one (dev, data->name); -if (IS_ERR (path)) - goto err_return; interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; - interconnect->path = path; - interconnect->average_bandwidth = data->average_bandwidth; - interconnect->peak_bandwidth = data->peak_bandwidth; - data++; + ret =ipa_interconnect_init_one (dev, interconnect, data++); +if (ret) +return ret; - path =ipa_interconnect_init_one (dev, data->name); -if (IS_ERR (path)) + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; + ret =ipa_interconnect_init_one (dev, interconnect, data++); +if (ret) goto err_memory_path_put; - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; - interconnect->path = path; - interconnect->average_bandwidth = data->average_bandwidth; - interconnect->peak_bandwidth = data->peak_bandwidth; - data++; - path =ipa_interconnect_init_one (dev, data->name); -if (IS_ERR (path)) + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; + ret =ipa_interconnect_init_one (dev, interconnect, data++); +if (ret) goto err_imem_path_put; - interconnect = &clock->interconnect[IPA_INTERCONNECT_CONFIG ]; - interconnect->path = path; - interconnect->average_bandwidth = data->average_bandwidth; - interconnect->peak_bandwidth = data->peak_bandwidth; - data++;return 0 ; err_imem_path_put: -icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ].path); + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; +ipa_interconnect_exit_one (interconnect); err_memory_path_put: -icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ].path); -err_return: -return PTR_ERR (path); + interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; +ipa_interconnect_exit_one (interconnect); + +return ret; }/* Inverse of ipa_interconnect_init() */ static void ipa_interconnect_exit (struct ipa_clock *clock) { -icc_put (clock->interconnect[IPA_INTERCONNECT_CONFIG ].path); -icc_put (clock->interconnect[IPA_INTERCONNECT_IMEM ].path); -icc_put (clock->interconnect[IPA_INTERCONNECT_MEMORY ].path); +struct ipa_interconnect *interconnect; + + interconnect = &clock->interconnect[IPA_INTERCONNECT_CONFIG ]; +ipa_interconnect_exit_one (interconnect); + interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; +ipa_interconnect_exit_one (interconnect); + interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; +ipa_interconnect_exit_one (interconnect); }/* Currently we only use one bandwidth level, so just "enable" interconnects */
Signature · 1 line
2.20.1
PATCH 7/7 net: ipa: allow arbitrary number of interconnects
In reply to Alex ElderCurrently we assume that the IPA hardware has exactly three interconnects. But that won't be guaranteed for all platforms, so allow any number of interconnects to be specified in the configuration data.
For each platform, define an array of interconnect data entries (still associated with the IPA clock structure), and record the number of entries initialized in that array.
Loop over all entries in this array when initializing, enabling, disabling, or tearing down the set of interconnects.
With this change we no longer need the ipa_interconnect_id enumerated type, so get rid of it.
--- drivers/net/ipa/ipa_clock.c | 113 +++++++++++++----------------- drivers/net/ipa/ipa_data-sc7180.c | 41 ++++++----- drivers/net/ipa/ipa_data-sdm845.c | 41 ++++++----- drivers/net/ipa/ipa_data.h | 14 ++-- 4 files changed, 97 insertions(+), 112 deletions(-)
drivers/net/ipa/ipa_clock.c +49 -64
@@ -47,13 +47,15 @@ struct ipa_interconnect {* @count: Clocking reference count * @mutex: Protects clock enable/disable * @core: IPA core clock +* @interconnect_count: Number of elements in interconnect[] * @interconnect: Interconnect array */ struct ipa_clock {refcount_t count;struct mutex mutex;/* protects clock enable/disable */ struct clk *core; -struct ipa_interconnect interconnect[IPA_INTERCONNECT_COUNT ]; +u32 interconnect_count; +struct ipa_interconnect *interconnect; }; static int ipa_interconnect_init_one(struct device *dev,
@@ -90,31 +92,29 @@ static int ipa_interconnect_init(struct ipa_clock *clock, struct device *dev, const struct ipa_interconnect_data *data) {struct ipa_interconnect *interconnect; +u32 count;int ret; - interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; - ret =ipa_interconnect_init_one (dev, interconnect, data++); -if (ret) -return ret; + count = clock->interconnect_count; + interconnect =kcalloc (count,sizeof (*interconnect),GFP_KERNEL ); +if (!interconnect) +return -ENOMEM ; + clock->interconnect = interconnect; - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; - ret =ipa_interconnect_init_one (dev, interconnect, data++); -if (ret) - goto err_memory_path_put; - - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; - ret =ipa_interconnect_init_one (dev, interconnect, data++); -if (ret) - goto err_imem_path_put; +while (count--) { + ret =ipa_interconnect_init_one (dev, interconnect, data++); +if (ret) + goto out_unwind; + interconnect++; + }return 0 ; -err_imem_path_put: - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; -ipa_interconnect_exit_one (interconnect); -err_memory_path_put: - interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; -ipa_interconnect_exit_one (interconnect); +out_unwind: +while (interconnect-- > clock->interconnect) +ipa_interconnect_exit_one (interconnect); +kfree (clock->interconnect); + clock->interconnect =NULL ;return ret; }
@@ -124,12 +124,11 @@ static void ipa_interconnect_exit(struct ipa_clock *clock) {struct ipa_interconnect *interconnect; - interconnect = &clock->interconnect[IPA_INTERCONNECT_CONFIG ]; -ipa_interconnect_exit_one (interconnect); - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; -ipa_interconnect_exit_one (interconnect); - interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; -ipa_interconnect_exit_one (interconnect); + interconnect = clock->interconnect + clock->interconnect_count; +while (interconnect-- > clock->interconnect) +ipa_interconnect_exit_one (interconnect); +kfree (clock->interconnect); + clock->interconnect =NULL ; }/* Currently we only use one bandwidth level, so just "enable" interconnects */
@@ -138,33 +137,23 @@ static int ipa_interconnect_enable(struct ipa *ipa)struct ipa_interconnect *interconnect;struct ipa_clock *clock = ipa->clock;int ret; +u32 i; - interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; - ret =icc_set_bw (interconnect->path, interconnect->average_bandwidth, - interconnect->peak_bandwidth); -if (ret) -return ret; - - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; - ret =icc_set_bw (interconnect->path, interconnect->average_bandwidth, - interconnect->peak_bandwidth); -if (ret) - goto err_memory_path_disable; - - interconnect = &clock->interconnect[IPA_INTERCONNECT_CONFIG ]; - ret =icc_set_bw (interconnect->path, interconnect->average_bandwidth, - interconnect->peak_bandwidth); -if (ret) - goto err_imem_path_disable; + interconnect = clock->interconnect; +for (i =0 ; i < clock->interconnect_count; i++) { + ret =icc_set_bw (interconnect->path, + interconnect->average_bandwidth, + interconnect->peak_bandwidth); +if (ret) + goto out_unwind; + interconnect++; + }return 0 ; -err_imem_path_disable: - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; - (void )icc_set_bw (interconnect->path,0 ,0 ); -err_memory_path_disable: - interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; - (void )icc_set_bw (interconnect->path,0 ,0 ); +out_unwind: +while (interconnect-- > clock->interconnect) + (void )icc_set_bw (interconnect->path,0 ,0 );return ret; }
@@ -175,22 +164,17 @@ static void ipa_interconnect_disable(struct ipa *ipa)struct ipa_interconnect *interconnect;struct ipa_clock *clock = ipa->clock;int result =0 ; +u32 count;int ret; - interconnect = &clock->interconnect[IPA_INTERCONNECT_MEMORY ]; - ret =icc_set_bw (interconnect->path,0 ,0 ); -if (ret) - result = ret; - - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; - ret =icc_set_bw (interconnect->path,0 ,0 ); -if (ret && !result) - result = ret; - - interconnect = &clock->interconnect[IPA_INTERCONNECT_IMEM ]; - ret =icc_set_bw (interconnect->path,0 ,0 ); -if (ret && !result) - result = ret; + count = clock->interconnect_count; + interconnect = clock->interconnect + count; +while (count--) { + interconnect--; + ret =icc_set_bw (interconnect->path,0 ,0 ); +if (ret && !result) + result = ret; + }if (result) dev_err(&ipa->pdev->dev,
@@ -314,8 +298,9 @@ ipa_clock_init(struct device *dev, const struct ipa_clock_data *data) goto err_clk_put; } clock->core = clk; + clock->interconnect_count = data->interconnect_count; - ret =ipa_interconnect_init (clock, dev, data->interconnect); + ret =ipa_interconnect_init (clock, dev, data->interconnect_data);if (ret) goto err_kfree;
drivers/net/ipa/ipa_data-sc7180.c +22 -19
49 lines not on this page · raw message
drivers/net/ipa/ipa_data-sdm845.c +22 -19
49 lines not on this page · raw message
drivers/net/ipa/ipa_data.h +4 -10
@@ -258,14 +258,6 @@ struct ipa_mem_data {u32 smem_size; }; -/** enum ipa_interconnect_id - IPA interconnect identifier */ -enum ipa_interconnect_id { -IPA_INTERCONNECT_MEMORY , -IPA_INTERCONNECT_IMEM , -IPA_INTERCONNECT_CONFIG , -IPA_INTERCONNECT_COUNT ,/* Last; not an interconnect */ -}; -/** * struct ipa_interconnect_data - description of IPA interconnect bandwidths * @name: Interconnect name (matches interconnect-name in DT)
@@ -281,11 +273,13 @@ struct ipa_interconnect_data {/** * struct ipa_clock_data - description of IPA clock and interconnect rates * @core_clock_rate: Core clock rate (Hz) -* @interconnect: Array of interconnect bandwidth parameters +* @interconnect_count: Number of entries in the interconnect_data array +* @interconnect_data: IPA interconnect configuration data */ struct ipa_clock_data {u32 core_clock_rate; -struct ipa_interconnect_data interconnect[IPA_INTERCONNECT_COUNT ]; +u32 interconnect_count;/* # entries in interconnect_data[] */ +const struct ipa_interconnect_data *interconnect_data; };/**
Signature · 1 line
2.20.1
Jakub Kicinski
maintainerRe: [PATCH net-next 7/7] net: ipa: allow arbitrary number of interconnects
Quoted 9 lines · On Fri, 15 Jan 2021 06:50:50 -0600 Alex Elder wrote:
Currently we assume that the IPA hardware has exactly three interconnects. But that won't be guaranteed for all platforms, so allow any number of interconnects to be specified in the configuration data.
For each platform, define an array of interconnect data entries (still associated with the IPA clock structure), and record the number of entries initialized in that array.
Quoted 5 lines
Loop over all entries in this array when initializing, enabling, disabling, or tearing down the set of interconnects.
With this change we no longer need the
ipa_interconnect_idenumerated type, so get rid of it.
Okay, all the platforms supported as of the end of the series still have 3 interconnects, or there is no upstream user of this functionality, if you will. What's the story?
Re: [PATCH net-next 7/7] net: ipa: allow arbitrary number of interconnects
Quoted 13 lines · Jakub Kicinski
Quoted 12 lines · On Fri, 15 Jan 2021 06:50:50 -0600 Alex Elder wrote:
Currently we assume that the IPA hardware has exactly three interconnects. But that won't be guaranteed for all platforms, so allow any number of interconnects to be specified in the configuration data.
For each platform, define an array of interconnect data entries (still associated with the IPA clock structure), and record the number of entries initialized in that array.
Loop over all entries in this array when initializing, enabling, disabling, or tearing down the set of interconnects.
Quoted 6 lines
Quoted 2 lines
With this change we no longer need the
ipa_interconnect_idenumerated type, so get rid of it.Okay, all the platforms supported as of the end of the series still have 3 interconnects, or there is no upstream user of this functionality, if you will. What's the story?
The short answer is that there is another version of IPA that has four interconnects instead of three. (A DTS file for it is in "sdxprairie.dtsi" in the Qualcomm "downstream" code.) I hope to have that version supported this year, but it's not my top priority right now. Generalizing the interconnect definitions as done in this series improves the driver, but you're right, it is technically not required at this time.
And some more background:
The upstream IPA driver is derived from the Qualcomm downstream code published at codeaurora.org. The downstream driver is huge (it's well over 100,000 lines of code) and it supports lots of IPA versions and some features that are not present upstream.
In order to have any hope of getting upstream support for the IPA hardware, the downstream driver functionality was reduced, removing support for filtering, routing, and NAT. I spent many months refactoring and reworking that code to make it more "upstreamable," and eventually posted the result for review.
Now that there is an upstream driver, a long term goal is to add back functionality that got removed, matching the most important features and hardware support found in the downstream code. So in cases like this, even though this feature is not yet required, adding it now lays groundwork to make later work easier.
Everything I do with the upstream IPA driver is aimed at in-tree support for additional IPA features and hardware versions. So even if an improvement isn't required *now*, there is at least a general plan to add support "soon" for something that will need it.
Beyond even that, there are some things I intend to do that will improve the driver, even if they aren't technically required near-term. For example, I'd like to dynamically allocate endpoints based on what's needed, rather than having the driver support any number of them up to a maximum fixed at build time.
Probably a longer response than you needed, but I thought it would help to provide more background. Besides, you *did* ask for "the story..."
-Alex
Re: [PATCH net-next 7/7] net: ipa: allow arbitrary number of interconnects
Quoted 61 lines · On Sun, 17 Jan 2021 10:03:41 -0600 Alex Elder wrote:
Quoted 13 lines · Jakub Kicinski
Quoted 12 lines · On Fri, 15 Jan 2021 06:50:50 -0600 Alex Elder wrote:
Currently we assume that the IPA hardware has exactly three interconnects. But that won't be guaranteed for all platforms, so allow any number of interconnects to be specified in the configuration data.
For each platform, define an array of interconnect data entries (still associated with the IPA clock structure), and record the number of entries initialized in that array.
Loop over all entries in this array when initializing, enabling, disabling, or tearing down the set of interconnects.
Quoted 6 lines
Quoted 2 lines
With this change we no longer need the
ipa_interconnect_idenumerated type, so get rid of it.Okay, all the platforms supported as of the end of the series still have 3 interconnects, or there is no upstream user of this functionality, if you will. What's the story?
The short answer is that there is another version of IPA that has four interconnects instead of three. (A DTS file for it is in "
sdxprairie.dtsi" in the Qualcomm "downstream" code.) I hope to have that version supported this year, but it's not my top priority right now. Generalizing the interconnect definitions as done in this series improves the driver, but you're right, it is technically not required at this time.And some more background:
The upstream IPA driver is derived from the Qualcomm downstream code published at codeaurora.org. The downstream driver is huge (it's well over 100,000 lines of code) and it supports lots of IPA versions and some features that are not present upstream.In order to have any hope of getting upstream support for the IPA hardware, the downstream driver functionality was reduced, removing support for filtering, routing, and NAT. I spent many months refactoring and reworking that code to make it more "upstreamable," and eventually posted the result for review.
Now that there is an upstream driver, a long term goal is to add back functionality that got removed, matching the most important features and hardware support found in the downstream code. So in cases like this, even though this feature is not yet required, adding it now lays groundwork to make later work easier.
Everything I do with the upstream IPA driver is aimed at in-tree support for additional IPA features and hardware versions. So even if an improvement isn't required *now*, there is at least a general plan to add support "soon" for something that will need it.
Beyond even that, there are some things I intend to do that will improve the driver, even if they aren't technically required near-term. For example, I'd like to dynamically allocate endpoints based on what's needed, rather than having the driver support any number of them up to a maximum fixed at build time.
Quoted 3 lines
Probably a longer response than you needed, but I thought it would help to provide more background. Besides, you *did* ask for "the story..."
Thanks, I think I get it now.
But it does sound a little too much like aligning with the vendor driver for the sake of aligning with the vendor driver. This makes the review for someone not familiar with the vendor driver hard, and raises questions like "is this really needed upstream or just downstream / out-of-tree". Please try to reorient the work towards implementing particular pieces of functionality upstream start to end.
Applied, with a warning :)
Re: [PATCH net-next 7/7] net: ipa: allow arbitrary number of interconnects
Quoted 6 lines · Jakub Kicinski
But it does sound a little too much like aligning with the vendor driver for the sake of aligning with the vendor driver. This makes the review for someone not familiar with the vendor driver hard, and raises questions like "is this really needed upstream or just downstream / out-of-tree". Please try to reorient the work towards implementing particular pieces of functionality upstream start to end.
I have lots of this kind of preparatory work "ready to go" and I'm eager to get it upstream. But I'll try to be more patient and wait to send things out until something justifies the need, rather than just doing it in support of a longer-term goal.
I would not consider what I'm doing "aligning with the vendor driver," but maybe I misunderstand your meaning. The upstream driver is very different from Qualcomm's driver. I'm basically writing all new code now, using the Qualcomm code for reference.
Thank you very much for applying the patches.
-Alex