From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C330DC3DA60 for ; Thu, 18 Jul 2024 02:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Q8SxWReq1VdvjbxxIozil5DAycCSt43GfCJ+RNd6XVE=; b=kaP/gAC4n9hMiD 7F1wE2VnRTzXRXjGBAElndg9749fdRDf4SWbYu9bzmbJzx1zSJIgckaWit4DgCiRB0ZKxExktcAJY EfAoGGq/DFV627vauu3WXKKcFOaM2PCJNHMjc9Fe/p0XJXDyYLR7fFeZ7YnvT2JqBsz2Kvl7t49KI kh0OSqk3Wdf4RdeG1EcyAWkpX+iyj6mdfUucMjp9FPMgvUUrx4mNXMbJ4l8ulcDqwECt2ym43ITb2 kB+mQiODd4FjX4iXwohWSG+n/e8jaVy8MAbS89mIp09C6a8V2tgrjJuBuBcD3llhd0wL8nRpD+4ky L/foBP45pByxoQbn1Kgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUH4x-0000000FYi7-36ZN; Thu, 18 Jul 2024 02:41:11 +0000 Received: from mx2.sberdevices.ru ([45.89.224.132] helo=mx1.sberdevices.ru) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUH4t-0000000FYhI-2zrf for linux-amlogic@lists.infradead.org; Thu, 18 Jul 2024 02:41:10 +0000 Received: from p-infra-ksmg-sc-msk02.sberdevices.ru (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 8C3AA120003; Thu, 18 Jul 2024 05:40:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 8C3AA120003 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1721270454; bh=o4NAt6NnN8e0tZRdE85vpVhfDEoJPhl2Xlh3U/Xudgk=; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type:From; b=YRAseztTHOKabpUHNngJbF/wafbY/LBqO3Lpgn514cnPZtNHQmxRlZbqTMsyRmG+M pw+29MdzUWSKIaOx6l30gGefyFFweAhwJ9ICUiiYdHmeclURB1Us75DlBFrdZvZhFA /Q+uRfVNy6c5h8Hb5oyukiqEROPDdUuGyKa8iP4h8mlxn0qA4EAWAPcF6iZ9bPvDoU e69pZCTsQkj6wYTH2MI5ja4TQH1Xl35iN3GpOkUyU2MPMm+800MYlOFPJ4DYUDnJkp J/fNzWGP2EypodS6S5907s+jlwFswoXzHvP5PkxjTDNZj12nFrAlaDsTIAHoqAEWyx OCvNQDoY5uIwg== Received: from smtp.sberdevices.ru (p-i-exch-sc-m02.sberdevices.ru [172.16.192.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Thu, 18 Jul 2024 05:40:54 +0300 (MSK) Received: from [172.28.128.6] (100.64.160.123) by p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Thu, 18 Jul 2024 05:40:54 +0300 Message-ID: Date: Thu, 18 Jul 2024 05:39:39 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/8] reset: amlogic: convert driver to regmap To: Jerome Brunet , Philipp Zabel , Stephen Boyd , Neil Armstrong CC: , , References: <20240710162526.2341399-1-jbrunet@baylibre.com> <20240710162526.2341399-2-jbrunet@baylibre.com> Content-Language: en-US From: Jan Dakinevich In-Reply-To: <20240710162526.2341399-2-jbrunet@baylibre.com> X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186569 [Jul 17 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: YVDakinevich@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 24 0.3.24 186c4d603b899ccfd4883d230c53f273b80e467f, {Tracking_smtp_not_equal_from}, {Tracking_from_domain_doesnt_match_to}, smtp.sberdevices.ru:7.1.1,5.0.1;100.64.160.123:7.1.2;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;sberdevices.ru:7.1.1,5.0.1;salutedevices.com:7.1.1, FromAlignment: n, {Tracking_smtp_domain_mismatch}, {Tracking_smtp_domain_2level_mismatch}, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/07/18 01:08:00 #26058129 X-KSMG-AntiVirus-Status: Clean, skipped X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240717_194108_500549_E7C4C478 X-CRM114-Status: GOOD ( 23.99 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On 7/10/24 19:25, Jerome Brunet wrote: > To allow using the same driver for the main reset controller and the > auxiliary ones embedded in the clock controllers, convert the > the Amlogic reset driver to regmap. > > Signed-off-by: Jerome Brunet > --- > drivers/reset/reset-meson.c | 80 ++++++++++++++++++++----------------- > 1 file changed, 44 insertions(+), 36 deletions(-) > > diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c > index f78be97898bc..8f3d6e9df235 100644 > --- a/drivers/reset/reset-meson.c > +++ b/drivers/reset/reset-meson.c > @@ -11,36 +11,44 @@ > #include > #include > #include > +#include > #include > #include > #include > > -#define BITS_PER_REG 32 > - > struct meson_reset_param { > int reg_count; > int level_offset; > }; > > struct meson_reset { > - void __iomem *reg_base; > const struct meson_reset_param *param; > struct reset_controller_dev rcdev; > - spinlock_t lock; > + struct regmap *map; > }; > > +static void meson_reset_offset_and_bit(struct meson_reset *data, > + unsigned long id, > + unsigned int *offset, > + unsigned int *bit) > +{ > + unsigned int stride = regmap_get_reg_stride(data->map); > + > + *offset = (id / (stride * BITS_PER_BYTE)) * stride; > + *bit = id % (stride * BITS_PER_BYTE); > +} > + > static int meson_reset_reset(struct reset_controller_dev *rcdev, > - unsigned long id) > + unsigned long id) > { > struct meson_reset *data = > container_of(rcdev, struct meson_reset, rcdev); > - unsigned int bank = id / BITS_PER_REG; > - unsigned int offset = id % BITS_PER_REG; > - void __iomem *reg_addr = data->reg_base + (bank << 2); > + unsigned int offset, bit; > > - writel(BIT(offset), reg_addr); > + meson_reset_offset_and_bit(data, id, &offset, &bit); > > - return 0; > + return regmap_update_bits(data->map, offset, > + BIT(bit), BIT(bit)); regmap_update_bits() is not equal to writel(), I suppose regmap_write() should be here. I'm still under testing, but I see unexpected behavior on A1 SoC: [ 1.482446] Call trace: [ 1.484860] dump_backtrace+0x94/0xec [ 1.488482] show_stack+0x18/0x24 [ 1.491754] dump_stack_lvl+0x78/0x90 [ 1.495377] dump_stack+0x18/0x24 [ 1.498654] __report_bad_irq+0x38/0xe4 [ 1.502453] note_interrupt+0x324/0x374 [ 1.506244] handle_irq_event+0x9c/0xac [ 1.510039] handle_fasteoi_irq+0xa4/0x238 [ 1.514093] generic_handle_domain_irq+0x2c/0x44 [ 1.518664] gic_handle_irq+0x40/0xc4 [ 1.522287] call_on_irq_stack+0x24/0x4c [ 1.526168] do_interrupt_handler+0x80/0x84 [ 1.530308] el1_interrupt+0x34/0x68 [ 1.533844] el1h_64_irq_handler+0x18/0x24 [ 1.537898] el1h_64_irq+0x64/0x68 [ 1.541262] default_idle_call+0x28/0x3c [ 1.545143] do_idle+0x208/0x260 [ 1.548334] cpu_startup_entry+0x38/0x3c [ 1.552220] kernel_init+0x0/0x1dc [ 1.555579] start_kernel+0x5ac/0x6f0 [ 1.559206] __primary_switched+0x80/0x88 and using of regmap_write() (apparently) fixes it. > } > > static int meson_reset_level(struct reset_controller_dev *rcdev, > @@ -48,25 +56,13 @@ static int meson_reset_level(struct reset_controller_dev *rcdev, > { > struct meson_reset *data = > container_of(rcdev, struct meson_reset, rcdev); > - unsigned int bank = id / BITS_PER_REG; > - unsigned int offset = id % BITS_PER_REG; > - void __iomem *reg_addr; > - unsigned long flags; > - u32 reg; > + unsigned int offset, bit; > > - reg_addr = data->reg_base + data->param->level_offset + (bank << 2); > + meson_reset_offset_and_bit(data, id, &offset, &bit); > + offset += data->param->level_offset; > > - spin_lock_irqsave(&data->lock, flags); > - > - reg = readl(reg_addr); > - if (assert) > - writel(reg & ~BIT(offset), reg_addr); > - else > - writel(reg | BIT(offset), reg_addr); > - > - spin_unlock_irqrestore(&data->lock, flags); > - > - return 0; > + return regmap_update_bits(data->map, offset, > + BIT(bit), assert ? 0 : BIT(bit)); > } > > static int meson_reset_assert(struct reset_controller_dev *rcdev, > @@ -113,30 +109,42 @@ static const struct of_device_id meson_reset_dt_ids[] = { > }; > MODULE_DEVICE_TABLE(of, meson_reset_dt_ids); > > +static const struct regmap_config regmap_config = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > static int meson_reset_probe(struct platform_device *pdev) > { > + struct device *dev = &pdev->dev; > struct meson_reset *data; > + void __iomem *base; > > - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > if (!data) > return -ENOMEM; > > - data->reg_base = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(data->reg_base)) > - return PTR_ERR(data->reg_base); > + base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(base)) > + return PTR_ERR(base); > > - data->param = of_device_get_match_data(&pdev->dev); > + data->param = of_device_get_match_data(dev); > if (!data->param) > return -ENODEV; > > - spin_lock_init(&data->lock); > + data->map = devm_regmap_init_mmio(dev, base, ®map_config); > + if (IS_ERR(data->map)) > + return dev_err_probe(dev, PTR_ERR(data->map), > + "can't init regmap mmio region\n"); > > data->rcdev.owner = THIS_MODULE; > - data->rcdev.nr_resets = data->param->reg_count * BITS_PER_REG; > + data->rcdev.nr_resets = data->param->reg_count * BITS_PER_BYTE > + * regmap_config.reg_stride; > data->rcdev.ops = &meson_reset_ops; > - data->rcdev.of_node = pdev->dev.of_node; > + data->rcdev.of_node = dev->of_node; > > - return devm_reset_controller_register(&pdev->dev, &data->rcdev); > + return devm_reset_controller_register(dev, &data->rcdev); > } > > static struct platform_driver meson_reset_driver = { -- Best regards Jan Dakinevich _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic