Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c343a37 authored by Corentin LABBE's avatar Corentin LABBE Committed by Herbert Xu
Browse files

hwrng: amd - Access hardware via ioread32/iowrite32 



Instead of accessing hw directly via pmbase, it's better to
access after ioport_map() via ioread32/iowrite32.

Signed-off-by: default avatarLABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7bad2cc0

drivers/char/hw_random/amd-rng.c

+25 −6
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ 


#define DRV_NAME "AMD768-HWRNG"



#define RNGDATA		0x00

#define RNGDONE		0x04

#define PMBASE_OFFSET	0xF0

#define PMBASE_SIZE	8



/*

 * Data for PCI driver interface

 *
@@ -48,6 +53,7 @@ static const struct pci_device_id pci_tbl[] = { 
MODULE_DEVICE_TABLE(pci, pci_tbl);



struct amd768_priv {

	void __iomem *iobase;

	struct pci_dev *pcidev;

	u32 pmbase;

};
@@ -58,7 +64,7 @@ static int amd_rng_data_present(struct hwrng *rng, int wait) 
	int data, i;



	for (i = 0; i < 20; i++) {

		data = !!(inl(priv->pmbase + 0xF4) & 1);

		data = !!(ioread32(priv->iobase + RNGDONE) & 1);

		if (data || !wait)

			break;

		udelay(10);
@@ -70,7 +76,7 @@ static int amd_rng_data_read(struct hwrng *rng, u32 *data) 
{

	struct amd768_priv *priv = (struct amd768_priv *)rng->priv;



	*data = inl(priv->pmbase + 0xF0);

	*data = ioread32(priv->iobase + RNGDATA);



	return 4;

}
@@ -138,12 +144,20 @@ static int __init mod_init(void) 
	if (!priv)

		return -ENOMEM;



	if (!request_region(pmbase + 0xF0, 8, DRV_NAME)) {

	if (!request_region(pmbase + PMBASE_OFFSET, PMBASE_SIZE, DRV_NAME)) {

		dev_err(&pdev->dev, DRV_NAME " region 0x%x already in use!\n",

			pmbase + 0xF0);

		err = -EBUSY;

		goto out;

	}



	priv->iobase = ioport_map(pmbase + PMBASE_OFFSET, PMBASE_SIZE);

	if (!priv->iobase) {

		pr_err(DRV_NAME "Cannot map ioport\n");

		err = -EINVAL;

		goto err_iomap;

	}



	amd_rng.priv = (unsigned long)priv;

	priv->pmbase = pmbase;

	priv->pcidev = pdev;
@@ -152,11 +166,14 @@ static int __init mod_init(void) 
	err = hwrng_register(&amd_rng);

	if (err) {

		pr_err(DRV_NAME " registering failed (%d)\n", err);

		release_region(pmbase + 0xF0, 8);

		goto out;

		goto err_hwrng;

	}

	return 0;



err_hwrng:

	ioport_unmap(priv->iobase);

err_iomap:

	release_region(pmbase + PMBASE_OFFSET, PMBASE_SIZE);

out:

	kfree(priv);

	return err;
@@ -170,7 +187,9 @@ static void __exit mod_exit(void) 


	hwrng_unregister(&amd_rng);



	release_region(priv->pmbase + 0xF0, 8);

	ioport_unmap(priv->iobase);



	release_region(priv->pmbase + PMBASE_OFFSET, PMBASE_SIZE);



	kfree(priv);

}