22 May, 2010
2 commits
-
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.cAlso fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.Signed-off-by: Grant Likely
-
By moving dma_mask into pdev_archdata, and adding archdata to
struct of_device, it makes it possible to substitute of_device
with struct platform_device, which is a stepping stone to
removing the of_platform bus entirely.Signed-off-by: Grant Likely
21 May, 2010
2 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
qlcnic: adding co maintainer
ixgbe: add support for active DA cables
ixgbe: dcb, do not tag tc_prio_control frames
ixgbe: fix ixgbe_tx_is_paused logic
ixgbe: always enable vlan strip/insert when DCB is enabled
ixgbe: remove some redundant code in setting FCoE FIP filter
ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
ixgbe: fix header len when unsplit packet overflows to data buffer
ipv6: Never schedule DAD timer on dead address
ipv6: Use POSTDAD state
ipv6: Use state_lock to protect ifa state
ipv6: Replace inet6_ifaddr->dead with state
cxgb4: notify upper drivers if the device is already up when they load
cxgb4: keep interrupts available when the ports are brought down
cxgb4: fix initial addition of MAC address
cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
cnic: Convert cnic_local_flags to atomic ops.
can: Fix SJA1000 command register writes on SMP systems
bridge: fix build for CONFIG_SYSFS disabled
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
...Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
vlynq: make whole Kconfig-menu dependant on architecture
add descriptive comment for TIF_MEMDIE task flag declaration.
EEPROM: max6875: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: Header file cleanup
agp: use NULL instead of 0 when pointer is needed
rtc-v3020: make bitfield unsigned
PCI: make bitfield unsigned
jbd2: use NULL instead of 0 when pointer is needed
cciss: fix shadows sparse warning
doc: inode uses a mutex instead of a semaphore.
uml: i386: Avoid redefinition of NR_syscalls
fix "seperate" typos in comments
cocbalt_lcdfb: correct sections
doc: Change urls for sparse
Powerpc: wii: Fix typo in comment
i2o: cleanup some exit paths
Documentation/: it's -> its where appropriate
UML: Fix compiler warning due to missing task_struct declaration
UML: add kernel.h include to signal.c
...
19 May, 2010
3 commits
-
Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c -
This patch eliminates the node pointer from struct of_device and the
of_node (or prom_node) pointer from struct dev_archdata since the node
pointer is now part of struct device proper when CONFIG_OF is set, and
all users of the old pointer locations have already been converted over
to use device->of_node.Also remove dev_archdata_{get,set}_node() as it is no longer used by
anything.Signed-off-by: Grant Likely
-
The following structure elements duplicate the information in
'struct device.of_node' and so are being eliminated. This patch
makes all readers of these elements use device.of_node instead.(struct of_device *)->node
(struct dev_archdata *)->prom_node (sparc)
(struct dev_archdata *)->of_node (powerpc & microblaze)Signed-off-by: Grant Likely
14 May, 2010
2 commits
-
Signed-off-by: Andreas Dilger
Acked-by: KOSAKI Motohiro
Signed-off-by: Jiri Kosina -
There is necessary to flush whole dcache. Icache work should be
done in kernel/module.c.Signed-off-by: Michal Simek
13 May, 2010
6 commits
-
Export __strncpy_user, memory_size, ioremap_bot for modules.
Signed-off-by: Michal Simek
-
Remove eeh_add_device_tree_late which is powerpc specific code.
Signed-off-by: Michal Simek
-
CC arch/microblaze/kernel/cpu/cache.o
arch/microblaze/kernel/cpu/cache.c: In function '__invalidate_dcache_range_wb':
arch/microblaze/kernel/cpu/cache.c:398: warning: ISO C90 forbids mixed declarations and code
arch/microblaze/kernel/cpu/cache.c: In function '__flush_dcache_range_wb':
arch/microblaze/kernel/cpu/cache.c:509: warning: ISO C90 forbids mixed declaraSigned-off-by: Michal Simek
-
Modules that use copy_{to,from}_user(), memcpy(), and memset() fail to build
in certain circumstances.Signed-off-by: Steven J. Magnani
Signed-off-by: Michal Simek -
The Microblaze implementations of get_user() and (MMU) put_user() evaluate
the address argument more than once. This causes unexpected side-effects for
invocations that include increment operators, i.e. get_user(foo, bar++).This patch also removes the distinction between MMU and noMMU put_user().
Without the patch:
$ echo 1234567890 > /proc/sys/kernel/core_pattern
$ cat /proc/sys/kernel/core_pattern
12345Signed-off-by: Steven J. Magnani
-
schedule() should not be called with interrupts disabled.
Signed-off-by: Steven J. Magnani
Signed-off-by: Michal Simek
12 May, 2010
1 commit
-
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
07 May, 2010
2 commits
-
This reverts commit 39e0786d3cf39c6d2f47b4818ae2da8b8ebc9ce2.
On request from microblaze developers, they are going to handle
this differently.Signed-off-by: David S. Miller
-
NET_IP_ALIGN defaults to 2, no need to override.
NET_SKB_PAD is now 64, which is much larger than microblaze's
L1_CACHE_SIZE so no need to override that either.Signed-off-by: David S. Miller
06 May, 2010
20 commits
-
Signed-off-by: Michal Simek
-
1. Remove CACHE_ALL_LOOP2 macro because it is identical to CACHE_ALL_LOOP
2. Change BUG_ON to WARN_ON
3. Remove end aligned from CACHE_LOOP_LIMITS.
C implementation do not need aligned end address and ASM code do aligned
in their macros
4. ASM optimized CACHE_RANGE_LOOP_1/2 macros needs to get aligned end address.
Because end address is compound from start + size, end address is the first address
which is exclude.Here is the corresponding code which describe it.
+ int align = ~(line_length - 1);
+ end = ((end & align) == end) ? end - line_length : end & align;a) end is aligned:
it is necessary to subtruct line length because we don't want to work with
next cacheline
b) end address is not aligned:
Just align it to be ready for ASM code.Signed-off-by: Michal Simek
-
PCI_DMA_FROMDEVICE should call invalidation not flushing.
Signed-off-by: Michal Simek
-
Microblaze cacheline length is configurable and current cpu
uses two cacheline length 4 and 8.We are taking conservative maximum value to be sure that cacheline
alignment is satisfied for all cases.Here is the calculation for cacheline lenght 8 32bit=4Byte values
which is corresponding with SHIFT 5.Signed-off-by: Michal Simek
-
Show cache line length in /proc/cpuinfo.
Signed-off-by: Michal Simek
-
Based on PowerPC patche 52142e756e9bf6485d3d53596e8aff2e816a7253
PowerPC description:
On platforms doing non-coherent DMA (4xx, 8xx, ...), it's important
that the kmalloc minimum alignment is set to the cache line size, to
avoid sharing cache lines between different objects, so that DMA to
one of the objects doesn't corrupt the other.Signed-off-by: Michal Simek
-
Copy & paste error.
Signed-off-by: Michal Simek
-
This patch fix consistent code which had problems with consistent_free
function.
I am not sure if we need to call flush_tlb_all after it but it keeps
tlbs synced.
I added noMMU and MMU version together.Uncached shadow feature is not tested.
Signed-off-by: Michal Simek
-
Based on af407c6db16aa9ca63559076dbe620220a822580
and f41b177157718abe9a93868bb76e47d4a6f3681dSigned-off-by: Michal Simek
-
Remove ancient macros which are here from Linux-2.4
Signed-off-by: Michal Simek
-
Current implementation doesn't handle dcache_line_length
correctly that's why is better to use generic memcpy.Cache optimized function could be good way howto improve
performance but must be based on benchmarking not blind
function like this.Signed-off-by: Michal Simek
-
As explained in commit 1c0fe6e3bd, we want to call the architecture independent
oom killer when getting an unexplained OOM from handle_mm_fault, rather than
simply killing current.Cc: microblaze-uclinux@itee.uq.edu.au
Cc: Michal Simek
Cc: linux-arch@vger.kernel.org
Signed-off-by: Nick Piggin
Acked-by: David Rientjes
Acked-by: Michal Simek -
Fix divide exception message to say "divide by zero".
Signed-off-by: Randy Dunlap
Cc: Michal Simek
Cc: microblaze-uclinux@itee.uq.edu.au
Signed-off-by: Michal Simek -
It is necessary for several drivers.
Signed-off-by: Michal Simek
-
I found several function which we don't use that's why I am removing them.
Signed-off-by: Michal Simek
-
Remove section mismatch - based on ppc aproach.
WARNING: vmlinux.o(.text+0x64834): Section mismatch in reference
from the function __pte_alloc_kernel() to the function .init.text:early_get_page()
The function __pte_alloc_kernel() references
the function __init early_get_page().
This is often because __pte_alloc_kernel lacks a __init
annotation or the annotation of early_get_page is wrong.Signed-off-by: Michal Simek
-
_start is located in .text, which causes mismatch warnings with
machine_early_init() and start_kernel() in .init.text.Signed-off-by: Steven J. Magnani
Signed-off-by: Michal Simek -
Function traces on Microblaze don't include IRQ entry and exit arrows,
i.e.0) | memcpy_toiovec() {
0) ==========> |
0) | do_IRQ() {
...
0)
Signed-off-by: Michal Simek -
This change should be part of b26b2d494b659f988b4d75eb394dfa0ddac415c9
Origin description:
resource/PCI: align functions now return start of resource
As suggested by Linus, align functions should return the start
of a resource, not void. An update of "res->start" is no longer
necessary.Signed-off-by: Michal Simek
-
This change should be part of 89a74ecccd1f78e51faf6287e5c0e93a92ac096e
Origin description:
PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
No functional change; this converts loops that iterate from 0 to
PCI_BUS_NUM_RESOURCES through pci_bus resource[] table to use the
pci_bus_for_each_resource() iterator instead.This doesn't change the way resources are stored; it merely removes
dependencies on the fact that they're in a table.Signed-off-by: Michal Simek
29 Apr, 2010
1 commit
-
Currently, platforms using CONFIG_OF add a 'struct device_node *of_node'
to dev->archdata. However, with CONFIG_OF becoming generic for all
architectures, it makes sense for commonality to move it out of archdata
and into struct device proper.This patch adds a struct device_node *of_node member to struct device
and updates all locations which currently write the device_node pointer
into archdata to also update dev->of_node. Subsequent patches will
modify callers to use the archdata location and ultimately remove
the archdata member entirely.Signed-off-by: Grant Likely
Acked-by: Greg Kroah-Hartman
CC: Michal Simek
CC: Greg Kroah-Hartman
CC: Benjamin Herrenschmidt
CC: "David S. Miller"
CC: Stephen Rothwell
CC: Jeremy Kerr
CC: microblaze-uclinux@itee.uq.edu.au
CC: linux-kernel@vger.kernel.org
CC: linuxppc-dev@ozlabs.org
CC: sparclinux@vger.kernel.org
13 Apr, 2010
1 commit
-
This patch adds support for using the LL TEMAC Ethernet driver on
non-Virtex 5 platforms by adding support for accessing the Soft DMA
registers as if they were memory mapped instead of solely through the
DCR's (available on the Virtex 5).The patch also updates the driver so that it runs on the MicroBlaze.
The changes were tested on the PowerPC 440, PowerPC 405, and the
MicroBlaze platforms.Signed-off-by: John Tyner
Signed-off-by: John Linn
Acked-by: Grant Likely
Signed-off-by: David S. Miller
