From patchwork Thu Sep 24 06:38:02 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: 1370321 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 4Bxlmd6nCXz9s1t for ; Thu, 24 Sep 2020 16:40:49 +1000 (AEST) 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=LjYpxsFz; 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 4Bxlmd6GgrzDqZ9 for ; Thu, 24 Sep 2020 16:40:49 +1000 (AEST) 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=LjYpxsFz; 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 4Bxlk63jhPzDqZD for ; Thu, 24 Sep 2020 16:38:38 +1000 (AEST) Received: by mail-pg1-x542.google.com with SMTP id u24so1316621pgi.1 for ; Wed, 23 Sep 2020 23:38:38 -0700 (PDT) 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=vTL3VSWWE/BCPK9LdtJdZaureTQRofLUceddSqPsA3Y=; b=LjYpxsFzxZlCtdOdkgzVLd+vn5qHQdD7AureT/w3lmOsN0Bdljj9PGH2tGyBsoEQSg yybCK6hqoAxbniTnWBV7XX29esVbYyiRADUQklApF+CK/jGolqtuTwD9b+dQux0Po02J w7M7wbmYEpk46rsF65/CyTu6GM54OCw9reTbs7NaHj1B8u7cYrctXxyFypVu1Za3fwfh Zi03eI4zHL3KUhUHwgpLIavM3cWZgLUkPEIGLNB98Jf/aKFFfclbFKndLC8VdAep3DSv Wj5hYGesStEuZxeADd3feZnpqIRVL3/tqmPR0vhhMaRSAk5OOHFt3XsmM/MCk5IsNDyH BjBg== 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=vTL3VSWWE/BCPK9LdtJdZaureTQRofLUceddSqPsA3Y=; b=bgiz+oEBECDORACWuNe4DqrabMDd/guc9Txq3C3jiQQ8h/m2DOt0zyn82eqVNaudby 6j871aA9y5AgMDyesjwzN5DWnBCms19QKcF1JU5wq7GCNzC0PeBVYJpbreFnT74vyk8b qHyIAhed8dkXLNbL/qcJaBq61Cs9G6KcrJ4idGzWF6/dZ4+e8Bmo7xI8YPvrGM6XkCfp UbXw86Wl857Z4uCrLaygTD+hxN3jOTtw20TgCRCaniKbJA8pHRgLi/8CSafkN6jWrPQ4 guCmSaW2aaMl9DcZELG+4ts4xwXqZ06HMvz9+r5ftRjmr9Qqq6vVjS4p2miJi5SziOXZ zmTg== X-Gm-Message-State: AOAM532Xth/t3bfHtVucj/hBELWT+CB0MAOAW8+ii9TddJpu1etgve+N ecC/REhGNg7nsU0tWh1o/2qKDyMjz94WVg== X-Google-Smtp-Source: ABdhPJxY6OfVAMz8bc+ccxtbwI344hTNWx7elaSdCiX/Wlx7eJqkugOWi2NlweCvcSBur/HwaZGuCw== X-Received: by 2002:aa7:96af:0:b029:142:6a8f:c04b with SMTP id g15-20020aa796af0000b02901426a8fc04bmr3281144pfk.30.1600929514491; Wed, 23 Sep 2020 23:38:34 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:33 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 01/18] powerpc/pci: Add ppc_md.discover_phbs() Date: Thu, 24 Sep 2020 16:38:02 +1000 Message-Id: <20200924063819.262830-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 --- 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 a90b892f0bfe..b732dd5722aa 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 Thu Sep 24 06:38:03 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: 1370322 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 4Bxlpb2Rttz9s1t for ; Thu, 24 Sep 2020 16:42:31 +1000 (AEST) 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=mAxjhWMM; 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 4Bxlpb29sRzDqZp for ; Thu, 24 Sep 2020 16:42:31 +1000 (AEST) 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=mAxjhWMM; 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 4Bxlk74ZhKzDqZF for ; Thu, 24 Sep 2020 16:38:39 +1000 (AEST) Received: by mail-pf1-x443.google.com with SMTP id d9so1292338pfd.3 for ; Wed, 23 Sep 2020 23:38:39 -0700 (PDT) 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=cdtzpyUkbWQDw2GmzVp1fBCkWNF6lLAstzuR4qPS42Q=; b=mAxjhWMM4p3EEOx2ZRTjSuz8ijPnwcuHFXSxh/s78zSnwIBYnjaxS0V7Wk8ner+/sL IkzE6iiWqwdK8AiwaeizAM5EB9KNwNA2b9KgywTOyzTFAUHlDRAoQHHTFl5x0Oa3wAG4 tDKvbQqYBgbGW0N837sBH5N1jYJzv9pF3tO9rIp5g2cb57VkvwMRQzGLbuESruBhtDLC tg0PtRolbzkDFdF11lDmHyQZ5tQ4RbugGwhBgK+R1j7DcXvP8ok8szNsQYr4AupU1CjQ zoR0121DUmp1wv/pUC0q1bsKojmN9xhmBqUwQ3hUAkXJZrNtjEEP3fVHLpik1/3rRBWC q5OQ== 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=cdtzpyUkbWQDw2GmzVp1fBCkWNF6lLAstzuR4qPS42Q=; b=W1Wm2WRf0yRUMiXcDT6P7sIcU/+YcvntSitI9QhjolJy4JbIA5JYRhRFW9HHteIZKW 7wNWUcxDBa8Q6KS6m/nlNEBuJCWn+s8j94ApMvC2lbJjz6+AKvAxoXZZ1SRN91mxT73c 32fQRkrADiJdze7rbXIXbPCXFxWi0quJELSpOvFFxJRYHzj51Bc9LRENNB/N7okjo6BJ z4IQ2zFg4RKU0oVjhk/1OFdv9R7/O2AYGDGknGnzNqsiajL7CEVdybUnfXMjnBZw2iHH T+y1lbhn9AkxAvGp9CS4nQtZjYhb9QISraYy6yrdTgpHHIkzOlge5CSQyIgplnWv+uUd zILA== X-Gm-Message-State: AOAM533jK5trSjUEf0XDFEUaQXs5m2RPNYVxlGMOXUYhcLLx7nOtezZD KgdwB8LuuDtn06K54ipKUfkb/daFdmj20w== X-Google-Smtp-Source: ABdhPJwl8Lc0Pq68smuotyXWUrY7mm1Tq83gCx39a6jdOpaLSvOqpbSoPG1RlXwq5/+k+9uYaUnL8Q== X-Received: by 2002:a63:1e03:: with SMTP id e3mr2792992pge.69.1600929516703; Wed, 23 Sep 2020 23:38:36 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:36 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 02/18] powerpc/{powernv,pseries}: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:03 +1000 Message-Id: <20200924063819.262830-2-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 023a4f987bb2..987654a08e2e 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -3184,6 +3184,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 7fcb88623081..a4d6d41b1155 100644 --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -140,9 +140,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(); @@ -500,6 +497,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 2f4ee0a90284..d0bf487fadf5 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); @@ -771,7 +774,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(); @@ -1035,6 +1037,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 Thu Sep 24 06:38:04 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: 1370323 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 4BxlrF3H2yz9s1t for ; Thu, 24 Sep 2020 16:43:57 +1000 (AEST) 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=ArsnPD3g; 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 4BxlrF2hGqzDqgM for ; Thu, 24 Sep 2020 16:43:57 +1000 (AEST) 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=ArsnPD3g; 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 4BxlkB1TbfzDqZ9 for ; Thu, 24 Sep 2020 16:38:41 +1000 (AEST) Received: by mail-pf1-x442.google.com with SMTP id o20so1261113pfp.11 for ; Wed, 23 Sep 2020 23:38:41 -0700 (PDT) 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=ArsnPD3gBOS9KxKFFonp++bC4Jg5mZP1oERua6mF3mR/5M7SK3hQyKSiqjQRFZ5nZY AdkqDW0z3IORK5Ej47UjgVZiNr1Qu3G3am44xSdCB3XWi9YlfECpSRhl91mHG+i0NNBd IMLl5wxawe42L4t99PDpPvkRDXmafgUJ5etqs0UGrZgjRuc2gM4Aj3FIvdkTX1s3ZwTT fDdiI3g8uYJHy1bApCCNaEZP/T+gJtkJLx4XkhC2i+iBgy5LaX8Q2dmCeSN97rvFkhHW IS77JPhHVkIJEJBKeWu85W45zQ5jav8ztGs9TwHwA8G+aGUKLxRzFBVhi5AZmfG2vXXi fbzQ== 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=NzsN7VDN4Q4mibWF3NR4txsS5do9owIXXtg3RyQengHAjMGUGwBLwZNLsjIQ5X6NJG cPPz+B7h1fxV1dBFoJV9GqQPGiVPgsISfUe0/CAsSHutcaikhu730nLvbWxjusk3ubkt i1dErYdoaU4Dh9jFDC4sNxG56IZqFCrsFphUu/thq6OAoku6wE2C9THqm0LjdS1GbbAA 9fCtSYURjg2KR7fpGZV1NdydNK7RiFoBfzBiOK066ppn5LfPqwWYkWu1yY78owqlbYYK PUUN2M61BZvaoP712xmiBNmhKhJE5N+T+BFUCR0I6T9WTfnwrklgM4LBp6+4le/cXG9K WHWg== X-Gm-Message-State: AOAM5300BW1ZKjv5ksXBme8EnhCjdZxqKqedP4V5WMYaYwDyymg8who6 REQ/ROwAwwFgpuHUa37YnnyppYwhQIRApg== X-Google-Smtp-Source: ABdhPJxbt9JHcLQrMFtTH03Aw1iOelZkD1w0SNxgg+HB13/FE0/4moOHnWz97R8FxeT3kAKYNjP5ZA== X-Received: by 2002:a62:2c09:0:b029:142:2501:34f8 with SMTP id s9-20020a622c090000b0290142250134f8mr3056721pfs.81.1600929518849; Wed, 23 Sep 2020 23:38:38 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:38 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 03/18] powerpc/maple: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:04 +1000 Message-Id: <20200924063819.262830-3-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38:05 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: 1370324 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 4Bxlsw3m9Mz9s1t for ; Thu, 24 Sep 2020 16:45:24 +1000 (AEST) 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=GU1oOdqW; 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 4Bxlsw3Q9lzDqbW for ; Thu, 24 Sep 2020 16:45:24 +1000 (AEST) 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=GU1oOdqW; 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 4BxlkB69shzDqZ9 for ; Thu, 24 Sep 2020 16:38:42 +1000 (AEST) Received: by mail-pf1-x442.google.com with SMTP id d9so1292413pfd.3 for ; Wed, 23 Sep 2020 23:38:42 -0700 (PDT) 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=GU1oOdqWwxmBIj5+GIbMLhFYCkpWBr4VgdMQjpT5yYV12R7LgAIhUqZYXDbEXfrRIq /W48iDWJ8LjDfy+DyJ4IpgOhNeE/C5EW0geyFFomsEw6Yu+rkHzSX0X2dR80v+BgOnbr iAnMv1L35uhlvdt8VNZwk8Rpvu66kIyym1lSYPre8PIt0vlLMDlzLiCkDSnIb58BGGzC VH7DNGeq4W0EU1jJl9db3YXEuztobiBoqizUZLq/0+8B+EO9hLFcOzFFMS3x2/PCcrC/ 48LHHeMJxMnPCIrs2VsfHuvf3ut1qhlKKEiQkNFzLykf39C5px8CFXtxk0KhKxhN9qay PAKQ== 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=qZrWiBo6fvUfSSsk9EgE690XjSWs2xNm+Uz0jpFsUnPz9Z6U0rg1k84U/yIGJXMCMB 2TcSPbGXlV7QRs3iM9lEh9oeMW72l9fSIneAGO0CluJCGGxG9D+Iyu9owIvP/N/xM4sC VRanQtaLZ0GEIwvucOhlOi2L1789zF1kKPa2RtqZNUfleFgwlkGnAsR5V2G24lDDELhO zAuqczIsgQd6jhJu306aLP8yaELToHsW/iKnmIVLKc2OFO/E5RdYVCif+idr7CYbSJKQ w5e8Ha3Uez4y+pDw/o5AP+ru/bD3fAnXSCcGJMX0bjHDVNzEhTIVDQsmruAX9oZFg4cW rZdA== X-Gm-Message-State: AOAM532H+6p+cQH2tg7a89Lmr/sakhIfotlX2Cj3IJcnTs7HpRE5Kxu2 X0+J2XLZBmhCgAicdC0V0ytfFcjX2tT1WQ== X-Google-Smtp-Source: ABdhPJxgFNzoBuexPaDdjA2YdUJHRvqd84LITwCVtThi21YSTDrJjGZsds0XUpe6PuCeSfGUGuot7g== X-Received: by 2002:a62:e404:0:b029:150:7d36:cd88 with SMTP id r4-20020a62e4040000b02901507d36cd88mr3159377pfh.24.1600929520955; Wed, 23 Sep 2020 23:38:40 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:40 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 04/18] powerpc/512x: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:05 +1000 Message-Id: <20200924063819.262830-4-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370325 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 4Bxlw26qdbz9s1t for ; Thu, 24 Sep 2020 16:47:14 +1000 (AEST) 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=ahGocHWp; 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 4BxlvM0QNszDr7p for ; Thu, 24 Sep 2020 16:46:39 +1000 (AEST) 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=ahGocHWp; 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 4BxlkD718fzDqZF for ; Thu, 24 Sep 2020 16:38:44 +1000 (AEST) Received: by mail-pf1-x443.google.com with SMTP id x22so1260081pfo.12 for ; Wed, 23 Sep 2020 23:38:44 -0700 (PDT) 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=ahGocHWpbo3ooji1eliJF69/u+hAq4KvU1X9N0wrUPP+MVYUbyXS/he+wzBJQWDbHR sOwrp8Odlqax7HFVncqL1Y5/pMqQmT71t9QDecNIGvesgrgLHIbXHeqdKvEG8S8Kmqhn gi+SnnfMmEwBvE+/ls3HOmD5JDGt+UCeZnQvRgdTc+pqyw0qU2wDQpOU8iFmBlqABCId OLC/ubWxX3eym5OP35m0OA5RvZQAl85ALjzlFmcwHIwvgbXUuIBkp9KjjEEnfsYDFoGT jesKchG1T98+cRnHyQFU225nYZbODGQ7XXByt9mhR/mJBMSSYj5iEm37+yvDEm+RJSP0 c99w== 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=hPGbfqt9MLGfZtVf9ZcyKtPA4h4dgQbdsjYGcQjFekSjIXzQNgMnyPpFr0VGFmxYDU Rp6IKE9IrfRWB2Qt6qqm1/VyyUQ/igyPS08gxytmNrslMJB67Wel5PqHnlu88I/R/REZ j9jF6fNQykMMWYEHb9L+jziDDtccxvW9h+cJ20NjsCTvIf5y/dcuMyLFQ0iVrTK+DUh7 mUrQZIKjSrgj6oMULmw/r93BBD2tJX7Pz44vPF3bSHFW0gDVqCnmvUqFqYPzsLmzUgKr Ln/0QLG/sGH3627SJvX+a47b2khedXkItOUbpUD2lQNiSTDzNcHVUxgcFe9jctuMAddB pKwA== X-Gm-Message-State: AOAM533jeUJSsGIxdZ/AWYVaTMa+JRLAKrYw682vS6Vss/bcwlKQ0l4B VJLRw8skQeiuoFXOEtz4MC+YeZCfnPTFFQ== X-Google-Smtp-Source: ABdhPJynPJ9UqKR/dDGVEAOmH32WdObyC6583+hgQqfDXrBHk+X6j7naG400LsKGh+5FBzImWr7tEg== X-Received: by 2002:a63:d841:: with SMTP id k1mr2810384pgj.59.1600929523082; Wed, 23 Sep 2020 23:38:43 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:42 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 05/18] powerpc/52xx/efika: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:06 +1000 Message-Id: <20200924063819.262830-5-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370326 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 4BxlxX4Pq8z9s1t for ; Thu, 24 Sep 2020 16:48:32 +1000 (AEST) 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=JeNHKQEd; 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 4BxlxX3s62zDr0y for ; Thu, 24 Sep 2020 16:48:32 +1000 (AEST) 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::642; helo=mail-pl1-x642.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=JeNHKQEd; dkim-atps=neutral Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 4BxlkK4LPRzDqZG for ; Thu, 24 Sep 2020 16:38:49 +1000 (AEST) Received: by mail-pl1-x642.google.com with SMTP id r19so1165183pls.1 for ; Wed, 23 Sep 2020 23:38:49 -0700 (PDT) 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=JeNHKQEd7kuHB8jqtWKOYguOhfBbnG7iPVCeqkm/cT9tgxH7bA/CrLfwvh3abNsJiw uvLYhEtHEBBWrCsNHsk8fUm4oznR+BF6h/HnbIXTs388VsynP/h3aYUXR5j19TOqk5us 1JYHh1OujTRwh/F6eOmABhJDQbwsbifLuOxWNvuU2rPS5SCB+aW5EmVLe1P0IlcxGr1b gXoTXByxBIS+ki2LWn9wf+Dos9IEkFPSMHkgIdNYecczDTGsIsn1PwYI8O83iWcOl9kr MSpF629/bJTYQX7fn9KX10ss7Wm6yfNDiQdmmD73z19eJk3K0R+FBCTTq7nSBwXMC5uT 22VA== 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=IiwT56ivTphnfDU+C3S9U/pCxEfEz64w7aGbA07RMVjAzs42MFo+HA1dmhWGvGlEwp 3GIOSF79G6bWgO5vy3zHgyOCotyWbE7Q6dpLNmqDH1bxmDW+p6VjO37iiwaunlZTXb6o Eu0C8ilbtslZyW9Xa8IPbDPUhOdVbjaOPOPpKsAA+jtLzVQTtz9O+3P6tvWceHhXu96j UZd7fM5Mu2gSfpyd/bB6pGfM2xqaiNQBNxK/NF9HzoNXuq/dluBarLPZdurfMBBMQ6v0 nr3BJUhZ/9gHZT73dvHUoXAm0f1cTCPk18nkwyPRvnOqGEV78373mYTkCMU3d6f5wwiW IEKQ== X-Gm-Message-State: AOAM530SyofCZV1UMHLQwSd2jB2C1+o1pka1y3hGb6puThpA2dpnDxqy FfWCwXTRSJRVEvQ2vLk93oPGR8ZIogqNVA== X-Google-Smtp-Source: ABdhPJzYT1usXG1AmRVm60SeQd8D/Ndw1kiQ+ucGVqjEhPXwjcFsWBX2QikHDTRzCePnV/HoDXMf1Q== X-Received: by 2002:a17:90a:f198:: with SMTP id bv24mr2793500pjb.117.1600929525155; Wed, 23 Sep 2020 23:38:45 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:44 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 06/18] powerpc/52xx/lite5200: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:07 +1000 Message-Id: <20200924063819.262830-6-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370327 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 4BxlzG0VDCz9s1t for ; Thu, 24 Sep 2020 16:50:02 +1000 (AEST) 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=m7BaSar6; 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 4BxlzF6pQKzDqlL for ; Thu, 24 Sep 2020 16:50:01 +1000 (AEST) 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=m7BaSar6; 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 4BxlkK71C7zDqZk for ; Thu, 24 Sep 2020 16:38:49 +1000 (AEST) Received: by mail-pg1-x541.google.com with SMTP id f2so1310112pgd.3 for ; Wed, 23 Sep 2020 23:38:49 -0700 (PDT) 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=m7BaSar60hvoZJ0EjYFIXGhZcWl8/3p5Eb1adT2n/5OaKce8gwFxPUFprfAn8UZLaj HPUJSw6vVoMBuySymsChiTT8/UIwWppz2fP3ygUKR7RTBTVxU5Wnk4MUWzuW0t9Kj3lH 7wlr1gTY5qdIr13yQk6/+vuHFmbZV/MWNtM1QzloBIoczrViztM8qAlHEJ6zUVdJ3GJo G4uE2n5/0RqbjFON+smU+ozj4zcB0ZPqoub8RKx5YegxqmtyO+nQPa9tDLuxci94fQtt rOnlU0MpldVMke6ESMkLNFV80af5xyyBeb3PeEsOpUyH22S1FAwfuiFLVyfbxB+T6rBb A++w== 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=VCeC1ne1pLqFnvBt3VH77vXAFIDclS7cT/6b/Ekcf/UfHzDQCdGI9p6gCMrtPsiKBh jFV1QV9g6hHv/iTNMnM13U+M4mOJulHCZIB0b2bwJEcw5subtY3y7ZCbHpfanj1C8cI+ cv9oB+iJduPPKCBs6LF4SMmORc33IkOhzTxxtKiNiPmLh6tkaDoxApCczZAi5+kTd9G8 M7O1HCsdg0F6TgPnpawAxpWNwLfeQ7LvRGUKH5BqruQy3SWNI8aH5DUcD9Pvh+QG8gBz zEcHguSM0cHzQusmLpNFSbPh63DgT78HAR5HIoi9igpcjmYvWWTojkZ7JfzlG8EW2kns RCBQ== X-Gm-Message-State: AOAM530quUMyldRysZXowg2ZU5eLsm5Sw8ux+as1U11vdD1k4gCny4PZ IZYxGBjytbdCQuWT5lWjqKyXkqejuYwjJQ== X-Google-Smtp-Source: ABdhPJzrJNq/a+VvwOSKOZFatDwh8kzIs+ofl34kVUay+/MarBSVppAo7DjmJcj7xmDrfxzLxVFPJA== X-Received: by 2002:a62:6287:0:b029:142:2501:3982 with SMTP id w129-20020a6262870000b029014225013982mr3121897pfb.71.1600929527481; Wed, 23 Sep 2020 23:38:47 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:46 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 07/18] powerpc/52xx/media5200: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:08 +1000 Message-Id: <20200924063819.262830-7-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370333 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 4Bxm2Y4L53z9sVT for ; Thu, 24 Sep 2020 16:52:53 +1000 (AEST) 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=a6QwynBA; 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 4Bxm2Y2vn4zDqjb for ; Thu, 24 Sep 2020 16:52:53 +1000 (AEST) 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=a6QwynBA; 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 4BxlkP2WXZzDqbp for ; Thu, 24 Sep 2020 16:38:52 +1000 (AEST) Received: by mail-pg1-x544.google.com with SMTP id 7so1281637pgm.11 for ; Wed, 23 Sep 2020 23:38:52 -0700 (PDT) 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=a6QwynBAY8seXIC4TgBOYSmwphiRJfjGQz1vbZ6ohlFDhfJVbFcnvqj0YWsO2kYf4O zDAY+pYoW2Lw7T/rhusETTaKvxe+gwmEy8mgr+9xHfRXKMYLAat63cYGFQHkX7Shl7NN RF0JxMWMveQQeJUSVOl9QGquDWxz+ceJ+x49IH1RA76LnCL2MJAkNapbfj6geHmj7dYf bWip5gTBVEk65Fw/2DTtgAd1StOG5WOnJtkWPvBww2zcw+G6BGKmYtmLKAbjcHuR+qSz lI5Say5kuKAb/WQEBYrtAS9U9g142DJeS2/IhQ9ohEQKWlHyOvMHmS+o3q9LFllfbey1 xLzA== 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=DNVhVlbdwfvzVh5GeCvap8ich//gioqfuiWnJcd5EzfIaVd+EO7pTLEjd6cUgzZ6lW YEEG+yQS9jjNgEBHwwcC0HnqbPkwZIc+mmgfXSDMSEldZvmW9JWh52K+iNuS2bnjWGrR qBU3O0r0xU3Sf3y57FWGkfdQX9QyNiCQ0NRD8Ak93u5D1i3Z1vXClHUgzBtHRDgYV3um j4AkUx7jbJKPJZPKk6kAOu+TpEut7gmPQ2mnDe2Dig+t1mWzzYIbXm2dgJO+P7WGUTvF Ep/IMoNdRRkJbIGhWWKv5ZRcgpY4ruX0dflldEA3hiX1n8mZFZ5qHovGVTTZwNmtULkn ALxw== X-Gm-Message-State: AOAM530kkMIUzrDoHiIekfpsYnBVEYkIdHAWaTj8ubzeaqavldD0gKHt g+hOjeIeaIcMeO4lMfgy6hAtyX6QnMjlIg== X-Google-Smtp-Source: ABdhPJw/EFE6FnoLe+zqzmhe5A7SH78G1UvwksaXc2cI8v8NkzVGlwCW20/Z4RNM3bNDcHb9wJutDA== X-Received: by 2002:a63:43c6:: with SMTP id q189mr2900373pga.63.1600929529625; Wed, 23 Sep 2020 23:38:49 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:49 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 08/18] powerpc/52xx/mpc5200_simple: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:09 +1000 Message-Id: <20200924063819.262830-8-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370344 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 4Bxm5Y1ScYz9sTH for ; Thu, 24 Sep 2020 16:55:29 +1000 (AEST) 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=Xh2L1ibY; 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 4Bxm5Y0VnrzDr0k for ; Thu, 24 Sep 2020 16:55:29 +1000 (AEST) 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::42f; helo=mail-pf1-x42f.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=Xh2L1ibY; dkim-atps=neutral Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) (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 4BxlkR1YFVzDqbX for ; Thu, 24 Sep 2020 16:38:55 +1000 (AEST) Received: by mail-pf1-x42f.google.com with SMTP id b124so1253012pfg.13 for ; Wed, 23 Sep 2020 23:38:55 -0700 (PDT) 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=Xh2L1ibYpDGQH3WONK7Ynk3O9fXyrsrfT4JwE7MvDPVrVEuhC0yIC1WLk72b4DwbGW K9J/VgiO3PSMGTloAdMtKN3j9S5zCics4yjU4332z1HqnsMmxkCDkKju0H486iyZhTB5 NAOkLgqwFH9DlNjwjONXEZUV4vw6h/racmgZJJPPBNjbQRzEpP4ZjETampAl8CNQsUIx jm8QhYsFAWhbuqSvgsoVsu7LHWi4vzHCdO9hUTAK0Cgw0jWhN+92oKQ6iR9fRQWT4cd1 0xL63LVXSRzmZ6Q8u2HDfQNARAlYNtFxCZkQyDVBfPypStDxcbwjruzUK0ELBSKhwJV5 IgQg== 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=Dl0sEgCPPBeVavvWB5KkxspYxy4MXKE3gPxk7fuHtErsE3vH6aiHuKet2I418Jcvpb 8IwvjhcuU5F16AHATewUgZSFRDSX8F7C58vN+IyFWhgY+Anu0P6+bRovTdG25+ohOBGW h91cnZCvu7O7LPhVaRuoPEnMYA5JKfoSVMfqsPpehOFLFnbAsxXPQYIWAlXA4Ur4j5om iu8O0NJ84WuIqKLdXhZ5rUX5jy79vvVVglrA7IOUfCjz9OtHr98PVT1Vqqc7NRIsHbn3 /x2n15HyRWhlVo9/2CMWGT46qQ6E6x5eajwMgwwQnmbSjmtp6aVacbSYmoExGJ0iLHIA TUCA== X-Gm-Message-State: AOAM530+dc+z4Lfda9+AkVF0gjfUF9TA/NUD7vGgn8tlZUFiTLTSfGym vUrHsS2IT5N9x1cOf7joQ1E8h60QjWhREw== X-Google-Smtp-Source: ABdhPJxCalXqy7xB+qwH7dgAmxlQ43QE1PxdwRiaFJK3m8vFHCg0q59T4IQONRRti2B2XzfnrUkeQg== X-Received: by 2002:a62:520e:0:b029:142:2501:3979 with SMTP id g14-20020a62520e0000b029014225013979mr3256866pfb.62.1600929531889; Wed, 23 Sep 2020 23:38:51 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:51 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 09/18] powerpc/82xx/*: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:10 +1000 Message-Id: <20200924063819.262830-9-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370345 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 4Bxm8Y6Yn8z9sSC for ; Thu, 24 Sep 2020 16:58:05 +1000 (AEST) 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=UN3Tepgl; 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 4Bxm8Y5C2mzDqfp for ; Thu, 24 Sep 2020 16:58:05 +1000 (AEST) 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::642; helo=mail-pl1-x642.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=UN3Tepgl; dkim-atps=neutral Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 4BxlkT1DrDzDqc9 for ; Thu, 24 Sep 2020 16:38:57 +1000 (AEST) Received: by mail-pl1-x642.google.com with SMTP id y17so1144530plb.6 for ; Wed, 23 Sep 2020 23:38:57 -0700 (PDT) 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=UN3TepglHmZVFZq8BFChRfOk5OnjNU2T5mkU9KTNtyySof9lexicwjsVVhld9gieId VeLJFd7PBpWYa5ZGOSIvabAjVORn2JoJNHVmRT4P6M/S8skbaTrd0o8rlItrv+ogqKcm Eko52va3oUXykOfUaWnG42ZR+M11f7CjDk23VNlIPvDssZ+tqy+f61GHPfMh9cYscKy9 658DztRSaBNP07iDFEl9oEbWLwL7UvVSST6kGKb5nKcL692OHNQp8X82fT32qqGqPRvL tNplUmC/CMthzQE55/j7ZaaZZlf1L/o8I1DBawGoe/F4tybk00XKSE8D2iqzpS/w1aJk sD7A== 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=dqvBl7foqL0zvfMC8u2p3Wb0CUVIqYKKL/Pbr+X6t7H/AJk0VAZLgw6dudsWYM5mY4 UZi8NRbfI+MTdmfSWEQ2ZpvQ7TwrO85uYoIVf1StKVKbwykHZqxBgwhsE9m69BszfFiM WArZ05KAx5jjnR1sXHgIpBh03oSzSSMIWp5Y6F9fI7kMy/SHxhvbqt1IJHbbwvTdT1D3 ttHEfGtOpELeUPseTyBhgacUr7pb3TCy1Y2xSItOhbm9oVdxKUA2Q4kBZKQfcxCcYmIB r4GPuCUNrlN8PAaDxDjpW7r9Z0Xa9qAZ6TD1RNiTRAymTcMpXwoT/vEJbFP9yJi31ixG 2SlA== X-Gm-Message-State: AOAM533r4cmzgfVdckXcMGmHWiG60wx/G+R7G+FwWouH4/dnjKcTqqSL 1eOLlYgqeCT2n1bZKsRTUGeWn35U2BTCbw== X-Google-Smtp-Source: ABdhPJw7Nlp3y0rYOum2Vnmo5lUM3NQ7hVnTrTFoxZplbnLZ5ZRZT6O0CL0LU10J7ye5X9b325W8rA== X-Received: by 2002:a17:902:c3c9:b029:d1:e5e7:bdd9 with SMTP id j9-20020a170902c3c9b02900d1e5e7bdd9mr3215123plj.57.1600929534370; Wed, 23 Sep 2020 23:38:54 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:53 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 10/18] powerpc/83xx: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:11 +1000 Message-Id: <20200924063819.262830-10-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370347 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 4BxmBW1935z9sSC for ; Thu, 24 Sep 2020 16:59:47 +1000 (AEST) 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=vfKyiH3A; 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 4BxmBV6m4PzDqND for ; Thu, 24 Sep 2020 16:59:46 +1000 (AEST) 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::1044; helo=mail-pj1-x1044.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=vfKyiH3A; dkim-atps=neutral Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) (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 4BxlkX3MYCzDqbF for ; Thu, 24 Sep 2020 16:39:00 +1000 (AEST) Received: by mail-pj1-x1044.google.com with SMTP id t7so1140737pjd.3 for ; Wed, 23 Sep 2020 23:39:00 -0700 (PDT) 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=vfKyiH3Ak6b5t1HAsVgtZ0shGN1rEp2Sq6grFkfhHwfjRCKdVqeNvOfiNqWsJIyD8p RwRt39MhaMU5QM5pK1a37tWt1avCw5YqlvVEC36X4pZYG+ZcVVWbfDCOAYL5+RH2NtAv sHc0F2GTWN1FiSWPvmN45gmXR46YTc00znAQI6fThBZLo7xAppDtymZl563TDyTe0seP Msyno451nSaXxA5GbCHqSRgD6gL4WT61EcAYQ4JL0eFgWe/IZD6+TE7ifjJXzigT0aPd drOLiSNT9F4MSmsX7D3RM1xIMpcY5cpgcc8fmd46X2//WRKTVKVCJjqGdbemdzDGUYIh SV4Q== 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=QFIen0uuhhAMHsS+jNCeld/5Rx1MVMNBD2nzqBukaiVYGlFCghB1f4bj/RyiruObEa 4dzuCVkNbBIHbQoYIfVFzfoh5LFgcj7yy7rSH45oOBTaqcraU7j0cmdUKEDcFcYXd7f+ sQL0ufHEDaP0TmekdKpTfp0ZszuC12YL+qLbE8MhGGwESHjn6LW9yvz5B/DsLHZcqC8z FoY1Fu8eGE1xKZBtb7TbwlQkHMCMeLu87CtdaEBDdwXo807hk2V+PWS8G90ThMZC+Cqc Cbe30NmgV92hfMSaZWeqkzyK+524eiAYTNLmqWcGvIHInfrb8lJayelrvjXatAt8ZNEW fbLA== X-Gm-Message-State: AOAM531EyUlzefm02r8J4FD/1emscjGdZJuW6PQ2zr/IFEcv04OyWwn9 zD9TZCVjH5cvg3pqBd5C4dDQ9mDTI8Ju1A== X-Google-Smtp-Source: ABdhPJwiP5AE5uHwNk7+4lLoknKONX1YcfBt8dh8lVXvRso/Mvi2o8RyypTVat/mXUuX1LAVA5LaaA== X-Received: by 2002:a17:902:8545:b029:d1:f2e3:8dd4 with SMTP id d5-20020a1709028545b02900d1f2e38dd4mr3246954plo.65.1600929536530; Wed, 23 Sep 2020 23:38:56 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:56 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 11/18] powerpc/amigaone: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:12 +1000 Message-Id: <20200924063819.262830-11-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370349 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 4BxmDx52cPz9sSC for ; Thu, 24 Sep 2020 17:01:53 +1000 (AEST) 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=qBFz4n8s; 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 4BxmDx39jvzDqZ1 for ; Thu, 24 Sep 2020 17:01:53 +1000 (AEST) 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=qBFz4n8s; 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 4BxlkZ59lkzDqbC for ; Thu, 24 Sep 2020 16:39:02 +1000 (AEST) Received: by mail-pg1-x542.google.com with SMTP id f2so1310366pgd.3 for ; Wed, 23 Sep 2020 23:39:02 -0700 (PDT) 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=qBFz4n8soV3KT7AsHKyExwxxzw1uY+Xma4R+1bN92XZpatp1yNNLqNcJQXkT7uWvlF aQvQwJZYx9eCSB5brM0DnpzxRzWTndNmojJMDaEwYaZoy4TRDY7E3w3qXcELpikXPr5A dWf3BVHpwJ8NR1NFCCWuNJTw50jm2MzOCaLoHjPeH2kbjeduYHWd2HNVgQRfwXyFZRzH voZ9b8jnWcABHjov7Ln9vEdFERRgnX3R55ww51+mdZCJCD/+K688Ip76TTDEmv/c6jHd A4JbRE2WwFHyrQlOFmr1BqcGiUiI2hrHpxP2lY1vfeYukRDWX9rQxmQeq1bOErdb4OKZ Hw7w== 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=B4cmFe0qt7t/8N/7ZvaTMkekireYtH+Ay5nKUdJL8foqz23wYtCwWysvBpzl6immnf cQxFnbdYa4YBpgQIL2M6v2afDDicJUjDE9aAqEqxP3giYAEq/Ga43IbVBEZoewBp9+kj 26/AZbC2p0VpILCz5GtB+5bjsWqXZ7SuhyOuunrIPKiVWKXsNbviw9YNm27S4iAGXRoN K8VWqt3Kk8iNv1jUTZ+HYHC5I70+gQUxESpsibIqjknj+hk3AriyaYTmshnBrB73atPx TKwT6D2AprgIDz0QHyEa5+8xoM+9l7xHBcs1nq00TYdN+G+PPS6f8eZVssXZKtCaoquA V7kQ== X-Gm-Message-State: AOAM530upVKV+jjgYDX9gMD3hf6bDV+GbhkEtka8g/XqVL6ZTS2FOWZa LMQdh0WQsQWOmK7vNslE3dsA3Ud6nCCk+A== X-Google-Smtp-Source: ABdhPJwS0xHMYqkl1R0fj/1fRAPKMw6HuL/M0ngsZJsqhyprwo/9+vIdj2ZpAyA3nPE29aRebbVzZQ== X-Received: by 2002:a65:45c5:: with SMTP id m5mr2872122pgr.252.1600929538784; Wed, 23 Sep 2020 23:38:58 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:38:58 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 12/18] powerpc/chrp: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:13 +1000 Message-Id: <20200924063819.262830-12-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370356 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 4BxmL02sZkz9sSt for ; Thu, 24 Sep 2020 17:06:16 +1000 (AEST) 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=qscSdzyR; 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 4BxmKy71khzDqlK for ; Thu, 24 Sep 2020 17:06:14 +1000 (AEST) 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=qscSdzyR; 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 4Bxlkg1HbYzDqZ9 for ; Thu, 24 Sep 2020 16:39:07 +1000 (AEST) Received: by mail-pg1-x542.google.com with SMTP id d13so1299152pgl.6 for ; Wed, 23 Sep 2020 23:39:07 -0700 (PDT) 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=qscSdzyRGcajP6h156Sb/xn8QcBA8Y68v8YN5uv3pBVB0nhSvyKMto1hNwyBhR0rHb eQPfhAa55ja945Qvfs/msdfK+Li85IThlWjsrKHSQSi1hrI+6+ZY1sOv/oGMxtVv5BDk VGDWmnfGK76cYSILgGg7ty3R4YjU8pIMS4YKPhGKEfiF3cRDcSdFYOLgW7aVJTW4Wkgl 0u9EvlXVD9fQWyOAABdcful0+RPtpHeVUjaLt2uSwfErx2ki+zMU8CrzaOvwuXWbPGZA g04BZS0uXEK6GeseIcMWoRECXqx07wDvXPDI1IAcjGWVwTU7VOmcGWRXSQiPmwkg952R KqOQ== 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=kcHGuicv7hBjoxNlxqTaghPfFN8mMNCm2XmXyRYurNVNS2pyNePNuFGYE/o5QPi+75 3JbbwTEd5OLo2eS8k5BJrcaq+OH8R/AfTpsCOyGWc9YcILPfcUf3mEjVkWUbH1Hw8x54 PkHBk41zIkBIwqID/PBRwDZ2BW/HHS7cDY+9dmgRMoYnJ+8kRo8KILjvuy0HM5Z449iY cJX/yxmkLTvrHPCgiuiTTltu94tpLWZ4TLecfYy8zEdAYg2Pninu80HPvrj6PmVFFfrL 5ogS+Ip8wpv6sEEOpb2OtH7RkNUzVICiA5KxE/ZjU37Bj+9QyVcbEcQ+M/EmZKv/91dg lN9Q== X-Gm-Message-State: AOAM5328u3ORdOUfc8e8j4HLe3JmdYu2pEQOuG2rfu41zxCGmxby2Mm9 vm5mn1VmZZWTv2otaXPkxqR8vt1RQ+TiaQ== X-Google-Smtp-Source: ABdhPJwNmjQd9Ota9qu7tHoLec70rx3Ep5TCFZynpHfeuvCqHbt3sQHcd321Uob0nk0ltqvLlGR0Jw== X-Received: by 2002:a63:5566:: with SMTP id f38mr2916449pgm.9.1600929541206; Wed, 23 Sep 2020 23:39:01 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:39:00 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 13/18] powerpc/embedded6xx/holly: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:14 +1000 Message-Id: <20200924063819.262830-13-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370352 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 4BxmHB74N5z9sSt for ; Thu, 24 Sep 2020 17:03:50 +1000 (AEST) 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=JchFOeU0; 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 4BxmHB6G58zDqwf for ; Thu, 24 Sep 2020 17:03:50 +1000 (AEST) 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::644; helo=mail-pl1-x644.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=JchFOeU0; dkim-atps=neutral Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (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 4Bxlkj4gRrzDqZG for ; Thu, 24 Sep 2020 16:39:09 +1000 (AEST) Received: by mail-pl1-x644.google.com with SMTP id s19so1156199plp.3 for ; Wed, 23 Sep 2020 23:39:09 -0700 (PDT) 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=JchFOeU09GsLc2VCiYZsmIIiOL8kZZjK/r36Vgfe4DF1g590PZS1adzu+pkAF2yy97 uKNOoXGlrafnfQS0nKekdQYMYVQgd3VD70M+vcR2jGJOFC9j9tshfj77gR6qMkuBqBum 0nLeNv9+yzmsUN/JoAK5jBaeI9S82gX1n4FHPH867MMPm64nCCiOqIj4+O/O4jupJqv+ Zj935kHB+XXBk0+AzDfv3y0OHDWzsZUD6xPNbi1krwcxCdByERuiqvK9wOJmZ7P37p00 fX1W21yd+E7chJpewAEbCOYITLs/p+/gRWdtvjDIODqoNvf+hJLGmD/6RijiWERpcjLY Tn2Q== 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=qTJcgP4957Zcy0xIXMA0MN2yk1uHoqN4DI5pTDZd71r9gqP6kXcrbsn9f0ip5b7f8u M2yuI9/kbDEYwrnLpR3NIwltM55xzmxyY/eGJltpPDdkAJH8IpONegTawPDmRYWglyrz 9gThzisgH7c5q8/PVttVHjnkTTm8B4YRzeMH8Rq1MADe+YBLk+f9GJov2ASZumpdroS4 erJbxCDrs293u3fDme0lgTDjR9+6r+T3WwJXCllxlZ53ZaOU3XmKD7egD8tRMzpFBsFw vDFBLY0doep1NrB4WebdWJsPCjLOPujyufM0iARDljy0fS7K0pS1cY1pzRhUGi428ZyY C82Q== X-Gm-Message-State: AOAM530S0CVLJIIsz5G3AnGFGW4JnrGPbCU7nceV9FsvZYK4pato9sAU VnL/5OMVBKaVk1XisMyKNZNRkszWffx4FQ== X-Google-Smtp-Source: ABdhPJzXjskAsznSwT96h46kOqWGL02Is22NYPiA3kEF+STkPS/mCUPBWltie7EnhCPA0Yvcg3LU2A== X-Received: by 2002:a17:902:7c90:b029:d2:2503:f72e with SMTP id y16-20020a1709027c90b02900d22503f72emr3308726pll.55.1600929543276; Wed, 23 Sep 2020 23:39:03 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:39:02 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 14/18] powerpc/embedded6xx/linkstation: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:15 +1000 Message-Id: <20200924063819.262830-14-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370359 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 4BxmN038PFz9sSC for ; Thu, 24 Sep 2020 17:08:00 +1000 (AEST) 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=PvAwg4xb; 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 4BxmN02BfvzDqYX for ; Thu, 24 Sep 2020 17:08:00 +1000 (AEST) 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::1044; helo=mail-pj1-x1044.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=PvAwg4xb; dkim-atps=neutral Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) (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 4Bxlkk53p1zDqZk for ; Thu, 24 Sep 2020 16:39:10 +1000 (AEST) Received: by mail-pj1-x1044.google.com with SMTP id mn7so1072066pjb.5 for ; Wed, 23 Sep 2020 23:39:10 -0700 (PDT) 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=5t1oqeJTdmTDIFhaXJivPBTTrbZGolePOo9vp9IXGm4=; b=PvAwg4xbFfy9BrDgDOs9qn8XeG+MSI+PTQvItEEmYh+WKLD+cSCHZP1j3dvo1RdM+H kvRLWfl5T7mT49GkvrJdFJhXpWOVJTl3ToUy/uITVEHcfw33ZZTo7w+9a4cvjHWvmaBP tXwl3H7KHA3Jak7NKPrjVL+GphP6Lm2s0NQkovr8LMt7YefJfFMLVgrN6Lsc5l+wrA+z 37UCGNueWwC4kvRxb0SI5VLZ4Lign5zMzfa3oJCbZ3kvk8rv+GugFio2OjMzhIh50VMM y3QB9W7bMpSRw1HRvXWhzQ2umVCH4xZax16GEopF+nBnMbldV46+Qk2cjyLWa3y9zbvV J0lQ== 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=5t1oqeJTdmTDIFhaXJivPBTTrbZGolePOo9vp9IXGm4=; b=cGejj+Egd9Bvkz9HC6pAmQ37iRReOvSGPfIn0yOvtt1qHP6sjMO9dasExli2IKLKaV ySwKLD8R93/ZJdjOVnT95v9JNfUYSeXIlWm7OEg1wG4ekaFkvucswltFXBIXyaBrnaJG tlwyHHTuldftHKAnJlXqhmcjthrIFVNQZSNSku4DcPcbW1EiVgBZXpwN2JZ/w/pfEM8L NKKh3ybZPE7Aj/l8JB/51yjwRTwT5agXK7jDrfnDJpu+FNDr86ErL9MDnWAD6XXvy0Hs 4j5SXyf5qxwpDMkQUAfQQOAQmVS/HD3As1Hj+2DSZUus9jCvFJKS6GBdpxl2f9cCpkeI pufw== X-Gm-Message-State: AOAM532bOsq8vniQKl3rtO1/2hQSi9d7GrHQyisoEsNSlf1KhLI58HVW TkIzBmH7TZOqF4N8KpmX1xWwBZ38HeACPQ== X-Google-Smtp-Source: ABdhPJxsTWhGu+IZeMGpw5r4rwb7mm3za+dDFLQyH0/fXJUtPRVxbYR6sUbjkWzGLQNILdCB7D/uTQ== X-Received: by 2002:a17:902:8548:b029:d0:cbe1:e70b with SMTP id d8-20020a1709028548b02900d0cbe1e70bmr3181411plo.25.1600929545321; Wed, 23 Sep 2020 23:39:05 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:39:04 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 15/18] powerpc/embedded6xx/mpc7448: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:16 +1000 Message-Id: <20200924063819.262830-15-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 15437abe1f6d..20b727584e40 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 @@ -180,6 +183,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 Thu Sep 24 06:38: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: 1370360 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 4BxmPk0VPpz9sSC for ; Thu, 24 Sep 2020 17:09:30 +1000 (AEST) 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=hRDmD9LD; 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 4BxmPj71gTzDr43 for ; Thu, 24 Sep 2020 17:09:29 +1000 (AEST) 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=hRDmD9LD; 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 4Bxlkl6pZ8zDqZD for ; Thu, 24 Sep 2020 16:39:11 +1000 (AEST) Received: by mail-pg1-x541.google.com with SMTP id 5so1302642pgf.5 for ; Wed, 23 Sep 2020 23:39:11 -0700 (PDT) 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=Hs7ZyX2cBQHTsxxF5Jk2JeV8HIjhj94uAk5H9tfp1b4=; b=hRDmD9LDVT0RiP7Sq6QTaULd3fNcXZAYDlVbQZBTvFe9lEM+VRG5Fb4ACjFDqMxB3N topIIKGlr8kiZqtv0kLrkVrwXtA3pGB1xIibb0cx6q6A3PON8mHuawlFyF7np7QrCzne eKl5XMobFIupB2SbvDaOWxDsGNSuSiE+gIRU99yZJc4n/Q7bikjyteLoFEXHgw+lieCy 8KxYQuRiZj6Qyz+JhYMTWQ27nN8BBbtTboz6eRV4gebRzw1W6Dd2HlZ0Og3vpGvBFJGt vDmxdcIXywtNVY69WUCklip9NlCIt0LRu+44n7VsWJ8+5ngE5NueBysJNgmZU9+sBYg9 VM1w== 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=Hs7ZyX2cBQHTsxxF5Jk2JeV8HIjhj94uAk5H9tfp1b4=; b=MTNnht2+Q3vFv/hIpqKso1iHQaXkGwDFTETa24TR/XvaEEQnnGrWIUVLoQEFZJ352i snJKa4I/fufIq8X5PaoUcrVeS7kytTCLVAENgqcMq2gyJ9C0nWWh4CMcqsOFWTBqcWAt gWJZQpaTeQ2jutvqeXa1/6memCjOt9+5rjXqFrdNjPwozWOvfycUb25pflQF6e4fFNwt WVlMJFkaYhwP7MstY1AQNoK7MiuPRUu9cEsfqqVQkJ4rPsnYEDN4pC+Au6G0yzP6mdQO LOv6atvMjuCW1UFsUuiBDp5qfMht29Qox+jsz/uahhC1SwkrUG80Wr5Fqo3rV7/Hcedl VYTA== X-Gm-Message-State: AOAM531NLQ7y7oExXWQsjY0IwgQ7pVoNb7ZZ4VAuDdM7lQa6HowB2AgZ e8K5K+buYSAK3NpqFyUNdaRkxZUGaYHydw== X-Google-Smtp-Source: ABdhPJwkM+Rh6DMSI1tdZ+x69IZQpHjDVeC01OYPpu/kCOCIB/Krvg1VBNZod+TLpsrCqFRGbJ4P5Q== X-Received: by 2002:a63:c20f:: with SMTP id b15mr2777101pgd.8.1600929547607; Wed, 23 Sep 2020 23:39:07 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:39:07 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 16/18] powerpc/embedded6xx/mve5100: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:17 +1000 Message-Id: <20200924063819.262830-16-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 ed1914dd34bb..e8c5de54b0e1 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"); } /* @@ -116,6 +119,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 Thu Sep 24 06:38: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: 1370361 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 4BxmRj4Cr8z9sSC for ; Thu, 24 Sep 2020 17:11:13 +1000 (AEST) 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=vM4oPkmI; 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 4BxmRj3GSLzDqkb for ; Thu, 24 Sep 2020 17:11:13 +1000 (AEST) 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::642; helo=mail-pl1-x642.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=vM4oPkmI; dkim-atps=neutral Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 4Bxlkm12NKzDqZk for ; Thu, 24 Sep 2020 16:39:11 +1000 (AEST) Received: by mail-pl1-x642.google.com with SMTP id c3so1148172plz.5 for ; Wed, 23 Sep 2020 23:39:11 -0700 (PDT) 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=vM4oPkmIwRmpMqmf9JnDDFwhnTyqsk26aZbS00JQQrHsj22WM4KKKUiz4ffINzllkd FMXGRjS4YbJyZSYLSg/gbgGzkQgMc8cngCdNjpB7cmEAw93Chl9msqEBTevn5ETwTW6W KBs9ICzK4V0Seq7AtMkECTWlelaBbXVpahDlnaAddYpjXIrcoc3J00G+vL/Z1Vv3beRt cMpmqi0dPyUzksVEBEzPw+9SAVJseNiSzUPdpeX/UnfH43DSRGVDJpZbAFrRvNpcUDue t8/FCYfhUhfZFAVcKTJcYS85+l9p4MlNZqfqFoAs5hx8nJKewrEczPxFI5RwBrxU4875 FmwQ== 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=BhEFDO9K9lH/9LnoXRY1LTrVn4pEhM0i+K1yQ0rNWym9Irnkpyx8tdVeS5Ur3m4cU5 19LnvexHh6IFOM0PmWLNlVbr6n6bIdtNZs3VCPu1k8YGwH4gSRc+v+b6h9lXNwJjXLJp 6Ao8J2I3iqmDyGbY4Dva3u/J8NhaTaTuUKRrY/2g+D18G35MlYUFnZ5uNsa2RK6XvLbS lyQ1LzaHc9oJEZAZIad3vWvlKBlB2Q5Lsxf4WXSQ+vpn8XwjeZ7NSyjL6YRvxGbUmi/W XwuCsYZHGzD2NPDmkwabD8/Ua+QFYI/P+ibzy0tnzrE3pi/BsZlYK7AjLwOrWen/UnG8 eiig== X-Gm-Message-State: AOAM531RJn7hnViwV+VJz5/M8T38rvTLrw8bAA6gZhFqe/kltP6z0fkb kW3pZBay/MQnnvh9va6IVQsorFUyN95loQ== X-Google-Smtp-Source: ABdhPJx+X17gK0mGkRjoCCt2VIc4hViBwWTHW5zXKqe0jmzS/ZfzvtJY+xZt7ujCvOw8h2dV4L5WCw== X-Received: by 2002:a17:902:b60a:b029:d1:f2ad:439c with SMTP id b10-20020a170902b60ab02900d1f2ad439cmr3210395pls.82.1600929549742; Wed, 23 Sep 2020 23:39:09 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:39:09 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 17/18] powerpc/pasemi: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:18 +1000 Message-Id: <20200924063819.262830-17-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Thu Sep 24 06:38: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: 1370363 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 4BxmVT5Sxpz9sTH for ; Thu, 24 Sep 2020 17:13:37 +1000 (AEST) 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=mVB1TOA8; 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 4BxmVT52VJzDr1Z for ; Thu, 24 Sep 2020 17:13:37 +1000 (AEST) 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::644; helo=mail-pl1-x644.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=mVB1TOA8; dkim-atps=neutral Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (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 4Bxlkp5LRbzDqZG for ; Thu, 24 Sep 2020 16:39:14 +1000 (AEST) Received: by mail-pl1-x644.google.com with SMTP id m15so1138084pls.8 for ; Wed, 23 Sep 2020 23:39:14 -0700 (PDT) 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=zAwF4NRxv1a4fAkh5ifbzgbxF54V3rFyD1n+9m4ZTik=; b=mVB1TOA84H7tKi/+1uoIFdXFWlr997NN/hqiYM/fZHhn+fc7RffdN0f4BYHbY2VlTg xqWKEI6ZAPVkj9qTo84VNpQ9BKIYxqBc0030Zle19oXW5KuoIWSIktjMUyyikT5wNLUa QDUWiyX1yulwnBvFfgkYAUm8cm4ViLsRuNGWznlYVREyNxlZoj6ZhYHwDzmMN6jyoMps 6xmgB36fwkvNzG7bTiGZpaME8mXSdeAvxQI+OoyisF5T2c9r8TPSiUjcyUU8bi7vVBNH xwZfLd4FApHZirNOdz/rBvAtZmQChFzxvhA+fgw5VXRJqv3DuF3AbY38NH2TqyjaWQ1/ 198Q== 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=zAwF4NRxv1a4fAkh5ifbzgbxF54V3rFyD1n+9m4ZTik=; b=iRF0wDc7qm9cjfL9EdR14GuDVgDWfaT3ewWpIAUVDoc/I9MEjkVJgDn2bxcXMm6b1x wwA+KTf9sX7kv/72ERyUjAwdIR7zhs23sviA7K+3Y1PEWLnXrM4OPOPPhKWPX83+YY3P nxB3FEf6uARuVlWbo4BToDxw91XkdYrhLsN9wJMmVFLY4Pzg2Rz8C7kr/ifzudNd5y81 vxrwkvB4Wvmuj0fQnT0k9fvGcaiXvnpBxdqJBjfkI3g05lAbq89sH0MSDR2A5jTQ2PUm yHukthA/sfoQzjEd/VZmORQVItSAtOB4Ql1faMLHM6HDg21SjASNBPyhEq7IS7dEO0ly Uasg== X-Gm-Message-State: AOAM530vZjhEAz9Gk8oiGGR545AIfPQWYJB52VaPNp27ESBHyM0nwiId jgciuBJkOzGC5Bjj9OaW8N5SSbRDn1F4uA== X-Google-Smtp-Source: ABdhPJy9IQaf7RBKA4otamEV2vMEmsWoS/MLe53v3M781cCgG1X7UrlvPeqiB8KvfxrNGKFYuZfDgA== X-Received: by 2002:a17:902:a40b:b029:d2:1e66:9c with SMTP id p11-20020a170902a40bb02900d21e66009cmr3271308plq.52.1600929552026; Wed, 23 Sep 2020 23:39:12 -0700 (PDT) Received: from localhost.ibm.com (194-193-34-182.tpgi.com.au. [194.193.34.182]) by smtp.gmail.com with ESMTPSA id y1sm1662930pgr.3.2020.09.23.23.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 23:39:11 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 18/18] powerpc/powermac: Move PHB discovery Date: Thu, 24 Sep 2020 16:38:19 +1000 Message-Id: <20200924063819.262830-18-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200924063819.262830-1-oohall@gmail.com> References: <20200924063819.262830-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 Tested-by: Christophe Leroy --- 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 f002b0fa69b8..0f8669139a21 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 */