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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 BB540C4707A for ; Fri, 21 May 2021 17:15:56 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 310766109F for ; Fri, 21 May 2021 17:15:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 310766109F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=acm.org 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:Reply-To:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=plVclb8eyQIBPNu6ZyyFs7Sp5UqXxL1ZiirWXR95qdo=; b=d8zHh/R88F9qdMJHHh2IKQCV8c mB67ndElBYCiCOD7Z6YwN5CaJqqw4EfDcY5/M7BY8xbKFPSI6uHTxcYIxIvSkqH0rWxWGPj/lmDNo 74LAF3VQGrwoSICUaCGfdsRwWVsPhlhKVHKahL3YVrCOvoiW66TPL3gv1okGUYq4yrJZuJ575m42m tzynkfjbzpOwzlbI8nP+fJGF/hq+VgfpyiW02HOJVHXuynH1g8wLwXvtBIfi5F6D+J6bkNNKP6dwo ALflRCqLnOYZrC3Cn598aui/r4sUl4MoW+hXyfmxWUW4A0kFGnFZV16XJli7Vu0Lx5JpLGmsjc72I Li6Ka7JQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk8jB-000R4o-O9; Fri, 21 May 2021 17:14:27 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk8j7-000R41-Nd for linux-arm-kernel@desiato.infradead.org; Fri, 21 May 2021 17:14:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Reply-To:Message-ID:Subject:Cc:To:From:Date:Sender: Content-Transfer-Encoding:Content-ID:Content-Description; bh=i/DEH4XPlbQY/GAcAQLF1MiUOk01m9bUndu1B0Q0p2Q=; b=LlT1cOPlMbWbcLKtqK2i10sOe3 zNFx8JpKZFJYoofk5fytZcvFstRePp3NsK9u04DD3IBZyHuiCBd8CAyM+yaFzSx4/H/jma0edUOnI 8huChx3COkJCyPZt8IBRw+9sO2tBDrWAlkc2rWssEr1/Xh+m1ZU+tacnqPpvX1gSOz5D0xyUoNKcQ MozTWoV5s093nI2Tqgxda6UIW8NhZTNiu4wbjEXc8bay/tq/XF76WBUtqSBYGjBjA+D8U8jJr2M57 obbH6ggWYMQ5kfaJFMWEzqkYGnawgk/X6DIMXAbcwyLSLf6q6cw1PfhcnYC1FT3iqaRU1nSzsMs0n JwD1j+Sg==; Received: from mail-ot1-x332.google.com ([2607:f8b0:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lk8j3-00HIls-VY for linux-arm-kernel@lists.infradead.org; Fri, 21 May 2021 17:14:20 +0000 Received: by mail-ot1-x332.google.com with SMTP id v19-20020a0568301413b0290304f00e3d88so18663561otp.4 for ; Fri, 21 May 2021 10:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:reply-to:references :mime-version:content-disposition:in-reply-to; bh=i/DEH4XPlbQY/GAcAQLF1MiUOk01m9bUndu1B0Q0p2Q=; b=BV5Dv0HT4uSHK02mYT6zN0hk40iQRR5Xpdfpu4QtHAAzKCSdM4Sis8Vs4vOJRFofzy /T9hgsH2rtOW3syQQdWfe0/wR2rmHaVjlErceHDQ5D0k/XbrtWnkIG4SNpREJ9u9DZrL QJuoAxvF2YbjE0vJc/CdH6vAyf/MS0wTgIxgSyzEJtYpbrVTjGyOYquNtKk+nXs/FjvJ WJXi4IGrYKs0/B6x8UZVFyZDpTbPpglAnp37MeUdzu4p6JtDq9pIbZDLopSyNfFp4JZk b1gh7vRTPD4rbovKIpBmqj/1pKGAhKAZ2tw7JUb7ZLUlbvptkcJYCyabMlYh0By0dpLV UKqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :reply-to:references:mime-version:content-disposition:in-reply-to; bh=i/DEH4XPlbQY/GAcAQLF1MiUOk01m9bUndu1B0Q0p2Q=; b=myOsobpScOpZlKp9SZvGZKEloTNqF/9EWafFPuXURH9lJ0CNoupMAz6qfAol8Ou9OT R3dFAqhNGls+jZzX+gDCPo5YK64AZeOaZnra6UrVRjIUXa8Jh4gjCHlPErsj/o2fpfXE AIQSGXJZFkleziLXs+a+eivuydrVcaUiCprr1gUoCIBtQdrU7EN617mnEX2NvBv3F3mz URrSEafLK9RSGNF5Ra4TwMkAmMlAny7Wsr0LeMvQK7jLBZW49hNM3pZKvbvwt84WZpOX wZ0t+iGem94odjzgG5UFfft+K5E5VUKnOY2dIKeNM2lG6aNbPs8Dul5SSyegaraQM1HG Gdsg== X-Gm-Message-State: AOAM533wxLz+l44dlDVl41nfanXfC3jZjGAYlpgheKLfQx0vV3ceLkft 1W/43Uhi05HM0hKODjTk8SCTrSU4C+me X-Google-Smtp-Source: ABdhPJzmHdxLbXoaJBp1/xmpAmOe0Q15yNBm3JriguNf2vFLBw/GS4NToO7dnR4UroPXKS2RE874yA== X-Received: by 2002:a9d:644f:: with SMTP id m15mr9364980otl.99.1621617255792; Fri, 21 May 2021 10:14:15 -0700 (PDT) Received: from serve.minyard.net ([47.184.156.158]) by smtp.gmail.com with ESMTPSA id n13sm1286675oov.30.2021.05.21.10.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 10:14:14 -0700 (PDT) Received: from minyard.net (unknown [IPv6:2001:470:b8f6:1b:9c8f:21cb:3961:b550]) by serve.minyard.net (Postfix) with ESMTPSA id A826D180105; Fri, 21 May 2021 17:14:13 +0000 (UTC) Date: Fri, 21 May 2021 12:14:12 -0500 From: Corey Minyard To: Andrew Jeffery Cc: openipmi-developer@lists.sourceforge.net, openbmc@lists.ozlabs.org, devicetree@vger.kernel.org, tmaimon77@gmail.com, linux-aspeed@lists.ozlabs.org, avifishman70@gmail.com, venture@google.com, linux-kernel@vger.kernel.org, tali.perry1@gmail.com, robh+dt@kernel.org, chiawei_wang@aspeedtech.com, linux-arm-kernel@lists.infradead.org, benjaminfair@google.com, arnd@arndb.de, zweiss@equinix.com Subject: Re: [PATCH v3 05/16] ipmi: kcs_bmc: Turn the driver data-structures inside-out Message-ID: <20210521171412.GI2921206@minyard.net> References: <20210510054213.1610760-1-andrew@aj.id.au> <20210510054213.1610760-6-andrew@aj.id.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210510054213.1610760-6-andrew@aj.id.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210521_101418_065569_71744901 X-CRM114-Status: GOOD ( 34.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: minyard@acm.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 On Mon, May 10, 2021 at 03:12:02PM +0930, Andrew Jeffery wrote: > Make the KCS device drivers responsible for allocating their own memory. > > Until now the private data for the device driver was allocated internal > to the private data for the chardev interface. This coupling required > the slightly awkward API of passing through the struct size for the > driver private data to the chardev constructor, and then retrieving a > pointer to the driver private data from the allocated chardev memory. > > In addition to being awkward, the arrangement prevents the > implementation of alternative userspace interfaces as the device driver > private data is not independent. > > Peel a layer off the onion and turn the data-structures inside out by > exploiting container_of() and embedding `struct kcs_device` in the > driver private data. All in all a very nice cleanup. A few nits inline. > > Signed-off-by: Andrew Jeffery > Reviewed-by: Zev Weiss > --- > drivers/char/ipmi/kcs_bmc.c | 19 +++++++-- > drivers/char/ipmi/kcs_bmc.h | 12 ++---- > drivers/char/ipmi/kcs_bmc_aspeed.c | 56 +++++++++++++------------ > drivers/char/ipmi/kcs_bmc_cdev_ipmi.c | 60 ++++++++++++++++++--------- > drivers/char/ipmi/kcs_bmc_npcm7xx.c | 37 ++++++++++------- > 5 files changed, 111 insertions(+), 73 deletions(-) > > diff --git a/drivers/char/ipmi/kcs_bmc.c b/drivers/char/ipmi/kcs_bmc.c > index ef5c48ffe74a..83da681bf49e 100644 > --- a/drivers/char/ipmi/kcs_bmc.c > +++ b/drivers/char/ipmi/kcs_bmc.c > @@ -44,12 +44,23 @@ int kcs_bmc_handle_event(struct kcs_bmc *kcs_bmc) > } > EXPORT_SYMBOL(kcs_bmc_handle_event); > > -struct kcs_bmc *kcs_bmc_ipmi_alloc(struct device *dev, int sizeof_priv, u32 channel); > -struct kcs_bmc *kcs_bmc_alloc(struct device *dev, int sizeof_priv, u32 channel) > +int kcs_bmc_ipmi_add_device(struct kcs_bmc *kcs_bmc); The above (and it's remove function) should be in an include file. > +void kcs_bmc_add_device(struct kcs_bmc *kcs_bmc) This should return an error so the probe can be failed and cleaned up and so confusing message don't get printed after this in one case. > { > - return kcs_bmc_ipmi_alloc(dev, sizeof_priv, channel); > + if (kcs_bmc_ipmi_add_device(kcs_bmc)) > + pr_warn("Failed to add device for KCS channel %d\n", > + kcs_bmc->channel); > } > -EXPORT_SYMBOL(kcs_bmc_alloc); > +EXPORT_SYMBOL(kcs_bmc_add_device); > + > +int kcs_bmc_ipmi_remove_device(struct kcs_bmc *kcs_bmc); > +void kcs_bmc_remove_device(struct kcs_bmc *kcs_bmc) > +{ > + if (kcs_bmc_ipmi_remove_device(kcs_bmc)) > + pr_warn("Failed to remove device for KCS channel %d\n", > + kcs_bmc->channel); > +} > +EXPORT_SYMBOL(kcs_bmc_remove_device); > > MODULE_LICENSE("GPL v2"); > MODULE_AUTHOR("Haiyue Wang "); > diff --git a/drivers/char/ipmi/kcs_bmc.h b/drivers/char/ipmi/kcs_bmc.h > index febea0c8deb4..b2e6b7a7fe62 100644 > --- a/drivers/char/ipmi/kcs_bmc.h > +++ b/drivers/char/ipmi/kcs_bmc.h > @@ -67,6 +67,8 @@ struct kcs_ioreg { > }; > > struct kcs_bmc { > + struct device *dev; > + > spinlock_t lock; > > u32 channel; > @@ -94,17 +96,11 @@ struct kcs_bmc { > u8 *kbuffer; > > struct miscdevice miscdev; > - > - unsigned long priv[]; > }; > > -static inline void *kcs_bmc_priv(struct kcs_bmc *kcs_bmc) > -{ > - return kcs_bmc->priv; > -} > - > int kcs_bmc_handle_event(struct kcs_bmc *kcs_bmc); > -struct kcs_bmc *kcs_bmc_alloc(struct device *dev, int sizeof_priv, u32 channel); > +void kcs_bmc_add_device(struct kcs_bmc *kcs_bmc); > +void kcs_bmc_remove_device(struct kcs_bmc *kcs_bmc); > > u8 kcs_bmc_read_data(struct kcs_bmc *kcs_bmc); > void kcs_bmc_write_data(struct kcs_bmc *kcs_bmc, u8 data); > diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c > index 06628ca69750..5d433dea5714 100644 > --- a/drivers/char/ipmi/kcs_bmc_aspeed.c > +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c > @@ -61,6 +61,8 @@ > #define LPC_STR4 0x11C > > struct aspeed_kcs_bmc { > + struct kcs_bmc kcs_bmc; > + > struct regmap *map; > }; > > @@ -69,9 +71,14 @@ struct aspeed_kcs_of_ops { > int (*get_io_address)(struct platform_device *pdev); > }; > > +static inline struct aspeed_kcs_bmc *to_aspeed_kcs_bmc(struct kcs_bmc *kcs_bmc) > +{ > + return container_of(kcs_bmc, struct aspeed_kcs_bmc, kcs_bmc); > +} > + > static u8 aspeed_kcs_inb(struct kcs_bmc *kcs_bmc, u32 reg) > { > - struct aspeed_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct aspeed_kcs_bmc *priv = to_aspeed_kcs_bmc(kcs_bmc); > u32 val = 0; > int rc; > > @@ -83,7 +90,7 @@ static u8 aspeed_kcs_inb(struct kcs_bmc *kcs_bmc, u32 reg) > > static void aspeed_kcs_outb(struct kcs_bmc *kcs_bmc, u32 reg, u8 data) > { > - struct aspeed_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct aspeed_kcs_bmc *priv = to_aspeed_kcs_bmc(kcs_bmc); > int rc; > > rc = regmap_write(priv->map, reg, data); > @@ -92,7 +99,7 @@ static void aspeed_kcs_outb(struct kcs_bmc *kcs_bmc, u32 reg, u8 data) > > static void aspeed_kcs_updateb(struct kcs_bmc *kcs_bmc, u32 reg, u8 mask, u8 val) > { > - struct aspeed_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct aspeed_kcs_bmc *priv = to_aspeed_kcs_bmc(kcs_bmc); > int rc; > > rc = regmap_update_bits(priv->map, reg, mask, val); > @@ -114,7 +121,7 @@ static void aspeed_kcs_updateb(struct kcs_bmc *kcs_bmc, u32 reg, u8 mask, u8 val > */ > static void aspeed_kcs_set_address(struct kcs_bmc *kcs_bmc, u16 addr) > { > - struct aspeed_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct aspeed_kcs_bmc *priv = to_aspeed_kcs_bmc(kcs_bmc); > > switch (kcs_bmc->channel) { > case 1: > @@ -148,7 +155,7 @@ static void aspeed_kcs_set_address(struct kcs_bmc *kcs_bmc, u16 addr) > > static void aspeed_kcs_enable_channel(struct kcs_bmc *kcs_bmc, bool enable) > { > - struct aspeed_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct aspeed_kcs_bmc *priv = to_aspeed_kcs_bmc(kcs_bmc); > > switch (kcs_bmc->channel) { > case 1: > @@ -323,17 +330,16 @@ static int aspeed_kcs_of_v2_get_io_address(struct platform_device *pdev) > static int aspeed_kcs_probe(struct platform_device *pdev) > { > const struct aspeed_kcs_of_ops *ops; > - struct device *dev = &pdev->dev; > struct aspeed_kcs_bmc *priv; > struct kcs_bmc *kcs_bmc; > struct device_node *np; > int rc, channel, addr; > > - np = dev->of_node->parent; > + np = pdev->dev.of_node->parent; > if (!of_device_is_compatible(np, "aspeed,ast2400-lpc-v2") && > !of_device_is_compatible(np, "aspeed,ast2500-lpc-v2") && > !of_device_is_compatible(np, "aspeed,ast2600-lpc-v2")) { > - dev_err(dev, "unsupported LPC device binding\n"); > + dev_err(&pdev->dev, "unsupported LPC device binding\n"); > return -ENODEV; > } > ops = of_device_get_match_data(&pdev->dev); > @@ -344,20 +350,22 @@ static int aspeed_kcs_probe(struct platform_device *pdev) > if (channel < 0) > return channel; > > - kcs_bmc = kcs_bmc_alloc(&pdev->dev, sizeof(struct aspeed_kcs_bmc), channel); > - if (!kcs_bmc) > + addr = ops->get_io_address(pdev); > + if (addr < 0) > + return addr; > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > return -ENOMEM; > > + kcs_bmc = &priv->kcs_bmc; > + kcs_bmc->dev = &pdev->dev; > + kcs_bmc->channel = channel; > kcs_bmc->ioreg = ast_kcs_bmc_ioregs[channel - 1]; > kcs_bmc->io_inputb = aspeed_kcs_inb; > kcs_bmc->io_outputb = aspeed_kcs_outb; > kcs_bmc->io_updateb = aspeed_kcs_updateb; > > - addr = ops->get_io_address(pdev); > - if (addr < 0) > - return addr; > - > - priv = kcs_bmc_priv(kcs_bmc); > priv->map = syscon_node_to_regmap(pdev->dev.parent->of_node); > if (IS_ERR(priv->map)) { > dev_err(&pdev->dev, "Couldn't get regmap\n"); > @@ -370,29 +378,23 @@ static int aspeed_kcs_probe(struct platform_device *pdev) > if (rc) > return rc; > > - dev_set_drvdata(dev, kcs_bmc); > + platform_set_drvdata(pdev, priv); > > aspeed_kcs_enable_channel(kcs_bmc, true); > > - rc = misc_register(&kcs_bmc->miscdev); > - if (rc) { > - dev_err(dev, "Unable to register device\n"); > - return rc; > - } > + kcs_bmc_add_device(&priv->kcs_bmc); > > - dev_dbg(&pdev->dev, > - "Probed KCS device %d (IDR=0x%x, ODR=0x%x, STR=0x%x)\n", > - kcs_bmc->channel, kcs_bmc->ioreg.idr, kcs_bmc->ioreg.odr, > - kcs_bmc->ioreg.str); > + dev_info(&pdev->dev, "Initialised channel %d at 0x%x\n", kcs_bmc->channel, addr); > > return 0; > } > > static int aspeed_kcs_remove(struct platform_device *pdev) > { > - struct kcs_bmc *kcs_bmc = dev_get_drvdata(&pdev->dev); > + struct aspeed_kcs_bmc *priv = platform_get_drvdata(pdev); > + struct kcs_bmc *kcs_bmc = &priv->kcs_bmc; > > - misc_deregister(&kcs_bmc->miscdev); > + kcs_bmc_remove_device(kcs_bmc); > > return 0; > } > diff --git a/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c b/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c > index 82c77994e481..5060643bf530 100644 > --- a/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c > +++ b/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c > @@ -382,7 +382,7 @@ static int kcs_bmc_ipmi_release(struct inode *inode, struct file *filp) > return 0; > } > > -static const struct file_operations kcs_bmc_fops = { > +static const struct file_operations kcs_bmc_ipmi_fops = { > .owner = THIS_MODULE, > .open = kcs_bmc_ipmi_open, > .read = kcs_bmc_ipmi_read, > @@ -392,36 +392,58 @@ static const struct file_operations kcs_bmc_fops = { > .unlocked_ioctl = kcs_bmc_ipmi_ioctl, > }; > > -struct kcs_bmc *kcs_bmc_ipmi_alloc(struct device *dev, int sizeof_priv, u32 channel); > -struct kcs_bmc *kcs_bmc_ipmi_alloc(struct device *dev, int sizeof_priv, u32 channel) > +int kcs_bmc_ipmi_add_device(struct kcs_bmc *kcs_bmc); > +int kcs_bmc_ipmi_add_device(struct kcs_bmc *kcs_bmc) > { > - struct kcs_bmc *kcs_bmc; > - > - kcs_bmc = devm_kzalloc(dev, sizeof(*kcs_bmc) + sizeof_priv, GFP_KERNEL); > - if (!kcs_bmc) > - return NULL; > + int rc; > > spin_lock_init(&kcs_bmc->lock); > - kcs_bmc->channel = channel; > - > mutex_init(&kcs_bmc->mutex); > init_waitqueue_head(&kcs_bmc->queue); > > - kcs_bmc->data_in = devm_kmalloc(dev, KCS_MSG_BUFSIZ, GFP_KERNEL); > - kcs_bmc->data_out = devm_kmalloc(dev, KCS_MSG_BUFSIZ, GFP_KERNEL); > - kcs_bmc->kbuffer = devm_kmalloc(dev, KCS_MSG_BUFSIZ, GFP_KERNEL); > + kcs_bmc->data_in = devm_kmalloc(kcs_bmc->dev, KCS_MSG_BUFSIZ, GFP_KERNEL); > + kcs_bmc->data_out = devm_kmalloc(kcs_bmc->dev, KCS_MSG_BUFSIZ, GFP_KERNEL); > + kcs_bmc->kbuffer = devm_kmalloc(kcs_bmc->dev, KCS_MSG_BUFSIZ, GFP_KERNEL); > > kcs_bmc->miscdev.minor = MISC_DYNAMIC_MINOR; > - kcs_bmc->miscdev.name = devm_kasprintf(dev, GFP_KERNEL, "%s%u", > - DEVICE_NAME, channel); > + kcs_bmc->miscdev.name = devm_kasprintf(kcs_bmc->dev, GFP_KERNEL, "%s%u", > + DEVICE_NAME, kcs_bmc->channel); > if (!kcs_bmc->data_in || !kcs_bmc->data_out || !kcs_bmc->kbuffer || > !kcs_bmc->miscdev.name) > - return NULL; > - kcs_bmc->miscdev.fops = &kcs_bmc_fops; > + return -ENOMEM; > > - return kcs_bmc; > + kcs_bmc->miscdev.fops = &kcs_bmc_ipmi_fops; > + > + rc = misc_register(&kcs_bmc->miscdev); > + if (rc) { > + dev_err(kcs_bmc->dev, "Unable to register device: %d\n", rc); > + return rc; > + } > + > + dev_info(kcs_bmc->dev, "Initialised IPMI client for channel %d", kcs_bmc->channel); > + > + return 0; > +} > +EXPORT_SYMBOL(kcs_bmc_ipmi_add_device); > + > +int kcs_bmc_ipmi_remove_device(struct kcs_bmc *kcs_bmc); > +int kcs_bmc_ipmi_remove_device(struct kcs_bmc *kcs_bmc) > +{ > + misc_deregister(&kcs_bmc->miscdev); > + > + spin_lock_irq(&kcs_bmc->lock); > + kcs_bmc->running = 0; > + kcs_bmc_ipmi_force_abort(kcs_bmc); > + spin_unlock_irq(&kcs_bmc->lock); > + > + devm_kfree(kcs_bmc->dev, kcs_bmc->kbuffer); > + devm_kfree(kcs_bmc->dev, kcs_bmc->data_out); > + devm_kfree(kcs_bmc->dev, kcs_bmc->data_in); > + devm_kfree(kcs_bmc->dev, kcs_bmc); > + > + return 0; > } > -EXPORT_SYMBOL(kcs_bmc_ipmi_alloc); > +EXPORT_SYMBOL(kcs_bmc_ipmi_remove_device); > > MODULE_LICENSE("GPL v2"); > MODULE_AUTHOR("Haiyue Wang "); > diff --git a/drivers/char/ipmi/kcs_bmc_npcm7xx.c b/drivers/char/ipmi/kcs_bmc_npcm7xx.c > index 1f44aadec9e8..f7b4e866f86e 100644 > --- a/drivers/char/ipmi/kcs_bmc_npcm7xx.c > +++ b/drivers/char/ipmi/kcs_bmc_npcm7xx.c > @@ -65,6 +65,8 @@ struct npcm7xx_kcs_reg { > }; > > struct npcm7xx_kcs_bmc { > + struct kcs_bmc kcs_bmc; > + > struct regmap *map; > > const struct npcm7xx_kcs_reg *reg; > @@ -76,9 +78,14 @@ static const struct npcm7xx_kcs_reg npcm7xx_kcs_reg_tbl[KCS_CHANNEL_MAX] = { > { .sts = KCS3ST, .dob = KCS3DO, .dib = KCS3DI, .ctl = KCS3CTL, .ie = KCS3IE }, > }; > > +static inline struct npcm7xx_kcs_bmc *to_npcm7xx_kcs_bmc(struct kcs_bmc *kcs_bmc) > +{ > + return container_of(kcs_bmc, struct npcm7xx_kcs_bmc, kcs_bmc); > +} > + > static u8 npcm7xx_kcs_inb(struct kcs_bmc *kcs_bmc, u32 reg) > { > - struct npcm7xx_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct npcm7xx_kcs_bmc *priv = to_npcm7xx_kcs_bmc(kcs_bmc); > u32 val = 0; > int rc; > > @@ -90,7 +97,7 @@ static u8 npcm7xx_kcs_inb(struct kcs_bmc *kcs_bmc, u32 reg) > > static void npcm7xx_kcs_outb(struct kcs_bmc *kcs_bmc, u32 reg, u8 data) > { > - struct npcm7xx_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct npcm7xx_kcs_bmc *priv = to_npcm7xx_kcs_bmc(kcs_bmc); > int rc; > > rc = regmap_write(priv->map, reg, data); > @@ -99,7 +106,7 @@ static void npcm7xx_kcs_outb(struct kcs_bmc *kcs_bmc, u32 reg, u8 data) > > static void npcm7xx_kcs_updateb(struct kcs_bmc *kcs_bmc, u32 reg, u8 mask, u8 data) > { > - struct npcm7xx_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct npcm7xx_kcs_bmc *priv = to_npcm7xx_kcs_bmc(kcs_bmc); > int rc; > > rc = regmap_update_bits(priv->map, reg, mask, data); > @@ -108,7 +115,7 @@ static void npcm7xx_kcs_updateb(struct kcs_bmc *kcs_bmc, u32 reg, u8 mask, u8 da > > static void npcm7xx_kcs_enable_channel(struct kcs_bmc *kcs_bmc, bool enable) > { > - struct npcm7xx_kcs_bmc *priv = kcs_bmc_priv(kcs_bmc); > + struct npcm7xx_kcs_bmc *priv = to_npcm7xx_kcs_bmc(kcs_bmc); > > regmap_update_bits(priv->map, priv->reg->ctl, KCS_CTL_IBFIE, > enable ? KCS_CTL_IBFIE : 0); > @@ -155,11 +162,10 @@ static int npcm7xx_kcs_probe(struct platform_device *pdev) > return -ENODEV; > } > > - kcs_bmc = kcs_bmc_alloc(dev, sizeof(*priv), chan); > - if (!kcs_bmc) > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > return -ENOMEM; > > - priv = kcs_bmc_priv(kcs_bmc); > priv->map = syscon_node_to_regmap(dev->parent->of_node); > if (IS_ERR(priv->map)) { > dev_err(dev, "Couldn't get regmap\n"); > @@ -167,6 +173,9 @@ static int npcm7xx_kcs_probe(struct platform_device *pdev) > } > priv->reg = &npcm7xx_kcs_reg_tbl[chan - 1]; > > + kcs_bmc = &priv->kcs_bmc; > + kcs_bmc->dev = &pdev->dev; > + kcs_bmc->channel = chan; > kcs_bmc->ioreg.idr = priv->reg->dib; > kcs_bmc->ioreg.odr = priv->reg->dob; > kcs_bmc->ioreg.str = priv->reg->sts; > @@ -174,31 +183,29 @@ static int npcm7xx_kcs_probe(struct platform_device *pdev) > kcs_bmc->io_outputb = npcm7xx_kcs_outb; > kcs_bmc->io_updateb = npcm7xx_kcs_updateb; > > - dev_set_drvdata(dev, kcs_bmc); > + platform_set_drvdata(pdev, priv); > > npcm7xx_kcs_enable_channel(kcs_bmc, true); > rc = npcm7xx_kcs_config_irq(kcs_bmc, pdev); > if (rc) > return rc; > > - rc = misc_register(&kcs_bmc->miscdev); > - if (rc) { > - dev_err(dev, "Unable to register device\n"); > - return rc; > - } > > pr_info("channel=%u idr=0x%x odr=0x%x str=0x%x\n", > chan, > kcs_bmc->ioreg.idr, kcs_bmc->ioreg.odr, kcs_bmc->ioreg.str); > > + kcs_bmc_add_device(kcs_bmc); > + > return 0; > } > > static int npcm7xx_kcs_remove(struct platform_device *pdev) > { > - struct kcs_bmc *kcs_bmc = dev_get_drvdata(&pdev->dev); > + struct npcm7xx_kcs_bmc *priv = platform_get_drvdata(pdev); > + struct kcs_bmc *kcs_bmc = &priv->kcs_bmc; > > - misc_deregister(&kcs_bmc->miscdev); > + kcs_bmc_remove_device(kcs_bmc); > > return 0; > } > -- > 2.27.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel