From patchwork Sat Apr 8 15:48:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 81248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp952264vqo; Sat, 8 Apr 2023 09:07:51 -0700 (PDT) X-Google-Smtp-Source: AKy350a845mppqnQz52S6/8Z3lC6hlYdtpxxcNOsCKsRjtpKGTOrUl4tgEwa7bkUn3YCSVgz1xdj X-Received: by 2002:aa7:9616:0:b0:62d:c382:1384 with SMTP id q22-20020aa79616000000b0062dc3821384mr6369510pfg.5.1680970070875; Sat, 08 Apr 2023 09:07:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680970070; cv=none; d=google.com; s=arc-20160816; b=fBhDX7iHO7Rb0idPrpB5UCCBtVCfWVAOqxWwr9Y6U16MZDZsX7jHP71TMwQrwadenY fI+edJENJxBsg3DO6HAU9Ec+udgPa0uDoi5AJLqhijUFByOftlbKyYSbogFjsYi8tFdN v7eqncXzKPRSDuFlHVc+dbdu5BIDx8iYSqrHs+o5c9XxD4FO6W9/7kQhbJvuw6yuZoFD DApd0VR8EWXFna9hbacjkLyqZf3WaIA0J/RTB8fkkI1XG9HGmO1sKZ11n32LKR4KXbCR ws4Q3Qm7wivc7syPzmjKdHIIEm51f4VrSu+SP8HlxT1BatRnYsnYc/llppnqdhzA8zFo 1BGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bFR1F9klYQ4KqG6ez4UJSCi45dcCLKa28RGliG130Yg=; b=ArIXkKFBraEvmImbqNYN5K/7xcIN1DlCmNu92L+uXf+iJvIoBOlQVWp8RM6YaXRU4b /jZgEINsH1kPTiilfxupswbQjAHkmnh7HegBCoOvfO01m/0MIneB1FYQCKaZTUuurfeF RjQuYHHTDM3Sq0tXsnHHp2gpWo1AtdLCFavLaRiVx3+0BhtYEiHyJHlQu4FKtKH8ndRE ZaxWInSs9HcXSkLT4XIn+/sNsE5Kzbkjrq6rnthAOkGrHQ5JnjUUBUgFmL8bLvBWN/57 wkOJT1rPF3TSowbeqrZrKtpT5ufH6LAYovZwsjXVaGNFg58tmauVJ4/drYXEqlh0KXX7 TVWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=I7b6aS9i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 26-20020a63195a000000b0050bdc2e7efdsi6199736pgz.42.2023.04.08.09.07.38; Sat, 08 Apr 2023 09:07:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=I7b6aS9i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230176AbjDHPtj (ORCPT + 99 others); Sat, 8 Apr 2023 11:49:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbjDHPtY (ORCPT ); Sat, 8 Apr 2023 11:49:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB22D31B for ; Sat, 8 Apr 2023 08:49:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 19ED46159D for ; Sat, 8 Apr 2023 15:49:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52194C4339E; Sat, 8 Apr 2023 15:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680968961; bh=ps76pyu3TDlG2IApvb70QcdiPajYqBKpLTa4tWI5Ohs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I7b6aS9iNM/B6evLHDiI7sYSh/+XCmeVoD1Lav/hmwvxFbbQecNetC7zAdT+PeBMo ia+Rrd3WJhqZE7AcSm4o8Ufuw/08swNvBNZF+qPtyoVTbjbcNoWArsv3e0Fzd62OMO DAsKi2QorKMGmjuMGQga6Z7IebgaD0LzTNLZ0X33C6vlsigbJDHLi7ULgTsUTz2qu3 abux0MGQU3i/3WGKRL0B/9xahwOCIOIMEQlWlYoWGqgJe+fc8eqy0BkJdxzndOyfSY nR2KTTAdJiPAABHTaHfFsepehuiIyHNX6KE10oKl0IIbaH1XM+JG6st4zDGSQVIc3L /Mn7ZlApa6PTA== Received: by pali.im (Postfix) id E5061213C; Sat, 8 Apr 2023 17:49:18 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Michael Ellerman , Christophe Leroy , Nicholas Piggin Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] powerpc/mpc86xx: mpc86xx_hpcn: Call uli_init() instead of explicit ppc_md assignment Date: Sat, 8 Apr 2023 17:48:13 +0200 Message-Id: <20230408154814.10400-8-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230408154814.10400-1-pali@kernel.org> References: <20230408154814.10400-1-pali@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-5.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762624873118509678?= X-GMAIL-MSGID: =?utf-8?q?1762624873118509678?= After calling fsl_pci_assign_primary(), it is possible to use uli_init() to conditionally initialize ppc_md.pci_exclude_device callback based on the uli1575 detection. Signed-off-by: Pali Rohár --- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index 645125cc8420..812110673d88 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c @@ -46,10 +46,6 @@ mpc86xx_hpcn_setup_arch(void) if (ppc_md.progress) ppc_md.progress("mpc86xx_hpcn_setup_arch()", 0); -#ifdef CONFIG_PCI - ppc_md.pci_exclude_device = uli_exclude_device; -#endif - printk("MPC86xx HPCN board from Freescale Semiconductor\n"); #ifdef CONFIG_SMP @@ -57,6 +53,7 @@ mpc86xx_hpcn_setup_arch(void) #endif fsl_pci_assign_primary(); + uli_init(); swiotlb_detect_4g(); }