Testing an importing OF PCI implementations patch

Thu Mar 3 18:36:28 UTC 2016

I just tried it on my Ultra5 against a brand new install
of FreeBSD-11.0-CURRENT-sparc64-20160217-r295683 (which otherwise seems to
run quite nicely) and got no love.  patch can't even find the relevant
files to patch, apparently.  Or did I get something wrong (see below)?

I also tried to install latest CURRENT on my G4 and G3 Macintoshes, but
they both die/hang after kernel load during device enumeration.   Is there
a particular / other FreeBSD version you'd like me to try?

root at sunultra5:~ # patch <
~jritorto/0001-Import-portions-of-implementation-the-PowerPC-PCI-de.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From 211eed9b3a5929ca36ea713736b5ceb307ee685f Mon Sep 17 00:00:00 2001
|From: Marcin Mazurek <mma at semihalf.com>
|Date: Tue, 8 Dec 2015 17:29:30 +0100
|Subject: [PATCH] Import portions of implementation the PowerPC PCI device
into
| new file ofwpci.c that other platform can share. The files ofw_pci.c and
| ofw_pci.h from sys/powerpc/ofw no longer exist. All required declarations
are
| moved to sys/dev/ofw/ofwpci.h.
|
|This creates a new ofw_pci_write_ivar() function and modifies
|ofw_pci_nranges(), ofw_pci_read_ivar(), ofw_pci_route_interrupt() methods.
|Most functions contain existing ppc implementations in the majority
unchanged.
|Now there is no need to have multiple identical copies of methods
|for various architectures.
|
|Obtained from: Semihalf
|Sponsored by: Annapurna Labs
|---
| sys/conf/files.arm                 |   1 +
| sys/conf/files.arm64               |   1 +
| sys/conf/files.i386                |   1 +
| sys/conf/files.mips                |   3 +
| sys/conf/files.powerpc             |   2 +-
| sys/dev/ofw/ofwpci.c               | 624
+++++++++++++++++++++++++++++++++++++
| sys/dev/ofw/ofwpci.h               |  83 +++++
| sys/powerpc/mpc85xx/pci_mpc85xx.c  |   3 +-
| sys/powerpc/ofw/ofw_pci.c          | 558 ---------------------------------
| sys/powerpc/ofw/ofw_pci.h          |  74 -----
| sys/powerpc/powermac/cpcht.c       |   2 +-
| sys/powerpc/powermac/grackle.c     |   5 +-
| sys/powerpc/powermac/uninorthpci.c |   5 +-
| sys/powerpc/powermac/uninorthvar.h |   2 +-
| sys/powerpc/pseries/rtas_pci.c     |   5 +-
| 15 files changed, 723 insertions(+), 646 deletions(-)
| create mode 100644 sys/dev/ofw/ofwpci.c
| create mode 100644 sys/dev/ofw/ofwpci.h
| delete mode 100644 sys/powerpc/ofw/ofw_pci.c
| delete mode 100644 sys/powerpc/ofw/ofw_pci.h
|
|diff --git a/sys/conf/files.arm b/sys/conf/files.arm
|index 2407616..c67b941 100644
|--- a/sys/conf/files.arm
|+++ b/sys/conf/files.arm
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 103.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
|index 8f5f10a..b1fa207 100644
|--- a/sys/conf/files.arm64
|+++ b/sys/conf/files.arm64
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 66.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
|index b065165..7d70a4f 100644
|--- a/sys/conf/files.i386
|+++ b/sys/conf/files.i386
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 285.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/conf/files.mips b/sys/conf/files.mips
|index 91d53aa..4cacac4 100644
|--- a/sys/conf/files.mips
|+++ b/sys/conf/files.mips
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 92.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
|index 0a1e7c1..e39343b 100644
|--- a/sys/conf/files.powerpc
|+++ b/sys/conf/files.powerpc
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 57.
Hunk #2 ignored at 146.
2 out of 2 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/dev/ofw/ofwpci.c b/sys/dev/ofw/ofwpci.c
|new file mode 100644
|index 0000000..38892c9
|--- /dev/null
|+++ b/sys/dev/ofw/ofwpci.c
--------------------------
Patching file ofwpci.c using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/dev/ofw/ofwpci.h b/sys/dev/ofw/ofwpci.h
|new file mode 100644
|index 0000000..e9825ad
|--- /dev/null
|+++ b/sys/dev/ofw/ofwpci.h
--------------------------
Patching file ofwpci.h using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c
b/sys/powerpc/mpc85xx/pci_mpc85xx.c
|index 4397ac0..5a141b6 100644
|--- a/sys/powerpc/mpc85xx/pci_mpc85xx.c
|+++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 58.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/ofw/ofw_pci.c b/sys/powerpc/ofw/ofw_pci.c
|deleted file mode 100644
|index 0ca5bc0..0000000
|--- a/sys/powerpc/ofw/ofw_pci.c
|+++ /dev/null
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 0.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/ofw/ofw_pci.h b/sys/powerpc/ofw/ofw_pci.h
|deleted file mode 100644
|index db883d4..0000000
|--- a/sys/powerpc/ofw/ofw_pci.h
|+++ /dev/null
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 0.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c
|index 765d946..3145689 100644
|--- a/sys/powerpc/powermac/cpcht.c
|+++ b/sys/powerpc/powermac/cpcht.c
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 51.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/powermac/grackle.c
b/sys/powerpc/powermac/grackle.c
|index 95d59a1..3d35fea 100644
|--- a/sys/powerpc/powermac/grackle.c
|+++ b/sys/powerpc/powermac/grackle.c
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 35.
Hunk #2 ignored at 52.
2 out of 2 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/powermac/uninorthpci.c
b/sys/powerpc/powermac/uninorthpci.c
|index 9da06ff..6149af5 100644
|--- a/sys/powerpc/powermac/uninorthpci.c
|+++ b/sys/powerpc/powermac/uninorthpci.c
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 32.
Hunk #2 ignored at 49.
2 out of 2 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/powermac/uninorthvar.h
b/sys/powerpc/powermac/uninorthvar.h
|index e08478d..e570da0 100644
|--- a/sys/powerpc/powermac/uninorthvar.h
|+++ b/sys/powerpc/powermac/uninorthvar.h
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 30.
1 out of 1 hunks ignored--saving rejects to Oops.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/powerpc/pseries/rtas_pci.c
b/sys/powerpc/pseries/rtas_pci.c
|index bb72b71..873168e 100644
|--- a/sys/powerpc/pseries/rtas_pci.c
|+++ b/sys/powerpc/pseries/rtas_pci.c
--------------------------
File to patch:
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 32.
Hunk #2 ignored at 50.
2 out of 2 hunks ignored--saving rejects to Oops.rej
Hmm...  Ignoring the trailing garbage.
done