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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBEDBC433DB for ; Sat, 19 Sep 2020 22:30:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 58EBD2085B for ; Sat, 19 Sep 2020 22:30:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qpwGXq4j"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kHIQOZ0C" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58EBD2085B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OaPuNQCy5JI9EncoLGnalbK3GXb8CgQv8TUi+MVYq7s=; b=qpwGXq4jNrHYBkBmP2IgiuCvs Mw1wNpKLwQ+cPK8SFycPY76NmLYCGGPosVAmAjeGW14SU1vTdHqUZYYCDIZFpUTD6zQYG+ZQzISxR HqOyXiUNOi1Q1pggA1JC24DuDqCB0CvHXB0qwEaxwdTWo+X8GCGE9JnWITweUGy3g6jBZUx2X4Gak Ma5Y1VXRDyoBAyUB2gSLSwg48yMzqDW9mBuv5qejiE/CbSBwYP2GXawAXz0wnT9OQEZqpdqiva8re oZ4WAsD3fEUL4sjAUIGUWG9N7YM7fpFAr386XltMg8A/3pbWVZ0V7giGkQK8ntDU66wx1KJQv3qI/ nDAOGBY/w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJlMG-0004GT-0S; Sat, 19 Sep 2020 22:29:28 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJlMD-0004G0-2x for linux-arm-kernel@lists.infradead.org; Sat, 19 Sep 2020 22:29:25 +0000 Received: by mail-lj1-x243.google.com with SMTP id n25so8007041ljj.4 for ; Sat, 19 Sep 2020 15:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NKi+wjC6dWzf+Z7xGQjWsEc0rij7x/ja/YI7q4yBabs=; b=kHIQOZ0CB9+LA4FOUvowUp2lKrrUOWcfne+NEfcfXJk0OTupohDxTLR43rdPYnpU5U GicCbI0EvyF77t+uvfFgtPParoW7MY/QP0EkmSsc2ro8g3fNiPcAMdMmRDU9CpFLDQVD o5gGX+mk1OtmrvatXkrMovoRWzxpYSg+jfHCjZsjENQNSzY6KylvlDdh1BRYn/Aa4Czn W2itJWQNQynupCSvO/KbveyopSz6z7xXAn+2LJEjL9Gg2X0HY1P/+AfLFYXXdtIxXOKn msgL17woaTsPj05OK1vNY+w48J+/Uphiyvq6mEPxYaIuguoZ1m1m1EKqjBV7lxcwGW+k ciTQ== 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:mime-version:content-transfer-encoding; bh=NKi+wjC6dWzf+Z7xGQjWsEc0rij7x/ja/YI7q4yBabs=; b=hRFP9fgHeTeg6qPIKZSVEKkE+D2z96tjxlmPa6iub8j5EEq/MxblrjFEWN4iNBVc2t coxhE/w5WbogezSBvqEILA8+y2rpJVuuJIQyZvgpaEYtAFztJtKYanDV3IUF5ALAPb6d xGOKwXGt5hjb6Td1vO9qqAJv4FzXh6xkZWBJeHHC97s2l9YM0OfFCURkX2K7KADNFhvW Hp3d8UC3T4myYKnxBTaKH5TwPWu29Nmf+GOv01fBc0hWVB7fhXNzGtsx/fEUsV7xF1ZY wvsnCfHxhQ5lyXVlKVPEWiRISym7CaQv+EOLl2jov/g74cn45k8b3kSQGT4V48pTyGCh rtcw== X-Gm-Message-State: AOAM5326I7Y7cN7TxcnG4V0mp9oNgiKcepiGjCT1C/hCRT3J01U1mvZU L2QYT6qJ4UiWwxLBo7+Fzxk= X-Google-Smtp-Source: ABdhPJyKClnDWdlUib5KUXzdnN+24azy9IRGBZhTe+irm0IOao3KfXeA08PP2jHuylJgT4MIk5ApWg== X-Received: by 2002:a2e:7806:: with SMTP id t6mr14590542ljc.48.1600554563573; Sat, 19 Sep 2020 15:29:23 -0700 (PDT) Received: from z50.localnet (109241122244.gdansk.vectranet.pl. [109.241.122.244]) by smtp.gmail.com with ESMTPSA id o128sm1435563lfa.126.2020.09.19.15.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Sep 2020 15:29:22 -0700 (PDT) From: Janusz Krzysztofik To: Christoph Hellwig , Tony Lindgren Subject: Re: [PATCH 1/4] ARM/omap1: switch to use dma_direct_set_offset for lbus DMA offsets Date: Sun, 20 Sep 2020 00:29:20 +0200 Message-ID: <2184547.ElGaqSPkdT@z50> In-Reply-To: <20200918054933.GK7101@atomide.com> References: <20200917173229.3311382-1-hch@lst.de> <20200917173229.3311382-2-hch@lst.de> <20200918054933.GK7101@atomide.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200919_182925_173056_58955877 X-CRM114-Status: GOOD ( 33.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aaro Koskinen , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King , iommu@lists.linux-foundation.org, linux-omap@vger.kernel.org, Robin Murphy , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Tony, On Friday, September 18, 2020 7:49:33 A.M. CEST Tony Lindgren wrote: > * Christoph Hellwig [200917 17:37]: > > Switch the omap1510 platform ohci device to use dma_direct_set_offset > > to set the DMA offset instead of using direct hooks into the DMA > > mapping code and remove the now unused hooks. > > Looks nice to me :) I still can't test this probably for few more weeks > though but hopefully Aaro or Janusz (Added to Cc) can test it. Works for me on Amstrad Delta (tested with a USB ethernet adapter). Tested-by: Janusz Krzysztofik Thanks, Janusz > > Regards, > > Tony > > > Signed-off-by: Christoph Hellwig > > --- > > arch/arm/include/asm/dma-direct.h | 18 ------------- > > arch/arm/mach-omap1/include/mach/memory.h | 31 ----------------------- > > arch/arm/mach-omap1/usb.c | 22 ++++++++++++++++ > > 3 files changed, 22 insertions(+), 49 deletions(-) > > > > diff --git a/arch/arm/include/asm/dma-direct.h b/arch/arm/include/asm/dma-direct.h > > index 436544aeb83405..77fcb7ee5ec907 100644 > > --- a/arch/arm/include/asm/dma-direct.h > > +++ b/arch/arm/include/asm/dma-direct.h > > @@ -9,7 +9,6 @@ > > * functions used internally by the DMA-mapping API to provide DMA > > * addresses. They must not be used by drivers. > > */ > > -#ifndef __arch_pfn_to_dma > > static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) > > { > > if (dev && dev->dma_range_map) > > @@ -34,23 +33,6 @@ static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) > > return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); > > } > > > > -#else > > -static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) > > -{ > > - return __arch_pfn_to_dma(dev, pfn); > > -} > > - > > -static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) > > -{ > > - return __arch_dma_to_pfn(dev, addr); > > -} > > - > > -static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) > > -{ > > - return __arch_virt_to_dma(dev, addr); > > -} > > -#endif > > - > > static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) > > { > > unsigned int offset = paddr & ~PAGE_MASK; > > diff --git a/arch/arm/mach-omap1/include/mach/memory.h b/arch/arm/mach-omap1/include/mach/memory.h > > index 1142560e0078f5..36bc0000cb6ab8 100644 > > --- a/arch/arm/mach-omap1/include/mach/memory.h > > +++ b/arch/arm/mach-omap1/include/mach/memory.h > > @@ -14,42 +14,11 @@ > > * OMAP-1510 bus address is translated into a Local Bus address if the > > * OMAP bus type is lbus. We do the address translation based on the > > * device overriding the defaults used in the dma-mapping API. > > - * Note that the is_lbus_device() test is not very efficient on 1510 > > - * because of the strncmp(). > > */ > > -#if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__) > > > > /* > > * OMAP-1510 Local Bus address offset > > */ > > #define OMAP1510_LB_OFFSET UL(0x30000000) > > > > -#define virt_to_lbus(x) ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET) > > -#define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET) > > -#define is_lbus_device(dev) (cpu_is_omap15xx() && dev && (strncmp(dev_name(dev), "ohci", 4) == 0)) > > - > > -#define __arch_pfn_to_dma(dev, pfn) \ > > - ({ dma_addr_t __dma = __pfn_to_phys(pfn); \ > > - if (is_lbus_device(dev)) \ > > - __dma = __dma - PHYS_OFFSET + OMAP1510_LB_OFFSET; \ > > - __dma; }) > > - > > -#define __arch_dma_to_pfn(dev, addr) \ > > - ({ dma_addr_t __dma = addr; \ > > - if (is_lbus_device(dev)) \ > > - __dma += PHYS_OFFSET - OMAP1510_LB_OFFSET; \ > > - __phys_to_pfn(__dma); \ > > - }) > > - > > -#define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ > > - lbus_to_virt(addr) : \ > > - __phys_to_virt(addr)); }) > > - > > -#define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \ > > - (dma_addr_t) (is_lbus_device(dev) ? \ > > - virt_to_lbus(__addr) : \ > > - __virt_to_phys(__addr)); }) > > - > > -#endif /* CONFIG_ARCH_OMAP15XX */ > > - > > #endif > > diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c > > index d8e9bbda8f7bdd..ba8566204ea9f4 100644 > > --- a/arch/arm/mach-omap1/usb.c > > +++ b/arch/arm/mach-omap1/usb.c > > @@ -9,6 +9,7 @@ > > #include > > #include > > #include > > +#include > > #include > > > > #include > > @@ -542,6 +543,25 @@ static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup) > > /* ULPD_APLL_CTRL */ > > #define APLL_NDPLL_SWITCH (1 << 0) > > > > +static int omap_1510_usb_ohci_notifier(struct notifier_block *nb, > > + unsigned long event, void *data) > > +{ > > + struct device *dev = data; > > + > > + if (event != BUS_NOTIFY_ADD_DEVICE) > > + return NOTIFY_DONE; > > + > > + if (strncmp(dev_name(dev), "ohci", 4) == 0 && > > + dma_direct_set_offset(dev, PHYS_OFFSET, OMAP1510_LB_OFFSET, > > + (u64)-1)) > > + WARN_ONCE(1, "failed to set DMA offset\n"); > > + return NOTIFY_OK; > > +} > > + > > +static struct notifier_block omap_1510_usb_ohci_nb = { > > + .notifier_call = omap_1510_usb_ohci_notifier, > > +}; > > + > > static void __init omap_1510_usb_init(struct omap_usb_config *config) > > { > > unsigned int val; > > @@ -600,6 +620,8 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config) > > if (config->register_host) { > > int status; > > > > + bus_register_notifier(&platform_bus_type, > > + &omap_1510_usb_ohci_nb); > > ohci_device.dev.platform_data = config; > > status = platform_device_register(&ohci_device); > > if (status) > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel