[PATCH 00/25] reduce code in fs/compat_ioctl.c - msg#00005

Previous Message by Date: click to view message preview

Re: pmac serial_pci_guess_board problem

> That's the expected size of the ports. Remember this is a heuristic > for finding the correct details of the ports. Some cards seem to > have regions of 16 bytes which aren't serial ports. > > I'm _very_ nervous about changing this, especially as it pre-dates > my time and you seem to imply that it's an OF problem. Can't it be > fixed up in a PCI quirk? Could be yes. a ppc64 specific one that re-do the BAR sizing... I wonder what's up with OF tho ... Maybe Apple's OF can't assign BARs smaller than 16 bytes ? Ben. - To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html

Next Message by Date: click to view message preview

[PATCH 22/25] serial: move ioctl32 code to tty_io.c

All driver implementing TIOCGSERIAL are tty drivers, so the conversion handler can be part of tty_compat_ioctl. In a perfect world, this would live in serial_core.c, but there are still a number of drivers that are not moved over to use that yet. If it were in serial_core, it could also live without the get_fs/set_fs hacks. CC: rmk+serial@xxxxxxxxxxxxxxxx CC: linux-serial@xxxxxxxxxxxxxxx Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Index: linux-cg/drivers/char/tty_io.c =================================================================== --- linux-cg.orig/drivers/char/tty_io.c 2005-11-05 14:22:34.000000000 +0100 +++ linux-cg/drivers/char/tty_io.c 2005-11-05 15:42:22.000000000 +0100 @@ -104,7 +104,6 @@ #include <linux/vt_kern.h> #include <linux/selection.h> #include <linux/devfs_fs_kernel.h> - #include <linux/kmod.h> #undef TTY_DEBUG_HANGUP @@ -153,7 +152,7 @@ static int tty_release(struct inode *, struct file *); int tty_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg); -long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg); +static long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg); static int tty_fasync(int fd, struct file * filp, int on); static void release_mem(struct tty_struct *tty, int idx); @@ -2437,7 +2436,75 @@ #ifdef CONFIG_COMPAT -long tty_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +#include <linux/serial.h> + +struct serial_struct32 { + compat_int_t type; + compat_int_t line; + compat_uint_t port; + compat_int_t irq; + compat_int_t flags; + compat_int_t xmit_fifo_size; + compat_int_t custom_divisor; + compat_int_t baud_base; + unsigned short close_delay; + char io_type; + char reserved_char[1]; + compat_int_t hub6; + unsigned short closing_wait; /* time to wait before closing */ + unsigned short closing_wait2; /* no longer used... */ + compat_uint_t iomem_base; + unsigned short iomem_reg_shift; + unsigned int port_high; + /* compat_ulong_t iomap_base FIXME */ + compat_int_t reserved[1]; +}; + +static int serial_struct_ioctl(struct inode *inode, struct file *file, + unsigned cmd, unsigned long arg) +{ + typedef struct serial_struct SS; + typedef struct serial_struct32 SS32; + struct serial_struct32 __user *ss32 = compat_ptr(arg); + int err; + struct serial_struct ss; + mm_segment_t oldseg = get_fs(); + __u32 udata; + + if (cmd == TIOCSSERIAL) { + if (!access_ok(VERIFY_READ, ss32, sizeof(SS32))) + return -EFAULT; + if (__copy_from_user + (&ss, ss32, offsetof(SS32, iomem_base))) + return -EFAULT; + __get_user(udata, &ss32->iomem_base); + ss.iomem_base = compat_ptr(udata); + __get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); + __get_user(ss.port_high, &ss32->port_high); + ss.iomap_base = 0UL; + } + set_fs(KERNEL_DS); + lock_kernel(); + err = tty_ioctl(inode, file, cmd, (unsigned long) (&ss)); + unlock_kernel(); + set_fs(oldseg); + if (cmd == TIOCGSERIAL && err >= 0) { + if (!access_ok(VERIFY_WRITE, ss32, sizeof(SS32))) + return -EFAULT; + if (__copy_to_user(ss32, &ss, offsetof(SS32, iomem_base))) + return -EFAULT; + __put_user((unsigned long) ss.iomem_base >> 32 ? + 0xffffffff : (unsigned) (unsigned long) ss. + iomem_base, &ss32->iomem_base); + __put_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); + __put_user(ss.port_high, &ss32->port_high); + + } + return err; +} + +static long tty_compat_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) { struct inode *inode = file->f_dentry->d_inode; struct tty_struct *tty; @@ -2499,6 +2566,14 @@ /* enter the native code path for those numbers known * to be compatible */ switch (cmd) { + case TIOCGSERIAL: + case TIOCSSERIAL: + ret = serial_struct_ioctl(inode, file, cmd, arg); + break; +#ifdef TIOCGLTC + case TIOCGLTC: + case TIOCSLTC: +#endif case TCFLSH: case TCGETA: case TCGETS: Index: linux-cg/fs/compat_ioctl.c =================================================================== --- linux-cg.orig/fs/compat_ioctl.c 2005-11-05 14:47:57.000000000 +0100 +++ linux-cg/fs/compat_ioctl.c 2005-11-05 15:46:46.000000000 +0100 @@ -356,67 +356,6 @@ #define HIDPGETCONNLIST _IOR('H', 210, int) #define HIDPGETCONNINFO _IOR('H', 211, int) -struct serial_struct32 { - compat_int_t type; - compat_int_t line; - compat_uint_t port; - compat_int_t irq; - compat_int_t flags; - compat_int_t xmit_fifo_size; - compat_int_t custom_divisor; - compat_int_t baud_base; - unsigned short close_delay; - char io_type; - char reserved_char[1]; - compat_int_t hub6; - unsigned short closing_wait; /* time to wait before closing */ - unsigned short closing_wait2; /* no longer used... */ - compat_uint_t iomem_base; - unsigned short iomem_reg_shift; - unsigned int port_high; - /* compat_ulong_t iomap_base FIXME */ - compat_int_t reserved[1]; -}; - -static int serial_struct_ioctl(unsigned fd, unsigned cmd, unsigned long arg) -{ - typedef struct serial_struct SS; - typedef struct serial_struct32 SS32; - struct serial_struct32 __user *ss32 = compat_ptr(arg); - int err; - struct serial_struct ss; - mm_segment_t oldseg = get_fs(); - __u32 udata; - - if (cmd == TIOCSSERIAL) { - if (!access_ok(VERIFY_READ, ss32, sizeof(SS32))) - return -EFAULT; - if (__copy_from_user(&ss, ss32, offsetof(SS32, iomem_base))) - return -EFAULT; - __get_user(udata, &ss32->iomem_base); - ss.iomem_base = compat_ptr(udata); - __get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); - __get_user(ss.port_high, &ss32->port_high); - ss.iomap_base = 0UL; - } - set_fs(KERNEL_DS); - err = sys_ioctl(fd,cmd,(unsigned long)(&ss)); - set_fs(oldseg); - if (cmd == TIOCGSERIAL && err >= 0) { - if (!access_ok(VERIFY_WRITE, ss32, sizeof(SS32))) - return -EFAULT; - if (__copy_to_user(ss32,&ss,offsetof(SS32,iomem_base))) - return -EFAULT; - __put_user((unsigned long)ss.iomem_base >> 32 ? - 0xffffffff : (unsigned)(unsigned long)ss.iomem_base, - &ss32->iomem_base); - __put_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); - __put_user(ss.port_high, &ss32->port_high); - - } - return err; -} - #undef CODE #endif @@ -425,13 +364,5 @@ HANDLE_IOCTL(MTIOCPOS32, mt_ioctl_trans) HANDLE_IOCTL(CDROMREADAUDIO, cdrom_ioctl_trans) HANDLE_IOCTL(CDROM_SEND_PACKET, cdrom_ioctl_trans) -/* Serial */ -HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl) -HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl) -#ifdef TIOCGLTC -COMPATIBLE_IOCTL(TIOCGLTC) -COMPATIBLE_IOCTL(TIOCSLTC) -#endif - #undef DECLARES #endif -- - To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html

Previous Message by Thread: click to view message preview

pmac serial_pci_guess_board problem

Russell, I found that the serial port probe code in drivers/serial/8250_pci.c no longer works properly for PowerMac G5 in 2.6.14. It seems some new code now takes the PCI device info directly from the G5's Open Firmware. The trouble is that OF sets the address length to 16 bytes, not the expected 8 bytes. Here's a fix, but I'd be interested to hear your comments. -Geoff Index: linux-2.6.14/drivers/serial/8250_pci.c =================================================================== --- linux-2.6.14.orig/drivers/serial/8250_pci.c 2005-11-04 11:41:09.000000000 -0800 +++ linux-2.6.14/drivers/serial/8250_pci.c 2005-11-04 11:44:21.000000000 -0800 @@ -1478,7 +1478,11 @@ num_port = 0; for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) { if (pci_resource_flags(dev, i) & IORESOURCE_IO && +#if defined(CONFIG_PPC_PMAC64) + pci_resource_len(dev, i) == 16 && +#else pci_resource_len(dev, i) == 8 && +#endif (first_port == -1 || (first_port + num_port) == i)) { num_port++; if (first_port == -1) -------- Original Message -------- Subject: Re: pci_resource_end() changed problem with 2.6.14 Date: Fri, 04 Nov 2005 17:56:09 +1100 From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> To: Geoff Levand <geoffrey.levand@xxxxxxxxxxx> CC: linuxppc64-dev@xxxxxxxxxx References: <436ADBA7.7030706@xxxxxxxxxxx> On Thu, 2005-11-03 at 19:55 -0800, Geoff Levand wrote: > I found that the serial port probe code in drivers/serial/8250_pci.c > no longer works properly for ppc64 in 2.6.14. It seems the value > returned by pci_resource_len() on ppc64 changed from 8 to 16 since > 2.6.13. I tested on a PC and pci_resource_len() returns 8 as > expected. > > Any help on on where to look for the problem would be appreciated. > > Here's the code that hits the problem: > > if (pci_resource_flags(dev, i) & IORESOURCE_IO && > pci_resource_len(dev, i) == 8 && > > And here are some test results: Interesting... What does an lspci -vv shows for the BARs of the PCI card ? Also, what do you have in /proc/device-tree ? What is the machine precisely ? 2.6.14 now uses the OF device-tree to generate the linux PCI tree instead of going directly to PCI probing. It's possible that this is causing your problem if for some reason, the BAR sizing done by OF ends up being different than what the kernel does ... Ben. - To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html

Next Message by Thread: click to view message preview

[PATCH 22/25] serial: move ioctl32 code to tty_io.c

All driver implementing TIOCGSERIAL are tty drivers, so the conversion handler can be part of tty_compat_ioctl. In a perfect world, this would live in serial_core.c, but there are still a number of drivers that are not moved over to use that yet. If it were in serial_core, it could also live without the get_fs/set_fs hacks. CC: rmk+serial@xxxxxxxxxxxxxxxx CC: linux-serial@xxxxxxxxxxxxxxx Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Index: linux-cg/drivers/char/tty_io.c =================================================================== --- linux-cg.orig/drivers/char/tty_io.c 2005-11-05 14:22:34.000000000 +0100 +++ linux-cg/drivers/char/tty_io.c 2005-11-05 15:42:22.000000000 +0100 @@ -104,7 +104,6 @@ #include <linux/vt_kern.h> #include <linux/selection.h> #include <linux/devfs_fs_kernel.h> - #include <linux/kmod.h> #undef TTY_DEBUG_HANGUP @@ -153,7 +152,7 @@ static int tty_release(struct inode *, struct file *); int tty_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg); -long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg); +static long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg); static int tty_fasync(int fd, struct file * filp, int on); static void release_mem(struct tty_struct *tty, int idx); @@ -2437,7 +2436,75 @@ #ifdef CONFIG_COMPAT -long tty_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +#include <linux/serial.h> + +struct serial_struct32 { + compat_int_t type; + compat_int_t line; + compat_uint_t port; + compat_int_t irq; + compat_int_t flags; + compat_int_t xmit_fifo_size; + compat_int_t custom_divisor; + compat_int_t baud_base; + unsigned short close_delay; + char io_type; + char reserved_char[1]; + compat_int_t hub6; + unsigned short closing_wait; /* time to wait before closing */ + unsigned short closing_wait2; /* no longer used... */ + compat_uint_t iomem_base; + unsigned short iomem_reg_shift; + unsigned int port_high; + /* compat_ulong_t iomap_base FIXME */ + compat_int_t reserved[1]; +}; + +static int serial_struct_ioctl(struct inode *inode, struct file *file, + unsigned cmd, unsigned long arg) +{ + typedef struct serial_struct SS; + typedef struct serial_struct32 SS32; + struct serial_struct32 __user *ss32 = compat_ptr(arg); + int err; + struct serial_struct ss; + mm_segment_t oldseg = get_fs(); + __u32 udata; + + if (cmd == TIOCSSERIAL) { + if (!access_ok(VERIFY_READ, ss32, sizeof(SS32))) + return -EFAULT; + if (__copy_from_user + (&ss, ss32, offsetof(SS32, iomem_base))) + return -EFAULT; + __get_user(udata, &ss32->iomem_base); + ss.iomem_base = compat_ptr(udata); + __get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); + __get_user(ss.port_high, &ss32->port_high); + ss.iomap_base = 0UL; + } + set_fs(KERNEL_DS); + lock_kernel(); + err = tty_ioctl(inode, file, cmd, (unsigned long) (&ss)); + unlock_kernel(); + set_fs(oldseg); + if (cmd == TIOCGSERIAL && err >= 0) { + if (!access_ok(VERIFY_WRITE, ss32, sizeof(SS32))) + return -EFAULT; + if (__copy_to_user(ss32, &ss, offsetof(SS32, iomem_base))) + return -EFAULT; + __put_user((unsigned long) ss.iomem_base >> 32 ? + 0xffffffff : (unsigned) (unsigned long) ss. + iomem_base, &ss32->iomem_base); + __put_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); + __put_user(ss.port_high, &ss32->port_high); + + } + return err; +} + +static long tty_compat_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) { struct inode *inode = file->f_dentry->d_inode; struct tty_struct *tty; @@ -2499,6 +2566,14 @@ /* enter the native code path for those numbers known * to be compatible */ switch (cmd) { + case TIOCGSERIAL: + case TIOCSSERIAL: + ret = serial_struct_ioctl(inode, file, cmd, arg); + break; +#ifdef TIOCGLTC + case TIOCGLTC: + case TIOCSLTC: +#endif case TCFLSH: case TCGETA: case TCGETS: Index: linux-cg/fs/compat_ioctl.c =================================================================== --- linux-cg.orig/fs/compat_ioctl.c 2005-11-05 14:47:57.000000000 +0100 +++ linux-cg/fs/compat_ioctl.c 2005-11-05 15:46:46.000000000 +0100 @@ -356,67 +356,6 @@ #define HIDPGETCONNLIST _IOR('H', 210, int) #define HIDPGETCONNINFO _IOR('H', 211, int) -struct serial_struct32 { - compat_int_t type; - compat_int_t line; - compat_uint_t port; - compat_int_t irq; - compat_int_t flags; - compat_int_t xmit_fifo_size; - compat_int_t custom_divisor; - compat_int_t baud_base; - unsigned short close_delay; - char io_type; - char reserved_char[1]; - compat_int_t hub6; - unsigned short closing_wait; /* time to wait before closing */ - unsigned short closing_wait2; /* no longer used... */ - compat_uint_t iomem_base; - unsigned short iomem_reg_shift; - unsigned int port_high; - /* compat_ulong_t iomap_base FIXME */ - compat_int_t reserved[1]; -}; - -static int serial_struct_ioctl(unsigned fd, unsigned cmd, unsigned long arg) -{ - typedef struct serial_struct SS; - typedef struct serial_struct32 SS32; - struct serial_struct32 __user *ss32 = compat_ptr(arg); - int err; - struct serial_struct ss; - mm_segment_t oldseg = get_fs(); - __u32 udata; - - if (cmd == TIOCSSERIAL) { - if (!access_ok(VERIFY_READ, ss32, sizeof(SS32))) - return -EFAULT; - if (__copy_from_user(&ss, ss32, offsetof(SS32, iomem_base))) - return -EFAULT; - __get_user(udata, &ss32->iomem_base); - ss.iomem_base = compat_ptr(udata); - __get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); - __get_user(ss.port_high, &ss32->port_high); - ss.iomap_base = 0UL; - } - set_fs(KERNEL_DS); - err = sys_ioctl(fd,cmd,(unsigned long)(&ss)); - set_fs(oldseg); - if (cmd == TIOCGSERIAL && err >= 0) { - if (!access_ok(VERIFY_WRITE, ss32, sizeof(SS32))) - return -EFAULT; - if (__copy_to_user(ss32,&ss,offsetof(SS32,iomem_base))) - return -EFAULT; - __put_user((unsigned long)ss.iomem_base >> 32 ? - 0xffffffff : (unsigned)(unsigned long)ss.iomem_base, - &ss32->iomem_base); - __put_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift); - __put_user(ss.port_high, &ss32->port_high); - - } - return err; -} - #undef CODE #endif @@ -425,13 +364,5 @@ HANDLE_IOCTL(MTIOCPOS32, mt_ioctl_trans) HANDLE_IOCTL(CDROMREADAUDIO, cdrom_ioctl_trans) HANDLE_IOCTL(CDROM_SEND_PACKET, cdrom_ioctl_trans) -/* Serial */ -HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl) -HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl) -#ifdef TIOCGLTC -COMPATIBLE_IOCTL(TIOCGLTC) -COMPATIBLE_IOCTL(TIOCSLTC) -#endif - #undef DECLARES #endif -- - To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html

Subject: [PATCH 00/25] reduce code in fs/compat_ioctl.c - msg#00005

List: linux.serial

Previous Message by Date: click to view message preview

Next Message by Date: click to view message preview

Previous Message by Thread: click to view message preview

Next Message by Thread: click to view message preview

Recent Threads

Recent Comments: