Commit 29e0937b authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [VIDEO]: XVR-500 and XVR-2500 need FB=y.
  [SPARC32]: asm/system.h needs asm/smp.h
  [SPARC32]: Update defconfig.
  [SPARC32]: Fix sparc32 kdebug changes.
  [SPARC64]: Accept ebus_bus_type for generic DMA ops.
  [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling.
  [SCSI]: Add help text for SCSI_ESP_CORE.
  [SPARC] SBUS: display7seg.c needs asm/io.h
  [SPARC] SBUS: bbc_i2c.c needs asm/io.h
  [SPARC64]: Be more resiliant with PCI I/O space regs.
  [SERIAL] SUNHV: Add an ID string.
parents 140ff8b0 be35cf01
This diff is collapsed.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/psr.h> #include <asm/psr.h>
#include <asm/page.h> #include <asm/page.h>
#include <linux/kdebug.h> #include <asm/kdebug.h>
#include <asm/winmacro.h> #include <asm/winmacro.h>
#include <asm/thread_info.h> /* TI_UWINMASK */ #include <asm/thread_info.h> /* TI_UWINMASK */
#include <asm/errno.h> #include <asm/errno.h>
......
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.21 # Linux kernel version: 2.6.22-rc1
# Fri May 11 14:31:45 2007 # Mon May 14 04:17:48 2007
# #
CONFIG_SPARC=y CONFIG_SPARC=y
CONFIG_SPARC64=y CONFIG_SPARC64=y
...@@ -508,10 +508,6 @@ CONFIG_ISCSI_TCP=m ...@@ -508,10 +508,6 @@ CONFIG_ISCSI_TCP=m
# CONFIG_SCSI_ESP_CORE is not set # CONFIG_SCSI_ESP_CORE is not set
# CONFIG_SCSI_SUNESP is not set # CONFIG_SCSI_SUNESP is not set
# CONFIG_SCSI_SRP is not set # CONFIG_SCSI_SRP is not set
#
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
# CONFIG_ATA is not set # CONFIG_ATA is not set
# #
...@@ -568,10 +564,6 @@ CONFIG_DUMMY=m ...@@ -568,10 +564,6 @@ CONFIG_DUMMY=m
# ARCnet devices # ARCnet devices
# #
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
#
# PHY device support
#
# CONFIG_PHYLIB is not set # CONFIG_PHYLIB is not set
# #
...@@ -611,10 +603,7 @@ CONFIG_NET_PCI=y ...@@ -611,10 +603,7 @@ CONFIG_NET_PCI=y
# CONFIG_SUNDANCE is not set # CONFIG_SUNDANCE is not set
# CONFIG_VIA_RHINE is not set # CONFIG_VIA_RHINE is not set
# CONFIG_SC92031 is not set # CONFIG_SC92031 is not set
CONFIG_NETDEV_1000=y
#
# Ethernet (1000 Mbit)
#
# CONFIG_ACENIC is not set # CONFIG_ACENIC is not set
# CONFIG_DL2K is not set # CONFIG_DL2K is not set
CONFIG_E1000=m CONFIG_E1000=m
...@@ -634,10 +623,7 @@ CONFIG_TIGON3=m ...@@ -634,10 +623,7 @@ CONFIG_TIGON3=m
CONFIG_BNX2=m CONFIG_BNX2=m
# CONFIG_QLA3XXX is not set # CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set # CONFIG_ATL1 is not set
CONFIG_NETDEV_10000=y
#
# Ethernet (10000 Mbit)
#
# CONFIG_CHELSIO_T1 is not set # CONFIG_CHELSIO_T1 is not set
# CONFIG_CHELSIO_T3 is not set # CONFIG_CHELSIO_T3 is not set
# CONFIG_IXGB is not set # CONFIG_IXGB is not set
...@@ -667,10 +653,6 @@ CONFIG_MLX4_DEBUG=y ...@@ -667,10 +653,6 @@ CONFIG_MLX4_DEBUG=y
# CONFIG_USB_RTL8150 is not set # CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET_MII is not set # CONFIG_USB_USBNET_MII is not set
# CONFIG_USB_USBNET is not set # CONFIG_USB_USBNET is not set
#
# Wan interfaces
#
# CONFIG_WAN is not set # CONFIG_WAN is not set
# CONFIG_FDDI is not set # CONFIG_FDDI is not set
# CONFIG_HIPPI is not set # CONFIG_HIPPI is not set
......
...@@ -537,6 +537,13 @@ static int __init build_one_resource(struct device_node *parent, ...@@ -537,6 +537,13 @@ static int __init build_one_resource(struct device_node *parent,
return 0; return 0;
} }
/* When we miss an I/O space match on PCI, just pass it up
* to the next PCI bridge and/or controller.
*/
if (!strcmp(bus->name, "pci") &&
(addr[0] & 0x03000000) == 0x01000000)
return 0;
return 1; return 1;
} }
......
...@@ -561,6 +561,9 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t ...@@ -561,6 +561,9 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t
unsigned long flags, status; unsigned long flags, status;
int cnt, retries, this_cpu, prev_sent, i; int cnt, retries, this_cpu, prev_sent, i;
if (cpus_empty(mask))
return;
/* We have to do this whole thing with interrupts fully disabled. /* We have to do this whole thing with interrupts fully disabled.
* Otherwise if we send an xcall from interrupt context it will * Otherwise if we send an xcall from interrupt context it will
* corrupt both our mondo block and cpu list state. * corrupt both our mondo block and cpu list state.
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <asm/ebus.h> #include <asm/ebus.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm/bbc.h> #include <asm/bbc.h>
#include <asm/io.h>
#include "bbc_i2c.h" #include "bbc_i2c.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <asm/ebus.h> /* EBus device */ #include <asm/ebus.h> /* EBus device */
#include <asm/oplib.h> /* OpenProm Library */ #include <asm/oplib.h> /* OpenProm Library */
#include <asm/uaccess.h> /* put_/get_user */ #include <asm/uaccess.h> /* put_/get_user */
#include <asm/io.h>
#include <asm/display7seg.h> #include <asm/display7seg.h>
......
...@@ -1757,6 +1757,14 @@ config SCSI_ESP_CORE ...@@ -1757,6 +1757,14 @@ config SCSI_ESP_CORE
tristate "ESP Scsi Driver Core" tristate "ESP Scsi Driver Core"
depends on SCSI depends on SCSI
select SCSI_SPI_ATTRS select SCSI_SPI_ATTRS
help
This is a core driver for NCR53c9x based scsi chipsets,
also known as "ESP" for Emulex Scsi Processor or
Enhanced Scsi Processor. This driver does not exist by
itself, there are front-end drivers which, when enabled,
select and enable this driver. One example is SCSI_SUNESP.
These front-end drivers provide probing, DMA, and register
access support for the core driver.
config SCSI_SUNESP config SCSI_SUNESP
tristate "Sparc ESP Scsi Driver" tristate "Sparc ESP Scsi Driver"
......
...@@ -493,6 +493,10 @@ static struct of_device_id hv_match[] = { ...@@ -493,6 +493,10 @@ static struct of_device_id hv_match[] = {
.name = "console", .name = "console",
.compatible = "qcn", .compatible = "qcn",
}, },
{
.name = "console",
.compatible = "SUNW,sun4v-console",
},
{}, {},
}; };
MODULE_DEVICE_TABLE(of, hv_match); MODULE_DEVICE_TABLE(of, hv_match);
......
...@@ -1535,7 +1535,7 @@ config FB_LEO ...@@ -1535,7 +1535,7 @@ config FB_LEO
config FB_XVR500 config FB_XVR500
bool "Sun XVR-500 3DLABS Wildcat support" bool "Sun XVR-500 3DLABS Wildcat support"
depends on FB && PCI && SPARC64 depends on (FB = y) && PCI && SPARC64
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT
...@@ -1548,7 +1548,7 @@ config FB_XVR500 ...@@ -1548,7 +1548,7 @@ config FB_XVR500
config FB_XVR2500 config FB_XVR2500
bool "Sun XVR-2500 3DLABS Wildcat support" bool "Sun XVR-2500 3DLABS Wildcat support"
depends on FB && PCI && SPARC64 depends on (FB = y) && PCI && SPARC64
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT
......
...@@ -58,6 +58,10 @@ static inline void sp_enter_debugger(void) ...@@ -58,6 +58,10 @@ static inline void sp_enter_debugger(void)
sp_enter_debugger(); \ sp_enter_debugger(); \
} while(0) } while(0)
enum die_val {
DIE_UNUSED,
};
#endif /* !(__ASSEMBLY__) */ #endif /* !(__ASSEMBLY__) */
/* Some nice offset defines for assembler code. */ /* Some nice offset defines for assembler code. */
...@@ -66,8 +70,4 @@ static inline void sp_enter_debugger(void) ...@@ -66,8 +70,4 @@ static inline void sp_enter_debugger(void)
#define KDEBUG_DUNNO2_OFF 0x8 #define KDEBUG_DUNNO2_OFF 0x8
#define KDEBUG_TEACH_OFF 0xc #define KDEBUG_TEACH_OFF 0xc
enum die_val {
DIE_UNUSED,
};
#endif /* !(_SPARC_KDEBUG_H) */ #endif /* !(_SPARC_KDEBUG_H) */
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <asm/psr.h> #include <asm/psr.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/btfixup.h> #include <asm/btfixup.h>
#include <asm/smp.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
/* need struct page definitions */ /* need struct page definitions */
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/of_device.h>
static inline int static inline int
dma_supported(struct device *dev, u64 mask) dma_supported(struct device *dev, u64 mask)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_dma_supported(to_pci_dev(dev), mask); return pci_dma_supported(to_pci_dev(dev), mask);
} }
...@@ -21,7 +24,8 @@ dma_supported(struct device *dev, u64 mask) ...@@ -21,7 +24,8 @@ dma_supported(struct device *dev, u64 mask)
static inline int static inline int
dma_set_mask(struct device *dev, u64 dma_mask) dma_set_mask(struct device *dev, u64 dma_mask)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_set_dma_mask(to_pci_dev(dev), dma_mask); return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
} }
...@@ -30,7 +34,8 @@ static inline void * ...@@ -30,7 +34,8 @@ static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
gfp_t flag) gfp_t flag)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_iommu_ops->alloc_consistent(to_pci_dev(dev), size, dma_handle, flag); return pci_iommu_ops->alloc_consistent(to_pci_dev(dev), size, dma_handle, flag);
} }
...@@ -39,7 +44,8 @@ static inline void ...@@ -39,7 +44,8 @@ static inline void
dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
dma_addr_t dma_handle) dma_addr_t dma_handle)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle); pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
} }
...@@ -48,7 +54,8 @@ static inline dma_addr_t ...@@ -48,7 +54,8 @@ static inline dma_addr_t
dma_map_single(struct device *dev, void *cpu_addr, size_t size, dma_map_single(struct device *dev, void *cpu_addr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction); return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
} }
...@@ -57,7 +64,8 @@ static inline void ...@@ -57,7 +64,8 @@ static inline void
dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction); pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
} }
...@@ -67,7 +75,8 @@ dma_map_page(struct device *dev, struct page *page, ...@@ -67,7 +75,8 @@ dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, unsigned long offset, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction); return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
} }
...@@ -76,7 +85,8 @@ static inline void ...@@ -76,7 +85,8 @@ static inline void
dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction); pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
} }
...@@ -85,7 +95,8 @@ static inline int ...@@ -85,7 +95,8 @@ static inline int
dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction); return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
} }
...@@ -94,7 +105,8 @@ static inline void ...@@ -94,7 +105,8 @@ static inline void
dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction); pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
} }
...@@ -103,7 +115,8 @@ static inline void ...@@ -103,7 +115,8 @@ static inline void
dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size, dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle, pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,
size, (int)direction); size, (int)direction);
...@@ -113,7 +126,8 @@ static inline void ...@@ -113,7 +126,8 @@ static inline void
dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle, pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,
size, (int)direction); size, (int)direction);
...@@ -123,7 +137,8 @@ static inline void ...@@ -123,7 +137,8 @@ static inline void
dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction); pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction);
} }
...@@ -132,7 +147,8 @@ static inline void ...@@ -132,7 +147,8 @@ static inline void
dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems, dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction); pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment