From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kever Yang Subject: Re: [PATCH v3 05/57] ram: rk3399: Add rank enc macro Date: Tue, 16 Jul 2019 20:58:50 +0800 Message-ID: <35e73ae2-8e09-7cc0-60ad-80185ce78293@rock-chips.com> References: <20190716115745.12585-1-jagan@amarulasolutions.com> <20190716115745.12585-6-jagan@amarulasolutions.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190716115745.12585-6-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+glpar-linux-rockchip=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: Jagan Teki , Simon Glass , Philipp Tomsich , YouMin Chen , u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, gajjar04akash-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org, Manivannan Sadhasivam List-Id: linux-rockchip.vger.kernel.org Ck9uIDIwMTkvNy8xNiDkuIvljYg3OjU2LCBKYWdhbiBUZWtpIHdyb3RlOgo+IEFkZCBzaW1wbGlm aWVkIGFuZCBtZWFuaW5nZnVsIG1hY3JvIGZvciByYW5rLgo+Cj4gU2lnbmVkLW9mZi1ieTogSmFn YW4gVGVraSA8amFnYW5AYW1hcnVsYXNvbHV0aW9ucy5jb20+Cj4gU2lnbmVkLW9mZi1ieTogWW91 TWluIENoZW4gPGN5bUByb2NrLWNoaXBzLmNvbT4KClJldmlld2VkLWJ5OiBLZXZlciBZYW5nIDxL ZXZlci55YW5nQHJvY2stY2hpcHMuY29tPgoKVGhhbmtzLAogwqAtIEtldmVyCj4gLS0tCj4gICBh cmNoL2FybS9pbmNsdWRlL2FzbS9hcmNoLXJvY2tjaGlwL3NkcmFtX2NvbW1vbi5oIHwgMiArKwo+ ICAgZHJpdmVycy9yYW0vcm9ja2NoaXAvc2RyYW1fcmszMzk5LmMgICAgICAgICAgICAgICB8IDMg Ky0tCj4gICAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK Pgo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9pbmNsdWRlL2FzbS9hcmNoLXJvY2tjaGlwL3NkcmFt X2NvbW1vbi5oIGIvYXJjaC9hcm0vaW5jbHVkZS9hc20vYXJjaC1yb2NrY2hpcC9zZHJhbV9jb21t b24uaAo+IGluZGV4IDJkMGJlOTIwZDkuLmRiOWUzMDEyNmYgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9h cm0vaW5jbHVkZS9hc20vYXJjaC1yb2NrY2hpcC9zZHJhbV9jb21tb24uaAo+ICsrKyBiL2FyY2gv YXJtL2luY2x1ZGUvYXNtL2FyY2gtcm9ja2NoaXAvc2RyYW1fY29tbW9uLmgKPiBAQCAtNzksNiAr NzksOCBAQCBzdHJ1Y3Qgc2RyYW1fYmFzZV9wYXJhbXMgewo+ICAgCQkJCQlTWVNfUkVHX05VTV9D SF9TSElGVCkKPiAgICNkZWZpbmUgU1lTX1JFR19SQU5LX1NISUZUKGNoKQkJKDExICsgKGNoKSAq IDE2KQo+ICAgI2RlZmluZSBTWVNfUkVHX1JBTktfTUFTSwkJMQo+ICsjZGVmaW5lIFNZU19SRUdf RU5DX1JBTksobiwgY2gpCQkoKChuKSAtIFNZU19SRUdfUkFOS19NQVNLKSA8PCBcCj4gKwkJCQkJ IFNZU19SRUdfUkFOS19TSElGVChjaCkpCj4gICAjZGVmaW5lIFNZU19SRUdfQ09MX1NISUZUKGNo KQkJKDkgKyAoY2gpICogMTYpCj4gICAjZGVmaW5lIFNZU19SRUdfQ09MX01BU0sJCTMKPiAgICNk ZWZpbmUgU1lTX1JFR19CS19TSElGVChjaCkJCSg4ICsgKGNoKSAqIDE2KQo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3JhbS9yb2NrY2hpcC9zZHJhbV9yazMzOTkuYyBiL2RyaXZlcnMvcmFtL3JvY2tj aGlwL3NkcmFtX3JrMzM5OS5jCj4gaW5kZXggODc0ZTg5NjM2OS4uYzIzOTBhNzcxYyAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL3JhbS9yb2NrY2hpcC9zZHJhbV9yazMzOTkuYwo+ICsrKyBiL2RyaXZl cnMvcmFtL3JvY2tjaGlwL3NkcmFtX3JrMzM5OS5jCj4gQEAgLTEwOTEsOCArMTA5MSw3IEBAIHN0 YXRpYyB2b2lkIGRyYW1fYWxsX2NvbmZpZyhzdHJ1Y3QgZHJhbV9pbmZvICpkcmFtLAo+ICAgCQlp ZHgrKzsKPiAgIAkJc3lzX3JlZyB8PSBTWVNfUkVHX0VOQ19ST1dfM180KGluZm8tPmNhcF9pbmZv LnJvd18zXzQsIGNoYW5uZWwpOwo+ICAgCQlzeXNfcmVnIHw9IFNZU19SRUdfRU5DX0NISU5GTyhj aGFubmVsKTsKPiAtCQlzeXNfcmVnIHw9IChpbmZvLT5jYXBfaW5mby5yYW5rIC0gMSkgPDwKPiAt CQkJICAgU1lTX1JFR19SQU5LX1NISUZUKGNoYW5uZWwpOwo+ICsJCXN5c19yZWcgfD0gU1lTX1JF R19FTkNfUkFOSyhpbmZvLT5jYXBfaW5mby5yYW5rLCBjaGFubmVsKTsKPiAgIAkJc3lzX3JlZyB8 PSAoaW5mby0+Y2FwX2luZm8uY29sIC0gOSkgPDwKPiAgIAkJCSAgIFNZU19SRUdfQ09MX1NISUZU KGNoYW5uZWwpOwo+ICAgCQlzeXNfcmVnIHw9IGluZm8tPmNhcF9pbmZvLmJrID09IDMgPyAwIDog MSA8PAoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpM aW51eC1yb2NrY2hpcCBtYWlsaW5nIGxpc3QKTGludXgtcm9ja2NoaXBAbGlzdHMuaW5mcmFkZWFk Lm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXJv Y2tjaGlwCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kever Yang Date: Tue, 16 Jul 2019 20:58:50 +0800 Subject: [U-Boot] [PATCH v3 05/57] ram: rk3399: Add rank enc macro In-Reply-To: <20190716115745.12585-6-jagan@amarulasolutions.com> References: <20190716115745.12585-1-jagan@amarulasolutions.com> <20190716115745.12585-6-jagan@amarulasolutions.com> Message-ID: <35e73ae2-8e09-7cc0-60ad-80185ce78293@rock-chips.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de On 2019/7/16 下午7:56, Jagan Teki wrote: > Add simplified and meaningful macro for rank. > > Signed-off-by: Jagan Teki > Signed-off-by: YouMin Chen Reviewed-by: Kever Yang Thanks,  - Kever > --- > arch/arm/include/asm/arch-rockchip/sdram_common.h | 2 ++ > drivers/ram/rockchip/sdram_rk3399.c | 3 +-- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h > index 2d0be920d9..db9e30126f 100644 > --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h > +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h > @@ -79,6 +79,8 @@ struct sdram_base_params { > SYS_REG_NUM_CH_SHIFT) > #define SYS_REG_RANK_SHIFT(ch) (11 + (ch) * 16) > #define SYS_REG_RANK_MASK 1 > +#define SYS_REG_ENC_RANK(n, ch) (((n) - SYS_REG_RANK_MASK) << \ > + SYS_REG_RANK_SHIFT(ch)) > #define SYS_REG_COL_SHIFT(ch) (9 + (ch) * 16) > #define SYS_REG_COL_MASK 3 > #define SYS_REG_BK_SHIFT(ch) (8 + (ch) * 16) > diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c > index 874e896369..c2390a771c 100644 > --- a/drivers/ram/rockchip/sdram_rk3399.c > +++ b/drivers/ram/rockchip/sdram_rk3399.c > @@ -1091,8 +1091,7 @@ static void dram_all_config(struct dram_info *dram, > idx++; > sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel); > sys_reg |= SYS_REG_ENC_CHINFO(channel); > - sys_reg |= (info->cap_info.rank - 1) << > - SYS_REG_RANK_SHIFT(channel); > + sys_reg |= SYS_REG_ENC_RANK(info->cap_info.rank, channel); > sys_reg |= (info->cap_info.col - 9) << > SYS_REG_COL_SHIFT(channel); > sys_reg |= info->cap_info.bk == 3 ? 0 : 1 <<