From owner-freebsd-sparc64@freebsd.org Thu Mar 3 18:36:28 2016 Return-Path: Delivered-To: freebsd-sparc64@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52994A934AB for ; Thu, 3 Mar 2016 18:36:28 +0000 (UTC) (envelope-from jacob.ritorto@gmail.com) Received: from mail-wm0-x22d.google.com (mail-wm0-x22d.google.com [IPv6:2a00:1450:400c:c09::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF047C97 for ; Thu, 3 Mar 2016 18:36:27 +0000 (UTC) (envelope-from jacob.ritorto@gmail.com) Received: by mail-wm0-x22d.google.com with SMTP id l68so2678028wml.0 for ; Thu, 03 Mar 2016 10:36:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=GoTRTh7vzO1qqktO9/a71+G5wi1DmQKvZ3/xgAbUScY=; b=bbSVvvjS1gqS2iz3e3gMDX5awIkiCb+hFur9kbgqnSnpkF6Pxhf+n90IedG8DZFocJ ZoOJfNFAYGwAJba2yF/lomhqnNMpeJ+aPDmFBY3FQZB17Pbi7NuvEL7FiwBu0eC0hHI5 k0S5guLUJBtTRCCN3xN65nxmy+DXg/GNUkVcawGstz+gdpmvp0R/Jq8N+Bs0E3phqVcb mw17jyYAOTQlh8WHFOfw1HK2o7BCH6WO08EqSF4hQS7LpRVP0JtFj6A5Xd6+Feg2pHoJ uJP5nru9+8rj6ywNFgcdtarq/XHAVq9T05v16vkhiMIdoi02ORPGJcsMjY91BJlmXUri 7egA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=GoTRTh7vzO1qqktO9/a71+G5wi1DmQKvZ3/xgAbUScY=; b=CtwqKw1ughV+TM96RUXx4w2KbPt0+EkL1vAJvA/wUtDpJSz7tLEP4+sTDDUb3iFdH8 r2OgVBiIyPzeU+gzkuvuTHzd+OMChcgx6FqRCIbBSddAoZ0j9FunP2ZVSD4+3n1UM/3/ ztGiLhomK+/Gph7MBlvTAolT8wXV5o8I9jhjKo7L13K2ifTMMX/AmfIMn7OYvtQGfw9X PiqxIQ37OOzzML3eurdcRKUszaQLknn7wybk7L76sd9U3zLrP8trq7AtCWLYUJ/ZbRXo 8CVU2Y/gT0XZVQc34TurHFp1L6pOnqAMdRD7GK9P2hVGpUa3gOJhWJ5WXbp9psVUn5Tg ASKw== X-Gm-Message-State: AD7BkJIdBtCYaP/jEiL3CodImk+ggrD6KYJCxeHrBal2cjiCViHAPMxJ2v6wlv0ieAdDjig/DbCIGksncdgPUA== MIME-Version: 1.0 X-Received: by 10.28.146.202 with SMTP id u193mr569425wmd.82.1457030185960; Thu, 03 Mar 2016 10:36:25 -0800 (PST) Received: by 10.27.54.10 with HTTP; Thu, 3 Mar 2016 10:36:25 -0800 (PST) In-Reply-To: <1456946143.3212.2.camel@atlas.lerwick.hopto.org> References: <1456946143.3212.2.camel@atlas.lerwick.hopto.org> Date: Thu, 3 Mar 2016 13:36:25 -0500 Message-ID: Subject: Re: Testing an importing OF PCI implementations patch From: Jacob Ritorto To: Craig Butler Cc: Marcin Mazurek , "freebsd-sparc64@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 X-BeenThere: freebsd-sparc64@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Porting FreeBSD to the Sparc List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2016 18:36:28 -0000 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@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 |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