| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1453123957-19881-1-git-send-email-ysato@users.sourceforge.jp>
Date: Mon, 18 Jan 2016 22:32:36 +0900
From: Yoshinori Sato <ysato@...rs.sourceforge.jp>
To: netdev@...r.kernel.org
Cc: Yoshinori Sato <ysato@...rs.sourceforge.jp>,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 1/2] ne: DeviceTree support.
Add basic device tree support.
Changes for v2
- Add "national,dcr" property read check.
Signed-off-by: Yoshinori Sato <ysato@...rs.sourceforge.jp>
---
Documentation/devicetree/bindings/net/ne2000.txt | 17 +++++++++++
drivers/net/ethernet/8390/ne.c | 36 +++++++++++++++++++-----
2 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/ne2000.txt
diff --git a/Documentation/devicetree/bindings/net/ne2000.txt b/Documentation/devicetree/bindings/net/ne2000.txt
new file mode 100644
index 0000000..8b0dfbf
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/ne2000.txt
@@ -0,0 +1,17 @@
+NE2000 compatible network controller
+
+Required properties:
+- compatible: "national,ne2000"
+- reg: base address and length of NE2000.
+- interrupts: interrupt specifier for the sole interrupt.
+- national,dcr: DP8390 DCR setting value.
+
+Example
+
+ ne2000: ethernet@...000 {
+ compatible = "national,ne2000";
+ reg = <0x200000 32>;
+ interrupts = <17 0>;
+ national,dcr = <0x48>;
+ };
+
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index c063b41..f1c21c6 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -52,6 +52,7 @@ static const char version2[] =
#include <linux/etherdevice.h>
#include <linux/jiffies.h>
#include <linux/platform_device.h>
+#include <linux/of.h>
#include <asm/io.h>
@@ -72,6 +73,7 @@ static int io[MAX_NE_CARDS];
static int irq[MAX_NE_CARDS];
static int bad[MAX_NE_CARDS];
static u32 ne_msg_enable;
+static unsigned int of_dcr_val;
#ifdef MODULE
module_param_array(io, int, NULL, 0);
@@ -171,6 +173,8 @@ bad_clone_list[] __initdata = {
# define DCR_VAL 0x48 /* 8-bit mode */
#elif defined(CONFIG_ATARI) /* 8-bit mode on Atari, normal on Q40 */
# define DCR_VAL (MACH_IS_ATARI ? 0x48 : 0x49)
+#elif defined(CONFIG_OF_NET)
+# define DCR_VAL of_dcr_val
#else
# define DCR_VAL 0x49
#endif
@@ -304,7 +308,8 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
struct ei_device *ei_local = netdev_priv(dev);
if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
- return -EBUSY;
+ if (!request_mem_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
+ return -EBUSY;
reg0 = inb_p(ioaddr);
if (reg0 == 0xFF) {
@@ -808,18 +813,28 @@ static int __init ne_drv_probe(struct platform_device *pdev)
if (!dev)
return -ENOMEM;
+ if (dev_of_node(&pdev->dev)) {
+ err = of_property_read_u32(dev_of_node(&pdev->dev),
+ "national,dcr", &of_dcr_val);
+ if (err)
+ goto fail;
+ }
+
/* ne.c doesn't populate resources in platform_device, but
* rbtx4927_ne_init and rbtx4938_ne_init do register devices
* with resources.
*/
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+ if (!res)
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
if (res) {
dev->base_addr = res->start;
dev->irq = platform_get_irq(pdev, 0);
} else {
if (this_dev < 0 || this_dev >= MAX_NE_CARDS) {
- free_netdev(dev);
- return -EINVAL;
+ err = -EINVAL;
+ goto fail;
}
dev->base_addr = io[this_dev];
dev->irq = irq[this_dev];
@@ -827,10 +842,8 @@ static int __init ne_drv_probe(struct platform_device *pdev)
}
SET_NETDEV_DEV(dev, &pdev->dev);
err = do_ne_probe(dev);
- if (err) {
- free_netdev(dev);
- return err;
- }
+ if (err)
+ goto fail;
platform_set_drvdata(pdev, dev);
/* Update with any values found by probing, don't update if
@@ -841,6 +854,9 @@ static int __init ne_drv_probe(struct platform_device *pdev)
irq[this_dev] = dev->irq;
}
return 0;
+fail:
+ free_netdev(dev);
+ return err;
}
static int ne_drv_remove(struct platform_device *pdev)
@@ -914,12 +930,18 @@ static int ne_drv_resume(struct platform_device *pdev)
#define ne_drv_resume NULL
#endif
+static const struct of_device_id ne2000_of_table[] __maybe_unused = {
+ { .compatible = "national,ne2000" },
+ { }
+};
+
static struct platform_driver ne_driver = {
.remove = ne_drv_remove,
.suspend = ne_drv_suspend,
.resume = ne_drv_resume,
.driver = {
.name = DRV_NAME,
+ .of_match_table = of_match_ptr(ne2000_of_table),
},
};
--
2.6.1
Powered by blists - more mailing lists