From: LABBE Corentin <clabbe.montjoie@gmail.com>
To: mpm@selenic.com, herbert@gondor.apana.org.au,
linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, LABBE Corentin <clabbe.montjoie@gmail.com>
Subject: [PATCH v3 6/8] hwrng: amd: Replace global variable with private struct
Date: Fri, 26 Aug 2016 13:11:34 +0200 [thread overview]
Message-ID: <1472209896-17197-7-git-send-email-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <1472209896-17197-1-git-send-email-clabbe.montjoie@gmail.com>
Instead of having two global variable, it's better to use a
private struct. This will permit to remove amd_pdev variable
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
---
drivers/char/hw_random/amd-rng.c | 57 ++++++++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 19 deletions(-)
diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
index 383e197..4ef94e9 100644
--- a/drivers/char/hw_random/amd-rng.c
+++ b/drivers/char/hw_random/amd-rng.c
@@ -47,15 +47,18 @@ static const struct pci_device_id pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, pci_tbl);
-static struct pci_dev *amd_pdev;
+struct amd768_priv {
+ struct pci_dev *pcidev;
+ u32 pmbase;
+};
static int amd_rng_data_present(struct hwrng *rng, int wait)
{
- u32 pmbase = (u32)rng->priv;
+ struct amd768_priv *priv = (struct amd768_priv *)rng->priv;
int data, i;
for (i = 0; i < 20; i++) {
- data = !!(inl(pmbase + 0xF4) & 1);
+ data = !!(inl(priv->pmbase + 0xF4) & 1);
if (data || !wait)
break;
udelay(10);
@@ -65,35 +68,37 @@ static int amd_rng_data_present(struct hwrng *rng, int wait)
static int amd_rng_data_read(struct hwrng *rng, u32 *data)
{
- u32 pmbase = (u32)rng->priv;
+ struct amd768_priv *priv = (struct amd768_priv *)rng->priv;
- *data = inl(pmbase + 0xF0);
+ *data = inl(priv->pmbase + 0xF0);
return 4;
}
static int amd_rng_init(struct hwrng *rng)
{
+ struct amd768_priv *priv = (struct amd768_priv *)rng->priv;
u8 rnen;
- pci_read_config_byte(amd_pdev, 0x40, &rnen);
+ pci_read_config_byte(priv->pcidev, 0x40, &rnen);
rnen |= BIT(7); /* RNG on */
- pci_write_config_byte(amd_pdev, 0x40, rnen);
+ pci_write_config_byte(priv->pcidev, 0x40, rnen);
- pci_read_config_byte(amd_pdev, 0x41, &rnen);
+ pci_read_config_byte(priv->pcidev, 0x41, &rnen);
rnen |= BIT(7); /* PMIO enable */
- pci_write_config_byte(amd_pdev, 0x41, rnen);
+ pci_write_config_byte(priv->pcidev, 0x41, rnen);
return 0;
}
static void amd_rng_cleanup(struct hwrng *rng)
{
+ struct amd768_priv *priv = (struct amd768_priv *)rng->priv;
u8 rnen;
- pci_read_config_byte(amd_pdev, 0x40, &rnen);
+ pci_read_config_byte(priv->pcidev, 0x40, &rnen);
rnen &= ~BIT(7); /* RNG off */
- pci_write_config_byte(amd_pdev, 0x40, rnen);
+ pci_write_config_byte(priv->pcidev, 0x40, rnen);
}
static struct hwrng amd_rng = {
@@ -110,6 +115,7 @@ static int __init mod_init(void)
struct pci_dev *pdev = NULL;
const struct pci_device_id *ent;
u32 pmbase;
+ struct amd768_priv *priv;
for_each_pci_dev(pdev) {
ent = pci_match_id(pci_tbl, pdev);
@@ -117,24 +123,30 @@ static int __init mod_init(void)
goto found;
}
/* Device not found. */
- goto out;
+ return -ENODEV;
found:
err = pci_read_config_dword(pdev, 0x58, &pmbase);
if (err)
- goto out;
- err = -EIO;
+ return err;
+
pmbase &= 0x0000FF00;
if (pmbase == 0)
- goto out;
+ return -EIO;
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
if (!request_region(pmbase + 0xF0, 8, DRV_NAME)) {
dev_err(&pdev->dev, DRV_NAME " region 0x%x already in use!\n",
pmbase + 0xF0);
err = -EBUSY;
goto out;
}
- amd_rng.priv = (unsigned long)pmbase;
- amd_pdev = pdev;
+ amd_rng.priv = (unsigned long)priv;
+ priv->pmbase = pmbase;
+ priv->pcidev = pdev;
pr_info(DRV_NAME " detected\n");
err = hwrng_register(&amd_rng);
@@ -143,17 +155,24 @@ found:
release_region(pmbase + 0xF0, 8);
goto out;
}
+ return 0;
+
out:
+ kfree(priv);
return err;
}
static void __exit mod_exit(void)
{
- u32 pmbase = (unsigned long)amd_rng.priv;
+ struct amd768_priv *priv;
+
+ priv = (struct amd768_priv *)amd_rng.priv;
hwrng_unregister(&amd_rng);
- release_region(pmbase + 0xF0, 8);
+ release_region(priv->pmbase + 0xF0, 8);
+
+ kfree(priv);
}
module_init(mod_init);
--
2.7.3
next prev parent reply other threads:[~2016-08-26 11:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-26 11:11 [PATCH v3 0/8] hwrng: amd: rework of the amd hwrng driver LABBE Corentin
2016-08-26 11:11 ` [PATCH v3 1/8] hwrng: amd: Fix style problem with blank line LABBE Corentin
2016-08-26 11:11 ` [PATCH v3 2/8] hwrng: amd: use the BIT macro LABBE Corentin
2016-08-26 11:11 ` [PATCH v3 3/8] hwrng: amd: Be consitent with the driver name LABBE Corentin
2016-08-26 11:11 ` [PATCH v3 4/8] hwrng: amd: Remove asm/io.h LABBE Corentin
2016-08-26 11:11 ` [PATCH v3 5/8] hwrng: amd: release_region must be called after hwrng_unregister LABBE Corentin
2016-08-26 11:11 ` LABBE Corentin [this message]
2016-08-27 14:43 ` [PATCH v3 6/8] hwrng: amd: Replace global variable with private struct Jason Cooper
2016-08-27 15:36 ` Jason Cooper
2016-08-26 11:11 ` [PATCH v3 7/8] hwrng: amd: Access hardware via ioread32/iowrite32 LABBE Corentin
2016-08-26 11:11 ` [PATCH v3 8/8] hwrng: amd: Convert to new hwrng read() API LABBE Corentin
2016-08-27 14:49 ` [PATCH v3 0/8] hwrng: amd: rework of the amd hwrng driver Jason Cooper
2016-08-31 15:18 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472209896-17197-7-git-send-email-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpm@selenic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).