From: Tomas Szepe <szepe@pinerecords.com>
To: Marcelo Tosatti <marcelo@conectiva.com.br>,
"David S. Miller" <davem@redhat.com>,
linux-kernel@vger.kernel.org, aurora-sparc-devel@linuxpower.org
Subject: [patch] 2.4.20-pre4 sparc32 fixup
Date: Sat, 24 Aug 2002 11:33:04 +0200 [thread overview]
Message-ID: <20020824093304.GU14278@louise.pinerecords.com> (raw)
Hi,
The patch inlined below gets 2.4.20-pre4 to compile (and boot) on my
testmachine again. Trivial stuff mostly, dunno about the page_to_phys
macro, though -- DaveM, could you have a look at it?
Aurora people united please try booting this on your sparc32 oldtimers
if you find the time.
Tomas
diff -urN linux-2.4.20-pre4/include/asm-sparc/io.h linux-2.4.20-pre4-sparc32/include/asm-sparc/io.h
--- linux-2.4.20-pre4/include/asm-sparc/io.h 2001-11-23 14:25:29.000000000 +0100
+++ linux-2.4.20-pre4-sparc32/include/asm-sparc/io.h 2002-08-24 10:47:55.000000000 +0200
@@ -14,6 +14,9 @@
#define virt_to_bus virt_to_phys
#define bus_to_virt phys_to_virt
+extern unsigned long phys_base;
+#define page_to_phys(page) ((((page) - mem_map) << PAGE_SHIFT) + phys_base)
+
static __inline__ u32 flip_dword (u32 d)
{
return ((d&0xff)<<24) | (((d>>8)&0xff)<<16) | (((d>>16)&0xff)<<8)| ((d>>24)&0xff);
diff -urN linux-2.4.20-pre4/include/asm-sparc/pci.h linux-2.4.20-pre4-sparc32/include/asm-sparc/pci.h
--- linux-2.4.20-pre4/include/asm-sparc/pci.h 2002-02-26 14:10:15.000000000 +0100
+++ linux-2.4.20-pre4-sparc32/include/asm-sparc/pci.h 2002-08-24 10:48:38.000000000 +0200
@@ -27,6 +27,12 @@
/* Dynamic DMA mapping stuff.
*/
+/* The PCI address space does not equal the physical memory
+ * address space. The networking and block device layers use
+ * this boolean for bounce buffer decisions.
+ */
+#define PCI_DMA_BUS_IS_PHYS (0)
+
#include <asm/scatterlist.h>
struct pci_dev;
diff -urN linux-2.4.20-pre4/include/asm-sparc/types.h linux-2.4.20-pre4-sparc32/include/asm-sparc/types.h
--- linux-2.4.20-pre4/include/asm-sparc/types.h 2000-02-01 08:37:19.000000000 +0100
+++ linux-2.4.20-pre4-sparc32/include/asm-sparc/types.h 2002-08-24 10:28:09.000000000 +0200
@@ -46,6 +46,7 @@
#define BITS_PER_LONG 32
typedef u32 dma_addr_t;
+typedef u64 dma64_addr_t;
#endif /* __KERNEL__ */
diff -urN linux-2.4.20-pre4/include/asm-sparc64/io.h linux-2.4.20-pre4-sparc32/include/asm-sparc64/io.h
--- linux-2.4.20-pre4/include/asm-sparc64/io.h 2002-02-26 14:10:15.000000000 +0100
+++ linux-2.4.20-pre4-sparc32/include/asm-sparc64/io.h 2002-08-24 10:37:45.000000000 +0200
@@ -19,7 +19,7 @@
#define bus_to_virt bus_to_virt_not_defined_use_pci_map
extern unsigned long phys_base;
-#define page_to_phys(page) ((((page) - mem_map) << PAGE_SHIFT)+phys_base)
+#define page_to_phys(page) ((((page) - mem_map) << PAGE_SHIFT) + phys_base)
/* Different PCI controllers we support have their PCI MEM space
* mapped to an either 2GB (Psycho) or 4GB (Sabre) aligned area,
diff -urN linux-2.4.20-pre4/include/linux/blkdev.h linux-2.4.20-pre4-sparc32/include/linux/blkdev.h
--- linux-2.4.20-pre4/include/linux/blkdev.h 2002-08-24 10:55:21.000000000 +0200
+++ linux-2.4.20-pre4-sparc32/include/linux/blkdev.h 2002-08-24 10:48:08.000000000 +0200
@@ -6,6 +6,7 @@
#include <linux/genhd.h>
#include <linux/tqueue.h>
#include <linux/list.h>
+#include <linux/mm.h>
#include <asm/io.h>
next reply other threads:[~2002-08-24 9:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-08-24 9:33 Tomas Szepe [this message]
2002-08-24 9:19 ` David S. Miller
2002-08-24 9:50 ` Tomas Szepe
2002-08-24 10:06 ` David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020824093304.GU14278@louise.pinerecords.com \
--to=szepe@pinerecords.com \
--cc=aurora-sparc-devel@linuxpower.org \
--cc=davem@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®