From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Elder Subject: Re: [PATCH v2 2/4] clk: bcm/kona: use DIV_ROUND_CLOSEST_ULL() Date: Tue, 24 Mar 2015 13:03:27 -0500 Message-ID: <5511A6EF.8010103@ieee.org> References: <1427205825-5444-1-git-send-email-javi.merino@arm.com> <1427205825-5444-3-git-send-email-javi.merino@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1427205825-5444-3-git-send-email-javi.merino@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Javi Merino , akpm@linux-foundation.org Cc: Mike Turquette , Stephen Boyd , intel-gfx@lists.freedesktop.org, emil.l.velikov@gmail.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Elder , jepler@unpythonic.net List-Id: dri-devel@lists.freedesktop.org T24gMDMvMjQvMjAxNSAwOTowMyBBTSwgSmF2aSBNZXJpbm8gd3JvdGU6Cj4gTm93IHRoYXQgdGhl IGtlcm5lbCBwcm92aWRlcyBESVZfUk9VTkRfQ0xPU0VTVF9VTEwoKSwgZHJvcCB0aGUgaW50ZXJu YWwKPiBpbXBsZW1lbnRhdGlvbiBhbmQgdXNlIHRoZSBrZXJuZWwgb25lLgo+IAo+IENjOiBNaWtl IFR1cnF1ZXR0ZSA8bXR1cnF1ZXR0ZUBsaW5hcm8ub3JnPgo+IENjOiBTdGVwaGVuIEJveWQgPHNi b3lkQGNvZGVhdXJvcmEub3JnPgo+IENjOiBBbGV4IEVsZGVyIDxlbGRlckBsaW5hcm8ub3JnPgoK QWNrZWQtYnk6IEFsZXggRWxkZXIgPGVsZGVyQGxpbmFyby5vcmc+Cgo+IFNpZ25lZC1vZmYtYnk6 IEphdmkgTWVyaW5vIDxqYXZpLm1lcmlub0Bhcm0uY29tPgo+IC0tLQo+ICBkcml2ZXJzL2Nsay9i Y20vY2xrLWtvbmEuYyB8IDI4ICsrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgZHJpdmVy cy9jbGsvYmNtL2Nsay1rb25hLmggfCAgMSAtCj4gIDIgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRp b25zKCspLCAyMiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9jbGsvYmNt L2Nsay1rb25hLmMgYi9kcml2ZXJzL2Nsay9iY20vY2xrLWtvbmEuYwo+IGluZGV4IDA1YWJhZTg5 MjYyZS4uYTBlZjRmNzVkNDU3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvY2xrL2JjbS9jbGsta29u YS5jCj4gKysrIGIvZHJpdmVycy9jbGsvYmNtL2Nsay1rb25hLmMKPiBAQCAtMTUsNiArMTUsNyBA QAo+ICAjaW5jbHVkZSAiY2xrLWtvbmEuaCIKPiAgCj4gICNpbmNsdWRlIDxsaW51eC9kZWxheS5o Pgo+ICsjaW5jbHVkZSA8bGludXgva2VybmVsLmg+Cj4gIAo+ICAvKgo+ICAgKiAiUG9saWNpZXMi IGFmZmVjdCB0aGUgZnJlcXVlbmNpZXMgb2YgYnVzIGNsb2NrcyBwcm92aWRlZCBieSBhCj4gQEAg LTUxLDIxICs1Miw2IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGJpdGZpZWxkX3JlcGxhY2UodTMyIHJl Z192YWwsIHUzMiBzaGlmdCwgdTMyIHdpZHRoLCB1MzIgdmFsKQo+ICAKPiAgLyogRGl2aWRlciBh bmQgc2NhbGluZyBoZWxwZXJzICovCj4gIAo+IC0vKgo+IC0gKiBJbXBsZW1lbnQgRElWX1JPVU5E X0NMT1NFU1QoKSBmb3IgNjQtYml0IGRpdmlkZW5kIGFuZCBib3RoIHZhbHVlcwo+IC0gKiB1bnNp Z25lZC4gIE5vdGUgdGhhdCB1bmxpa2UgZG9fZGl2KCksIHRoZSByZW1haW5kZXIgaXMgZGlzY2Fy ZGVkCj4gLSAqIGFuZCB0aGUgcmV0dXJuIHZhbHVlIGlzIHRoZSBxdW90aWVudCAobm90IHRoZSBy ZW1haW5kZXIpLgo+IC0gKi8KPiAtdTY0IGRvX2Rpdl9yb3VuZF9jbG9zZXN0KHU2NCBkaXZpZGVu ZCwgdW5zaWduZWQgbG9uZyBkaXZpc29yKQo+IC17Cj4gLQl1NjQgcmVzdWx0Owo+IC0KPiAtCXJl c3VsdCA9IGRpdmlkZW5kICsgKCh1NjQpZGl2aXNvciA+PiAxKTsKPiAtCSh2b2lkKWRvX2Rpdihy ZXN1bHQsIGRpdmlzb3IpOwo+IC0KPiAtCXJldHVybiByZXN1bHQ7Cj4gLX0KPiAtCj4gIC8qIENv bnZlcnQgYSBkaXZpZGVyIGludG8gdGhlIHNjYWxlZCBkaXZpc29yIHZhbHVlIGl0IHJlcHJlc2Vu dHMuICovCj4gIHN0YXRpYyBpbmxpbmUgdTY0IHNjYWxlZF9kaXZfdmFsdWUoc3RydWN0IGJjbV9j bGtfZGl2ICpkaXYsIHUzMiByZWdfZGl2KQo+ICB7Cj4gQEAgLTg3LDcgKzczLDcgQEAgdTY0IHNj YWxlZF9kaXZfYnVpbGQoc3RydWN0IGJjbV9jbGtfZGl2ICpkaXYsIHUzMiBkaXZfdmFsdWUsIHUz MiBiaWxsaW9udGhzKQo+ICAJY29tYmluZWQgPSAodTY0KWRpdl92YWx1ZSAqIEJJTExJT04gKyBi aWxsaW9udGhzOwo+ICAJY29tYmluZWQgPDw9IGRpdi0+dS5zLmZyYWNfd2lkdGg7Cj4gIAo+IC0J cmV0dXJuIGRvX2Rpdl9yb3VuZF9jbG9zZXN0KGNvbWJpbmVkLCBCSUxMSU9OKTsKPiArCXJldHVy biBESVZfUk9VTkRfQ0xPU0VTVF9VTEwoY29tYmluZWQsIEJJTExJT04pOwo+ICB9Cj4gIAo+ICAv KiBUaGUgc2NhbGVkIG1pbmltdW0gZGl2aXNvciByZXByZXNlbnRhYmxlIGJ5IGEgZGl2aWRlciAq Lwo+IEBAIC03MzEsNyArNzE3LDcgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgY2xrX3JlY2FsY19y YXRlKHN0cnVjdCBjY3VfZGF0YSAqY2N1LAo+ICAJCXNjYWxlZF9yYXRlID0gc2NhbGVfcmF0ZShw cmVfZGl2LCBwYXJlbnRfcmF0ZSk7Cj4gIAkJc2NhbGVkX3JhdGUgPSBzY2FsZV9yYXRlKGRpdiwg c2NhbGVkX3JhdGUpOwo+ICAJCXNjYWxlZF9kaXYgPSBkaXZpZGVyX3JlYWRfc2NhbGVkKGNjdSwg cHJlX2Rpdik7Cj4gLQkJc2NhbGVkX3BhcmVudF9yYXRlID0gZG9fZGl2X3JvdW5kX2Nsb3Nlc3Qo c2NhbGVkX3JhdGUsCj4gKwkJc2NhbGVkX3BhcmVudF9yYXRlID0gRElWX1JPVU5EX0NMT1NFU1Rf VUxMKHNjYWxlZF9yYXRlLAo+ICAJCQkJCQkJc2NhbGVkX2Rpdik7Cj4gIAl9IGVsc2UgIHsKPiAg CQlzY2FsZWRfcGFyZW50X3JhdGUgPSBzY2FsZV9yYXRlKGRpdiwgcGFyZW50X3JhdGUpOwo+IEBA IC03NDMsNyArNzI5LDcgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgY2xrX3JlY2FsY19yYXRlKHN0 cnVjdCBjY3VfZGF0YSAqY2N1LAo+ICAJICogcmF0ZS4KPiAgCSAqLwo+ICAJc2NhbGVkX2RpdiA9 IGRpdmlkZXJfcmVhZF9zY2FsZWQoY2N1LCBkaXYpOwo+IC0JcmVzdWx0ID0gZG9fZGl2X3JvdW5k X2Nsb3Nlc3Qoc2NhbGVkX3BhcmVudF9yYXRlLCBzY2FsZWRfZGl2KTsKPiArCXJlc3VsdCA9IERJ Vl9ST1VORF9DTE9TRVNUX1VMTChzY2FsZWRfcGFyZW50X3JhdGUsIHNjYWxlZF9kaXYpOwo+ICAK PiAgCXJldHVybiAodW5zaWduZWQgbG9uZylyZXN1bHQ7Cj4gIH0KPiBAQCAtNzkwLDcgKzc3Niw3 IEBAIHN0YXRpYyBsb25nIHJvdW5kX3JhdGUoc3RydWN0IGNjdV9kYXRhICpjY3UsIHN0cnVjdCBi Y21fY2xrX2RpdiAqZGl2LAo+ICAJCXNjYWxlZF9yYXRlID0gc2NhbGVfcmF0ZShwcmVfZGl2LCBw YXJlbnRfcmF0ZSk7Cj4gIAkJc2NhbGVkX3JhdGUgPSBzY2FsZV9yYXRlKGRpdiwgc2NhbGVkX3Jh dGUpOwo+ICAJCXNjYWxlZF9wcmVfZGl2ID0gZGl2aWRlcl9yZWFkX3NjYWxlZChjY3UsIHByZV9k aXYpOwo+IC0JCXNjYWxlZF9wYXJlbnRfcmF0ZSA9IGRvX2Rpdl9yb3VuZF9jbG9zZXN0KHNjYWxl ZF9yYXRlLAo+ICsJCXNjYWxlZF9wYXJlbnRfcmF0ZSA9IERJVl9ST1VORF9DTE9TRVNUX1VMTChz Y2FsZWRfcmF0ZSwKPiAgCQkJCQkJCXNjYWxlZF9wcmVfZGl2KTsKPiAgCX0gZWxzZSB7Cj4gIAkJ c2NhbGVkX3BhcmVudF9yYXRlID0gc2NhbGVfcmF0ZShkaXYsIHBhcmVudF9yYXRlKTsKPiBAQCAt ODAyLDcgKzc4OCw3IEBAIHN0YXRpYyBsb25nIHJvdW5kX3JhdGUoc3RydWN0IGNjdV9kYXRhICpj Y3UsIHN0cnVjdCBiY21fY2xrX2RpdiAqZGl2LAo+ICAJICogdGhlIGJlc3Qgd2UgY2FuIGRvLgo+ ICAJICovCj4gIAlpZiAoIWRpdmlkZXJfaXNfZml4ZWQoZGl2KSkgewo+IC0JCWJlc3Rfc2NhbGVk X2RpdiA9IGRvX2Rpdl9yb3VuZF9jbG9zZXN0KHNjYWxlZF9wYXJlbnRfcmF0ZSwKPiArCQliZXN0 X3NjYWxlZF9kaXYgPSBESVZfUk9VTkRfQ0xPU0VTVF9VTEwoc2NhbGVkX3BhcmVudF9yYXRlLAo+ ICAJCQkJCQkJcmF0ZSk7Cj4gIAkJbWluX3NjYWxlZF9kaXYgPSBzY2FsZWRfZGl2X21pbihkaXYp Owo+ICAJCW1heF9zY2FsZWRfZGl2ID0gc2NhbGVkX2Rpdl9tYXgoZGl2KTsKPiBAQCAtODE1LDcg KzgwMSw3IEBAIHN0YXRpYyBsb25nIHJvdW5kX3JhdGUoc3RydWN0IGNjdV9kYXRhICpjY3UsIHN0 cnVjdCBiY21fY2xrX2RpdiAqZGl2LAo+ICAJfQo+ICAKPiAgCS8qIE9LLCBmaWd1cmUgb3V0IHRo ZSByZXN1bHRpbmcgcmF0ZSAqLwo+IC0JcmVzdWx0ID0gZG9fZGl2X3JvdW5kX2Nsb3Nlc3Qoc2Nh bGVkX3BhcmVudF9yYXRlLCBiZXN0X3NjYWxlZF9kaXYpOwo+ICsJcmVzdWx0ID0gRElWX1JPVU5E X0NMT1NFU1RfVUxMKHNjYWxlZF9wYXJlbnRfcmF0ZSwgYmVzdF9zY2FsZWRfZGl2KTsKPiAgCj4g IAlpZiAoc2NhbGVkX2RpdikKPiAgCQkqc2NhbGVkX2RpdiA9IGJlc3Rfc2NhbGVkX2RpdjsKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9jbGsvYmNtL2Nsay1rb25hLmggYi9kcml2ZXJzL2Nsay9iY20v Y2xrLWtvbmEuaAo+IGluZGV4IDI1MzdiMzA3MjkxMC4uNjg0OWE2NGJhZjZkIDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvY2xrL2JjbS9jbGsta29uYS5oCj4gKysrIGIvZHJpdmVycy9jbGsvYmNtL2Ns ay1rb25hLmgKPiBAQCAtNTAzLDcgKzUwMyw2IEBAIGV4dGVybiBzdHJ1Y3QgY2xrX29wcyBrb25h X3BlcmlfY2xrX29wczsKPiAgCj4gIC8qIEV4dGVybmFsbHkgdmlzaWJsZSBmdW5jdGlvbnMgKi8K PiAgCj4gLWV4dGVybiB1NjQgZG9fZGl2X3JvdW5kX2Nsb3Nlc3QodTY0IGRpdmlkZW5kLCB1bnNp Z25lZCBsb25nIGRpdmlzb3IpOwo+ICBleHRlcm4gdTY0IHNjYWxlZF9kaXZfbWF4KHN0cnVjdCBi Y21fY2xrX2RpdiAqZGl2KTsKPiAgZXh0ZXJuIHU2NCBzY2FsZWRfZGl2X2J1aWxkKHN0cnVjdCBi Y21fY2xrX2RpdiAqZGl2LCB1MzIgZGl2X3ZhbHVlLAo+ICAJCQkJdTMyIGJpbGxpb250aHMpOwo+ IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753934AbbCXSDg (ORCPT ); Tue, 24 Mar 2015 14:03:36 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:35427 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752618AbbCXSDe (ORCPT ); Tue, 24 Mar 2015 14:03:34 -0400 Message-ID: <5511A6EF.8010103@ieee.org> Date: Tue, 24 Mar 2015 13:03:27 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Javi Merino , akpm@linux-foundation.org CC: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, emil.l.velikov@gmail.com, jepler@unpythonic.net, daniel@ffwll.ch, Mike Turquette , Stephen Boyd , Alex Elder Subject: Re: [PATCH v2 2/4] clk: bcm/kona: use DIV_ROUND_CLOSEST_ULL() References: <1427205825-5444-1-git-send-email-javi.merino@arm.com> <1427205825-5444-3-git-send-email-javi.merino@arm.com> In-Reply-To: <1427205825-5444-3-git-send-email-javi.merino@arm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/24/2015 09:03 AM, Javi Merino wrote: > Now that the kernel provides DIV_ROUND_CLOSEST_ULL(), drop the internal > implementation and use the kernel one. > > Cc: Mike Turquette > Cc: Stephen Boyd > Cc: Alex Elder Acked-by: Alex Elder > Signed-off-by: Javi Merino > --- > drivers/clk/bcm/clk-kona.c | 28 +++++++--------------------- > drivers/clk/bcm/clk-kona.h | 1 - > 2 files changed, 7 insertions(+), 22 deletions(-) > > diff --git a/drivers/clk/bcm/clk-kona.c b/drivers/clk/bcm/clk-kona.c > index 05abae89262e..a0ef4f75d457 100644 > --- a/drivers/clk/bcm/clk-kona.c > +++ b/drivers/clk/bcm/clk-kona.c > @@ -15,6 +15,7 @@ > #include "clk-kona.h" > > #include > +#include > > /* > * "Policies" affect the frequencies of bus clocks provided by a > @@ -51,21 +52,6 @@ static inline u32 bitfield_replace(u32 reg_val, u32 shift, u32 width, u32 val) > > /* Divider and scaling helpers */ > > -/* > - * Implement DIV_ROUND_CLOSEST() for 64-bit dividend and both values > - * unsigned. Note that unlike do_div(), the remainder is discarded > - * and the return value is the quotient (not the remainder). > - */ > -u64 do_div_round_closest(u64 dividend, unsigned long divisor) > -{ > - u64 result; > - > - result = dividend + ((u64)divisor >> 1); > - (void)do_div(result, divisor); > - > - return result; > -} > - > /* Convert a divider into the scaled divisor value it represents. */ > static inline u64 scaled_div_value(struct bcm_clk_div *div, u32 reg_div) > { > @@ -87,7 +73,7 @@ u64 scaled_div_build(struct bcm_clk_div *div, u32 div_value, u32 billionths) > combined = (u64)div_value * BILLION + billionths; > combined <<= div->u.s.frac_width; > > - return do_div_round_closest(combined, BILLION); > + return DIV_ROUND_CLOSEST_ULL(combined, BILLION); > } > > /* The scaled minimum divisor representable by a divider */ > @@ -731,7 +717,7 @@ static unsigned long clk_recalc_rate(struct ccu_data *ccu, > scaled_rate = scale_rate(pre_div, parent_rate); > scaled_rate = scale_rate(div, scaled_rate); > scaled_div = divider_read_scaled(ccu, pre_div); > - scaled_parent_rate = do_div_round_closest(scaled_rate, > + scaled_parent_rate = DIV_ROUND_CLOSEST_ULL(scaled_rate, > scaled_div); > } else { > scaled_parent_rate = scale_rate(div, parent_rate); > @@ -743,7 +729,7 @@ static unsigned long clk_recalc_rate(struct ccu_data *ccu, > * rate. > */ > scaled_div = divider_read_scaled(ccu, div); > - result = do_div_round_closest(scaled_parent_rate, scaled_div); > + result = DIV_ROUND_CLOSEST_ULL(scaled_parent_rate, scaled_div); > > return (unsigned long)result; > } > @@ -790,7 +776,7 @@ static long round_rate(struct ccu_data *ccu, struct bcm_clk_div *div, > scaled_rate = scale_rate(pre_div, parent_rate); > scaled_rate = scale_rate(div, scaled_rate); > scaled_pre_div = divider_read_scaled(ccu, pre_div); > - scaled_parent_rate = do_div_round_closest(scaled_rate, > + scaled_parent_rate = DIV_ROUND_CLOSEST_ULL(scaled_rate, > scaled_pre_div); > } else { > scaled_parent_rate = scale_rate(div, parent_rate); > @@ -802,7 +788,7 @@ static long round_rate(struct ccu_data *ccu, struct bcm_clk_div *div, > * the best we can do. > */ > if (!divider_is_fixed(div)) { > - best_scaled_div = do_div_round_closest(scaled_parent_rate, > + best_scaled_div = DIV_ROUND_CLOSEST_ULL(scaled_parent_rate, > rate); > min_scaled_div = scaled_div_min(div); > max_scaled_div = scaled_div_max(div); > @@ -815,7 +801,7 @@ static long round_rate(struct ccu_data *ccu, struct bcm_clk_div *div, > } > > /* OK, figure out the resulting rate */ > - result = do_div_round_closest(scaled_parent_rate, best_scaled_div); > + result = DIV_ROUND_CLOSEST_ULL(scaled_parent_rate, best_scaled_div); > > if (scaled_div) > *scaled_div = best_scaled_div; > diff --git a/drivers/clk/bcm/clk-kona.h b/drivers/clk/bcm/clk-kona.h > index 2537b3072910..6849a64baf6d 100644 > --- a/drivers/clk/bcm/clk-kona.h > +++ b/drivers/clk/bcm/clk-kona.h > @@ -503,7 +503,6 @@ extern struct clk_ops kona_peri_clk_ops; > > /* Externally visible functions */ > > -extern u64 do_div_round_closest(u64 dividend, unsigned long divisor); > extern u64 scaled_div_max(struct bcm_clk_div *div); > extern u64 scaled_div_build(struct bcm_clk_div *div, u32 div_value, > u32 billionths); >