From patchwork Tue Aug 1 17:35:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 129437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2878036vqg; Tue, 1 Aug 2023 12:12:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlE6fwzRXeBLLDeZteWX9bHdqzVYlRBDPPIADt6M7nAS02AOlqS+i/KIspL0M3hRGFD1FdTm X-Received: by 2002:a05:6512:344a:b0:4fe:df7:bcf1 with SMTP id j10-20020a056512344a00b004fe0df7bcf1mr2378397lfr.57.1690917156284; Tue, 01 Aug 2023 12:12:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690917156; cv=none; d=google.com; s=arc-20160816; b=Pn9oi5B9bReAK4FeqJHvihGC/VOnPjoVzE1VxmWJhR10TrPkc4yCDNX1a+xMkXrj4D o7hUQkpR1GHT4+1mdfD9q+0ox8V6NdraLnp8HVhujQm0wiKlxfkfH2blz8KB8zn9WCLQ t83QwPT4MMT36SCDEEreOmmCsLLBTN3mFNBWt6ItxRTJ2+Iwwf9bbOuwKR6X2nVGcSWj 0L/KAOuHhqXQ0uujBJOHfgiY4Y+5yujA0TKv6JQ5uhZPyoYzrjaU/yVq1MTKlHiFq0Fu Zz2nwdT3klghkQaH7qhHxFAf5JfKx6t7K3tCX2M6twHuPxpHBbwaw8hbyHQkdaa/QP4F lkpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OiAddSX0ELWK4uOqDiiBlj4EDsp11VIp0UdNjLcR73Q=; fh=5HI8xClRuvQgfwG5XWQ/y0OxSazXgHJWeupfevDts70=; b=op5XEEdJ6tC/B7TeXh//8W/e+PJ9xjE9BD2iCGwXAVZA98n5+jx9OSpI8b4khwe25+ sCbxjRj6RvBsev3Z7v8ob2cCu+KvDITukRYeX0IO9MOfH5mOPNHlfKc8WhnWPMAO8M+y pzCtRQe9CoNKDLH1kakAJsHzHEGS1qTj+4esWC+jNkdm1EOJElF4QqNhtisjtthIiFcW B0w76/YnsA6oFmzZng1prWKVxs4iDIMRzwgU3I8G6XsQ+9r8WGA7GP2gYrhOTvEz0Tct pN9in6ZVnVSdXK2Yq5RegJ9ApMKNHlqXKyODcPzy1XDFcfeZy+3aJG01SLxQ9z43HvXs rxjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="hwIKMU/5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w7-20020aa7d287000000b00522be1235bcsi4143720edq.544.2023.08.01.12.12.12; Tue, 01 Aug 2023 12:12:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="hwIKMU/5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233856AbjHARgf (ORCPT + 99 others); Tue, 1 Aug 2023 13:36:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbjHARgb (ORCPT ); Tue, 1 Aug 2023 13:36:31 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1984BE53; Tue, 1 Aug 2023 10:36:31 -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: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=OiAddSX0ELWK4uOqDiiBlj4EDsp11VIp0UdNjLcR73Q=; b=hwIKMU/53Hdyq9e37shW+WfWm4 qaVPuqT1yfAVhRMp4WRUuQ6c0NF9yNps2UuWjRgqD5mX9VrTRO2bVtiaL/RdjsFO9bIvJ0hBtXDBD RSZOayCNmjTcr339Kvr5ruFS6jIVvPH7HlMYWqLRxEq5nQ6URnx50+8CafMEfC2RfdoPaNsd4xs8a mhfP4rYdElxPCU6VSvKdr8RuaKWgxQ1Nrm+SWHt+66UvHZ8+SoqfWyQugiERZsSm+ihytZYwjEo30 y1fnUl8hna1Dh+0hJLe3PBC6X2+MJaOZ3OJtDHZ7rApIr2nYeZFUFvhp3D0LnoTWS73bgHLlGr01O v9vAxxSg==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qQtHs-002w4G-03; Tue, 01 Aug 2023 17:36:00 +0000 From: Christoph Hellwig To: Luis Chamberlain , Greg Kroah-Hartman , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ulf Hansson , Manuel Lauss , Yangbo Lu , Joshua Kinard Cc: Daniel Vetter , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org (open list), linux-mmc@vger.kernel.org, netdev@vger.kernel.org, linux-rtc@vger.kernel.org, linux-modules@vger.kernel.org Subject: [PATCH 1/5] ARM: pxa: remove use of symbol_get() Date: Tue, 1 Aug 2023 19:35:40 +0200 Message-Id: <20230801173544.1929519-2-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230801173544.1929519-1-hch@lst.de> References: <20230801173544.1929519-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773055147950006111 X-GMAIL-MSGID: 1773055147950006111 From: Arnd Bergmann The spitz board file uses the obscure symbol_get() function to optionally call a function from sharpsl_pm.c if that is built. However, the two files are always built together these days, and have been for a long time, so this can be changed to a normal function call. Link: https://lore.kernel.org/lkml/20230731162639.GA9441@lst.de/ Signed-off-by: Arnd Bergmann Signed-off-by: Christoph Hellwig --- arch/arm/mach-pxa/sharpsl_pm.c | 2 -- arch/arm/mach-pxa/spitz.c | 14 +------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index d29bdcd5270e0f..72fa2e3fd35318 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c @@ -216,8 +216,6 @@ void sharpsl_battery_kick(void) { schedule_delayed_work(&sharpsl_bat, msecs_to_jiffies(125)); } -EXPORT_SYMBOL(sharpsl_battery_kick); - static void sharpsl_battery_thread(struct work_struct *private_) { diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index d01ea54b0b7820..cc691b199429ca 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -9,7 +9,6 @@ */ #include -#include /* symbol_get ; symbol_put */ #include #include #include @@ -518,17 +517,6 @@ static struct gpiod_lookup_table spitz_ads7846_gpio_table = { }, }; -static void spitz_bl_kick_battery(void) -{ - void (*kick_batt)(void); - - kick_batt = symbol_get(sharpsl_battery_kick); - if (kick_batt) { - kick_batt(); - symbol_put(sharpsl_battery_kick); - } -} - static struct gpiod_lookup_table spitz_lcdcon_gpio_table = { .dev_id = "spi2.1", .table = { @@ -556,7 +544,7 @@ static struct corgi_lcd_platform_data spitz_lcdcon_info = { .max_intensity = 0x2f, .default_intensity = 0x1f, .limit_mask = 0x0b, - .kick_battery = spitz_bl_kick_battery, + .kick_battery = sharpsl_battery_kick, }; static struct spi_board_info spitz_spi_devices[] = { From patchwork Tue Aug 1 17:35:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 129427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2868368vqg; Tue, 1 Aug 2023 11:56:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlGi4sAs/LCEE/Wpyb+94YTwpfdSvEnSWf41sKLfFTDIUcwE9leq4kyQoomgwwPPzjEjIOq+ X-Received: by 2002:a17:906:1d6:b0:973:ff8d:2a46 with SMTP id 22-20020a17090601d600b00973ff8d2a46mr3504631ejj.3.1690916184161; Tue, 01 Aug 2023 11:56:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690916184; cv=none; d=google.com; s=arc-20160816; b=cKt1LZXjP4yxYEzPFmaSD4laVVw7xWx+iUD+fGk2w+m+3OTmBAnyMf+xtj+9z6/IAL BZk4Q2nm3zGg7htsFcwNggUyZWbM0Xiq4M2dBDk6iqgMpJxQ9Je+3Ih7sN28l8xlqpdS GgV5S/I+Zy+ciLu+HbIliLkWgx9hay9hBx9M26hEWv58e8Owm68QTsV4dyxE9Pf0eHgQ yExnUcqBGk+v3za2vjWCtLaYfhQvzr9q13W3QonNNYs/eJT8OB/XDVuUjmpV/VkJ+Qdw 8TmfcLvYVHqfqQMV9XiLUbn6HFDvXVjGtD1lcSEDtFKGaqHCyoLvYiWfRAGB+G/MxT9s cgag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TBYKzlSrBqkJCEZA7FG895w30+HjQzxC2X3fqEBml8c=; fh=5HI8xClRuvQgfwG5XWQ/y0OxSazXgHJWeupfevDts70=; b=dhu5w7TIY4cqjgBCbdR+VAA2rwW/2czddOP1gAqv5rzM2Xhw7PjZXt0mG0mDoCkbiD f7EekvXvrM7kx/aaVykQvExK9AMD7dRkVcPRH3ns9668wmX7kWJNU7NCS/J18FiZoLjX 9ABWUZZfayOhy5pNb03nHDoVatMA6goxiE6AhSGHbpDzuFOrBB12lMLmOA0ob8iBc0m+ UCwu2T8UrzjC8jangZFtOyj/8zV1trRdip5gxeqJEVrdX5wBGdj6seCO0JY6YgbFz6Tc sXrWRryqV2RnSyM1wYtYxkKsx3OlAfkdn7/kz7/MT+KzbaM/lzQhUVhiAx7cDeekGsNY enIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="1xK/nDZZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a12-20020a170906684c00b00992a91b422fsi8841081ejs.41.2023.08.01.11.55.59; Tue, 01 Aug 2023 11:56:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="1xK/nDZZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234234AbjHARgh (ORCPT + 99 others); Tue, 1 Aug 2023 13:36:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233753AbjHARgd (ORCPT ); Tue, 1 Aug 2023 13:36:33 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB1FA10EA; Tue, 1 Aug 2023 10:36:32 -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: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=TBYKzlSrBqkJCEZA7FG895w30+HjQzxC2X3fqEBml8c=; b=1xK/nDZZ1R8EhDL4BBBQxTBjZE bpv6Sfx9oUYKKZ8Inc/znia9KHx+Zodbgr8BrzaFnDBv18+H1bw43OZmZMM4SoxU5gwevclaBV9yj IAHYf6kbwKZnsJaK8XHYROIRFfGKqbXtezYGspkR2wn8AKkTTRLe+fRvWCKFEsdPazAPUfjLRbd+o M7jg0/j7YRlLpo09Y5vWrW3itfs10lNc9F6Kb+SyrS7sOZUrEet1FNhNi4vLGXxkMKrHth0KToTBc p965o8sftKKd8LiZPCt+weipBBXrEtZX7v/Q8lT0uFHSCZ268TEjmw7ZP0rBDH73tLAs5vqBzBtrQ na0opyMA==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qQtHv-002w4Z-1b; Tue, 01 Aug 2023 17:36:19 +0000 From: Christoph Hellwig To: Luis Chamberlain , Greg Kroah-Hartman , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ulf Hansson , Manuel Lauss , Yangbo Lu , Joshua Kinard Cc: Daniel Vetter , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org (open list), linux-mmc@vger.kernel.org, netdev@vger.kernel.org, linux-rtc@vger.kernel.org, linux-modules@vger.kernel.org Subject: [PATCH 2/5] mmc: au1xmmc: force non-modular build and remove symbol_get usage Date: Tue, 1 Aug 2023 19:35:41 +0200 Message-Id: <20230801173544.1929519-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230801173544.1929519-1-hch@lst.de> References: <20230801173544.1929519-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773054128953956255 X-GMAIL-MSGID: 1773054128953956255 au1xmmc is split somewhat awkwardly into the main mmc subsystem driver, and callbacks in platform_data that sit under arch/mips/ and are always built in. The latter than call mmc_detect_change through symbol_get. Remove the use of symbol_get by requiring the driver to be built in. In the future the interrupt handlers for card insert/eject detection should probably be moved into the main driver, and which point it can be built modular again. Signed-off-by: Christoph Hellwig Acked-by: Manuel Lauss Reviewed-by: Arnd Bergmann Acked-by: Ulf Hansson --- arch/mips/alchemy/devboards/db1000.c | 8 +------- arch/mips/alchemy/devboards/db1200.c | 19 ++----------------- arch/mips/alchemy/devboards/db1300.c | 10 +--------- drivers/mmc/host/Kconfig | 4 ++-- 4 files changed, 6 insertions(+), 35 deletions(-) diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c index 79d66faa84828d..012da042d0a4f7 100644 --- a/arch/mips/alchemy/devboards/db1000.c +++ b/arch/mips/alchemy/devboards/db1000.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -167,12 +166,7 @@ static struct platform_device db1x00_audio_dev = { static irqreturn_t db1100_mmc_cd(int irq, void *ptr) { - void (*mmc_cd)(struct mmc_host *, unsigned long); - /* link against CONFIG_MMC=m */ - mmc_cd = symbol_get(mmc_detect_change); - mmc_cd(ptr, msecs_to_jiffies(500)); - symbol_put(mmc_detect_change); - + mmc_detect_change(ptr, msecs_to_jiffies(500)); return IRQ_HANDLED; } diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c index 1864eb935ca57f..76080c71a2a7b6 100644 --- a/arch/mips/alchemy/devboards/db1200.c +++ b/arch/mips/alchemy/devboards/db1200.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -340,14 +339,7 @@ static irqreturn_t db1200_mmc_cd(int irq, void *ptr) static irqreturn_t db1200_mmc_cdfn(int irq, void *ptr) { - void (*mmc_cd)(struct mmc_host *, unsigned long); - - /* link against CONFIG_MMC=m */ - mmc_cd = symbol_get(mmc_detect_change); - if (mmc_cd) { - mmc_cd(ptr, msecs_to_jiffies(200)); - symbol_put(mmc_detect_change); - } + mmc_detect_change(ptr, msecs_to_jiffies(200)); msleep(100); /* debounce */ if (irq == DB1200_SD0_INSERT_INT) @@ -431,14 +423,7 @@ static irqreturn_t pb1200_mmc1_cd(int irq, void *ptr) static irqreturn_t pb1200_mmc1_cdfn(int irq, void *ptr) { - void (*mmc_cd)(struct mmc_host *, unsigned long); - - /* link against CONFIG_MMC=m */ - mmc_cd = symbol_get(mmc_detect_change); - if (mmc_cd) { - mmc_cd(ptr, msecs_to_jiffies(200)); - symbol_put(mmc_detect_change); - } + mmc_detect_change(ptr, msecs_to_jiffies(200)); msleep(100); /* debounce */ if (irq == PB1200_SD1_INSERT_INT) diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c index e70e529ddd914d..ff61901329c626 100644 --- a/arch/mips/alchemy/devboards/db1300.c +++ b/arch/mips/alchemy/devboards/db1300.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -459,14 +458,7 @@ static irqreturn_t db1300_mmc_cd(int irq, void *ptr) static irqreturn_t db1300_mmc_cdfn(int irq, void *ptr) { - void (*mmc_cd)(struct mmc_host *, unsigned long); - - /* link against CONFIG_MMC=m. We can only be called once MMC core has - * initialized the controller, so symbol_get() should always succeed. - */ - mmc_cd = symbol_get(mmc_detect_change); - mmc_cd(ptr, msecs_to_jiffies(200)); - symbol_put(mmc_detect_change); + mmc_detect_change(ptr, msecs_to_jiffies(200)); msleep(100); /* debounce */ if (irq == DB1300_SD1_INSERT_INT) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 159a3e9490aed8..f7afd179dd10bf 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -526,11 +526,11 @@ config MMC_ALCOR of Alcor Micro PCI-E card reader config MMC_AU1X - tristate "Alchemy AU1XX0 MMC Card Interface support" + bool "Alchemy AU1XX0 MMC Card Interface support" depends on MIPS_ALCHEMY help This selects the AMD Alchemy(R) Multimedia card interface. - If you have a Alchemy platform with a MMC slot, say Y or M here. + If you have a Alchemy platform with a MMC slot, say Y here. If unsure, say N. From patchwork Tue Aug 1 17:35:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 129432 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2875399vqg; Tue, 1 Aug 2023 12:07:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlH3S4TCLFY0dl8jpYGTcRIEKwKdUzg8CdeYhsRZKdI8+34NdfQq+RatpBlu3lPnDsAgt8BR X-Received: by 2002:a17:906:5399:b0:994:1eb4:6898 with SMTP id g25-20020a170906539900b009941eb46898mr3323204ejo.9.1690916874551; Tue, 01 Aug 2023 12:07:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690916874; cv=none; d=google.com; s=arc-20160816; b=E4Jiqteg2yBR3KM1D1JdoHzkNjnRmjfeW+gMov5gC33RyjoZGBUtUhLXUn2xTtyxeO ns936JX5LNS644gw58zzegfTggDROzz0SAeiBS2GN52WwPZ2yi+2F84WRUeL1UqZGmvV kUD2Qdy9m3obBzKgsLkL0L4gNsjPPnQHbhOYs4ne0kIKRbXCAk8K1r1jjx6fkYynri3Y u6BkoHoWCpkxypEQFh0oXkmtf/x5Yex42DHyYqBNp+WeNL8umTYKyloGiPegndOPPDGa odVegI8y1UOZJzPGb8hDPePwb9xn7zaUvD5m5GTy/pHMKJaiFgHqmp+V/3GmWyhMo38G M2gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vUhd/MVWBy56mOzm+K4tEHruRxLdGUU1nmktMG4E7ys=; fh=elFsBTEuuNkTJx1yMxVuAGYeFbNWjp898LQUyRQZ4Xw=; b=QlER71UHB/rTm1dwlyPK/lojRO7CArPpxfS1wVh2gyM2KihWg1pDQY6IVvzxoZUSV3 KWCzfnMXCswHr7CDakga7jm1McsvjMaNJMRgcqCJ4w/E230lU9sgPjxPE0LhGXMZwHEL i5PbkxEE4CYW0B8MNBcMT5JJFgvKG2itxdXOtEfzrWahwL2WvMeCh+N4V2rCTLH9zmpS dhTjdoULr6DVvVioCn1rGvrWLoFS1UqCYLaFyOgC1+/05WZt3OHxzJSDngnzIRreN3Hq EwIZakUSJNBZY7dXdgEwkha8eaKQgYgacTG/Id0osLOlqAL7gSRNUEMOC1I/rWDferkM x0Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=3jpBWUAY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o5-20020a17090608c500b00986486cb8d6si9032773eje.705.2023.08.01.12.07.29; Tue, 01 Aug 2023 12:07:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=3jpBWUAY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234629AbjHARgm (ORCPT + 99 others); Tue, 1 Aug 2023 13:36:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234088AbjHARgg (ORCPT ); Tue, 1 Aug 2023 13:36:36 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCDEC1704; Tue, 1 Aug 2023 10:36:35 -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: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=vUhd/MVWBy56mOzm+K4tEHruRxLdGUU1nmktMG4E7ys=; b=3jpBWUAY1W4VKBP3fI5r02yhz4 FZFvQ4+kZJf1DmoUaU5luH70z6V9KlI5F3yRpccnPplOIBo6jNhgr7jGHc3Z7S/6vPqqF03kbWfiq olRVxLYS3U2UvX64FlDxxgf/DJp33mEK2IjCQ4nFMsknLSnGZZPLFVTYU22YoKHZRtGV9S890IBMR EsY/4fzZBC5AMCGbTVU7GmABULuvOkYiMAojqD7nzm7ZQTNZZzlu+WlgmbF/o4e364diJ4AkhgZ/1 8PTOwkYGHXUASPhff2MkoYbzYnv48mj8KFUKyTEP3BichErJaRNt6Ae6T1EZG6j91wN84ZIxUwgqi 7EcT+/yQ==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qQtIF-002w65-0q; Tue, 01 Aug 2023 17:36:23 +0000 From: Christoph Hellwig To: Luis Chamberlain , Greg Kroah-Hartman , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ulf Hansson , Manuel Lauss , Yangbo Lu , Joshua Kinard Cc: Daniel Vetter , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org (open list), linux-mmc@vger.kernel.org, netdev@vger.kernel.org, linux-rtc@vger.kernel.org, linux-modules@vger.kernel.org, Jakub Kicinski Subject: [PATCH 3/5] net: enetc: use EXPORT_SYMBOL_GPL for enetc_phc_index Date: Tue, 1 Aug 2023 19:35:42 +0200 Message-Id: <20230801173544.1929519-4-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230801173544.1929519-1-hch@lst.de> References: <20230801173544.1929519-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773054852826130743 X-GMAIL-MSGID: 1773054852826130743 enetc_phc_index is only used via symbol_get, which was only ever intended for very internal symbols like this one. Use EXPORT_SYMBOL_GPL for it so that symbol_get can enforce only being used on EXPORT_SYMBOL_GPL symbols. Signed-off-by: Christoph Hellwig Reviewed-by: Jakub Kicinski Reviewed-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c index 17c097cef7d45f..5243fc03105890 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c @@ -8,7 +8,7 @@ #include "enetc.h" int enetc_phc_index = -1; -EXPORT_SYMBOL(enetc_phc_index); +EXPORT_SYMBOL_GPL(enetc_phc_index); static struct ptp_clock_info enetc_ptp_caps = { .owner = THIS_MODULE, From patchwork Tue Aug 1 17:35:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 129415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2855759vqg; Tue, 1 Aug 2023 11:29:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlG67VyvZaVEH4dlqJZQoli1ne4678NM+Y4OmBbZAUqNWnrXNWeeeo7o6Bx1iZ0dRyiGOr7V X-Received: by 2002:a9d:66c5:0:b0:6b7:56d9:533 with SMTP id t5-20020a9d66c5000000b006b756d90533mr11353577otm.28.1690914564780; Tue, 01 Aug 2023 11:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690914564; cv=none; d=google.com; s=arc-20160816; b=xh7QB6eVzN+eZuGweQOrcop76sA84NiVgLVSzx3jY18L4SQvxV2p5lHFLZW1+1lEpK htcJNpWD74BL/nBfzx8v6JdHMBWULOxVcKSGyVdMeZN+JKIUDv9q928FDTlIngZj7a3U HgN0OAinBh+vkd/vZ4SqdXwvN0A581MIZAOo6Kpxu9rbzXBbGCdzyMcyoOD8Q1/2E9zL n0CciAHzEDqHqztghBej/0IopgDoRHNq1kiAKTjDdUnqBbaQvbRtHDy5Ye9Cg4E3c854 Xc00P+T1FKH2qyLY0wBiF5RArldqz4+1Sl9uUJJIfyFwWyrlY77Hyv7Ms/xYDTlz//mm 4+bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t3/TEOMMBqs2aatmdG8Z4OzwuZXTQz0DDq3G1QEeVZ0=; fh=5HI8xClRuvQgfwG5XWQ/y0OxSazXgHJWeupfevDts70=; b=lOvIrmDBMIbZMcKo3k42hoKxS6oRJKzjaFfeidKDB9DG3SR6iHnsQLMpKK2izM9vMB zaeFQJFYw8Uf98DYd9DbbARLYTSLiXBEKixzF9W6ceui9fSaPyO2JSoG1kvw4zA2LPIc +8l429YCvMQmaWzwW9UGZTSCgdv+DIIFyxaFXpn3m09o1MjTSRcAGYLqH13wOBFFVmC9 iaU0xyvM4xQ8L/rl6hX8mUnZX5v49FRCTABnV9w/ZHXiIOMj2713IG8VuAlT5rTB+i8z SywHwit7t8pxvizLTR8zJXUO1xr0ix95AALACjsU79TgToe1W2EX3HoV+airRmfShw6w ByhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=xn4P9Q6v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j25-20020a634a59000000b0055c79555b90si9225610pgl.333.2023.08.01.11.29.11; Tue, 01 Aug 2023 11:29:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=xn4P9Q6v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234518AbjHARgj (ORCPT + 99 others); Tue, 1 Aug 2023 13:36:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234283AbjHARgg (ORCPT ); Tue, 1 Aug 2023 13:36:36 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C83C10F1; Tue, 1 Aug 2023 10:36:35 -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: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=t3/TEOMMBqs2aatmdG8Z4OzwuZXTQz0DDq3G1QEeVZ0=; b=xn4P9Q6v+cxfApxHVA9nIEPL59 XoFVePi8z26u90VblqDo8ZKsMc4U/DPTZRP68ibsrEcq6pP3g/0s3sKfa8oa9J58H+Rhq3KnrgleJ 6hjJ52UVN20msW7acln7uPOWX2Wgfj9ssfxy52dAyC9hY0K407jhXK7ptNEaWsD0/heV0SMOsPncP ujQuF8E1zjeUTy+sWrlYianfi4e3+R7mMuqoeQ+xgOFZee91Fj/ltLieZapt2FvNM6+6lcWh2F9tS kvcQgk4/X9ea54a1eLYdm5du7NnHBNsjcGVKTmnCDw0bDVk1xj0mpa3GVRUzG/fB4KrkWlSOkqzCW FN32rksw==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qQtII-002w8A-1j; Tue, 01 Aug 2023 17:36:27 +0000 From: Christoph Hellwig To: Luis Chamberlain , Greg Kroah-Hartman , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ulf Hansson , Manuel Lauss , Yangbo Lu , Joshua Kinard Cc: Daniel Vetter , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org (open list), linux-mmc@vger.kernel.org, netdev@vger.kernel.org, linux-rtc@vger.kernel.org, linux-modules@vger.kernel.org Subject: [PATCH 4/5] rtc: ds1685: use EXPORT_SYMBOL_GPL for ds1685_rtc_poweroff Date: Tue, 1 Aug 2023 19:35:43 +0200 Message-Id: <20230801173544.1929519-5-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230801173544.1929519-1-hch@lst.de> References: <20230801173544.1929519-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773052431034918065 X-GMAIL-MSGID: 1773052431034918065 ds1685_rtc_poweroff is only used externally via symbol_get, which was only ever intended for very internal symbols like this one. Use EXPORT_SYMBOL_GPL for it so that symbol_get can enforce only being used on EXPORT_SYMBOL_GPL symbols. Signed-off-by: Christoph Hellwig Acked-by: Joshua Kinard Reviewed-by: Greg Kroah-Hartman --- drivers/rtc/rtc-ds1685.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c index 0f707be0eb87fa..04dbf35cf3b706 100644 --- a/drivers/rtc/rtc-ds1685.c +++ b/drivers/rtc/rtc-ds1685.c @@ -1432,7 +1432,7 @@ ds1685_rtc_poweroff(struct platform_device *pdev) unreachable(); } } -EXPORT_SYMBOL(ds1685_rtc_poweroff); +EXPORT_SYMBOL_GPL(ds1685_rtc_poweroff); /* ----------------------------------------------------------------------- */ From patchwork Tue Aug 1 17:35:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 129406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2840076vqg; Tue, 1 Aug 2023 11:01:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlGnfEPmynrKZA08EMuYBWFSeLGnkPL/jGWLUaGkwEZfQfdhpohv100E3tsKSDHVR4LsJVCe X-Received: by 2002:a17:90a:d78d:b0:268:1f64:cefc with SMTP id z13-20020a17090ad78d00b002681f64cefcmr10198600pju.49.1690912899750; Tue, 01 Aug 2023 11:01:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690912899; cv=none; d=google.com; s=arc-20160816; b=n+HmyEdt3BLhxfUioVYoumRDqtmJWGinXogXysUYamCgZoa4Ozc/nwJjqsmgkhYet2 kUkM6f8KXIlf2eihf2N2RPcQUSofdXWMMjWZUYQXQedxFlnfKz2ApaakL3jZd1qB4YQe sfllWHMRhMkOOpehcSqcl8YzaS61pdfZxkoBd5l9Z2amw9H8WMyVZhdNNB1vkjjBQacE GUGSn2IzFhBpX2hhvZt66PuouzqZkVvXk12RQHfVhOau04NKz02BF7gl6YTmM2R16EAn 3/g0ZCLUfxoOr7jleEC5ZMsuecC9ZpaCDBGKkBNKrQq3SU0I0TSOAfCJI+ypSXO6Ez1d l0Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PTHF39oHMx6VE63jxRUT6IwF0t0yHHtHwutR/mCVCgk=; fh=5HI8xClRuvQgfwG5XWQ/y0OxSazXgHJWeupfevDts70=; b=MESGVrNxcyUr4eenOgGTfOWVcCw8OhxIh12XPN9KS6Qn9weefyuJGlbteEHUQMStjw EevMqU3O4gYSJkL82Ed1AdGPDoRno0xzwuWrdlCCPz/jzBGnNmxGRON2sPvghYKERqM1 cEH1EqtgND8yVsSdPxJ/m0ybcS73zpDbIhAZKoJz0sJcf5D8T6m4dMQWTfZC/7knIwxY vfDRMly4FpnQHQEQyRChTVZQMohq5rKhKqWlP98p+xyHALFBIZ6CLaierrNj3AW0QXZL eJk1uWW9jTOWDnSTNm6NCyu6YN5hsdpBMEnnVdyIv5OLRcEG8ep4b00DXsltcldm3bLM WsPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zqR2EJf6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qe6-20020a17090b4f8600b00267b910cb37si9673698pjb.52.2023.08.01.11.01.10; Tue, 01 Aug 2023 11:01:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zqR2EJf6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234776AbjHARgv (ORCPT + 99 others); Tue, 1 Aug 2023 13:36:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234173AbjHARgr (ORCPT ); Tue, 1 Aug 2023 13:36:47 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B4C12134; Tue, 1 Aug 2023 10:36:37 -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: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=PTHF39oHMx6VE63jxRUT6IwF0t0yHHtHwutR/mCVCgk=; b=zqR2EJf6+QTJmNUjyd3x0q6VcD ookMmvswLITB4Jwjk0MzoEC2//VVIl16IMmOdtw8pgr1kY1MwZL6U6AOZIBFFwiCF7ghOcm9SgAI0 +bo9tllXEGcJ55aRFgRP9B4/c8jP8VCpTKkpQTFZy2cFUe2js6CJfRLo3txY8v8D40XRsYSIxKJcn 1Uwti/Y1q7HPJbxFDrVKbPiFrvSsj3aKT4OIT4NtRe2rUusv8THcOd9P+9zyffsUBp1BV4WrS7SGR 20yCBxxMRBrcvJKUGpgILWIlRSfpEUrtsxOQo0tVHo7wsk7OJWPZopRm0Y7a3EkUYdAXcp8pTUIZd PI9bvn8w==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qQtIM-002w9v-03; Tue, 01 Aug 2023 17:36:30 +0000 From: Christoph Hellwig To: Luis Chamberlain , Greg Kroah-Hartman , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ulf Hansson , Manuel Lauss , Yangbo Lu , Joshua Kinard Cc: Daniel Vetter , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org (open list), linux-mmc@vger.kernel.org, netdev@vger.kernel.org, linux-rtc@vger.kernel.org, linux-modules@vger.kernel.org Subject: [PATCH 5/5] modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules Date: Tue, 1 Aug 2023 19:35:44 +0200 Message-Id: <20230801173544.1929519-6-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230801173544.1929519-1-hch@lst.de> References: <20230801173544.1929519-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773050685126690242 X-GMAIL-MSGID: 1773050685126690242 It has recently come to my attention that nvidia is circumventing the protection added in 262e6ae7081d ("modules: inherit TAINT_PROPRIETARY_MODULE") by importing exports from their proprietary modules into an allegedly GPL licensed module and then rexporting them. Given that symbol_get was only ever intended for tightly cooperating modules using very internal symbols it is logical to restrict it to being used on EXPORT_SYMBOL_GPL and prevent nvidia from costly DMCA Circumvention of Access Controls law suites. All symbols except for four used through symbol_get were already exported as EXPORT_SYMBOL_GPL, and the remaining four ones were switched over in the preparation patches. Fixes: 262e6ae7081d ("modules: inherit TAINT_PROPRIETARY_MODULE") Signed-off-by: Christoph Hellwig Reviewed-by: Greg Kroah-Hartman --- kernel/module/main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/kernel/module/main.c b/kernel/module/main.c index 59b1d067e52890..c395af9eced114 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -1295,12 +1295,20 @@ void *__symbol_get(const char *symbol) }; preempt_disable(); - if (!find_symbol(&fsa) || strong_try_module_get(fsa.owner)) { - preempt_enable(); - return NULL; + if (!find_symbol(&fsa)) + goto fail; + if (fsa.license != GPL_ONLY) { + pr_warn("failing symbol_get of non-GPLONLY symbol %s.\n", + symbol); + goto fail; } + if (strong_try_module_get(fsa.owner)) + goto fail; preempt_enable(); return (void *)kernel_symbol_value(fsa.sym); +fail: + preempt_enable(); + return NULL; } EXPORT_SYMBOL_GPL(__symbol_get);