Merge tag 'char-misc-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver patch pull request for 5.1-rc1. The largest thing by far is the new habanalabs driver for their AI accelerator chip. For now it is in the drivers/misc directory but will probably move to a new directory soon along with other drivers of this type. Other than that, just the usual set of individual driver updates and fixes. There's an "odd" merge in here from the DRM tree that they asked me to do as the MEI driver is starting to interact with the i915 driver, and it needed some coordination. All of those patches have been properly acked by the relevant subsystem maintainers. All of these have been in linux-next with no reported issues, most for quite some time" * tag 'char-misc-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (219 commits) habanalabs: adjust Kconfig to fix build errors habanalabs: use %px instead of %p in error print habanalabs: use do_div for 64-bit divisions intel_th: gth: Fix an off-by-one in output unassigning habanalabs: fix little-endian<->cpu conversion warnings habanalabs: use NULL to initialize array of pointers habanalabs: fix little-endian<->cpu conversion warnings habanalabs: soft-reset device if context-switch fails habanalabs: print pointer using %p habanalabs: fix memory leak with CBs with unaligned size habanalabs: return correct error code on MMU mapping failure habanalabs: add comments in uapi/misc/habanalabs.h habanalabs: extend QMAN0 job timeout habanalabs: set DMA0 completion to SOB 1007 habanalabs: fix validation of WREG32 to DMA completion habanalabs: fix mmu cache registers init habanalabs: disable CPU access on timeouts habanalabs: add MMU DRAM default page mapping habanalabs: Dissociate RAZWI info from event types misc/habanalabs: adjust Kconfig to fix build errors ...
This commit is contained in:
Linus Torvalds
@@ -1682,7 +1682,6 @@ if RUNTIME_TESTING_MENU
|
||||
config LKDTM
|
||||
tristate "Linux Kernel Dump Test Tool Module"
|
||||
depends on DEBUG_FS
|
||||
depends on BLOCK
|
||||
help
|
||||
This module enables testing of the different dumping mechanisms by
|
||||
inducing system failures at predefined crash points.
|
||||
|
||||
140
lib/iomap.c
140
lib/iomap.c
@@ -65,8 +65,9 @@ static void bad_io_access(unsigned long port, const char *access)
|
||||
#endif
|
||||
|
||||
#ifndef mmio_read16be
|
||||
#define mmio_read16be(addr) be16_to_cpu(__raw_readw(addr))
|
||||
#define mmio_read32be(addr) be32_to_cpu(__raw_readl(addr))
|
||||
#define mmio_read16be(addr) swab16(readw(addr))
|
||||
#define mmio_read32be(addr) swab32(readl(addr))
|
||||
#define mmio_read64be(addr) swab64(readq(addr))
|
||||
#endif
|
||||
|
||||
unsigned int ioread8(void __iomem *addr)
|
||||
@@ -100,14 +101,89 @@ EXPORT_SYMBOL(ioread16be);
|
||||
EXPORT_SYMBOL(ioread32);
|
||||
EXPORT_SYMBOL(ioread32be);
|
||||
|
||||
#ifdef readq
|
||||
static u64 pio_read64_lo_hi(unsigned long port)
|
||||
{
|
||||
u64 lo, hi;
|
||||
|
||||
lo = inl(port);
|
||||
hi = inl(port + sizeof(u32));
|
||||
|
||||
return lo | (hi << 32);
|
||||
}
|
||||
|
||||
static u64 pio_read64_hi_lo(unsigned long port)
|
||||
{
|
||||
u64 lo, hi;
|
||||
|
||||
hi = inl(port + sizeof(u32));
|
||||
lo = inl(port);
|
||||
|
||||
return lo | (hi << 32);
|
||||
}
|
||||
|
||||
static u64 pio_read64be_lo_hi(unsigned long port)
|
||||
{
|
||||
u64 lo, hi;
|
||||
|
||||
lo = pio_read32be(port + sizeof(u32));
|
||||
hi = pio_read32be(port);
|
||||
|
||||
return lo | (hi << 32);
|
||||
}
|
||||
|
||||
static u64 pio_read64be_hi_lo(unsigned long port)
|
||||
{
|
||||
u64 lo, hi;
|
||||
|
||||
hi = pio_read32be(port);
|
||||
lo = pio_read32be(port + sizeof(u32));
|
||||
|
||||
return lo | (hi << 32);
|
||||
}
|
||||
|
||||
u64 ioread64_lo_hi(void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, return pio_read64_lo_hi(port), return readq(addr));
|
||||
return 0xffffffffffffffffULL;
|
||||
}
|
||||
|
||||
u64 ioread64_hi_lo(void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, return pio_read64_hi_lo(port), return readq(addr));
|
||||
return 0xffffffffffffffffULL;
|
||||
}
|
||||
|
||||
u64 ioread64be_lo_hi(void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, return pio_read64be_lo_hi(port),
|
||||
return mmio_read64be(addr));
|
||||
return 0xffffffffffffffffULL;
|
||||
}
|
||||
|
||||
u64 ioread64be_hi_lo(void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, return pio_read64be_hi_lo(port),
|
||||
return mmio_read64be(addr));
|
||||
return 0xffffffffffffffffULL;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(ioread64_lo_hi);
|
||||
EXPORT_SYMBOL(ioread64_hi_lo);
|
||||
EXPORT_SYMBOL(ioread64be_lo_hi);
|
||||
EXPORT_SYMBOL(ioread64be_hi_lo);
|
||||
|
||||
#endif /* readq */
|
||||
|
||||
#ifndef pio_write16be
|
||||
#define pio_write16be(val,port) outw(swab16(val),port)
|
||||
#define pio_write32be(val,port) outl(swab32(val),port)
|
||||
#endif
|
||||
|
||||
#ifndef mmio_write16be
|
||||
#define mmio_write16be(val,port) __raw_writew(be16_to_cpu(val),port)
|
||||
#define mmio_write32be(val,port) __raw_writel(be32_to_cpu(val),port)
|
||||
#define mmio_write16be(val,port) writew(swab16(val),port)
|
||||
#define mmio_write32be(val,port) writel(swab32(val),port)
|
||||
#define mmio_write64be(val,port) writeq(swab64(val),port)
|
||||
#endif
|
||||
|
||||
void iowrite8(u8 val, void __iomem *addr)
|
||||
@@ -136,6 +212,62 @@ EXPORT_SYMBOL(iowrite16be);
|
||||
EXPORT_SYMBOL(iowrite32);
|
||||
EXPORT_SYMBOL(iowrite32be);
|
||||
|
||||
#ifdef writeq
|
||||
static void pio_write64_lo_hi(u64 val, unsigned long port)
|
||||
{
|
||||
outl(val, port);
|
||||
outl(val >> 32, port + sizeof(u32));
|
||||
}
|
||||
|
||||
static void pio_write64_hi_lo(u64 val, unsigned long port)
|
||||
{
|
||||
outl(val >> 32, port + sizeof(u32));
|
||||
outl(val, port);
|
||||
}
|
||||
|
||||
static void pio_write64be_lo_hi(u64 val, unsigned long port)
|
||||
{
|
||||
pio_write32be(val, port + sizeof(u32));
|
||||
pio_write32be(val >> 32, port);
|
||||
}
|
||||
|
||||
static void pio_write64be_hi_lo(u64 val, unsigned long port)
|
||||
{
|
||||
pio_write32be(val >> 32, port);
|
||||
pio_write32be(val, port + sizeof(u32));
|
||||
}
|
||||
|
||||
void iowrite64_lo_hi(u64 val, void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, pio_write64_lo_hi(val, port),
|
||||
writeq(val, addr));
|
||||
}
|
||||
|
||||
void iowrite64_hi_lo(u64 val, void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, pio_write64_hi_lo(val, port),
|
||||
writeq(val, addr));
|
||||
}
|
||||
|
||||
void iowrite64be_lo_hi(u64 val, void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, pio_write64be_lo_hi(val, port),
|
||||
mmio_write64be(val, addr));
|
||||
}
|
||||
|
||||
void iowrite64be_hi_lo(u64 val, void __iomem *addr)
|
||||
{
|
||||
IO_COND(addr, pio_write64be_hi_lo(val, port),
|
||||
mmio_write64be(val, addr));
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(iowrite64_lo_hi);
|
||||
EXPORT_SYMBOL(iowrite64_hi_lo);
|
||||
EXPORT_SYMBOL(iowrite64be_lo_hi);
|
||||
EXPORT_SYMBOL(iowrite64be_hi_lo);
|
||||
|
||||
#endif /* readq */
|
||||
|
||||
/*
|
||||
* These are the "repeat MMIO read/write" functions.
|
||||
* Note the "__raw" accesses, since we don't want to
|
||||
|
||||
Reference in New Issue
Block a user