Skip to content

L
linux
Commit c46920da authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'for-david' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6

parents f5f4cf08 6476a907
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1379 additions and 2066 deletions
Documentation/DocBook/Makefile
View file @ c46920da
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# To add a new book the only step required is to add the book to the # To add a new book the only step required is to add the book to the
# list of DOCBOOKS. # list of DOCBOOKS.
DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \ DOCBOOKS := z8530book.xml mcabook.xml \
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
procfs-guide.xml writing_usb_driver.xml networking.xml \ procfs-guide.xml writing_usb_driver.xml networking.xml \
kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
......
Documentation/DocBook/networking.tmpl
View file @ c46920da
...@@ -98,9 +98,6 @@ ...@@ -98,9 +98,6 @@
X!Enet/core/wireless.c X!Enet/core/wireless.c
</sect1> </sect1>
--> -->
<sect1><title>Synchronous PPP</title>
!Edrivers/net/wan/syncppp.c
</sect1>
</chapter> </chapter>
</book> </book>
Documentation/DocBook/wanbook.tmpl deleted 100644 → 0
View file @ f5f4cf08
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
<book id="WANGuide">
<bookinfo>
<title>Synchronous PPP and Cisco HDLC Programming Guide</title>
<authorgroup>
<author>
<firstname>Alan</firstname>
<surname>Cox</surname>
<affiliation>
<address>
<email>alan@lxorguk.ukuu.org.uk</email>
</address>
</affiliation>
</author>
</authorgroup>
<copyright>
<year>2000</year>
<holder>Alan Cox</holder>
</copyright>
<legalnotice>
<para>
This documentation is free software; you can redistribute
it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
</para>
<para>
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
</para>
<para>
You should have received a copy of the GNU General Public
License along with this program; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
MA 02111-1307 USA
</para>
<para>
For more details see the file COPYING in the source
distribution of Linux.
</para>
</legalnotice>
</bookinfo>
<toc></toc>
<chapter id="intro">
<title>Introduction</title>
<para>
The syncppp drivers in Linux provide a fairly complete
implementation of Cisco HDLC and a minimal implementation of
PPP. The longer term goal is to switch the PPP layer to the
generic PPP interface that is new in Linux 2.3.x. The API should
remain unchanged when this is done, but support will then be
available for IPX, compression and other PPP features
</para>
</chapter>
<chapter id="bugs">
<title>Known Bugs And Assumptions</title>
<para>
<variablelist>
<varlistentry><term>PPP is minimal</term>
<listitem>
<para>
The current PPP implementation is very basic, although sufficient
for most wan usages.
</para>
</listitem></varlistentry>
<varlistentry><term>Cisco HDLC Quirks</term>
<listitem>
<para>
Currently we do not end all packets with the correct Cisco multicast
or unicast flags. Nothing appears to mind too much but this should
be corrected.
</para>
</listitem></varlistentry>
</variablelist>
</para>
</chapter>
<chapter id="pubfunctions">
<title>Public Functions Provided</title>
!Edrivers/net/wan/syncppp.c
</chapter>
</book>
Documentation/networking/generic-hdlc.txt
View file @ c46920da
...@@ -3,15 +3,15 @@ Krzysztof Halasa <khc@pm.waw.pl> ...@@ -3,15 +3,15 @@ Krzysztof Halasa <khc@pm.waw.pl>
Generic HDLC layer currently supports: Generic HDLC layer currently supports:
1. Frame Relay (ANSI, CCITT, Cisco and no LMI). 1. Frame Relay (ANSI, CCITT, Cisco and no LMI)
- Normal (routed) and Ethernet-bridged (Ethernet device emulation) - Normal (routed) and Ethernet-bridged (Ethernet device emulation)
interfaces can share a single PVC. interfaces can share a single PVC.
- ARP support (no InARP support in the kernel - there is an - ARP support (no InARP support in the kernel - there is an
experimental InARP user-space daemon available on: experimental InARP user-space daemon available on:
http://www.kernel.org/pub/linux/utils/net/hdlc/). http://www.kernel.org/pub/linux/utils/net/hdlc/).
2. raw HDLC - either IP (IPv4) interface or Ethernet device emulation. 2. raw HDLC - either IP (IPv4) interface or Ethernet device emulation
3. Cisco HDLC. 3. Cisco HDLC
4. PPP (uses syncppp.c). 4. PPP
5. X.25 (uses X.25 routines). 5. X.25 (uses X.25 routines).
Generic HDLC is a protocol driver only - it needs a low-level driver Generic HDLC is a protocol driver only - it needs a low-level driver
......
drivers/net/wan/Makefile
View file @ c46920da
...@@ -14,7 +14,7 @@ obj-$(CONFIG_HDLC_RAW) += hdlc_raw.o ...@@ -14,7 +14,7 @@ obj-$(CONFIG_HDLC_RAW) += hdlc_raw.o
obj-$(CONFIG_HDLC_RAW_ETH) += hdlc_raw_eth.o obj-$(CONFIG_HDLC_RAW_ETH) += hdlc_raw_eth.o
obj-$(CONFIG_HDLC_CISCO) += hdlc_cisco.o obj-$(CONFIG_HDLC_CISCO) += hdlc_cisco.o
obj-$(CONFIG_HDLC_FR) += hdlc_fr.o obj-$(CONFIG_HDLC_FR) += hdlc_fr.o
obj-$(CONFIG_HDLC_PPP) += hdlc_ppp.o syncppp.o obj-$(CONFIG_HDLC_PPP) += hdlc_ppp.o
obj-$(CONFIG_HDLC_X25) += hdlc_x25.o obj-$(CONFIG_HDLC_X25) += hdlc_x25.o
pc300-y := pc300_drv.o pc300-y := pc300_drv.o
......
drivers/net/wan/c101.c
View file @ c46920da
...@@ -88,7 +88,7 @@ static card_t **new_card = &first_card; ...@@ -88,7 +88,7 @@ static card_t **new_card = &first_card;
/* EDA address register must be set in EDAL, EDAH order - 8 bit ISA bus */ /* EDA address register must be set in EDAL, EDAH order - 8 bit ISA bus */
#define sca_outw(value, reg, card) do { \ #define sca_outw(value, reg, card) do { \
writeb(value & 0xFF, (card)->win0base + C101_SCA + (reg)); \ writeb(value & 0xFF, (card)->win0base + C101_SCA + (reg)); \
writeb((value >> 8 ) & 0xFF, (card)->win0base + C101_SCA + (reg+1));\ writeb((value >> 8 ) & 0xFF, (card)->win0base + C101_SCA + (reg + 1));\
} while(0) } while(0)
#define port_to_card(port) (port) #define port_to_card(port) (port)
...@@ -113,7 +113,7 @@ static inline void openwin(card_t *card, u8 page) ...@@ -113,7 +113,7 @@ static inline void openwin(card_t *card, u8 page)
} }
#include "hd6457x.c" #include "hd64570.c"
static inline void set_carrier(port_t *port) static inline void set_carrier(port_t *port)
...@@ -381,7 +381,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) ...@@ -381,7 +381,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
return result; return result;
} }
sca_init_sync_port(card); /* Set up C101 memory */ sca_init_port(card); /* Set up C101 memory */
set_carrier(card); set_carrier(card);
printk(KERN_INFO "%s: Moxa C101 on IRQ%u," printk(KERN_INFO "%s: Moxa C101 on IRQ%u,"
......
drivers/net/wan/hd64572.c 0 → 100644
View file @ c46920da
This diff is collapsed.
drivers/net/wan/hdlc_ppp.c
View file @ c46920da
This diff is collapsed.
drivers/net/wan/n2.c
View file @ c46920da
...@@ -53,7 +53,7 @@ static const char* devname = "RISCom/N2"; ...@@ -53,7 +53,7 @@ static const char* devname = "RISCom/N2";
#define NEED_SCA_MSCI_INTR #define NEED_SCA_MSCI_INTR
#define MAX_TX_BUFFERS 10 #define MAX_TX_BUFFERS 10
static char *hw = NULL; /* pointer to hw=xxx command line string */ static char *hw; /* pointer to hw=xxx command line string */
/* RISCom/N2 Board Registers */ /* RISCom/N2 Board Registers */
...@@ -145,7 +145,6 @@ static card_t **new_card = &first_card; ...@@ -145,7 +145,6 @@ static card_t **new_card = &first_card;
&(card)->ports[port] : NULL) &(card)->ports[port] : NULL)
static __inline__ u8 sca_get_page(card_t *card) static __inline__ u8 sca_get_page(card_t *card)
{ {
return inb(card->io + N2_PSR) & PSR_PAGEBITS; return inb(card->io + N2_PSR) & PSR_PAGEBITS;
...@@ -159,9 +158,7 @@ static __inline__ void openwin(card_t *card, u8 page) ...@@ -159,9 +158,7 @@ static __inline__ void openwin(card_t *card, u8 page)
} }
#include "hd64570.c"
#include "hd6457x.c"
static void n2_set_iface(port_t *port) static void n2_set_iface(port_t *port)
...@@ -478,7 +475,7 @@ static int __init n2_run(unsigned long io, unsigned long irq, ...@@ -478,7 +475,7 @@ static int __init n2_run(unsigned long io, unsigned long irq,
n2_destroy_card(card); n2_destroy_card(card);
return -ENOBUFS; return -ENOBUFS;
} }
sca_init_sync_port(port); /* Set up SCA memory */ sca_init_port(port); /* Set up SCA memory */
printk(KERN_INFO "%s: RISCom/N2 node %d\n", printk(KERN_INFO "%s: RISCom/N2 node %d\n",
dev->name, port->phy_node); dev->name, port->phy_node);
......
drivers/net/wan/pc300too.c
View file @ c46920da
/* /*
* Cyclades PC300 synchronous serial card driver for Linux * Cyclades PC300 synchronous serial card driver for Linux
* *
* Copyright (C) 2000-2007 Krzysztof Halasa <khc@pm.waw.pl> * Copyright (C) 2000-2008 Krzysztof Halasa <khc@pm.waw.pl>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License * under the terms of version 2 of the GNU General Public License
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* Sources of information: * Sources of information:
* Hitachi HD64572 SCA-II User's Manual * Hitachi HD64572 SCA-II User's Manual
* Cyclades PC300 Linux driver * Original Cyclades PC300 Linux driver
* *
* This driver currently supports only PC300/RSV (V.24/V.35) and * This driver currently supports only PC300/RSV (V.24/V.35) and
* PC300/X21 cards. * PC300/X21 cards.
...@@ -37,17 +37,11 @@ ...@@ -37,17 +37,11 @@
#include "hd64572.h" #include "hd64572.h"
static const char* version = "Cyclades PC300 driver version: 1.17";
static const char* devname = "PC300";
#undef DEBUG_PKT #undef DEBUG_PKT
#define DEBUG_RINGS #define DEBUG_RINGS
#define PC300_PLX_SIZE 0x80 /* PLX control window size (128 B) */ #define PC300_PLX_SIZE 0x80 /* PLX control window size (128 B) */
#define PC300_SCA_SIZE 0x400 /* SCA window size (1 KB) */ #define PC300_SCA_SIZE 0x400 /* SCA window size (1 KB) */
#define ALL_PAGES_ALWAYS_MAPPED
#define NEED_DETECT_RAM
#define NEED_SCA_MSCI_INTR
#define MAX_TX_BUFFERS 10 #define MAX_TX_BUFFERS 10
static int pci_clock_freq = 33000000; static int pci_clock_freq = 33000000;
...@@ -81,7 +75,8 @@ typedef struct { ...@@ -81,7 +75,8 @@ typedef struct {
typedef struct port_s { typedef struct port_s {
struct net_device *dev; struct napi_struct napi;
struct net_device *netdev;
struct card_s *card; struct card_s *card;
spinlock_t lock; /* TX lock */ spinlock_t lock; /* TX lock */
sync_serial_settings settings; sync_serial_settings settings;
...@@ -93,7 +88,7 @@ typedef struct port_s { ...@@ -93,7 +88,7 @@ typedef struct port_s {
u16 txin; /* tx ring buffer 'in' and 'last' pointers */ u16 txin; /* tx ring buffer 'in' and 'last' pointers */
u16 txlast; u16 txlast;
u8 rxs, txs, tmc; /* SCA registers */ u8 rxs, txs, tmc; /* SCA registers */
u8 phy_node; /* physical port # - 0 or 1 */ u8 chan; /* physical port # - 0 or 1 */
}port_t; }port_t;
...@@ -114,21 +109,10 @@ typedef struct card_s { ...@@ -114,21 +109,10 @@ typedef struct card_s {
}card_t; }card_t;
#define sca_in(reg, card) readb(card->scabase + (reg))
#define sca_out(value, reg, card) writeb(value, card->scabase + (reg))
#define sca_inw(reg, card) readw(card->scabase + (reg))
#define sca_outw(value, reg, card) writew(value, card->scabase + (reg))
#define sca_inl(reg, card) readl(card->scabase + (reg))
#define sca_outl(value, reg, card) writel(value, card->scabase + (reg))
#define port_to_card(port) (port->card)
#define log_node(port) (port->phy_node)
#define phy_node(port) (port->phy_node)
#define winbase(card) (card->rambase)
#define get_port(card, port) ((port) < (card)->n_ports ? \ #define get_port(card, port) ((port) < (card)->n_ports ? \
(&(card)->ports[port]) : (NULL)) (&(card)->ports[port]) : (NULL))
#include "hd6457x.c" #include "hd64572.c"
static void pc300_set_iface(port_t *port) static void pc300_set_iface(port_t *port)
...@@ -139,8 +123,8 @@ static void pc300_set_iface(port_t *port) ...@@ -139,8 +123,8 @@ static void pc300_set_iface(port_t *port)
u8 rxs = port->rxs & CLK_BRG_MASK; u8 rxs = port->rxs & CLK_BRG_MASK;
u8 txs = port->txs & CLK_BRG_MASK; u8 txs = port->txs & CLK_BRG_MASK;
sca_out(EXS_TES1, (phy_node(port) ? MSCI1_OFFSET : MSCI0_OFFSET) + EXS, sca_out(EXS_TES1, (port->chan ? MSCI1_OFFSET : MSCI0_OFFSET) + EXS,
port_to_card(port)); port->card);
switch(port->settings.clock_type) { switch(port->settings.clock_type) {
case CLOCK_INT: case CLOCK_INT:
rxs |= CLK_BRG; /* BRG output */ rxs |= CLK_BRG; /* BRG output */
...@@ -172,10 +156,10 @@ static void pc300_set_iface(port_t *port) ...@@ -172,10 +156,10 @@ static void pc300_set_iface(port_t *port)
if (port->card->type == PC300_RSV) { if (port->card->type == PC300_RSV) {
if (port->iface == IF_IFACE_V35) if (port->iface == IF_IFACE_V35)
writel(card->init_ctrl_value | writel(card->init_ctrl_value |
PC300_CHMEDIA_MASK(port->phy_node), init_ctrl); PC300_CHMEDIA_MASK(port->chan), init_ctrl);
else else
writel(card->init_ctrl_value & writel(card->init_ctrl_value &
~PC300_CHMEDIA_MASK(port->phy_node), init_ctrl); ~PC300_CHMEDIA_MASK(port->chan), init_ctrl);
} }
} }
...@@ -280,10 +264,8 @@ static void pc300_pci_remove_one(struct pci_dev *pdev) ...@@ -280,10 +264,8 @@ static void pc300_pci_remove_one(struct pci_dev *pdev)
card_t *card = pci_get_drvdata(pdev); card_t *card = pci_get_drvdata(pdev);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
if (card->ports[i].card) { if (card->ports[i].card)
struct net_device *dev = port_to_dev(&card->ports[i]); unregister_hdlc_device(card->ports[i].netdev);
unregister_hdlc_device(dev);
}
if (card->irq) if (card->irq)
free_irq(card->irq, card); free_irq(card->irq, card);
...@@ -298,10 +280,10 @@ static void pc300_pci_remove_one(struct pci_dev *pdev) ...@@ -298,10 +280,10 @@ static void pc300_pci_remove_one(struct pci_dev *pdev)
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
if (card->ports[0].dev) if (card->ports[0].netdev)
free_netdev(card->ports[0].dev); free_netdev(card->ports[0].netdev);
if (card->ports[1].dev) if (card->ports[1].netdev)
free_netdev(card->ports[1].dev); free_netdev(card->ports[1].netdev);
kfree(card); kfree(card);
} }
...@@ -318,12 +300,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -318,12 +300,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
u32 scaphys; /* SCA memory base */ u32 scaphys; /* SCA memory base */
u32 plxphys; /* PLX registers memory base */ u32 plxphys; /* PLX registers memory base */
#ifndef MODULE
static int printed_version;
if (!printed_version++)
printk(KERN_INFO "%s\n", version);
#endif
i = pci_enable_device(pdev); i = pci_enable_device(pdev);
if (i) if (i)
return i; return i;
...@@ -343,27 +319,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -343,27 +319,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
} }
pci_set_drvdata(pdev, card); pci_set_drvdata(pdev, card);
if (pdev->device == PCI_DEVICE_ID_PC300_TE_1 ||
pdev->device == PCI_DEVICE_ID_PC300_TE_2)
card->type = PC300_TE; /* not fully supported */
else if (card->init_ctrl_value & PC300_CTYPE_MASK)
card->type = PC300_X21;
else
card->type = PC300_RSV;
if (pdev->device == PCI_DEVICE_ID_PC300_RX_1 ||
pdev->device == PCI_DEVICE_ID_PC300_TE_1)
card->n_ports = 1;
else
card->n_ports = 2;
for (i = 0; i < card->n_ports; i++)
if (!(card->ports[i].dev = alloc_hdlcdev(&card->ports[i]))) {
printk(KERN_ERR "pc300: unable to allocate memory\n");
pc300_pci_remove_one(pdev);
return -ENOMEM;
}
if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE || if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE ||
pci_resource_len(pdev, 2) != PC300_SCA_SIZE || pci_resource_len(pdev, 2) != PC300_SCA_SIZE ||
pci_resource_len(pdev, 3) < 16384) { pci_resource_len(pdev, 3) < 16384) {
...@@ -372,13 +327,13 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -372,13 +327,13 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
return -EFAULT; return -EFAULT;
} }
plxphys = pci_resource_start(pdev,0) & PCI_BASE_ADDRESS_MEM_MASK; plxphys = pci_resource_start(pdev, 0) & PCI_BASE_ADDRESS_MEM_MASK;
card->plxbase = ioremap(plxphys, PC300_PLX_SIZE); card->plxbase = ioremap(plxphys, PC300_PLX_SIZE);
scaphys = pci_resource_start(pdev,2) & PCI_BASE_ADDRESS_MEM_MASK; scaphys = pci_resource_start(pdev, 2) & PCI_BASE_ADDRESS_MEM_MASK;
card->scabase = ioremap(scaphys, PC300_SCA_SIZE); card->scabase = ioremap(scaphys, PC300_SCA_SIZE);
ramphys = pci_resource_start(pdev,3) & PCI_BASE_ADDRESS_MEM_MASK; ramphys = pci_resource_start(pdev, 3) & PCI_BASE_ADDRESS_MEM_MASK;
card->rambase = pci_ioremap_bar(pdev, 3); card->rambase = pci_ioremap_bar(pdev, 3);
if (card->plxbase == NULL || if (card->plxbase == NULL ||
...@@ -393,6 +348,27 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -393,6 +348,27 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
card->init_ctrl_value = readl(&((plx9050 __iomem *)card->scabase)->init_ctrl); card->init_ctrl_value = readl(&((plx9050 __iomem *)card->scabase)->init_ctrl);
pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys); pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys);
if (pdev->device == PCI_DEVICE_ID_PC300_TE_1 ||
pdev->device == PCI_DEVICE_ID_PC300_TE_2)
card->type = PC300_TE; /* not fully supported */
else if (card->init_ctrl_value & PC300_CTYPE_MASK)
card->type = PC300_X21;
else
card->type = PC300_RSV;
if (pdev->device == PCI_DEVICE_ID_PC300_RX_1 ||
pdev->device == PCI_DEVICE_ID_PC300_TE_1)
card->n_ports = 1;
else
card->n_ports = 2;
for (i = 0; i < card->n_ports; i++)
if (!(card->ports[i].netdev = alloc_hdlcdev(&card->ports[i]))) {
printk(KERN_ERR "pc300: unable to allocate memory\n");
pc300_pci_remove_one(pdev);
return -ENOMEM;
}
/* Reset PLX */ /* Reset PLX */
p = &card->plxbase->init_ctrl; p = &card->plxbase->init_ctrl;
writel(card->init_ctrl_value | 0x40000000, p); writel(card->init_ctrl_value | 0x40000000, p);
...@@ -446,7 +422,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -446,7 +422,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
writew(0x0041, &card->plxbase->intr_ctrl_stat); writew(0x0041, &card->plxbase->intr_ctrl_stat);
/* Allocate IRQ */ /* Allocate IRQ */
if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, devname, card)) { if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pc300", card)) {
printk(KERN_WARNING "pc300: could not allocate IRQ%d.\n", printk(KERN_WARNING "pc300: could not allocate IRQ%d.\n",
pdev->irq); pdev->irq);
pc300_pci_remove_one(pdev); pc300_pci_remove_one(pdev);
...@@ -463,9 +439,9 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -463,9 +439,9 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
for (i = 0; i < card->n_ports; i++) { for (i = 0; i < card->n_ports; i++) {
port_t *port = &card->ports[i]; port_t *port = &card->ports[i];
struct net_device *dev = port_to_dev(port); struct net_device *dev = port->netdev;
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
port->phy_node = i; port->chan = i;
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
dev->irq = card->irq; dev->irq = card->irq;
...@@ -484,6 +460,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -484,6 +460,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
else else
port->iface = IF_IFACE_V35; port->iface = IF_IFACE_V35;
sca_init_port(port);
if (register_hdlc_device(dev)) { if (register_hdlc_device(dev)) {
printk(KERN_ERR "pc300: unable to register hdlc " printk(KERN_ERR "pc300: unable to register hdlc "
"device\n"); "device\n");
...@@ -491,10 +468,9 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev, ...@@ -491,10 +468,9 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
pc300_pci_remove_one(pdev); pc300_pci_remove_one(pdev);
return -ENOBUFS; return -ENOBUFS;
} }
sca_init_sync_port(port); /* Set up SCA memory */
printk(KERN_INFO "%s: PC300 node %d\n", printk(KERN_INFO "%s: PC300 channel %d\n",
dev->name, port->phy_node); dev->name, port->chan);
} }
return 0; return 0;
} }
...@@ -524,9 +500,6 @@ static struct pci_driver pc300_pci_driver = { ...@@ -524,9 +500,6 @@ static struct pci_driver pc300_pci_driver = {
static int __init pc300_init_module(void) static int __init pc300_init_module(void)
{ {
#ifdef MODULE
printk(KERN_INFO "%s\n", version);
#endif
if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) { if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
printk(KERN_ERR "pc300: Invalid PCI clock frequency\n"); printk(KERN_ERR "pc300: Invalid PCI clock frequency\n");
return -EINVAL; return -EINVAL;
......
drivers/net/wan/pci200syn.c
View file @ c46920da
/* /*
* Goramo PCI200SYN synchronous serial card driver for Linux * Goramo PCI200SYN synchronous serial card driver for Linux
* *
* Copyright (C) 2002-2003 Krzysztof Halasa <khc@pm.waw.pl> * Copyright (C) 2002-2008 Krzysztof Halasa <khc@pm.waw.pl>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License * under the terms of version 2 of the GNU General Public License
...@@ -33,17 +33,11 @@ ...@@ -33,17 +33,11 @@
#include "hd64572.h" #include "hd64572.h"
static const char* version = "Goramo PCI200SYN driver version: 1.16";
static const char* devname = "PCI200SYN";
#undef DEBUG_PKT #undef DEBUG_PKT
#define DEBUG_RINGS #define DEBUG_RINGS
#define PCI200SYN_PLX_SIZE 0x80 /* PLX control window size (128b) */ #define PCI200SYN_PLX_SIZE 0x80 /* PLX control window size (128b) */
#define PCI200SYN_SCA_SIZE 0x400 /* SCA window size (1Kb) */ #define PCI200SYN_SCA_SIZE 0x400 /* SCA window size (1Kb) */
#define ALL_PAGES_ALWAYS_MAPPED
#define NEED_DETECT_RAM
#define NEED_SCA_MSCI_INTR
#define MAX_TX_BUFFERS 10 #define MAX_TX_BUFFERS 10
static int pci_clock_freq = 33000000; static int pci_clock_freq = 33000000;
...@@ -68,7 +62,8 @@ typedef struct { ...@@ -68,7 +62,8 @@ typedef struct {
typedef struct port_s { typedef struct port_s {
struct net_device *dev; struct napi_struct napi;
struct net_device *netdev;
struct card_s *card; struct card_s *card;
spinlock_t lock; /* TX lock */ spinlock_t lock; /* TX lock */
sync_serial_settings settings; sync_serial_settings settings;
...@@ -79,7 +74,7 @@ typedef struct port_s { ...@@ -79,7 +74,7 @@ typedef struct port_s {
u16 txin; /* tx ring buffer 'in' and 'last' pointers */ u16 txin; /* tx ring buffer 'in' and 'last' pointers */
u16 txlast; u16 txlast;
u8 rxs, txs, tmc; /* SCA registers */ u8 rxs, txs, tmc; /* SCA registers */
u8 phy_node; /* physical port # - 0 or 1 */ u8 chan; /* physical port # - 0 or 1 */
}port_t; }port_t;
...@@ -97,17 +92,6 @@ typedef struct card_s { ...@@ -97,17 +92,6 @@ typedef struct card_s {
}card_t; }card_t;
#define sca_in(reg, card) readb(card->scabase + (reg))
#define sca_out(value, reg, card) writeb(value, card->scabase + (reg))
#define sca_inw(reg, card) readw(card->scabase + (reg))
#define sca_outw(value, reg, card) writew(value, card->scabase + (reg))
#define sca_inl(reg, card) readl(card->scabase + (reg))
#define sca_outl(value, reg, card) writel(value, card->scabase + (reg))
#define port_to_card(port) (port->card)
#define log_node(port) (port->phy_node)
#define phy_node(port) (port->phy_node)
#define winbase(card) (card->rambase)
#define get_port(card, port) (&card->ports[port]) #define get_port(card, port) (&card->ports[port])
#define sca_flush(card) (sca_in(IER0, card)); #define sca_flush(card) (sca_in(IER0, card));
...@@ -127,7 +111,7 @@ static inline void new_memcpy_toio(char __iomem *dest, char *src, int length) ...@@ -127,7 +111,7 @@ static inline void new_memcpy_toio(char __iomem *dest, char *src, int length)
#undef memcpy_toio #undef memcpy_toio
#define memcpy_toio new_memcpy_toio #define memcpy_toio new_memcpy_toio
#include "hd6457x.c" #include "hd64572.c"
static void pci200_set_iface(port_t *port) static void pci200_set_iface(port_t *port)
...@@ -137,8 +121,8 @@ static void pci200_set_iface(port_t *port) ...@@ -137,8 +121,8 @@ static void pci200_set_iface(port_t *port)
u8 rxs = port->rxs & CLK_BRG_MASK; u8 rxs = port->rxs & CLK_BRG_MASK;
u8 txs = port->txs & CLK_BRG_MASK; u8 txs = port->txs & CLK_BRG_MASK;
sca_out(EXS_TES1, (phy_node(port) ? MSCI1_OFFSET : MSCI0_OFFSET) + EXS, sca_out(EXS_TES1, (port->chan ? MSCI1_OFFSET : MSCI0_OFFSET) + EXS,
port_to_card(port)); port->card);
switch(port->settings.clock_type) { switch(port->settings.clock_type) {
case CLOCK_INT: case CLOCK_INT:
rxs |= CLK_BRG; /* BRG output */ rxs |= CLK_BRG; /* BRG output */
...@@ -180,7 +164,7 @@ static int pci200_open(struct net_device *dev) ...@@ -180,7 +164,7 @@ static int pci200_open(struct net_device *dev)
sca_open(dev); sca_open(dev);
pci200_set_iface(port); pci200_set_iface(port);
sca_flush(port_to_card(port)); sca_flush(port->card);
return 0; return 0;
} }
...@@ -189,7 +173,7 @@ static int pci200_open(struct net_device *dev) ...@@ -189,7 +173,7 @@ static int pci200_open(struct net_device *dev)
static int pci200_close(struct net_device *dev) static int pci200_close(struct net_device *dev)
{ {
sca_close(dev); sca_close(dev);
sca_flush(port_to_card(dev_to_port(dev))); sca_flush(dev_to_port(dev)->card);
hdlc_close(dev); hdlc_close(dev);
return 0; return 0;
} }
...@@ -242,7 +226,7 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -242,7 +226,7 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
memcpy(&port->settings, &new_line, size); /* Update settings */ memcpy(&port->settings, &new_line, size); /* Update settings */
pci200_set_iface(port); pci200_set_iface(port);
sca_flush(port_to_card(port)); sca_flush(port->card);
return 0; return 0;
default: default:
...@@ -258,10 +242,8 @@ static void pci200_pci_remove_one(struct pci_dev *pdev) ...@@ -258,10 +242,8 @@ static void pci200_pci_remove_one(struct pci_dev *pdev)
card_t *card = pci_get_drvdata(pdev); card_t *card = pci_get_drvdata(pdev);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
if (card->ports[i].card) { if (card->ports[i].card)
struct net_device *dev = port_to_dev(&card->ports[i]); unregister_hdlc_device(card->ports[i].netdev);
unregister_hdlc_device(dev);
}
if (card->irq) if (card->irq)
free_irq(card->irq, card); free_irq(card->irq, card);
...@@ -276,10 +258,10 @@ static void pci200_pci_remove_one(struct pci_dev *pdev) ...@@ -276,10 +258,10 @@ static void pci200_pci_remove_one(struct pci_dev *pdev)
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
if (card->ports[0].dev) if (card->ports[0].netdev)
free_netdev(card->ports[0].dev); free_netdev(card->ports[0].netdev);
if (card->ports[1].dev) if (card->ports[1].netdev)
free_netdev(card->ports[1].dev); free_netdev(card->ports[1].netdev);
kfree(card); kfree(card);
} }
...@@ -296,12 +278,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, ...@@ -296,12 +278,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
u32 scaphys; /* SCA memory base */ u32 scaphys; /* SCA memory base */
u32 plxphys; /* PLX registers memory base */ u32 plxphys; /* PLX registers memory base */
#ifndef MODULE
static int printed_version;
if (!printed_version++)
printk(KERN_INFO "%s\n", version);
#endif
i = pci_enable_device(pdev); i = pci_enable_device(pdev);
if (i) if (i)
return i; return i;
...@@ -320,9 +296,9 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, ...@@ -320,9 +296,9 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
return -ENOBUFS; return -ENOBUFS;
} }
pci_set_drvdata(pdev, card); pci_set_drvdata(pdev, card);
card->ports[0].dev = alloc_hdlcdev(&card->ports[0]); card->ports[0].netdev = alloc_hdlcdev(&card->ports[0]);
card->ports[1].dev = alloc_hdlcdev(&card->ports[1]); card->ports[1].netdev = alloc_hdlcdev(&card->ports[1]);
if (!card->ports[0].dev || !card->ports[1].dev) { if (!card->ports[0].netdev || !card->ports[1].netdev) {
printk(KERN_ERR "pci200syn: unable to allocate memory\n"); printk(KERN_ERR "pci200syn: unable to allocate memory\n");
pci200_pci_remove_one(pdev); pci200_pci_remove_one(pdev);
return -ENOMEM; return -ENOMEM;
...@@ -398,7 +374,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, ...@@ -398,7 +374,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
writew(readw(p) | 0x0040, p); writew(readw(p) | 0x0040, p);
/* Allocate IRQ */ /* Allocate IRQ */
if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, devname, card)) { if (request_irq(pdev->irq, sca_intr, IRQF_SHARED, "pci200syn", card)) {
printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n", printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
pdev->irq); pdev->irq);
pci200_pci_remove_one(pdev); pci200_pci_remove_one(pdev);
...@@ -410,9 +386,9 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, ...@@ -410,9 +386,9 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
port_t *port = &card->ports[i]; port_t *port = &card->ports[i];
struct net_device *dev = port_to_dev(port); struct net_device *dev = port->netdev;
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
port->phy_node = i; port->chan = i;
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
dev->irq = card->irq; dev->irq = card->irq;
...@@ -426,6 +402,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, ...@@ -426,6 +402,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
hdlc->xmit = sca_xmit; hdlc->xmit = sca_xmit;
port->settings.clock_type = CLOCK_EXT; port->settings.clock_type = CLOCK_EXT;
port->card = card; port->card = card;
sca_init_port(port);
if (register_hdlc_device(dev)) { if (register_hdlc_device(dev)) {
printk(KERN_ERR "pci200syn: unable to register hdlc " printk(KERN_ERR "pci200syn: unable to register hdlc "
"device\n"); "device\n");
...@@ -433,10 +410,9 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, ...@@ -433,10 +410,9 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
pci200_pci_remove_one(pdev); pci200_pci_remove_one(pdev);
return -ENOBUFS; return -ENOBUFS;
} }
sca_init_sync_port(port); /* Set up SCA memory */
printk(KERN_INFO "%s: PCI200SYN node %d\n", printk(KERN_INFO "%s: PCI200SYN channel %d\n",
dev->name, port->phy_node); dev->name, port->chan);
} }
sca_flush(card); sca_flush(card);
...@@ -464,9 +440,6 @@ static struct pci_driver pci200_pci_driver = { ...@@ -464,9 +440,6 @@ static struct pci_driver pci200_pci_driver = {
static int __init pci200_init_module(void) static int __init pci200_init_module(void)
{ {
#ifdef MODULE
printk(KERN_INFO "%s\n", version);
#endif
if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) { if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n"); printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
return -EINVAL; return -EINVAL;
......
drivers/net/wan/syncppp.c deleted 100644 → 0
View file @ f5f4cf08
This diff is collapsed.
include/net/syncppp.h deleted 100644 → 0
View file @ f5f4cf08
/*
* Defines for synchronous PPP/Cisco link level subroutines.
*
* Copyright (C) 1994 Cronyx Ltd.
* Author: Serge Vakulenko, <vak@zebub.msk.su>
*
* This software is distributed with NO WARRANTIES, not even the implied
* warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* Authors grant any other persons or organizations permission to use
* or modify this software as long as this message is kept with the software,
* all derivative works or modified versions.
*
* Version 1.7, Wed Jun 7 22:12:02 MSD 1995
*
*
*
*/
#ifndef _SYNCPPP_H_
#define _SYNCPPP_H_ 1
#ifdef __KERNEL__
struct slcp {
u16 state; /* state machine */
u32 magic; /* local magic number */
u_char echoid; /* id of last keepalive echo request */
u_char confid; /* id of last configuration request */
};
struct sipcp {
u16 state; /* state machine */
u_char confid; /* id of last configuration request */
};
struct sppp
{
struct sppp * pp_next; /* next interface in keepalive list */
u32 pp_flags; /* use Cisco protocol instead of PPP */
u16 pp_alivecnt; /* keepalive packets counter */
u16 pp_loopcnt; /* loopback detection counter */
u32 pp_seq; /* local sequence number */
u32 pp_rseq; /* remote sequence number */
struct slcp lcp; /* LCP params */
struct sipcp ipcp; /* IPCP params */
struct timer_list pp_timer;
struct net_device *pp_if;
char pp_link_state; /* Link status */
spinlock_t lock;
};
struct ppp_device
{
struct net_device *dev; /* Network device pointer */
struct sppp sppp; /* Synchronous PPP */
};
static inline struct sppp *sppp_of(struct net_device *dev)
{
struct ppp_device **ppp = dev->ml_priv;
BUG_ON((*ppp)->dev != dev);
return &(*ppp)->sppp;
}
#define PP_KEEPALIVE 0x01 /* use keepalive protocol */
#define PP_CISCO 0x02 /* use Cisco protocol instead of PPP */
#define PP_TIMO 0x04 /* cp_timeout routine active */
#define PP_DEBUG 0x08
#define PPP_MTU 1500 /* max. transmit unit */
#define LCP_STATE_CLOSED 0 /* LCP state: closed (conf-req sent) */
#define LCP_STATE_ACK_RCVD 1 /* LCP state: conf-ack received */
#define LCP_STATE_ACK_SENT 2 /* LCP state: conf-ack sent */
#define LCP_STATE_OPENED 3 /* LCP state: opened */
#define IPCP_STATE_CLOSED 0 /* IPCP state: closed (conf-req sent) */
#define IPCP_STATE_ACK_RCVD 1 /* IPCP state: conf-ack received */
#define IPCP_STATE_ACK_SENT 2 /* IPCP state: conf-ack sent */
#define IPCP_STATE_OPENED 3 /* IPCP state: opened */
#define SPPP_LINK_DOWN 0 /* link down - no keepalive */
#define SPPP_LINK_UP 1 /* link is up - keepalive ok */
void sppp_attach (struct ppp_device *pd);
void sppp_detach (struct net_device *dev);
int sppp_do_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd);
struct sk_buff *sppp_dequeue (struct net_device *dev);
int sppp_isempty (struct net_device *dev);
void sppp_flush (struct net_device *dev);
int sppp_open (struct net_device *dev);
int sppp_reopen (struct net_device *dev);
int sppp_close (struct net_device *dev);
#endif
#define SPPPIOCCISCO (SIOCDEVPRIVATE)
#define SPPPIOCPPP (SIOCDEVPRIVATE+1)
#define SPPPIOCDEBUG (SIOCDEVPRIVATE+2)
#define SPPPIOCSFLAGS (SIOCDEVPRIVATE+3)
#define SPPPIOCGFLAGS (SIOCDEVPRIVATE+4)
#endif /* _SYNCPPP_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7