diff options
60 files changed, 8448 insertions, 351 deletions
@@ -1,5 +1,6 @@ - netbsd build - macos x build - implement rpm package backend +- implement update for MTD devices (foxboard,rb532,ag241) - network scripts for wireless client and acess point - customise mconf help texts to better fit for OpenADK diff --git a/mk/build.mk b/mk/build.mk index ee3867a16..bd5dc9e5c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -405,10 +405,10 @@ bulk: echo === building $$target $$libc $$fs on $$(date); \ $(GMAKE) prereq && \ if [ "x$$p" = xy ];then \ - $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \ allmodconfig; \ else \ - $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \ defconfig; \ fi && \ $(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \ diff --git a/mk/image.mk b/mk/image.mk index c6f5ce266..a2a6bb176 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -71,9 +71,6 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \ ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - # padding of images is required, foxboard only? - #dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 970120270..79cb7f9cc 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -53,8 +53,12 @@ compile: $(LINUX_DIR)/vmlinux install: compile ifneq ($(strip $(INSTALL_TARGETS)),) $(TRACE) target/${ADK_TARGET}-modules-install +ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) + $(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE) +else $(foreach pkg,$(INSTALL_TARGETS),$(shell $(PKG_INSTALL) $(pkg))) endif +endif clean: rm -rf $(LINUX_BUILD_DIR) diff --git a/mk/modules.mk b/mk/modules.mk index 948a68364..734fd4435 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -568,6 +568,7 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(eval $(call KMOD_template,SCSI,scsi,\ $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ ,20)) $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ @@ -979,6 +980,10 @@ $(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\ $(MODULES_DIR)/kernel/drivers/input/mousedev \ ,45)) +$(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ + $(MODULES_DIR)/kernel/drivers/input/evdev \ +,45)) + # # USB # diff --git a/package/Config.in b/package/Config.in index 80e1a84bb..63ae10491 100644 --- a/package/Config.in +++ b/package/Config.in @@ -79,6 +79,7 @@ endmenu menu "Misc" source "package/collectd/Config.in" source "package/deco/Config.in" +source "package/dialog/Config.in" source "package/digitemp/Config.in" source "package/gpm/Config.in" source "package/gpsd/Config.in" @@ -543,6 +544,7 @@ source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" source "package/xf86-input-mouse/Config.in" source "package/xf86-input-keyboard/Config.in" +source "package/xf86-input-evtouch/Config.in" menu "X Libraries" source "package/libICE/Config.in" diff --git a/package/base-files/extra/sbin/update b/package/base-files/extra/sbin/update index 0cd4ee713..c51962f5b 100755 --- a/package/base-files/extra/sbin/update +++ b/package/base-files/extra/sbin/update @@ -6,6 +6,11 @@ if [ $who -ne 0 ]; then exit 1 fi +if [ -x /sbin/mtd ];then + updatecmd="mtd -r write - linux" +else + updatecmd="gunzip -c | tar -xf -" +fi check_exit() { if [ $? -ne 0 ];then @@ -22,19 +27,19 @@ prepare() { extract_from_file() { prepare - cat $1 | gunzip -c | tar -xf - + cat $1 | $updatecmd check_exit } extract_from_ssh() { prepare - ssh $1 "cat $2" | gunzip -c | tar -xf - + ssh $1 "cat $2" | $updatecmd check_exit } extract_from_http() { prepare - wget -O - $1 | gunzip -c | tar -xf - + wget -O - $1 | $updatecmd check_exit } diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index e99c7e244..dd5784512 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.6 PKG_RELEASE:= 5 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base -PKG_TARGET_DEPENDS:= alix1c alix2d wrap foxboard ag241 rb532 +PKG_TARGET_DEPENDS:= alix1c alix2d alix2d13 wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/dialog/Makefile b/package/dialog/Makefile new file mode 100644 index 000000000..2763a0946 --- /dev/null +++ b/package/dialog/Makefile @@ -0,0 +1,31 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= dialog +PKG_VERSION:= 1.1-20080819 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 3caebd641a9f337b980becb4444336c5 +PKG_DESCR:= A text gui interface +PKG_SECTION:= misc +PKG_DEPENDS:= libncurses +PKG_BUILDDEP+= ncurses +PKG_SITES:= ftp://ftp.us.debian.org/debian/pool/main/d/dialog/ + +DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DIALOG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +MAKE_FILE:= makefile +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_DIALOG)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/dialog $(IDIR_DIALOG)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index fab6e8d79..a291c127c 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= digitemp PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libusb libusb-compat PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84 -PKG_DESCR:= simple program for reading values from 1-wire devices +PKG_DESCR:= program for reading values from 1-wire devices PKG_SECTION:= misc PKG_DEPENDS:= libusb +PKG_BUILDDEP+= libusb libusb-compat PKG_URL:= http://www.digitemp.com/software/linux PKG_SITES:= http://www.digitemp.com/software/linux/ @@ -20,7 +20,7 @@ $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ TCFLAGS+= -I./src -I./userial ALL_TARGET= ds2490 -BUILD_STYLE= auto +BUILD_STYLE:= auto do-install: ${INSTALL_DIR} ${IDIR_DIGITEMP}/usr/sbin diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 96ec1ce99..436bd3a13 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.41.9 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 52f60a9e19a02f142f5546f1b5681927 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= admin +PKG_DEPENDS:= libcom-err libuuid libblkid libpthread PKG_URL:= http://e2fsprogs.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} @@ -24,10 +25,10 @@ PKG_SECTION_SS:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UUID},${PKG_SECTION_UUID})) -$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR})) -$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SS},${PKG_SECTION_SS})) -$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_UUID},${PKG_SECTION_UUID})) +$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR})) +$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_SS},${PKG_SECTION_SS})) +$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-elf-shlibs \ diff --git a/package/git/Makefile b/package/git/Makefile index da9896e51..2a6951c1c 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.6.5.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 50fb736021ef89916af622cb4772bbea +PKG_VERSION:= 1.6.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 08af805fd59f68d9ad00a2f878cf820e PKG_DESCR:= fast version control system PKG_SECTION:= misc PKG_DEPENDS:= libopenssl libcurl libexpat diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index 90a61257a..cfa09f93e 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= net PKG_URL:= http://sourceforge.net/projects/igmpproxy/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/} +CFLINE_IGMPPROXY= select ADK_KERNEL_IP_MULTICAST\n\tselect ADK_KERNEL_IP_MROUTE + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libICE/Makefile b/package/libICE/Makefile index d779ab1db..4f7e7e660 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libICE PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 -PKG_BUILDDEP+= xtrans PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea PKG_DESCR:= Inter-Client Exchange library PKG_SECTION:= x11 +PKG_BUILDDEP+= xtrans xproto PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index 3724575b5..e40b02d39 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412 PKG_DESCR:= X font Library PKG_SECTION:= x11 PKG_DEPENDS:= libfreetype -PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc +PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc xtrans PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile index c2badb0fd..145c36988 100644 --- a/package/libXrender/Makefile +++ b/package/libXrender/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1791473c18a83a333a048b72d719fc55 PKG_DESCR:= X11 rendering library PKG_SECTION:= x11 +PKG_BUILDDEP+= renderproto PKG_SITES:= ${MASTER_SITE_XORG} ifeq ($(ADK_STATIC),y) diff --git a/package/libffi/Makefile b/package/libffi/Makefile index d1c71d881..d17d844a8 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.0.8 +PKG_VERSION:= 3.0.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 188a4f79fdac2310044b44b7d3918ef9 +PKG_MD5SUM:= 1f300a7a7f975d4046f51c3022fa5ff1 PKG_DESCR:= Foreign Function Interface library PKG_SECTION:= libs PKG_URL:= http://sourceware.org/libffi @@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= autotool gnu +CONFIGURE_STYLE= gnu BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/libffi/patches/patch-Makefile_am b/package/libffi/patches/patch-Makefile_am deleted file mode 100644 index d53ba2a76..000000000 --- a/package/libffi/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libffi-3.0.6.orig/Makefile.am 2008-02-21 14:36:18.000000000 +0100 -+++ libffi-3.0.6/Makefile.am 2008-12-08 02:27:27.000000000 +0100 -@@ -68,6 +68,7 @@ AM_MAKEFLAGS = \ - "infodir=$(infodir)" \ - "libdir=$(libdir)" \ - "prefix=$(prefix)" \ -+ "includesdir=$(prefix)/include" \ - "AR=$(AR)" \ - "AS=$(AS)" \ - "CC=$(CC)" \ diff --git a/package/libffi/patches/patch-include_Makefile_am b/package/libffi/patches/patch-include_Makefile_am deleted file mode 100644 index 0b6ad70ab..000000000 --- a/package/libffi/patches/patch-include_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libffi-3.0.6.orig/include/Makefile.am 2008-02-14 16:37:00.000000000 +0100 -+++ libffi-3.0.6/include/Makefile.am 2008-12-08 02:20:25.000000000 +0100 -@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign - DISTCLEANFILES=ffitarget.h - EXTRA_DIST=ffi.h.in ffi_common.h - --includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include -+includesdir = $(includesdir) - nodist_includes_HEADERS = ffi.h ffitarget.h diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 00f85b570..d6da115a4 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a1384a9a48430397aff236f97e26ed05 PKG_DESCR:= X11 keyboard configuration extension library PKG_SECTION:= x11 +PKG_BUILDDEP+= kbproto libX11 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/mtd/Makefile b/package/mtd/Makefile index a04bd4693..92acee50f 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +PKGDFLT_MTD= y + BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 0fd7c6710..ef58ca96f 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openswan -PKG_VERSION:= 2.6.22 +PKG_VERSION:= 2.6.24 PKG_RELEASE:= 1 -PKG_BUILDDEP+= gmp -PKG_MD5SUM:= 9a30009bade8a1b09fba27680c87cf72 +PKG_MD5SUM:= 1c76b6982c05392f7c360afb92699661 PKG_DESCR:= IPSec software PKG_SECTION:= net PKG_DEPENDS:= ip libgmp +PKG_BUILDDEP+= gmp PKG_URL:= http://www.openswan.org PKG_SITES:= http://www.openswan.org/download/ \ ftp://ftp.openswan.org/openswan/ diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program deleted file mode 100644 index 154fd06c2..000000000 --- a/package/openswan/patches/patch-programs_Makefile_program +++ /dev/null @@ -1,102 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openswan-2.6.22.orig/programs/Makefile.program 2009-06-23 04:53:08.000000000 +0200 -+++ openswan-2.6.22/programs/Makefile.program 2009-07-23 19:46:18.635264333 +0200 -@@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL - CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" - - # die if there are any warnings --ifndef WERROR --WERROR:= -Werror --endif -+#ifndef WERROR -+#WERROR:= -Werror -+#endif - - CFLAGS+= ${WERROR} - -@@ -104,67 +104,67 @@ endif - ifneq ($(NOINSTALL),true) - - doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) -- @mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) -+ mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) - @if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi -- @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ -+ $(foreach f, $(addsuffix .8, $(PROGRAM)), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/$(MANPROGPREFIX)$f || exit 1; \ - ) -- @$(foreach f, $(EXTRA8MAN), \ -+ $(foreach f, $(EXTRA8MAN), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/ipsec_$f || exit 1; \ - ) -- @$(foreach f, $(EXTRA5MAN), \ -+ $(foreach f, $(EXTRA5MAN), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/$f || exit 1 ;\ - ) -- @$(foreach f, $(EXTRA5PROC), \ -+ $(foreach f, $(EXTRA5PROC), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/ipsec_$f || exit 1 ;\ - ) -- @$(foreach f, $(LIBFILES), \ -+ $(foreach f, $(LIBFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTCONFFLAGS) $$g $(LIBDIR)/$f || exit 1 ;\ - ) -- @$(foreach f, $(CONFFILES), \ -+ $(foreach f, $(CONFFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - if [ ! -f $(CONFDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDIR)/$f || exit 1; fi;\ - $(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \ - ) -- @$(foreach f, $(EXCONFFILES), \ -+ $(foreach f, $(EXCONFFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \ - ) -- @$(foreach f, $(CONFDFILES), \ -+ $(foreach f, $(CONFDFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - if [ ! -f $(CONFDDIR)/$(CONFDSUBDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDDIR)/$(CONFDSUBDIR)/$f || exit 1; fi;\ - ) - - install_file_list:: -- @if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi -- @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ -+ if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi -+ $(foreach f, $(addsuffix .8, $(PROGRAM)), \ - echo $(MANDIR8)/${MANPROGPREFIX}$f; \ - ) -- @$(foreach f, $(EXTRA8MAN), \ -+ $(foreach f, $(EXTRA8MAN), \ - echo $(MANDIR8)/ipsec_$f; \ - ) -- @$(foreach f, $(EXTRA5MAN), \ -+ $(foreach f, $(EXTRA5MAN), \ - echo $(MANDIR5)/$f;\ - ) -- @$(foreach f, $(EXTRA5PROC), \ -+ $(foreach f, $(EXTRA5PROC), \ - echo $(MANDIR5)/ipsec_$f; \ - ) -- @$(foreach f, $(LIBFILES), \ -+ $(foreach f, $(LIBFILES), \ - echo $(LIBDIR)/$f;\ - ) -- @$(foreach f, $(CONFFILES), \ -+ $(foreach f, $(CONFFILES), \ - echo $(CONFDIR)/$f;\ - echo $(EXAMPLECONFDIR)/$f-sample;\ - ) -- @$(foreach f, $(EXCONFFILES), \ -+ $(foreach f, $(EXCONFFILES), \ - echo $(EXAMPLECONFDIR)/$f-sample;\ - ) -- @$(foreach f, $(CONFDFILES), \ -+ $(foreach f, $(CONFDFILES), \ - echo $(CONFDDIR)/${CONFDSUBDIR}/$f;\ - ) - diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile new file mode 100644 index 000000000..4f7506523 --- /dev/null +++ b/package/xf86-input-evtouch/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xf86-input-evtouch +PKG_VERSION:= 0.8.8 +PKG_RELEASE:= 1 +PKG_BUILDDEP+= xorg-server +PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13 +PKG_DESCR:= X11 driver for touchscreen +PKG_SECTION:= x11 +PKG_DEPENDS:= xorg-server kmod-input-evdev +PKG_SITES:= http://www.conan.de/touchscreen/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +PKG_TARGET_DEPENDS:= alix1c + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_INPUT_EVTOUCH,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input + ${CP} ${WRKINST}/usr/lib/xorg/modules/input/evtouch_drv.so \ + ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86-input-evtouch/patches/patch-ev_calibrate_c b/package/xf86-input-evtouch/patches/patch-ev_calibrate_c new file mode 100644 index 000000000..103500ea5 --- /dev/null +++ b/package/xf86-input-evtouch/patches/patch-ev_calibrate_c @@ -0,0 +1,11 @@ +--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c 2008-11-10 12:25:32.000000000 +0100 ++++ xf86-input-evtouch-0.8.8/ev_calibrate.c 2010-01-08 17:13:52.000000000 +0100 +@@ -218,7 +218,7 @@ int main (void) + int cap_style = CapButt; /* style of the line's edje and */ + int join_style = JoinBevel; /* joined lines. */ + +- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; ++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; + + int depth; + int screen_num; diff --git a/package/xf86-input-evtouch/patches/patch-evtouch_c b/package/xf86-input-evtouch/patches/patch-evtouch_c new file mode 100644 index 000000000..a0fe4919e --- /dev/null +++ b/package/xf86-input-evtouch/patches/patch-evtouch_c @@ -0,0 +1,125 @@ +--- xf86-input-evtouch-0.8.8.orig/evtouch.c 2008-11-11 09:47:55.000000000 +0100 ++++ xf86-input-evtouch-0.8.8/evtouch.c 2010-01-08 17:14:02.000000000 +0100 +@@ -30,8 +30,8 @@ + + #define _evdev_touch_C_ + +-#include <xf86Version.h> +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) ++#include <xorgVersion.h> ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0) + #define XFREE86_V4 + #endif + +@@ -74,7 +74,6 @@ + #include "xf86_OSproc.h" + #include "xf86Xinput.h" + #include "exevents.h" +-#include "xf86OSmouse.h" + #include "randrstr.h" + + #ifndef NEED_XF86_TYPES +@@ -139,7 +138,7 @@ static XF86ModuleVersionInfo VersionRec + "Kenan Esau", + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, ++ XORG_VERSION_CURRENT, + 0, 8, 8, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, +@@ -167,7 +166,7 @@ Unplug(pointer p) + } + + +-XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; ++_X_EXPORT XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; + + #endif /* XFree86LOADER */ + +@@ -306,7 +305,7 @@ void EVTouchProcessAbs(EVTouchPrivatePtr + } + + if (pos_changed == 1) { +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, +@@ -370,7 +369,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr + priv->raw_y = priv->min_y; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, +@@ -591,6 +590,10 @@ DeviceInit (DeviceIntPtr dev) + EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); + unsigned char map[EV_MAX_BUTTONS]; + int i; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_label; ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + for (i = 0; i < EV_MAX_BUTTONS; i++) + map[i] = i; +@@ -629,7 +632,11 @@ DeviceInit (DeviceIntPtr dev) + /* + * Device reports button press for 5 buttons. + */ +- if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE) ++ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ &btn_label, ++#endif ++ map) == FALSE) + { + ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n"); + return BadAlloc; +@@ -653,28 +660,34 @@ DeviceInit (DeviceIntPtr dev) + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, +- local->history_size, Absolute) == FALSE) ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels, ++#endif ++ local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); + return !Success; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 +- xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, ++ xf86InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif ++ 0, priv->screen_width, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); + xf86InitValuatorDefaults(dev, 0); +- xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, ++ xf86InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif ++ 0, priv->screen_height, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); + xf86InitValuatorDefaults(dev, 1); +-#else +- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, +- xf86InitValuatorDefaults(dev, 1); +-#endif + + /* Initial position of pointer on screen: Centered */ + priv->cur_x=(priv->max_x - priv->min_x)/2; diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 790a01d7e..4152dcc0c 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp libxau libxaw libxmu libxpm libxrender libxt libxxf86dga libxext libxdmcp libxv libsm libice libx11 PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/target/Config.in b/target/Config.in index 12ab8eb64..a23f3c651 100644 --- a/target/Config.in +++ b/target/Config.in @@ -26,6 +26,9 @@ config ADK_alix1c config ADK_alix2d tristate +config ADK_alix2d13 + tristate + config ADK_wrap tristate @@ -102,6 +105,7 @@ config ADK_TARGET string default "alix1c" if ADK_alix1c default "alix2d" if ADK_alix2d + default "alix2d13" if ADK_alix2d13 default "wrap" if ADK_wrap default "qemu-arm" if ADK_arm_qemu default "qemu-cris" if ADK_cris_qemu @@ -192,6 +196,24 @@ config ADK_LINUX_X86_ALIX2D http://www.pcengines.ch/ Status: stable +config ADK_LINUX_X86_ALIX2D13 + bool "PC Engines Alix2D13" + select ADK_alix2d13 + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NEW_LEDS + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII + select BUSYBOX_HWCLOCK + help + Support for ALIX2D13 boards. + http://www.pcengines.ch/ + Status: stable + config ADK_LINUX_X86_WRAP bool "PC Engines WRAP" select ADK_wrap @@ -528,6 +550,7 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_X86_64_QEMU || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_X86_ALIX2D || \ + ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB411 || \ ADK_LINUX_MIPS_RB433 || \ @@ -552,6 +575,7 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_X86_64_QEMU || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_X86_ALIX2D || \ + ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB411 || \ ADK_LINUX_MIPS_RB433 || \ @@ -624,6 +648,7 @@ config ADK_TARGET_ROOTFS_NFSROOT ADK_LINUX_CRIS_FOXBOARD || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_X86_ALIX2D || \ + ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_MIPS_RB433 || \ @@ -645,6 +670,7 @@ config ADK_TARGET_ROOTFS_EXT2_CF depends on \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_X86_ALIX2D || \ + ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 select ADK_KERNEL_EXT2_FS diff --git a/target/ag241/Makefile b/target/ag241/Makefile index 9848205cc..f6bba9c85 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/ag241/patches/ar7.patch b/target/ag241/patches/ar7.patch index 8b28e854c..ef48019d4 100644 --- a/target/ag241/patches/ar7.patch +++ b/target/ag241/patches/ar7.patch @@ -149,3 +149,21 @@ diff -Nur linux-2.6.32.orig/drivers/serial/8250.c linux-2.6.32/drivers/serial/82 serial_out(up, UART_TX, ch); } +diff -Nur linux-2.6.32.orig/arch/mips/ar7/prom.c linux-2.6.32/arch/mips/ar7/prom.c +--- linux-2.6.32.orig/arch/mips/ar7/prom.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/mips/ar7/prom.c 2010-01-05 20:39:11.000000000 +0100 +@@ -219,14 +219,6 @@ + if (strstr(prom_getcmdline(), "console=")) + return; + +-#ifdef CONFIG_KGDB +- if (!strstr(prom_getcmdline(), "nokgdb")) { +- strcat(prom_getcmdline(), " console=kgdb"); +- kgdb_enabled = 1; +- return; +- } +-#endif +- + s = prom_getenv("modetty0"); + if (s) { + baud = simple_strtoul(s, &p, 10); diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 691cf1a08..c17a1ef8a 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile index 691cf1a08..c17a1ef8a 100644 --- a/target/alix2d/Makefile +++ b/target/alix2d/Makefile @@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config index a0badc9b6..434e2ad64 100644 --- a/target/alix2d/kernel.config +++ b/target/alix2d/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31.5 -# Tue Nov 24 19:35:15 2009 +# Linux kernel version: 2.6.32 +# Sun Jan 10 11:31:53 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -16,7 +16,6 @@ CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_MMU=y CONFIG_ZONE_DMA=y CONFIG_GENERIC_ISA_DMA=y @@ -34,7 +33,8 @@ CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y @@ -76,11 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y @@ -110,21 +111,20 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y # CONFIG_AIO is not set -CONFIG_HAVE_PERF_COUNTERS=y +CONFIG_HAVE_PERF_EVENTS=y # -# Performance Counters +# Kernel Performance Events And Counters # +# CONFIG_PERF_EVENTS is not set # CONFIG_PERF_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_PCI_QUIRKS is not set -CONFIG_STRIP_ASM_SYMS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y @@ -203,6 +203,7 @@ CONFIG_MGEODE_LX=y # CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set # CONFIG_GENERIC_CPU is not set # CONFIG_X86_GENERIC is not set CONFIG_X86_CPU=y @@ -218,7 +219,8 @@ CONFIG_X86_POPAD_OK=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_USE_3DNOW=y CONFIG_X86_TSC=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_DEBUGCTLMSR=y CONFIG_PROCESSOR_SELECT=y # CONFIG_CPU_SUP_INTEL is not set @@ -238,7 +240,6 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT is not set # CONFIG_X86_UP_APIC is not set # CONFIG_X86_MCE is not set -# CONFIG_X86_ANCIENT_MCE is not set # CONFIG_VM86 is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -276,6 +277,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_X86_CHECK_BIOS_CORRUPTION=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set @@ -305,16 +307,12 @@ CONFIG_CMDLINE="console=ttyS0,115200" # Power management and ACPI options # # CONFIG_PM is not set +# CONFIG_SFI is not set # # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # CONFIG_CPU_IDLE is not set # @@ -388,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -428,6 +427,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set @@ -491,6 +491,7 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y # CONFIG_SATA_PMP is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SIL24 is not set @@ -512,6 +513,7 @@ CONFIG_ATA_SFF=y # CONFIG_PATA_ALI is not set CONFIG_PATA_AMD=y # CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set @@ -541,6 +543,7 @@ CONFIG_PATA_AMD=y # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set @@ -634,6 +637,7 @@ CONFIG_NET_PCI=y # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set CONFIG_VIA_RHINE=y CONFIG_VIA_RHINE_MMIO=y # CONFIG_SC92031 is not set @@ -641,10 +645,7 @@ CONFIG_VIA_RHINE_MMIO=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set - -# -# Wireless LAN -# +CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set @@ -660,33 +661,14 @@ CONFIG_VIA_RHINE_MMIO=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set # # Input device support # -CONFIG_INPUT=y -# CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_POLLDEV is not set - -# -# Userland interfaces -# -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +# CONFIG_INPUT is not set # # Hardware I/O ports @@ -727,7 +709,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_NVRAM is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -# CONFIG_SONYPI is not set # CONFIG_MWAVE is not set # CONFIG_PC8736x_GPIO is not set # CONFIG_NSC_GPIO is not set @@ -760,15 +741,19 @@ CONFIG_GPIO_SYSFS=y # PCI GPIO expanders: # # CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set # # SPI GPIO expanders: # + +# +# AC97 GPIO expanders: +# # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -791,6 +776,7 @@ CONFIG_SSB_POSSIBLE=y # Graphics support # # CONFIG_AGP is not set +# CONFIG_VGA_ARB is not set # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set @@ -802,7 +788,6 @@ CONFIG_SSB_POSSIBLE=y # # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_SOUND is not set -# CONFIG_HID_SUPPORT is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -826,7 +811,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y # CONFIG_UWB is not set # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_ALIX2=y +# CONFIG_LEDS_GPIO is not set + +# +# LED Triggers +# +# CONFIG_LEDS_TRIGGERS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set @@ -875,7 +872,7 @@ CONFIG_RTC_DRV_CMOS=y # TI VLYNQ # # CONFIG_STAGING is not set -CONFIG_X86_PLATFORM_DEVICES=y +# CONFIG_X86_PLATFORM_DEVICES is not set # # Firmware Drivers @@ -901,6 +898,8 @@ CONFIG_EXT2_FS=y # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set @@ -960,8 +959,6 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_NILFS2_FS is not set -# CONFIG_AUFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set @@ -1004,6 +1001,7 @@ CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set @@ -1022,7 +1020,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FTRACE_SYSCALLS=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -1060,7 +1058,6 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set @@ -1092,12 +1089,14 @@ CONFIG_CRYPTO=y # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set @@ -1154,7 +1153,6 @@ CONFIG_CRYPTO_HW=y # # CONFIG_OCF_OCF is not set CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y # CONFIG_VIRTUALIZATION is not set # CONFIG_BINARY_PRINTF is not set diff --git a/target/alix2d13/Makefile b/target/alix2d13/Makefile new file mode 100644 index 000000000..c17a1ef8a --- /dev/null +++ b/target/alix2d13/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk +include $(TOPDIR)/mk/kernel.mk +include $(TOPDIR)/mk/modules.mk +include $(TOPDIR)/mk/kernel-build.mk +include $(TOPDIR)/mk/image.mk + +kernel-install: + cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk + +ifeq ($(FS),ext2-cf) +imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @echo + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" + @echo "To install everything to CompactFlash use scripts/install.sh" + @echo 'Login as user root with password linux123 via ssh or console' +endif +ifeq ($(FS),nfsroot) +imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ + $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE) + @echo + @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' + @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' + @echo 'Login as user root with password linux123 via ssh or console' +endif diff --git a/target/alix2d13/files/etc/fstab b/target/alix2d13/files/etc/fstab new file mode 100644 index 000000000..7aed67706 --- /dev/null +++ b/target/alix2d13/files/etc/fstab @@ -0,0 +1,2 @@ +# <fs> <mountpoint> <type> <opts> <dump/pass> +/dev/root / ext2 noatime 0 0 diff --git a/target/alix2d13/files/etc/inittab b/target/alix2d13/files/etc/inittab new file mode 100644 index 000000000..230cfa242 --- /dev/null +++ b/target/alix2d13/files/etc/inittab @@ -0,0 +1,3 @@ +::sysinit:/etc/init.d/rcS +::shutdown:/etc/init.d/rcK +ttyS0::respawn:/sbin/getty -i -L ttyS0 115200 vt100 diff --git a/target/alix2d13/files/etc/mdev.conf b/target/alix2d13/files/etc/mdev.conf new file mode 100644 index 000000000..5e2c73cf0 --- /dev/null +++ b/target/alix2d13/files/etc/mdev.conf @@ -0,0 +1,11 @@ +rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc +device-mapper 0:0 660 @mkdir /dev/mapper +tun 0:0 660 >net/tun +null 0:0 777 +zero 0:0 666 +u?random 0:0 644 +console 0:0 0600 +ptmx 0:0 666 +ttyS* 0:0 640 +msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr) +.* 0:0 644 @/lib/mdev/init diff --git a/target/alix2d13/kernel.config b/target/alix2d13/kernel.config new file mode 100644 index 000000000..0ea3adb76 --- /dev/null +++ b/target/alix2d13/kernel.config @@ -0,0 +1,1198 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.32 +# Fri Jan 8 11:29:58 2010 +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_X86_32_LAZY_GS=y +CONFIG_KTIME_SCALAR=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +# CONFIG_KERNEL_GZIP is not set +# CONFIG_KERNEL_BZIP2 is not set +CONFIG_KERNEL_LZMA=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +# CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +# CONFIG_PCSPKR_PLATFORM is not set +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +# CONFIG_AIO is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +# CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_PCI_QUIRKS is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" +# CONFIG_FREEZER is not set + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_SMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_SCHED_OMIT_FRAME_POINTER=y +# CONFIG_PARAVIRT_GUEST is not set +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +CONFIG_MGEODE_LX=y +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +# CONFIG_GENERIC_CPU is not set +# CONFIG_X86_GENERIC is not set +CONFIG_X86_CPU=y +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_XADD=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_PROCESSOR_SELECT=y +# CONFIG_CPU_SUP_INTEL is not set +# CONFIG_CPU_SUP_CYRIX_32 is not set +CONFIG_CPU_SUP_AMD=y +# CONFIG_CPU_SUP_CENTAUR is not set +# CONFIG_CPU_SUP_TRANSMETA_32 is not set +# CONFIG_CPU_SUP_UMC_32 is not set +# CONFIG_X86_DS is not set +# CONFIG_HPET_TIMER is not set +# CONFIG_DMI is not set +# CONFIG_IOMMU_HELPER is not set +# CONFIG_IOMMU_API is not set +CONFIG_NR_CPUS=1 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +# CONFIG_X86_UP_APIC is not set +# CONFIG_X86_MCE is not set +# CONFIG_VM86 is not set +# CONFIG_TOSHIBA is not set +# CONFIG_I8K is not set +# CONFIG_X86_REBOOTFIXUPS is not set +# CONFIG_MICROCODE is not set +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y +# CONFIG_X86_CPU_DEBUG is not set +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_2G_OPT is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_X86_PAE is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set +CONFIG_X86_RESERVE_LOW_64K=y +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_MTRR_SANITIZER is not set +# CONFIG_X86_PAT is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +# CONFIG_SCHED_HRTICK is not set +# CONFIG_KEXEC is not set +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x100000 +# CONFIG_COMPAT_VDSO is not set +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0,115200" +# CONFIG_CMDLINE_OVERRIDE is not set + +# +# Power management and ACPI options +# +# CONFIG_PM is not set +# CONFIG_SFI is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +# CONFIG_PCIEPORTBUS is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +CONFIG_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set +# CONFIG_GEODE_MFGPT_TIMER is not set +# CONFIG_OLPC is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_HD is not set +# CONFIG_MISC_DEVICES is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +# CONFIG_SATA_PMP is not set +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SIL24 is not set +CONFIG_ATA_SFF=y +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_PATA_ALI is not set +CONFIG_PATA_AMD=y +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CS5535 is not set +# CONFIG_PATA_CS5536 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_SCH is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# See the help texts for more information. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_PHYLIB=y +# CONFIG_SWCONFIG is not set + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_B44 is not set +# CONFIG_FORCEDETH is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +# CONFIG_R6040 is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SMSC9420 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_VIA_RHINE=y +CONFIG_VIA_RHINE_MMIO=y +# CONFIG_SC92031 is not set +# CONFIG_ATL2 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_TR is not set +CONFIG_WLAN=y +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +# CONFIG_VT is not set +# CONFIG_DEVKMEM is not set +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +# CONFIG_SERIAL_8250_PCI is not set +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_SONYPI is not set +# CONFIG_MWAVE is not set +# CONFIG_PC8736x_GPIO is not set +# CONFIG_NSC_GPIO is not set +# CONFIG_CS5535_GPIO is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_HANGCHECK_TIMER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set +CONFIG_DEVPORT=y +# CONFIG_I2C is not set +# CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +CONFIG_VGA_ARB=y +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_SOUND is not set +# CONFIG_HID_SUPPORT is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +# CONFIG_USB is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_ALIX2=y +# CONFIG_LEDS_GPIO is not set + +# +# LED Triggers +# +# CONFIG_LEDS_TRIGGERS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set +CONFIG_X86_PLATFORM_DEVICES=y + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +# CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +# CONFIG_ISCSI_IBFT_FIND is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY is not set +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +# CONFIG_PROC_KCORE is not set +CONFIG_PROC_SYSCTL=y +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_NLS is not set +# CONFIG_DLM is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +# CONFIG_FRAME_POINTER is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_STRICT_DEVMEM is not set +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_EARLY_PRINTK is not set +# CONFIG_4KSTACKS is not set +# CONFIG_DOUBLEFAULT is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_OPTIMIZE_INLINING is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_AES_586 is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SALSA20_586 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_TWOFISH_586 is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_PADLOCK is not set +# CONFIG_CRYPTO_DEV_GEODE is not set +# CONFIG_CRYPTO_DEV_HIFN_795X is not set + +# +# OCF Configuration +# +# CONFIG_OCF_OCF is not set +CONFIG_HAVE_KVM=y +# CONFIG_VIRTUALIZATION is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/target/alix2d13/target.mk b/target/alix2d13/target.mk new file mode 100644 index 000000000..9f958a84b --- /dev/null +++ b/target/alix2d13/target.mk @@ -0,0 +1,7 @@ +ARCH:= x86 +CPU_ARCH:= i586 +KERNEL_VERSION:= 2.6.32 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 +TARGET_OPTIMIZATION:= -Os -pipe +TARGET_CFLAGS_ARCH:= -march=geode diff --git a/target/alix2d13/uclibc.config b/target/alix2d13/uclibc.config new file mode 100644 index 000000000..f98da5b03 --- /dev/null +++ b/target/alix2d13/uclibc.config @@ -0,0 +1,241 @@ +# +# Automatically generated make config: don't edit +# Version: 0.9.30 +# Mon Dec 1 19:41:35 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_GENERIC_386 is not set +# CONFIG_386 is not set +# CONFIG_486 is not set +CONFIG_586=y +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +# CONFIG_PENTIUMIII is not set +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +UCLIBC_HAS_FENV=y +UCLIBC_HAS_LONG_DOUBLE_MATH=y +KERNEL_HEADERS="" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# ARCH_HAS_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# LDSO_GNU_HASH_SUPPORT is not set +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_SYSLOG=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +# UCLIBC_SUSV3_LEGACY is not set +# UCLIBC_SUSV3_LEGACY_MACROS is not set +# UCLIBC_HAS_STUBS is not set +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UCLIBC_HAS_PTY=y +ASSUME_DEVPTS=y +UNIX98PTY_ONLY=y +# UCLIBC_HAS_GETPT is not set +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Advanced Library Settings +# +UCLIBC_PWD_BUFFER_SIZE=256 +UCLIBC_GRP_BUFFER_SIZE=256 + +# +# Support various families of functions +# +# UCLIBC_LINUX_MODULE_24 is not set +UCLIBC_LINUX_SPECIFIC=y +UCLIBC_HAS_GNU_ERROR=y +UCLIBC_BSD_SPECIFIC=y +UCLIBC_HAS_BSD_ERR=y +# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set +# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set +# UCLIBC_NTP_LEGACY is not set +# UCLIBC_SV4_DEPRECATED is not set +UCLIBC_HAS_REALTIME=y +UCLIBC_HAS_ADVANCED_REALTIME=y +UCLIBC_HAS_EPOLL=y +UCLIBC_HAS_XATTR=y +# UCLIBC_HAS_PROFILING is not set +UCLIBC_HAS_CRYPT_IMPL=y +UCLIBC_HAS_CRYPT=y +UCLIBC_HAS_NETWORK_SUPPORT=y +UCLIBC_HAS_SOCKET=y +UCLIBC_HAS_IPV4=y +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +UCLIBC_HAS_REENTRANT_RPC=y +UCLIBC_USE_NETLINK=y +UCLIBC_SUPPORT_AI_ADDRCONFIG=y +UCLIBC_HAS_BSD_RES_CLOSE=y + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +UCLIBC_HAS_STDIO_BUFSIZ_4096=y +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y +UCLIBC_HAS_GNU_GLOB=y + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="/usr/" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +UCLIBC_HAS_ARC4RANDOM=y +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +UCLIBC_EXTRA_CFLAGS="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/target/bulk.lst b/target/bulk.lst index 8017bf310..d4ac932e5 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -1 +1,4 @@ +alix1c uclibc nfsroot y +alix1c eglibc nfsroot y alix1c glibc nfsroot y +ag241 uclibc nfsroot y diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index c4a64c26b..dd6e167c2 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -12,7 +12,7 @@ $(TOOLS_BUILD_DIR): tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C tools/mkfimage - #$(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE) + $(MAKE) -C tools/e100boot prepare compile install $(MAKE) -C ../tools/squashfs prepare compile install $(INSTALL_BIN) tools/boot_linux $(BIN_DIR)/ @@ -22,10 +22,15 @@ kernel-install: tools-compile ifeq ($(FS),squashfs) imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) - @echo - @echo Use sudo ./boot_linux -F -i $(ROOTFSSQUASHFS) to flash - @echo Do not forget to set network boot jumper, before you start the foxboard - @echo 'Login as user root with password linux123 via ssh or console' + dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ + bs=4063232 conv=sync $(MAKE_TRACE) + @if [ $$(stat --format=%s ${BIN_DIR}/${ROOTFSSQUASHFS}) -gt 4063232 ];then \ + echo 'Image is too big!'; \ + else \ + echo 'Use sudo ./boot_linux -F -i $(ROOTFSSQUASHFS) to flash'; \ + echo 'Do not forget to set the network boot jumper, before you start the foxboard'; \ + echo 'Login as user root with password linux123 via ssh or console'; \ + fi endif ifeq ($(FS),nfsroot) imageinstall: ${BIN_DIR}/${ROOTFSTARBALL} @@ -33,5 +38,6 @@ imageinstall: ${BIN_DIR}/${ROOTFSTARBALL} @echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${FS}-kernel to flash the kernel @echo Do not forget to set network boot jumper, before you start the foxboard @echo ${ROOTFSTARBALL} is your nfs root and can be extracted on your nfs server + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/foxboard/patches/cris.patch b/target/foxboard/patches/cris.patch index 277e1757d..3c6bca534 100644 --- a/target/foxboard/patches/cris.patch +++ b/target/foxboard/patches/cris.patch @@ -1,7 +1,16 @@ -diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.31.5/arch/cris/arch-v10/drivers/axisflashmap.c ---- linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/arch-v10/drivers/axisflashmap.c 2009-11-09 21:10:52.565914436 +0100 -@@ -122,19 +122,19 @@ +diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.32/arch/cris/arch-v10/drivers/axisflashmap.c +--- linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/arch-v10/drivers/axisflashmap.c 2010-01-10 14:34:37.376309632 +0100 +@@ -113,7 +113,7 @@ + + /* If no partition-table was found, we use this default-set. */ + #define MAX_PARTITIONS 7 +-#define NUM_DEFAULT_PARTITIONS 3 ++#define NUM_DEFAULT_PARTITIONS 4 + + /* + * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the +@@ -122,19 +122,24 @@ */ static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = { { @@ -26,10 +35,15 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2. + .name = "cfgfs", + .size = 0x20000 , + .offset = CONFIG_ETRAX_MTD_SIZE - 0x20000 ++ }, ++ { ++ .name = "linux", ++ .size = CONFIG_ETRAX_MTD_SIZE - 0x20000, ++ .offset = 0 } }; -@@ -281,6 +281,11 @@ +@@ -281,6 +286,11 @@ struct partitiontable_entry *ptable; int use_default_ptable = 1; /* Until proven otherwise. */ const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n"; @@ -41,7 +55,7 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2. if (!(mymtd = flash_probe())) { /* There's no reason to use this module if no flash chip can -@@ -292,6 +297,31 @@ +@@ -292,6 +302,31 @@ mymtd->name, mymtd->size); axisflash_mtd = mymtd; } @@ -73,7 +87,7 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2. if (mymtd) { mymtd->owner = THIS_MODULE; -@@ -360,21 +390,6 @@ +@@ -360,21 +395,6 @@ use_default_ptable = !ptable_ok; } @@ -95,7 +109,7 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2. #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE if (mymtd) { main_partition.size = mymtd->size; -@@ -397,36 +412,6 @@ +@@ -397,36 +417,6 @@ if (err) panic("axisflashmap could not add MTD partitions!\n"); } @@ -132,9 +146,9 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2. return err; } -diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.31.5/arch/cris/arch-v10/drivers/ds1302.c ---- linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/ds1302.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/arch-v10/drivers/ds1302.c 2009-11-09 21:10:52.569915505 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.32/arch/cris/arch-v10/drivers/ds1302.c +--- linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/arch-v10/drivers/ds1302.c 2010-01-10 13:41:59.256309588 +0100 @@ -21,6 +21,7 @@ #include <linux/delay.h> #include <linux/bcd.h> @@ -167,9 +181,9 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.31.5 return 0; } -diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.31.5/arch/cris/arch-v10/drivers/gpio.c ---- linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/gpio.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/arch-v10/drivers/gpio.c 2009-11-09 21:10:52.569915505 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.32/arch/cris/arch-v10/drivers/gpio.c +--- linux-2.6.32.orig/arch/cris/arch-v10/drivers/gpio.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/arch-v10/drivers/gpio.c 2010-01-10 13:41:59.256309588 +0100 @@ -21,6 +21,7 @@ #include <linux/poll.h> #include <linux/init.h> @@ -203,18 +217,18 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.31.5/a /* Clear all leds */ #if defined (CONFIG_ETRAX_CSP0_LEDS) || defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS) CRIS_LED_NETWORK_SET(0); -diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.31.5/arch/cris/arch-v10/lib/hw_settings.S ---- linux-2.6.31.5.orig/arch/cris/arch-v10/lib/hw_settings.S 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/arch-v10/lib/hw_settings.S 2009-11-09 21:10:52.622221897 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.32/arch/cris/arch-v10/lib/hw_settings.S +--- linux-2.6.32.orig/arch/cris/arch-v10/lib/hw_settings.S 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/arch-v10/lib/hw_settings.S 2010-01-10 13:41:59.256309588 +0100 @@ -60,3 +60,5 @@ .dword R_PORT_PB_SET .dword PB_SET_VALUE .dword 0 ; No more register values + .ascii "ACME_PART_MAGIC" + .dword 0xdeadc0de -diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/mm/init.c linux-2.6.31.5/arch/cris/arch-v10/mm/init.c ---- linux-2.6.31.5.orig/arch/cris/arch-v10/mm/init.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/arch-v10/mm/init.c 2009-11-09 21:10:52.669914289 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/mm/init.c linux-2.6.32/arch/cris/arch-v10/mm/init.c +--- linux-2.6.32.orig/arch/cris/arch-v10/mm/init.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/arch-v10/mm/init.c 2010-01-10 13:41:59.256309588 +0100 @@ -184,6 +184,9 @@ free_area_init_node(0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0); @@ -225,9 +239,9 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/arch-v10/mm/init.c linux-2.6.31.5/arch/c /* Initialize remaps of some I/O-ports. It is important that this * is called before any driver is initialized. -diff -Nur linux-2.6.31.5.orig/arch/cris/boot/compressed/Makefile linux-2.6.31.5/arch/cris/boot/compressed/Makefile ---- linux-2.6.31.5.orig/arch/cris/boot/compressed/Makefile 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/boot/compressed/Makefile 2009-11-09 21:10:52.673930723 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/boot/compressed/Makefile linux-2.6.32/arch/cris/boot/compressed/Makefile +--- linux-2.6.32.orig/arch/cris/boot/compressed/Makefile 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/boot/compressed/Makefile 2010-01-10 13:41:59.256309588 +0100 @@ -18,7 +18,7 @@ OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o @@ -237,9 +251,9 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/boot/compressed/Makefile linux-2.6.31.5/ quiet_cmd_image = BUILD $@ cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@ -diff -Nur linux-2.6.31.5.orig/arch/cris/boot/compressed/misc.c linux-2.6.31.5/arch/cris/boot/compressed/misc.c ---- linux-2.6.31.5.orig/arch/cris/boot/compressed/misc.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/boot/compressed/misc.c 2009-11-09 21:10:52.677915030 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/boot/compressed/misc.c linux-2.6.32/arch/cris/boot/compressed/misc.c +--- linux-2.6.32.orig/arch/cris/boot/compressed/misc.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/boot/compressed/misc.c 2010-01-10 13:41:59.256309588 +0100 @@ -106,7 +106,7 @@ static void flush_window(void); @@ -290,9 +304,9 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/boot/compressed/misc.c linux-2.6.31.5/ar - puts("Done. Now booting the kernel\n"); + putstr("Done. Now booting the kernel\n"); } -diff -Nur linux-2.6.31.5.orig/arch/cris/boot/Makefile linux-2.6.31.5/arch/cris/boot/Makefile ---- linux-2.6.31.5.orig/arch/cris/boot/Makefile 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/boot/Makefile 2009-11-09 21:10:52.729928085 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/boot/Makefile linux-2.6.32/arch/cris/boot/Makefile +--- linux-2.6.32.orig/arch/cris/boot/Makefile 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/boot/Makefile 2010-01-10 13:41:59.256309588 +0100 @@ -5,7 +5,7 @@ objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss @@ -310,9 +324,9 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/boot/Makefile linux-2.6.31.5/arch/cris/b $(obj)/zImage: $(obj)/compressed/vmlinux @cp $< $@ -diff -Nur linux-2.6.31.5.orig/arch/cris/Kconfig linux-2.6.31.5/arch/cris/Kconfig ---- linux-2.6.31.5.orig/arch/cris/Kconfig 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/Kconfig 2009-11-09 21:10:52.761915122 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/Kconfig linux-2.6.32/arch/cris/Kconfig +--- linux-2.6.32.orig/arch/cris/Kconfig 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/Kconfig 2010-01-10 13:41:59.256309588 +0100 @@ -168,6 +168,12 @@ help Size of DRAM (decimal in MB) typically 2, 8 or 16. @@ -347,9 +361,9 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/Kconfig linux-2.6.31.5/arch/cris/Kconfig source "drivers/net/Kconfig" source "drivers/i2c/Kconfig" -diff -Nur linux-2.6.31.5.orig/arch/cris/Makefile linux-2.6.31.5/arch/cris/Makefile ---- linux-2.6.31.5.orig/arch/cris/Makefile 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/arch/cris/Makefile 2009-11-09 21:12:38.534695929 +0100 +diff -Nur linux-2.6.32.orig/arch/cris/Makefile linux-2.6.32/arch/cris/Makefile +--- linux-2.6.32.orig/arch/cris/Makefile 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/arch/cris/Makefile 2010-01-10 13:41:59.256309588 +0100 @@ -40,10 +40,10 @@ LD = $(CROSS_COMPILE)ld -mcrislinux @@ -363,10 +377,10 @@ diff -Nur linux-2.6.31.5.orig/arch/cris/Makefile linux-2.6.31.5/arch/cris/Makefi KBUILD_CPPFLAGS += $(inc) ifdef CONFIG_FRAME_POINTER -diff -Nur linux-2.6.31.5.orig/drivers/net/cris/eth_v10.c linux-2.6.31.5/drivers/net/cris/eth_v10.c ---- linux-2.6.31.5.orig/drivers/net/cris/eth_v10.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/drivers/net/cris/eth_v10.c 2009-11-09 21:10:52.857914224 +0100 -@@ -1711,7 +1711,7 @@ +diff -Nur linux-2.6.32.orig/drivers/net/cris/eth_v10.c linux-2.6.32/drivers/net/cris/eth_v10.c +--- linux-2.6.32.orig/drivers/net/cris/eth_v10.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/drivers/net/cris/eth_v10.c 2010-01-10 13:41:59.256309588 +0100 +@@ -1725,7 +1725,7 @@ static void e100_netpoll(struct net_device* netdev) { @@ -375,9 +389,1773 @@ diff -Nur linux-2.6.31.5.orig/drivers/net/cris/eth_v10.c linux-2.6.31.5/drivers/ } #endif -diff -Nur linux-2.6.31.5.orig/drivers/serial/crisv10.c linux-2.6.31.5/drivers/serial/crisv10.c ---- linux-2.6.31.5.orig/drivers/serial/crisv10.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/drivers/serial/crisv10.c 2009-11-10 07:59:31.341915786 +0100 +diff -Nur linux-2.6.32.orig/drivers/net/cris/eth_v10.c.orig linux-2.6.32/drivers/net/cris/eth_v10.c.orig +--- linux-2.6.32.orig/drivers/net/cris/eth_v10.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/drivers/net/cris/eth_v10.c.orig 2009-12-03 04:51:21.000000000 +0100 +@@ -0,0 +1,1760 @@ ++/* ++ * e100net.c: A network driver for the ETRAX 100LX network controller. ++ * ++ * Copyright (c) 1998-2002 Axis Communications AB. ++ * ++ * The outline of this driver comes from skeleton.c. ++ * ++ */ ++ ++ ++#include <linux/module.h> ++ ++#include <linux/kernel.h> ++#include <linux/delay.h> ++#include <linux/types.h> ++#include <linux/fcntl.h> ++#include <linux/interrupt.h> ++#include <linux/ptrace.h> ++#include <linux/ioport.h> ++#include <linux/in.h> ++#include <linux/slab.h> ++#include <linux/string.h> ++#include <linux/spinlock.h> ++#include <linux/errno.h> ++#include <linux/init.h> ++#include <linux/bitops.h> ++ ++#include <linux/if.h> ++#include <linux/mii.h> ++#include <linux/netdevice.h> ++#include <linux/etherdevice.h> ++#include <linux/skbuff.h> ++#include <linux/ethtool.h> ++ ++#include <arch/svinto.h>/* DMA and register descriptions */ ++#include <asm/io.h> /* CRIS_LED_* I/O functions */ ++#include <asm/irq.h> ++#include <asm/dma.h> ++#include <asm/system.h> ++#include <asm/ethernet.h> ++#include <asm/cache.h> ++#include <arch/io_interface_mux.h> ++ ++//#define ETHDEBUG ++#define D(x) ++ ++/* ++ * The name of the card. Is used for messages and in the requests for ++ * io regions, irqs and dma channels ++ */ ++ ++static const char* cardname = "ETRAX 100LX built-in ethernet controller"; ++ ++/* A default ethernet address. Highlevel SW will set the real one later */ ++ ++static struct sockaddr default_mac = { ++ 0, ++ { 0x00, 0x40, 0x8C, 0xCD, 0x00, 0x00 } ++}; ++ ++/* Information that need to be kept for each board. */ ++struct net_local { ++ struct net_device_stats stats; ++ struct mii_if_info mii_if; ++ ++ /* Tx control lock. This protects the transmit buffer ring ++ * state along with the "tx full" state of the driver. This ++ * means all netif_queue flow control actions are protected ++ * by this lock as well. ++ */ ++ spinlock_t lock; ++ ++ spinlock_t led_lock; /* Protect LED state */ ++ spinlock_t transceiver_lock; /* Protect transceiver state. */ ++}; ++ ++typedef struct etrax_eth_descr ++{ ++ etrax_dma_descr descr; ++ struct sk_buff* skb; ++} etrax_eth_descr; ++ ++/* Some transceivers requires special handling */ ++struct transceiver_ops ++{ ++ unsigned int oui; ++ void (*check_speed)(struct net_device* dev); ++ void (*check_duplex)(struct net_device* dev); ++}; ++ ++/* Duplex settings */ ++enum duplex ++{ ++ half, ++ full, ++ autoneg ++}; ++ ++/* Dma descriptors etc. */ ++ ++#define MAX_MEDIA_DATA_SIZE 1522 ++ ++#define MIN_PACKET_LEN 46 ++#define ETHER_HEAD_LEN 14 ++ ++/* ++** MDIO constants. ++*/ ++#define MDIO_START 0x1 ++#define MDIO_READ 0x2 ++#define MDIO_WRITE 0x1 ++#define MDIO_PREAMBLE 0xfffffffful ++ ++/* Broadcom specific */ ++#define MDIO_AUX_CTRL_STATUS_REG 0x18 ++#define MDIO_BC_FULL_DUPLEX_IND 0x1 ++#define MDIO_BC_SPEED 0x2 ++ ++/* TDK specific */ ++#define MDIO_TDK_DIAGNOSTIC_REG 18 ++#define MDIO_TDK_DIAGNOSTIC_RATE 0x400 ++#define MDIO_TDK_DIAGNOSTIC_DPLX 0x800 ++ ++/*Intel LXT972A specific*/ ++#define MDIO_INT_STATUS_REG_2 0x0011 ++#define MDIO_INT_FULL_DUPLEX_IND (1 << 9) ++#define MDIO_INT_SPEED (1 << 14) ++ ++/* Network flash constants */ ++#define NET_FLASH_TIME (HZ/50) /* 20 ms */ ++#define NET_FLASH_PAUSE (HZ/100) /* 10 ms */ ++#define NET_LINK_UP_CHECK_INTERVAL (2*HZ) /* 2 s */ ++#define NET_DUPLEX_CHECK_INTERVAL (2*HZ) /* 2 s */ ++ ++#define NO_NETWORK_ACTIVITY 0 ++#define NETWORK_ACTIVITY 1 ++ ++#define NBR_OF_RX_DESC 32 ++#define NBR_OF_TX_DESC 16 ++ ++/* Large packets are sent directly to upper layers while small packets are */ ++/* copied (to reduce memory waste). The following constant decides the breakpoint */ ++#define RX_COPYBREAK 256 ++ ++/* Due to a chip bug we need to flush the cache when descriptors are returned */ ++/* to the DMA. To decrease performance impact we return descriptors in chunks. */ ++/* The following constant determines the number of descriptors to return. */ ++#define RX_QUEUE_THRESHOLD NBR_OF_RX_DESC/2 ++ ++#define GET_BIT(bit,val) (((val) >> (bit)) & 0x01) ++ ++/* Define some macros to access ETRAX 100 registers */ ++#define SETF(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \ ++ IO_FIELD_(reg##_, field##_, val) ++#define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \ ++ IO_STATE_(reg##_, field##_, _##val) ++ ++static etrax_eth_descr *myNextRxDesc; /* Points to the next descriptor to ++ to be processed */ ++static etrax_eth_descr *myLastRxDesc; /* The last processed descriptor */ ++ ++static etrax_eth_descr RxDescList[NBR_OF_RX_DESC] __attribute__ ((aligned(32))); ++ ++static etrax_eth_descr* myFirstTxDesc; /* First packet not yet sent */ ++static etrax_eth_descr* myLastTxDesc; /* End of send queue */ ++static etrax_eth_descr* myNextTxDesc; /* Next descriptor to use */ ++static etrax_eth_descr TxDescList[NBR_OF_TX_DESC] __attribute__ ((aligned(32))); ++ ++static unsigned int network_rec_config_shadow = 0; ++ ++static unsigned int network_tr_ctrl_shadow = 0; ++ ++/* Network speed indication. */ ++static DEFINE_TIMER(speed_timer, NULL, 0, 0); ++static DEFINE_TIMER(clear_led_timer, NULL, 0, 0); ++static int current_speed; /* Speed read from transceiver */ ++static int current_speed_selection; /* Speed selected by user */ ++static unsigned long led_next_time; ++static int led_active; ++static int rx_queue_len; ++ ++/* Duplex */ ++static DEFINE_TIMER(duplex_timer, NULL, 0, 0); ++static int full_duplex; ++static enum duplex current_duplex; ++ ++/* Index to functions, as function prototypes. */ ++ ++static int etrax_ethernet_init(void); ++ ++static int e100_open(struct net_device *dev); ++static int e100_set_mac_address(struct net_device *dev, void *addr); ++static int e100_send_packet(struct sk_buff *skb, struct net_device *dev); ++static irqreturn_t e100rxtx_interrupt(int irq, void *dev_id); ++static irqreturn_t e100nw_interrupt(int irq, void *dev_id); ++static void e100_rx(struct net_device *dev); ++static int e100_close(struct net_device *dev); ++static int e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); ++static int e100_set_config(struct net_device* dev, struct ifmap* map); ++static void e100_tx_timeout(struct net_device *dev); ++static struct net_device_stats *e100_get_stats(struct net_device *dev); ++static void set_multicast_list(struct net_device *dev); ++static void e100_hardware_send_packet(struct net_local* np, char *buf, int length); ++static void update_rx_stats(struct net_device_stats *); ++static void update_tx_stats(struct net_device_stats *); ++static int e100_probe_transceiver(struct net_device* dev); ++ ++static void e100_check_speed(unsigned long priv); ++static void e100_set_speed(struct net_device* dev, unsigned long speed); ++static void e100_check_duplex(unsigned long priv); ++static void e100_set_duplex(struct net_device* dev, enum duplex); ++static void e100_negotiate(struct net_device* dev); ++ ++static int e100_get_mdio_reg(struct net_device *dev, int phy_id, int location); ++static void e100_set_mdio_reg(struct net_device *dev, int phy_id, int location, int value); ++ ++static void e100_send_mdio_cmd(unsigned short cmd, int write_cmd); ++static void e100_send_mdio_bit(unsigned char bit); ++static unsigned char e100_receive_mdio_bit(void); ++static void e100_reset_transceiver(struct net_device* net); ++ ++static void e100_clear_network_leds(unsigned long dummy); ++static void e100_set_network_leds(int active); ++ ++static const struct ethtool_ops e100_ethtool_ops; ++#if defined(CONFIG_ETRAX_NO_PHY) ++static void dummy_check_speed(struct net_device* dev); ++static void dummy_check_duplex(struct net_device* dev); ++#else ++static void broadcom_check_speed(struct net_device* dev); ++static void broadcom_check_duplex(struct net_device* dev); ++static void tdk_check_speed(struct net_device* dev); ++static void tdk_check_duplex(struct net_device* dev); ++static void intel_check_speed(struct net_device* dev); ++static void intel_check_duplex(struct net_device* dev); ++static void generic_check_speed(struct net_device* dev); ++static void generic_check_duplex(struct net_device* dev); ++#endif ++#ifdef CONFIG_NET_POLL_CONTROLLER ++static void e100_netpoll(struct net_device* dev); ++#endif ++ ++static int autoneg_normal = 1; ++ ++struct transceiver_ops transceivers[] = ++{ ++#if defined(CONFIG_ETRAX_NO_PHY) ++ {0x0000, dummy_check_speed, dummy_check_duplex} /* Dummy */ ++#else ++ {0x1018, broadcom_check_speed, broadcom_check_duplex}, /* Broadcom */ ++ {0xC039, tdk_check_speed, tdk_check_duplex}, /* TDK 2120 */ ++ {0x039C, tdk_check_speed, tdk_check_duplex}, /* TDK 2120C */ ++ {0x04de, intel_check_speed, intel_check_duplex}, /* Intel LXT972A*/ ++ {0x0000, generic_check_speed, generic_check_duplex} /* Generic, must be last */ ++#endif ++}; ++ ++struct transceiver_ops* transceiver = &transceivers[0]; ++ ++static const struct net_device_ops e100_netdev_ops = { ++ .ndo_open = e100_open, ++ .ndo_stop = e100_close, ++ .ndo_start_xmit = e100_send_packet, ++ .ndo_tx_timeout = e100_tx_timeout, ++ .ndo_get_stats = e100_get_stats, ++ .ndo_set_multicast_list = set_multicast_list, ++ .ndo_do_ioctl = e100_ioctl, ++ .ndo_set_mac_address = e100_set_mac_address, ++ .ndo_validate_addr = eth_validate_addr, ++ .ndo_change_mtu = eth_change_mtu, ++ .ndo_set_config = e100_set_config, ++#ifdef CONFIG_NET_POLL_CONTROLLER ++ .ndo_poll_controller = e100_netpoll, ++#endif ++}; ++ ++#define tx_done(dev) (*R_DMA_CH0_CMD == 0) ++ ++/* ++ * Check for a network adaptor of this type, and return '0' if one exists. ++ * If dev->base_addr == 0, probe all likely locations. ++ * If dev->base_addr == 1, always return failure. ++ * If dev->base_addr == 2, allocate space for the device and return success ++ * (detachable devices only). ++ */ ++ ++static int __init ++etrax_ethernet_init(void) ++{ ++ struct net_device *dev; ++ struct net_local* np; ++ int i, err; ++ ++ printk(KERN_INFO ++ "ETRAX 100LX 10/100MBit ethernet v2.0 (c) 1998-2007 Axis Communications AB\n"); ++ ++ if (cris_request_io_interface(if_eth, cardname)) { ++ printk(KERN_CRIT "etrax_ethernet_init failed to get IO interface\n"); ++ return -EBUSY; ++ } ++ ++ dev = alloc_etherdev(sizeof(struct net_local)); ++ if (!dev) ++ return -ENOMEM; ++ ++ np = netdev_priv(dev); ++ ++ /* we do our own locking */ ++ dev->features |= NETIF_F_LLTX; ++ ++ dev->base_addr = (unsigned int)R_NETWORK_SA_0; /* just to have something to show */ ++ ++ /* now setup our etrax specific stuff */ ++ ++ dev->irq = NETWORK_DMA_RX_IRQ_NBR; /* we really use DMATX as well... */ ++ dev->dma = NETWORK_RX_DMA_NBR; ++ ++ /* fill in our handlers so the network layer can talk to us in the future */ ++ ++ dev->ethtool_ops = &e100_ethtool_ops; ++ dev->netdev_ops = &e100_netdev_ops; ++ ++ spin_lock_init(&np->lock); ++ spin_lock_init(&np->led_lock); ++ spin_lock_init(&np->transceiver_lock); ++ ++ /* Initialise the list of Etrax DMA-descriptors */ ++ ++ /* Initialise receive descriptors */ ++ ++ for (i = 0; i < NBR_OF_RX_DESC; i++) { ++ /* Allocate two extra cachelines to make sure that buffer used ++ * by DMA does not share cacheline with any other data (to ++ * avoid cache bug) ++ */ ++ RxDescList[i].skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES); ++ if (!RxDescList[i].skb) ++ return -ENOMEM; ++ RxDescList[i].descr.ctrl = 0; ++ RxDescList[i].descr.sw_len = MAX_MEDIA_DATA_SIZE; ++ RxDescList[i].descr.next = virt_to_phys(&RxDescList[i + 1]); ++ RxDescList[i].descr.buf = L1_CACHE_ALIGN(virt_to_phys(RxDescList[i].skb->data)); ++ RxDescList[i].descr.status = 0; ++ RxDescList[i].descr.hw_len = 0; ++ prepare_rx_descriptor(&RxDescList[i].descr); ++ } ++ ++ RxDescList[NBR_OF_RX_DESC - 1].descr.ctrl = d_eol; ++ RxDescList[NBR_OF_RX_DESC - 1].descr.next = virt_to_phys(&RxDescList[0]); ++ rx_queue_len = 0; ++ ++ /* Initialize transmit descriptors */ ++ for (i = 0; i < NBR_OF_TX_DESC; i++) { ++ TxDescList[i].descr.ctrl = 0; ++ TxDescList[i].descr.sw_len = 0; ++ TxDescList[i].descr.next = virt_to_phys(&TxDescList[i + 1].descr); ++ TxDescList[i].descr.buf = 0; ++ TxDescList[i].descr.status = 0; ++ TxDescList[i].descr.hw_len = 0; ++ TxDescList[i].skb = 0; ++ } ++ ++ TxDescList[NBR_OF_TX_DESC - 1].descr.ctrl = d_eol; ++ TxDescList[NBR_OF_TX_DESC - 1].descr.next = virt_to_phys(&TxDescList[0].descr); ++ ++ /* Initialise initial pointers */ ++ ++ myNextRxDesc = &RxDescList[0]; ++ myLastRxDesc = &RxDescList[NBR_OF_RX_DESC - 1]; ++ myFirstTxDesc = &TxDescList[0]; ++ myNextTxDesc = &TxDescList[0]; ++ myLastTxDesc = &TxDescList[NBR_OF_TX_DESC - 1]; ++ ++ /* Register device */ ++ err = register_netdev(dev); ++ if (err) { ++ free_netdev(dev); ++ return err; ++ } ++ ++ /* set the default MAC address */ ++ ++ e100_set_mac_address(dev, &default_mac); ++ ++ /* Initialize speed indicator stuff. */ ++ ++ current_speed = 10; ++ current_speed_selection = 0; /* Auto */ ++ speed_timer.expires = jiffies + NET_LINK_UP_CHECK_INTERVAL; ++ speed_timer.data = (unsigned long)dev; ++ speed_timer.function = e100_check_speed; ++ ++ clear_led_timer.function = e100_clear_network_leds; ++ clear_led_timer.data = (unsigned long)dev; ++ ++ full_duplex = 0; ++ current_duplex = autoneg; ++ duplex_timer.expires = jiffies + NET_DUPLEX_CHECK_INTERVAL; ++ duplex_timer.data = (unsigned long)dev; ++ duplex_timer.function = e100_check_duplex; ++ ++ /* Initialize mii interface */ ++ np->mii_if.phy_id_mask = 0x1f; ++ np->mii_if.reg_num_mask = 0x1f; ++ np->mii_if.dev = dev; ++ np->mii_if.mdio_read = e100_get_mdio_reg; ++ np->mii_if.mdio_write = e100_set_mdio_reg; ++ ++ /* Initialize group address registers to make sure that no */ ++ /* unwanted addresses are matched */ ++ *R_NETWORK_GA_0 = 0x00000000; ++ *R_NETWORK_GA_1 = 0x00000000; ++ ++ /* Initialize next time the led can flash */ ++ led_next_time = jiffies; ++ return 0; ++} ++ ++/* set MAC address of the interface. called from the core after a ++ * SIOCSIFADDR ioctl, and from the bootup above. ++ */ ++ ++static int ++e100_set_mac_address(struct net_device *dev, void *p) ++{ ++ struct net_local *np = netdev_priv(dev); ++ struct sockaddr *addr = p; ++ ++ spin_lock(&np->lock); /* preemption protection */ ++ ++ /* remember it */ ++ ++ memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); ++ ++ /* Write it to the hardware. ++ * Note the way the address is wrapped: ++ * *R_NETWORK_SA_0 = a0_0 | (a0_1 << 8) | (a0_2 << 16) | (a0_3 << 24); ++ * *R_NETWORK_SA_1 = a0_4 | (a0_5 << 8); ++ */ ++ ++ *R_NETWORK_SA_0 = dev->dev_addr[0] | (dev->dev_addr[1] << 8) | ++ (dev->dev_addr[2] << 16) | (dev->dev_addr[3] << 24); ++ *R_NETWORK_SA_1 = dev->dev_addr[4] | (dev->dev_addr[5] << 8); ++ *R_NETWORK_SA_2 = 0; ++ ++ /* show it in the log as well */ ++ ++ printk(KERN_INFO "%s: changed MAC to %pM\n", dev->name, dev->dev_addr); ++ ++ spin_unlock(&np->lock); ++ ++ return 0; ++} ++ ++/* ++ * Open/initialize the board. This is called (in the current kernel) ++ * sometime after booting when the 'ifconfig' program is run. ++ * ++ * This routine should set everything up anew at each open, even ++ * registers that "should" only need to be set once at boot, so that ++ * there is non-reboot way to recover if something goes wrong. ++ */ ++ ++static int ++e100_open(struct net_device *dev) ++{ ++ unsigned long flags; ++ ++ /* enable the MDIO output pin */ ++ ++ *R_NETWORK_MGM_CTRL = IO_STATE(R_NETWORK_MGM_CTRL, mdoe, enable); ++ ++ *R_IRQ_MASK0_CLR = ++ IO_STATE(R_IRQ_MASK0_CLR, overrun, clr) | ++ IO_STATE(R_IRQ_MASK0_CLR, underrun, clr) | ++ IO_STATE(R_IRQ_MASK0_CLR, excessive_col, clr); ++ ++ /* clear dma0 and 1 eop and descr irq masks */ ++ *R_IRQ_MASK2_CLR = ++ IO_STATE(R_IRQ_MASK2_CLR, dma0_descr, clr) | ++ IO_STATE(R_IRQ_MASK2_CLR, dma0_eop, clr) | ++ IO_STATE(R_IRQ_MASK2_CLR, dma1_descr, clr) | ++ IO_STATE(R_IRQ_MASK2_CLR, dma1_eop, clr); ++ ++ /* Reset and wait for the DMA channels */ ++ ++ RESET_DMA(NETWORK_TX_DMA_NBR); ++ RESET_DMA(NETWORK_RX_DMA_NBR); ++ WAIT_DMA(NETWORK_TX_DMA_NBR); ++ WAIT_DMA(NETWORK_RX_DMA_NBR); ++ ++ /* Initialise the etrax network controller */ ++ ++ /* allocate the irq corresponding to the receiving DMA */ ++ ++ if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt, ++ IRQF_SAMPLE_RANDOM, cardname, (void *)dev)) { ++ goto grace_exit0; ++ } ++ ++ /* allocate the irq corresponding to the transmitting DMA */ ++ ++ if (request_irq(NETWORK_DMA_TX_IRQ_NBR, e100rxtx_interrupt, 0, ++ cardname, (void *)dev)) { ++ goto grace_exit1; ++ } ++ ++ /* allocate the irq corresponding to the network errors etc */ ++ ++ if (request_irq(NETWORK_STATUS_IRQ_NBR, e100nw_interrupt, 0, ++ cardname, (void *)dev)) { ++ goto grace_exit2; ++ } ++ ++ /* ++ * Always allocate the DMA channels after the IRQ, ++ * and clean up on failure. ++ */ ++ ++ if (cris_request_dma(NETWORK_TX_DMA_NBR, ++ cardname, ++ DMA_VERBOSE_ON_ERROR, ++ dma_eth)) { ++ goto grace_exit3; ++ } ++ ++ if (cris_request_dma(NETWORK_RX_DMA_NBR, ++ cardname, ++ DMA_VERBOSE_ON_ERROR, ++ dma_eth)) { ++ goto grace_exit4; ++ } ++ ++ /* give the HW an idea of what MAC address we want */ ++ ++ *R_NETWORK_SA_0 = dev->dev_addr[0] | (dev->dev_addr[1] << 8) | ++ (dev->dev_addr[2] << 16) | (dev->dev_addr[3] << 24); ++ *R_NETWORK_SA_1 = dev->dev_addr[4] | (dev->dev_addr[5] << 8); ++ *R_NETWORK_SA_2 = 0; ++ ++#if 0 ++ /* use promiscuous mode for testing */ ++ *R_NETWORK_GA_0 = 0xffffffff; ++ *R_NETWORK_GA_1 = 0xffffffff; ++ ++ *R_NETWORK_REC_CONFIG = 0xd; /* broadcast rec, individ. rec, ma0 enabled */ ++#else ++ SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, max_size, size1522); ++ SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, broadcast, receive); ++ SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, ma0, enable); ++ SETF(network_rec_config_shadow, R_NETWORK_REC_CONFIG, duplex, full_duplex); ++ *R_NETWORK_REC_CONFIG = network_rec_config_shadow; ++#endif ++ ++ *R_NETWORK_GEN_CONFIG = ++ IO_STATE(R_NETWORK_GEN_CONFIG, phy, mii_clk) | ++ IO_STATE(R_NETWORK_GEN_CONFIG, enable, on); ++ ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, clr_error, clr); ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, delay, none); ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, cancel, dont); ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, cd, enable); ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, retry, enable); ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, pad, enable); ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, crc, enable); ++ *R_NETWORK_TR_CTRL = network_tr_ctrl_shadow; ++ ++ local_irq_save(flags); ++ ++ /* enable the irq's for ethernet DMA */ ++ ++ *R_IRQ_MASK2_SET = ++ IO_STATE(R_IRQ_MASK2_SET, dma0_eop, set) | ++ IO_STATE(R_IRQ_MASK2_SET, dma1_eop, set); ++ ++ *R_IRQ_MASK0_SET = ++ IO_STATE(R_IRQ_MASK0_SET, overrun, set) | ++ IO_STATE(R_IRQ_MASK0_SET, underrun, set) | ++ IO_STATE(R_IRQ_MASK0_SET, excessive_col, set); ++ ++ /* make sure the irqs are cleared */ ++ ++ *R_DMA_CH0_CLR_INTR = IO_STATE(R_DMA_CH0_CLR_INTR, clr_eop, do); ++ *R_DMA_CH1_CLR_INTR = IO_STATE(R_DMA_CH1_CLR_INTR, clr_eop, do); ++ ++ /* make sure the rec and transmit error counters are cleared */ ++ ++ (void)*R_REC_COUNTERS; /* dummy read */ ++ (void)*R_TR_COUNTERS; /* dummy read */ ++ ++ /* start the receiving DMA channel so we can receive packets from now on */ ++ ++ *R_DMA_CH1_FIRST = virt_to_phys(myNextRxDesc); ++ *R_DMA_CH1_CMD = IO_STATE(R_DMA_CH1_CMD, cmd, start); ++ ++ /* Set up transmit DMA channel so it can be restarted later */ ++ ++ *R_DMA_CH0_FIRST = 0; ++ *R_DMA_CH0_DESCR = virt_to_phys(myLastTxDesc); ++ netif_start_queue(dev); ++ ++ local_irq_restore(flags); ++ ++ /* Probe for transceiver */ ++ if (e100_probe_transceiver(dev)) ++ goto grace_exit5; ++ ++ /* Start duplex/speed timers */ ++ add_timer(&speed_timer); ++ add_timer(&duplex_timer); ++ ++ /* We are now ready to accept transmit requeusts from ++ * the queueing layer of the networking. ++ */ ++ netif_carrier_on(dev); ++ ++ return 0; ++ ++grace_exit5: ++ cris_free_dma(NETWORK_RX_DMA_NBR, cardname); ++grace_exit4: ++ cris_free_dma(NETWORK_TX_DMA_NBR, cardname); ++grace_exit3: ++ free_irq(NETWORK_STATUS_IRQ_NBR, (void *)dev); ++grace_exit2: ++ free_irq(NETWORK_DMA_TX_IRQ_NBR, (void *)dev); ++grace_exit1: ++ free_irq(NETWORK_DMA_RX_IRQ_NBR, (void *)dev); ++grace_exit0: ++ return -EAGAIN; ++} ++ ++#if defined(CONFIG_ETRAX_NO_PHY) ++static void ++dummy_check_speed(struct net_device* dev) ++{ ++ current_speed = 100; ++} ++#else ++static void ++generic_check_speed(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_ADVERTISE); ++ if ((data & ADVERTISE_100FULL) || ++ (data & ADVERTISE_100HALF)) ++ current_speed = 100; ++ else ++ current_speed = 10; ++} ++ ++static void ++tdk_check_speed(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, ++ MDIO_TDK_DIAGNOSTIC_REG); ++ current_speed = (data & MDIO_TDK_DIAGNOSTIC_RATE ? 100 : 10); ++} ++ ++static void ++broadcom_check_speed(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, ++ MDIO_AUX_CTRL_STATUS_REG); ++ current_speed = (data & MDIO_BC_SPEED ? 100 : 10); ++} ++ ++static void ++intel_check_speed(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, ++ MDIO_INT_STATUS_REG_2); ++ current_speed = (data & MDIO_INT_SPEED ? 100 : 10); ++} ++#endif ++static void ++e100_check_speed(unsigned long priv) ++{ ++ struct net_device* dev = (struct net_device*)priv; ++ struct net_local *np = netdev_priv(dev); ++ static int led_initiated = 0; ++ unsigned long data; ++ int old_speed = current_speed; ++ ++ spin_lock(&np->transceiver_lock); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_BMSR); ++ if (!(data & BMSR_LSTATUS)) { ++ current_speed = 0; ++ } else { ++ transceiver->check_speed(dev); ++ } ++ ++ spin_lock(&np->led_lock); ++ if ((old_speed != current_speed) || !led_initiated) { ++ led_initiated = 1; ++ e100_set_network_leds(NO_NETWORK_ACTIVITY); ++ if (current_speed) ++ netif_carrier_on(dev); ++ else ++ netif_carrier_off(dev); ++ } ++ spin_unlock(&np->led_lock); ++ ++ /* Reinitialize the timer. */ ++ speed_timer.expires = jiffies + NET_LINK_UP_CHECK_INTERVAL; ++ add_timer(&speed_timer); ++ ++ spin_unlock(&np->transceiver_lock); ++} ++ ++static void ++e100_negotiate(struct net_device* dev) ++{ ++ struct net_local *np = netdev_priv(dev); ++ unsigned short data = e100_get_mdio_reg(dev, np->mii_if.phy_id, ++ MII_ADVERTISE); ++ ++ /* Discard old speed and duplex settings */ ++ data &= ~(ADVERTISE_100HALF | ADVERTISE_100FULL | ++ ADVERTISE_10HALF | ADVERTISE_10FULL); ++ ++ switch (current_speed_selection) { ++ case 10: ++ if (current_duplex == full) ++ data |= ADVERTISE_10FULL; ++ else if (current_duplex == half) ++ data |= ADVERTISE_10HALF; ++ else ++ data |= ADVERTISE_10HALF | ADVERTISE_10FULL; ++ break; ++ ++ case 100: ++ if (current_duplex == full) ++ data |= ADVERTISE_100FULL; ++ else if (current_duplex == half) ++ data |= ADVERTISE_100HALF; ++ else ++ data |= ADVERTISE_100HALF | ADVERTISE_100FULL; ++ break; ++ ++ case 0: /* Auto */ ++ if (current_duplex == full) ++ data |= ADVERTISE_100FULL | ADVERTISE_10FULL; ++ else if (current_duplex == half) ++ data |= ADVERTISE_100HALF | ADVERTISE_10HALF; ++ else ++ data |= ADVERTISE_10HALF | ADVERTISE_10FULL | ++ ADVERTISE_100HALF | ADVERTISE_100FULL; ++ break; ++ ++ default: /* assume autoneg speed and duplex */ ++ data |= ADVERTISE_10HALF | ADVERTISE_10FULL | ++ ADVERTISE_100HALF | ADVERTISE_100FULL; ++ break; ++ } ++ ++ e100_set_mdio_reg(dev, np->mii_if.phy_id, MII_ADVERTISE, data); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR); ++ if (autoneg_normal) { ++ /* Renegotiate with link partner */ ++ data |= BMCR_ANENABLE | BMCR_ANRESTART; ++ } else { ++ /* Don't negotiate speed or duplex */ ++ data &= ~(BMCR_ANENABLE | BMCR_ANRESTART); ++ ++ /* Set speed and duplex static */ ++ if (current_speed_selection == 10) ++ data &= ~BMCR_SPEED100; ++ else ++ data |= BMCR_SPEED100; ++ ++ if (current_duplex != full) ++ data &= ~BMCR_FULLDPLX; ++ else ++ data |= BMCR_FULLDPLX; ++ } ++ e100_set_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR, data); ++} ++ ++static void ++e100_set_speed(struct net_device* dev, unsigned long speed) ++{ ++ struct net_local *np = netdev_priv(dev); ++ ++ spin_lock(&np->transceiver_lock); ++ if (speed != current_speed_selection) { ++ current_speed_selection = speed; ++ e100_negotiate(dev); ++ } ++ spin_unlock(&np->transceiver_lock); ++} ++ ++static void ++e100_check_duplex(unsigned long priv) ++{ ++ struct net_device *dev = (struct net_device *)priv; ++ struct net_local *np = netdev_priv(dev); ++ int old_duplex; ++ ++ spin_lock(&np->transceiver_lock); ++ old_duplex = full_duplex; ++ transceiver->check_duplex(dev); ++ if (old_duplex != full_duplex) { ++ /* Duplex changed */ ++ SETF(network_rec_config_shadow, R_NETWORK_REC_CONFIG, duplex, full_duplex); ++ *R_NETWORK_REC_CONFIG = network_rec_config_shadow; ++ } ++ ++ /* Reinitialize the timer. */ ++ duplex_timer.expires = jiffies + NET_DUPLEX_CHECK_INTERVAL; ++ add_timer(&duplex_timer); ++ np->mii_if.full_duplex = full_duplex; ++ spin_unlock(&np->transceiver_lock); ++} ++#if defined(CONFIG_ETRAX_NO_PHY) ++static void ++dummy_check_duplex(struct net_device* dev) ++{ ++ full_duplex = 1; ++} ++#else ++static void ++generic_check_duplex(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_ADVERTISE); ++ if ((data & ADVERTISE_10FULL) || ++ (data & ADVERTISE_100FULL)) ++ full_duplex = 1; ++ else ++ full_duplex = 0; ++} ++ ++static void ++tdk_check_duplex(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, ++ MDIO_TDK_DIAGNOSTIC_REG); ++ full_duplex = (data & MDIO_TDK_DIAGNOSTIC_DPLX) ? 1 : 0; ++} ++ ++static void ++broadcom_check_duplex(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, ++ MDIO_AUX_CTRL_STATUS_REG); ++ full_duplex = (data & MDIO_BC_FULL_DUPLEX_IND) ? 1 : 0; ++} ++ ++static void ++intel_check_duplex(struct net_device* dev) ++{ ++ unsigned long data; ++ struct net_local *np = netdev_priv(dev); ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, ++ MDIO_INT_STATUS_REG_2); ++ full_duplex = (data & MDIO_INT_FULL_DUPLEX_IND) ? 1 : 0; ++} ++#endif ++static void ++e100_set_duplex(struct net_device* dev, enum duplex new_duplex) ++{ ++ struct net_local *np = netdev_priv(dev); ++ ++ spin_lock(&np->transceiver_lock); ++ if (new_duplex != current_duplex) { ++ current_duplex = new_duplex; ++ e100_negotiate(dev); ++ } ++ spin_unlock(&np->transceiver_lock); ++} ++ ++static int ++e100_probe_transceiver(struct net_device* dev) ++{ ++ int ret = 0; ++ ++#if !defined(CONFIG_ETRAX_NO_PHY) ++ unsigned int phyid_high; ++ unsigned int phyid_low; ++ unsigned int oui; ++ struct transceiver_ops* ops = NULL; ++ struct net_local *np = netdev_priv(dev); ++ ++ spin_lock(&np->transceiver_lock); ++ ++ /* Probe MDIO physical address */ ++ for (np->mii_if.phy_id = 0; np->mii_if.phy_id <= 31; ++ np->mii_if.phy_id++) { ++ if (e100_get_mdio_reg(dev, ++ np->mii_if.phy_id, MII_BMSR) != 0xffff) ++ break; ++ } ++ if (np->mii_if.phy_id == 32) { ++ ret = -ENODEV; ++ goto out; ++ } ++ ++ /* Get manufacturer */ ++ phyid_high = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_PHYSID1); ++ phyid_low = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_PHYSID2); ++ oui = (phyid_high << 6) | (phyid_low >> 10); ++ ++ for (ops = &transceivers[0]; ops->oui; ops++) { ++ if (ops->oui == oui) ++ break; ++ } ++ transceiver = ops; ++out: ++ spin_unlock(&np->transceiver_lock); ++#endif ++ return ret; ++} ++ ++static int ++e100_get_mdio_reg(struct net_device *dev, int phy_id, int location) ++{ ++ unsigned short cmd; /* Data to be sent on MDIO port */ ++ int data; /* Data read from MDIO */ ++ int bitCounter; ++ ++ /* Start of frame, OP Code, Physical Address, Register Address */ ++ cmd = (MDIO_START << 14) | (MDIO_READ << 12) | (phy_id << 7) | ++ (location << 2); ++ ++ e100_send_mdio_cmd(cmd, 0); ++ ++ data = 0; ++ ++ /* Data... */ ++ for (bitCounter=15; bitCounter>=0 ; bitCounter--) { ++ data |= (e100_receive_mdio_bit() << bitCounter); ++ } ++ ++ return data; ++} ++ ++static void ++e100_set_mdio_reg(struct net_device *dev, int phy_id, int location, int value) ++{ ++ int bitCounter; ++ unsigned short cmd; ++ ++ cmd = (MDIO_START << 14) | (MDIO_WRITE << 12) | (phy_id << 7) | ++ (location << 2); ++ ++ e100_send_mdio_cmd(cmd, 1); ++ ++ /* Data... */ ++ for (bitCounter=15; bitCounter>=0 ; bitCounter--) { ++ e100_send_mdio_bit(GET_BIT(bitCounter, value)); ++ } ++ ++} ++ ++static void ++e100_send_mdio_cmd(unsigned short cmd, int write_cmd) ++{ ++ int bitCounter; ++ unsigned char data = 0x2; ++ ++ /* Preamble */ ++ for (bitCounter = 31; bitCounter>= 0; bitCounter--) ++ e100_send_mdio_bit(GET_BIT(bitCounter, MDIO_PREAMBLE)); ++ ++ for (bitCounter = 15; bitCounter >= 2; bitCounter--) ++ e100_send_mdio_bit(GET_BIT(bitCounter, cmd)); ++ ++ /* Turnaround */ ++ for (bitCounter = 1; bitCounter >= 0 ; bitCounter--) ++ if (write_cmd) ++ e100_send_mdio_bit(GET_BIT(bitCounter, data)); ++ else ++ e100_receive_mdio_bit(); ++} ++ ++static void ++e100_send_mdio_bit(unsigned char bit) ++{ ++ *R_NETWORK_MGM_CTRL = ++ IO_STATE(R_NETWORK_MGM_CTRL, mdoe, enable) | ++ IO_FIELD(R_NETWORK_MGM_CTRL, mdio, bit); ++ udelay(1); ++ *R_NETWORK_MGM_CTRL = ++ IO_STATE(R_NETWORK_MGM_CTRL, mdoe, enable) | ++ IO_MASK(R_NETWORK_MGM_CTRL, mdck) | ++ IO_FIELD(R_NETWORK_MGM_CTRL, mdio, bit); ++ udelay(1); ++} ++ ++static unsigned char ++e100_receive_mdio_bit() ++{ ++ unsigned char bit; ++ *R_NETWORK_MGM_CTRL = 0; ++ bit = IO_EXTRACT(R_NETWORK_STAT, mdio, *R_NETWORK_STAT); ++ udelay(1); ++ *R_NETWORK_MGM_CTRL = IO_MASK(R_NETWORK_MGM_CTRL, mdck); ++ udelay(1); ++ return bit; ++} ++ ++static void ++e100_reset_transceiver(struct net_device* dev) ++{ ++ struct net_local *np = netdev_priv(dev); ++ unsigned short cmd; ++ unsigned short data; ++ int bitCounter; ++ ++ data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR); ++ ++ cmd = (MDIO_START << 14) | (MDIO_WRITE << 12) | (np->mii_if.phy_id << 7) | (MII_BMCR << 2); ++ ++ e100_send_mdio_cmd(cmd, 1); ++ ++ data |= 0x8000; ++ ++ for (bitCounter = 15; bitCounter >= 0 ; bitCounter--) { ++ e100_send_mdio_bit(GET_BIT(bitCounter, data)); ++ } ++} ++ ++/* Called by upper layers if they decide it took too long to complete ++ * sending a packet - we need to reset and stuff. ++ */ ++ ++static void ++e100_tx_timeout(struct net_device *dev) ++{ ++ struct net_local *np = netdev_priv(dev); ++ unsigned long flags; ++ ++ spin_lock_irqsave(&np->lock, flags); ++ ++ printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name, ++ tx_done(dev) ? "IRQ problem" : "network cable problem"); ++ ++ /* remember we got an error */ ++ ++ np->stats.tx_errors++; ++ ++ /* reset the TX DMA in case it has hung on something */ ++ ++ RESET_DMA(NETWORK_TX_DMA_NBR); ++ WAIT_DMA(NETWORK_TX_DMA_NBR); ++ ++ /* Reset the transceiver. */ ++ ++ e100_reset_transceiver(dev); ++ ++ /* and get rid of the packets that never got an interrupt */ ++ while (myFirstTxDesc != myNextTxDesc) { ++ dev_kfree_skb(myFirstTxDesc->skb); ++ myFirstTxDesc->skb = 0; ++ myFirstTxDesc = phys_to_virt(myFirstTxDesc->descr.next); ++ } ++ ++ /* Set up transmit DMA channel so it can be restarted later */ ++ *R_DMA_CH0_FIRST = 0; ++ *R_DMA_CH0_DESCR = virt_to_phys(myLastTxDesc); ++ ++ /* tell the upper layers we're ok again */ ++ ++ netif_wake_queue(dev); ++ spin_unlock_irqrestore(&np->lock, flags); ++} ++ ++ ++/* This will only be invoked if the driver is _not_ in XOFF state. ++ * What this means is that we need not check it, and that this ++ * invariant will hold if we make sure that the netif_*_queue() ++ * calls are done at the proper times. ++ */ ++ ++static int ++e100_send_packet(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct net_local *np = netdev_priv(dev); ++ unsigned char *buf = skb->data; ++ unsigned long flags; ++ ++#ifdef ETHDEBUG ++ printk("send packet len %d\n", length); ++#endif ++ spin_lock_irqsave(&np->lock, flags); /* protect from tx_interrupt and ourself */ ++ ++ myNextTxDesc->skb = skb; ++ ++ dev->trans_start = jiffies; ++ ++ e100_hardware_send_packet(np, buf, skb->len); ++ ++ myNextTxDesc = phys_to_virt(myNextTxDesc->descr.next); ++ ++ /* Stop queue if full */ ++ if (myNextTxDesc == myFirstTxDesc) { ++ netif_stop_queue(dev); ++ } ++ ++ spin_unlock_irqrestore(&np->lock, flags); ++ ++ return NETDEV_TX_OK; ++} ++ ++/* ++ * The typical workload of the driver: ++ * Handle the network interface interrupts. ++ */ ++ ++static irqreturn_t ++e100rxtx_interrupt(int irq, void *dev_id) ++{ ++ struct net_device *dev = (struct net_device *)dev_id; ++ struct net_local *np = netdev_priv(dev); ++ unsigned long irqbits; ++ ++ /* ++ * Note that both rx and tx interrupts are blocked at this point, ++ * regardless of which got us here. ++ */ ++ ++ irqbits = *R_IRQ_MASK2_RD; ++ ++ /* Handle received packets */ ++ if (irqbits & IO_STATE(R_IRQ_MASK2_RD, dma1_eop, active)) { ++ /* acknowledge the eop interrupt */ ++ ++ *R_DMA_CH1_CLR_INTR = IO_STATE(R_DMA_CH1_CLR_INTR, clr_eop, do); ++ ++ /* check if one or more complete packets were indeed received */ ++ ++ while ((*R_DMA_CH1_FIRST != virt_to_phys(myNextRxDesc)) && ++ (myNextRxDesc != myLastRxDesc)) { ++ /* Take out the buffer and give it to the OS, then ++ * allocate a new buffer to put a packet in. ++ */ ++ e100_rx(dev); ++ np->stats.rx_packets++; ++ /* restart/continue on the channel, for safety */ ++ *R_DMA_CH1_CMD = IO_STATE(R_DMA_CH1_CMD, cmd, restart); ++ /* clear dma channel 1 eop/descr irq bits */ ++ *R_DMA_CH1_CLR_INTR = ++ IO_STATE(R_DMA_CH1_CLR_INTR, clr_eop, do) | ++ IO_STATE(R_DMA_CH1_CLR_INTR, clr_descr, do); ++ ++ /* now, we might have gotten another packet ++ so we have to loop back and check if so */ ++ } ++ } ++ ++ /* Report any packets that have been sent */ ++ while (virt_to_phys(myFirstTxDesc) != *R_DMA_CH0_FIRST && ++ (netif_queue_stopped(dev) || myFirstTxDesc != myNextTxDesc)) { ++ np->stats.tx_bytes += myFirstTxDesc->skb->len; ++ np->stats.tx_packets++; ++ ++ /* dma is ready with the transmission of the data in tx_skb, so now ++ we can release the skb memory */ ++ dev_kfree_skb_irq(myFirstTxDesc->skb); ++ myFirstTxDesc->skb = 0; ++ myFirstTxDesc = phys_to_virt(myFirstTxDesc->descr.next); ++ /* Wake up queue. */ ++ netif_wake_queue(dev); ++ } ++ ++ if (irqbits & IO_STATE(R_IRQ_MASK2_RD, dma0_eop, active)) { ++ /* acknowledge the eop interrupt. */ ++ *R_DMA_CH0_CLR_INTR = IO_STATE(R_DMA_CH0_CLR_INTR, clr_eop, do); ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++static irqreturn_t ++e100nw_interrupt(int irq, void *dev_id) ++{ ++ struct net_device *dev = (struct net_device *)dev_id; ++ struct net_local *np = netdev_priv(dev); ++ unsigned long irqbits = *R_IRQ_MASK0_RD; ++ ++ /* check for underrun irq */ ++ if (irqbits & IO_STATE(R_IRQ_MASK0_RD, underrun, active)) { ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, clr_error, clr); ++ *R_NETWORK_TR_CTRL = network_tr_ctrl_shadow; ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, clr_error, nop); ++ np->stats.tx_errors++; ++ D(printk("ethernet receiver underrun!\n")); ++ } ++ ++ /* check for overrun irq */ ++ if (irqbits & IO_STATE(R_IRQ_MASK0_RD, overrun, active)) { ++ update_rx_stats(&np->stats); /* this will ack the irq */ ++ D(printk("ethernet receiver overrun!\n")); ++ } ++ /* check for excessive collision irq */ ++ if (irqbits & IO_STATE(R_IRQ_MASK0_RD, excessive_col, active)) { ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, clr_error, clr); ++ *R_NETWORK_TR_CTRL = network_tr_ctrl_shadow; ++ SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, clr_error, nop); ++ np->stats.tx_errors++; ++ D(printk("ethernet excessive collisions!\n")); ++ } ++ return IRQ_HANDLED; ++} ++ ++/* We have a good packet(s), get it/them out of the buffers. */ ++static void ++e100_rx(struct net_device *dev) ++{ ++ struct sk_buff *skb; ++ int length = 0; ++ struct net_local *np = netdev_priv(dev); ++ unsigned char *skb_data_ptr; ++#ifdef ETHDEBUG ++ int i; ++#endif ++ etrax_eth_descr *prevRxDesc; /* The descriptor right before myNextRxDesc */ ++ spin_lock(&np->led_lock); ++ if (!led_active && time_after(jiffies, led_next_time)) { ++ /* light the network leds depending on the current speed. */ ++ e100_set_network_leds(NETWORK_ACTIVITY); ++ ++ /* Set the earliest time we may clear the LED */ ++ led_next_time = jiffies + NET_FLASH_TIME; ++ led_active = 1; ++ mod_timer(&clear_led_timer, jiffies + HZ/10); ++ } ++ spin_unlock(&np->led_lock); ++ ++ length = myNextRxDesc->descr.hw_len - 4; ++ np->stats.rx_bytes += length; ++ ++#ifdef ETHDEBUG ++ printk("Got a packet of length %d:\n", length); ++ /* dump the first bytes in the packet */ ++ skb_data_ptr = (unsigned char *)phys_to_virt(myNextRxDesc->descr.buf); ++ for (i = 0; i < 8; i++) { ++ printk("%d: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x\n", i * 8, ++ skb_data_ptr[0],skb_data_ptr[1],skb_data_ptr[2],skb_data_ptr[3], ++ skb_data_ptr[4],skb_data_ptr[5],skb_data_ptr[6],skb_data_ptr[7]); ++ skb_data_ptr += 8; ++ } ++#endif ++ ++ if (length < RX_COPYBREAK) { ++ /* Small packet, copy data */ ++ skb = dev_alloc_skb(length - ETHER_HEAD_LEN); ++ if (!skb) { ++ np->stats.rx_errors++; ++ printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name); ++ goto update_nextrxdesc; ++ } ++ ++ skb_put(skb, length - ETHER_HEAD_LEN); /* allocate room for the packet body */ ++ skb_data_ptr = skb_push(skb, ETHER_HEAD_LEN); /* allocate room for the header */ ++ ++#ifdef ETHDEBUG ++ printk("head = 0x%x, data = 0x%x, tail = 0x%x, end = 0x%x\n", ++ skb->head, skb->data, skb_tail_pointer(skb), ++ skb_end_pointer(skb)); ++ printk("copying packet to 0x%x.\n", skb_data_ptr); ++#endif ++ ++ memcpy(skb_data_ptr, phys_to_virt(myNextRxDesc->descr.buf), length); ++ } ++ else { ++ /* Large packet, send directly to upper layers and allocate new ++ * memory (aligned to cache line boundary to avoid bug). ++ * Before sending the skb to upper layers we must make sure ++ * that skb->data points to the aligned start of the packet. ++ */ ++ int align; ++ struct sk_buff *new_skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES); ++ if (!new_skb) { ++ np->stats.rx_errors++; ++ printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name); ++ goto update_nextrxdesc; ++ } ++ skb = myNextRxDesc->skb; ++ align = (int)phys_to_virt(myNextRxDesc->descr.buf) - (int)skb->data; ++ skb_put(skb, length + align); ++ skb_pull(skb, align); /* Remove alignment bytes */ ++ myNextRxDesc->skb = new_skb; ++ myNextRxDesc->descr.buf = L1_CACHE_ALIGN(virt_to_phys(myNextRxDesc->skb->data)); ++ } ++ ++ skb->protocol = eth_type_trans(skb, dev); ++ ++ /* Send the packet to the upper layers */ ++ netif_rx(skb); ++ ++ update_nextrxdesc: ++ /* Prepare for next packet */ ++ myNextRxDesc->descr.status = 0; ++ prevRxDesc = myNextRxDesc; ++ myNextRxDesc = phys_to_virt(myNextRxDesc->descr.next); ++ ++ rx_queue_len++; ++ ++ /* Check if descriptors should be returned */ ++ if (rx_queue_len == RX_QUEUE_THRESHOLD) { ++ flush_etrax_cache(); ++ prevRxDesc->descr.ctrl |= d_eol; ++ myLastRxDesc->descr.ctrl &= ~d_eol; ++ myLastRxDesc = prevRxDesc; ++ rx_queue_len = 0; ++ } ++} ++ ++/* The inverse routine to net_open(). */ ++static int ++e100_close(struct net_device *dev) ++{ ++ struct net_local *np = netdev_priv(dev); ++ ++ printk(KERN_INFO "Closing %s.\n", dev->name); ++ ++ netif_stop_queue(dev); ++ ++ *R_IRQ_MASK0_CLR = ++ IO_STATE(R_IRQ_MASK0_CLR, overrun, clr) | ++ IO_STATE(R_IRQ_MASK0_CLR, underrun, clr) | ++ IO_STATE(R_IRQ_MASK0_CLR, excessive_col, clr); ++ ++ *R_IRQ_MASK2_CLR = ++ IO_STATE(R_IRQ_MASK2_CLR, dma0_descr, clr) | ++ IO_STATE(R_IRQ_MASK2_CLR, dma0_eop, clr) | ++ IO_STATE(R_IRQ_MASK2_CLR, dma1_descr, clr) | ++ IO_STATE(R_IRQ_MASK2_CLR, dma1_eop, clr); ++ ++ /* Stop the receiver and the transmitter */ ++ ++ RESET_DMA(NETWORK_TX_DMA_NBR); ++ RESET_DMA(NETWORK_RX_DMA_NBR); ++ ++ /* Flush the Tx and disable Rx here. */ ++ ++ free_irq(NETWORK_DMA_RX_IRQ_NBR, (void *)dev); ++ free_irq(NETWORK_DMA_TX_IRQ_NBR, (void *)dev); ++ free_irq(NETWORK_STATUS_IRQ_NBR, (void *)dev); ++ ++ cris_free_dma(NETWORK_TX_DMA_NBR, cardname); ++ cris_free_dma(NETWORK_RX_DMA_NBR, cardname); ++ ++ /* Update the statistics here. */ ++ ++ update_rx_stats(&np->stats); ++ update_tx_stats(&np->stats); ++ ++ /* Stop speed/duplex timers */ ++ del_timer(&speed_timer); ++ del_timer(&duplex_timer); ++ ++ return 0; ++} ++ ++static int ++e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ++{ ++ struct mii_ioctl_data *data = if_mii(ifr); ++ struct net_local *np = netdev_priv(dev); ++ int rc = 0; ++ int old_autoneg; ++ ++ spin_lock(&np->lock); /* Preempt protection */ ++ switch (cmd) { ++ /* The ioctls below should be considered obsolete but are */ ++ /* still present for compatability with old scripts/apps */ ++ case SET_ETH_SPEED_10: /* 10 Mbps */ ++ e100_set_speed(dev, 10); ++ break; ++ case SET_ETH_SPEED_100: /* 100 Mbps */ ++ e100_set_speed(dev, 100); ++ break; ++ case SET_ETH_SPEED_AUTO: /* Auto-negotiate speed */ ++ e100_set_speed(dev, 0); ++ break; ++ case SET_ETH_DUPLEX_HALF: /* Half duplex */ ++ e100_set_duplex(dev, half); ++ break; ++ case SET_ETH_DUPLEX_FULL: /* Full duplex */ ++ e100_set_duplex(dev, full); ++ break; ++ case SET_ETH_DUPLEX_AUTO: /* Auto-negotiate duplex */ ++ e100_set_duplex(dev, autoneg); ++ break; ++ case SET_ETH_AUTONEG: ++ old_autoneg = autoneg_normal; ++ autoneg_normal = *(int*)data; ++ if (autoneg_normal != old_autoneg) ++ e100_negotiate(dev); ++ break; ++ default: ++ rc = generic_mii_ioctl(&np->mii_if, if_mii(ifr), ++ cmd, NULL); ++ break; ++ } ++ spin_unlock(&np->lock); ++ return rc; ++} ++ ++static int e100_get_settings(struct net_device *dev, ++ struct ethtool_cmd *cmd) ++{ ++ struct net_local *np = netdev_priv(dev); ++ int err; ++ ++ spin_lock_irq(&np->lock); ++ err = mii_ethtool_gset(&np->mii_if, cmd); ++ spin_unlock_irq(&np->lock); ++ ++ /* The PHY may support 1000baseT, but the Etrax100 does not. */ ++ cmd->supported &= ~(SUPPORTED_1000baseT_Half ++ | SUPPORTED_1000baseT_Full); ++ return err; ++} ++ ++static int e100_set_settings(struct net_device *dev, ++ struct ethtool_cmd *ecmd) ++{ ++ if (ecmd->autoneg == AUTONEG_ENABLE) { ++ e100_set_duplex(dev, autoneg); ++ e100_set_speed(dev, 0); ++ } else { ++ e100_set_duplex(dev, ecmd->duplex == DUPLEX_HALF ? half : full); ++ e100_set_speed(dev, ecmd->speed == SPEED_10 ? 10: 100); ++ } ++ ++ return 0; ++} ++ ++static void e100_get_drvinfo(struct net_device *dev, ++ struct ethtool_drvinfo *info) ++{ ++ strncpy(info->driver, "ETRAX 100LX", sizeof(info->driver) - 1); ++ strncpy(info->version, "$Revision: 1.31 $", sizeof(info->version) - 1); ++ strncpy(info->fw_version, "N/A", sizeof(info->fw_version) - 1); ++ strncpy(info->bus_info, "N/A", sizeof(info->bus_info) - 1); ++} ++ ++static int e100_nway_reset(struct net_device *dev) ++{ ++ if (current_duplex == autoneg && current_speed_selection == 0) ++ e100_negotiate(dev); ++ return 0; ++} ++ ++static const struct ethtool_ops e100_ethtool_ops = { ++ .get_settings = e100_get_settings, ++ .set_settings = e100_set_settings, ++ .get_drvinfo = e100_get_drvinfo, ++ .nway_reset = e100_nway_reset, ++ .get_link = ethtool_op_get_link, ++}; ++ ++static int ++e100_set_config(struct net_device *dev, struct ifmap *map) ++{ ++ struct net_local *np = netdev_priv(dev); ++ ++ spin_lock(&np->lock); /* Preempt protection */ ++ ++ switch(map->port) { ++ case IF_PORT_UNKNOWN: ++ /* Use autoneg */ ++ e100_set_speed(dev, 0); ++ e100_set_duplex(dev, autoneg); ++ break; ++ case IF_PORT_10BASET: ++ e100_set_speed(dev, 10); ++ e100_set_duplex(dev, autoneg); ++ break; ++ case IF_PORT_100BASET: ++ case IF_PORT_100BASETX: ++ e100_set_speed(dev, 100); ++ e100_set_duplex(dev, autoneg); ++ break; ++ case IF_PORT_100BASEFX: ++ case IF_PORT_10BASE2: ++ case IF_PORT_AUI: ++ spin_unlock(&np->lock); ++ return -EOPNOTSUPP; ++ break; ++ default: ++ printk(KERN_ERR "%s: Invalid media selected", dev->name); ++ spin_unlock(&np->lock); ++ return -EINVAL; ++ } ++ spin_unlock(&np->lock); ++ return 0; ++} ++ ++static void ++update_rx_stats(struct net_device_stats *es) ++{ ++ unsigned long r = *R_REC_COUNTERS; ++ /* update stats relevant to reception errors */ ++ es->rx_fifo_errors += IO_EXTRACT(R_REC_COUNTERS, congestion, r); ++ es->rx_crc_errors += IO_EXTRACT(R_REC_COUNTERS, crc_error, r); ++ es->rx_frame_errors += IO_EXTRACT(R_REC_COUNTERS, alignment_error, r); ++ es->rx_length_errors += IO_EXTRACT(R_REC_COUNTERS, oversize, r); ++} ++ ++static void ++update_tx_stats(struct net_device_stats *es) ++{ ++ unsigned long r = *R_TR_COUNTERS; ++ /* update stats relevant to transmission errors */ ++ es->collisions += ++ IO_EXTRACT(R_TR_COUNTERS, single_col, r) + ++ IO_EXTRACT(R_TR_COUNTERS, multiple_col, r); ++} ++ ++/* ++ * Get the current statistics. ++ * This may be called with the card open or closed. ++ */ ++static struct net_device_stats * ++e100_get_stats(struct net_device *dev) ++{ ++ struct net_local *lp = netdev_priv(dev); ++ unsigned long flags; ++ ++ spin_lock_irqsave(&lp->lock, flags); ++ ++ update_rx_stats(&lp->stats); ++ update_tx_stats(&lp->stats); ++ ++ spin_unlock_irqrestore(&lp->lock, flags); ++ return &lp->stats; ++} ++ ++/* ++ * Set or clear the multicast filter for this adaptor. ++ * num_addrs == -1 Promiscuous mode, receive all packets ++ * num_addrs == 0 Normal mode, clear multicast list ++ * num_addrs > 0 Multicast mode, receive normal and MC packets, ++ * and do best-effort filtering. ++ */ ++static void ++set_multicast_list(struct net_device *dev) ++{ ++ struct net_local *lp = netdev_priv(dev); ++ int num_addr = dev->mc_count; ++ unsigned long int lo_bits; ++ unsigned long int hi_bits; ++ ++ spin_lock(&lp->lock); ++ if (dev->flags & IFF_PROMISC) { ++ /* promiscuous mode */ ++ lo_bits = 0xfffffffful; ++ hi_bits = 0xfffffffful; ++ ++ /* Enable individual receive */ ++ SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, individual, receive); ++ *R_NETWORK_REC_CONFIG = network_rec_config_shadow; ++ } else if (dev->flags & IFF_ALLMULTI) { ++ /* enable all multicasts */ ++ lo_bits = 0xfffffffful; ++ hi_bits = 0xfffffffful; ++ ++ /* Disable individual receive */ ++ SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, individual, discard); ++ *R_NETWORK_REC_CONFIG = network_rec_config_shadow; ++ } else if (num_addr == 0) { ++ /* Normal, clear the mc list */ ++ lo_bits = 0x00000000ul; ++ hi_bits = 0x00000000ul; ++ ++ /* Disable individual receive */ ++ SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, individual, discard); ++ *R_NETWORK_REC_CONFIG = network_rec_config_shadow; ++ } else { ++ /* MC mode, receive normal and MC packets */ ++ char hash_ix; ++ struct dev_mc_list *dmi = dev->mc_list; ++ int i; ++ char *baddr; ++ ++ lo_bits = 0x00000000ul; ++ hi_bits = 0x00000000ul; ++ for (i = 0; i < num_addr; i++) { ++ /* Calculate the hash index for the GA registers */ ++ ++ hash_ix = 0; ++ baddr = dmi->dmi_addr; ++ hash_ix ^= (*baddr) & 0x3f; ++ hash_ix ^= ((*baddr) >> 6) & 0x03; ++ ++baddr; ++ hash_ix ^= ((*baddr) << 2) & 0x03c; ++ hash_ix ^= ((*baddr) >> 4) & 0xf; ++ ++baddr; ++ hash_ix ^= ((*baddr) << 4) & 0x30; ++ hash_ix ^= ((*baddr) >> 2) & 0x3f; ++ ++baddr; ++ hash_ix ^= (*baddr) & 0x3f; ++ hash_ix ^= ((*baddr) >> 6) & 0x03; ++ ++baddr; ++ hash_ix ^= ((*baddr) << 2) & 0x03c; ++ hash_ix ^= ((*baddr) >> 4) & 0xf; ++ ++baddr; ++ hash_ix ^= ((*baddr) << 4) & 0x30; ++ hash_ix ^= ((*baddr) >> 2) & 0x3f; ++ ++ hash_ix &= 0x3f; ++ ++ if (hash_ix >= 32) { ++ hi_bits |= (1 << (hash_ix-32)); ++ } else { ++ lo_bits |= (1 << hash_ix); ++ } ++ dmi = dmi->next; ++ } ++ /* Disable individual receive */ ++ SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, individual, discard); ++ *R_NETWORK_REC_CONFIG = network_rec_config_shadow; ++ } ++ *R_NETWORK_GA_0 = lo_bits; ++ *R_NETWORK_GA_1 = hi_bits; ++ spin_unlock(&lp->lock); ++} ++ ++void ++e100_hardware_send_packet(struct net_local *np, char *buf, int length) ++{ ++ D(printk("e100 send pack, buf 0x%x len %d\n", buf, length)); ++ ++ spin_lock(&np->led_lock); ++ if (!led_active && time_after(jiffies, led_next_time)) { ++ /* light the network leds depending on the current speed. */ ++ e100_set_network_leds(NETWORK_ACTIVITY); ++ ++ /* Set the earliest time we may clear the LED */ ++ led_next_time = jiffies + NET_FLASH_TIME; ++ led_active = 1; ++ mod_timer(&clear_led_timer, jiffies + HZ/10); ++ } ++ spin_unlock(&np->led_lock); ++ ++ /* configure the tx dma descriptor */ ++ myNextTxDesc->descr.sw_len = length; ++ myNextTxDesc->descr.ctrl = d_eop | d_eol | d_wait; ++ myNextTxDesc->descr.buf = virt_to_phys(buf); ++ ++ /* Move end of list */ ++ myLastTxDesc->descr.ctrl &= ~d_eol; ++ myLastTxDesc = myNextTxDesc; ++ ++ /* Restart DMA channel */ ++ *R_DMA_CH0_CMD = IO_STATE(R_DMA_CH0_CMD, cmd, restart); ++} ++ ++static void ++e100_clear_network_leds(unsigned long dummy) ++{ ++ struct net_device *dev = (struct net_device *)dummy; ++ struct net_local *np = netdev_priv(dev); ++ ++ spin_lock(&np->led_lock); ++ ++ if (led_active && time_after(jiffies, led_next_time)) { ++ e100_set_network_leds(NO_NETWORK_ACTIVITY); ++ ++ /* Set the earliest time we may set the LED */ ++ led_next_time = jiffies + NET_FLASH_PAUSE; ++ led_active = 0; ++ } ++ ++ spin_unlock(&np->led_lock); ++} ++ ++static void ++e100_set_network_leds(int active) ++{ ++#if defined(CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK) ++ int light_leds = (active == NO_NETWORK_ACTIVITY); ++#elif defined(CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY) ++ int light_leds = (active == NETWORK_ACTIVITY); ++#else ++#error "Define either CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK or CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY" ++#endif ++ ++ if (!current_speed) { ++ /* Make LED red, link is down */ ++#if defined(CONFIG_ETRAX_NETWORK_RED_ON_NO_CONNECTION) ++ CRIS_LED_NETWORK_SET(CRIS_LED_RED); ++#else ++ CRIS_LED_NETWORK_SET(CRIS_LED_OFF); ++#endif ++ } else if (light_leds) { ++ if (current_speed == 10) { ++ CRIS_LED_NETWORK_SET(CRIS_LED_ORANGE); ++ } else { ++ CRIS_LED_NETWORK_SET(CRIS_LED_GREEN); ++ } ++ } else { ++ CRIS_LED_NETWORK_SET(CRIS_LED_OFF); ++ } ++} ++ ++#ifdef CONFIG_NET_POLL_CONTROLLER ++static void ++e100_netpoll(struct net_device* netdev) ++{ ++ e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev, NULL); ++} ++#endif ++ ++static int ++etrax_init_module(void) ++{ ++ return etrax_ethernet_init(); ++} ++ ++static int __init ++e100_boot_setup(char* str) ++{ ++ struct sockaddr sa = {0}; ++ int i; ++ ++ /* Parse the colon separated Ethernet station address */ ++ for (i = 0; i < ETH_ALEN; i++) { ++ unsigned int tmp; ++ if (sscanf(str + 3*i, "%2x", &tmp) != 1) { ++ printk(KERN_WARNING "Malformed station address"); ++ return 0; ++ } ++ sa.sa_data[i] = (char)tmp; ++ } ++ ++ default_mac = sa; ++ return 1; ++} ++ ++__setup("etrax100_eth=", e100_boot_setup); ++ ++module_init(etrax_init_module); +diff -Nur linux-2.6.32.orig/drivers/serial/crisv10.c linux-2.6.32/drivers/serial/crisv10.c +--- linux-2.6.32.orig/drivers/serial/crisv10.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/drivers/serial/crisv10.c 2010-01-10 13:41:59.276309474 +0100 @@ -13,6 +13,7 @@ #include <linux/errno.h> #include <linux/signal.h> @@ -386,7 +2164,7 @@ diff -Nur linux-2.6.31.5.orig/drivers/serial/crisv10.c linux-2.6.31.5/drivers/se #include <linux/timer.h> #include <linux/interrupt.h> #include <linux/tty.h> -@@ -26,6 +27,7 @@ +@@ -27,6 +28,7 @@ #include <linux/kernel.h> #include <linux/mutex.h> #include <linux/bitops.h> @@ -394,7 +2172,7 @@ diff -Nur linux-2.6.31.5.orig/drivers/serial/crisv10.c linux-2.6.31.5/drivers/se #include <linux/seq_file.h> #include <linux/delay.h> #include <linux/module.h> -@@ -4414,6 +4416,7 @@ +@@ -4415,6 +4417,7 @@ #endif }; @@ -402,7 +2180,7 @@ diff -Nur linux-2.6.31.5.orig/drivers/serial/crisv10.c linux-2.6.31.5/drivers/se static int __init rs_init(void) { int i; -@@ -4547,6 +4550,24 @@ +@@ -4548,6 +4551,24 @@ #endif #endif /* CONFIG_SVINTO_SIM */ @@ -427,9 +2205,4569 @@ diff -Nur linux-2.6.31.5.orig/drivers/serial/crisv10.c linux-2.6.31.5/drivers/se return 0; } -diff -Nur linux-2.6.31.5.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.31.5/drivers/usb/host/hc-cris-dbg.h ---- linux-2.6.31.5.orig/drivers/usb/host/hc-cris-dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.5/drivers/usb/host/hc-cris-dbg.h 2009-11-09 21:10:52.977927276 +0100 +diff -Nur linux-2.6.32.orig/drivers/serial/crisv10.c.orig linux-2.6.32/drivers/serial/crisv10.c.orig +--- linux-2.6.32.orig/drivers/serial/crisv10.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/drivers/serial/crisv10.c.orig 2009-12-03 04:51:21.000000000 +0100 +@@ -0,0 +1,4556 @@ ++/* ++ * Serial port driver for the ETRAX 100LX chip ++ * ++ * Copyright (C) 1998-2007 Axis Communications AB ++ * ++ * Many, many authors. Based once upon a time on serial.c for 16x50. ++ * ++ */ ++ ++static char *serial_version = "$Revision: 1.25 $"; ++ ++#include <linux/types.h> ++#include <linux/errno.h> ++#include <linux/signal.h> ++#include <linux/sched.h> ++#include <linux/timer.h> ++#include <linux/interrupt.h> ++#include <linux/tty.h> ++#include <linux/tty_flip.h> ++#include <linux/major.h> ++#include <linux/smp_lock.h> ++#include <linux/string.h> ++#include <linux/fcntl.h> ++#include <linux/mm.h> ++#include <linux/slab.h> ++#include <linux/init.h> ++#include <linux/kernel.h> ++#include <linux/mutex.h> ++#include <linux/bitops.h> ++#include <linux/seq_file.h> ++#include <linux/delay.h> ++#include <linux/module.h> ++#include <linux/uaccess.h> ++#include <linux/io.h> ++ ++#include <asm/irq.h> ++#include <asm/dma.h> ++#include <asm/system.h> ++ ++#include <arch/svinto.h> ++ ++/* non-arch dependent serial structures are in linux/serial.h */ ++#include <linux/serial.h> ++/* while we keep our own stuff (struct e100_serial) in a local .h file */ ++#include "crisv10.h" ++#include <asm/fasttimer.h> ++#include <arch/io_interface_mux.h> ++ ++#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER ++#ifndef CONFIG_ETRAX_FAST_TIMER ++#error "Enable FAST_TIMER to use SERIAL_FAST_TIMER" ++#endif ++#endif ++ ++#if defined(CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS) && \ ++ (CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS == 0) ++#error "RX_TIMEOUT_TICKS == 0 not allowed, use 1" ++#endif ++ ++#if defined(CONFIG_ETRAX_RS485_ON_PA) && defined(CONFIG_ETRAX_RS485_ON_PORT_G) ++#error "Disable either CONFIG_ETRAX_RS485_ON_PA or CONFIG_ETRAX_RS485_ON_PORT_G" ++#endif ++ ++/* ++ * All of the compatibilty code so we can compile serial.c against ++ * older kernels is hidden in serial_compat.h ++ */ ++#if defined(LOCAL_HEADERS) ++#include "serial_compat.h" ++#endif ++ ++struct tty_driver *serial_driver; ++ ++/* number of characters left in xmit buffer before we ask for more */ ++#define WAKEUP_CHARS 256 ++ ++//#define SERIAL_DEBUG_INTR ++//#define SERIAL_DEBUG_OPEN ++//#define SERIAL_DEBUG_FLOW ++//#define SERIAL_DEBUG_DATA ++//#define SERIAL_DEBUG_THROTTLE ++//#define SERIAL_DEBUG_IO /* Debug for Extra control and status pins */ ++//#define SERIAL_DEBUG_LINE 0 /* What serport we want to debug */ ++ ++/* Enable this to use serial interrupts to handle when you ++ expect the first received event on the serial port to ++ be an error, break or similar. Used to be able to flash IRMA ++ from eLinux */ ++#define SERIAL_HANDLE_EARLY_ERRORS ++ ++/* Currently 16 descriptors x 128 bytes = 2048 bytes */ ++#define SERIAL_DESCR_BUF_SIZE 256 ++ ++#define SERIAL_PRESCALE_BASE 3125000 /* 3.125MHz */ ++#define DEF_BAUD_BASE SERIAL_PRESCALE_BASE ++ ++/* We don't want to load the system with massive fast timer interrupt ++ * on high baudrates so limit it to 250 us (4kHz) */ ++#define MIN_FLUSH_TIME_USEC 250 ++ ++/* Add an x here to log a lot of timer stuff */ ++#define TIMERD(x) ++/* Debug details of interrupt handling */ ++#define DINTR1(x) /* irq on/off, errors */ ++#define DINTR2(x) /* tx and rx */ ++/* Debug flip buffer stuff */ ++#define DFLIP(x) ++/* Debug flow control and overview of data flow */ ++#define DFLOW(x) ++#define DBAUD(x) ++#define DLOG_INT_TRIG(x) ++ ++//#define DEBUG_LOG_INCLUDED ++#ifndef DEBUG_LOG_INCLUDED ++#define DEBUG_LOG(line, string, value) ++#else ++struct debug_log_info ++{ ++ unsigned long time; ++ unsigned long timer_data; ++// int line; ++ const char *string; ++ int value; ++}; ++#define DEBUG_LOG_SIZE 4096 ++ ++struct debug_log_info debug_log[DEBUG_LOG_SIZE]; ++int debug_log_pos = 0; ++ ++#define DEBUG_LOG(_line, _string, _value) do { \ ++ if ((_line) == SERIAL_DEBUG_LINE) {\ ++ debug_log_func(_line, _string, _value); \ ++ }\ ++}while(0) ++ ++void debug_log_func(int line, const char *string, int value) ++{ ++ if (debug_log_pos < DEBUG_LOG_SIZE) { ++ debug_log[debug_log_pos].time = jiffies; ++ debug_log[debug_log_pos].timer_data = *R_TIMER_DATA; ++// debug_log[debug_log_pos].line = line; ++ debug_log[debug_log_pos].string = string; ++ debug_log[debug_log_pos].value = value; ++ debug_log_pos++; ++ } ++ /*printk(string, value);*/ ++} ++#endif ++ ++#ifndef CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS ++/* Default number of timer ticks before flushing rx fifo ++ * When using "little data, low latency applications: use 0 ++ * When using "much data applications (PPP)" use ~5 ++ */ ++#define CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS 5 ++#endif ++ ++unsigned long timer_data_to_ns(unsigned long timer_data); ++ ++static void change_speed(struct e100_serial *info); ++static void rs_throttle(struct tty_struct * tty); ++static void rs_wait_until_sent(struct tty_struct *tty, int timeout); ++static int rs_write(struct tty_struct *tty, ++ const unsigned char *buf, int count); ++#ifdef CONFIG_ETRAX_RS485 ++static int e100_write_rs485(struct tty_struct *tty, ++ const unsigned char *buf, int count); ++#endif ++static int get_lsr_info(struct e100_serial *info, unsigned int *value); ++ ++ ++#define DEF_BAUD 115200 /* 115.2 kbit/s */ ++#define STD_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) ++#define DEF_RX 0x20 /* or SERIAL_CTRL_W >> 8 */ ++/* Default value of tx_ctrl register: has txd(bit 7)=1 (idle) as default */ ++#define DEF_TX 0x80 /* or SERIAL_CTRL_B */ ++ ++/* offsets from R_SERIALx_CTRL */ ++ ++#define REG_DATA 0 ++#define REG_DATA_STATUS32 0 /* this is the 32 bit register R_SERIALx_READ */ ++#define REG_TR_DATA 0 ++#define REG_STATUS 1 ++#define REG_TR_CTRL 1 ++#define REG_REC_CTRL 2 ++#define REG_BAUD 3 ++#define REG_XOFF 4 /* this is a 32 bit register */ ++ ++/* The bitfields are the same for all serial ports */ ++#define SER_RXD_MASK IO_MASK(R_SERIAL0_STATUS, rxd) ++#define SER_DATA_AVAIL_MASK IO_MASK(R_SERIAL0_STATUS, data_avail) ++#define SER_FRAMING_ERR_MASK IO_MASK(R_SERIAL0_STATUS, framing_err) ++#define SER_PAR_ERR_MASK IO_MASK(R_SERIAL0_STATUS, par_err) ++#define SER_OVERRUN_MASK IO_MASK(R_SERIAL0_STATUS, overrun) ++ ++#define SER_ERROR_MASK (SER_OVERRUN_MASK | SER_PAR_ERR_MASK | SER_FRAMING_ERR_MASK) ++ ++/* Values for info->errorcode */ ++#define ERRCODE_SET_BREAK (TTY_BREAK) ++#define ERRCODE_INSERT 0x100 ++#define ERRCODE_INSERT_BREAK (ERRCODE_INSERT | TTY_BREAK) ++ ++#define FORCE_EOP(info) *R_SET_EOP = 1U << info->iseteop; ++ ++/* ++ * General note regarding the use of IO_* macros in this file: ++ * ++ * We will use the bits defined for DMA channel 6 when using various ++ * IO_* macros (e.g. IO_STATE, IO_MASK, IO_EXTRACT) and _assume_ they are ++ * the same for all channels (which of course they are). ++ * ++ * We will also use the bits defined for serial port 0 when writing commands ++ * to the different ports, as these bits too are the same for all ports. ++ */ ++ ++ ++/* Mask for the irqs possibly enabled in R_IRQ_MASK1_RD etc. */ ++static const unsigned long e100_ser_int_mask = 0 ++#ifdef CONFIG_ETRAX_SERIAL_PORT0 ++| IO_MASK(R_IRQ_MASK1_RD, ser0_data) | IO_MASK(R_IRQ_MASK1_RD, ser0_ready) ++#endif ++#ifdef CONFIG_ETRAX_SERIAL_PORT1 ++| IO_MASK(R_IRQ_MASK1_RD, ser1_data) | IO_MASK(R_IRQ_MASK1_RD, ser1_ready) ++#endif ++#ifdef CONFIG_ETRAX_SERIAL_PORT2 ++| IO_MASK(R_IRQ_MASK1_RD, ser2_data) | IO_MASK(R_IRQ_MASK1_RD, ser2_ready) ++#endif ++#ifdef CONFIG_ETRAX_SERIAL_PORT3 ++| IO_MASK(R_IRQ_MASK1_RD, ser3_data) | IO_MASK(R_IRQ_MASK1_RD, ser3_ready) ++#endif ++; ++unsigned long r_alt_ser_baudrate_shadow = 0; ++ ++/* this is the data for the four serial ports in the etrax100 */ ++/* DMA2(ser2), DMA4(ser3), DMA6(ser0) or DMA8(ser1) */ ++/* R_DMA_CHx_CLR_INTR, R_DMA_CHx_FIRST, R_DMA_CHx_CMD */ ++ ++static struct e100_serial rs_table[] = { ++ { .baud = DEF_BAUD, ++ .ioport = (unsigned char *)R_SERIAL0_CTRL, ++ .irq = 1U << 12, /* uses DMA 6 and 7 */ ++ .oclrintradr = R_DMA_CH6_CLR_INTR, ++ .ofirstadr = R_DMA_CH6_FIRST, ++ .ocmdadr = R_DMA_CH6_CMD, ++ .ostatusadr = R_DMA_CH6_STATUS, ++ .iclrintradr = R_DMA_CH7_CLR_INTR, ++ .ifirstadr = R_DMA_CH7_FIRST, ++ .icmdadr = R_DMA_CH7_CMD, ++ .idescradr = R_DMA_CH7_DESCR, ++ .flags = STD_FLAGS, ++ .rx_ctrl = DEF_RX, ++ .tx_ctrl = DEF_TX, ++ .iseteop = 2, ++ .dma_owner = dma_ser0, ++ .io_if = if_serial_0, ++#ifdef CONFIG_ETRAX_SERIAL_PORT0 ++ .enabled = 1, ++#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT ++ .dma_out_enabled = 1, ++ .dma_out_nbr = SER0_TX_DMA_NBR, ++ .dma_out_irq_nbr = SER0_DMA_TX_IRQ_NBR, ++ .dma_out_irq_flags = IRQF_DISABLED, ++ .dma_out_irq_description = "serial 0 dma tr", ++#else ++ .dma_out_enabled = 0, ++ .dma_out_nbr = UINT_MAX, ++ .dma_out_irq_nbr = 0, ++ .dma_out_irq_flags = 0, ++ .dma_out_irq_description = NULL, ++#endif ++#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN ++ .dma_in_enabled = 1, ++ .dma_in_nbr = SER0_RX_DMA_NBR, ++ .dma_in_irq_nbr = SER0_DMA_RX_IRQ_NBR, ++ .dma_in_irq_flags = IRQF_DISABLED, ++ .dma_in_irq_description = "serial 0 dma rec", ++#else ++ .dma_in_enabled = 0, ++ .dma_in_nbr = UINT_MAX, ++ .dma_in_irq_nbr = 0, ++ .dma_in_irq_flags = 0, ++ .dma_in_irq_description = NULL, ++#endif ++#else ++ .enabled = 0, ++ .io_if_description = NULL, ++ .dma_out_enabled = 0, ++ .dma_in_enabled = 0 ++#endif ++ ++}, /* ttyS0 */ ++#ifndef CONFIG_SVINTO_SIM ++ { .baud = DEF_BAUD, ++ .ioport = (unsigned char *)R_SERIAL1_CTRL, ++ .irq = 1U << 16, /* uses DMA 8 and 9 */ ++ .oclrintradr = R_DMA_CH8_CLR_INTR, ++ .ofirstadr = R_DMA_CH8_FIRST, ++ .ocmdadr = R_DMA_CH8_CMD, ++ .ostatusadr = R_DMA_CH8_STATUS, ++ .iclrintradr = R_DMA_CH9_CLR_INTR, ++ .ifirstadr = R_DMA_CH9_FIRST, ++ .icmdadr = R_DMA_CH9_CMD, ++ .idescradr = R_DMA_CH9_DESCR, ++ .flags = STD_FLAGS, ++ .rx_ctrl = DEF_RX, ++ .tx_ctrl = DEF_TX, ++ .iseteop = 3, ++ .dma_owner = dma_ser1, ++ .io_if = if_serial_1, ++#ifdef CONFIG_ETRAX_SERIAL_PORT1 ++ .enabled = 1, ++ .io_if_description = "ser1", ++#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT ++ .dma_out_enabled = 1, ++ .dma_out_nbr = SER1_TX_DMA_NBR, ++ .dma_out_irq_nbr = SER1_DMA_TX_IRQ_NBR, ++ .dma_out_irq_flags = IRQF_DISABLED, ++ .dma_out_irq_description = "serial 1 dma tr", ++#else ++ .dma_out_enabled = 0, ++ .dma_out_nbr = UINT_MAX, ++ .dma_out_irq_nbr = 0, ++ .dma_out_irq_flags = 0, ++ .dma_out_irq_description = NULL, ++#endif ++#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN ++ .dma_in_enabled = 1, ++ .dma_in_nbr = SER1_RX_DMA_NBR, ++ .dma_in_irq_nbr = SER1_DMA_RX_IRQ_NBR, ++ .dma_in_irq_flags = IRQF_DISABLED, ++ .dma_in_irq_description = "serial 1 dma rec", ++#else ++ .dma_in_enabled = 0, ++ .dma_in_enabled = 0, ++ .dma_in_nbr = UINT_MAX, ++ .dma_in_irq_nbr = 0, ++ .dma_in_irq_flags = 0, ++ .dma_in_irq_description = NULL, ++#endif ++#else ++ .enabled = 0, ++ .io_if_description = NULL, ++ .dma_in_irq_nbr = 0, ++ .dma_out_enabled = 0, ++ .dma_in_enabled = 0 ++#endif ++}, /* ttyS1 */ ++ ++ { .baud = DEF_BAUD, ++ .ioport = (unsigned char *)R_SERIAL2_CTRL, ++ .irq = 1U << 4, /* uses DMA 2 and 3 */ ++ .oclrintradr = R_DMA_CH2_CLR_INTR, ++ .ofirstadr = R_DMA_CH2_FIRST, ++ .ocmdadr = R_DMA_CH2_CMD, ++ .ostatusadr = R_DMA_CH2_STATUS, ++ .iclrintradr = R_DMA_CH3_CLR_INTR, ++ .ifirstadr = R_DMA_CH3_FIRST, ++ .icmdadr = R_DMA_CH3_CMD, ++ .idescradr = R_DMA_CH3_DESCR, ++ .flags = STD_FLAGS, ++ .rx_ctrl = DEF_RX, ++ .tx_ctrl = DEF_TX, ++ .iseteop = 0, ++ .dma_owner = dma_ser2, ++ .io_if = if_serial_2, ++#ifdef CONFIG_ETRAX_SERIAL_PORT2 ++ .enabled = 1, ++ .io_if_description = "ser2", ++#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT ++ .dma_out_enabled = 1, ++ .dma_out_nbr = SER2_TX_DMA_NBR, ++ .dma_out_irq_nbr = SER2_DMA_TX_IRQ_NBR, ++ .dma_out_irq_flags = IRQF_DISABLED, ++ .dma_out_irq_description = "serial 2 dma tr", ++#else ++ .dma_out_enabled = 0, ++ .dma_out_nbr = UINT_MAX, ++ .dma_out_irq_nbr = 0, ++ .dma_out_irq_flags = 0, ++ .dma_out_irq_description = NULL, ++#endif ++#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN ++ .dma_in_enabled = 1, ++ .dma_in_nbr = SER2_RX_DMA_NBR, ++ .dma_in_irq_nbr = SER2_DMA_RX_IRQ_NBR, ++ .dma_in_irq_flags = IRQF_DISABLED, ++ .dma_in_irq_description = "serial 2 dma rec", ++#else ++ .dma_in_enabled = 0, ++ .dma_in_nbr = UINT_MAX, ++ .dma_in_irq_nbr = 0, ++ .dma_in_irq_flags = 0, ++ .dma_in_irq_description = NULL, ++#endif ++#else ++ .enabled = 0, ++ .io_if_description = NULL, ++ .dma_out_enabled = 0, ++ .dma_in_enabled = 0 ++#endif ++ }, /* ttyS2 */ ++ ++ { .baud = DEF_BAUD, ++ .ioport = (unsigned char *)R_SERIAL3_CTRL, ++ .irq = 1U << 8, /* uses DMA 4 and 5 */ ++ .oclrintradr = R_DMA_CH4_CLR_INTR, ++ .ofirstadr = R_DMA_CH4_FIRST, ++ .ocmdadr = R_DMA_CH4_CMD, ++ .ostatusadr = R_DMA_CH4_STATUS, ++ .iclrintradr = R_DMA_CH5_CLR_INTR, ++ .ifirstadr = R_DMA_CH5_FIRST, ++ .icmdadr = R_DMA_CH5_CMD, ++ .idescradr = R_DMA_CH5_DESCR, ++ .flags = STD_FLAGS, ++ .rx_ctrl = DEF_RX, ++ .tx_ctrl = DEF_TX, ++ .iseteop = 1, ++ .dma_owner = dma_ser3, ++ .io_if = if_serial_3, ++#ifdef CONFIG_ETRAX_SERIAL_PORT3 ++ .enabled = 1, ++ .io_if_description = "ser3", ++#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT ++ .dma_out_enabled = 1, ++ .dma_out_nbr = SER3_TX_DMA_NBR, ++ .dma_out_irq_nbr = SER3_DMA_TX_IRQ_NBR, ++ .dma_out_irq_flags = IRQF_DISABLED, ++ .dma_out_irq_description = "serial 3 dma tr", ++#else ++ .dma_out_enabled = 0, ++ .dma_out_nbr = UINT_MAX, ++ .dma_out_irq_nbr = 0, ++ .dma_out_irq_flags = 0, ++ .dma_out_irq_description = NULL, ++#endif ++#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN ++ .dma_in_enabled = 1, ++ .dma_in_nbr = SER3_RX_DMA_NBR, ++ .dma_in_irq_nbr = SER3_DMA_RX_IRQ_NBR, ++ .dma_in_irq_flags = IRQF_DISABLED, ++ .dma_in_irq_description = "serial 3 dma rec", ++#else ++ .dma_in_enabled = 0, ++ .dma_in_nbr = UINT_MAX, ++ .dma_in_irq_nbr = 0, ++ .dma_in_irq_flags = 0, ++ .dma_in_irq_description = NULL ++#endif ++#else ++ .enabled = 0, ++ .io_if_description = NULL, ++ .dma_out_enabled = 0, ++ .dma_in_enabled = 0 ++#endif ++ } /* ttyS3 */ ++#endif ++}; ++ ++ ++#define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial)) ++ ++#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER ++static struct fast_timer fast_timers[NR_PORTS]; ++#endif ++ ++#ifdef CONFIG_ETRAX_SERIAL_PROC_ENTRY ++#define PROCSTAT(x) x ++struct ser_statistics_type { ++ int overrun_cnt; ++ int early_errors_cnt; ++ int ser_ints_ok_cnt; ++ int errors_cnt; ++ unsigned long int processing_flip; ++ unsigned long processing_flip_still_room; ++ unsigned long int timeout_flush_cnt; ++ int rx_dma_ints; ++ int tx_dma_ints; ++ int rx_tot; ++ int tx_tot; ++}; ++ ++static struct ser_statistics_type ser_stat[NR_PORTS]; ++ ++#else ++ ++#define PROCSTAT(x) ++ ++#endif /* CONFIG_ETRAX_SERIAL_PROC_ENTRY */ ++ ++/* RS-485 */ ++#if defined(CONFIG_ETRAX_RS485) ++#ifdef CONFIG_ETRAX_FAST_TIMER ++static struct fast_timer fast_timers_rs485[NR_PORTS]; ++#endif ++#if defined(CONFIG_ETRAX_RS485_ON_PA) ++static int rs485_pa_bit = CONFIG_ETRAX_RS485_ON_PA_BIT; ++#endif ++#if defined(CONFIG_ETRAX_RS485_ON_PORT_G) ++static int rs485_port_g_bit = CONFIG_ETRAX_RS485_ON_PORT_G_BIT; ++#endif ++#endif ++ ++/* Info and macros needed for each ports extra control/status signals. */ ++#define E100_STRUCT_PORT(line, pinname) \ ++ ((CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT >= 0)? \ ++ (R_PORT_PA_DATA): ( \ ++ (CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT >= 0)? \ ++ (R_PORT_PB_DATA):&dummy_ser[line])) ++ ++#define E100_STRUCT_SHADOW(line, pinname) \ ++ ((CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT >= 0)? \ ++ (&port_pa_data_shadow): ( \ ++ (CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT >= 0)? \ ++ (&port_pb_data_shadow):&dummy_ser[line])) ++#define E100_STRUCT_MASK(line, pinname) \ ++ ((CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT >= 0)? \ ++ (1<<CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT): ( \ ++ (CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT >= 0)? \ ++ (1<<CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT):DUMMY_##pinname##_MASK)) ++ ++#define DUMMY_DTR_MASK 1 ++#define DUMMY_RI_MASK 2 ++#define DUMMY_DSR_MASK 4 ++#define DUMMY_CD_MASK 8 ++static unsigned char dummy_ser[NR_PORTS] = {0xFF, 0xFF, 0xFF,0xFF}; ++ ++/* If not all status pins are used or disabled, use mixed mode */ ++#ifdef CONFIG_ETRAX_SERIAL_PORT0 ++ ++#define SER0_PA_BITSUM (CONFIG_ETRAX_SER0_DTR_ON_PA_BIT+CONFIG_ETRAX_SER0_RI_ON_PA_BIT+CONFIG_ETRAX_SER0_DSR_ON_PA_BIT+CONFIG_ETRAX_SER0_CD_ON_PA_BIT) ++ ++#if SER0_PA_BITSUM != -4 ++# if CONFIG_ETRAX_SER0_DTR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER0_RI_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER0_DSR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER0_CD_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#define SER0_PB_BITSUM (CONFIG_ETRAX_SER0_DTR_ON_PB_BIT+CONFIG_ETRAX_SER0_RI_ON_PB_BIT+CONFIG_ETRAX_SER0_DSR_ON_PB_BIT+CONFIG_ETRAX_SER0_CD_ON_PB_BIT) ++ ++#if SER0_PB_BITSUM != -4 ++# if CONFIG_ETRAX_SER0_DTR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER0_RI_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER0_DSR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER0_CD_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#endif /* PORT0 */ ++ ++ ++#ifdef CONFIG_ETRAX_SERIAL_PORT1 ++ ++#define SER1_PA_BITSUM (CONFIG_ETRAX_SER1_DTR_ON_PA_BIT+CONFIG_ETRAX_SER1_RI_ON_PA_BIT+CONFIG_ETRAX_SER1_DSR_ON_PA_BIT+CONFIG_ETRAX_SER1_CD_ON_PA_BIT) ++ ++#if SER1_PA_BITSUM != -4 ++# if CONFIG_ETRAX_SER1_DTR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER1_RI_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER1_DSR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER1_CD_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#define SER1_PB_BITSUM (CONFIG_ETRAX_SER1_DTR_ON_PB_BIT+CONFIG_ETRAX_SER1_RI_ON_PB_BIT+CONFIG_ETRAX_SER1_DSR_ON_PB_BIT+CONFIG_ETRAX_SER1_CD_ON_PB_BIT) ++ ++#if SER1_PB_BITSUM != -4 ++# if CONFIG_ETRAX_SER1_DTR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER1_RI_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER1_DSR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER1_CD_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#endif /* PORT1 */ ++ ++#ifdef CONFIG_ETRAX_SERIAL_PORT2 ++ ++#define SER2_PA_BITSUM (CONFIG_ETRAX_SER2_DTR_ON_PA_BIT+CONFIG_ETRAX_SER2_RI_ON_PA_BIT+CONFIG_ETRAX_SER2_DSR_ON_PA_BIT+CONFIG_ETRAX_SER2_CD_ON_PA_BIT) ++ ++#if SER2_PA_BITSUM != -4 ++# if CONFIG_ETRAX_SER2_DTR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER2_RI_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER2_DSR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER2_CD_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#define SER2_PB_BITSUM (CONFIG_ETRAX_SER2_DTR_ON_PB_BIT+CONFIG_ETRAX_SER2_RI_ON_PB_BIT+CONFIG_ETRAX_SER2_DSR_ON_PB_BIT+CONFIG_ETRAX_SER2_CD_ON_PB_BIT) ++ ++#if SER2_PB_BITSUM != -4 ++# if CONFIG_ETRAX_SER2_DTR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER2_RI_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER2_DSR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER2_CD_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#endif /* PORT2 */ ++ ++#ifdef CONFIG_ETRAX_SERIAL_PORT3 ++ ++#define SER3_PA_BITSUM (CONFIG_ETRAX_SER3_DTR_ON_PA_BIT+CONFIG_ETRAX_SER3_RI_ON_PA_BIT+CONFIG_ETRAX_SER3_DSR_ON_PA_BIT+CONFIG_ETRAX_SER3_CD_ON_PA_BIT) ++ ++#if SER3_PA_BITSUM != -4 ++# if CONFIG_ETRAX_SER3_DTR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER3_RI_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER3_DSR_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER3_CD_ON_PA_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#define SER3_PB_BITSUM (CONFIG_ETRAX_SER3_DTR_ON_PB_BIT+CONFIG_ETRAX_SER3_RI_ON_PB_BIT+CONFIG_ETRAX_SER3_DSR_ON_PB_BIT+CONFIG_ETRAX_SER3_CD_ON_PB_BIT) ++ ++#if SER3_PB_BITSUM != -4 ++# if CONFIG_ETRAX_SER3_DTR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER3_RI_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER3_DSR_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++# if CONFIG_ETRAX_SER3_CD_ON_PB_BIT == -1 ++# ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED ++# define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1 ++# endif ++# endif ++#endif ++ ++#endif /* PORT3 */ ++ ++ ++#if defined(CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED) || \ ++ defined(CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED) || \ ++ defined(CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED) || \ ++ defined(CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED) ++#define CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED ++#endif ++ ++#ifdef CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED ++/* The pins can be mixed on PA and PB */ ++#define CONTROL_PINS_PORT_NOT_USED(line) \ ++ &dummy_ser[line], &dummy_ser[line], \ ++ &dummy_ser[line], &dummy_ser[line], \ ++ &dummy_ser[line], &dummy_ser[line], \ ++ &dummy_ser[line], &dummy_ser[line], \ ++ DUMMY_DTR_MASK, DUMMY_RI_MASK, DUMMY_DSR_MASK, DUMMY_CD_MASK ++ ++ ++struct control_pins ++{ ++ volatile unsigned char *dtr_port; ++ unsigned char *dtr_shadow; ++ volatile unsigned char *ri_port; ++ unsigned char *ri_shadow; ++ volatile unsigned char *dsr_port; ++ unsigned char *dsr_shadow; ++ volatile unsigned char *cd_port; ++ unsigned char *cd_shadow; ++ ++ unsigned char dtr_mask; ++ unsigned char ri_mask; ++ unsigned char dsr_mask; ++ unsigned char cd_mask; ++}; ++ ++static const struct control_pins e100_modem_pins[NR_PORTS] = ++{ ++ /* Ser 0 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT0 ++ E100_STRUCT_PORT(0,DTR), E100_STRUCT_SHADOW(0,DTR), ++ E100_STRUCT_PORT(0,RI), E100_STRUCT_SHADOW(0,RI), ++ E100_STRUCT_PORT(0,DSR), E100_STRUCT_SHADOW(0,DSR), ++ E100_STRUCT_PORT(0,CD), E100_STRUCT_SHADOW(0,CD), ++ E100_STRUCT_MASK(0,DTR), ++ E100_STRUCT_MASK(0,RI), ++ E100_STRUCT_MASK(0,DSR), ++ E100_STRUCT_MASK(0,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(0) ++#endif ++ }, ++ ++ /* Ser 1 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT1 ++ E100_STRUCT_PORT(1,DTR), E100_STRUCT_SHADOW(1,DTR), ++ E100_STRUCT_PORT(1,RI), E100_STRUCT_SHADOW(1,RI), ++ E100_STRUCT_PORT(1,DSR), E100_STRUCT_SHADOW(1,DSR), ++ E100_STRUCT_PORT(1,CD), E100_STRUCT_SHADOW(1,CD), ++ E100_STRUCT_MASK(1,DTR), ++ E100_STRUCT_MASK(1,RI), ++ E100_STRUCT_MASK(1,DSR), ++ E100_STRUCT_MASK(1,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(1) ++#endif ++ }, ++ ++ /* Ser 2 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT2 ++ E100_STRUCT_PORT(2,DTR), E100_STRUCT_SHADOW(2,DTR), ++ E100_STRUCT_PORT(2,RI), E100_STRUCT_SHADOW(2,RI), ++ E100_STRUCT_PORT(2,DSR), E100_STRUCT_SHADOW(2,DSR), ++ E100_STRUCT_PORT(2,CD), E100_STRUCT_SHADOW(2,CD), ++ E100_STRUCT_MASK(2,DTR), ++ E100_STRUCT_MASK(2,RI), ++ E100_STRUCT_MASK(2,DSR), ++ E100_STRUCT_MASK(2,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(2) ++#endif ++ }, ++ ++ /* Ser 3 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT3 ++ E100_STRUCT_PORT(3,DTR), E100_STRUCT_SHADOW(3,DTR), ++ E100_STRUCT_PORT(3,RI), E100_STRUCT_SHADOW(3,RI), ++ E100_STRUCT_PORT(3,DSR), E100_STRUCT_SHADOW(3,DSR), ++ E100_STRUCT_PORT(3,CD), E100_STRUCT_SHADOW(3,CD), ++ E100_STRUCT_MASK(3,DTR), ++ E100_STRUCT_MASK(3,RI), ++ E100_STRUCT_MASK(3,DSR), ++ E100_STRUCT_MASK(3,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(3) ++#endif ++ } ++}; ++#else /* CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED */ ++ ++/* All pins are on either PA or PB for each serial port */ ++#define CONTROL_PINS_PORT_NOT_USED(line) \ ++ &dummy_ser[line], &dummy_ser[line], \ ++ DUMMY_DTR_MASK, DUMMY_RI_MASK, DUMMY_DSR_MASK, DUMMY_CD_MASK ++ ++ ++struct control_pins ++{ ++ volatile unsigned char *port; ++ unsigned char *shadow; ++ ++ unsigned char dtr_mask; ++ unsigned char ri_mask; ++ unsigned char dsr_mask; ++ unsigned char cd_mask; ++}; ++ ++#define dtr_port port ++#define dtr_shadow shadow ++#define ri_port port ++#define ri_shadow shadow ++#define dsr_port port ++#define dsr_shadow shadow ++#define cd_port port ++#define cd_shadow shadow ++ ++static const struct control_pins e100_modem_pins[NR_PORTS] = ++{ ++ /* Ser 0 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT0 ++ E100_STRUCT_PORT(0,DTR), E100_STRUCT_SHADOW(0,DTR), ++ E100_STRUCT_MASK(0,DTR), ++ E100_STRUCT_MASK(0,RI), ++ E100_STRUCT_MASK(0,DSR), ++ E100_STRUCT_MASK(0,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(0) ++#endif ++ }, ++ ++ /* Ser 1 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT1 ++ E100_STRUCT_PORT(1,DTR), E100_STRUCT_SHADOW(1,DTR), ++ E100_STRUCT_MASK(1,DTR), ++ E100_STRUCT_MASK(1,RI), ++ E100_STRUCT_MASK(1,DSR), ++ E100_STRUCT_MASK(1,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(1) ++#endif ++ }, ++ ++ /* Ser 2 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT2 ++ E100_STRUCT_PORT(2,DTR), E100_STRUCT_SHADOW(2,DTR), ++ E100_STRUCT_MASK(2,DTR), ++ E100_STRUCT_MASK(2,RI), ++ E100_STRUCT_MASK(2,DSR), ++ E100_STRUCT_MASK(2,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(2) ++#endif ++ }, ++ ++ /* Ser 3 */ ++ { ++#ifdef CONFIG_ETRAX_SERIAL_PORT3 ++ E100_STRUCT_PORT(3,DTR), E100_STRUCT_SHADOW(3,DTR), ++ E100_STRUCT_MASK(3,DTR), ++ E100_STRUCT_MASK(3,RI), ++ E100_STRUCT_MASK(3,DSR), ++ E100_STRUCT_MASK(3,CD) ++#else ++ CONTROL_PINS_PORT_NOT_USED(3) ++#endif ++ } ++}; ++#endif /* !CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED */ ++ ++#define E100_RTS_MASK 0x20 ++#define E100_CTS_MASK 0x40 ++ ++/* All serial port signals are active low: ++ * active = 0 -> 3.3V to RS-232 driver -> -12V on RS-232 level ++ * inactive = 1 -> 0V to RS-232 driver -> +12V on RS-232 level ++ * ++ * These macros returns the pin value: 0=0V, >=1 = 3.3V on ETRAX chip ++ */ ++ ++/* Output */ ++#define E100_RTS_GET(info) ((info)->rx_ctrl & E100_RTS_MASK) ++/* Input */ ++#define E100_CTS_GET(info) ((info)->ioport[REG_STATUS] & E100_CTS_MASK) ++ ++/* These are typically PA or PB and 0 means 0V, 1 means 3.3V */ ++/* Is an output */ ++#define E100_DTR_GET(info) ((*e100_modem_pins[(info)->line].dtr_shadow) & e100_modem_pins[(info)->line].dtr_mask) ++ ++/* Normally inputs */ ++#define E100_RI_GET(info) ((*e100_modem_pins[(info)->line].ri_port) & e100_modem_pins[(info)->line].ri_mask) ++#define E100_CD_GET(info) ((*e100_modem_pins[(info)->line].cd_port) & e100_modem_pins[(info)->line].cd_mask) ++ ++/* Input */ ++#define E100_DSR_GET(info) ((*e100_modem_pins[(info)->line].dsr_port) & e100_modem_pins[(info)->line].dsr_mask) ++ ++ ++/* ++ * tmp_buf is used as a temporary buffer by serial_write. We need to ++ * lock it in case the memcpy_fromfs blocks while swapping in a page, ++ * and some other program tries to do a serial write at the same time. ++ * Since the lock will only come under contention when the system is ++ * swapping and available memory is low, it makes sense to share one ++ * buffer across all the serial ports, since it significantly saves ++ * memory if large numbers of serial ports are open. ++ */ ++static unsigned char *tmp_buf; ++static DEFINE_MUTEX(tmp_buf_mutex); ++ ++/* Calculate the chartime depending on baudrate, numbor of bits etc. */ ++static void update_char_time(struct e100_serial * info) ++{ ++ tcflag_t cflags = info->port.tty->termios->c_cflag; ++ int bits; ++ ++ /* calc. number of bits / data byte */ ++ /* databits + startbit and 1 stopbit */ ++ if ((cflags & CSIZE) == CS7) ++ bits = 9; ++ else ++ bits = 10; ++ ++ if (cflags & CSTOPB) /* 2 stopbits ? */ ++ bits++; ++ ++ if (cflags & PARENB) /* parity bit ? */ ++ bits++; ++ ++ /* calc timeout */ ++ info->char_time_usec = ((bits * 1000000) / info->baud) + 1; ++ info->flush_time_usec = 4*info->char_time_usec; ++ if (info->flush_time_usec < MIN_FLUSH_TIME_USEC) ++ info->flush_time_usec = MIN_FLUSH_TIME_USEC; ++ ++} ++ ++/* ++ * This function maps from the Bxxxx defines in asm/termbits.h into real ++ * baud rates. ++ */ ++ ++static int ++cflag_to_baud(unsigned int cflag) ++{ ++ static int baud_table[] = { ++ 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, ++ 4800, 9600, 19200, 38400 }; ++ ++ static int ext_baud_table[] = { ++ 0, 57600, 115200, 230400, 460800, 921600, 1843200, 6250000, ++ 0, 0, 0, 0, 0, 0, 0, 0 }; ++ ++ if (cflag & CBAUDEX) ++ return ext_baud_table[(cflag & CBAUD) & ~CBAUDEX]; ++ else ++ return baud_table[cflag & CBAUD]; ++} ++ ++/* and this maps to an etrax100 hardware baud constant */ ++ ++static unsigned char ++cflag_to_etrax_baud(unsigned int cflag) ++{ ++ char retval; ++ ++ static char baud_table[] = { ++ -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, -1, 3, 4, 5, 6, 7 }; ++ ++ static char ext_baud_table[] = { ++ -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1 }; ++ ++ if (cflag & CBAUDEX) ++ retval = ext_baud_table[(cflag & CBAUD) & ~CBAUDEX]; ++ else ++ retval = baud_table[cflag & CBAUD]; ++ ++ if (retval < 0) { ++ printk(KERN_WARNING "serdriver tried setting invalid baud rate, flags %x.\n", cflag); ++ retval = 5; /* choose default 9600 instead */ ++ } ++ ++ return retval | (retval << 4); /* choose same for both TX and RX */ ++} ++ ++ ++/* Various static support functions */ ++ ++/* Functions to set or clear DTR/RTS on the requested line */ ++/* It is complicated by the fact that RTS is a serial port register, while ++ * DTR might not be implemented in the HW at all, and if it is, it can be on ++ * any general port. ++ */ ++ ++ ++static inline void ++e100_dtr(struct e100_serial *info, int set) ++{ ++#ifndef CONFIG_SVINTO_SIM ++ unsigned char mask = e100_modem_pins[info->line].dtr_mask; ++ ++#ifdef SERIAL_DEBUG_IO ++ printk("ser%i dtr %i mask: 0x%02X\n", info->line, set, mask); ++ printk("ser%i shadow before 0x%02X get: %i\n", ++ info->line, *e100_modem_pins[info->line].dtr_shadow, ++ E100_DTR_GET(info)); ++#endif ++ /* DTR is active low */ ++ { ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ *e100_modem_pins[info->line].dtr_shadow &= ~mask; ++ *e100_modem_pins[info->line].dtr_shadow |= (set ? 0 : mask); ++ *e100_modem_pins[info->line].dtr_port = *e100_modem_pins[info->line].dtr_shadow; ++ local_irq_restore(flags); ++ } ++ ++#ifdef SERIAL_DEBUG_IO ++ printk("ser%i shadow after 0x%02X get: %i\n", ++ info->line, *e100_modem_pins[info->line].dtr_shadow, ++ E100_DTR_GET(info)); ++#endif ++#endif ++} ++ ++/* set = 0 means 3.3V on the pin, bitvalue: 0=active, 1=inactive ++ * 0=0V , 1=3.3V ++ */ ++static inline void ++e100_rts(struct e100_serial *info, int set) ++{ ++#ifndef CONFIG_SVINTO_SIM ++ unsigned long flags; ++ local_irq_save(flags); ++ info->rx_ctrl &= ~E100_RTS_MASK; ++ info->rx_ctrl |= (set ? 0 : E100_RTS_MASK); /* RTS is active low */ ++ info->ioport[REG_REC_CTRL] = info->rx_ctrl; ++ local_irq_restore(flags); ++#ifdef SERIAL_DEBUG_IO ++ printk("ser%i rts %i\n", info->line, set); ++#endif ++#endif ++} ++ ++ ++/* If this behaves as a modem, RI and CD is an output */ ++static inline void ++e100_ri_out(struct e100_serial *info, int set) ++{ ++#ifndef CONFIG_SVINTO_SIM ++ /* RI is active low */ ++ { ++ unsigned char mask = e100_modem_pins[info->line].ri_mask; ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ *e100_modem_pins[info->line].ri_shadow &= ~mask; ++ *e100_modem_pins[info->line].ri_shadow |= (set ? 0 : mask); ++ *e100_modem_pins[info->line].ri_port = *e100_modem_pins[info->line].ri_shadow; ++ local_irq_restore(flags); ++ } ++#endif ++} ++static inline void ++e100_cd_out(struct e100_serial *info, int set) ++{ ++#ifndef CONFIG_SVINTO_SIM ++ /* CD is active low */ ++ { ++ unsigned char mask = e100_modem_pins[info->line].cd_mask; ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ *e100_modem_pins[info->line].cd_shadow &= ~mask; ++ *e100_modem_pins[info->line].cd_shadow |= (set ? 0 : mask); ++ *e100_modem_pins[info->line].cd_port = *e100_modem_pins[info->line].cd_shadow; ++ local_irq_restore(flags); ++ } ++#endif ++} ++ ++static inline void ++e100_disable_rx(struct e100_serial *info) ++{ ++#ifndef CONFIG_SVINTO_SIM ++ /* disable the receiver */ ++ info->ioport[REG_REC_CTRL] = ++ (info->rx_ctrl &= ~IO_MASK(R_SERIAL0_REC_CTRL, rec_enable)); ++#endif ++} ++ ++static inline void ++e100_enable_rx(struct e100_serial *info) ++{ ++#ifndef CONFIG_SVINTO_SIM ++ /* enable the receiver */ ++ info->ioport[REG_REC_CTRL] = ++ (info->rx_ctrl |= IO_MASK(R_SERIAL0_REC_CTRL, rec_enable)); ++#endif ++} ++ ++/* the rx DMA uses both the dma_descr and the dma_eop interrupts */ ++ ++static inline void ++e100_disable_rxdma_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("rxdma_irq(%d): 0\n",info->line); ++#endif ++ DINTR1(DEBUG_LOG(info->line,"IRQ disable_rxdma_irq %i\n", info->line)); ++ *R_IRQ_MASK2_CLR = (info->irq << 2) | (info->irq << 3); ++} ++ ++static inline void ++e100_enable_rxdma_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("rxdma_irq(%d): 1\n",info->line); ++#endif ++ DINTR1(DEBUG_LOG(info->line,"IRQ enable_rxdma_irq %i\n", info->line)); ++ *R_IRQ_MASK2_SET = (info->irq << 2) | (info->irq << 3); ++} ++ ++/* the tx DMA uses only dma_descr interrupt */ ++ ++static void e100_disable_txdma_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("txdma_irq(%d): 0\n",info->line); ++#endif ++ DINTR1(DEBUG_LOG(info->line,"IRQ disable_txdma_irq %i\n", info->line)); ++ *R_IRQ_MASK2_CLR = info->irq; ++} ++ ++static void e100_enable_txdma_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("txdma_irq(%d): 1\n",info->line); ++#endif ++ DINTR1(DEBUG_LOG(info->line,"IRQ enable_txdma_irq %i\n", info->line)); ++ *R_IRQ_MASK2_SET = info->irq; ++} ++ ++static void e100_disable_txdma_channel(struct e100_serial *info) ++{ ++ unsigned long flags; ++ ++ /* Disable output DMA channel for the serial port in question ++ * ( set to something other than serialX) ++ */ ++ local_irq_save(flags); ++ DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line)); ++ if (info->line == 0) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma6)) == ++ IO_STATE(R_GEN_CONFIG, dma6, serial0)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma6); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma6, unused); ++ } ++ } else if (info->line == 1) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma8)) == ++ IO_STATE(R_GEN_CONFIG, dma8, serial1)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma8); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma8, usb); ++ } ++ } else if (info->line == 2) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma2)) == ++ IO_STATE(R_GEN_CONFIG, dma2, serial2)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma2); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma2, par0); ++ } ++ } else if (info->line == 3) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma4)) == ++ IO_STATE(R_GEN_CONFIG, dma4, serial3)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma4); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma4, par1); ++ } ++ } ++ *R_GEN_CONFIG = genconfig_shadow; ++ local_irq_restore(flags); ++} ++ ++ ++static void e100_enable_txdma_channel(struct e100_serial *info) ++{ ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ DFLOW(DEBUG_LOG(info->line, "enable_txdma_channel %i\n", info->line)); ++ /* Enable output DMA channel for the serial port in question */ ++ if (info->line == 0) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma6); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma6, serial0); ++ } else if (info->line == 1) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma8); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma8, serial1); ++ } else if (info->line == 2) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma2); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma2, serial2); ++ } else if (info->line == 3) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma4); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma4, serial3); ++ } ++ *R_GEN_CONFIG = genconfig_shadow; ++ local_irq_restore(flags); ++} ++ ++static void e100_disable_rxdma_channel(struct e100_serial *info) ++{ ++ unsigned long flags; ++ ++ /* Disable input DMA channel for the serial port in question ++ * ( set to something other than serialX) ++ */ ++ local_irq_save(flags); ++ if (info->line == 0) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma7)) == ++ IO_STATE(R_GEN_CONFIG, dma7, serial0)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma7); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma7, unused); ++ } ++ } else if (info->line == 1) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma9)) == ++ IO_STATE(R_GEN_CONFIG, dma9, serial1)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma9); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma9, usb); ++ } ++ } else if (info->line == 2) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma3)) == ++ IO_STATE(R_GEN_CONFIG, dma3, serial2)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma3); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma3, par0); ++ } ++ } else if (info->line == 3) { ++ if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma5)) == ++ IO_STATE(R_GEN_CONFIG, dma5, serial3)) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma5); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma5, par1); ++ } ++ } ++ *R_GEN_CONFIG = genconfig_shadow; ++ local_irq_restore(flags); ++} ++ ++ ++static void e100_enable_rxdma_channel(struct e100_serial *info) ++{ ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ /* Enable input DMA channel for the serial port in question */ ++ if (info->line == 0) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma7); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma7, serial0); ++ } else if (info->line == 1) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma9); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma9, serial1); ++ } else if (info->line == 2) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma3); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma3, serial2); ++ } else if (info->line == 3) { ++ genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma5); ++ genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma5, serial3); ++ } ++ *R_GEN_CONFIG = genconfig_shadow; ++ local_irq_restore(flags); ++} ++ ++#ifdef SERIAL_HANDLE_EARLY_ERRORS ++/* in order to detect and fix errors on the first byte ++ we have to use the serial interrupts as well. */ ++ ++static inline void ++e100_disable_serial_data_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("ser_irq(%d): 0\n",info->line); ++#endif ++ DINTR1(DEBUG_LOG(info->line,"IRQ disable data_irq %i\n", info->line)); ++ *R_IRQ_MASK1_CLR = (1U << (8+2*info->line)); ++} ++ ++static inline void ++e100_enable_serial_data_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("ser_irq(%d): 1\n",info->line); ++ printk("**** %d = %d\n", ++ (8+2*info->line), ++ (1U << (8+2*info->line))); ++#endif ++ DINTR1(DEBUG_LOG(info->line,"IRQ enable data_irq %i\n", info->line)); ++ *R_IRQ_MASK1_SET = (1U << (8+2*info->line)); ++} ++#endif ++ ++static inline void ++e100_disable_serial_tx_ready_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("ser_tx_irq(%d): 0\n",info->line); ++#endif ++ DINTR1(DEBUG_LOG(info->line,"IRQ disable ready_irq %i\n", info->line)); ++ *R_IRQ_MASK1_CLR = (1U << (8+1+2*info->line)); ++} ++ ++static inline void ++e100_enable_serial_tx_ready_irq(struct e100_serial *info) ++{ ++#ifdef SERIAL_DEBUG_INTR ++ printk("ser_tx_irq(%d): 1\n",info->line); ++ printk("**** %d = %d\n", ++ (8+1+2*info->line), ++ (1U << (8+1+2*info->line))); ++#endif ++ DINTR2(DEBUG_LOG(info->line,"IRQ enable ready_irq %i\n", info->line)); ++ *R_IRQ_MASK1_SET = (1U << (8+1+2*info->line)); ++} ++ ++static inline void e100_enable_rx_irq(struct e100_serial *info) ++{ ++ if (info->uses_dma_in) ++ e100_enable_rxdma_irq(info); ++ else ++ e100_enable_serial_data_irq(info); ++} ++static inline void e100_disable_rx_irq(struct e100_serial *info) ++{ ++ if (info->uses_dma_in) ++ e100_disable_rxdma_irq(info); ++ else ++ e100_disable_serial_data_irq(info); ++} ++ ++#if defined(CONFIG_ETRAX_RS485) ++/* Enable RS-485 mode on selected port. This is UGLY. */ ++static int ++e100_enable_rs485(struct tty_struct *tty, struct serial_rs485 *r) ++{ ++ struct e100_serial * info = (struct e100_serial *)tty->driver_data; ++ ++#if defined(CONFIG_ETRAX_RS485_ON_PA) ++ *R_PORT_PA_DATA = port_pa_data_shadow |= (1 << rs485_pa_bit); ++#endif ++#if defined(CONFIG_ETRAX_RS485_ON_PORT_G) ++ REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow, ++ rs485_port_g_bit, 1); ++#endif ++#if defined(CONFIG_ETRAX_RS485_LTC1387) ++ REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow, ++ CONFIG_ETRAX_RS485_LTC1387_DXEN_PORT_G_BIT, 1); ++ REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow, ++ CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1); ++#endif ++ ++ info->rs485.flags = r->flags; ++ if (r->delay_rts_before_send >= 1000) ++ info->rs485.delay_rts_before_send = 1000; ++ else ++ info->rs485.delay_rts_before_send = r->delay_rts_before_send; ++/* printk("rts: on send = %i, after = %i, enabled = %i", ++ info->rs485.rts_on_send, ++ info->rs485.rts_after_sent, ++ info->rs485.enabled ++ ); ++*/ ++ return 0; ++} ++ ++static int ++e100_write_rs485(struct tty_struct *tty, ++ const unsigned char *buf, int count) ++{ ++ struct e100_serial * info = (struct e100_serial *)tty->driver_data; ++ int old_value = (info->rs485.flags) & SER_RS485_ENABLED; ++ ++ /* rs485 is always implicitly enabled if we're using the ioctl() ++ * but it doesn't have to be set in the serial_rs485 ++ * (to be backward compatible with old apps) ++ * So we store, set and restore it. ++ */ ++ info->rs485.flags |= SER_RS485_ENABLED; ++ /* rs_write now deals with RS485 if enabled */ ++ count = rs_write(tty, buf, count); ++ if (!old_value) ++ info->rs485.flags &= ~(SER_RS485_ENABLED); ++ return count; ++} ++ ++#ifdef CONFIG_ETRAX_FAST_TIMER ++/* Timer function to toggle RTS when using FAST_TIMER */ ++static void rs485_toggle_rts_timer_function(unsigned long data) ++{ ++ struct e100_serial *info = (struct e100_serial *)data; ++ ++ fast_timers_rs485[info->line].function = NULL; ++ e100_rts(info, (info->rs485.flags & SER_RS485_RTS_AFTER_SEND)); ++#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER) ++ e100_enable_rx(info); ++ e100_enable_rx_irq(info); ++#endif ++} ++#endif ++#endif /* CONFIG_ETRAX_RS485 */ ++ ++/* ++ * ------------------------------------------------------------ ++ * rs_stop() and rs_start() ++ * ++ * This routines are called before setting or resetting tty->stopped. ++ * They enable or disable transmitter using the XOFF registers, as necessary. ++ * ------------------------------------------------------------ ++ */ ++ ++static void ++rs_stop(struct tty_struct *tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ if (info) { ++ unsigned long flags; ++ unsigned long xoff; ++ ++ local_irq_save(flags); ++ DFLOW(DEBUG_LOG(info->line, "XOFF rs_stop xmit %i\n", ++ CIRC_CNT(info->xmit.head, ++ info->xmit.tail,SERIAL_XMIT_SIZE))); ++ ++ xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, ++ STOP_CHAR(info->port.tty)); ++ xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, stop); ++ if (tty->termios->c_iflag & IXON ) { ++ xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable); ++ } ++ ++ *((unsigned long *)&info->ioport[REG_XOFF]) = xoff; ++ local_irq_restore(flags); ++ } ++} ++ ++static void ++rs_start(struct tty_struct *tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ if (info) { ++ unsigned long flags; ++ unsigned long xoff; ++ ++ local_irq_save(flags); ++ DFLOW(DEBUG_LOG(info->line, "XOFF rs_start xmit %i\n", ++ CIRC_CNT(info->xmit.head, ++ info->xmit.tail,SERIAL_XMIT_SIZE))); ++ xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(tty)); ++ xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, enable); ++ if (tty->termios->c_iflag & IXON ) { ++ xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable); ++ } ++ ++ *((unsigned long *)&info->ioport[REG_XOFF]) = xoff; ++ if (!info->uses_dma_out && ++ info->xmit.head != info->xmit.tail && info->xmit.buf) ++ e100_enable_serial_tx_ready_irq(info); ++ ++ local_irq_restore(flags); ++ } ++} ++ ++/* ++ * ---------------------------------------------------------------------- ++ * ++ * Here starts the interrupt handling routines. All of the following ++ * subroutines are declared as inline and are folded into ++ * rs_interrupt(). They were separated out for readability's sake. ++ * ++ * Note: rs_interrupt() is a "fast" interrupt, which means that it ++ * runs with interrupts turned off. People who may want to modify ++ * rs_interrupt() should try to keep the interrupt handler as fast as ++ * possible. After you are done making modifications, it is not a bad ++ * idea to do: ++ * ++ * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c ++ * ++ * and look at the resulting assemble code in serial.s. ++ * ++ * - Ted Ts'o (tytso@mit.edu), 7-Mar-93 ++ * ----------------------------------------------------------------------- ++ */ ++ ++/* ++ * This routine is used by the interrupt handler to schedule ++ * processing in the software interrupt portion of the driver. ++ */ ++static void rs_sched_event(struct e100_serial *info, int event) ++{ ++ if (info->event & (1 << event)) ++ return; ++ info->event |= 1 << event; ++ schedule_work(&info->work); ++} ++ ++/* The output DMA channel is free - use it to send as many chars as possible ++ * NOTES: ++ * We don't pay attention to info->x_char, which means if the TTY wants to ++ * use XON/XOFF it will set info->x_char but we won't send any X char! ++ * ++ * To implement this, we'd just start a DMA send of 1 byte pointing at a ++ * buffer containing the X char, and skip updating xmit. We'd also have to ++ * check if the last sent char was the X char when we enter this function ++ * the next time, to avoid updating xmit with the sent X value. ++ */ ++ ++static void ++transmit_chars_dma(struct e100_serial *info) ++{ ++ unsigned int c, sentl; ++ struct etrax_dma_descr *descr; ++ ++#ifdef CONFIG_SVINTO_SIM ++ /* This will output too little if tail is not 0 always since ++ * we don't reloop to send the other part. Anyway this SHOULD be a ++ * no-op - transmit_chars_dma would never really be called during sim ++ * since rs_write does not write into the xmit buffer then. ++ */ ++ if (info->xmit.tail) ++ printk("Error in serial.c:transmit_chars-dma(), tail!=0\n"); ++ if (info->xmit.head != info->xmit.tail) { ++ SIMCOUT(info->xmit.buf + info->xmit.tail, ++ CIRC_CNT(info->xmit.head, ++ info->xmit.tail, ++ SERIAL_XMIT_SIZE)); ++ info->xmit.head = info->xmit.tail; /* move back head */ ++ info->tr_running = 0; ++ } ++ return; ++#endif ++ /* acknowledge both dma_descr and dma_eop irq in R_DMA_CHx_CLR_INTR */ ++ *info->oclrintradr = ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) | ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do); ++ ++#ifdef SERIAL_DEBUG_INTR ++ if (info->line == SERIAL_DEBUG_LINE) ++ printk("tc\n"); ++#endif ++ if (!info->tr_running) { ++ /* weirdo... we shouldn't get here! */ ++ printk(KERN_WARNING "Achtung: transmit_chars_dma with !tr_running\n"); ++ return; ++ } ++ ++ descr = &info->tr_descr; ++ ++ /* first get the amount of bytes sent during the last DMA transfer, ++ and update xmit accordingly */ ++ ++ /* if the stop bit was not set, all data has been sent */ ++ if (!(descr->status & d_stop)) { ++ sentl = descr->sw_len; ++ } else ++ /* otherwise we find the amount of data sent here */ ++ sentl = descr->hw_len; ++ ++ DFLOW(DEBUG_LOG(info->line, "TX %i done\n", sentl)); ++ ++ /* update stats */ ++ info->icount.tx += sentl; ++ ++ /* update xmit buffer */ ++ info->xmit.tail = (info->xmit.tail + sentl) & (SERIAL_XMIT_SIZE - 1); ++ ++ /* if there is only a few chars left in the buf, wake up the blocked ++ write if any */ ++ if (CIRC_CNT(info->xmit.head, ++ info->xmit.tail, ++ SERIAL_XMIT_SIZE) < WAKEUP_CHARS) ++ rs_sched_event(info, RS_EVENT_WRITE_WAKEUP); ++ ++ /* find out the largest amount of consecutive bytes we want to send now */ ++ ++ c = CIRC_CNT_TO_END(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); ++ ++ /* Don't send all in one DMA transfer - divide it so we wake up ++ * application before all is sent ++ */ ++ ++ if (c >= 4*WAKEUP_CHARS) ++ c = c/2; ++ ++ if (c <= 0) { ++ /* our job here is done, don't schedule any new DMA transfer */ ++ info->tr_running = 0; ++ ++#if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER) ++ if (info->rs485.flags & SER_RS485_ENABLED) { ++ /* Set a short timer to toggle RTS */ ++ start_one_shot_timer(&fast_timers_rs485[info->line], ++ rs485_toggle_rts_timer_function, ++ (unsigned long)info, ++ info->char_time_usec*2, ++ "RS-485"); ++ } ++#endif /* RS485 */ ++ return; ++ } ++ ++ /* ok we can schedule a dma send of c chars starting at info->xmit.tail */ ++ /* set up the descriptor correctly for output */ ++ DFLOW(DEBUG_LOG(info->line, "TX %i\n", c)); ++ descr->ctrl = d_int | d_eol | d_wait; /* Wait needed for tty_wait_until_sent() */ ++ descr->sw_len = c; ++ descr->buf = virt_to_phys(info->xmit.buf + info->xmit.tail); ++ descr->status = 0; ++ ++ *info->ofirstadr = virt_to_phys(descr); /* write to R_DMAx_FIRST */ ++ *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, start); ++ ++ /* DMA is now running (hopefully) */ ++} /* transmit_chars_dma */ ++ ++static void ++start_transmit(struct e100_serial *info) ++{ ++#if 0 ++ if (info->line == SERIAL_DEBUG_LINE) ++ printk("x\n"); ++#endif ++ ++ info->tr_descr.sw_len = 0; ++ info->tr_descr.hw_len = 0; ++ info->tr_descr.status = 0; ++ info->tr_running = 1; ++ if (info->uses_dma_out) ++ transmit_chars_dma(info); ++ else ++ e100_enable_serial_tx_ready_irq(info); ++} /* start_transmit */ ++ ++#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER ++static int serial_fast_timer_started = 0; ++static int serial_fast_timer_expired = 0; ++static void flush_timeout_function(unsigned long data); ++#define START_FLUSH_FAST_TIMER_TIME(info, string, usec) {\ ++ unsigned long timer_flags; \ ++ local_irq_save(timer_flags); \ ++ if (fast_timers[info->line].function == NULL) { \ ++ serial_fast_timer_started++; \ ++ TIMERD(DEBUG_LOG(info->line, "start_timer %i ", info->line)); \ ++ TIMERD(DEBUG_LOG(info->line, "num started: %i\n", serial_fast_timer_started)); \ ++ start_one_shot_timer(&fast_timers[info->line], \ ++ flush_timeout_function, \ ++ (unsigned long)info, \ ++ (usec), \ ++ string); \ ++ } \ ++ else { \ ++ TIMERD(DEBUG_LOG(info->line, "timer %i already running\n", info->line)); \ ++ } \ ++ local_irq_restore(timer_flags); \ ++} ++#define START_FLUSH_FAST_TIMER(info, string) START_FLUSH_FAST_TIMER_TIME(info, string, info->flush_time_usec) ++ ++#else ++#define START_FLUSH_FAST_TIMER_TIME(info, string, usec) ++#define START_FLUSH_FAST_TIMER(info, string) ++#endif ++ ++static struct etrax_recv_buffer * ++alloc_recv_buffer(unsigned int size) ++{ ++ struct etrax_recv_buffer *buffer; ++ ++ if (!(buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC))) ++ return NULL; ++ ++ buffer->next = NULL; ++ buffer->length = 0; ++ buffer->error = TTY_NORMAL; ++ ++ return buffer; ++} ++ ++static void ++append_recv_buffer(struct e100_serial *info, struct etrax_recv_buffer *buffer) ++{ ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ ++ if (!info->first_recv_buffer) ++ info->first_recv_buffer = buffer; ++ else ++ info->last_recv_buffer->next = buffer; ++ ++ info->last_recv_buffer = buffer; ++ ++ info->recv_cnt += buffer->length; ++ if (info->recv_cnt > info->max_recv_cnt) ++ info->max_recv_cnt = info->recv_cnt; ++ ++ local_irq_restore(flags); ++} ++ ++static int ++add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char flag) ++{ ++ struct etrax_recv_buffer *buffer; ++ if (info->uses_dma_in) { ++ if (!(buffer = alloc_recv_buffer(4))) ++ return 0; ++ ++ buffer->length = 1; ++ buffer->error = flag; ++ buffer->buffer[0] = data; ++ ++ append_recv_buffer(info, buffer); ++ ++ info->icount.rx++; ++ } else { ++ struct tty_struct *tty = info->port.tty; ++ tty_insert_flip_char(tty, data, flag); ++ info->icount.rx++; ++ } ++ ++ return 1; ++} ++ ++static unsigned int handle_descr_data(struct e100_serial *info, ++ struct etrax_dma_descr *descr, ++ unsigned int recvl) ++{ ++ struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer; ++ ++ if (info->recv_cnt + recvl > 65536) { ++ printk(KERN_CRIT ++ "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl); ++ return 0; ++ } ++ ++ buffer->length = recvl; ++ ++ if (info->errorcode == ERRCODE_SET_BREAK) ++ buffer->error = TTY_BREAK; ++ info->errorcode = 0; ++ ++ append_recv_buffer(info, buffer); ++ ++ if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE))) ++ panic("%s: Failed to allocate memory for receive buffer!\n", __func__); ++ ++ descr->buf = virt_to_phys(buffer->buffer); ++ ++ return recvl; ++} ++ ++static unsigned int handle_all_descr_data(struct e100_serial *info) ++{ ++ struct etrax_dma_descr *descr; ++ unsigned int recvl; ++ unsigned int ret = 0; ++ ++ while (1) ++ { ++ descr = &info->rec_descr[info->cur_rec_descr]; ++ ++ if (descr == phys_to_virt(*info->idescradr)) ++ break; ++ ++ if (++info->cur_rec_descr == SERIAL_RECV_DESCRIPTORS) ++ info->cur_rec_descr = 0; ++ ++ /* find out how many bytes were read */ ++ ++ /* if the eop bit was not set, all data has been received */ ++ if (!(descr->status & d_eop)) { ++ recvl = descr->sw_len; ++ } else { ++ /* otherwise we find the amount of data received here */ ++ recvl = descr->hw_len; ++ } ++ ++ /* Reset the status information */ ++ descr->status = 0; ++ ++ DFLOW( DEBUG_LOG(info->line, "RX %lu\n", recvl); ++ if (info->port.tty->stopped) { ++ unsigned char *buf = phys_to_virt(descr->buf); ++ DEBUG_LOG(info->line, "rx 0x%02X\n", buf[0]); ++ DEBUG_LOG(info->line, "rx 0x%02X\n", buf[1]); ++ DEBUG_LOG(info->line, "rx 0x%02X\n", buf[2]); ++ } ++ ); ++ ++ /* update stats */ ++ info->icount.rx += recvl; ++ ++ ret += handle_descr_data(info, descr, recvl); ++ } ++ ++ return ret; ++} ++ ++static void receive_chars_dma(struct e100_serial *info) ++{ ++ struct tty_struct *tty; ++ unsigned char rstat; ++ ++#ifdef CONFIG_SVINTO_SIM ++ /* No receive in the simulator. Will probably be when the rest of ++ * the serial interface works, and this piece will just be removed. ++ */ ++ return; ++#endif ++ ++ /* Acknowledge both dma_descr and dma_eop irq in R_DMA_CHx_CLR_INTR */ ++ *info->iclrintradr = ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) | ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do); ++ ++ tty = info->port.tty; ++ if (!tty) /* Something wrong... */ ++ return; ++ ++#ifdef SERIAL_HANDLE_EARLY_ERRORS ++ if (info->uses_dma_in) ++ e100_enable_serial_data_irq(info); ++#endif ++ ++ if (info->errorcode == ERRCODE_INSERT_BREAK) ++ add_char_and_flag(info, '\0', TTY_BREAK); ++ ++ handle_all_descr_data(info); ++ ++ /* Read the status register to detect errors */ ++ rstat = info->ioport[REG_STATUS]; ++ if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) ) { ++ DFLOW(DEBUG_LOG(info->line, "XOFF detect stat %x\n", rstat)); ++ } ++ ++ if (rstat & SER_ERROR_MASK) { ++ /* If we got an error, we must reset it by reading the ++ * data_in field ++ */ ++ unsigned char data = info->ioport[REG_DATA]; ++ ++ PROCSTAT(ser_stat[info->line].errors_cnt++); ++ DEBUG_LOG(info->line, "#dERR: s d 0x%04X\n", ++ ((rstat & SER_ERROR_MASK) << 8) | data); ++ ++ if (rstat & SER_PAR_ERR_MASK) ++ add_char_and_flag(info, data, TTY_PARITY); ++ else if (rstat & SER_OVERRUN_MASK) ++ add_char_and_flag(info, data, TTY_OVERRUN); ++ else if (rstat & SER_FRAMING_ERR_MASK) ++ add_char_and_flag(info, data, TTY_FRAME); ++ } ++ ++ START_FLUSH_FAST_TIMER(info, "receive_chars"); ++ ++ /* Restart the receiving DMA */ ++ *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart); ++} ++ ++static int start_recv_dma(struct e100_serial *info) ++{ ++ struct etrax_dma_descr *descr = info->rec_descr; ++ struct etrax_recv_buffer *buffer; ++ int i; ++ ++ /* Set up the receiving descriptors */ ++ for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) { ++ if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE))) ++ panic("%s: Failed to allocate memory for receive buffer!\n", __func__); ++ ++ descr[i].ctrl = d_int; ++ descr[i].buf = virt_to_phys(buffer->buffer); ++ descr[i].sw_len = SERIAL_DESCR_BUF_SIZE; ++ descr[i].hw_len = 0; ++ descr[i].status = 0; ++ descr[i].next = virt_to_phys(&descr[i+1]); ++ } ++ ++ /* Link the last descriptor to the first */ ++ descr[i-1].next = virt_to_phys(&descr[0]); ++ ++ /* Start with the first descriptor in the list */ ++ info->cur_rec_descr = 0; ++ ++ /* Start the DMA */ ++ *info->ifirstadr = virt_to_phys(&descr[info->cur_rec_descr]); ++ *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, start); ++ ++ /* Input DMA should be running now */ ++ return 1; ++} ++ ++static void ++start_receive(struct e100_serial *info) ++{ ++#ifdef CONFIG_SVINTO_SIM ++ /* No receive in the simulator. Will probably be when the rest of ++ * the serial interface works, and this piece will just be removed. ++ */ ++ return; ++#endif ++ if (info->uses_dma_in) { ++ /* reset the input dma channel to be sure it works */ ++ ++ *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset); ++ while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->icmdadr) == ++ IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, reset)); ++ ++ start_recv_dma(info); ++ } ++} ++ ++ ++/* the bits in the MASK2 register are laid out like this: ++ DMAI_EOP DMAI_DESCR DMAO_EOP DMAO_DESCR ++ where I is the input channel and O is the output channel for the port. ++ info->irq is the bit number for the DMAO_DESCR so to check the others we ++ shift info->irq to the left. ++*/ ++ ++/* dma output channel interrupt handler ++ this interrupt is called from DMA2(ser2), DMA4(ser3), DMA6(ser0) or ++ DMA8(ser1) when they have finished a descriptor with the intr flag set. ++*/ ++ ++static irqreturn_t ++tr_interrupt(int irq, void *dev_id) ++{ ++ struct e100_serial *info; ++ unsigned long ireg; ++ int i; ++ int handled = 0; ++ ++#ifdef CONFIG_SVINTO_SIM ++ /* No receive in the simulator. Will probably be when the rest of ++ * the serial interface works, and this piece will just be removed. ++ */ ++ { ++ const char *s = "What? tr_interrupt in simulator??\n"; ++ SIMCOUT(s,strlen(s)); ++ } ++ return IRQ_HANDLED; ++#endif ++ ++ /* find out the line that caused this irq and get it from rs_table */ ++ ++ ireg = *R_IRQ_MASK2_RD; /* get the active irq bits for the dma channels */ ++ ++ for (i = 0; i < NR_PORTS; i++) { ++ info = rs_table + i; ++ if (!info->enabled || !info->uses_dma_out) ++ continue; ++ /* check for dma_descr (don't need to check for dma_eop in output dma for serial */ ++ if (ireg & info->irq) { ++ handled = 1; ++ /* we can send a new dma bunch. make it so. */ ++ DINTR2(DEBUG_LOG(info->line, "tr_interrupt %i\n", i)); ++ /* Read jiffies_usec first, ++ * we want this time to be as late as possible ++ */ ++ PROCSTAT(ser_stat[info->line].tx_dma_ints++); ++ info->last_tx_active_usec = GET_JIFFIES_USEC(); ++ info->last_tx_active = jiffies; ++ transmit_chars_dma(info); ++ } ++ ++ /* FIXME: here we should really check for a change in the ++ status lines and if so call status_handle(info) */ ++ } ++ return IRQ_RETVAL(handled); ++} /* tr_interrupt */ ++ ++/* dma input channel interrupt handler */ ++ ++static irqreturn_t ++rec_interrupt(int irq, void *dev_id) ++{ ++ struct e100_serial *info; ++ unsigned long ireg; ++ int i; ++ int handled = 0; ++ ++#ifdef CONFIG_SVINTO_SIM ++ /* No receive in the simulator. Will probably be when the rest of ++ * the serial interface works, and this piece will just be removed. ++ */ ++ { ++ const char *s = "What? rec_interrupt in simulator??\n"; ++ SIMCOUT(s,strlen(s)); ++ } ++ return IRQ_HANDLED; ++#endif ++ ++ /* find out the line that caused this irq and get it from rs_table */ ++ ++ ireg = *R_IRQ_MASK2_RD; /* get the active irq bits for the dma channels */ ++ ++ for (i = 0; i < NR_PORTS; i++) { ++ info = rs_table + i; ++ if (!info->enabled || !info->uses_dma_in) ++ continue; ++ /* check for both dma_eop and dma_descr for the input dma channel */ ++ if (ireg & ((info->irq << 2) | (info->irq << 3))) { ++ handled = 1; ++ /* we have received something */ ++ receive_chars_dma(info); ++ } ++ ++ /* FIXME: here we should really check for a change in the ++ status lines and if so call status_handle(info) */ ++ } ++ return IRQ_RETVAL(handled); ++} /* rec_interrupt */ ++ ++static int force_eop_if_needed(struct e100_serial *info) ++{ ++ /* We check data_avail bit to determine if data has ++ * arrived since last time ++ */ ++ unsigned char rstat = info->ioport[REG_STATUS]; ++ ++ /* error or datavail? */ ++ if (rstat & SER_ERROR_MASK) { ++ /* Some error has occurred. If there has been valid data, an ++ * EOP interrupt will be made automatically. If no data, the ++ * normal ser_interrupt should be enabled and handle it. ++ * So do nothing! ++ */ ++ DEBUG_LOG(info->line, "timeout err: rstat 0x%03X\n", ++ rstat | (info->line << 8)); ++ return 0; ++ } ++ ++ if (rstat & SER_DATA_AVAIL_MASK) { ++ /* Ok data, no error, count it */ ++ TIMERD(DEBUG_LOG(info->line, "timeout: rstat 0x%03X\n", ++ rstat | (info->line << 8))); ++ /* Read data to clear status flags */ ++ (void)info->ioport[REG_DATA]; ++ ++ info->forced_eop = 0; ++ START_FLUSH_FAST_TIMER(info, "magic"); ++ return 0; ++ } ++ ++ /* hit the timeout, force an EOP for the input ++ * dma channel if we haven't already ++ */ ++ if (!info->forced_eop) { ++ info->forced_eop = 1; ++ PROCSTAT(ser_stat[info->line].timeout_flush_cnt++); ++ TIMERD(DEBUG_LOG(info->line, "timeout EOP %i\n", info->line)); ++ FORCE_EOP(info); ++ } ++ ++ return 1; ++} ++ ++static void flush_to_flip_buffer(struct e100_serial *info) ++{ ++ struct tty_struct *tty; ++ struct etrax_recv_buffer *buffer; ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ tty = info->port.tty; ++ ++ if (!tty) { ++ local_irq_restore(flags); ++ return; ++ } ++ ++ while ((buffer = info->first_recv_buffer) != NULL) { ++ unsigned int count = buffer->length; ++ ++ tty_insert_flip_string(tty, buffer->buffer, count); ++ info->recv_cnt -= count; ++ ++ if (count == buffer->length) { ++ info->first_recv_buffer = buffer->next; ++ kfree(buffer); ++ } else { ++ buffer->length -= count; ++ memmove(buffer->buffer, buffer->buffer + count, buffer->length); ++ buffer->error = TTY_NORMAL; ++ } ++ } ++ ++ if (!info->first_recv_buffer) ++ info->last_recv_buffer = NULL; ++ ++ local_irq_restore(flags); ++ ++ /* This includes a check for low-latency */ ++ tty_flip_buffer_push(tty); ++} ++ ++static void check_flush_timeout(struct e100_serial *info) ++{ ++ /* Flip what we've got (if we can) */ ++ flush_to_flip_buffer(info); ++ ++ /* We might need to flip later, but not to fast ++ * since the system is busy processing input... */ ++ if (info->first_recv_buffer) ++ START_FLUSH_FAST_TIMER_TIME(info, "flip", 2000); ++ ++ /* Force eop last, since data might have come while we're processing ++ * and if we started the slow timer above, we won't start a fast ++ * below. ++ */ ++ force_eop_if_needed(info); ++} ++ ++#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER ++static void flush_timeout_function(unsigned long data) ++{ ++ struct e100_serial *info = (struct e100_serial *)data; ++ ++ fast_timers[info->line].function = NULL; ++ serial_fast_timer_expired++; ++ TIMERD(DEBUG_LOG(info->line, "flush_timout %i ", info->line)); ++ TIMERD(DEBUG_LOG(info->line, "num expired: %i\n", serial_fast_timer_expired)); ++ check_flush_timeout(info); ++} ++ ++#else ++ ++/* dma fifo/buffer timeout handler ++ forces an end-of-packet for the dma input channel if no chars ++ have been received for CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS/100 s. ++*/ ++ ++static struct timer_list flush_timer; ++ ++static void ++timed_flush_handler(unsigned long ptr) ++{ ++ struct e100_serial *info; ++ int i; ++ ++#ifdef CONFIG_SVINTO_SIM ++ return; ++#endif ++ ++ for (i = 0; i < NR_PORTS; i++) { ++ info = rs_table + i; ++ if (info->uses_dma_in) ++ check_flush_timeout(info); ++ } ++ ++ /* restart flush timer */ ++ mod_timer(&flush_timer, jiffies + CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS); ++} ++#endif ++ ++#ifdef SERIAL_HANDLE_EARLY_ERRORS ++ ++/* If there is an error (ie break) when the DMA is running and ++ * there are no bytes in the fifo the DMA is stopped and we get no ++ * eop interrupt. Thus we have to monitor the first bytes on a DMA ++ * transfer, and if it is without error we can turn the serial ++ * interrupts off. ++ */ ++ ++/* ++BREAK handling on ETRAX 100: ++ETRAX will generate interrupt although there is no stop bit between the ++characters. ++ ++Depending on how long the break sequence is, the end of the breaksequence ++will look differently: ++| indicates start/end of a character. ++ ++B= Break character (0x00) with framing error. ++E= Error byte with parity error received after B characters. ++F= "Faked" valid byte received immediately after B characters. ++V= Valid byte ++ ++1. ++ B BL ___________________________ V ++.._|__________|__________| |valid data | ++ ++Multiple frame errors with data == 0x00 (B), ++the timing matches up "perfectly" so no extra ending char is detected. ++The RXD pin is 1 in the last interrupt, in that case ++we set info->errorcode = ERRCODE_INSERT_BREAK, but we can't really ++know if another byte will come and this really is case 2. below ++(e.g F=0xFF or 0xFE) ++If RXD pin is 0 we can expect another character (see 2. below). ++ ++ ++2. ++ ++ B B E or F__________________..__ V ++.._|__________|__________|______ | |valid data ++ "valid" or ++ parity error ++ ++Multiple frame errors with data == 0x00 (B), ++but the part of the break trigs is interpreted as a start bit (and possibly ++some 0 bits followed by a number of 1 bits and a stop bit). ++Depending on parity settings etc. this last character can be either ++a fake "valid" char (F) or have a parity error (E). ++ ++If the character is valid it will be put in the buffer, ++we set info->errorcode = ERRCODE_SET_BREAK so the receive interrupt ++will set the flags so the tty will handle it, ++if it's an error byte it will not be put in the buffer ++and we set info->errorcode = ERRCODE_INSERT_BREAK. ++ ++To distinguish a V byte in 1. from an F byte in 2. we keep a timestamp ++of the last faulty char (B) and compares it with the current time: ++If the time elapsed time is less then 2*char_time_usec we will assume ++it's a faked F char and not a Valid char and set ++info->errorcode = ERRCODE_SET_BREAK. ++ ++Flaws in the above solution: ++~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++We use the timer to distinguish a F character from a V character, ++if a V character is to close after the break we might make the wrong decision. ++ ++TODO: The break will be delayed until an F or V character is received. ++ ++*/ ++ ++static ++struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info) ++{ ++ unsigned long data_read; ++ struct tty_struct *tty = info->port.tty; ++ ++ if (!tty) { ++ printk("!NO TTY!\n"); ++ return info; ++ } ++ ++ /* Read data and status at the same time */ ++ data_read = *((unsigned long *)&info->ioport[REG_DATA_STATUS32]); ++more_data: ++ if (data_read & IO_MASK(R_SERIAL0_READ, xoff_detect) ) { ++ DFLOW(DEBUG_LOG(info->line, "XOFF detect\n", 0)); ++ } ++ DINTR2(DEBUG_LOG(info->line, "ser_rx %c\n", IO_EXTRACT(R_SERIAL0_READ, data_in, data_read))); ++ ++ if (data_read & ( IO_MASK(R_SERIAL0_READ, framing_err) | ++ IO_MASK(R_SERIAL0_READ, par_err) | ++ IO_MASK(R_SERIAL0_READ, overrun) )) { ++ /* An error */ ++ info->last_rx_active_usec = GET_JIFFIES_USEC(); ++ info->last_rx_active = jiffies; ++ DINTR1(DEBUG_LOG(info->line, "ser_rx err stat_data %04X\n", data_read)); ++ DLOG_INT_TRIG( ++ if (!log_int_trig1_pos) { ++ log_int_trig1_pos = log_int_pos; ++ log_int(rdpc(), 0, 0); ++ } ++ ); ++ ++ ++ if ( ((data_read & IO_MASK(R_SERIAL0_READ, data_in)) == 0) && ++ (data_read & IO_MASK(R_SERIAL0_READ, framing_err)) ) { ++ /* Most likely a break, but we get interrupts over and ++ * over again. ++ */ ++ ++ if (!info->break_detected_cnt) { ++ DEBUG_LOG(info->line, "#BRK start\n", 0); ++ } ++ if (data_read & IO_MASK(R_SERIAL0_READ, rxd)) { ++ /* The RX pin is high now, so the break ++ * must be over, but.... ++ * we can't really know if we will get another ++ * last byte ending the break or not. ++ * And we don't know if the byte (if any) will ++ * have an error or look valid. ++ */ ++ DEBUG_LOG(info->line, "# BL BRK\n", 0); ++ info->errorcode = ERRCODE_INSERT_BREAK; ++ } ++ info->break_detected_cnt++; ++ } else { ++ /* The error does not look like a break, but could be ++ * the end of one ++ */ ++ if (info->break_detected_cnt) { ++ DEBUG_LOG(info->line, "EBRK %i\n", info->break_detected_cnt); ++ info->errorcode = ERRCODE_INSERT_BREAK; ++ } else { ++ unsigned char data = IO_EXTRACT(R_SERIAL0_READ, ++ data_in, data_read); ++ char flag = TTY_NORMAL; ++ if (info->errorcode == ERRCODE_INSERT_BREAK) { ++ struct tty_struct *tty = info->port.tty; ++ tty_insert_flip_char(tty, 0, flag); ++ info->icount.rx++; ++ } ++ ++ if (data_read & IO_MASK(R_SERIAL0_READ, par_err)) { ++ info->icount.parity++; ++ flag = TTY_PARITY; ++ } else if (data_read & IO_MASK(R_SERIAL0_READ, overrun)) { ++ info->icount.overrun++; ++ flag = TTY_OVERRUN; ++ } else if (data_read & IO_MASK(R_SERIAL0_READ, framing_err)) { ++ info->icount.frame++; ++ flag = TTY_FRAME; ++ } ++ tty_insert_flip_char(tty, data, flag); ++ info->errorcode = 0; ++ } ++ info->break_detected_cnt = 0; ++ } ++ } else if (data_read & IO_MASK(R_SERIAL0_READ, data_avail)) { ++ /* No error */ ++ DLOG_INT_TRIG( ++ if (!log_int_trig1_pos) { ++ if (log_int_pos >= log_int_size) { ++ log_int_pos = 0; ++ } ++ log_int_trig0_pos = log_int_pos; ++ log_int(rdpc(), 0, 0); ++ } ++ ); ++ tty_insert_flip_char(tty, ++ IO_EXTRACT(R_SERIAL0_READ, data_in, data_read), ++ TTY_NORMAL); ++ } else { ++ DEBUG_LOG(info->line, "ser_rx int but no data_avail %08lX\n", data_read); ++ } ++ ++ ++ info->icount.rx++; ++ data_read = *((unsigned long *)&info->ioport[REG_DATA_STATUS32]); ++ if (data_read & IO_MASK(R_SERIAL0_READ, data_avail)) { ++ DEBUG_LOG(info->line, "ser_rx %c in loop\n", IO_EXTRACT(R_SERIAL0_READ, data_in, data_read)); ++ goto more_data; ++ } ++ ++ tty_flip_buffer_push(info->port.tty); ++ return info; ++} ++ ++static struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info) ++{ ++ unsigned char rstat; ++ ++#ifdef SERIAL_DEBUG_INTR ++ printk("Interrupt from serport %d\n", i); ++#endif ++/* DEBUG_LOG(info->line, "ser_interrupt stat %03X\n", rstat | (i << 8)); */ ++ if (!info->uses_dma_in) { ++ return handle_ser_rx_interrupt_no_dma(info); ++ } ++ /* DMA is used */ ++ rstat = info->ioport[REG_STATUS]; ++ if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) ) { ++ DFLOW(DEBUG_LOG(info->line, "XOFF detect\n", 0)); ++ } ++ ++ if (rstat & SER_ERROR_MASK) { ++ unsigned char data; ++ ++ info->last_rx_active_usec = GET_JIFFIES_USEC(); ++ info->last_rx_active = jiffies; ++ /* If we got an error, we must reset it by reading the ++ * data_in field ++ */ ++ data = info->ioport[REG_DATA]; ++ DINTR1(DEBUG_LOG(info->line, "ser_rx! %c\n", data)); ++ DINTR1(DEBUG_LOG(info->line, "ser_rx err stat %02X\n", rstat)); ++ if (!data && (rstat & SER_FRAMING_ERR_MASK)) { ++ /* Most likely a break, but we get interrupts over and ++ * over again. ++ */ ++ ++ if (!info->break_detected_cnt) { ++ DEBUG_LOG(info->line, "#BRK start\n", 0); ++ } ++ if (rstat & SER_RXD_MASK) { ++ /* The RX pin is high now, so the break ++ * must be over, but.... ++ * we can't really know if we will get another ++ * last byte ending the break or not. ++ * And we don't know if the byte (if any) will ++ * have an error or look valid. ++ */ ++ DEBUG_LOG(info->line, "# BL BRK\n", 0); ++ info->errorcode = ERRCODE_INSERT_BREAK; ++ } ++ info->break_detected_cnt++; ++ } else { ++ /* The error does not look like a break, but could be ++ * the end of one ++ */ ++ if (info->break_detected_cnt) { ++ DEBUG_LOG(info->line, "EBRK %i\n", info->break_detected_cnt); ++ info->errorcode = ERRCODE_INSERT_BREAK; ++ } else { ++ if (info->errorcode == ERRCODE_INSERT_BREAK) { ++ info->icount.brk++; ++ add_char_and_flag(info, '\0', TTY_BREAK); ++ } ++ ++ if (rstat & SER_PAR_ERR_MASK) { ++ info->icount.parity++; ++ add_char_and_flag(info, data, TTY_PARITY); ++ } else if (rstat & SER_OVERRUN_MASK) { ++ info->icount.overrun++; ++ add_char_and_flag(info, data, TTY_OVERRUN); ++ } else if (rstat & SER_FRAMING_ERR_MASK) { ++ info->icount.frame++; ++ add_char_and_flag(info, data, TTY_FRAME); ++ } ++ ++ info->errorcode = 0; ++ } ++ info->break_detected_cnt = 0; ++ DEBUG_LOG(info->line, "#iERR s d %04X\n", ++ ((rstat & SER_ERROR_MASK) << 8) | data); ++ } ++ PROCSTAT(ser_stat[info->line].early_errors_cnt++); ++ } else { /* It was a valid byte, now let the DMA do the rest */ ++ unsigned long curr_time_u = GET_JIFFIES_USEC(); ++ unsigned long curr_time = jiffies; ++ ++ if (info->break_detected_cnt) { ++ /* Detect if this character is a new valid char or the ++ * last char in a break sequence: If LSBits are 0 and ++ * MSBits are high AND the time is close to the ++ * previous interrupt we should discard it. ++ */ ++ long elapsed_usec = ++ (curr_time - info->last_rx_active) * (1000000/HZ) + ++ curr_time_u - info->last_rx_active_usec; ++ if (elapsed_usec < 2*info->char_time_usec) { ++ DEBUG_LOG(info->line, "FBRK %i\n", info->line); ++ /* Report as BREAK (error) and let ++ * receive_chars_dma() handle it ++ */ ++ info->errorcode = ERRCODE_SET_BREAK; ++ } else { ++ DEBUG_LOG(info->line, "Not end of BRK (V)%i\n", info->line); ++ } ++ DEBUG_LOG(info->line, "num brk %i\n", info->break_detected_cnt); ++ } ++ ++#ifdef SERIAL_DEBUG_INTR ++ printk("** OK, disabling ser_interrupts\n"); ++#endif ++ e100_disable_serial_data_irq(info); ++ DINTR2(DEBUG_LOG(info->line, "ser_rx OK %d\n", info->line)); ++ info->break_detected_cnt = 0; ++ ++ PROCSTAT(ser_stat[info->line].ser_ints_ok_cnt++); ++ } ++ /* Restarting the DMA never hurts */ ++ *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart); ++ START_FLUSH_FAST_TIMER(info, "ser_int"); ++ return info; ++} /* handle_ser_rx_interrupt */ ++ ++static void handle_ser_tx_interrupt(struct e100_serial *info) ++{ ++ unsigned long flags; ++ ++ if (info->x_char) { ++ unsigned char rstat; ++ DFLOW(DEBUG_LOG(info->line, "tx_int: xchar 0x%02X\n", info->x_char)); ++ local_irq_save(flags); ++ rstat = info->ioport[REG_STATUS]; ++ DFLOW(DEBUG_LOG(info->line, "stat %x\n", rstat)); ++ ++ info->ioport[REG_TR_DATA] = info->x_char; ++ info->icount.tx++; ++ info->x_char = 0; ++ /* We must enable since it is disabled in ser_interrupt */ ++ e100_enable_serial_tx_ready_irq(info); ++ local_irq_restore(flags); ++ return; ++ } ++ if (info->uses_dma_out) { ++ unsigned char rstat; ++ int i; ++ /* We only use normal tx interrupt when sending x_char */ ++ DFLOW(DEBUG_LOG(info->line, "tx_int: xchar sent\n", 0)); ++ local_irq_save(flags); ++ rstat = info->ioport[REG_STATUS]; ++ DFLOW(DEBUG_LOG(info->line, "stat %x\n", rstat)); ++ e100_disable_serial_tx_ready_irq(info); ++ if (info->port.tty->stopped) ++ rs_stop(info->port.tty); ++ /* Enable the DMA channel and tell it to continue */ ++ e100_enable_txdma_channel(info); ++ /* Wait 12 cycles before doing the DMA command */ ++ for(i = 6; i > 0; i--) ++ nop(); ++ ++ *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, continue); ++ local_irq_restore(flags); ++ return; ++ } ++ /* Normal char-by-char interrupt */ ++ if (info->xmit.head == info->xmit.tail ++ || info->port.tty->stopped ++ || info->port.tty->hw_stopped) { ++ DFLOW(DEBUG_LOG(info->line, "tx_int: stopped %i\n", ++ info->port.tty->stopped)); ++ e100_disable_serial_tx_ready_irq(info); ++ info->tr_running = 0; ++ return; ++ } ++ DINTR2(DEBUG_LOG(info->line, "tx_int %c\n", info->xmit.buf[info->xmit.tail])); ++ /* Send a byte, rs485 timing is critical so turn of ints */ ++ local_irq_save(flags); ++ info->ioport[REG_TR_DATA] = info->xmit.buf[info->xmit.tail]; ++ info->xmit.tail = (info->xmit.tail + 1) & (SERIAL_XMIT_SIZE-1); ++ info->icount.tx++; ++ if (info->xmit.head == info->xmit.tail) { ++#if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER) ++ if (info->rs485.flags & SER_RS485_ENABLED) { ++ /* Set a short timer to toggle RTS */ ++ start_one_shot_timer(&fast_timers_rs485[info->line], ++ rs485_toggle_rts_timer_function, ++ (unsigned long)info, ++ info->char_time_usec*2, ++ "RS-485"); ++ } ++#endif /* RS485 */ ++ info->last_tx_active_usec = GET_JIFFIES_USEC(); ++ info->last_tx_active = jiffies; ++ e100_disable_serial_tx_ready_irq(info); ++ info->tr_running = 0; ++ DFLOW(DEBUG_LOG(info->line, "tx_int: stop2\n", 0)); ++ } else { ++ /* We must enable since it is disabled in ser_interrupt */ ++ e100_enable_serial_tx_ready_irq(info); ++ } ++ local_irq_restore(flags); ++ ++ if (CIRC_CNT(info->xmit.head, ++ info->xmit.tail, ++ SERIAL_XMIT_SIZE) < WAKEUP_CHARS) ++ rs_sched_event(info, RS_EVENT_WRITE_WAKEUP); ++ ++} /* handle_ser_tx_interrupt */ ++ ++/* result of time measurements: ++ * RX duration 54-60 us when doing something, otherwise 6-9 us ++ * ser_int duration: just sending: 8-15 us normally, up to 73 us ++ */ ++static irqreturn_t ++ser_interrupt(int irq, void *dev_id) ++{ ++ static volatile int tx_started = 0; ++ struct e100_serial *info; ++ int i; ++ unsigned long flags; ++ unsigned long irq_mask1_rd; ++ unsigned long data_mask = (1 << (8+2*0)); /* ser0 data_avail */ ++ int handled = 0; ++ static volatile unsigned long reentered_ready_mask = 0; ++ ++ local_irq_save(flags); ++ irq_mask1_rd = *R_IRQ_MASK1_RD; ++ /* First handle all rx interrupts with ints disabled */ ++ info = rs_table; ++ irq_mask1_rd &= e100_ser_int_mask; ++ for (i = 0; i < NR_PORTS; i++) { ++ /* Which line caused the data irq? */ ++ if (irq_mask1_rd & data_mask) { ++ handled = 1; ++ handle_ser_rx_interrupt(info); ++ } ++ info += 1; ++ data_mask <<= 2; ++ } ++ /* Handle tx interrupts with interrupts enabled so we ++ * can take care of new data interrupts while transmitting ++ * We protect the tx part with the tx_started flag. ++ * We disable the tr_ready interrupts we are about to handle and ++ * unblock the serial interrupt so new serial interrupts may come. ++ * ++ * If we get a new interrupt: ++ * - it migth be due to synchronous serial ports. ++ * - serial irq will be blocked by general irq handler. ++ * - async data will be handled above (sync will be ignored). ++ * - tx_started flag will prevent us from trying to send again and ++ * we will exit fast - no need to unblock serial irq. ++ * - Next (sync) serial interrupt handler will be runned with ++ * disabled interrupt due to restore_flags() at end of function, ++ * so sync handler will not be preempted or reentered. ++ */ ++ if (!tx_started) { ++ unsigned long ready_mask; ++ unsigned long ++ tx_started = 1; ++ /* Only the tr_ready interrupts left */ ++ irq_mask1_rd &= (IO_MASK(R_IRQ_MASK1_RD, ser0_ready) | ++ IO_MASK(R_IRQ_MASK1_RD, ser1_ready) | ++ IO_MASK(R_IRQ_MASK1_RD, ser2_ready) | ++ IO_MASK(R_IRQ_MASK1_RD, ser3_ready)); ++ while (irq_mask1_rd) { ++ /* Disable those we are about to handle */ ++ *R_IRQ_MASK1_CLR = irq_mask1_rd; ++ /* Unblock the serial interrupt */ ++ *R_VECT_MASK_SET = IO_STATE(R_VECT_MASK_SET, serial, set); ++ ++ local_irq_enable(); ++ ready_mask = (1 << (8+1+2*0)); /* ser0 tr_ready */ ++ info = rs_table; ++ for (i = 0; i < NR_PORTS; i++) { ++ /* Which line caused the ready irq? */ ++ if (irq_mask1_rd & ready_mask) { ++ handled = 1; ++ handle_ser_tx_interrupt(info); ++ } ++ info += 1; ++ ready_mask <<= 2; ++ } ++ /* handle_ser_tx_interrupt enables tr_ready interrupts */ ++ local_irq_disable(); ++ /* Handle reentered TX interrupt */ ++ irq_mask1_rd = reentered_ready_mask; ++ } ++ local_irq_disable(); ++ tx_started = 0; ++ } else { ++ unsigned long ready_mask; ++ ready_mask = irq_mask1_rd & (IO_MASK(R_IRQ_MASK1_RD, ser0_ready) | ++ IO_MASK(R_IRQ_MASK1_RD, ser1_ready) | ++ IO_MASK(R_IRQ_MASK1_RD, ser2_ready) | ++ IO_MASK(R_IRQ_MASK1_RD, ser3_ready)); ++ if (ready_mask) { ++ reentered_ready_mask |= ready_mask; ++ /* Disable those we are about to handle */ ++ *R_IRQ_MASK1_CLR = ready_mask; ++ DFLOW(DEBUG_LOG(SERIAL_DEBUG_LINE, "ser_int reentered with TX %X\n", ready_mask)); ++ } ++ } ++ ++ local_irq_restore(flags); ++ return IRQ_RETVAL(handled); ++} /* ser_interrupt */ ++#endif ++ ++/* ++ * ------------------------------------------------------------------- ++ * Here ends the serial interrupt routines. ++ * ------------------------------------------------------------------- ++ */ ++ ++/* ++ * This routine is used to handle the "bottom half" processing for the ++ * serial driver, known also the "software interrupt" processing. ++ * This processing is done at the kernel interrupt level, after the ++ * rs_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON. This ++ * is where time-consuming activities which can not be done in the ++ * interrupt driver proper are done; the interrupt driver schedules ++ * them using rs_sched_event(), and they get done here. ++ */ ++static void ++do_softint(struct work_struct *work) ++{ ++ struct e100_serial *info; ++ struct tty_struct *tty; ++ ++ info = container_of(work, struct e100_serial, work); ++ ++ tty = info->port.tty; ++ if (!tty) ++ return; ++ ++ if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) ++ tty_wakeup(tty); ++} ++ ++static int ++startup(struct e100_serial * info) ++{ ++ unsigned long flags; ++ unsigned long xmit_page; ++ int i; ++ ++ xmit_page = get_zeroed_page(GFP_KERNEL); ++ if (!xmit_page) ++ return -ENOMEM; ++ ++ local_irq_save(flags); ++ ++ /* if it was already initialized, skip this */ ++ ++ if (info->flags & ASYNC_INITIALIZED) { ++ local_irq_restore(flags); ++ free_page(xmit_page); ++ return 0; ++ } ++ ++ if (info->xmit.buf) ++ free_page(xmit_page); ++ else ++ info->xmit.buf = (unsigned char *) xmit_page; ++ ++#ifdef SERIAL_DEBUG_OPEN ++ printk("starting up ttyS%d (xmit_buf 0x%p)...\n", info->line, info->xmit.buf); ++#endif ++ ++#ifdef CONFIG_SVINTO_SIM ++ /* Bits and pieces collected from below. Better to have them ++ in one ifdef:ed clause than to mix in a lot of ifdefs, ++ right? */ ++ if (info->port.tty) ++ clear_bit(TTY_IO_ERROR, &info->port.tty->flags); ++ ++ info->xmit.head = info->xmit.tail = 0; ++ info->first_recv_buffer = info->last_recv_buffer = NULL; ++ info->recv_cnt = info->max_recv_cnt = 0; ++ ++ for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) ++ info->rec_descr[i].buf = NULL; ++ ++ /* No real action in the simulator, but may set info important ++ to ioctl. */ ++ change_speed(info); ++#else ++ ++ /* ++ * Clear the FIFO buffers and disable them ++ * (they will be reenabled in change_speed()) ++ */ ++ ++ /* ++ * Reset the DMA channels and make sure their interrupts are cleared ++ */ ++ ++ if (info->dma_in_enabled) { ++ info->uses_dma_in = 1; ++ e100_enable_rxdma_channel(info); ++ ++ *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset); ++ ++ /* Wait until reset cycle is complete */ ++ while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->icmdadr) == ++ IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, reset)); ++ ++ /* Make sure the irqs are cleared */ ++ *info->iclrintradr = ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) | ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do); ++ } else { ++ e100_disable_rxdma_channel(info); ++ } ++ ++ if (info->dma_out_enabled) { ++ info->uses_dma_out = 1; ++ e100_enable_txdma_channel(info); ++ *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset); ++ ++ while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->ocmdadr) == ++ IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, reset)); ++ ++ /* Make sure the irqs are cleared */ ++ *info->oclrintradr = ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) | ++ IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do); ++ } else { ++ e100_disable_txdma_channel(info); ++ } ++ ++ if (info->port.tty) ++ clear_bit(TTY_IO_ERROR, &info->port.tty->flags); ++ ++ info->xmit.head = info->xmit.tail = 0; ++ info->first_recv_buffer = info->last_recv_buffer = NULL; ++ info->recv_cnt = info->max_recv_cnt = 0; ++ ++ for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) ++ info->rec_descr[i].buf = 0; ++ ++ /* ++ * and set the speed and other flags of the serial port ++ * this will start the rx/tx as well ++ */ ++#ifdef SERIAL_HANDLE_EARLY_ERRORS ++ e100_enable_serial_data_irq(info); ++#endif ++ change_speed(info); ++ ++ /* dummy read to reset any serial errors */ ++ ++ (void)info->ioport[REG_DATA]; ++ ++ /* enable the interrupts */ ++ if (info->uses_dma_out) ++ e100_enable_txdma_irq(info); ++ ++ e100_enable_rx_irq(info); ++ ++ info->tr_running = 0; /* to be sure we don't lock up the transmitter */ ++ ++ /* setup the dma input descriptor and start dma */ ++ ++ start_receive(info); ++ ++ /* for safety, make sure the descriptors last result is 0 bytes written */ ++ ++ info->tr_descr.sw_len = 0; ++ info->tr_descr.hw_len = 0; ++ info->tr_descr.status = 0; ++ ++ /* enable RTS/DTR last */ ++ ++ e100_rts(info, 1); ++ e100_dtr(info, 1); ++ ++#endif /* CONFIG_SVINTO_SIM */ ++ ++ info->flags |= ASYNC_INITIALIZED; ++ ++ local_irq_restore(flags); ++ return 0; ++} ++ ++/* ++ * This routine will shutdown a serial port; interrupts are disabled, and ++ * DTR is dropped if the hangup on close termio flag is on. ++ */ ++static void ++shutdown(struct e100_serial * info) ++{ ++ unsigned long flags; ++ struct etrax_dma_descr *descr = info->rec_descr; ++ struct etrax_recv_buffer *buffer; ++ int i; ++ ++#ifndef CONFIG_SVINTO_SIM ++ /* shut down the transmitter and receiver */ ++ DFLOW(DEBUG_LOG(info->line, "shutdown %i\n", info->line)); ++ e100_disable_rx(info); ++ info->ioport[REG_TR_CTRL] = (info->tx_ctrl &= ~0x40); ++ ++ /* disable interrupts, reset dma channels */ ++ if (info->uses_dma_in) { ++ e100_disable_rxdma_irq(info); ++ *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset); ++ info->uses_dma_in = 0; ++ } else { ++ e100_disable_serial_data_irq(info); ++ } ++ ++ if (info->uses_dma_out) { ++ e100_disable_txdma_irq(info); ++ info->tr_running = 0; ++ *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset); ++ info->uses_dma_out = 0; ++ } else { ++ e100_disable_serial_tx_ready_irq(info); ++ info->tr_running = 0; ++ } ++ ++#endif /* CONFIG_SVINTO_SIM */ ++ ++ if (!(info->flags & ASYNC_INITIALIZED)) ++ return; ++ ++#ifdef SERIAL_DEBUG_OPEN ++ printk("Shutting down serial port %d (irq %d)....\n", info->line, ++ info->irq); ++#endif ++ ++ local_irq_save(flags); ++ ++ if (info->xmit.buf) { ++ free_page((unsigned long)info->xmit.buf); ++ info->xmit.buf = NULL; ++ } ++ ++ for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) ++ if (descr[i].buf) { ++ buffer = phys_to_virt(descr[i].buf) - sizeof *buffer; ++ kfree(buffer); ++ descr[i].buf = 0; ++ } ++ ++ if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) { ++ /* hang up DTR and RTS if HUPCL is enabled */ ++ e100_dtr(info, 0); ++ e100_rts(info, 0); /* could check CRTSCTS before doing this */ ++ } ++ ++ if (info->port.tty) ++ set_bit(TTY_IO_ERROR, &info->port.tty->flags); ++ ++ info->flags &= ~ASYNC_INITIALIZED; ++ local_irq_restore(flags); ++} ++ ++ ++/* change baud rate and other assorted parameters */ ++ ++static void ++change_speed(struct e100_serial *info) ++{ ++ unsigned int cflag; ++ unsigned long xoff; ++ unsigned long flags; ++ /* first some safety checks */ ++ ++ if (!info->port.tty || !info->port.tty->termios) ++ return; ++ if (!info->ioport) ++ return; ++ ++ cflag = info->port.tty->termios->c_cflag; ++ ++ /* possibly, the tx/rx should be disabled first to do this safely */ ++ ++ /* change baud-rate and write it to the hardware */ ++ if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) { ++ /* Special baudrate */ ++ u32 mask = 0xFF << (info->line*8); /* Each port has 8 bits */ ++ unsigned long alt_source = ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, normal) | ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, normal); ++ /* R_ALT_SER_BAUDRATE selects the source */ ++ DBAUD(printk("Custom baudrate: baud_base/divisor %lu/%i\n", ++ (unsigned long)info->baud_base, info->custom_divisor)); ++ if (info->baud_base == SERIAL_PRESCALE_BASE) { ++ /* 0, 2-65535 (0=65536) */ ++ u16 divisor = info->custom_divisor; ++ /* R_SERIAL_PRESCALE (upper 16 bits of R_CLOCK_PRESCALE) */ ++ /* baudrate is 3.125MHz/custom_divisor */ ++ alt_source = ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, prescale) | ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, prescale); ++ alt_source = 0x11; ++ DBAUD(printk("Writing SERIAL_PRESCALE: divisor %i\n", divisor)); ++ *R_SERIAL_PRESCALE = divisor; ++ info->baud = SERIAL_PRESCALE_BASE/divisor; ++ } ++#ifdef CONFIG_ETRAX_EXTERN_PB6CLK_ENABLED ++ else if ((info->baud_base==CONFIG_ETRAX_EXTERN_PB6CLK_FREQ/8 && ++ info->custom_divisor == 1) || ++ (info->baud_base==CONFIG_ETRAX_EXTERN_PB6CLK_FREQ && ++ info->custom_divisor == 8)) { ++ /* ext_clk selected */ ++ alt_source = ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, extern) | ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, extern); ++ DBAUD(printk("using external baudrate: %lu\n", CONFIG_ETRAX_EXTERN_PB6CLK_FREQ/8)); ++ info->baud = CONFIG_ETRAX_EXTERN_PB6CLK_FREQ/8; ++ } ++#endif ++ else ++ { ++ /* Bad baudbase, we don't support using timer0 ++ * for baudrate. ++ */ ++ printk(KERN_WARNING "Bad baud_base/custom_divisor: %lu/%i\n", ++ (unsigned long)info->baud_base, info->custom_divisor); ++ } ++ r_alt_ser_baudrate_shadow &= ~mask; ++ r_alt_ser_baudrate_shadow |= (alt_source << (info->line*8)); ++ *R_ALT_SER_BAUDRATE = r_alt_ser_baudrate_shadow; ++ } else { ++ /* Normal baudrate */ ++ /* Make sure we use normal baudrate */ ++ u32 mask = 0xFF << (info->line*8); /* Each port has 8 bits */ ++ unsigned long alt_source = ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, normal) | ++ IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, normal); ++ r_alt_ser_baudrate_shadow &= ~mask; ++ r_alt_ser_baudrate_shadow |= (alt_source << (info->line*8)); ++#ifndef CONFIG_SVINTO_SIM ++ *R_ALT_SER_BAUDRATE = r_alt_ser_baudrate_shadow; ++#endif /* CONFIG_SVINTO_SIM */ ++ ++ info->baud = cflag_to_baud(cflag); ++#ifndef CONFIG_SVINTO_SIM ++ info->ioport[REG_BAUD] = cflag_to_etrax_baud(cflag); ++#endif /* CONFIG_SVINTO_SIM */ ++ } ++ ++#ifndef CONFIG_SVINTO_SIM ++ /* start with default settings and then fill in changes */ ++ local_irq_save(flags); ++ /* 8 bit, no/even parity */ ++ info->rx_ctrl &= ~(IO_MASK(R_SERIAL0_REC_CTRL, rec_bitnr) | ++ IO_MASK(R_SERIAL0_REC_CTRL, rec_par_en) | ++ IO_MASK(R_SERIAL0_REC_CTRL, rec_par)); ++ ++ /* 8 bit, no/even parity, 1 stop bit, no cts */ ++ info->tx_ctrl &= ~(IO_MASK(R_SERIAL0_TR_CTRL, tr_bitnr) | ++ IO_MASK(R_SERIAL0_TR_CTRL, tr_par_en) | ++ IO_MASK(R_SERIAL0_TR_CTRL, tr_par) | ++ IO_MASK(R_SERIAL0_TR_CTRL, stop_bits) | ++ IO_MASK(R_SERIAL0_TR_CTRL, auto_cts)); ++ ++ if ((cflag & CSIZE) == CS7) { ++ /* set 7 bit mode */ ++ info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_bitnr, tr_7bit); ++ info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_bitnr, rec_7bit); ++ } ++ ++ if (cflag & CSTOPB) { ++ /* set 2 stop bit mode */ ++ info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, stop_bits, two_bits); ++ } ++ ++ if (cflag & PARENB) { ++ /* enable parity */ ++ info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_par_en, enable); ++ info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_par_en, enable); ++ } ++ ++ if (cflag & CMSPAR) { ++ /* enable stick parity, PARODD mean Mark which matches ETRAX */ ++ info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_stick_par, stick); ++ info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_stick_par, stick); ++ } ++ if (cflag & PARODD) { ++ /* set odd parity (or Mark if CMSPAR) */ ++ info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_par, odd); ++ info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_par, odd); ++ } ++ ++ if (cflag & CRTSCTS) { ++ /* enable automatic CTS handling */ ++ DFLOW(DEBUG_LOG(info->line, "FLOW auto_cts enabled\n", 0)); ++ info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, auto_cts, active); ++ } ++ ++ /* make sure the tx and rx are enabled */ ++ ++ info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_enable, enable); ++ info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_enable, enable); ++ ++ /* actually write the control regs to the hardware */ ++ ++ info->ioport[REG_TR_CTRL] = info->tx_ctrl; ++ info->ioport[REG_REC_CTRL] = info->rx_ctrl; ++ xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->port.tty)); ++ xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, enable); ++ if (info->port.tty->termios->c_iflag & IXON ) { ++ DFLOW(DEBUG_LOG(info->line, "FLOW XOFF enabled 0x%02X\n", ++ STOP_CHAR(info->port.tty))); ++ xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable); ++ } ++ ++ *((unsigned long *)&info->ioport[REG_XOFF]) = xoff; ++ local_irq_restore(flags); ++#endif /* !CONFIG_SVINTO_SIM */ ++ ++ update_char_time(info); ++ ++} /* change_speed */ ++ ++/* start transmitting chars NOW */ ++ ++static void ++rs_flush_chars(struct tty_struct *tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned long flags; ++ ++ if (info->tr_running || ++ info->xmit.head == info->xmit.tail || ++ tty->stopped || ++ tty->hw_stopped || ++ !info->xmit.buf) ++ return; ++ ++#ifdef SERIAL_DEBUG_FLOW ++ printk("rs_flush_chars\n"); ++#endif ++ ++ /* this protection might not exactly be necessary here */ ++ ++ local_irq_save(flags); ++ start_transmit(info); ++ local_irq_restore(flags); ++} ++ ++static int rs_raw_write(struct tty_struct *tty, ++ const unsigned char *buf, int count) ++{ ++ int c, ret = 0; ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned long flags; ++ ++ /* first some sanity checks */ ++ ++ if (!tty || !info->xmit.buf || !tmp_buf) ++ return 0; ++ ++#ifdef SERIAL_DEBUG_DATA ++ if (info->line == SERIAL_DEBUG_LINE) ++ printk("rs_raw_write (%d), status %d\n", ++ count, info->ioport[REG_STATUS]); ++#endif ++ ++#ifdef CONFIG_SVINTO_SIM ++ /* Really simple. The output is here and now. */ ++ SIMCOUT(buf, count); ++ return count; ++#endif ++ local_save_flags(flags); ++ DFLOW(DEBUG_LOG(info->line, "write count %i ", count)); ++ DFLOW(DEBUG_LOG(info->line, "ldisc %i\n", tty->ldisc.chars_in_buffer(tty))); ++ ++ ++ /* The local_irq_disable/restore_flags pairs below are needed ++ * because the DMA interrupt handler moves the info->xmit values. ++ * the memcpy needs to be in the critical region unfortunately, ++ * because we need to read xmit values, memcpy, write xmit values ++ * in one atomic operation... this could perhaps be avoided by ++ * more clever design. ++ */ ++ local_irq_disable(); ++ while (count) { ++ c = CIRC_SPACE_TO_END(info->xmit.head, ++ info->xmit.tail, ++ SERIAL_XMIT_SIZE); ++ ++ if (count < c) ++ c = count; ++ if (c <= 0) ++ break; ++ ++ memcpy(info->xmit.buf + info->xmit.head, buf, c); ++ info->xmit.head = (info->xmit.head + c) & ++ (SERIAL_XMIT_SIZE-1); ++ buf += c; ++ count -= c; ++ ret += c; ++ } ++ local_irq_restore(flags); ++ ++ /* enable transmitter if not running, unless the tty is stopped ++ * this does not need IRQ protection since if tr_running == 0 ++ * the IRQ's are not running anyway for this port. ++ */ ++ DFLOW(DEBUG_LOG(info->line, "write ret %i\n", ret)); ++ ++ if (info->xmit.head != info->xmit.tail && ++ !tty->stopped && ++ !tty->hw_stopped && ++ !info->tr_running) { ++ start_transmit(info); ++ } ++ ++ return ret; ++} /* raw_raw_write() */ ++ ++static int ++rs_write(struct tty_struct *tty, ++ const unsigned char *buf, int count) ++{ ++#if defined(CONFIG_ETRAX_RS485) ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ ++ if (info->rs485.flags & SER_RS485_ENABLED) ++ { ++ /* If we are in RS-485 mode, we need to toggle RTS and disable ++ * the receiver before initiating a DMA transfer ++ */ ++#ifdef CONFIG_ETRAX_FAST_TIMER ++ /* Abort any started timer */ ++ fast_timers_rs485[info->line].function = NULL; ++ del_fast_timer(&fast_timers_rs485[info->line]); ++#endif ++ e100_rts(info, (info->rs485.flags & SER_RS485_RTS_ON_SEND)); ++#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER) ++ e100_disable_rx(info); ++ e100_enable_rx_irq(info); ++#endif ++ ++ if (info->rs485.delay_rts_before_send > 0) ++ msleep(info->rs485.delay_rts_before_send); ++ } ++#endif /* CONFIG_ETRAX_RS485 */ ++ ++ count = rs_raw_write(tty, buf, count); ++ ++#if defined(CONFIG_ETRAX_RS485) ++ if (info->rs485.flags & SER_RS485_ENABLED) ++ { ++ unsigned int val; ++ /* If we are in RS-485 mode the following has to be done: ++ * wait until DMA is ready ++ * wait on transmit shift register ++ * toggle RTS ++ * enable the receiver ++ */ ++ ++ /* Sleep until all sent */ ++ tty_wait_until_sent(tty, 0); ++#ifdef CONFIG_ETRAX_FAST_TIMER ++ /* Now sleep a little more so that shift register is empty */ ++ schedule_usleep(info->char_time_usec * 2); ++#endif ++ /* wait on transmit shift register */ ++ do{ ++ get_lsr_info(info, &val); ++ }while (!(val & TIOCSER_TEMT)); ++ ++ e100_rts(info, (info->rs485.flags & SER_RS485_RTS_AFTER_SEND)); ++ ++#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER) ++ e100_enable_rx(info); ++ e100_enable_rxdma_irq(info); ++#endif ++ } ++#endif /* CONFIG_ETRAX_RS485 */ ++ ++ return count; ++} /* rs_write */ ++ ++ ++/* how much space is available in the xmit buffer? */ ++ ++static int ++rs_write_room(struct tty_struct *tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ ++ return CIRC_SPACE(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); ++} ++ ++/* How many chars are in the xmit buffer? ++ * This does not include any chars in the transmitter FIFO. ++ * Use wait_until_sent for waiting for FIFO drain. ++ */ ++ ++static int ++rs_chars_in_buffer(struct tty_struct *tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ ++ return CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); ++} ++ ++/* discard everything in the xmit buffer */ ++ ++static void ++rs_flush_buffer(struct tty_struct *tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ info->xmit.head = info->xmit.tail = 0; ++ local_irq_restore(flags); ++ ++ tty_wakeup(tty); ++} ++ ++/* ++ * This function is used to send a high-priority XON/XOFF character to ++ * the device ++ * ++ * Since we use DMA we don't check for info->x_char in transmit_chars_dma(), ++ * but we do it in handle_ser_tx_interrupt(). ++ * We disable DMA channel and enable tx ready interrupt and write the ++ * character when possible. ++ */ ++static void rs_send_xchar(struct tty_struct *tty, char ch) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned long flags; ++ local_irq_save(flags); ++ if (info->uses_dma_out) { ++ /* Put the DMA on hold and disable the channel */ ++ *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, hold); ++ while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->ocmdadr) != ++ IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, hold)); ++ e100_disable_txdma_channel(info); ++ } ++ ++ /* Must make sure transmitter is not stopped before we can transmit */ ++ if (tty->stopped) ++ rs_start(tty); ++ ++ /* Enable manual transmit interrupt and send from there */ ++ DFLOW(DEBUG_LOG(info->line, "rs_send_xchar 0x%02X\n", ch)); ++ info->x_char = ch; ++ e100_enable_serial_tx_ready_irq(info); ++ local_irq_restore(flags); ++} ++ ++/* ++ * ------------------------------------------------------------ ++ * rs_throttle() ++ * ++ * This routine is called by the upper-layer tty layer to signal that ++ * incoming characters should be throttled. ++ * ------------------------------------------------------------ ++ */ ++static void ++rs_throttle(struct tty_struct * tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++#ifdef SERIAL_DEBUG_THROTTLE ++ char buf[64]; ++ ++ printk("throttle %s: %lu....\n", tty_name(tty, buf), ++ (unsigned long)tty->ldisc.chars_in_buffer(tty)); ++#endif ++ DFLOW(DEBUG_LOG(info->line,"rs_throttle %lu\n", tty->ldisc.chars_in_buffer(tty))); ++ ++ /* Do RTS before XOFF since XOFF might take some time */ ++ if (tty->termios->c_cflag & CRTSCTS) { ++ /* Turn off RTS line */ ++ e100_rts(info, 0); ++ } ++ if (I_IXOFF(tty)) ++ rs_send_xchar(tty, STOP_CHAR(tty)); ++ ++} ++ ++static void ++rs_unthrottle(struct tty_struct * tty) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++#ifdef SERIAL_DEBUG_THROTTLE ++ char buf[64]; ++ ++ printk("unthrottle %s: %lu....\n", tty_name(tty, buf), ++ (unsigned long)tty->ldisc.chars_in_buffer(tty)); ++#endif ++ DFLOW(DEBUG_LOG(info->line,"rs_unthrottle ldisc %d\n", tty->ldisc.chars_in_buffer(tty))); ++ DFLOW(DEBUG_LOG(info->line,"rs_unthrottle flip.count: %i\n", tty->flip.count)); ++ /* Do RTS before XOFF since XOFF might take some time */ ++ if (tty->termios->c_cflag & CRTSCTS) { ++ /* Assert RTS line */ ++ e100_rts(info, 1); ++ } ++ ++ if (I_IXOFF(tty)) { ++ if (info->x_char) ++ info->x_char = 0; ++ else ++ rs_send_xchar(tty, START_CHAR(tty)); ++ } ++ ++} ++ ++/* ++ * ------------------------------------------------------------ ++ * rs_ioctl() and friends ++ * ------------------------------------------------------------ ++ */ ++ ++static int ++get_serial_info(struct e100_serial * info, ++ struct serial_struct * retinfo) ++{ ++ struct serial_struct tmp; ++ ++ /* this is all probably wrong, there are a lot of fields ++ * here that we don't have in e100_serial and maybe we ++ * should set them to something else than 0. ++ */ ++ ++ if (!retinfo) ++ return -EFAULT; ++ memset(&tmp, 0, sizeof(tmp)); ++ tmp.type = info->type; ++ tmp.line = info->line; ++ tmp.port = (int)info->ioport; ++ tmp.irq = info->irq; ++ tmp.flags = info->flags; ++ tmp.baud_base = info->baud_base; ++ tmp.close_delay = info->close_delay; ++ tmp.closing_wait = info->closing_wait; ++ tmp.custom_divisor = info->custom_divisor; ++ if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) ++ return -EFAULT; ++ return 0; ++} ++ ++static int ++set_serial_info(struct e100_serial *info, ++ struct serial_struct *new_info) ++{ ++ struct serial_struct new_serial; ++ struct e100_serial old_info; ++ int retval = 0; ++ ++ if (copy_from_user(&new_serial, new_info, sizeof(new_serial))) ++ return -EFAULT; ++ ++ old_info = *info; ++ ++ if (!capable(CAP_SYS_ADMIN)) { ++ if ((new_serial.type != info->type) || ++ (new_serial.close_delay != info->close_delay) || ++ ((new_serial.flags & ~ASYNC_USR_MASK) != ++ (info->flags & ~ASYNC_USR_MASK))) ++ return -EPERM; ++ info->flags = ((info->flags & ~ASYNC_USR_MASK) | ++ (new_serial.flags & ASYNC_USR_MASK)); ++ goto check_and_exit; ++ } ++ ++ if (info->count > 1) ++ return -EBUSY; ++ ++ /* ++ * OK, past this point, all the error checking has been done. ++ * At this point, we start making changes..... ++ */ ++ ++ info->baud_base = new_serial.baud_base; ++ info->flags = ((info->flags & ~ASYNC_FLAGS) | ++ (new_serial.flags & ASYNC_FLAGS)); ++ info->custom_divisor = new_serial.custom_divisor; ++ info->type = new_serial.type; ++ info->close_delay = new_serial.close_delay; ++ info->closing_wait = new_serial.closing_wait; ++ info->port.tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0; ++ ++ check_and_exit: ++ if (info->flags & ASYNC_INITIALIZED) { ++ change_speed(info); ++ } else ++ retval = startup(info); ++ return retval; ++} ++ ++/* ++ * get_lsr_info - get line status register info ++ * ++ * Purpose: Let user call ioctl() to get info when the UART physically ++ * is emptied. On bus types like RS485, the transmitter must ++ * release the bus after transmitting. This must be done when ++ * the transmit shift register is empty, not be done when the ++ * transmit holding register is empty. This functionality ++ * allows an RS485 driver to be written in user space. ++ */ ++static int ++get_lsr_info(struct e100_serial * info, unsigned int *value) ++{ ++ unsigned int result = TIOCSER_TEMT; ++#ifndef CONFIG_SVINTO_SIM ++ unsigned long curr_time = jiffies; ++ unsigned long curr_time_usec = GET_JIFFIES_USEC(); ++ unsigned long elapsed_usec = ++ (curr_time - info->last_tx_active) * 1000000/HZ + ++ curr_time_usec - info->last_tx_active_usec; ++ ++ if (info->xmit.head != info->xmit.tail || ++ elapsed_usec < 2*info->char_time_usec) { ++ result = 0; ++ } ++#endif ++ ++ if (copy_to_user(value, &result, sizeof(int))) ++ return -EFAULT; ++ return 0; ++} ++ ++#ifdef SERIAL_DEBUG_IO ++struct state_str ++{ ++ int state; ++ const char *str; ++}; ++ ++const struct state_str control_state_str[] = { ++ {TIOCM_DTR, "DTR" }, ++ {TIOCM_RTS, "RTS"}, ++ {TIOCM_ST, "ST?" }, ++ {TIOCM_SR, "SR?" }, ++ {TIOCM_CTS, "CTS" }, ++ {TIOCM_CD, "CD" }, ++ {TIOCM_RI, "RI" }, ++ {TIOCM_DSR, "DSR" }, ++ {0, NULL } ++}; ++ ++char *get_control_state_str(int MLines, char *s) ++{ ++ int i = 0; ++ ++ s[0]='\0'; ++ while (control_state_str[i].str != NULL) { ++ if (MLines & control_state_str[i].state) { ++ if (s[0] != '\0') { ++ strcat(s, ", "); ++ } ++ strcat(s, control_state_str[i].str); ++ } ++ i++; ++ } ++ return s; ++} ++#endif ++ ++static int ++rs_break(struct tty_struct *tty, int break_state) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned long flags; ++ ++ if (!info->ioport) ++ return -EIO; ++ ++ local_irq_save(flags); ++ if (break_state == -1) { ++ /* Go to manual mode and set the txd pin to 0 */ ++ /* Clear bit 7 (txd) and 6 (tr_enable) */ ++ info->tx_ctrl &= 0x3F; ++ } else { ++ /* Set bit 7 (txd) and 6 (tr_enable) */ ++ info->tx_ctrl |= (0x80 | 0x40); ++ } ++ info->ioport[REG_TR_CTRL] = info->tx_ctrl; ++ local_irq_restore(flags); ++ return 0; ++} ++ ++static int ++rs_tiocmset(struct tty_struct *tty, struct file *file, ++ unsigned int set, unsigned int clear) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ ++ if (clear & TIOCM_RTS) ++ e100_rts(info, 0); ++ if (clear & TIOCM_DTR) ++ e100_dtr(info, 0); ++ /* Handle FEMALE behaviour */ ++ if (clear & TIOCM_RI) ++ e100_ri_out(info, 0); ++ if (clear & TIOCM_CD) ++ e100_cd_out(info, 0); ++ ++ if (set & TIOCM_RTS) ++ e100_rts(info, 1); ++ if (set & TIOCM_DTR) ++ e100_dtr(info, 1); ++ /* Handle FEMALE behaviour */ ++ if (set & TIOCM_RI) ++ e100_ri_out(info, 1); ++ if (set & TIOCM_CD) ++ e100_cd_out(info, 1); ++ ++ local_irq_restore(flags); ++ return 0; ++} ++ ++static int ++rs_tiocmget(struct tty_struct *tty, struct file *file) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned int result; ++ unsigned long flags; ++ ++ local_irq_save(flags); ++ ++ result = ++ (!E100_RTS_GET(info) ? TIOCM_RTS : 0) ++ | (!E100_DTR_GET(info) ? TIOCM_DTR : 0) ++ | (!E100_RI_GET(info) ? TIOCM_RNG : 0) ++ | (!E100_DSR_GET(info) ? TIOCM_DSR : 0) ++ | (!E100_CD_GET(info) ? TIOCM_CAR : 0) ++ | (!E100_CTS_GET(info) ? TIOCM_CTS : 0); ++ ++ local_irq_restore(flags); ++ ++#ifdef SERIAL_DEBUG_IO ++ printk(KERN_DEBUG "ser%i: modem state: %i 0x%08X\n", ++ info->line, result, result); ++ { ++ char s[100]; ++ ++ get_control_state_str(result, s); ++ printk(KERN_DEBUG "state: %s\n", s); ++ } ++#endif ++ return result; ++ ++} ++ ++ ++static int ++rs_ioctl(struct tty_struct *tty, struct file * file, ++ unsigned int cmd, unsigned long arg) ++{ ++ struct e100_serial * info = (struct e100_serial *)tty->driver_data; ++ ++ if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && ++ (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD) && ++ (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) { ++ if (tty->flags & (1 << TTY_IO_ERROR)) ++ return -EIO; ++ } ++ ++ switch (cmd) { ++ case TIOCGSERIAL: ++ return get_serial_info(info, ++ (struct serial_struct *) arg); ++ case TIOCSSERIAL: ++ return set_serial_info(info, ++ (struct serial_struct *) arg); ++ case TIOCSERGETLSR: /* Get line status register */ ++ return get_lsr_info(info, (unsigned int *) arg); ++ ++ case TIOCSERGSTRUCT: ++ if (copy_to_user((struct e100_serial *) arg, ++ info, sizeof(struct e100_serial))) ++ return -EFAULT; ++ return 0; ++ ++#if defined(CONFIG_ETRAX_RS485) ++ case TIOCSERSETRS485: ++ { ++ /* In this ioctl we still use the old structure ++ * rs485_control for backward compatibility ++ * (if we use serial_rs485, then old user-level code ++ * wouldn't work anymore...). ++ * The use of this ioctl is deprecated: use TIOCSRS485 ++ * instead.*/ ++ struct rs485_control rs485ctrl; ++ struct serial_rs485 rs485data; ++ printk(KERN_DEBUG "The use of this ioctl is deprecated. Use TIOCSRS485 instead\n"); ++ if (copy_from_user(&rs485ctrl, (struct rs485_control *)arg, ++ sizeof(rs485ctrl))) ++ return -EFAULT; ++ ++ rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send; ++ rs485data.flags = 0; ++ if (rs485ctrl.enabled) ++ rs485data.flags |= SER_RS485_ENABLED; ++ else ++ rs485data.flags &= ~(SER_RS485_ENABLED); ++ ++ if (rs485ctrl.rts_on_send) ++ rs485data.flags |= SER_RS485_RTS_ON_SEND; ++ else ++ rs485data.flags &= ~(SER_RS485_RTS_ON_SEND); ++ ++ if (rs485ctrl.rts_after_sent) ++ rs485data.flags |= SER_RS485_RTS_AFTER_SEND; ++ else ++ rs485data.flags &= ~(SER_RS485_RTS_AFTER_SEND); ++ ++ return e100_enable_rs485(tty, &rs485data); ++ } ++ ++ case TIOCSRS485: ++ { ++ /* This is the new version of TIOCSRS485, with new ++ * data structure serial_rs485 */ ++ struct serial_rs485 rs485data; ++ if (copy_from_user(&rs485data, (struct rs485_control *)arg, ++ sizeof(rs485data))) ++ return -EFAULT; ++ ++ return e100_enable_rs485(tty, &rs485data); ++ } ++ ++ ++ case TIOCSERWRRS485: ++ { ++ struct rs485_write rs485wr; ++ if (copy_from_user(&rs485wr, (struct rs485_write *)arg, ++ sizeof(rs485wr))) ++ return -EFAULT; ++ ++ return e100_write_rs485(tty, rs485wr.outc, rs485wr.outc_size); ++ } ++#endif ++ ++ default: ++ return -ENOIOCTLCMD; ++ } ++ return 0; ++} ++ ++static void ++rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) ++{ ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ ++ change_speed(info); ++ ++ /* Handle turning off CRTSCTS */ ++ if ((old_termios->c_cflag & CRTSCTS) && ++ !(tty->termios->c_cflag & CRTSCTS)) { ++ tty->hw_stopped = 0; ++ rs_start(tty); ++ } ++ ++} ++ ++/* ++ * ------------------------------------------------------------ ++ * rs_close() ++ * ++ * This routine is called when the serial port gets closed. First, we ++ * wait for the last remaining data to be sent. Then, we unlink its ++ * S structure from the interrupt chain if necessary, and we free ++ * that IRQ if nothing is left in the chain. ++ * ------------------------------------------------------------ ++ */ ++static void ++rs_close(struct tty_struct *tty, struct file * filp) ++{ ++ struct e100_serial * info = (struct e100_serial *)tty->driver_data; ++ unsigned long flags; ++ ++ if (!info) ++ return; ++ ++ /* interrupts are disabled for this entire function */ ++ ++ local_irq_save(flags); ++ ++ if (tty_hung_up_p(filp)) { ++ local_irq_restore(flags); ++ return; ++ } ++ ++#ifdef SERIAL_DEBUG_OPEN ++ printk("[%d] rs_close ttyS%d, count = %d\n", current->pid, ++ info->line, info->count); ++#endif ++ if ((tty->count == 1) && (info->count != 1)) { ++ /* ++ * Uh, oh. tty->count is 1, which means that the tty ++ * structure will be freed. Info->count should always ++ * be one in these conditions. If it's greater than ++ * one, we've got real problems, since it means the ++ * serial port won't be shutdown. ++ */ ++ printk(KERN_CRIT ++ "rs_close: bad serial port count; tty->count is 1, " ++ "info->count is %d\n", info->count); ++ info->count = 1; ++ } ++ if (--info->count < 0) { ++ printk(KERN_CRIT "rs_close: bad serial port count for ttyS%d: %d\n", ++ info->line, info->count); ++ info->count = 0; ++ } ++ if (info->count) { ++ local_irq_restore(flags); ++ return; ++ } ++ info->flags |= ASYNC_CLOSING; ++ /* ++ * Save the termios structure, since this port may have ++ * separate termios for callout and dialin. ++ */ ++ if (info->flags & ASYNC_NORMAL_ACTIVE) ++ info->normal_termios = *tty->termios; ++ /* ++ * Now we wait for the transmit buffer to clear; and we notify ++ * the line discipline to only process XON/XOFF characters. ++ */ ++ tty->closing = 1; ++ if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE) ++ tty_wait_until_sent(tty, info->closing_wait); ++ /* ++ * At this point we stop accepting input. To do this, we ++ * disable the serial receiver and the DMA receive interrupt. ++ */ ++#ifdef SERIAL_HANDLE_EARLY_ERRORS ++ e100_disable_serial_data_irq(info); ++#endif ++ ++#ifndef CONFIG_SVINTO_SIM ++ e100_disable_rx(info); ++ e100_disable_rx_irq(info); ++ ++ if (info->flags & ASYNC_INITIALIZED) { ++ /* ++ * Before we drop DTR, make sure the UART transmitter ++ * has completely drained; this is especially ++ * important as we have a transmit FIFO! ++ */ ++ rs_wait_until_sent(tty, HZ); ++ } ++#endif ++ ++ shutdown(info); ++ rs_flush_buffer(tty); ++ tty_ldisc_flush(tty); ++ tty->closing = 0; ++ info->event = 0; ++ info->port.tty = NULL; ++ if (info->blocked_open) { ++ if (info->close_delay) ++ schedule_timeout_interruptible(info->close_delay); ++ wake_up_interruptible(&info->open_wait); ++ } ++ info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); ++ wake_up_interruptible(&info->close_wait); ++ local_irq_restore(flags); ++ ++ /* port closed */ ++ ++#if defined(CONFIG_ETRAX_RS485) ++ if (info->rs485.flags & SER_RS485_ENABLED) { ++ info->rs485.flags &= ~(SER_RS485_ENABLED); ++#if defined(CONFIG_ETRAX_RS485_ON_PA) ++ *R_PORT_PA_DATA = port_pa_data_shadow &= ~(1 << rs485_pa_bit); ++#endif ++#if defined(CONFIG_ETRAX_RS485_ON_PORT_G) ++ REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow, ++ rs485_port_g_bit, 0); ++#endif ++#if defined(CONFIG_ETRAX_RS485_LTC1387) ++ REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow, ++ CONFIG_ETRAX_RS485_LTC1387_DXEN_PORT_G_BIT, 0); ++ REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow, ++ CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 0); ++#endif ++ } ++#endif ++ ++ /* ++ * Release any allocated DMA irq's. ++ */ ++ if (info->dma_in_enabled) { ++ free_irq(info->dma_in_irq_nbr, info); ++ cris_free_dma(info->dma_in_nbr, info->dma_in_irq_description); ++ info->uses_dma_in = 0; ++#ifdef SERIAL_DEBUG_OPEN ++ printk(KERN_DEBUG "DMA irq '%s' freed\n", ++ info->dma_in_irq_description); ++#endif ++ } ++ if (info->dma_out_enabled) { ++ free_irq(info->dma_out_irq_nbr, info); ++ cris_free_dma(info->dma_out_nbr, info->dma_out_irq_description); ++ info->uses_dma_out = 0; ++#ifdef SERIAL_DEBUG_OPEN ++ printk(KERN_DEBUG "DMA irq '%s' freed\n", ++ info->dma_out_irq_description); ++#endif ++ } ++} ++ ++/* ++ * rs_wait_until_sent() --- wait until the transmitter is empty ++ */ ++static void rs_wait_until_sent(struct tty_struct *tty, int timeout) ++{ ++ unsigned long orig_jiffies; ++ struct e100_serial *info = (struct e100_serial *)tty->driver_data; ++ unsigned long curr_time = jiffies; ++ unsigned long curr_time_usec = GET_JIFFIES_USEC(); ++ long elapsed_usec = ++ (curr_time - info->last_tx_active) * (1000000/HZ) + ++ curr_time_usec - info->last_tx_active_usec; ++ ++ /* ++ * Check R_DMA_CHx_STATUS bit 0-6=number of available bytes in FIFO ++ * R_DMA_CHx_HWSW bit 31-16=nbr of bytes left in DMA buffer (0=64k) ++ */ ++ lock_kernel(); ++ orig_jiffies = jiffies; ++ while (info->xmit.head != info->xmit.tail || /* More in send queue */ ++ (*info->ostatusadr & 0x007f) || /* more in FIFO */ ++ (elapsed_usec < 2*info->char_time_usec)) { ++ schedule_timeout_interruptible(1); ++ if (signal_pending(current)) ++ break; ++ if (timeout && time_after(jiffies, orig_jiffies + timeout)) ++ break; ++ curr_time = jiffies; ++ curr_time_usec = GET_JIFFIES_USEC(); ++ elapsed_usec = ++ (curr_time - info->last_tx_active) * (1000000/HZ) + ++ curr_time_usec - info->last_tx_active_usec; ++ } ++ set_current_state(TASK_RUNNING); ++ unlock_kernel(); ++} ++ ++/* ++ * rs_hangup() --- called by tty_hangup() when a hangup is signaled. ++ */ ++void ++rs_hangup(struct tty_struct *tty) ++{ ++ struct e100_serial * info = (struct e100_serial *)tty->driver_data; ++ ++ rs_flush_buffer(tty); ++ shutdown(info); ++ info->event = 0; ++ info->count = 0; ++ info->flags &= ~ASYNC_NORMAL_ACTIVE; ++ info->port.tty = NULL; ++ wake_up_interruptible(&info->open_wait); ++} ++ ++/* ++ * ------------------------------------------------------------ ++ * rs_open() and friends ++ * ------------------------------------------------------------ ++ */ ++static int ++block_til_ready(struct tty_struct *tty, struct file * filp, ++ struct e100_serial *info) ++{ ++ DECLARE_WAITQUEUE(wait, current); ++ unsigned long flags; ++ int retval; ++ int do_clocal = 0, extra_count = 0; ++ ++ /* ++ * If the device is in the middle of being closed, then block ++ * until it's done, and then try again. ++ */ ++ if (tty_hung_up_p(filp) || ++ (info->flags & ASYNC_CLOSING)) { ++ wait_event_interruptible(info->close_wait, ++ !(info->flags & ASYNC_CLOSING)); ++#ifdef SERIAL_DO_RESTART ++ if (info->flags & ASYNC_HUP_NOTIFY) ++ return -EAGAIN; ++ else ++ return -ERESTARTSYS; ++#else ++ return -EAGAIN; ++#endif ++ } ++ ++ /* ++ * If non-blocking mode is set, or the port is not enabled, ++ * then make the check up front and then exit. ++ */ ++ if ((filp->f_flags & O_NONBLOCK) || ++ (tty->flags & (1 << TTY_IO_ERROR))) { ++ info->flags |= ASYNC_NORMAL_ACTIVE; ++ return 0; ++ } ++ ++ if (tty->termios->c_cflag & CLOCAL) { ++ do_clocal = 1; ++ } ++ ++ /* ++ * Block waiting for the carrier detect and the line to become ++ * free (i.e., not in use by the callout). While we are in ++ * this loop, info->count is dropped by one, so that ++ * rs_close() knows when to free things. We restore it upon ++ * exit, either normal or abnormal. ++ */ ++ retval = 0; ++ add_wait_queue(&info->open_wait, &wait); ++#ifdef SERIAL_DEBUG_OPEN ++ printk("block_til_ready before block: ttyS%d, count = %d\n", ++ info->line, info->count); ++#endif ++ local_irq_save(flags); ++ if (!tty_hung_up_p(filp)) { ++ extra_count++; ++ info->count--; ++ } ++ local_irq_restore(flags); ++ info->blocked_open++; ++ while (1) { ++ local_irq_save(flags); ++ /* assert RTS and DTR */ ++ e100_rts(info, 1); ++ e100_dtr(info, 1); ++ local_irq_restore(flags); ++ set_current_state(TASK_INTERRUPTIBLE); ++ if (tty_hung_up_p(filp) || ++ !(info->flags & ASYNC_INITIALIZED)) { ++#ifdef SERIAL_DO_RESTART ++ if (info->flags & ASYNC_HUP_NOTIFY) ++ retval = -EAGAIN; ++ else ++ retval = -ERESTARTSYS; ++#else ++ retval = -EAGAIN; ++#endif ++ break; ++ } ++ if (!(info->flags & ASYNC_CLOSING) && do_clocal) ++ /* && (do_clocal || DCD_IS_ASSERTED) */ ++ break; ++ if (signal_pending(current)) { ++ retval = -ERESTARTSYS; ++ break; ++ } ++#ifdef SERIAL_DEBUG_OPEN ++ printk("block_til_ready blocking: ttyS%d, count = %d\n", ++ info->line, info->count); ++#endif ++ schedule(); ++ } ++ set_current_state(TASK_RUNNING); ++ remove_wait_queue(&info->open_wait, &wait); ++ if (extra_count) ++ info->count++; ++ info->blocked_open--; ++#ifdef SERIAL_DEBUG_OPEN ++ printk("block_til_ready after blocking: ttyS%d, count = %d\n", ++ info->line, info->count); ++#endif ++ if (retval) ++ return retval; ++ info->flags |= ASYNC_NORMAL_ACTIVE; ++ return 0; ++} ++ ++static void ++deinit_port(struct e100_serial *info) ++{ ++ if (info->dma_out_enabled) { ++ cris_free_dma(info->dma_out_nbr, info->dma_out_irq_description); ++ free_irq(info->dma_out_irq_nbr, info); ++ } ++ if (info->dma_in_enabled) { ++ cris_free_dma(info->dma_in_nbr, info->dma_in_irq_description); ++ free_irq(info->dma_in_irq_nbr, info); ++ } ++} ++ ++/* ++ * This routine is called whenever a serial port is opened. ++ * It performs the serial-specific initialization for the tty structure. ++ */ ++static int ++rs_open(struct tty_struct *tty, struct file * filp) ++{ ++ struct e100_serial *info; ++ int retval, line; ++ unsigned long page; ++ int allocated_resources = 0; ++ ++ /* find which port we want to open */ ++ line = tty->index; ++ ++ if (line < 0 || line >= NR_PORTS) ++ return -ENODEV; ++ ++ /* find the corresponding e100_serial struct in the table */ ++ info = rs_table + line; ++ ++ /* don't allow the opening of ports that are not enabled in the HW config */ ++ if (!info->enabled) ++ return -ENODEV; ++ ++#ifdef SERIAL_DEBUG_OPEN ++ printk("[%d] rs_open %s, count = %d\n", current->pid, tty->name, ++ info->count); ++#endif ++ ++ info->count++; ++ tty->driver_data = info; ++ info->port.tty = tty; ++ ++ info->port.tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0; ++ ++ if (!tmp_buf) { ++ page = get_zeroed_page(GFP_KERNEL); ++ if (!page) { ++ return -ENOMEM; ++ } ++ if (tmp_buf) ++ free_page(page); ++ else ++ tmp_buf = (unsigned char *) page; ++ } ++ ++ /* ++ * If the port is in the middle of closing, bail out now ++ */ ++ if (tty_hung_up_p(filp) || ++ (info->flags & ASYNC_CLOSING)) { ++ wait_event_interruptible(info->close_wait, ++ !(info->flags & ASYNC_CLOSING)); ++#ifdef SERIAL_DO_RESTART ++ return ((info->flags & ASYNC_HUP_NOTIFY) ? ++ -EAGAIN : -ERESTARTSYS); ++#else ++ return -EAGAIN; ++#endif ++ } ++ ++ /* ++ * If DMA is enabled try to allocate the irq's. ++ */ ++ if (info->count == 1) { ++ allocated_resources = 1; ++ if (info->dma_in_enabled) { ++ if (request_irq(info->dma_in_irq_nbr, ++ rec_interrupt, ++ info->dma_in_irq_flags, ++ info->dma_in_irq_description, ++ info)) { ++ printk(KERN_WARNING "DMA irq '%s' busy; " ++ "falling back to non-DMA mode\n", ++ info->dma_in_irq_description); ++ /* Make sure we never try to use DMA in */ ++ /* for the port again. */ ++ info->dma_in_enabled = 0; ++ } else if (cris_request_dma(info->dma_in_nbr, ++ info->dma_in_irq_description, ++ DMA_VERBOSE_ON_ERROR, ++ info->dma_owner)) { ++ free_irq(info->dma_in_irq_nbr, info); ++ printk(KERN_WARNING "DMA '%s' busy; " ++ "falling back to non-DMA mode\n", ++ info->dma_in_irq_description); ++ /* Make sure we never try to use DMA in */ ++ /* for the port again. */ ++ info->dma_in_enabled = 0; ++ } ++#ifdef SERIAL_DEBUG_OPEN ++ else ++ printk(KERN_DEBUG "DMA irq '%s' allocated\n", ++ info->dma_in_irq_description); ++#endif ++ } ++ if (info->dma_out_enabled) { ++ if (request_irq(info->dma_out_irq_nbr, ++ tr_interrupt, ++ info->dma_out_irq_flags, ++ info->dma_out_irq_description, ++ info)) { ++ printk(KERN_WARNING "DMA irq '%s' busy; " ++ "falling back to non-DMA mode\n", ++ info->dma_out_irq_description); ++ /* Make sure we never try to use DMA out */ ++ /* for the port again. */ ++ info->dma_out_enabled = 0; ++ } else if (cris_request_dma(info->dma_out_nbr, ++ info->dma_out_irq_description, ++ DMA_VERBOSE_ON_ERROR, ++ info->dma_owner)) { ++ free_irq(info->dma_out_irq_nbr, info); ++ printk(KERN_WARNING "DMA '%s' busy; " ++ "falling back to non-DMA mode\n", ++ info->dma_out_irq_description); ++ /* Make sure we never try to use DMA out */ ++ /* for the port again. */ ++ info->dma_out_enabled = 0; ++ } ++#ifdef SERIAL_DEBUG_OPEN ++ else ++ printk(KERN_DEBUG "DMA irq '%s' allocated\n", ++ info->dma_out_irq_description); ++#endif ++ } ++ } ++ ++ /* ++ * Start up the serial port ++ */ ++ ++ retval = startup(info); ++ if (retval) { ++ if (allocated_resources) ++ deinit_port(info); ++ ++ /* FIXME Decrease count info->count here too? */ ++ return retval; ++ } ++ ++ ++ retval = block_til_ready(tty, filp, info); ++ if (retval) { ++#ifdef SERIAL_DEBUG_OPEN ++ printk("rs_open returning after block_til_ready with %d\n", ++ retval); ++#endif ++ if (allocated_resources) ++ deinit_port(info); ++ ++ return retval; ++ } ++ ++ if ((info->count == 1) && (info->flags & ASYNC_SPLIT_TERMIOS)) { ++ *tty->termios = info->normal_termios; ++ change_speed(info); ++ } ++ ++#ifdef SERIAL_DEBUG_OPEN ++ printk("rs_open ttyS%d successful...\n", info->line); ++#endif ++ DLOG_INT_TRIG( log_int_pos = 0); ++ ++ DFLIP( if (info->line == SERIAL_DEBUG_LINE) { ++ info->icount.rx = 0; ++ } ); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PROC_FS ++/* ++ * /proc fs routines.... ++ */ ++ ++static void seq_line_info(struct seq_file *m, struct e100_serial *info) ++{ ++ unsigned long tmp; ++ ++ seq_printf(m, "%d: uart:E100 port:%lX irq:%d", ++ info->line, (unsigned long)info->ioport, info->irq); ++ ++ if (!info->ioport || (info->type == PORT_UNKNOWN)) { ++ seq_printf(m, "\n"); ++ return; ++ } ++ ++ seq_printf(m, " baud:%d", info->baud); ++ seq_printf(m, " tx:%lu rx:%lu", ++ (unsigned long)info->icount.tx, ++ (unsigned long)info->icount.rx); ++ tmp = CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); ++ if (tmp) ++ seq_printf(m, " tx_pend:%lu/%lu", ++ (unsigned long)tmp, ++ (unsigned long)SERIAL_XMIT_SIZE); ++ ++ seq_printf(m, " rx_pend:%lu/%lu", ++ (unsigned long)info->recv_cnt, ++ (unsigned long)info->max_recv_cnt); ++ ++#if 1 ++ if (info->port.tty) { ++ if (info->port.tty->stopped) ++ seq_printf(m, " stopped:%i", ++ (int)info->port.tty->stopped); ++ if (info->port.tty->hw_stopped) ++ seq_printf(m, " hw_stopped:%i", ++ (int)info->port.tty->hw_stopped); ++ } ++ ++ { ++ unsigned char rstat = info->ioport[REG_STATUS]; ++ if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect)) ++ seq_printf(m, " xoff_detect:1"); ++ } ++ ++#endif ++ ++ if (info->icount.frame) ++ seq_printf(m, " fe:%lu", (unsigned long)info->icount.frame); ++ ++ if (info->icount.parity) ++ seq_printf(m, " pe:%lu", (unsigned long)info->icount.parity); ++ ++ if (info->icount.brk) ++ seq_printf(m, " brk:%lu", (unsigned long)info->icount.brk); ++ ++ if (info->icount.overrun) ++ seq_printf(m, " oe:%lu", (unsigned long)info->icount.overrun); ++ ++ /* ++ * Last thing is the RS-232 status lines ++ */ ++ if (!E100_RTS_GET(info)) ++ seq_puts(m, "|RTS"); ++ if (!E100_CTS_GET(info)) ++ seq_puts(m, "|CTS"); ++ if (!E100_DTR_GET(info)) ++ seq_puts(m, "|DTR"); ++ if (!E100_DSR_GET(info)) ++ seq_puts(m, "|DSR"); ++ if (!E100_CD_GET(info)) ++ seq_puts(m, "|CD"); ++ if (!E100_RI_GET(info)) ++ seq_puts(m, "|RI"); ++ seq_puts(m, "\n"); ++} ++ ++ ++static int crisv10_proc_show(struct seq_file *m, void *v) ++{ ++ int i; ++ ++ seq_printf(m, "serinfo:1.0 driver:%s\n", serial_version); ++ ++ for (i = 0; i < NR_PORTS; i++) { ++ if (!rs_table[i].enabled) ++ continue; ++ seq_line_info(m, &rs_table[i]); ++ } ++#ifdef DEBUG_LOG_INCLUDED ++ for (i = 0; i < debug_log_pos; i++) { ++ seq_printf(m, "%-4i %lu.%lu ", ++ i, debug_log[i].time, ++ timer_data_to_ns(debug_log[i].timer_data)); ++ seq_printf(m, debug_log[i].string, debug_log[i].value); ++ } ++ seq_printf(m, "debug_log %i/%i\n", i, DEBUG_LOG_SIZE); ++ debug_log_pos = 0; ++#endif ++ return 0; ++} ++ ++static int crisv10_proc_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, crisv10_proc_show, NULL); ++} ++ ++static const struct file_operations crisv10_proc_fops = { ++ .owner = THIS_MODULE, ++ .open = crisv10_proc_open, ++ .read = seq_read, ++ .llseek = seq_lseek, ++ .release = single_release, ++}; ++#endif ++ ++ ++/* Finally, routines used to initialize the serial driver. */ ++ ++static void show_serial_version(void) ++{ ++ printk(KERN_INFO ++ "ETRAX 100LX serial-driver %s, " ++ "(c) 2000-2004 Axis Communications AB\r\n", ++ &serial_version[11]); /* "$Revision: x.yy" */ ++} ++ ++/* rs_init inits the driver at boot (using the module_init chain) */ ++ ++static const struct tty_operations rs_ops = { ++ .open = rs_open, ++ .close = rs_close, ++ .write = rs_write, ++ .flush_chars = rs_flush_chars, ++ .write_room = rs_write_room, ++ .chars_in_buffer = rs_chars_in_buffer, ++ .flush_buffer = rs_flush_buffer, ++ .ioctl = rs_ioctl, ++ .throttle = rs_throttle, ++ .unthrottle = rs_unthrottle, ++ .set_termios = rs_set_termios, ++ .stop = rs_stop, ++ .start = rs_start, ++ .hangup = rs_hangup, ++ .break_ctl = rs_break, ++ .send_xchar = rs_send_xchar, ++ .wait_until_sent = rs_wait_until_sent, ++ .tiocmget = rs_tiocmget, ++ .tiocmset = rs_tiocmset, ++#ifdef CONFIG_PROC_FS ++ .proc_fops = &crisv10_proc_fops, ++#endif ++}; ++ ++static int __init rs_init(void) ++{ ++ int i; ++ struct e100_serial *info; ++ struct tty_driver *driver = alloc_tty_driver(NR_PORTS); ++ ++ if (!driver) ++ return -ENOMEM; ++ ++ show_serial_version(); ++ ++ /* Setup the timed flush handler system */ ++ ++#if !defined(CONFIG_ETRAX_SERIAL_FAST_TIMER) ++ setup_timer(&flush_timer, timed_flush_handler, 0); ++ mod_timer(&flush_timer, jiffies + 5); ++#endif ++ ++#if defined(CONFIG_ETRAX_RS485) ++#if defined(CONFIG_ETRAX_RS485_ON_PA) ++ if (cris_io_interface_allocate_pins(if_ser0, 'a', rs485_pa_bit, ++ rs485_pa_bit)) { ++ printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " ++ "RS485 pin\n"); ++ put_tty_driver(driver); ++ return -EBUSY; ++ } ++#endif ++#if defined(CONFIG_ETRAX_RS485_ON_PORT_G) ++ if (cris_io_interface_allocate_pins(if_ser0, 'g', rs485_pa_bit, ++ rs485_port_g_bit)) { ++ printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " ++ "RS485 pin\n"); ++ put_tty_driver(driver); ++ return -EBUSY; ++ } ++#endif ++#endif ++ ++ /* Initialize the tty_driver structure */ ++ ++ driver->driver_name = "serial"; ++ driver->name = "ttyS"; ++ driver->major = TTY_MAJOR; ++ driver->minor_start = 64; ++ driver->type = TTY_DRIVER_TYPE_SERIAL; ++ driver->subtype = SERIAL_TYPE_NORMAL; ++ driver->init_termios = tty_std_termios; ++ driver->init_termios.c_cflag = ++ B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ ++ driver->init_termios.c_ispeed = 115200; ++ driver->init_termios.c_ospeed = 115200; ++ driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; ++ ++ tty_set_operations(driver, &rs_ops); ++ serial_driver = driver; ++ if (tty_register_driver(driver)) ++ panic("Couldn't register serial driver\n"); ++ /* do some initializing for the separate ports */ ++ ++ for (i = 0, info = rs_table; i < NR_PORTS; i++,info++) { ++ if (info->enabled) { ++ if (cris_request_io_interface(info->io_if, ++ info->io_if_description)) { ++ printk(KERN_CRIT "ETRAX100LX async serial: " ++ "Could not allocate IO pins for " ++ "%s, port %d\n", ++ info->io_if_description, i); ++ info->enabled = 0; ++ } ++ } ++ info->uses_dma_in = 0; ++ info->uses_dma_out = 0; ++ info->line = i; ++ info->port.tty = NULL; ++ info->type = PORT_ETRAX; ++ info->tr_running = 0; ++ info->forced_eop = 0; ++ info->baud_base = DEF_BAUD_BASE; ++ info->custom_divisor = 0; ++ info->flags = 0; ++ info->close_delay = 5*HZ/10; ++ info->closing_wait = 30*HZ; ++ info->x_char = 0; ++ info->event = 0; ++ info->count = 0; ++ info->blocked_open = 0; ++ info->normal_termios = driver->init_termios; ++ init_waitqueue_head(&info->open_wait); ++ init_waitqueue_head(&info->close_wait); ++ info->xmit.buf = NULL; ++ info->xmit.tail = info->xmit.head = 0; ++ info->first_recv_buffer = info->last_recv_buffer = NULL; ++ info->recv_cnt = info->max_recv_cnt = 0; ++ info->last_tx_active_usec = 0; ++ info->last_tx_active = 0; ++ ++#if defined(CONFIG_ETRAX_RS485) ++ /* Set sane defaults */ ++ info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND); ++ info->rs485.flags |= SER_RS485_RTS_AFTER_SEND; ++ info->rs485.delay_rts_before_send = 0; ++ info->rs485.flags &= ~(SER_RS485_ENABLED); ++#endif ++ INIT_WORK(&info->work, do_softint); ++ ++ if (info->enabled) { ++ printk(KERN_INFO "%s%d at 0x%x is a builtin UART with DMA\n", ++ serial_driver->name, info->line, (unsigned int)info->ioport); ++ } ++ } ++#ifdef CONFIG_ETRAX_FAST_TIMER ++#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER ++ memset(fast_timers, 0, sizeof(fast_timers)); ++#endif ++#ifdef CONFIG_ETRAX_RS485 ++ memset(fast_timers_rs485, 0, sizeof(fast_timers_rs485)); ++#endif ++ fast_timer_init(); ++#endif ++ ++#ifndef CONFIG_SVINTO_SIM ++#ifndef CONFIG_ETRAX_KGDB ++ /* Not needed in simulator. May only complicate stuff. */ ++ /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */ ++ ++ if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, ++ IRQF_SHARED | IRQF_DISABLED, "serial ", driver)) ++ panic("%s: Failed to request irq8", __func__); ++ ++#endif ++#endif /* CONFIG_SVINTO_SIM */ ++ ++ return 0; ++} ++ ++/* this makes sure that rs_init is called during kernel boot */ ++ ++module_init(rs_init); +diff -Nur linux-2.6.32.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.32/drivers/usb/host/hc-cris-dbg.h +--- linux-2.6.32.orig/drivers/usb/host/hc-cris-dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/drivers/usb/host/hc-cris-dbg.h 2010-01-10 13:41:59.276309474 +0100 @@ -0,0 +1,146 @@ + +/* macros for debug output */ @@ -577,9 +6915,9 @@ diff -Nur linux-2.6.31.5.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.31.5/driv + }; \ + s; \ + }) -diff -Nur linux-2.6.31.5.orig/drivers/usb/host/hc-crisv10.c linux-2.6.31.5/drivers/usb/host/hc-crisv10.c ---- linux-2.6.31.5.orig/drivers/usb/host/hc-crisv10.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.5/drivers/usb/host/hc-crisv10.c 2009-11-09 21:10:53.049913537 +0100 +diff -Nur linux-2.6.32.orig/drivers/usb/host/hc-crisv10.c linux-2.6.32/drivers/usb/host/hc-crisv10.c +--- linux-2.6.32.orig/drivers/usb/host/hc-crisv10.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/drivers/usb/host/hc-crisv10.c 2010-01-10 13:41:59.326309689 +0100 @@ -0,0 +1,4801 @@ +/* + * @@ -5382,9 +11720,9 @@ diff -Nur linux-2.6.31.5.orig/drivers/usb/host/hc-crisv10.c linux-2.6.31.5/drive +/* Module hooks */ +module_init(module_hcd_init); +module_exit(module_hcd_exit); -diff -Nur linux-2.6.31.5.orig/drivers/usb/host/hc-crisv10.h linux-2.6.31.5/drivers/usb/host/hc-crisv10.h ---- linux-2.6.31.5.orig/drivers/usb/host/hc-crisv10.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.5/drivers/usb/host/hc-crisv10.h 2009-11-09 21:10:53.061914787 +0100 +diff -Nur linux-2.6.32.orig/drivers/usb/host/hc-crisv10.h linux-2.6.32/drivers/usb/host/hc-crisv10.h +--- linux-2.6.32.orig/drivers/usb/host/hc-crisv10.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/drivers/usb/host/hc-crisv10.h 2010-01-10 13:41:59.326309689 +0100 @@ -0,0 +1,331 @@ +#ifndef __LINUX_ETRAX_USB_H +#define __LINUX_ETRAX_USB_H @@ -5717,18 +12055,56 @@ diff -Nur linux-2.6.31.5.orig/drivers/usb/host/hc-crisv10.h linux-2.6.31.5/drive +#define USB_SB_command__full__yes 1 + +#endif -diff -Nur linux-2.6.31.5.orig/drivers/usb/host/Makefile linux-2.6.31.5/drivers/usb/host/Makefile ---- linux-2.6.31.5.orig/drivers/usb/host/Makefile 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/drivers/usb/host/Makefile 2009-11-09 21:10:53.090776289 +0100 -@@ -31,3 +31,4 @@ +diff -Nur linux-2.6.32.orig/drivers/usb/host/Makefile linux-2.6.32/drivers/usb/host/Makefile +--- linux-2.6.32.orig/drivers/usb/host/Makefile 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/drivers/usb/host/Makefile 2010-01-10 13:41:59.326309689 +0100 +@@ -32,3 +32,4 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o +obj-$(CONFIG_ETRAX_USB_HOST) += hc-crisv10.o -diff -Nur linux-2.6.31.5.orig/drivers/usb/Makefile linux-2.6.31.5/drivers/usb/Makefile ---- linux-2.6.31.5.orig/drivers/usb/Makefile 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/drivers/usb/Makefile 2009-11-09 21:10:53.111922280 +0100 -@@ -20,6 +20,7 @@ +diff -Nur linux-2.6.32.orig/drivers/usb/host/Makefile.orig linux-2.6.32/drivers/usb/host/Makefile.orig +--- linux-2.6.32.orig/drivers/usb/host/Makefile.orig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/drivers/usb/host/Makefile.orig 2009-12-03 04:51:21.000000000 +0100 +@@ -0,0 +1,34 @@ ++# ++# Makefile for USB Host Controller Drivers ++# ++ ++ifeq ($(CONFIG_USB_DEBUG),y) ++ EXTRA_CFLAGS += -DDEBUG ++endif ++ ++isp1760-objs := isp1760-hcd.o isp1760-if.o ++fhci-objs := fhci-hcd.o fhci-hub.o fhci-q.o fhci-mem.o \ ++ fhci-tds.o fhci-sched.o ++ifeq ($(CONFIG_FHCI_DEBUG),y) ++fhci-objs += fhci-dbg.o ++endif ++xhci-objs := xhci-hcd.o xhci-mem.o xhci-pci.o xhci-ring.o xhci-hub.o xhci-dbg.o ++ ++obj-$(CONFIG_USB_WHCI_HCD) += whci/ ++ ++obj-$(CONFIG_PCI) += pci-quirks.o ++ ++obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o ++obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o ++obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o ++obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o ++obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o ++obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o ++obj-$(CONFIG_USB_FHCI_HCD) += fhci.o ++obj-$(CONFIG_USB_XHCI_HCD) += xhci.o ++obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o ++obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o ++obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o ++obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o ++obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o ++obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o +diff -Nur linux-2.6.32.orig/drivers/usb/Makefile linux-2.6.32/drivers/usb/Makefile +--- linux-2.6.32.orig/drivers/usb/Makefile 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/drivers/usb/Makefile 2010-01-10 13:41:59.326309689 +0100 +@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ obj-$(CONFIG_USB_ISP1760_HCD) += host/ @@ -5736,9 +12112,59 @@ diff -Nur linux-2.6.31.5.orig/drivers/usb/Makefile linux-2.6.31.5/drivers/usb/Ma obj-$(CONFIG_USB_C67X00_HCD) += c67x00/ -diff -Nur linux-2.6.31.5.orig/lib/klist.c linux-2.6.31.5/lib/klist.c ---- linux-2.6.31.5.orig/lib/klist.c 2009-10-23 00:57:56.000000000 +0200 -+++ linux-2.6.31.5/lib/klist.c 2009-11-09 21:10:53.142378957 +0100 +diff -Nur linux-2.6.32.orig/drivers/usb/Makefile.orig linux-2.6.32/drivers/usb/Makefile.orig +--- linux-2.6.32.orig/drivers/usb/Makefile.orig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/drivers/usb/Makefile.orig 2009-12-03 04:51:21.000000000 +0100 +@@ -0,0 +1,46 @@ ++# ++# Makefile for the kernel USB device drivers. ++# ++ ++# Object files in subdirectories ++ ++obj-$(CONFIG_USB) += core/ ++ ++obj-$(CONFIG_USB_MON) += mon/ ++ ++obj-$(CONFIG_PCI) += host/ ++obj-$(CONFIG_USB_EHCI_HCD) += host/ ++obj-$(CONFIG_USB_ISP116X_HCD) += host/ ++obj-$(CONFIG_USB_OHCI_HCD) += host/ ++obj-$(CONFIG_USB_UHCI_HCD) += host/ ++obj-$(CONFIG_USB_FHCI_HCD) += host/ ++obj-$(CONFIG_USB_XHCI_HCD) += host/ ++obj-$(CONFIG_USB_SL811_HCD) += host/ ++obj-$(CONFIG_USB_ISP1362_HCD) += host/ ++obj-$(CONFIG_USB_U132_HCD) += host/ ++obj-$(CONFIG_USB_R8A66597_HCD) += host/ ++obj-$(CONFIG_USB_HWA_HCD) += host/ ++obj-$(CONFIG_USB_ISP1760_HCD) += host/ ++ ++obj-$(CONFIG_USB_C67X00_HCD) += c67x00/ ++ ++obj-$(CONFIG_USB_WUSB) += wusbcore/ ++ ++obj-$(CONFIG_USB_ACM) += class/ ++obj-$(CONFIG_USB_PRINTER) += class/ ++obj-$(CONFIG_USB_WDM) += class/ ++obj-$(CONFIG_USB_TMC) += class/ ++ ++obj-$(CONFIG_USB_STORAGE) += storage/ ++obj-$(CONFIG_USB) += storage/ ++ ++obj-$(CONFIG_USB_MDC800) += image/ ++obj-$(CONFIG_USB_MICROTEK) += image/ ++ ++obj-$(CONFIG_USB_SERIAL) += serial/ ++ ++obj-$(CONFIG_USB) += misc/ ++obj-y += early/ ++ ++obj-$(CONFIG_USB_ATM) += atm/ ++obj-$(CONFIG_USB_SPEEDTOUCH) += atm/ +diff -Nur linux-2.6.32.orig/lib/klist.c linux-2.6.32/lib/klist.c +--- linux-2.6.32.orig/lib/klist.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/lib/klist.c 2010-01-10 13:41:59.326309689 +0100 @@ -60,7 +60,7 @@ { knode->n_klist = klist; diff --git a/target/foxboard/tools/mkfimage/mkfimage.c b/target/foxboard/tools/mkfimage/mkfimage.c index 6904170cf..b1897fbd7 100644 --- a/target/foxboard/tools/mkfimage/mkfimage.c +++ b/target/foxboard/tools/mkfimage/mkfimage.c @@ -37,7 +37,7 @@ int main(int argc, char **argv){ for(loop = 0; loop < (64 * 1024) - sizeof(magic_str); loop++){ if(buffer[loop] == magic_str[0]){ if((magic = strstr(&buffer[loop], magic_str))){ - printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer); + //printf("Magic at 0x%.08X %p %p\n", magic - buffer, magic, buffer); printf("Found Magic %X%X%X%X\n", buffer[loop + strlen(magic_str)], buffer[loop + strlen(magic_str) + 2], diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index bdad0241f..d9c997b8d 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -67,6 +67,7 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD depends on !ADK_KERNEL_SATA_AHCI + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241) default n help Enables support for AHCI Serial ATA. diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 2b90a6028..7d78a594e 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -62,7 +62,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X endmenu menu "OpenBSD Cryptographic framework" -depends on !ADK_LINUX_CRIS_FOXBOARD +depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241) config ADK_KPACKAGE_KMOD_OCF_HIFN prompt "kmod-cryptodev-hifn................ hifn engine" diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 8631b486e..f075c4749 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -83,7 +83,7 @@ config ADK_KPACKAGE_KMOD_EXT4_FS config ADK_KPACKAGE_KMOD_HFSPLUS_FS prompt "kmod-fs-hfsplus................... HFS+ filesystem support" tristate - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KPACKAGE_KMOD_NLS_UTF8 default n help @@ -101,7 +101,7 @@ source "package/ntfs-3g/Config.in" config ADK_KPACKAGE_KMOD_NTFS_FS prompt "kmod-fs-ntfs...................... NTFS file system support" tristate - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS default n help NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003. @@ -133,7 +133,7 @@ config ADK_KERNEL_FAT_FS config ADK_KPACKAGE_KMOD_VFAT_FS prompt "kmod-fs-vfat...................... VFAT filesystem support" select ADK_KERNEL_FAT_FS - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 select ADK_KPACKAGE_KMOD_NLS_ISO8859_1 tristate diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 78c21d52c..71236c47f 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -1,6 +1,6 @@ config ADK_KPACKAGE_KMOD_CIFS prompt "kmod-fs-cifs...................... CIFS support" - select ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS tristate default n help diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 5f1cffd77..a3afafe0c 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -38,4 +38,10 @@ config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV tristate default n +config ADK_KPACKAGE_KMOD_INPUT_EVDEV + prompt "kmod-input-evdev................. Event support" + select ADK_KERNEL_INPUT + tristate + default n + endmenu diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index d99681204..64a7af06e 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -1,5 +1,5 @@ menu "Network devices support" -depends on !ADK_LINUX_CRIS_FOXBOARD +depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_MIPS_AG241) config ADK_KERNEL_NETDEVICES boolean diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 0f38986d5..19f09b05a 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -40,6 +40,16 @@ config ADK_KERNEL_LLC tristate default n +config ADK_KERNEL_IP_MULTICAST + prompt "Enable IP Multicasting" + boolean + default n + +config ADK_KERNEL_IP_MROUTE + prompt "Enable IP Multicasting Routing" + boolean + default n + config ADK_KPACKAGE_KMOD_ATM prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)" tristate diff --git a/target/linux/config/Config.in.nls b/target/linux/config/Config.in.nls index 6933bad20..517f5b5f9 100644 --- a/target/linux/config/Config.in.nls +++ b/target/linux/config/Config.in.nls @@ -23,7 +23,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437 prompt "kmod-nls-codepage-437........... Codepage 437 (United States, Canada)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored @@ -38,7 +38,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737 prompt "kmod-nls-codepage-737........... Codepage 737 (Greek)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored @@ -53,7 +53,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775 prompt "kmod-nls-codepage-775........... Codepage 775 (Baltic Rim)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored @@ -69,7 +69,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850 prompt "kmod-nls-codepage-850........... Codepage 850 (Western European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -86,7 +86,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852 prompt "kmod-nls-codepage-852........... Codepage 852 (Eastern European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -104,7 +104,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855 prompt "kmod-nls-codepage-855........... Codepage 855 (Cyrillic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -118,7 +118,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857 prompt "kmod-nls-codepage-857........... Codepage 857 (Turkish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -132,7 +132,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860 prompt "kmod-nls-codepage-860........... Codepage 860 (Portuguese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -146,7 +146,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861 prompt "kmod-nls-codepage-861........... Codepage 861 (Icelandic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -160,7 +160,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862 prompt "kmod-nls-codepage-862........... Codepage 862 (Hebrew)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -174,7 +174,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863 prompt "kmod-nls-codepage-863........... Codepage 863 (French Canadian)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -189,7 +189,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864 prompt "kmod-nls-codepage-864........... Codepage 864 (Arabic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -203,7 +203,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865 prompt "kmod-nls-codepage-865........... Codepage 865 (Norwegian, Danish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -218,7 +218,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866 prompt "kmod-nls-codepage-866........... Codepage 866 (Cyrillic/Russian)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -233,7 +233,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869 prompt "kmod-nls-codepage-869........... Codepage 869 (Greek)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -247,7 +247,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874 prompt "kmod-nls-codepage-874........... Codepage 874 (Thai)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -261,7 +261,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932 prompt "kmod-nls-codepage-932........... Codepage 932 (Japanese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -277,7 +277,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936 prompt "kmod-nls-codepage-936........... Codepage 936 (Simplified Chinese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -292,7 +292,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949 prompt "kmod-nls-codepage-949........... Codepage 949 (Korean)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -306,7 +306,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950 prompt "kmod-nls-codepage-950........... Codepage 950 (Traditional Chinese)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -321,7 +321,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250 prompt "kmod-nls-codepage-1250.......... Codepage 1250 (Slavic/Central European)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CDROMs @@ -335,7 +335,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251 prompt "kmod-nls-codepage-1251.......... Codepage 1251 (Bulgarian, Belarusian)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help The Microsoft FAT file system family can deal with filenames in native language character sets. These character sets are stored in @@ -350,7 +350,7 @@ config ADK_KPACKAGE_KMOD_NLS_ASCII prompt "kmod-nls-ascii.................. ASCII (United States)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help An ASCII NLS module is needed if you want to override the DEFAULT NLS with this very basic charset and don't want any @@ -360,7 +360,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_1 prompt "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin-1; Western European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -375,7 +375,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_2 prompt "kmod-nls-iso8859-2.............. NLS ISO 8859-2 (Latin-2; Central European Languages)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -389,7 +389,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_3 prompt "kmod-nls-iso8859-3.............. NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -402,7 +402,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_4 prompt "kmod-nls-iso8859-4.............. NLS ISO 8859-4 (Latin-4; old Baltic charset)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -415,7 +415,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_5 prompt "kmod-nls-iso8859-5.............. NLS ISO 8859-5 (Cyrillic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -429,7 +429,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_6 prompt "kmod-nls-iso8859-6.............. NLS ISO 8859-6 (Arabic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -441,7 +441,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_7 prompt "kmod-nls-iso8859-7.............. NLS ISO 8859-7 (Greek)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -453,7 +453,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_8 prompt "kmod-nls-iso8859-8.............. NLS ISO 8859-8 (Hebrew)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -465,7 +465,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_9 prompt "kmod-nls-iso8859-9.............. NLS ISO 8859-9 (Latin-5; Turkish)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -478,7 +478,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_13 prompt "kmod-nls-iso8859-13............. NLS ISO 8859-13 (Latin-7; Baltic Rim)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -491,7 +491,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_14 prompt "kmod-nls-iso8859-14............. NLS ISO 8859-14 (Latin-8; Celtic)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -505,7 +505,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_15 prompt "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -524,7 +524,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_R prompt "kmod-nls-koi8-r................. NLS KOI8-R (Cryllic for Russian and Bulgarian" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -536,7 +536,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_U prompt "kmod-nls-koi8-u................. NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs @@ -548,7 +548,7 @@ config ADK_KPACKAGE_KMOD_NLS_UTF8 prompt "kmod-nls-utf8................... NLS UTF8" tristate default n - depends on ADK_KPACKAGE_KMOD_NLS + select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS help If you want to display filenames with native language characters from the Microsoft FAT file system family or from JOLIET CD-ROMs diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index f66fbeee0..57b2a649f 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -15,8 +15,9 @@ config ADK_KERNEL_USB_SERIAL config ADK_KPACKAGE_KMOD_USB prompt "kmod-usb-core..................... USB support" tristate - default y if ADK_LINUX_X86_ALIX1C || ADK_LINUX_CRIS_FOXBOARD + default y if ADK_LINUX_X86_ALIX1C default n + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KERNEL_NLS select ADK_KERNEL_USB_DEVICEFS help diff --git a/target/rb411/Makefile b/target/rb411/Makefile index b9ee5932b..4ecfbc47a 100644 --- a/target/rb411/Makefile +++ b/target/rb411/Makefile @@ -14,6 +14,7 @@ ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),yaffs) diff --git a/target/rb433/Makefile b/target/rb433/Makefile index b9ee5932b..4ecfbc47a 100644 --- a/target/rb433/Makefile +++ b/target/rb433/Makefile @@ -14,6 +14,7 @@ ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),yaffs) diff --git a/target/rb532/Makefile b/target/rb532/Makefile index f0e6028ec..7cf3d7c46 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -26,5 +26,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/target.lst b/target/target.lst index 2537feef7..f78fff3da 100644 --- a/target/target.lst +++ b/target/target.lst @@ -1,7 +1,8 @@ native ADK_LINUX_NATIVE alix1c ADK_LINUX_X86_ALIX1C alix2d ADK_LINUX_X86_ALIX2D -alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D +alix2d13 ADK_LINUX_X86_ALIX2D13 +alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_ALIX2D13 wrap ADK_LINUX_X86_WRAP foxboard ADK_LINUX_CRIS_FOXBOARD lemote ADK_LINUX_MIPS64_LEMOTE @@ -27,5 +28,5 @@ rb411 ADK_LINUX_MIPS_RB411 rb433 ADK_LINUX_MIPS_RB433 rb532 ADK_LINUX_MIPS_RB532 routerboard ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532 -x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP +x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP || ADK_LINUX_X86_ALIX2D13 x86_64 ADK_LINUX_X86_64_QEMU || ADK_LINUX_X86_64_RESCUE || ADK_LINUX_X86_64_SHUTTLE diff --git a/target/wag54g/Makefile b/target/wag54g/Makefile index d86ada854..44ce7734f 100644 --- a/target/wag54g/Makefile +++ b/target/wag54g/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/wrap/Makefile b/target/wrap/Makefile index 825b55175..77b9d4ab9 100644 --- a/target/wrap/Makefile +++ b/target/wrap/Makefile @@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/wrap/kernel.config b/target/wrap/kernel.config index 51c8272c9..50f0a6b6e 100644 --- a/target/wrap/kernel.config +++ b/target/wrap/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31.5 -# Sun Nov 22 19:32:12 2009 +# Linux kernel version: 2.6.32 +# Wed Jan 6 19:38:11 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -16,7 +16,6 @@ CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_MMU=y CONFIG_ZONE_DMA=y CONFIG_GENERIC_ISA_DMA=y @@ -33,7 +32,8 @@ CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y @@ -76,11 +76,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y @@ -112,17 +113,15 @@ CONFIG_SHMEM=y # CONFIG_AIO is not set # -# Performance Counters +# Kernel Performance Events And Counters # # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_PCI_QUIRKS is not set -CONFIG_STRIP_ASM_SYMS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y @@ -200,6 +199,7 @@ CONFIG_M486=y # CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set # CONFIG_GENERIC_CPU is not set CONFIG_X86_GENERIC=y CONFIG_X86_CPU=y @@ -234,7 +234,6 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT is not set # CONFIG_X86_UP_APIC is not set # CONFIG_X86_MCE is not set -# CONFIG_X86_ANCIENT_MCE is not set # CONFIG_VM86 is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -272,6 +271,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_X86_CHECK_BIOS_CORRUPTION=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set @@ -299,6 +299,7 @@ CONFIG_CMDLINE="console=ttyS0,38400" # Power management and ACPI options # # CONFIG_PM is not set +# CONFIG_SFI is not set # # CPU Frequency scaling @@ -349,8 +350,13 @@ CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y +# CONFIG_IP_MULTIPLE_TABLES is not set +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set @@ -375,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -476,6 +483,7 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +# CONFIG_ATA_VERBOSE_ERROR is not set # CONFIG_SATA_PMP is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SIL24 is not set @@ -497,6 +505,7 @@ CONFIG_ATA_SFF=y # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set @@ -526,6 +535,7 @@ CONFIG_ATA_SFF=y # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set # CONFIG_PATA_RZ1000 is not set CONFIG_PATA_SC1200=y # CONFIG_PATA_SERVERWORKS is not set @@ -619,16 +629,14 @@ CONFIG_NATSEMI=y # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set # CONFIG_VIA_RHINE is not set # CONFIG_SC92031 is not set # CONFIG_ATL2 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set - -# -# Wireless LAN -# +CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set @@ -644,6 +652,7 @@ CONFIG_NATSEMI=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -737,7 +746,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -760,6 +768,7 @@ CONFIG_SSB_POSSIBLE=y # Graphics support # # CONFIG_AGP is not set +CONFIG_VGA_ARB=y # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set @@ -877,6 +886,8 @@ CONFIG_EXT2_FS=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set @@ -936,8 +947,6 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_NILFS2_FS is not set -# CONFIG_AUFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set @@ -980,6 +989,7 @@ CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set @@ -998,7 +1008,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FTRACE_SYSCALLS=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -1036,7 +1046,6 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set @@ -1068,12 +1077,14 @@ CONFIG_CRYPTO=y # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set @@ -1130,7 +1141,6 @@ CONFIG_CRYPTO_HW=y # # CONFIG_OCF_OCF is not set CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y # CONFIG_VIRTUALIZATION is not set # CONFIG_BINARY_PRINTF is not set |