From patchwork Tue Nov 3 04:35:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392628 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQH7f3xPDz9sTL for ; Tue, 3 Nov 2020 15:37:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mOn5Qtwn; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQH7f3CC3zDqT4 for ; Tue, 3 Nov 2020 15:37:18 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mOn5Qtwn; dkim-atps=neutral Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH5q1fKyzDqRg for ; Tue, 3 Nov 2020 15:35:40 +1100 (AEDT) Received: by mail-pf1-x442.google.com with SMTP id c20so13099933pfr.8 for ; Mon, 02 Nov 2020 20:35:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AqH91wod4zhrH4JP+K+qkPgKJrzcevKNxf/fTHSp6M4=; b=mOn5Qtwn7PbKBhB16A5c3h6EI5yAQsE7iZyJXGSsBRTgHKE6WKcIc/ExNFbF4TnbfU GeHOyr43SWIYaxYDOTNrWUIuA0AgVBk2rWFlNmDxsN5ugpXxCm62vEX68bCty7xoAt/u g8Hdw7fl/PinNc8pJRmOFZ4ORrZug3cby5d1FsSyZ9SmyhnDUC08tKvyxX7pussFu54B GP67pFRwSAChK10woWkK2ndMr3UuuZ44SLDd0bRX3XQar1b3WoOi0bdYW7ukwFdATrPz nW/3MH4M/JBb2pGndpg73ivAhLpjSxxfjyqk7i0oHoxEmJafC3CDYIeI+2xPwy410IKE zioA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AqH91wod4zhrH4JP+K+qkPgKJrzcevKNxf/fTHSp6M4=; b=n3fPn2mtADa/f5KDUnv93xJC4HbvEwVEQGk4h5bMq9/NjlhMJMrCBZPEUn6sNSjAtO /HBzu3gnvyYgHYoBruZ2BtZurwzjse0cR5N+i7FBPSyfReaP0SedRSW3e1B5W/Qf8OMP YQDHAIcywUJIOrsJ22Y24iCXyIieP/w6QWaFeE3mhlrNoW7gaaqWGnTDattfHYGZq3b0 2uko3B2ySvDq/P/QrAWXT+6mdPKqM43XzV7yumQpEaFibMBFnTt0mCUzDsRPvcPTXbCe QZzvQbPZKZP4YbY+tYLNbnVc7R4Snrhe2DVd+TJ9OcfB3xA2BV31IzENuwpNUycpIh0B TOfg== X-Gm-Message-State: AOAM5305wivhYG9fWvjl7EaA6Jq1937t4seH0iYKRiUS7spPwDjzyhx1 grbSnBe/2lgu4bgw0N8HnCT0yRQpA44= X-Google-Smtp-Source: ABdhPJx4khg67NY2pkMd8E5bMkHFnYSQB3B9AMGhFlfdun0djEV+IUsho1BbPOXWwIOiufgWQj8d6A== X-Received: by 2002:a17:90a:cb91:: with SMTP id a17mr1725729pju.220.1604378136343; Mon, 02 Nov 2020 20:35:36 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:35 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 01/18] powerpc/pci: Add ppc_md.discover_phbs() Date: Tue, 3 Nov 2020 15:35:06 +1100 Message-Id: <20201103043523.916109-1-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Mackerras , Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" On many powerpc platforms the discovery and initalisation of pci_controllers (PHBs) happens inside of setup_arch(). This is very early in boot (pre-initcalls) and means that we're initialising the PHB long before many basic kernel services (slab allocator, debugfs, a real ioremap) are available. On PowerNV this causes an additional problem since we map the PHB registers with ioremap(). As of commit d538aadc2718 ("powerpc/ioremap: warn on early use of ioremap()") a warning is printed because we're using the "incorrect" API to setup and MMIO mapping in searly boot. The kernel does provide early_ioremap(), but that is not intended to create long-lived MMIO mappings and a seperate warning is printed by generic code if early_ioremap() mappings are "leaked." This is all fixable with dumb hacks like using early_ioremap() to setup the initial mapping then replacing it with a real ioremap later on in boot, but it does raise the question: Why the hell are we setting up the PHB's this early in boot? The old and wise claim it's due to "hysterical rasins." Aside from amused grapes there doesn't appear to be any real reason to maintain the current behaviour. Already most of the newer embedded platforms perform PHB discovery in an arch_initcall and between the end of setup_arch() and the start of initcalls none of the generic kernel code does anything PCI related. On powerpc scanning PHBs occurs in a subsys_initcall so it should be possible to move the PHB discovery to a core, postcore or arch initcall. This patch adds the ppc_md.discover_phbs hook and a core_initcall stub that calls it. The core_initcalls are the earliest to be called so this will any possibly issues with dependency between initcalls. This isn't just an academic issue either since on pseries and PowerNV EEH init occurs in an arch_initcall and depends on the pci_controllers being available, similarly the creation of pci_dns occurs at core_initcall_sync (i.e. between core and postcore initcalls). These problems need to be addressed seperately. Cc: Paul Mackerras Cc: Christophe Leroy Signed-off-by: Oliver O'Halloran Reported-by: kernel test robot --- arch/powerpc/include/asm/machdep.h | 3 +++ arch/powerpc/kernel/pci-common.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 475687f24f4a..d319160d790c 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -59,6 +59,9 @@ struct machdep_calls { int (*pcibios_root_bridge_prepare)(struct pci_host_bridge *bridge); + /* finds all the pci_controllers present at boot */ + void (*discover_phbs)(void); + /* To setup PHBs when using automatic OF platform driver for PCI */ int (*pci_setup_phb)(struct pci_controller *host); diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index be108616a721..6265e7d1c697 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1625,3 +1625,13 @@ static void fixup_hide_host_resource_fsl(struct pci_dev *dev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_resource_fsl); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, fixup_hide_host_resource_fsl); + + +int __init discover_phbs(void) +{ + if (ppc_md.discover_phbs) + ppc_md.discover_phbs(); + + return 0; +} +core_initcall(discover_phbs); From patchwork Tue Nov 3 04:35:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392629 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQH9y3V64z9sTL for ; Tue, 3 Nov 2020 15:39:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Hf1IB78L; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQH9x738FzDq9S for ; Tue, 3 Nov 2020 15:39:17 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::641; helo=mail-pl1-x641.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Hf1IB78L; dkim-atps=neutral Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH5q1cwjzDqRf for ; Tue, 3 Nov 2020 15:35:41 +1100 (AEDT) Received: by mail-pl1-x641.google.com with SMTP id f21so7967076plr.5 for ; Mon, 02 Nov 2020 20:35:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WWQy/KGpQazwEdkBoXJDExW1MCb5ecC1N581bBUcpKY=; b=Hf1IB78Llrn2jHIxERu9ZAwC2jQ9/A4gsm16MfBeBrrK3QZ2YNl+CyH+Wi5Jv1xac7 zAAbTg0FhEbuGXkWdyDJMvcfB57m69+UMm1IVVddrRcL9sHI5pNtd5VolQkNklshuQ37 ru1fJmU5/eRvtEd/Qtod7ENcj7IFa+TbUu1WY2qOU4SQS4GUjvgbStgWP9RDPvk+AbZ4 HnrfdR9WWnPTp60PZFBSTdmPmxocfMui+unK5a17F0g76iaDNgEj3tRVp387ZSLvtUSM 9GcK0eMrKgfWl+azgq1JBY+hI4YtaYNGvXqXJkqNliarJgrT116CQBB0Nae9zWlgbqOU NF2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WWQy/KGpQazwEdkBoXJDExW1MCb5ecC1N581bBUcpKY=; b=tSoyXL7K6eVPU4PdQq/YAfJivFHJ4nTJzm6K6xnM6e1ilMkKGTq0gmw7uMI6OgQTbs IaRgPnEeaAyukM/S2ubsXzcyf/tEpwb4EJJ2wCYTKz17xMbDVlAdzvvXDmYeK1ncU3TZ cRsivFL6yNMq/5ozzazJhNPtQwZZtWE5bJsNywNg4zKXBOVrTDS81+SqlNolHWyQYb8B 7ctcVRrikunr37PW/Ql3f+eh2CBr7XTVN4onKwzysBSouDAQDYEJCyeGRgUUlhncneXZ 2lSnqlslXB0mbi13/OLsH5e6DDxmJBJIg6HXiyaQZ1MY9FapgscdlXkoWAtirkmhs6r4 z3MQ== X-Gm-Message-State: AOAM531SEZvA95wmFTEdDxfG7nVa6SMQC5MX2rCotRnHJjw6kQp55Qb8 +kY1QL3lLURmkyrJPzjiqCY04ph7a44= X-Google-Smtp-Source: ABdhPJyPW0mpxa0vKMcecTbbEuAQqb4YXagTI4+vImJUHJZuHZe9Pcdy2H89TxHjdYIMin8Nah4rbQ== X-Received: by 2002:a17:902:bc82:b029:d6:4ee5:87d0 with SMTP id bb2-20020a170902bc82b02900d64ee587d0mr23409710plb.40.1604378138304; Mon, 02 Nov 2020 20:35:38 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:37 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 02/18] powerpc/{powernv,pseries}: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:07 +1100 Message-Id: <20201103043523.916109-2-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Make powernv and pseries use ppc_mc.discover_phbs. These two platforms need to be done together because they both depends on pci_dn's being created from the DT. The pci_dn contains a pointer to the relevant pci_controller so they need to be created after the pci_controller structures are available, but before and before PCI devices are scanned. Currently this ordering is provided by initcalls and the sequence is: 1. PHBs are discovered (setup_arch) (early boot, pre-initcalls) 2. pci_dn are created from the unflattended DT (core initcall) 3. PHBs are scanned pcibios_init() (subsys initcall) The new ppc_md.discover_phbs() function is also a core_initcall so we can't guarantee ordering between the creations of pci_controllers and the creation of pci_dn's which require a pci_controller. We could use the postcore, or core_sync initcall levels, but it's cleaner to just move the pci_dn setup into the per-PHB inits which occur inside of .discover_phb() for these platforms. This brings the boot-time path in line with the PHB hotplug path that is used for pseries DLPAR operations too. Signed-off-by: Oliver O'Halloran --- arch/powerpc/kernel/pci_dn.c | 22 ---------------------- arch/powerpc/platforms/powernv/pci-ioda.c | 3 +++ arch/powerpc/platforms/powernv/setup.c | 4 +--- arch/powerpc/platforms/pseries/setup.c | 7 +++++-- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index 54e240597fd9..61571ae23953 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -481,28 +481,6 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb) pci_traverse_device_nodes(dn, add_pdn, phb); } -/** - * pci_devs_phb_init - Initialize phbs and pci devs under them. - * - * This routine walks over all phb's (pci-host bridges) on the - * system, and sets up assorted pci-related structures - * (including pci info in the device node structs) for each - * pci device found underneath. This routine runs once, - * early in the boot sequence. - */ -static int __init pci_devs_phb_init(void) -{ - struct pci_controller *phb, *tmp; - - /* This must be done first so the device nodes have valid pci info! */ - list_for_each_entry_safe(phb, tmp, &hose_list, list_node) - pci_devs_phb_init_dynamic(phb); - - return 0; -} - -core_initcall(pci_devs_phb_init); - static void pci_dev_pdn_setup(struct pci_dev *pdev) { struct pci_dn *pdn; diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 2b4ceb5e6ce4..d6815f03fee3 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -3176,6 +3176,9 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np, /* Remove M64 resource if we can't configure it successfully */ if (!phb->init_m64 || phb->init_m64(phb)) hose->mem_resources[1].flags = 0; + + /* create pci_dn's for DT nodes under this PHB */ + pci_devs_phb_init_dynamic(hose); } void __init pnv_pci_init_ioda2_phb(struct device_node *np) diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c index 9acaa0f131b9..92f5fa827909 100644 --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -162,9 +162,6 @@ static void __init pnv_setup_arch(void) /* Initialize SMP */ pnv_smp_init(); - /* Setup PCI */ - pnv_pci_init(); - /* Setup RTC and NVRAM callbacks */ if (firmware_has_feature(FW_FEATURE_OPAL)) opal_nvram_init(); @@ -524,6 +521,7 @@ define_machine(powernv) { .init_IRQ = pnv_init_IRQ, .show_cpuinfo = pnv_show_cpuinfo, .get_proc_freq = pnv_get_proc_freq, + .discover_phbs = pnv_pci_init, .progress = pnv_progress, .machine_shutdown = pnv_shutdown, .power_save = NULL, diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 633c45ec406d..e88b30d4b6cd 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -463,7 +463,7 @@ void pseries_little_endian_exceptions(void) } #endif -static void __init find_and_init_phbs(void) +static void __init pSeries_discover_phbs(void) { struct device_node *node; struct pci_controller *phb; @@ -481,6 +481,9 @@ static void __init find_and_init_phbs(void) pci_process_bridge_OF_ranges(phb, node, 0); isa_bridge_find_early(phb); phb->controller_ops = pseries_pci_controller_ops; + + /* create pci_dn's for DT nodes under this PHB */ + pci_devs_phb_init_dynamic(phb); } of_node_put(root); @@ -777,7 +780,6 @@ static void __init pSeries_setup_arch(void) /* Find and initialize PCI host bridges */ init_pci_config_tokens(); - find_and_init_phbs(); of_reconfig_notifier_register(&pci_dn_reconfig_nb); pSeries_nvram_init(); @@ -1041,6 +1043,7 @@ define_machine(pseries) { .init_IRQ = pseries_init_irq, .show_cpuinfo = pSeries_show_cpuinfo, .log_error = pSeries_log_error, + .discover_phbs = pSeries_discover_phbs, .pcibios_fixup = pSeries_final_fixup, .restart = rtas_restart, .halt = rtas_halt, From patchwork Tue Nov 3 04:35:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392630 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHDC29Fdz9sTL for ; Tue, 3 Nov 2020 15:41:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AFnpNcb9; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHDC1Bh6zDqB2 for ; Tue, 3 Nov 2020 15:41:15 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AFnpNcb9; dkim-atps=neutral Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH5s0xP7zDqRf for ; Tue, 3 Nov 2020 15:35:44 +1100 (AEDT) Received: by mail-pg1-x542.google.com with SMTP id 62so5407797pgg.12 for ; Mon, 02 Nov 2020 20:35:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cMf1RE1FgJIEOpVzKnxoKyobML/s2DJ3qBS6LP8HEaA=; b=AFnpNcb9N8lHLyS4RZHJr8p6RPlB+D9p+h1MUuAUBvCB3/L0iVkOSOuHXGMsLy5TD3 J08blaiKiYf3VnkJElNmIOccHlNHkqSk/LhWaaxcc1NmRgeYYw5N3v3UZw0mrYThha8e M+Yy6/MOGwvHqtPwoYj4jsODgCvhAMvN54CLwX8SFKCeyGapfhXh1wgRl6oyF4xyx5Fy ncmSbkqy0QuZ4dZ33Q1avDAxvap1eTt/DgniN6OxkfV7qXyBQmfeEvgaanUt6AStzWj2 +OdsOIDFyxwN/SDmOjb10RH5b6iyP/hAo+v8lQOx2FAu1wFoqknZ/At5UAx8Tk7p5syK DUaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cMf1RE1FgJIEOpVzKnxoKyobML/s2DJ3qBS6LP8HEaA=; b=NHwhYPaAjAg7/oOm/4+AFxngzk+0lpN068lGTw1M291MKJa48bQAlsk7wYunafBJMW rWcy6h/R8qfgKWvuGmJ6NDK5gFqNx/SEQ3JmnjGsYie88NzvQOwyGZN6A1nDKrG7WiBk OBmuSbFQAhVdGMDFwijOqK7qnWRCEXC7LW3cBFeFP36sB9fRr4/PaWo92k7IxOnNO67C 7iomKu/QWNkKBHjteyaOLFdkVLRY4iwxya7LMnncKkvBbGXG6IoaW29CSTERcwncN0YV DccccR4s2xfsltqxfEM/Wo4d/W8lKmM/yybtDCo/H72dJ0W83fjOYfxRtOqlK8BLBX8C Y1fA== X-Gm-Message-State: AOAM533LzhjIO5tFUn43knKX8ZkWf5dguPpkxm3SZih+eAUrMXjAuzic 3vKw5FFLlYv+XJ40/NNknlpYpTxtg8M= X-Google-Smtp-Source: ABdhPJxcPybkCLeEKI1uDWb3+J8QAC8JBXSHWrPrsFPFsbA+SeppiMv/OsAIRE88H3a8Nbl4iih69w== X-Received: by 2002:a17:90b:1106:: with SMTP id gi6mr1927245pjb.70.1604378140517; Mon, 02 Nov 2020 20:35:40 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:39 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 03/18] powerpc/maple: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:08 +1100 Message-Id: <20201103043523.916109-3-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- arch/powerpc/platforms/maple/setup.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index f7e66a2005b4..4e9ad5bf3efb 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -179,9 +179,6 @@ static void __init maple_setup_arch(void) #ifdef CONFIG_SMP smp_ops = &maple_smp_ops; #endif - /* Lookup PCI hosts */ - maple_pci_init(); - maple_use_rtas_reboot_and_halt_if_present(); printk(KERN_DEBUG "Using native/NAP idle loop\n"); @@ -351,6 +348,7 @@ define_machine(maple) { .name = "Maple", .probe = maple_probe, .setup_arch = maple_setup_arch, + .discover_phbs = maple_pci_init, .init_IRQ = maple_init_IRQ, .pci_irq_fixup = maple_pci_irq_fixup, .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq, From patchwork Tue Nov 3 04:35:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392631 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHG12CZNz9sTL for ; Tue, 3 Nov 2020 15:42:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YGdJhJse; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHG11kPmzDqTw for ; Tue, 3 Nov 2020 15:42:49 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::443; helo=mail-pf1-x443.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YGdJhJse; dkim-atps=neutral Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH5t0fvJzDqRf for ; Tue, 3 Nov 2020 15:35:45 +1100 (AEDT) Received: by mail-pf1-x443.google.com with SMTP id 72so6407458pfv.7 for ; Mon, 02 Nov 2020 20:35:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4MaVnrEusxnMfC02Fiqn5WXhl5UJquPzZDgMRzT03D0=; b=YGdJhJseQAwJCRQaMTMbTcjXCau9Gv1CK4dC1WXH8Gu1w0N5macx+deQ8yGCgwLpMk 1U9TOHXF2W8K6goslA7pQDRC0vZEd0Tn3opH9FT3esSNN/+A856Z5hOlzm/6oGq9qbFL ZfTgxXG6i3P5EbWm+6dnNlrDtY8rsJiMt2zBui4NakPuEGfR6F8u6P4iuWtxtB5izznD tq8R26xRPWQlW/xFwa3YBmof9aPpKNmuPd9o2DY7ep1RS38bGfvRoNb4fg5ujS22TXR1 1yenFp4/Nx5AaRkNyT89QlV6LQwcvNd5vSsOWJgjpAYlDyMsEUk76KVzGyKDtdxuNiUv 0PQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4MaVnrEusxnMfC02Fiqn5WXhl5UJquPzZDgMRzT03D0=; b=f8mRhfHHqQjpREwa31xUChTmU6PgiEx69WAo1pnD5pSOZ+FzdK918KGM1uDAJUO3YU WNROJzWUz4egmSFKhA8vZ/JWQ5ULAXKINJeo6UYuS858+1fBiAZJ1KuGuCEL4LlPLF53 WTDsSry/XB6M8a7QCcC+mfa4JGsKMipesRk/bUcHypgcUYShRTnnECIlAH4t2VnsfmJ2 hpBubuTgZICmOss2v+NycSFB3wGM8SGLQSOZHxP+D2EIW6tWXMJq2pl5nsk86ad54bnY jl2feFpyANSANaG1U3Va8sYez72wMoyytoTSjATcvCo8jDLV78hmLB95iryf3LqZq9Y1 Z+/Q== X-Gm-Message-State: AOAM531aUw/d/DhHQ1V7XowixF1+rUZRqjQ1aGajIqLd6a16M8U4Qz8J VzcmlLz/KN+jF3JVM3hAL5HL0fl/MYs= X-Google-Smtp-Source: ABdhPJwf/35LH4JKNw/oFekOD/vCodHKiacjl5tCbejHWumVhnb1Y9m8/F0oUDwu/fuWfRKC+NU6jQ== X-Received: by 2002:a65:6649:: with SMTP id z9mr11067182pgv.18.1604378142563; Mon, 02 Nov 2020 20:35:42 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:42 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 04/18] powerpc/512x: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:09 +1100 Message-Id: <20201103043523.916109-4-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- only compile tested --- arch/powerpc/platforms/512x/mpc5121_ads.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c index 6303fbfc4e4f..9d030c2e0004 100644 --- a/arch/powerpc/platforms/512x/mpc5121_ads.c +++ b/arch/powerpc/platforms/512x/mpc5121_ads.c @@ -24,21 +24,23 @@ static void __init mpc5121_ads_setup_arch(void) { -#ifdef CONFIG_PCI - struct device_node *np; -#endif printk(KERN_INFO "MPC5121 ADS board from Freescale Semiconductor\n"); /* * cpld regs are needed early */ mpc5121_ads_cpld_map(); + mpc512x_setup_arch(); +} + +static void __init mpc5121_ads_setup_pci(void) +{ #ifdef CONFIG_PCI + struct device_node *np; + for_each_compatible_node(np, "pci", "fsl,mpc5121-pci") mpc83xx_add_bridge(np); #endif - - mpc512x_setup_arch(); } static void __init mpc5121_ads_init_IRQ(void) @@ -64,6 +66,7 @@ define_machine(mpc5121_ads) { .name = "MPC5121 ADS", .probe = mpc5121_ads_probe, .setup_arch = mpc5121_ads_setup_arch, + .discover_phbs = mpc5121_ads_setup_pci, .init = mpc512x_init, .init_IRQ = mpc5121_ads_init_IRQ, .get_irq = ipic_get_irq, From patchwork Tue Nov 3 04:35:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392632 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHJ32jgXz9sTL for ; Tue, 3 Nov 2020 15:44:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=i68IBSlP; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHJ31yRFzDqTq for ; Tue, 3 Nov 2020 15:44:35 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::543; helo=mail-pg1-x543.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=i68IBSlP; dkim-atps=neutral Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH5v17gtzDqRs for ; Tue, 3 Nov 2020 15:35:47 +1100 (AEDT) Received: by mail-pg1-x543.google.com with SMTP id g12so12688529pgm.8 for ; Mon, 02 Nov 2020 20:35:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S7XdpBSyN2hayLd4zRl+DTnOe6f75FZb4gpZXT38Um4=; b=i68IBSlP0NXxs4hWvlU7VnsBXuOerg5+GL36z6GJLtuH0z+Ey8SYxV5Lc39di5WvGa B0onD/VU1/KJCvlSNkjE7xr2rJi17Fvjcyc+bGmYDwg69+m89hWx7gzKmbjoigX6VZ5T r4cY+wm9s4uTQSARjvEP0L77t3L1i3IOFqD7QwGL+uCHqUzWMwnQIQd9poXHcKf0ptph CCaS8/HGkpIbsfPFEvP8pCc81SvRyufRwVJ0YqYwpEnWUl0vy/NC9HnxpUG4Q5a4NNKz Jw6mNH0t3gaoKgzcQK08rr80OATtCmo1AkstTxeD54GcUe4L9EUOCUke+RsqqExCTDtZ /osA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S7XdpBSyN2hayLd4zRl+DTnOe6f75FZb4gpZXT38Um4=; b=KssthZfUTaXz9r7rM5yX0hYuDaaZdk+SMr54H8n2kYVPL5lAVUNsrEur7lzrQ5bXQS 0SDH1F/0ecx3PoIrTY/9J1I3KNsjuMgpgfqkyCZylYGsLTL2U0DeuteRhtAL4td/9sG3 4ylR6rKTOnzZiz4fFMoHFUkv5duxQFduzBqV7zYKBnu5tD8rlUzjfl3jK2330t5YJpdr VmplH5fkaPXIe6jFj61pto4GQJQzgq2lM7LyYuTQw1IR9tdhSM8XcAVnuqVz53Jr+Me1 dMCFg6zy7qbXKFUDE7IKfBHkhg3sGq14u5j6p+tRkoZGSQ88vhjpOUJLUDm6zxfXqK6P tzpw== X-Gm-Message-State: AOAM530PljPIM0g7TyuF09WwJOtc88GwD/vCs7X0TKRdwdqrfTwDIdVc wxaV9hebN9A2ue8FvnQOCwZ/fBIYwts= X-Google-Smtp-Source: ABdhPJwmwc6ATWcY9F5FY8cmTYpdegTZrDktb7wZSryfXXQR1czWPP9DRd2dqaaBE9DpFPuV/Xza5A== X-Received: by 2002:a63:7408:: with SMTP id p8mr15451268pgc.273.1604378144493; Mon, 02 Nov 2020 20:35:44 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:44 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 05/18] powerpc/52xx/efika: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:10 +1100 Message-Id: <20201103043523.916109-5-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with mpc5200_defconfig --- arch/powerpc/platforms/52xx/efika.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 4514a6f7458a..3b7d70d71692 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c @@ -185,8 +185,6 @@ static void __init efika_setup_arch(void) /* Map important registers from the internal memory map */ mpc52xx_map_common_devices(); - efika_pcisetup(); - #ifdef CONFIG_PM mpc52xx_suspend.board_suspend_prepare = efika_suspend_prepare; mpc52xx_pm_init(); @@ -218,6 +216,7 @@ define_machine(efika) .name = EFIKA_PLATFORM_NAME, .probe = efika_probe, .setup_arch = efika_setup_arch, + .discover_phbs = efika_pcisetup, .init = mpc52xx_declare_of_platform_devices, .show_cpuinfo = efika_show_cpuinfo, .init_IRQ = mpc52xx_init_irq, From patchwork Tue Nov 3 04:35:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392633 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHL85YmSz9sTL for ; Tue, 3 Nov 2020 15:46:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=hE9mxHRx; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHL84y5szDqTg for ; Tue, 3 Nov 2020 15:46:24 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=hE9mxHRx; dkim-atps=neutral Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH5x3sLkzDqSp for ; Tue, 3 Nov 2020 15:35:49 +1100 (AEDT) Received: by mail-pg1-x541.google.com with SMTP id h6so12698123pgk.4 for ; Mon, 02 Nov 2020 20:35:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fE2xl1SfpG/JbbzqMFYfA0Ul38UprkCR9u030OCuybI=; b=hE9mxHRxfyaMZqOG4BDSAlgfqvCgfu52tsgdTPP++8Oqu8NAUMjLeHGfm9a7hiMYEW 8boljDFyLmUnky3tY5zzzvZW4mIpW//0WSBeTeH4I1YbBg0J9NaFTCyE27CHon8Y5tKB ilDJJ3BlBwTM3zPLRJMxBvff1veXeJfm5PztQLbh+JqoEMJMpwZVskW/2Y/3VbnHuKci 24G3wMbup3b1YQtYBNg5+gGnNy2EDFTSgIr60KadJ6814lhTktxazPAz/MebVaUMQ686 +qRJnMLvxdPvycR9LMRb8rE+a8yElwmUc9v+17xY7tSohC8vvDc0Fj4EeYsp6M5ViyBh nR0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fE2xl1SfpG/JbbzqMFYfA0Ul38UprkCR9u030OCuybI=; b=bGPAb/M06LSmVJL96iMQPCeB1x4Hekv/YGMeO0sgjRl810dQUYsGYTDW4bcUYYA6cO 2MVRr53P8nFDtqT87z9g5Yii/JPJdLPtxxRrcQPkRZX3FgX+Zv9qAw2PLZbTIthmcZrI i+CmU3ZoKlY8TH3lvGk4zZWd+Qlo0fA+HWOzQZKUebKgnjXDAIbZD/7+DYzXCjCfOjOH UmH/iNVKP/yrLHGeNu3nUTB+SqZSAeac4GkLhZ9qmgyCJluwX/a/RZhR8GvhkwmdAHsu YGlS5Iwi15EV+PaYI8WULiDSSW/82B0yhGb3ud+BjCJGUbk31x4UQQjz49aRVx9gxU+e o5fg== X-Gm-Message-State: AOAM530fLeNPg+Cotw3YTz6tiDf3QYqWE0XmW4Ioy+I8oz6uhKAS1gqn ZKl5ItRfe17cugTed0cxwPFHP9k6Zx4= X-Google-Smtp-Source: ABdhPJzHdHK28LY96Udr3Nnj8xVJFkZ7YOz4p4VvRklhvlTJPvB/SlFi9+R/6XgJ0dV2LpKYefjF6g== X-Received: by 2002:a63:f54c:: with SMTP id e12mr15434383pgk.415.1604378146468; Mon, 02 Nov 2020 20:35:46 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:46 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 06/18] powerpc/52xx/lite5200: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:11 +1100 Message-Id: <20201103043523.916109-6-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with 52xx/lite5200b_defconfig --- arch/powerpc/platforms/52xx/lite5200.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index 3181aac08225..04cc97397095 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c @@ -165,8 +165,6 @@ static void __init lite5200_setup_arch(void) mpc52xx_suspend.board_resume_finish = lite5200_resume_finish; lite5200_pm_init(); #endif - - mpc52xx_setup_pci(); } static const char * const board[] __initconst = { @@ -187,6 +185,7 @@ define_machine(lite5200) { .name = "lite5200", .probe = lite5200_probe, .setup_arch = lite5200_setup_arch, + .discover_phbs = mpc52xx_setup_pci, .init = mpc52xx_declare_of_platform_devices, .init_IRQ = mpc52xx_init_irq, .get_irq = mpc52xx_get_irq, From patchwork Tue Nov 3 04:35:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392634 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHMz5cynz9sTL for ; Tue, 3 Nov 2020 15:47:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=idqr+nmY; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHMz2vq2zDqTq for ; Tue, 3 Nov 2020 15:47:59 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::443; helo=mail-pf1-x443.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=idqr+nmY; dkim-atps=neutral Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH5y4lqRzDqRj for ; Tue, 3 Nov 2020 15:35:50 +1100 (AEDT) Received: by mail-pf1-x443.google.com with SMTP id w65so13121688pfd.3 for ; Mon, 02 Nov 2020 20:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D5qtslshvrhaaM1PpdIGdaX4z8+z5ZAL/vniYoBwcKc=; b=idqr+nmY1zlJSIoGRx2D16QBqn11o9RejHowwlfkI6to7MRKX2WER79Y5qhdiBbzzO tf+pC4vg/4FDITKw8n+qThADc2pGt8Y+lOJ6MgFvMiA1JRQ+h3Z4tyCz4pz9rBVucJ5x t2PnBmVOLmEJnSaxDPaKq1J+451jGLP8fX0QCnxOcoB6QYX8ftQ8S7jmwx3WdB/GXv+1 jrxTJHX3xi12g0B1lgMN0F6QrdrO0mJGFF5mptf1dxBPOflEfT9j+ao2nMy/UWQWzY3K Kjs4VCU/ZmlhcvmXSf+6WyNiynVbgqrGsp8MTrsTNTCdhs+mbKVeZDe5m7LfmSztV5Wx gFPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D5qtslshvrhaaM1PpdIGdaX4z8+z5ZAL/vniYoBwcKc=; b=kAYRN/Xw8m1In1plbySqTNGiPoNyp/dT56/UGwwx522FQtdjqeRr3lOunM0EAc9JBQ 15xw7CZ2A6RZFSHMYKOfGZoNrdhjCAYZx8XeUdd2peUtrcigcifW+Zrn7nKFl9IS6zPX W2NMpt7X0EJMiFNQReZbVDiqk9PMgUxx1l0p0nnbbXNK9xJgW8FxB6bzpzTbR5GhuecL 5dWLu+lCXWNvcgz01O+aLHvA54g8pFUY9JEtVPAJ/kf3bSAjkul+uy0DNpmjZ5krJDKA DV/VIm2XcMOheNYxHzf9rxJQqOFBxu7heT8jykgfawLqMLHjeZQI6RY1JmTmC8x4po4o t+2Q== X-Gm-Message-State: AOAM533WcnCE7/gdOhdLAYQ4dXzszxRHa7kcvo9AH27s723UKcMYacj0 NgdnX5+lhiUvOV1TbK/QDfdbXkaoMGQ= X-Google-Smtp-Source: ABdhPJzQyNuIVR3CrM/1CIeqfpPapOCezTIptLQ0vA8FhLzyEp1ZlXmM0eNkmXrXC+IOUSn1EFtTUQ== X-Received: by 2002:a65:6219:: with SMTP id d25mr15318374pgv.1.1604378148618; Mon, 02 Nov 2020 20:35:48 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:47 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 07/18] powerpc/52xx/media5200: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:12 +1100 Message-Id: <20201103043523.916109-7-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- arch/powerpc/platforms/52xx/media5200.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c index 07c5bc4ed0b5..efb8bdecbcc7 100644 --- a/arch/powerpc/platforms/52xx/media5200.c +++ b/arch/powerpc/platforms/52xx/media5200.c @@ -202,8 +202,6 @@ static void __init media5200_setup_arch(void) /* Some mpc5200 & mpc5200b related configuration */ mpc5200_setup_xlb_arbiter(); - mpc52xx_setup_pci(); - np = of_find_matching_node(NULL, mpc5200_gpio_ids); gpio = of_iomap(np, 0); of_node_put(np); @@ -244,6 +242,7 @@ define_machine(media5200_platform) { .name = "media5200-platform", .probe = media5200_probe, .setup_arch = media5200_setup_arch, + .discover_phbs = mpc52xx_setup_pci, .init = mpc52xx_declare_of_platform_devices, .init_IRQ = media5200_init_irq, .get_irq = mpc52xx_get_irq, From patchwork Tue Nov 3 04:35:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392635 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHPx3rmTz9sTL for ; Tue, 3 Nov 2020 15:49:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dpwrlGeM; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHPx2njLzDqGl for ; Tue, 3 Nov 2020 15:49:41 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dpwrlGeM; dkim-atps=neutral Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH604B9tzDqRv for ; Tue, 3 Nov 2020 15:35:52 +1100 (AEDT) Received: by mail-pf1-x442.google.com with SMTP id a200so13089336pfa.10 for ; Mon, 02 Nov 2020 20:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aAdrOeUATeOYY9F0WJM+M2LaFIVjxmx3q+en/nm6b5o=; b=dpwrlGeM+gNcH+n7Hfr/+iZ/wvmotHBkhgS7Kv+keqpW9e05J8ECtVB0pxS7kyv3tM ZjUQlDemwPKTv4UjD25LA5R/VmAESbCFcP/2avIZ8z8NpNh3KEujqlRVb1YtJsyHgPlp G0vS6kHIr8uKh5N7nMmY9h2/WHQBwifnjbQKTd5aPEpiFF4TQsOehvLzZBdW6a2GU9pU 8dizji9zwpjaPD+PkeZATQvZMhF6etaxbRuClgAmMqgzxxZtm0OVgeGHUFHCY/ZE6/0n EjmigE4lUzhRHs3/yYjhnqqA4mkXSYAuGdcZi5kCvjl8wpOPD4TQYAjdQdYGsB1f2Z9E GI4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aAdrOeUATeOYY9F0WJM+M2LaFIVjxmx3q+en/nm6b5o=; b=X1iEAhBkuIzTn9hEgvjODXLk4i0JwqSlaDYGDiLM8KZ3C1PF3ab8cEQaykEAEg5Riz oj/TmURE5XfBTPdQDVm8n2u+EAajPW44gi64uvYf5H3IcoOwvUA6kejOpWRDbuxlS+XF aT0Rl92MmgEFiMB/fz3YVUN/AW+MWVyfInj/eqAJaNC4Wk76bZamUl3l2vnxoWdlFSIz 1dHPEoF8z6g8j0Ll6UkL8HTpP3/2O1z4BacVZn+1/xaeCsOg3yL5zcCBaAiediuP/9ib jQbv7tKY64E2FSYxJdrAUl/icAvwy6VmAaAkx0HKvat9o0gawe3VaflM1D+bwRKOJSgD e9NA== X-Gm-Message-State: AOAM5306zrv0SXzs3RIvZdDzXRi/2jq1oTgejvPA02Hw/3jfMAO2Lkwz QTkDrXMar8OlPmk4Xg+aIzjF7EKnLKI= X-Google-Smtp-Source: ABdhPJyRi1hYi0/8JxsRn/0wIE5xpbYEjdhuvp81uCpOV0os+dU7PALeQdadRqs26LCsskZkvjbXlg== X-Received: by 2002:a63:4511:: with SMTP id s17mr8266594pga.4.1604378150550; Mon, 02 Nov 2020 20:35:50 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:50 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 08/18] powerpc/52xx/mpc5200_simple: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:13 +1100 Message-Id: <20201103043523.916109-8-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- arch/powerpc/platforms/52xx/mpc5200_simple.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c index 2d01e9b2e779..b9f5675b0a1d 100644 --- a/arch/powerpc/platforms/52xx/mpc5200_simple.c +++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c @@ -40,8 +40,6 @@ static void __init mpc5200_simple_setup_arch(void) /* Some mpc5200 & mpc5200b related configuration */ mpc5200_setup_xlb_arbiter(); - - mpc52xx_setup_pci(); } /* list of the supported boards */ @@ -73,6 +71,7 @@ define_machine(mpc5200_simple_platform) { .name = "mpc5200-simple-platform", .probe = mpc5200_simple_probe, .setup_arch = mpc5200_simple_setup_arch, + .discover_phbs = mpc52xx_setup_pci, .init = mpc52xx_declare_of_platform_devices, .init_IRQ = mpc52xx_init_irq, .get_irq = mpc52xx_get_irq, From patchwork Tue Nov 3 04:35:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392636 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHSP5rwkz9sVK for ; Tue, 3 Nov 2020 15:51:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FUiXS/y6; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHSP5GF5zDqVV for ; Tue, 3 Nov 2020 15:51:49 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::544; helo=mail-pg1-x544.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FUiXS/y6; dkim-atps=neutral Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH640sYBzDqSL for ; Tue, 3 Nov 2020 15:35:55 +1100 (AEDT) Received: by mail-pg1-x544.google.com with SMTP id o3so12673187pgr.11 for ; Mon, 02 Nov 2020 20:35:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sW/UzNztx1LJZzb4Lv8dPnaVX4ry9sbuSemrP+m6GqM=; b=FUiXS/y6OeOqvOGpAtR/p1yQ+vgvyPb0KWnbCVBR6wLz+nBUCKrgbtn0ZfSOKbgPhL SD4DsJ96DMT6rXhar6WfbKlP9Rd7uWDvSaD9ZBq0ORhnytNORwde799bMF3kbTmlRfR3 KTpdldaqVelYslgbfO3svYNiFt0JKGBGz8IlrcnHuN/XU8TjPywbarLe9SgyWK0SjatC Jv54xC+mKx7UqToaXWs5KDppycWh5Q+YAW6+T3kuxhL1EUw6M6lqsX2Me847PJcdIVi8 jEFmOUo975n4nGlAeZglXje9P0UHnUe/8e76t9z8kLhmbAFaRysT1NNQSYtQLQAoLZhZ WClw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sW/UzNztx1LJZzb4Lv8dPnaVX4ry9sbuSemrP+m6GqM=; b=MpCn23Cc1RoOzDXMIfzksmTOCRPzfk0MNOcmEcvxTQzvyM4s3BdsWsr2zZG8d1ujnB Uzqi+0qTnflPCTsh0M1Umr78+dpUyjNzpvgJIZJT8LRUkInJT2MS+mSqtlpvBJ/hoW3F u2sM0jk5/die2KyEdeeVCaxh+Vz/A9jZwfeg2qWEQ4VY50cyHXXccnCUI61a30L2hzSH ulHZ6Ol7TbgriTrsz+7N0kxDSwWqO4eaGyWcAggthUZtCD6b9KwMgAm4gQQ8YLEGjZOz rxNps1GgzxST3dVNaHJ7RwM7Z3YiQTaZ5CohLSMKKcv3fbOp/+Ga+Fmp2iG4ZqUCI3C5 qoSg== X-Gm-Message-State: AOAM531Z1Q4d6+FlE73oK40olKuHLxW4MebL7BhlFCUhyAPo+A1Ml8rF 4XvTUk2jK3Au4u5Yl93PG89GwtFPNMs= X-Google-Smtp-Source: ABdhPJwh/6YQ2U8ktr+WMWdm6zuaNgmfrI8cWIns140GG4pfFOOv1Mf3DjMLS34tJdtH4LeUN7K2JA== X-Received: by 2002:aa7:950b:0:b029:18a:df47:ef90 with SMTP id b11-20020aa7950b0000b029018adf47ef90mr9717529pfp.74.1604378152485; Mon, 02 Nov 2020 20:35:52 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:52 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 09/18] powerpc/82xx/*: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:14 +1100 Message-Id: <20201103043523.916109-9-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with pq2fads_defconfig --- arch/powerpc/platforms/82xx/mpc8272_ads.c | 2 +- arch/powerpc/platforms/82xx/pq2fads.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c index 3fe1a6593280..0b5b9dec16d5 100644 --- a/arch/powerpc/platforms/82xx/mpc8272_ads.c +++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c @@ -171,7 +171,6 @@ static void __init mpc8272_ads_setup_arch(void) iounmap(bcsr); init_ioports(); - pq2_init_pci(); if (ppc_md.progress) ppc_md.progress("mpc8272_ads_setup_arch(), finish", 0); @@ -205,6 +204,7 @@ define_machine(mpc8272_ads) .name = "Freescale MPC8272 ADS", .probe = mpc8272_ads_probe, .setup_arch = mpc8272_ads_setup_arch, + .discover_phbs = pq2_init_pci, .init_IRQ = mpc8272_ads_pic_init, .get_irq = cpm2_get_irq, .calibrate_decr = generic_calibrate_decr, diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c index a74082140718..ac9113d524af 100644 --- a/arch/powerpc/platforms/82xx/pq2fads.c +++ b/arch/powerpc/platforms/82xx/pq2fads.c @@ -150,8 +150,6 @@ static void __init pq2fads_setup_arch(void) /* Enable external IRQs */ clrbits32(&cpm2_immr->im_siu_conf.siu_82xx.sc_siumcr, 0x0c000000); - pq2_init_pci(); - if (ppc_md.progress) ppc_md.progress("pq2fads_setup_arch(), finish", 0); } @@ -184,6 +182,7 @@ define_machine(pq2fads) .name = "Freescale PQ2FADS", .probe = pq2fads_probe, .setup_arch = pq2fads_setup_arch, + .discover_phbs = pq2_init_pci, .init_IRQ = pq2fads_pic_init, .get_irq = cpm2_get_irq, .calibrate_decr = generic_calibrate_decr, From patchwork Tue Nov 3 04:35:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392637 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHVG3vMdz9sTR for ; Tue, 3 Nov 2020 15:53:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=O2y5lvzn; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHVG0sj0zDqVc for ; Tue, 3 Nov 2020 15:53:26 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::636; helo=mail-pl1-x636.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=O2y5lvzn; dkim-atps=neutral Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH665pzyzDqSh for ; Tue, 3 Nov 2020 15:35:58 +1100 (AEDT) Received: by mail-pl1-x636.google.com with SMTP id t6so7959756plq.11 for ; Mon, 02 Nov 2020 20:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ppYNoquUFvSDgQ0kDzqxFcaBErf141d6C668dXHzNKM=; b=O2y5lvznkjkeft3eqwo7/wRUV0zEWzjCRHCnPESMEdoKEDGAE/ISioy1T5a8oDfB5H sc/bhX33zdMpuBK6Qh+r034knq3rSYqgCeKwKiurdiEhYFFSWE3uQba3zBnZnaksj7H7 pScuOWwD+liyRypM/eZJ2b31edDZWe6ZDeOwtxUnwzWORCa0O3Br1Begrkd/bHoKBBnE OHiIW+Kgj+YmvD3k+OkA3L7PYAdZjG0jaRJ2zGMo70QWkPiMegoZ6upUw9FGBlrxThdw 9dSmFHw2PZP1XsukankcyEOT1RYdgW2QKsoPLkIBj/P7HMHV9rj4Czn2tkU8NYSCRtAP Jswg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ppYNoquUFvSDgQ0kDzqxFcaBErf141d6C668dXHzNKM=; b=ktNrs0+CFM84Z0wa8fpkY8nUrgHplkxoLrf9VJXEoVEygaGs7woMp1LvIJm8ZvPIqB o0lT3sUvIp8H+BeKn4dbcl3HE+gBCBwEmSdSH4fYxCjY7AueVxQIMeiijqBIJbRIdOPk tZuKlm9O1b6IB1drhVX1WYdr4OxE60y2L5LdaGkisBaH3nCPQqflvzaMr8hWK5AGbzEx QrucHUdQXbqmBWvBlp7ZILNiYAnFcGGOlJ6RXh2cgz4icTPSQb/AnF1vmMw6wN8NiRCd DyJs9T5V2wlTiZHiD9deyl63loo35IlA0mv3elspGQue8hB1ls3Bxoo6+WTtI/y6O/A3 rxag== X-Gm-Message-State: AOAM530TDrUvB4d00BdNEvtxfZZOY/7/oUmOGY1vdQ5UjRCEkhw25tEw TbfiWjEpsh5TQ9p5Yy2QHGJ1a9J1pBk= X-Google-Smtp-Source: ABdhPJzlhhnfW7ELcL2w6oLceZcIQEEGdTsBNZPgb+P3mEdliP70rR3iv+wNjW8fkYCoaHNurRc+ZQ== X-Received: by 2002:a17:902:a5c5:b029:d5:dc92:49e7 with SMTP id t5-20020a170902a5c5b02900d5dc9249e7mr24335788plq.25.1604378154467; Mon, 02 Nov 2020 20:35:54 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:54 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 10/18] powerpc/83xx: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:15 +1100 Message-Id: <20201103043523.916109-10-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with mpc83xx_defconfig --- arch/powerpc/platforms/83xx/asp834x.c | 1 + arch/powerpc/platforms/83xx/km83xx.c | 1 + arch/powerpc/platforms/83xx/misc.c | 2 -- arch/powerpc/platforms/83xx/mpc830x_rdb.c | 1 + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 + arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 1 + arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 + arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 + arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 1 + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 + 13 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c index 28474876f41b..68061c2a57c1 100644 --- a/arch/powerpc/platforms/83xx/asp834x.c +++ b/arch/powerpc/platforms/83xx/asp834x.c @@ -44,6 +44,7 @@ define_machine(asp834x) { .name = "ASP8347E", .probe = asp834x_probe, .setup_arch = asp834x_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c index bcdc2c203ec9..108e1e4d2683 100644 --- a/arch/powerpc/platforms/83xx/km83xx.c +++ b/arch/powerpc/platforms/83xx/km83xx.c @@ -180,6 +180,7 @@ define_machine(mpc83xx_km) { .name = "mpc83xx-km-platform", .probe = mpc83xx_km_probe, .setup_arch = mpc83xx_km_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index a952e91db3ee..3285dabcf923 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c @@ -132,8 +132,6 @@ void __init mpc83xx_setup_arch(void) setbat(-1, va, immrbase, immrsize, PAGE_KERNEL_NCG); update_bats(); } - - mpc83xx_setup_pci(); } int machine_check_83xx(struct pt_regs *regs) diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c index 51426e88ec67..956d4389effa 100644 --- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c @@ -48,6 +48,7 @@ define_machine(mpc830x_rdb) { .name = "MPC830x RDB", .probe = mpc830x_rdb_probe, .setup_arch = mpc830x_rdb_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c index 5ccd57a48492..3b578f080e3b 100644 --- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c @@ -48,6 +48,7 @@ define_machine(mpc831x_rdb) { .name = "MPC831x RDB", .probe = mpc831x_rdb_probe, .setup_arch = mpc831x_rdb_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index 6fa5402ebf20..850d566ef900 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -101,6 +101,7 @@ define_machine(mpc832x_mds) { .name = "MPC832x MDS", .probe = mpc832x_sys_probe, .setup_arch = mpc832x_sys_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index 622c625d5ce4..b6133a237a70 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c @@ -219,6 +219,7 @@ define_machine(mpc832x_rdb) { .name = "MPC832x RDB", .probe = mpc832x_rdb_probe, .setup_arch = mpc832x_rdb_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c index ebfd139bca20..9630f3aa4d9c 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_itx.c +++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c @@ -70,6 +70,7 @@ define_machine(mpc834x_itx) { .name = "MPC834x ITX", .probe = mpc834x_itx_probe, .setup_arch = mpc834x_itx_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c index 356228e35279..6d91bdce0a18 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c @@ -91,6 +91,7 @@ define_machine(mpc834x_mds) { .name = "MPC834x MDS", .probe = mpc834x_mds_probe, .setup_arch = mpc834x_mds_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index 90d9cbfae659..da4cf52cb55b 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c @@ -201,6 +201,7 @@ define_machine(mpc836x_mds) { .name = "MPC836x MDS", .probe = mpc836x_mds_probe, .setup_arch = mpc836x_mds_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c index b4aac2cde849..3427ad0d9d38 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c +++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c @@ -41,6 +41,7 @@ define_machine(mpc836x_rdk) { .name = "MPC836x RDK", .probe = mpc836x_rdk_probe, .setup_arch = mpc836x_rdk_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c index 9d3721c965be..f28d166ea7db 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c @@ -93,6 +93,7 @@ define_machine(mpc837x_mds) { .name = "MPC837x MDS", .probe = mpc837x_mds_probe, .setup_arch = mpc837x_mds_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c index 7c45f7ac2607..7fb7684c256b 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c @@ -73,6 +73,7 @@ define_machine(mpc837x_rdb) { .name = "MPC837x RDB/WLAN", .probe = mpc837x_rdb_probe, .setup_arch = mpc837x_rdb_setup_arch, + .discover_phbs = mpc83xx_setup_pci, .init_IRQ = mpc83xx_ipic_init_IRQ, .get_irq = ipic_get_irq, .restart = mpc83xx_restart, From patchwork Tue Nov 3 04:35:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392638 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHXN2hYNz9sTR for ; Tue, 3 Nov 2020 15:55:16 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cHjSsYmQ; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHXN1k1QzDqXM for ; Tue, 3 Nov 2020 15:55:16 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cHjSsYmQ; dkim-atps=neutral Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH674cx9zDqRg for ; Tue, 3 Nov 2020 15:35:59 +1100 (AEDT) Received: by mail-pg1-x541.google.com with SMTP id w4so2466554pgg.13 for ; Mon, 02 Nov 2020 20:35:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aL7nf5HtJg3suEXS4YOkIp0Q0gZ4/3ZocZ8b4EhkTCU=; b=cHjSsYmQ/MBh9G0f9uARXaVWQo+8St3i0wmu/e0d7Ia65160YPnVtkpg8nbR9Xz623 nSd+VSldI9znwAJiOPVcVIHvuXw7tzS6PRKX4NiIhuaz2YqMwDxYW9bgVs/4lmjsAjsS 8RqQkkmWcEdgr7za0J2TvmOpUIDJcGQn2/82Fj+ot//gS1n0lNq77v9jqg/k+KUyRm0Q HcfapK715MRjJgtSR1GeU8FqFt4frC7bi7QUhD+WlroKnO7Cd7Ab5zRHZBAzXmtyaD1s /rv3yOxsyGSxaMhnJT5XJNy8PwEMw3CimPcGmGwJ1sjPMYfjH4dExWbMjruL/s78aoq2 7ZZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aL7nf5HtJg3suEXS4YOkIp0Q0gZ4/3ZocZ8b4EhkTCU=; b=AcQiqw3anQjcCTde3JZaj5JOXRyE93sM0DuO048xUGEBVXEL14RqanfNtI0NGyF1Y3 AqaRpl45uAvLkwO52SOdwK0P2dc/YLjwDOAu07qfne4wllYT05fJ00WRjmKD/u1fInAO rsv2FHKelutt3tVVMJrdTiw+pI0e3N0MdmZnEEPXBGDWsfcbTGHigahf/Trbv6aJas8e crsmfZ2HTTgjYhNn62X/8gp2arcCjFYZ+5xdJk7WVBIiIqQFflx2SxrwNXxnzX6S2G5C CN9+WFX5BuXeHM0DWWEZdYpfP+xxDHNLRshw8j6SqlKjuBFi8pzCb8OqMLZDsxJH+I6u SX/w== X-Gm-Message-State: AOAM530jrZJIIW691n4FwjrV+bQLbEP6FA2PQ7UCS+q8oKkculCPTU4M xAx8UAFhHFrJJaGlqiF2Qxofl4qsjLQ= X-Google-Smtp-Source: ABdhPJw7P/6SoGM1uKywgMGgdl403hwqWRuvrVQvpVZer9+DT9qeakVY6iMRmXHLCr7d4iodBsNIwg== X-Received: by 2002:a05:6a00:228a:b029:18b:212a:1af7 with SMTP id f10-20020a056a00228ab029018b212a1af7mr3787687pfe.55.1604378156571; Mon, 02 Nov 2020 20:35:56 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:56 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 11/18] powerpc/amigaone: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:16 +1100 Message-Id: <20201103043523.916109-11-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with amigaone_defconfig --- arch/powerpc/platforms/amigaone/setup.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c index f5d0bf999759..b25ddf39dd43 100644 --- a/arch/powerpc/platforms/amigaone/setup.c +++ b/arch/powerpc/platforms/amigaone/setup.c @@ -65,6 +65,12 @@ static int __init amigaone_add_bridge(struct device_node *dev) } void __init amigaone_setup_arch(void) +{ + if (ppc_md.progress) + ppc_md.progress("Linux/PPC "UTS_RELEASE"\n", 0); +} + +void __init amigaone_discover_phbs(void) { struct device_node *np; int phb = -ENODEV; @@ -74,9 +80,6 @@ void __init amigaone_setup_arch(void) phb = amigaone_add_bridge(np); BUG_ON(phb != 0); - - if (ppc_md.progress) - ppc_md.progress("Linux/PPC "UTS_RELEASE"\n", 0); } void __init amigaone_init_IRQ(void) @@ -159,6 +162,7 @@ define_machine(amigaone) { .name = "AmigaOne", .probe = amigaone_probe, .setup_arch = amigaone_setup_arch, + .discover_phbs = amigaone_discover_phbs, .show_cpuinfo = amigaone_show_cpuinfo, .init_IRQ = amigaone_init_IRQ, .restart = amigaone_restart, From patchwork Tue Nov 3 04:35:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392639 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHZM31P5z9sTR for ; Tue, 3 Nov 2020 15:56:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=fJdL0oyW; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHZL74FBzDqWP for ; Tue, 3 Nov 2020 15:56:58 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=fJdL0oyW; dkim-atps=neutral Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH6836nFzDqSK for ; Tue, 3 Nov 2020 15:36:00 +1100 (AEDT) Received: by mail-pf1-x442.google.com with SMTP id o129so13118543pfb.1 for ; Mon, 02 Nov 2020 20:36:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zZPqzei1Fv+qLr1ovU3GS5sWwxVaLo335Z4KS7ZGWxs=; b=fJdL0oyWTL+Vm/i9FwT/uaT9ipLpQ6hHYfehKxCzfc8o4LjqcwM5nVonyZLH/oTEno GGOqj3nJVOEPsIo9QbM/2mvJqmM9cIp1apVF7QvCqPBQ/zkdVeNrI65gtjsMsxM3YwiC y3s879nQBGq6UeGxuzJqHt9X+i6K6R4vzC/n+/g7W4cHOM3dgpgLQA//DXr1iUexcbQw sXrYqbcM1NzYVgz8xPv1aZb8iGc6QzkXSYqZR+Jcvd/3pnV8LqXBpmO77lB9iv7GRO2I Yqe+I79aAirudLQKBv56iyv8nFGoMfdh05c9CBKASagt8rQB+LWRxVaaTULVxNi5WMsI rHFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zZPqzei1Fv+qLr1ovU3GS5sWwxVaLo335Z4KS7ZGWxs=; b=kvxouxNXMSaIyEA2GaWMiXmxeIyd3OEgIyDdWiPlSPb7TQM97wcO3abND39yfTzXeC aTXaeKOVflgfgJfE/cwmo1OJVC5iF3OSxxzzd3pCjLOz5l0tiTKozonOvN2otjn/6XSN 8DZG9Ko6la09pL0Hjk1hWBSOXgpIdliQGVIVxiuBDNwL6YFF/vKAfAFjNkvwXhNs+73A rsPFIWRYk+u1vub+Isex2WGeWG35NyeeIRhOFYZnjbqIjeyNdjygJQ5Hgwm6VM/564Nb /IxbE6/B71oOpEKP1BbpAu4xDEtq/QRRIKy2kjjupklQFHi8OkaYyIaJthM3L7xpiKht /Fmg== X-Gm-Message-State: AOAM530w+5HEPIVjYFLdIB5+0dR+JrWNK3LpjgqAUHpln7k8tPDAHFVi kvSSFsRcmOpFCfn/AvEip5R1pY9zgUQ= X-Google-Smtp-Source: ABdhPJyBV9R7+jJPa3HuIkgMbIzMHSrm7l0/thUO/5jwBMfxK5AlTTJGCiXseDLRxKSxQPQRwFCovw== X-Received: by 2002:a63:540d:: with SMTP id i13mr6892505pgb.37.1604378158513; Mon, 02 Nov 2020 20:35:58 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:35:58 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 12/18] powerpc/chrp: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:17 +1100 Message-Id: <20201103043523.916109-12-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with chrp32_defconfig --- arch/powerpc/platforms/chrp/pci.c | 8 ++++++++ arch/powerpc/platforms/chrp/setup.c | 12 +----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c index b2c2bf35b76c..8c421dc78b28 100644 --- a/arch/powerpc/platforms/chrp/pci.c +++ b/arch/powerpc/platforms/chrp/pci.c @@ -314,6 +314,14 @@ chrp_find_bridges(void) } } of_node_put(root); + + /* + * "Temporary" fixes for PCI devices. + * -- Geert + */ + hydra_init(); /* Mac I/O */ + + pci_create_OF_bus_map(); } /* SL82C105 IDE Control/Status Register */ diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index c45435aa5e36..3cfc382841e5 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -334,22 +334,11 @@ static void __init chrp_setup_arch(void) /* On pegasos, enable the L2 cache if not already done by OF */ pegasos_set_l2cr(); - /* Lookup PCI host bridges */ - chrp_find_bridges(); - - /* - * Temporary fixes for PCI devices. - * -- Geert - */ - hydra_init(); /* Mac I/O */ - /* * Fix the Super I/O configuration */ sio_init(); - pci_create_OF_bus_map(); - /* * Print the banner, then scroll down so boot progress * can be printed. -- Cort @@ -582,6 +571,7 @@ define_machine(chrp) { .name = "CHRP", .probe = chrp_probe, .setup_arch = chrp_setup_arch, + .discover_phbs = chrp_find_bridges, .init = chrp_init2, .show_cpuinfo = chrp_show_cpuinfo, .init_IRQ = chrp_init_IRQ, From patchwork Tue Nov 3 04:35:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392640 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHc54tC7z9sTR for ; Tue, 3 Nov 2020 15:58:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=piXszWmn; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHc54cMrzDqdW for ; Tue, 3 Nov 2020 15:58:29 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::544; helo=mail-pg1-x544.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=piXszWmn; dkim-atps=neutral Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH6C0mh8zDqRk for ; Tue, 3 Nov 2020 15:36:03 +1100 (AEDT) Received: by mail-pg1-x544.google.com with SMTP id w4so2466675pgg.13 for ; Mon, 02 Nov 2020 20:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WePGWSemMFXgajsFMe7cKUHtaA9xMjkK6ByOLy1nU4Q=; b=piXszWmnDDcGPCO2nMg0XU6XAhLivk/q3ArALCTlem1E/ln77RJn8PwV9Mdh6/EqY3 suXLJswTCY+onbS/6HnsiuWSUomatNLCteZhesutDCGcnp3ysVku6gybGCG5TAqC/kWz 8vqjk4m4cWdjHcUTR0mYggUckKQfzR3Wj0JNIE7J0xoVggPknXGVjVoZXyWZYf399wPe zadriVO14wl/7UTZe3Uu68+ZtBxwpztbdx3BAVP84iL0jHaQr2KS1EXwCVV0oZBKTP9p DWkP8z6ri5BX6QL49Kstb2Lpt5/sIHepynXCFWi7KuVuiSwZty4EfebUnNktOhonPFpT X6Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WePGWSemMFXgajsFMe7cKUHtaA9xMjkK6ByOLy1nU4Q=; b=YBEpMWuC/t3A+QOP/hPyBjEkSRafOWgL/zVvvMOsVG4OPU6oxdCQs4QxPRcJDwUGXa JIaTZVvZwypOFgVy9ugSfF/Mj71lbQclNO4eDkDgzwJh7jJukMZb6H/ox9kk3BfYCoGk U2BQw/JvsVcqQOUPjAKX5T93Fq5ce0fuWCx/2KSuBWBeCC1rFzskPqU83zxtkrAYMj1W msV0XWJ8dOXBbBR1AFzfSb1dSiHVU7f0hMNckQOkbz05xnTOV77TpmjKa7/UhpJd9SBj xwHQZwDZN1zvRu9U51hTUbZTg7xG937qbK+9h/ATw5rzecay5oB5eMn8JTJDj0fga+Rl 4Vew== X-Gm-Message-State: AOAM532x6C6UzFEeNAG6HU+fWuFj/CfKYJN5diIxaGgF0DOL8hw1VsSx m9TwEyaxQI7oN15FE9Ylgn4fq4cdNdg= X-Google-Smtp-Source: ABdhPJzd7kXnqVZCfuTtN4xRpSGqNncztIVPw1tlbd5bkiqE2K6MQctQh7vESk2t0NFa2OAmy1FwaA== X-Received: by 2002:a63:a74b:: with SMTP id w11mr15893629pgo.425.1604378160559; Mon, 02 Nov 2020 20:36:00 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:36:00 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 13/18] powerpc/embedded6xx/holly: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:18 +1100 Message-Id: <20201103043523.916109-13-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with holly_defconfig --- arch/powerpc/platforms/embedded6xx/holly.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c index d8f2e2c737bb..53065d564161 100644 --- a/arch/powerpc/platforms/embedded6xx/holly.c +++ b/arch/powerpc/platforms/embedded6xx/holly.c @@ -108,15 +108,13 @@ static void holly_remap_bridge(void) tsi108_write_reg(TSI108_PCI_P2O_BAR2, 0x0); } -static void __init holly_setup_arch(void) +static void __init holly_init_pci(void) { struct device_node *np; if (ppc_md.progress) ppc_md.progress("holly_setup_arch():set_bridge", 0); - tsi108_csr_vir_base = get_vir_csrbase(); - /* setup PCI host bridge */ holly_remap_bridge(); @@ -127,6 +125,11 @@ static void __init holly_setup_arch(void) ppc_md.pci_exclude_device = holly_exclude_device; if (ppc_md.progress) ppc_md.progress("tsi108: resources set", 0x100); +} + +static void __init holly_setup_arch(void) +{ + tsi108_csr_vir_base = get_vir_csrbase(); printk(KERN_INFO "PPC750GX/CL Platform\n"); } @@ -259,6 +262,7 @@ define_machine(holly){ .name = "PPC750 GX/CL TSI", .probe = holly_probe, .setup_arch = holly_setup_arch, + .discover_phbs = holly_init_pci, .init_IRQ = holly_init_IRQ, .show_cpuinfo = holly_show_cpuinfo, .get_irq = mpic_get_irq, From patchwork Tue Nov 3 04:35:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392641 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHf100tcz9sTR for ; Tue, 3 Nov 2020 16:00:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pnrqMXsI; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHf06R14zDqX7 for ; Tue, 3 Nov 2020 16:00:08 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::443; helo=mail-pf1-x443.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pnrqMXsI; dkim-atps=neutral Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH6D6JzdzDqSc for ; Tue, 3 Nov 2020 15:36:04 +1100 (AEDT) Received: by mail-pf1-x443.google.com with SMTP id y14so13085907pfp.13 for ; Mon, 02 Nov 2020 20:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GX8TB1JQMQXMDXdTDV+dtMxz0fEHDVFigA2RzLzUcxQ=; b=pnrqMXsIlEQ9xRoPi4ycIonxteiXDmHmH7DMyS02WD0V/Cy4GfXMiMT5T/4FfRgOLj EmpDL9779vWTtbh2KcwVKoqBgcPb9iXAmBI2YPddrPQZV0uM4kToVMZ/7j2ezTGUFquk vEnRrE+mtlp8crhS0dnki+jyviaf3Xwm5O+dMiccnmHGO5/EqqRZgpWQEzgcv5Q6N4h1 ct23RDKBJV0gsqVzRZVW887ZHfdTatN5NAZZJM020I31dzJFl35VURBoeTDSEMse1mF4 QfiVp9UkwCzS02Di4gNp916wgBO468FtdZaR6Xso6XgJfBIjItfa4veQP0QCidGWH9MF gLsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GX8TB1JQMQXMDXdTDV+dtMxz0fEHDVFigA2RzLzUcxQ=; b=d8z0uU5aFEjpP9lLiYVhj3i3ZZqcJg6o9QpkK7raKUHrqzuQKr2TxNb2Sp00rzCCRg 5mfhrtYxzQn+tsaG4UIEBqemc5id8CBMFwe3jYhGWu7PyvI+qaRGCXqpXtZAig+3mOTO n677q8q+3KR6NshYWQOX0LKXUDTBLWm1S4hgZqUg1NxefOV4CRrX58uNOsRMdwAfFv/Z cNJftmIgZSKOZ5TuOo1Q2NGhBiTRDLTTOy9sJQ4Ljku4AQkesHF6heFC4m28eUKFVdjR Fn0ND7uMTu2KoCwyMHJWbLJImZ2uRR8pDETh4Ph3iJSyZBQuxLteq/Wcq2xlJYZVdsRm 0dkA== X-Gm-Message-State: AOAM531LZQimQ3DWwnjUzsMY8V3/hOIdM8altY6qAaDR7gcL9vjHsopY YR/TdQgBhUaJdjDicf57giEW7GjdXmk= X-Google-Smtp-Source: ABdhPJyjQWeckvqPVxW4TZw6af9+HssMbGAM9bIWVkXJ8Dg2jmCIk4wXaHj+3k5lpbqijf6nfGkZcQ== X-Received: by 2002:a62:84d2:0:b029:18a:f574:fded with SMTP id k201-20020a6284d20000b029018af574fdedmr7843412pfd.31.1604378162573; Mon, 02 Nov 2020 20:36:02 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:36:02 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 14/18] powerpc/embedded6xx/linkstation: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:19 +1100 Message-Id: <20201103043523.916109-14-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with linkstation_defconfig --- arch/powerpc/platforms/embedded6xx/linkstation.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index f514d5d28cd4..eb8342e7f84e 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c @@ -63,15 +63,18 @@ static int __init linkstation_add_bridge(struct device_node *dev) } static void __init linkstation_setup_arch(void) +{ + printk(KERN_INFO "BUFFALO Network Attached Storage Series\n"); + printk(KERN_INFO "(C) 2002-2005 BUFFALO INC.\n"); +} + +static void __init linkstation_setup_pci(void) { struct device_node *np; /* Lookup PCI host bridges */ for_each_compatible_node(np, "pci", "mpc10x-pci") linkstation_add_bridge(np); - - printk(KERN_INFO "BUFFALO Network Attached Storage Series\n"); - printk(KERN_INFO "(C) 2002-2005 BUFFALO INC.\n"); } /* @@ -153,6 +156,7 @@ define_machine(linkstation){ .name = "Buffalo Linkstation", .probe = linkstation_probe, .setup_arch = linkstation_setup_arch, + .discover_phbs = linkstation_setup_pci, .init_IRQ = linkstation_init_IRQ, .show_cpuinfo = linkstation_show_cpuinfo, .get_irq = mpic_get_irq, From patchwork Tue Nov 3 04:35:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392642 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHhj0g6Cz9sTR for ; Tue, 3 Nov 2020 16:02:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EvPm3vF2; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHhg1Pt1zDqFZ for ; Tue, 3 Nov 2020 16:02:27 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::443; helo=mail-pf1-x443.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EvPm3vF2; dkim-atps=neutral Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH6G6sGYzDqRj for ; Tue, 3 Nov 2020 15:36:06 +1100 (AEDT) Received: by mail-pf1-x443.google.com with SMTP id 13so13104570pfy.4 for ; Mon, 02 Nov 2020 20:36:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCHzuMPZXrJObHdp0kUs4hoTBdSxkmby1XwHPOpSYxQ=; b=EvPm3vF25SEikHT+7cGWctpanOVcFWqdmq1z/rz2vQmMnJ+QtYqQHM9Fh9nWTov+uR juTNlI+HFqRlbyd5m+/rHzhwMvs0n4bYHu1/dYfps0BiKjkl3uESAYTA/bb+eZpqIkhr 4ztYayQy+YBFjV0ZTaIr+3KxS/CBRKgezCretmdXs/oqdcwobRnTegrXA6F24qvp8btF 8HUSu3Uy8qNz1MA64UJBS+xZMmp46EqegtekYNeh8b+8L+bO7kZXAXVLlcPTRxoJ8MiV DGyt35Mb7qvfnQHznmRrul3q1RpaXl5TFyv8xJO43GWr6f9sXG5xBQivPkzwv8fDuud0 4odw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dCHzuMPZXrJObHdp0kUs4hoTBdSxkmby1XwHPOpSYxQ=; b=nSIMHOKy5z4jbDmF0hbf1Iomf6eUFarUVv2N6KX6a3GyWOMHUd6TGXi2gqi43wWcBO Jh6NMPzHi1f68f7b2dRqPEHiMdgTdDfWU7ekqmAyBbjosvUyySbgUZCA4EBjZmZ62X3n JV+ox0bHJJN75UPzlHw0Pz53961HMnv2umvAU01p/xCc9hPbH7ORliPB7dfRvCxpT1SD JUWQ+HbdcA7ADZ+SibeqBLMIbqMRYrHjk6TQgyRpF7BadvCrEw0aMhVRMmMNEteCWzoy mG7FiVNKKIS1mHPkMDnrGqPRtobxmeDA+vHKkkSAKD6/3XHikig4c9teYyax7aDX4ehu EF3g== X-Gm-Message-State: AOAM532N65LXHEE7mAh8MJSFXCYVbJ3nCSrfYfKYgSrpw1TCvTpXo3X3 2SMgERvJdCBqkbxbi4YecDplNOjPMV4= X-Google-Smtp-Source: ABdhPJzNT8My+Hm7nf6QKrm3ToACsXNNia0JPhW/+3kxfDctO5P/KLP5neK2Qyymbx08NZm03aQmWg== X-Received: by 2002:a62:5253:0:b029:18a:b277:6be2 with SMTP id g80-20020a6252530000b029018ab2776be2mr13264719pfb.0.1604378164620; Mon, 02 Nov 2020 20:36:04 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:36:04 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 15/18] powerpc/embedded6xx/mpc7448: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:20 +1100 Message-Id: <20201103043523.916109-15-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with mpc7448_hpc2_defconfig --- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c index b95c3380d2b5..5565647dc879 100644 --- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c @@ -58,16 +58,14 @@ int mpc7448_hpc2_exclude_device(struct pci_controller *hose, return PCIBIOS_SUCCESSFUL; } -static void __init mpc7448_hpc2_setup_arch(void) +static void __init mpc7448_hpc2_setup_pci(void) { +#ifdef CONFIG_PCI struct device_node *np; if (ppc_md.progress) - ppc_md.progress("mpc7448_hpc2_setup_arch():set_bridge", 0); - - tsi108_csr_vir_base = get_vir_csrbase(); + ppc_md.progress("mpc7448_hpc2_setup_pci():set_bridge", 0); /* setup PCI host bridge */ -#ifdef CONFIG_PCI for_each_compatible_node(np, "pci", "tsi108-pci") tsi108_setup_pci(np, MPC7448HPC2_PCI_CFG_PHYS, 0); @@ -75,6 +73,11 @@ static void __init mpc7448_hpc2_setup_arch(void) if (ppc_md.progress) ppc_md.progress("tsi108: resources set", 0x100); #endif +} + +static void __init mpc7448_hpc2_setup_arch(void) +{ + tsi108_csr_vir_base = get_vir_csrbase(); printk(KERN_INFO "MPC7448HPC2 (TAIGA) Platform\n"); printk(KERN_INFO @@ -181,6 +184,7 @@ define_machine(mpc7448_hpc2){ .name = "MPC7448 HPC2", .probe = mpc7448_hpc2_probe, .setup_arch = mpc7448_hpc2_setup_arch, + .discover_phbs = mpc7448_hpc2_setup_pci, .init_IRQ = mpc7448_hpc2_init_IRQ, .show_cpuinfo = mpc7448_hpc2_show_cpuinfo, .get_irq = mpic_get_irq, From patchwork Tue Nov 3 04:35:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392643 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHlC0Xyyz9sVD for ; Tue, 3 Nov 2020 16:04:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=B4kPaKXv; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHlB6VPvzDqDr for ; Tue, 3 Nov 2020 16:04:38 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::42e; helo=mail-pf1-x42e.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=B4kPaKXv; dkim-atps=neutral Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH6K457VzDqRf for ; Tue, 3 Nov 2020 15:36:09 +1100 (AEDT) Received: by mail-pf1-x42e.google.com with SMTP id j18so13128017pfa.0 for ; Mon, 02 Nov 2020 20:36:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VJRwJhgz7kC41nm/IuWt5UkVk7ZlL7bpbyZUIHtDKAw=; b=B4kPaKXvXNmf1qAd04mRneAlPHgQrp6JrG8FPHARg0PA2i54KyKe83RcB4fzeuNkny tkowMIHs33ZH9uuXnafDeXQQg+OlCGFd9rX7CWDflu+5xBUr9fMZIzNKhoRpSbXByrMX kwSn/xmx/RuVzLEy7UuXuxU7cNV9CWEP4LbiP1cvfmmX/5MeNnPdnr8oxQ4MvKhmi7F0 DNn8hZUOkDWDGHYhAMdDU+h3CFKiemwNF0pEFO6u/FGvrBxtdLVClWlzF9IehY23OiwJ weY0ArOYHkOdJwZ0Le0e4H5XPS2diEw2ECJ/4CbVQMsmBPRYHpktr4FWX3MWWz3mgXdb 6NdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VJRwJhgz7kC41nm/IuWt5UkVk7ZlL7bpbyZUIHtDKAw=; b=Hzet+E4NSOHeqQJvFhD8qN+ggh5GmHR19XJ6UtYwthnyuWzGxc6dL1AUd7T5c2vz1r DWr5Y7EpxBzKqTTLNyv1r7/VQTGim9DjoQ5ejqZlzMwxUohR0LVr7Ze+pItoTorYQBTk WqbW6DRSZSCWkPIzKZ7ZXm3Fh2mynSjgnWVjZWhbG4OR8KsCNWFmjtWjJjF1JT92f9MH 8QfdC96wso4ZKZumkdH9f+7xWxTBHFBkfMrt5xGFQhkk+lCsXfYHXeKuCWMQihQ6CPSD C3hsGhwHDYE/vahaSQ8PeFDrkXh+M8n2J3GBJK51UUq6B4Z9KUld1mex/9o+ebmVTsuV izlg== X-Gm-Message-State: AOAM532AVvKRZ+Vsqy0BkWFuXpPPUvIuGwiUg9zX241g3HKqtjkcKk6c KD6QCO9aXKyR9T6w68wREDUk57zad6E= X-Google-Smtp-Source: ABdhPJyNeQf4QvgOtL4D5pQhYRuqNJ9TyuPqgLz1f7Y+D9JVVZhs5nM5RfIO05RlgXR3PA3jdHHPBQ== X-Received: by 2002:a62:aa0f:0:b029:162:ecc2:4d44 with SMTP id e15-20020a62aa0f0000b0290162ecc24d44mr24724831pff.52.1604378166834; Mon, 02 Nov 2020 20:36:06 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:36:06 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 16/18] powerpc/embedded6xx/mve5100: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:21 +1100 Message-Id: <20201103043523.916109-16-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with mvme5100_defconfig --- arch/powerpc/platforms/embedded6xx/mvme5100.c | 13 ++++++++----- arch/powerpc/platforms/embedded6xx/storcenter.c | 8 ++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c index 1cd488daa0bf..c06a0490d157 100644 --- a/arch/powerpc/platforms/embedded6xx/mvme5100.c +++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c @@ -154,17 +154,19 @@ static const struct of_device_id mvme5100_of_bus_ids[] __initconst = { */ static void __init mvme5100_setup_arch(void) { - struct device_node *np; - if (ppc_md.progress) ppc_md.progress("mvme5100_setup_arch()", 0); - for_each_compatible_node(np, "pci", "hawk-pci") - mvme5100_add_bridge(np); - restart = ioremap(BOARD_MODRST_REG, 4); } +static void __init mvme5100_setup_pci(void) +{ + struct device_node *np; + + for_each_compatible_node(np, "pci", "hawk-pci") + mvme5100_add_bridge(np); +} static void mvme5100_show_cpuinfo(struct seq_file *m) { @@ -205,6 +207,7 @@ define_machine(mvme5100) { .name = "MVME5100", .probe = mvme5100_probe, .setup_arch = mvme5100_setup_arch, + .discover_phbs = mvme5100_setup_pci, .init_IRQ = mvme5100_pic_init, .show_cpuinfo = mvme5100_show_cpuinfo, .get_irq = mpic_get_irq, diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c index e346ddcef45e..e188b90f7016 100644 --- a/arch/powerpc/platforms/embedded6xx/storcenter.c +++ b/arch/powerpc/platforms/embedded6xx/storcenter.c @@ -65,14 +65,17 @@ static int __init storcenter_add_bridge(struct device_node *dev) } static void __init storcenter_setup_arch(void) +{ + printk(KERN_INFO "IOMEGA StorCenter\n"); +} + +static void __init storcenter_setup_pci(void) { struct device_node *np; /* Lookup PCI host bridges */ for_each_compatible_node(np, "pci", "mpc10x-pci") storcenter_add_bridge(np); - - printk(KERN_INFO "IOMEGA StorCenter\n"); } /* @@ -117,6 +120,7 @@ define_machine(storcenter){ .name = "IOMEGA StorCenter", .probe = storcenter_probe, .setup_arch = storcenter_setup_arch, + .discover_phbs = storcenter_setup_pci, .init_IRQ = storcenter_init_IRQ, .get_irq = mpic_get_irq, .restart = storcenter_restart, From patchwork Tue Nov 3 04:35:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392645 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHnL1kxCz9sVD for ; Tue, 3 Nov 2020 16:06:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Pxhx4Znf; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHnL10WDzDqLn for ; Tue, 3 Nov 2020 16:06:30 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::544; helo=mail-pg1-x544.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Pxhx4Znf; dkim-atps=neutral Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH6M11kJzDqSf for ; Tue, 3 Nov 2020 15:36:11 +1100 (AEDT) Received: by mail-pg1-x544.google.com with SMTP id z24so12706954pgk.3 for ; Mon, 02 Nov 2020 20:36:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MSskaiTZtrQLAA4HeLAU5RtvuPrJ/Mg3BppavGPHrS8=; b=Pxhx4ZnfpF4MJuvqQF051fx4rDfn+QEzaaeA7Ewl1kv7l9nnnyGhC3Vm1wSpD54BMO V043ussyAIpLszJkycoZBINhWQ/s2womdNwkPUPX6hRWwW6ByD2kkGBf2+YR6qXgjLc9 PFCuNYDnA7VM5FMty7QX2qoa3t2DUwFBY3UqA9Yt4ONyS4qiaEDedOqUkxFF8cc5jVbJ HxiI/TvxpCD6+g2T8QcdduAuhSwWI60eadW2r14pT+YS0KpUNl8befwAlicAHvSC8wPB ObqkJn6tMdDqOszY/8q6be7aRoIKG3lU/QENdNH0KwHmRGgnmJM2zE5FF4ImFTSZIBOC riTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MSskaiTZtrQLAA4HeLAU5RtvuPrJ/Mg3BppavGPHrS8=; b=FBsBZOW/YllwaQ8ekxGAeMg6yXolQRJa3V4LI09FGzU0dWSBHrZu0x9aPC3auLMTE6 KXT9r6HpNV9HLd0MXQBOnUy56bSm8coE5LF8HW8pZKE5eFhBHf2zZs7ZSgKw2flsx1Sg unWZqIAUmBU4E6lQsLQwUs8yH6boBdrqSJAAiRiq5ELRNQJdhXcP/4cVMZwZIXwwDaBN /zgvTYQb89dbwtFFU2h3i1o2eQhO5J6X9t7Xj5TecY1E6vEqyzuPmN0LfDDvbsgazjga Uc3hAI7K1kh0g1u+Ch82TqUSgPxIgmsWCGkQpG/nLKk1NrKPosEp7oU94mUe9jNMNBEo NYjQ== X-Gm-Message-State: AOAM5318Z26df2CN+LfZ50Ct8SoflLBt1VzfLh/+fGTnjT1SMUJ720AA Uosy4uxKtHoCq6Yk/utHJqPnRceuEvg= X-Google-Smtp-Source: ABdhPJwUFatMAbBMCEouaRLtlnDlmzHU32sFWew6dvMde08hrw+D609qSB7c+msMj0q5qkBBwumazA== X-Received: by 2002:a63:6645:: with SMTP id a66mr16350577pgc.207.1604378168816; Mon, 02 Nov 2020 20:36:08 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:36:08 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 17/18] powerpc/pasemi: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:22 +1100 Message-Id: <20201103043523.916109-17-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with pasemi_defconfig --- arch/powerpc/platforms/pasemi/setup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index b612474f8f8e..376797eb7894 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c @@ -144,8 +144,6 @@ static void __init pas_setup_arch(void) /* Setup SMP callback */ smp_ops = &pas_smp_ops; #endif - /* Lookup PCI hosts */ - pas_pci_init(); /* Remap SDC register for doing reset */ /* XXXOJN This should maybe come out of the device tree */ @@ -446,6 +444,7 @@ define_machine(pasemi) { .name = "PA Semi PWRficient", .probe = pas_probe, .setup_arch = pas_setup_arch, + .discover_phbs = pas_pci_init, .init_IRQ = pas_init_IRQ, .get_irq = mpic_get_irq, .restart = pas_restart, From patchwork Tue Nov 3 04:35:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1392647 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQHqS535Dz9sTR for ; Tue, 3 Nov 2020 16:08:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uWRgHKW6; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CQHqS4JrgzDqFZ for ; Tue, 3 Nov 2020 16:08:20 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uWRgHKW6; dkim-atps=neutral Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CQH6Q2C59zDqRp for ; Tue, 3 Nov 2020 15:36:13 +1100 (AEDT) Received: by mail-pf1-x444.google.com with SMTP id a200so13089913pfa.10 for ; Mon, 02 Nov 2020 20:36:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=do4QpgVUJH4FahzX+VOxgzwXwqh4ZG7TfyRWmg7zLms=; b=uWRgHKW6eoFIox+NA+aH2tec1T9bZWHOz9pzrhoKmfsdUr/qiqdjxYy5Tz/+YsJ51D RpDGIYaFridj2GQFSrt4fN/UzVzoLtptUeSo/Ws+YrqxVqv84hQ6ZI8Jmne9M8enJUIg 9PwL+iuZ+WukYk4zx/9ZU04Od9OAel3Hv2jyZvDOexSCPl1epbS5AbNYrmRl40kKyWGS 1f3IAVHiJfxVzKDVpm3sWiF+hKzQkw3ssYcmS4+0sB5xJhtLgySUPHD5yw51cvuF8nA6 GegLrU/jFZhiERlvpZcw23IRY1GyMIPhwWCb7J3ePHkqIaKWUGVyWRKq/7iRachiv1n0 eEIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=do4QpgVUJH4FahzX+VOxgzwXwqh4ZG7TfyRWmg7zLms=; b=hdt31xQGpuMjWYuLFR8LRCi7ayVaG5D1xFYfkcV1impOS9ls+hO7UvJtIT1N5RMjXR K6t+f/lMOCWMvDEZcejQIbOsp7VK60i8iX0RCHaaevY7KLedwqaEPkHayjmiPGUetnmH 2H/+h3Dp3TISmlLXvJp+y6w0xsAvGEt4Mo30kQpX9QTwH1PtJxPdEXJdKIdzSakKOdGx kJ6r5fOi1cOD2Unx2wH2SwJCvc/DhH5linw7AVLrtNPboljMAlWg2os4dk06LAa4YOwE pUKD+aakqCcqKQLHUvMb0FVRq49EBXJ1+QN776mVWoTzum5GPbsQkgfmPPIYXQLhIFbm g0ZQ== X-Gm-Message-State: AOAM5330mLcsUJUrWkYDgfjlmI1/RKnR6zPuK7/gU1lmO5NJRnPlvtIA GAjjw1iL9jKg8p5LC4+eZbjMSg3wbwQ= X-Google-Smtp-Source: ABdhPJxQVOGaH5miLqqxzgKXMvLCGYmR3B5PZnxp52mA6wad+5o9qayVycAd3I6pylUuOd8hcqkb5g== X-Received: by 2002:a05:6a00:16c4:b029:162:bf9f:6458 with SMTP id l4-20020a056a0016c4b0290162bf9f6458mr24065170pfc.55.1604378170832; Mon, 02 Nov 2020 20:36:10 -0800 (PST) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com (110-175-254-242.static.tpgi.com.au. [110.175.254.242]) by smtp.gmail.com with ESMTPSA id o16sm2579116pgn.66.2020.11.02.20.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 20:36:10 -0800 (PST) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 18/18] powerpc/powermac: Move PHB discovery Date: Tue, 3 Nov 2020 15:35:23 +1100 Message-Id: <20201103043523.916109-18-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103043523.916109-1-oohall@gmail.com> References: <20201103043523.916109-1-oohall@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oliver O'Halloran Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Oliver O'Halloran --- compile tested with pmac32_defconfig and g5_defconfig --- arch/powerpc/platforms/powermac/setup.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 2e2cc0c75d87..86aee3f2483f 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -298,9 +298,6 @@ static void __init pmac_setup_arch(void) of_node_put(ic); } - /* Lookup PCI hosts */ - pmac_pci_init(); - #ifdef CONFIG_PPC32 ohare_init(); l2cr_init(); @@ -600,6 +597,7 @@ define_machine(powermac) { .name = "PowerMac", .probe = pmac_probe, .setup_arch = pmac_setup_arch, + .discover_phbs = pmac_pci_init, .show_cpuinfo = pmac_show_cpuinfo, .init_IRQ = pmac_pic_init, .get_irq = NULL, /* changed later */