From patchwork Sat Jun 8 19:53:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 166203 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2157449ili; Sat, 8 Jun 2019 12:53:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjKK7graLeClc9be1+WVFKjlavUJyMa0BAQR6eTJPEjzaMwYg566YvVsdeE1Z4pa5l7XBi X-Received: by 2002:a62:2f87:: with SMTP id v129mr66999233pfv.9.1560023628676; Sat, 08 Jun 2019 12:53:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560023628; cv=none; d=google.com; s=arc-20160816; b=eNEbqYuJUtrGm9urVEtbLRICESedg0J/45EygpE4ywqTFrulgjBOfBoceLkIoCAFJP vXaS0VkcfZ+53893Lq4NhFH1d+KNFOa8Kqm10CIVN5o/NUvoZzrCTb4i9DaVnsNhWZmZ yrsQty07CLjaI2zupt68VDxDfTePOf766zS1M4iUV3ggTOG0iu6/oiLcAfV7og8nl0Lb Ccmkd7f2lWXtaTVw0/IGnyKZJdS8o1xbgsL1wR9DsHuVBcRfa8SOxLKC8htj1D0CaZou L4IMCQlWOD85R3/ukKcHA8ZPUdXkUBQXp6xUve2meWbxxVSYjlR4tZ8F94/NawOe66Na qOXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=83a8MoLcEJiG177cdK9PZRkYinryGGyKPXFycKJosaY=; b=wYposlVIEva0TiSiuoTv0sAEeVDVcVgp8CjtBJBzuGWHwqtKkabIFr86ZL8p6UPvWH hjxEp2Ka9iJTiiKbVM2kb/VbfLIZb45x4sBMB5/6Jm9xyqBCbpeArWqhASOI8cnPNhPt JZEMv7g4MOywl6soBttajEOHS4CpgizXOHsHaBxVRz0REehkz+TiD/oZuXZnHGiVDqh+ yBl1rs7crZt7k397By5f14FxprrA+CYqksrmJwBNeubY2pEfhDXIQDZsiFSyAwQUsbHt uF6nIMbQYsFBZA+AD2cTSpno+lSfUm/k6GIeqIXjsX0T8RJAnwxH8E/9/iCNk6EM7E1k VVDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="WaL7D/rJ"; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j1si5428596pld.399.2019.06.08.12.53.48; Sat, 08 Jun 2019 12:53:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="WaL7D/rJ"; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727518AbfFHTxr (ORCPT + 5 others); Sat, 8 Jun 2019 15:53:47 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:35035 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727519AbfFHTxq (ORCPT ); Sat, 8 Jun 2019 15:53:46 -0400 Received: by mail-pl1-f193.google.com with SMTP id p1so2098362plo.2 for ; Sat, 08 Jun 2019 12:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=83a8MoLcEJiG177cdK9PZRkYinryGGyKPXFycKJosaY=; b=WaL7D/rJC7D65LYWj8NEGexxrwXKI6tDAcL/sPB5lIlAPrDTQq/rJPqVXrqxsuQO/5 s5LYiCX3KAJImUAWhIcUtCQvKmhSvwjvfsYKV7629GpfDEqN+O7gnSyjKWdoEAm3WAoo hSns9rM0WAhBvFiH1yqncIKN+kITrQB9h+g1vrzvS37cz/RZ1eRsgTv+fKqt1rPuz0Jl yMMNINDh8FHhcVGvkcMBO8aXn9Vdv9+QXPkpUwSaYm68BbAVZfpkJr1/Ok9DnQOfYus1 k5IdIjOE86acO7FP3iSBBWsTcFl/0JQaD5GBDET/1PkxBFMMRzSbUSDzslILD3iH7iwD Sp9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=83a8MoLcEJiG177cdK9PZRkYinryGGyKPXFycKJosaY=; b=RHthQGecal7l9r4VFrBDjek/L9fFOOHoZBrBGgKkoy2dYMpAWbQfzgXqEr84EwyrCR k4dX/x3kkUwDXQbbV5HpjKjjwjHUOh9KmA+2tGN6JzpCrolpUTiuoPGYFK7Frcrxo5zI HeMXbHjQopm9bObcHziLVL3jvYO887LPhbsknFpYQYzzGzWcDYBGmm+S0KsSeH5IQkRs GhO52utThT14yp4DxzJKv03ZW67EC4qu9FIWIdAp048+OeS+bdkHXqjzfM5bQKh5Iby9 FGNkHvP1MSVCYZIycfcfDRAIRFgBnJG+qxD/5QvXLzYDP4KR3Os2qYXBy+cNDwYeMpDa 7c2Q== X-Gm-Message-State: APjAAAXw0mdRVGbF5QbaaYHygZ+Tnsz8L5wEXcWhynSGyE4evurc04I/ +Z1upxkGCL632bX6Chmyaf4C X-Received: by 2002:a17:902:bc3:: with SMTP id 61mr4289938plr.324.1560023625983; Sat, 08 Jun 2019 12:53:45 -0700 (PDT) Received: from localhost.localdomain ([2405:204:7185:fba9:ec1e:ad07:23ac:d3ee]) by smtp.gmail.com with ESMTPSA id b35sm6034377pjc.15.2019.06.08.12.53.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Jun 2019 12:53:45 -0700 (PDT) From: Manivannan Sadhasivam To: ulf.hansson@linaro.org, afaerber@suse.de, robh+dt@kernel.org, sboyd@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, thomas.liau@actions-semi.com, linux-actions@lists.infradead.org, linus.walleij@linaro.org, linux-clk@vger.kernel.org, Manivannan Sadhasivam Subject: [PATCH 1/7] clk: actions: Fix factor clk struct member access Date: Sun, 9 Jun 2019 01:23:11 +0530 Message-Id: <20190608195317.6336-2-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190608195317.6336-1-manivannan.sadhasivam@linaro.org> References: <20190608195317.6336-1-manivannan.sadhasivam@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Since the helper "owl_factor_helper_round_rate" is shared between factor and composite clocks, using the factor clk specific helper function like "hw_to_owl_factor" to access its members will create issues when called from composite clk specific code. Hence, pass the "factor_hw" struct pointer directly instead of fetching it using factor clk specific helpers. This issue has been observed when a composite clock like "sd0_clk" tried to call "owl_factor_helper_round_rate" resulting in pointer dereferencing error. Fixes: 4bb78fc9744a ("clk: actions: Add factor clock support") Signed-off-by: Manivannan Sadhasivam --- drivers/clk/actions/owl-factor.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/drivers/clk/actions/owl-factor.c b/drivers/clk/actions/owl-factor.c index 317d4a9e112e..f419dfdd334f 100644 --- a/drivers/clk/actions/owl-factor.c +++ b/drivers/clk/actions/owl-factor.c @@ -64,11 +64,10 @@ static unsigned int _get_table_val(const struct clk_factor_table *table, return val; } -static int clk_val_best(struct clk_hw *hw, unsigned long rate, +static int clk_val_best(const struct owl_factor_hw *factor_hw, + struct clk_hw *hw, unsigned long rate, unsigned long *best_parent_rate) { - struct owl_factor *factor = hw_to_owl_factor(hw); - struct owl_factor_hw *factor_hw = &factor->factor_hw; const struct clk_factor_table *clkt = factor_hw->table; unsigned long parent_rate, try_parent_rate, best = 0, cur_rate; unsigned long parent_rate_saved = *best_parent_rate; @@ -126,7 +125,7 @@ long owl_factor_helper_round_rate(struct owl_clk_common *common, const struct clk_factor_table *clkt = factor_hw->table; unsigned int val, mul = 0, div = 1; - val = clk_val_best(&common->hw, rate, parent_rate); + val = clk_val_best(factor_hw, &common->hw, rate, parent_rate); _get_table_div_mul(clkt, val, &mul, &div); return *parent_rate * mul / div;