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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67078C04A6A for ; Tue, 8 Aug 2023 19:57:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230400AbjHHT5p (ORCPT ); Tue, 8 Aug 2023 15:57:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234643AbjHHT5D (ORCPT ); Tue, 8 Aug 2023 15:57:03 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F8E7E71; Tue, 8 Aug 2023 11:11:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:References:Cc:To:From:Subject:MIME-Version:Date: Message-ID:Sender:Reply-To:Content-ID:Content-Description; bh=IoPG8dlq66hTDTyIAklTpnQJayP5s9nIcHgBjUiFzms=; b=PK3ngQv9XY2IpbxEjhZYvjXt+O J7dw0mhRVV5RJAv+RHwrmcOaei/zzeQWajwiRw+yrKX7QOW1JFFztjBim5wrzs5J+aeWqyR5qCN5c FmMvMB7tsPZXmwPBNcMeaZU9ny/HYhsTjlyUWQjXPJaOxZEFQEf/EdOV66r8r+ujroiYcBEE0SnCd aZgpj7HvvH9CC48v0wDJlYZT78ciEkg6e1mxBpIYcKJUote/5b5d40Ikdlbx3ujA8Dqmrc+nPoTe/ mIgzsLJrGa6Ryz0iQIsUgWnbMhPTAlp3KzdT35PRli7KzQBZBqhPxxTLJdYI3MZt9bTVQLfaliNV6 4oshYdaA==; Received: from [2601:1c2:980:9ec0::2764] by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qTFDZ-001l3h-0Z; Tue, 08 Aug 2023 05:25:17 +0000 Message-ID: <124ef4a7-cc9a-e12c-7903-3ffefc374c65@infradead.org> Date: Mon, 7 Aug 2023 22:25:16 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH v2] SPARC: Fix parport_pc support for 32-bit platforms Content-Language: en-US From: Randy Dunlap To: "Maciej W. Rozycki" , "David S. Miller" , Andrew Morton Cc: Sudip Mukherjee , Sam Ravnborg , sparclinux@vger.kernel.org, linux-parport@lists.infradead.org, linux-kernel@vger.kernel.org References: In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Hi, Is there some way to have this build fix merged? Thanks. On 6/18/23 18:08, Randy Dunlap wrote: > > > On 6/18/23 18:01, Maciej W. Rozycki wrote: >> For 32-bit SPARC platforms PC-style parallel ports are only available as >> PCI options. Adjust accordingly, fixing build errors: >> >> sparc-linux-gnu-ld: drivers/parport/parport_pc.o: in function `ecpp_remove': >> parport_pc.c:(.text+0x8f0): undefined reference to `ebus_dma_irq_enable' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x8f8): undefined reference to `ebus_dma_unregister' >> sparc-linux-gnu-ld: drivers/parport/parport_pc.o: in function `parport_pc_fifo_write_block_dma': >> parport_pc.c:(.text+0x1430): undefined reference to `ebus_dma_enable' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x1444): undefined reference to `ebus_dma_prepare' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x14e4): undefined reference to `ebus_dma_enable' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x14f4): undefined reference to `ebus_dma_request' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x1584): undefined reference to `ebus_dma_enable' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x1594): undefined reference to `ebus_dma_residue' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x1608): undefined reference to `ebus_dma_enable' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x1618): undefined reference to `ebus_dma_residue' >> sparc-linux-gnu-ld: drivers/parport/parport_pc.o: in function `ecpp_probe': >> parport_pc.c:(.text+0x33a0): undefined reference to `ebus_dma_register' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x33b8): undefined reference to `ebus_dma_irq_enable' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x34b0): undefined reference to `ebus_dma_irq_enable' >> sparc-linux-gnu-ld: parport_pc.c:(.text+0x34bc): undefined reference to `ebus_dma_unregister' >> >> Reported-by: Randy Dunlap >> Closes: https://lore.kernel.org/r/20230406160548.25721-1-rdunlap@infradead.org/ >> Signed-off-by: Maciej W. Rozycki >> Fixes: 66bcd06099bb ("parport_pc: Also enable driver for PCI systems") >> Cc: stable@vger.kernel.org # v5.18+ > > Acked-by: Randy Dunlap > Tested-by: Randy Dunlap # build-tested > > Thanks for fixing this. > >> --- > >> Changes from v1: >> >> - Wrap `dma_spin_lock' into HAS_DMA to fix a "'dma_spin_lock' defined but >> not used" warning. I think it's slightly cleaner this way compared to >> wrapping the whole part into CONFIG_SPARC64, as this better reflects the >> structure of the dependencies here. It also follows the structure of >> parport_pc.c, which likewise has `parport_pc_fifo_write_block_dma' put >> into CONFIG_PARPORT_PC_FIFO and then HAS_DMA conditionals. >> >> - Add Reported-by tag. >> --- >> arch/sparc/include/asm/parport.h | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> linux-sparc32-parport-pc.diff >> Index: linux-macro/arch/sparc/include/asm/parport.h >> =================================================================== >> --- linux-macro.orig/arch/sparc/include/asm/parport.h >> +++ linux-macro/arch/sparc/include/asm/parport.h >> @@ -19,9 +19,11 @@ >> * While sparc64 doesn't have an ISA DMA API, we provide something that looks >> * close enough to make parport_pc happy >> */ >> +#ifdef CONFIG_SPARC64 >> #define HAS_DMA >> +#endif >> >> -#ifdef CONFIG_PARPORT_PC_FIFO >> +#if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA) >> static DEFINE_SPINLOCK(dma_spin_lock); >> >> #define claim_dma_lock() \ >> @@ -249,7 +251,8 @@ static struct platform_driver ecpp_drive >> >> static int parport_pc_find_nonpci_ports(int autoirq, int autodma) >> { >> - return platform_driver_register(&ecpp_driver); >> + return (IS_ENABLED(CONFIG_SPARC64) && >> + platform_driver_register(&ecpp_driver)); >> } >> >> #endif /* !(_ASM_SPARC64_PARPORT_H */ > -- ~Randy