Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp292638pxb; Wed, 8 Sep 2021 01:02:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvjnSH7kydlv51c0gNRH42M4kMwbvK6j6CsSTwktpUOZRKHFCdzFIAYekx6b7nAXawIgQv X-Received: by 2002:a17:906:1289:: with SMTP id k9mr2749954ejb.2.1631088154715; Wed, 08 Sep 2021 01:02:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631088154; cv=none; d=google.com; s=arc-20160816; b=GZqxqM15qZ0zErSOXc0d/A3qSQzc5VG30YfAsCCVoEou9fzJheNWd6tqZGnn3TazhO iwXlv6W0iJqwQ+1hsugo/c28ivQxAhhK9+MkD74MUtV2csDfbJiYf+wklvnRtsefAq+2 uUPISLVUnsEjdWxDrsKcjTrQMSoc0c+1oAv8AyL+MHEA4zG/8X8W1vvjqFFQ0DfzYhQh pakceiTCS/UgSzT/z4Q+lRnRPkJVTUiI5f7BsNX8yYsiLTpLEknEL8JRz7myV6WJImYk 8ZSjhiKNWbYlIAiF69SyUkDeTluVboL8YvIUyoGmoOT//hnWdWekgIHZPzgbfymprRMc vvUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :authorized-sender; bh=07ChNIrBbh/eN6JWqLoB3P9bCfBxw85gNfyOBmXaumA=; b=IqJGTwJdhSCt6qAAVdstqY/kQu71rwqp91MZebUUEOvyIIK8sNy1NuyaKOE6P5n4bF UOpzR8+zIvVeBtzO8VRWbxC9vrr3NXvrrEnfyG1WriM/GjyH9eM6LTrr2/sAOUu2BvXG EepvPRzkrBD81a9u7uqPH7MU+bJI8uBIaNn21YCcKwyTIXarB34FJhFbYViou3k6dmkE 8OLVipgK23AnndABztq+M3PnEb+T25KDX58BkztLs7viWiwJFuZKsWbHmPbQtX+6EWIt 9erI/9HKru5dvMPiX4jgV4ckyI2LVBwPlKajjGO5vd05Vj3I/iPnFR+NoPJwh6Ezvy+3 PIyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m9si1383960edc.501.2021.09.08.01.02.10; Wed, 08 Sep 2021 01:02:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345419AbhIHH4F (ORCPT + 99 others); Wed, 8 Sep 2021 03:56:05 -0400 Received: from bin-mail-out-05.binero.net ([195.74.38.228]:38815 "EHLO bin-mail-out-05.binero.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234696AbhIHH4B (ORCPT ); Wed, 8 Sep 2021 03:56:01 -0400 X-Greylist: delayed 370 seconds by postgrey-1.27 at vger.kernel.org; Wed, 08 Sep 2021 03:56:01 EDT X-Halon-ID: 2a06a1c6-1079-11ec-8aa7-005056917f90 Authorized-sender: andreas@gaisler.com Received: from andreas.got.gaisler.com (h-98-128-223-123.na.cust.bahnhof.se [98.128.223.123]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 2a06a1c6-1079-11ec-8aa7-005056917f90; Wed, 08 Sep 2021 09:48:35 +0200 (CEST) From: Andreas Larsson To: David Miller , sparclinux@vger.kernel.org Cc: Christoph Hellwig , Sam Ravnborg , linux-kernel@vger.kernel.org, software@gaisler.com Subject: [PATCH] sparc32: Page align size in arch_dma_alloc Date: Wed, 8 Sep 2021 09:48:22 +0200 Message-Id: <20210908074822.16793-1-andreas@gaisler.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 53b7670e5735 ("sparc: factor the dma coherent mapping into helper") lost the page align for the calls to dma_make_coherent and srmmu_unmapiorange. The latter cannot handle a non page aligned len argument. Signed-off-by: Andreas Larsson --- arch/sparc/kernel/ioport.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 8e1d72a16759..7ceae24b0ca9 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -356,7 +356,9 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs) { - if (!sparc_dma_free_resource(cpu_addr, PAGE_ALIGN(size))) + size = PAGE_ALIGN(size); + + if (!sparc_dma_free_resource(cpu_addr, size)) return; dma_make_coherent(dma_addr, size); -- 2.17.1