From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 30 Jul 2024 13:09:03 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sYkj1-004RYX-2g for lore@lore.pengutronix.de; Tue, 30 Jul 2024 13:09:03 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sYkj1-0003vk-6L for lore@pengutronix.de; Tue, 30 Jul 2024 13:09:03 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MUG9+BVs35m5OPhzS+DBGtvXc4IKR94u7Fy6ygGOwWQ=; b=2nd87CeXwrXGhROFsYiwd6eyb/ t47ax5qa2GLxmS52HlKQu/GZBMq/80qr2avdKYunw7mpnk4iPLIbuFB2eq/cWqkRnDzTiL6CI6OpW WewyU4TiSl/byMlgd5JWe6TNIdvwziMJz8YbnaEcqpVMIL6kmZvEmzZ8uN1UL9unCqDtv4V3ek8VU QI4V+0ZyEf5MztCUnpP+PfYnLOoaBz/v5PQ+g2qfze5rgMnZgA2JA73dcxOX9WSKO/9Rq4FkW7nTs XXo40u0HF8gFieUA3uauUDB2cKdoULOS6BZJ8YCCeNf4CONdIgjvldmfZskAw+rpc3PAdGPt9Wb9d w8+/GzPQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sYkiZ-0000000EqU1-2aLJ; Tue, 30 Jul 2024 11:08:35 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sYkiX-0000000EqTJ-0Ow6 for barebox@lists.infradead.org; Tue, 30 Jul 2024 11:08:34 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sYkiV-0003qc-Ry; Tue, 30 Jul 2024 13:08:31 +0200 Message-ID: <30067938-201b-4488-b435-011ac90c7fd3@pengutronix.de> Date: Tue, 30 Jul 2024 13:08:31 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Sascha Hauer Cc: barebox@lists.infradead.org References: <20240730071929.2016537-1-a.fatoum@pengutronix.de> <20240730071929.2016537-7-a.fatoum@pengutronix.de> Content-Language: en-US From: Ahmad Fatoum In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240730_040833_171115_EA912A33 X-CRM114-Status: GOOD ( 24.89 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 06/10] mci: core: use CONFIG_MCI_WRITE, not CONFIG_BLOCK_WRITE X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Hello Sascha, On 30.07.24 11:18, Sascha Hauer wrote: > On Tue, Jul 30, 2024 at 09:19:25AM +0200, Ahmad Fatoum wrote: >> There's a more specific CONFIG_MCI_WRITE that's so far only used to >> remove write support for in the Atmel MCI driver. We should use the same >> symbol also to remove support in the MCI core instead of relying on its >> parent CONFIG_BLOCK_WRITE option. > > Currently CONFIG_MCI_WRITE has no relation to CONFIG_BLOCK_WRITE. > Having CONFIG_MCI_WRITE enabled and CONFIG_BLOCK_WRITE disabled doesn't > make sense. Shouldn't CONFIG_MCI_WRITE depend on CONFIG_BLOCK_WRITE? > > Also having CONFIG_BLOCK_WRITE enabled and CONFIG_MCI_WRITE disabled > allows you to support writing to block devices that are not MCI devices. > Given that the vast majority of block devices are actually MCI devices > this seems rather exotic. > > Maybe we should drop CONFIG_MCI_WRITE and replace it with > CONFIG_BLOCK_WRITE, or just have > > config MCI_WRITE > bool > default y if BLOCK_WRITE This works for me. I can do this for v2. > > Sascha > >> >> Signed-off-by: Ahmad Fatoum >> --- >> drivers/mci/mci-core.c | 8 +++----- >> 1 file changed, 3 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c >> index f6f8a6adabb9..3a5fb0330700 100644 >> --- a/drivers/mci/mci-core.c >> +++ b/drivers/mci/mci-core.c >> @@ -1801,8 +1801,8 @@ static int mci_blk_part_switch(struct mci_part *part) >> * >> * This routine expects the buffer has the correct size to read all data! >> */ >> -static int __maybe_unused mci_sd_write(struct block_device *blk, >> - const void *buffer, sector_t block, blkcnt_t num_blocks) >> +static int mci_sd_write(struct block_device *blk, >> + const void *buffer, sector_t block, blkcnt_t num_blocks) >> { >> struct mci_part *part = container_of(blk, struct mci_part, blk); >> struct mci *mci = part->mci; >> @@ -2179,9 +2179,7 @@ static int mci_check_if_already_initialized(struct mci *mci) >> >> static struct block_device_ops mci_ops = { >> .read = mci_sd_read, >> -#ifdef CONFIG_BLOCK_WRITE >> - .write = mci_sd_write, >> -#endif >> + .write = IS_ENABLED(CONFIG_MCI_WRITE) ? mci_sd_write : NULL, >> }; >> >> static int mci_set_boot(struct param_d *param, void *priv) >> -- >> 2.39.2 >> >> >> > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |