From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.178 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794446974; b=Zxhe2C8xknNFlEBW5uONkVQllNTkh1UdHReihdFGrxwDRYxs2LhoPv4LoXaMBM/EZmm8 J7BODjRvYu2lZey2fXF61hBupSRzMmiC0Jsdo3sIEaQ6tNHKGgIMzGNPNJQyEkgUy55oi ftAit8/r5RcSHiAcev1VL6tA3Hvpz8YjjP5VlygzAvPaaBHrbHOJ3y/qFW4q2B8U5Cl4l cN54XGjGhs5nb43i4GURPw3sfZ6CqK5vN4/WDP8v70MrZQx5rRhxothyrkhnUJ/ujY2t4 UCOTuZxxUIYoRlwMAxkZUBrggozSz7BzPFzydHEJDYcK/8ihwqGpWBpX3bMaM27DlbQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794446974; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=oWUwJV+JlBCEZrihlkA2MkXrd5z9pouBqsCsn0XzyXE=; b=yW4E3UulrRs4ZP3fRBECMVRTsmCvV+TR2p80QBJBXdMBXT9RQBNwseNF7KnnbqFAElUK 2tAjL8xst3/LCGGSJUP4tp1pfPqQJ4DCNWK1zt9hgfGfMz6XiL7UKsjSJUfI6KyxvoaIE 4lvnZfCZtap5rRqNkD2VwR3PsnkF5LN32vFy/lR16B65RejJ1sq8bjQjljDuCxLEY+22c 9JUr1M46cjQGaokskry7ojEMO/mX9xZhiIOkwWeishUnviY2u2ksvTeGBCwcb5GvbxZs0 Tvv9BEzbke/2tBEo/fBSonWfxkDPZq1FOnBZISYo2brjyxGIBW1aQFe/1I6nB+5sd6g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=fpMDWF11; arc=none smtp.remote-ip=209.85.167.178 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 626A96073FD1 for ; Thu, 12 Nov 2026 01:29:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 626A96073FD1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=fpMDWF11 Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-4b28d9537bcso296332b6e.0 for ; Wed, 11 Nov 2026 17:29:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794446973; x=1795051773; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=oWUwJV+JlBCEZrihlkA2MkXrd5z9pouBqsCsn0XzyXE=; b=fpMDWF11t2YaY7bFLvYmIHQPKuRVHB0zIZLFe92VSnw1ViYwYJWacBf+WyRMgatxGn 2nKLLRGsdfGLLvfOaA3x00+KOe10P1iCvYDqs6W58twf8zX+ZyLqgbq7yWVb6aDLojt5 ULpWaOruqDM9DGUfU1RXALWwq1V/fyQxpes+KkTEVgengdzVNNEJqj2lD9AX/QYyTcBh 41u0JvS4Ik6T7r+5QC0Kic2JLS6nJcInTPR/isB5hgFBc2AfvixLtIrG1ZpfSJ9PqE94 6tgkN/tGJ9gtRaXszxoKSWfsSCk+FqRO+e6t83w4H1RhSold/D0xgDR9LOLLypmOK/sJ NHEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794446973; x=1795051773; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=oWUwJV+JlBCEZrihlkA2MkXrd5z9pouBqsCsn0XzyXE=; b=10wIV17mZ8sZTd5LuNm+fYVQ4id58NPMvgyBqgCziSnLI7hG3knGEfTe3+MgF7NzoL MpHiM5n9aECPeUaLS/GzIrBzxW2OmGIS52N7F5VPdqghTDethDtYsa5YIg41oWsFVYCd g1sqUMCAZwjFjgpWXZqyLFI2KnmMr0QmmIuavWaRJHWE1reVGojRGoC6kFmKBhWmLNXs mDHpCb8XSzFWNHBi3K7X6ZG/z+fJmTFIQ03uHXR2IRi/iHMXbm5ofcZP+/B9u5E2rqDo 3Zoj7RdRZgiGSCYhCW84cwflol/UEERJBNpTfqOwGmNHjG7tg37C5tzrdpM6E1M61g9a 4bfA== X-Forwarded-Encrypted: i=1; AL+hErEw7m4TpgZv7qezmUbEXRE1Muwv29GJpgGE1dM54lLH68JPDFz7F57zuFJwntGw1S7FTfuHvEMnSOWvh/w=@vger.kernel.org X-Gm-Message-State: APuU4Z9zo9yVsabjLe6xzHSjpqn088kY/dB2tDlXDdQ7NMWwl3MvdORn xepX5owg9Cooa/2JyqoBPoVBmu8VYu4J5vizHGdxdU5Dc7D6td26ysA7 X-Gm-Gg: AYBFou10ALO4Qy85SyEYnZPsWxYqyAYM8b6FEuY2OPQbJF5wrmM02NyRn2cl2W9izj6 FIzT2/l1ICRW323srrKljL0H3Dl1lhlAv4Al1tAORwwHq7mDBHbQtVl8wbuikMhl7VIqjJNTpzl DvqGjzqKTToldHfepZOCZa3U5lk8vVDnAyAVtrX5hNlfeDFskLk/R9mDQvEP77xnNROMxWi4grv k35N3ZjZloCnR1ec4yzop5LVqb1J1TzxzBCiytdgfVII0bUTKQkPZhG4Qa9GY8FNWb38IMi+y7A R2ico4OSjG0hLCti0wFSstvGlNYN5Su5vgLbmXVdubLU8P8bTCf9ZYny88z0SaqmkPJeqQcHfkQ Ur0ZxYslximcYZHscSRBQ3l0oiRWgsGVox4GGh/sQndYNIOBwUWlDv43GKNeIVffOKNj8kmbhIp GWa7vM2KsyANGrmkM4xccLsEVQmuBFYG2mvtL+Ag9D7nAQbzMI8XUh+TVvb8vhfAYjYueziGlSZ q4cJny/UGtVKV0KIKMlrdGyTB6aqsx9UrbeoqPg/R7m1xqk+/Z1LChRORJnzTIq2l8dtUCpDr0w DTvugCa3Hfxf5cv9K1Ms4fvG4ggNLXjGvAHdgvFL5WfxWkq65ubqs2Qwyb50eqs62xAntxGOUp/ UAD6wW3D0JMuhV5EG52S02C6ScoaEUBTlt1Tme1v/YYYe4MmDHsZgHk08XDfmNsHWhEVRvXsIWT +BgAukR89t5eP28CZZdM7vCDaI5aK1nTOFjqeS8T24iSYhBteMMnBJ X-Received: by 2002:a05:6808:11cb:b0:4a4:c95a:38d1 with SMTP id 5614622812f47-56cd547bd90mr885945b6e.4.1794446968745; Wed, 11 Nov 2026 17:29:28 -0800 (PST) Received: from [127.0.1.1] (174-29-1-49.hlrn.qwest.net. [174.29.1.49]) by smtp.gmail.com with ESMTPSA id 5614622812f47-56905738049sm6823481b6e.10.2026.11.11.17.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 17:29:28 -0800 (PST) From: James Hilliard Date: Wed, 11 Nov 2026 18:28:34 -0700 Subject: [PATCH v3 55/58] mtd: rawnand: r852: retain chip state across removal X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261111-submit-rawnand-retained-handle-lifetime-v1-v3-55-ce537999741d@gmail.com> References: <20261111-submit-rawnand-retained-handle-lifetime-v1-v3-0-ce537999741d@gmail.com> In-Reply-To: <20261111-submit-rawnand-retained-handle-lifetime-v1-v3-0-ce537999741d@gmail.com> To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , James Hilliard , Maxim Levitsky X-Mailer: b4 0.15.2 A removed card can still have open MTD handles. Reinitializing the same nand_chip for a newly inserted card lets those handles access replacement media, while freeing it during PCI removal leaves dangling references. Allocate a fresh chip for every insertion and separate SmartMedia scanning from publication so lifetime ownership is installed first. Disconnect the old chip before disabling its hardware, and retain it and the controller until their final MTD reference is released. Stop IRQ-driven card-work scheduling before destroying the workqueue during PCI removal. Run NAND cleanup during disconnection; the final core-owned put only releases retained allocation and layout data. Cc: Maxim Levitsky Signed-off-by: James Hilliard --- drivers/mtd/nand/raw/r852.c | 103 +++++++++++++++++++++++---------------- drivers/mtd/nand/raw/r852.h | 1 + drivers/mtd/nand/raw/sm_common.c | 15 ++---- drivers/mtd/nand/raw/sm_common.h | 2 +- 4 files changed, 65 insertions(+), 56 deletions(-) diff --git a/drivers/mtd/nand/raw/r852.c b/drivers/mtd/nand/raw/r852.c index 566662d45c2c..3c3161bc4b30 100644 --- a/drivers/mtd/nand/raw/r852.c +++ b/drivers/mtd/nand/raw/r852.c @@ -625,16 +625,29 @@ static void r852_update_media_status(struct r852_device *dev) spin_unlock_irqrestore(&dev->irqlock, flags); } -/* - * Register the nand device - * Called when the card is detected - */ +/* Register a new chip instance for each inserted card. */ static int r852_register_nand_device(struct r852_device *dev) { - struct mtd_info *mtd = nand_to_mtd(dev->chip); + struct nand_chip *chip; + struct mtd_info *mtd; + int ret; WARN_ON(dev->card_registered); + chip = kzalloc_obj(*chip); + if (!chip) + goto error1; + + chip->legacy.cmd_ctrl = r852_cmdctl; + chip->legacy.waitfunc = r852_wait; + chip->legacy.dev_ready = r852_ready; + chip->legacy.read_byte = r852_read_byte; + chip->legacy.read_buf = r852_read_buf; + chip->legacy.write_buf = r852_write_buf; + chip->controller = &dev->controller; + nand_set_controller_data(chip, dev); + dev->chip = chip; + mtd = nand_to_mtd(chip); mtd->parent_dev = &dev->pci_dev->dev; if (dev->readonly) @@ -642,8 +655,17 @@ static int r852_register_nand_device(struct r852_device *dev) r852_engine_enable(dev); - if (sm_register_device(mtd, dev->sm)) - goto error1; + ret = sm_scan_device(mtd, dev->sm); + if (ret) + goto free_chip; + ret = nand_set_lifetime(chip, chip); + if (ret) { + nand_cleanup(chip); + goto free_chip; + } + ret = mtd_device_register(mtd, NULL, 0); + if (ret) + goto put_chip; if (device_create_file(mtd->dev, &dev_attr_media_type)) { message("can't create media type sysfs attribute"); @@ -653,8 +675,15 @@ static int r852_register_nand_device(struct r852_device *dev) dev->card_registered = 1; return 0; error3: - WARN_ON(mtd_device_unregister(nand_to_mtd(dev->chip))); - nand_cleanup(dev->chip); + WARN_ON(mtd_device_unregister(mtd)); +put_chip: + nand_disconnect(chip); + dev->chip = NULL; + mtd_put_master(mtd); + goto error1; +free_chip: + dev->chip = NULL; + kfree(chip); error1: /* Force card redetect */ dev->card_detected = 0; @@ -667,16 +696,19 @@ static int r852_register_nand_device(struct r852_device *dev) static void r852_unregister_nand_device(struct r852_device *dev) { - struct mtd_info *mtd = nand_to_mtd(dev->chip); + struct mtd_info *mtd; if (!dev->card_registered) return; + mtd = nand_to_mtd(dev->chip); device_remove_file(mtd->dev, &dev_attr_media_type); WARN_ON(mtd_device_unregister(mtd)); - nand_cleanup(dev->chip); + nand_disconnect(dev->chip); r852_engine_disable(dev); + dev->chip = NULL; dev->card_registered = 0; + mtd_put_master(mtd); } /* Card state updater */ @@ -734,7 +766,7 @@ static irqreturn_t r852_irq(int irq, void *data) card_status = r852_read_reg(dev, R852_CARD_IRQ_STA); r852_write_reg(dev, R852_CARD_IRQ_STA, card_status); - if (card_status & (R852_CARD_IRQ_INSERT|R852_CARD_IRQ_REMOVE)) { + if (card_status & (R852_CARD_IRQ_INSERT | R852_CARD_IRQ_REMOVE)) { ret = IRQ_HANDLED; dev->card_detected = !!(card_status & R852_CARD_IRQ_INSERT); @@ -752,8 +784,10 @@ static irqreturn_t r852_irq(int irq, void *data) /* let, card state to settle a bit, and then do the work */ dev->card_unstable = 1; - queue_delayed_work(dev->card_workqueue, - &dev->card_detect_work, msecs_to_jiffies(100)); + if (!dev->removing) + queue_delayed_work(dev->card_workqueue, + &dev->card_detect_work, + msecs_to_jiffies(100)); goto out; } @@ -844,7 +878,6 @@ static const struct nand_controller_ops r852_ops = { static int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) { int error; - struct nand_chip *chip; struct r852_device *dev; /* pci initialization */ @@ -866,42 +899,27 @@ static int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) error = -ENOMEM; - /* init nand chip, but register it only on card insert */ - chip = kzalloc_obj(struct nand_chip); - - if (!chip) - goto error4; - - /* commands */ - chip->legacy.cmd_ctrl = r852_cmdctl; - chip->legacy.waitfunc = r852_wait; - chip->legacy.dev_ready = r852_ready; - - /* I/O */ - chip->legacy.read_byte = r852_read_byte; - chip->legacy.read_buf = r852_read_buf; - chip->legacy.write_buf = r852_write_buf; - /* init our device structure */ dev = kzalloc_obj(struct r852_device); if (!dev) - goto error5; + goto error4; + error = devm_nand_controller_init(&pci_dev->dev, &dev->controller, dev); + if (error) + goto error4; - nand_set_controller_data(chip, dev); - dev->chip = chip; dev->pci_dev = pci_dev; pci_set_drvdata(pci_dev, dev); - nand_controller_init(&dev->controller); dev->controller.ops = &r852_ops; - chip->controller = &dev->controller; dev->bounce_buffer = dma_alloc_coherent(&pci_dev->dev, R852_DMA_LEN, &dev->phys_bounce_buffer, GFP_KERNEL); - if (!dev->bounce_buffer) + if (!dev->bounce_buffer) { + error = -ENOMEM; goto error6; + } error = -ENODEV; @@ -961,9 +979,6 @@ static int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) dma_free_coherent(&pci_dev->dev, R852_DMA_LEN, dev->bounce_buffer, dev->phys_bounce_buffer); error6: - kfree(dev); -error5: - kfree(chip); error4: pci_release_regions(pci_dev); error3: @@ -976,6 +991,11 @@ static int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) static void r852_remove(struct pci_dev *pci_dev) { struct r852_device *dev = pci_get_drvdata(pci_dev); + unsigned long flags; + + spin_lock_irqsave(&dev->irqlock, flags); + dev->removing = true; + spin_unlock_irqrestore(&dev->irqlock, flags); /* Stop detect workqueue - we are going to unregister the device anyway*/ @@ -995,9 +1015,6 @@ static void r852_remove(struct pci_dev *pci_dev) dma_free_coherent(&pci_dev->dev, R852_DMA_LEN, dev->bounce_buffer, dev->phys_bounce_buffer); - kfree(dev->chip); - kfree(dev); - /* Shutdown the PCI device */ pci_release_regions(pci_dev); pci_disable_device(pci_dev); diff --git a/drivers/mtd/nand/raw/r852.h b/drivers/mtd/nand/raw/r852.h index 96fe301d15da..a89ab61ea51e 100644 --- a/drivers/mtd/nand/raw/r852.h +++ b/drivers/mtd/nand/raw/r852.h @@ -128,6 +128,7 @@ struct r852_device { struct delayed_work card_detect_work; struct workqueue_struct *card_workqueue; int card_registered; /* card registered with mtd */ + bool removing; /* stop card work during PCI removal */ int card_detected; /* card detected in slot */ int card_unstable; /* whenever the card is inserted, is not known yet */ diff --git a/drivers/mtd/nand/raw/sm_common.c b/drivers/mtd/nand/raw/sm_common.c index e238784c8c3e..a79e3c3c77d1 100644 --- a/drivers/mtd/nand/raw/sm_common.c +++ b/drivers/mtd/nand/raw/sm_common.c @@ -182,28 +182,19 @@ static const struct nand_controller_ops sm_controller_ops = { .attach_chip = sm_attach_chip, }; -int sm_register_device(struct mtd_info *mtd, int smartmedia) +int sm_scan_device(struct mtd_info *mtd, int smartmedia) { struct nand_chip *chip = mtd_to_nand(mtd); struct nand_flash_dev *flash_ids; - int ret; chip->options |= NAND_SKIP_BBTSCAN; /* Scan for card properties */ chip->legacy.dummy_controller.ops = &sm_controller_ops; flash_ids = smartmedia ? nand_smartmedia_flash_ids : nand_xd_flash_ids; - ret = nand_scan_with_ids(chip, 1, flash_ids); - if (ret) - return ret; - - ret = mtd_device_register(mtd, NULL, 0); - if (ret) - nand_cleanup(chip); - - return ret; + return nand_scan_with_ids(chip, 1, flash_ids); } -EXPORT_SYMBOL_GPL(sm_register_device); +EXPORT_SYMBOL_GPL(sm_scan_device); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Maxim Levitsky "); diff --git a/drivers/mtd/nand/raw/sm_common.h b/drivers/mtd/nand/raw/sm_common.h index 57fc9f86f9ee..d8a330d6b730 100644 --- a/drivers/mtd/nand/raw/sm_common.h +++ b/drivers/mtd/nand/raw/sm_common.h @@ -33,7 +33,7 @@ struct sm_oob { #define SM_SMALL_OOB_SIZE 8 -int sm_register_device(struct mtd_info *mtd, int smartmedia); +int sm_scan_device(struct mtd_info *mtd, int smartmedia); static inline int sm_sector_valid(struct sm_oob *oob) -- 2.53.0