From patchwork Fri May 24 18:26:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13673534 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 69B36C25B74 for ; Fri, 24 May 2024 18:30:46 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=erHxXKs5T/dVngGQRUV+pTO5fFZq/fiMa7cyYNhIBeU=; b=LZ2Hdi3/wtIjFC 563nWZz14IyyuWiIsfRGhD7foDsAR9yK2uI2x+0khcg1ydhgoanrHNpb1GYdKYiiGfbrGiKssXJjk 8+JGfF8ViCbk5wXXUNlbB4PzvFb+yeNcmt9Ve/qKm79XOxqk00l/D3+NZOuNUHTLsVcfL5M8FNEie hefV6o1n2I7TU4OWvdv6BAkget+yTimGHk2YbJ/u8UWOWKymcUbHo7/l8FDUzNDNKSecsvnq9rSkM al1cCSn4ydHD1/fTzOhJiSAHjPvW7zhYjujlWu4Pj0EFamYtHt7C2SdA/+2eX9tw9iGZeCmGD6OzN hvgYAeGFUFXDlc6Mbtxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZgb-00000009ay2-0zh8; Fri, 24 May 2024 18:30:37 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZeG-00000009ZL5-1FUF for linux-arm-kernel@bombadil.infradead.org; Fri, 24 May 2024 18:28:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=JtSsjB9R4+UVIqScRuc1I4bk33cfKERDT5iPQWCGPm4=; b=gKHVZToPhe8aBDBx7qAE0c0p3V Uz5LLUyBLfWcmiVFWmZR+zqZwoOooSQH0SXme1gyCFN9donZmJsIEVMjRSKUsIEVwgmuuGxaeYN/Z 5kezbO7lcryZMsMzXl9zG4Tfo8TghBiQOtUNIHqvLj9b01LFNZNPvYP8WSrlFMHXG6AI4c0N21Xn/ Gz6LWmmjQFTd3Y4eWE/BZkwC2jY6gdzDXE1/LWr3NJr24d/GKz3CAt+lbKy/99PEc9lcAsZJoSa8T 65mqaCa+NYfjR0XiKgJoaflIP77hBBxqmurnkhjPnznazbMbyYh2EhkoHNXTpUq4VUj8J6LG9me8n A3sOF0EA==; Received: from mail-lj1-x262.google.com ([2a00:1450:4864:20::262]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZe6-00000009vJH-1zPm for linux-arm-kernel@lists.infradead.org; Fri, 24 May 2024 18:28:10 +0000 Received: by mail-lj1-x262.google.com with SMTP id 38308e7fff4ca-2e964acff1aso888531fa.0 for ; Fri, 24 May 2024 11:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1716575279; x=1717180079; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JtSsjB9R4+UVIqScRuc1I4bk33cfKERDT5iPQWCGPm4=; b=V8t7GbauPw8yNb0ypdAhc6xRuWTN2qXhgaa48vjZrbSbRJciMbN4XrxjpIPLWe3GA9 Pe7Zm3pDkiIaZNcoQV7OBsUONVng13Z6lUS79SHKeyIrgK0hLLxalf337WdMAAC8BnGC XFDxihvlQI5mfFK2tfO0yq8suFOOKY02KLEsySc2ppshxB7kdC2ZvPOgR9CWsVP5gAjK vYNycop8b+f7/ekfhIcM3YQunfmHIw0UOr9/L5BhrW4snmNPiJHeh0r7n0SIPuAC060x u6EZLLy8/zBdXnQ/bOfkJdxncR9bOLYLCmiGYrTpAo1+g4diTDyvch7yXARLcnDY3LtT o+Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716575279; x=1717180079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JtSsjB9R4+UVIqScRuc1I4bk33cfKERDT5iPQWCGPm4=; b=ZURdOPpB4zIisDkxcAtYCHl60GabxzunrwveygmER8zDCbYtBiIwJjTDZ/WRJ/PcUy W7PerGca9k1jlLkvO7C89pUQdGAdtaY7PRePjtSSyH++6+715NCtSVDAfXYsE+eWz0X9 UiqjJqBORJpMhBOkYJDIKrIEBB5rWGuUXKbjeNcgmMdZHdVuhr+CzrBIgHw+2x92VqMy xt4nlPhlm739nSyUMCpMVt9j6NY57aktKw7ici8f+6Y4Spo4axp36H4P1l8meMK0g/kC q6QK++hoW1P7/jAjSh/0Elxb8aKm7DPmqQSQBTetQgkweOlr2eQghZKmYn6r0OJaKP10 jXew== X-Forwarded-Encrypted: i=1; AJvYcCXhsXp8LBOKSeIj4MiZM8dzHXK5QrOgKLZOLB5rvyFUEXPIbxE0/muMoHsVtnXCsyxn9JWFZXhsrxRD3ywdZo801oJMGw5txgdAK+c6LDCuh0rmXWM= X-Gm-Message-State: AOJu0Yz2Zk5prwXMaK+6Hxpwefd5MG6KYd+uWXAvvQ6qIiwdeIr6Bk93 cTNZHls/efFxu/6+DSWFjCobXSarNyVJ8uBRDqQOM3+kqfQt7Y0chOq11mAXSByW+uXgAxh9Alg P6XckT7Be0duKN5xXIoEJNSSm7fAf7MQs X-Google-Smtp-Source: AGHT+IEUZDsi7SCR4IVByAOz4hmEEdc/AaRCJ/JoMT6C0FVxhy9anVd20JxEW5NHN8g2XEYbzyFyk0QQFB+O X-Received: by 2002:a2e:9c8f:0:b0:2e6:f59e:226f with SMTP id 38308e7fff4ca-2e95b0bce90mr19539971fa.5.1716575279453; Fri, 24 May 2024 11:27:59 -0700 (PDT) Received: from raspberrypi.com ([188.39.149.98]) by smtp-relay.gmail.com with ESMTPS id 38308e7fff4ca-2e95be01800sm348091fa.53.2024.05.24.11.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 11:27:59 -0700 (PDT) X-Relaying-Domain: raspberrypi.com From: Dave Stevenson To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Vinod Koul , Maxime Ripard , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Ulf Hansson , Mark Brown , Christoph Hellwig , Marek Szyprowski , Robin Murphy , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Vladimir Murzin , Phil Elwell , Stefan Wahren , Serge Semin Cc: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mmc@vger.kernel.org, linux-spi@vger.kernel.org, iommu@lists.linux.dev, linux-sound@vger.kernel.org, Dave Stevenson Subject: [PATCH 14/18] mmc: bcm2835: Use phys addresses for slave DMA config Date: Fri, 24 May 2024 19:26:58 +0100 Message-Id: <20240524182702.1317935-15-dave.stevenson@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> References: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240524_192804_172457_5E1EFAA4 X-CRM114-Status: GOOD ( 17.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Phil Elwell Contrary to what struct snd_dmaengine_dai_dma_data suggests, the configuration of addresses of DMA slave interfaces should be done in CPU physical addresses. Signed-off-by: Phil Elwell Signed-off-by: Dave Stevenson --- drivers/mmc/host/bcm2835.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 35d8fdea668b..746a60fac0f0 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -1347,8 +1346,8 @@ static int bcm2835_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct clk *clk; struct bcm2835_host *host; + struct resource *iomem; struct mmc_host *mmc; - const __be32 *regaddr_p; int ret; dev_dbg(dev, "%s\n", __func__); @@ -1361,23 +1360,13 @@ static int bcm2835_probe(struct platform_device *pdev) host->pdev = pdev; spin_lock_init(&host->lock); - host->ioaddr = devm_platform_ioremap_resource(pdev, 0); + host->ioaddr = devm_platform_get_and_ioremap_resource(pdev, 0, &iomem); if (IS_ERR(host->ioaddr)) { ret = PTR_ERR(host->ioaddr); goto err; } - /* Parse OF address directly to get the physical address for - * DMA to our registers. - */ - regaddr_p = of_get_address(pdev->dev.of_node, 0, NULL, NULL); - if (!regaddr_p) { - dev_err(dev, "Can't get phys address\n"); - ret = -EINVAL; - goto err; - } - - host->phys_addr = be32_to_cpup(regaddr_p); + host->phys_addr = iomem->start; host->dma_chan = NULL; host->dma_desc = NULL;