From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLACK,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89DC0C432C0 for ; Wed, 27 Nov 2019 02:18:29 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AC2F6207DD for ; Wed, 27 Nov 2019 02:18:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ozlabs-ru.20150623.gappssmtp.com header.i=@ozlabs-ru.20150623.gappssmtp.com header.b="NxYjiBXk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC2F6207DD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ozlabs.ru Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47N4FG2kBGzDql5 for ; Wed, 27 Nov 2019 13:18:26 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.ru (client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=aik@ozlabs.ru; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ozlabs.ru Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ozlabs-ru.20150623.gappssmtp.com header.i=@ozlabs-ru.20150623.gappssmtp.com header.b="NxYjiBXk"; 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 47N4CC1NmZzDqft for ; Wed, 27 Nov 2019 13:16:38 +1100 (AEDT) Received: by mail-pl1-x642.google.com with SMTP id j12so9025116plt.9 for ; Tue, 26 Nov 2019 18:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ozlabs-ru.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:autocrypt:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=h3ltnqLL7NqD5hgut0BLqf6QHfXXC286r9KUfynNsi0=; b=NxYjiBXkzGqu0szgHOLq/kZF55VwdEoHoXfu6qZCzVLuxc+kR4j28rdYvst4CV49mu 101cV5f5T1xnnluf7qWKcNoP1TR7kj3F/7xL9Ec4QKqnu5ixNrNJdQni5lYOo2KHQXl7 cIia3ZqpWpUo4ExZsLkZ5plrHJb1CCF34ovnBcjKSvAv/G6HP7EQNUjyTi0bxX0hqhr2 V/T+wS7uLALebNmcH63pCT6/Y9M6cokoslG0Hw33ZIWXscUErI0L112AHd9JmRBzBEKK +3JHYBky1G/LU3uN7ZOOubbLUjfPX2uVL9b2FfmZO2W68j95NjhZeZNW7Ku3SzxqX4c3 OZSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=h3ltnqLL7NqD5hgut0BLqf6QHfXXC286r9KUfynNsi0=; b=lrOG0DvvCB6nTtu8PBrHRPuNcBcnXCSZjdSByMXRd6qhV0JvVksv5gMMu1OwbMOMwO 1yHk4PQSe2JNRIYFbl3PVfjM1j93XvN7PqQlGlLRlwHchvr2bsd95+DwsP3/zqRgkbMf wx5Uty1dn7h/tC19DXvYJ/f2xkRHAPELPcVuLqFgfP/Sj66ofuCHyFgpVxNbYlBWz1q1 v0Zqzs4SOZXxMnXYYvpecQXGw5P4As4jHqp2NOFFa9wruRND1D+8G+PRJqv99+e6aW2A PQuWA8PCAdeJwNeonxCFM2T9DPTVhoTJ8a08f0rKl7XNfyraQ9nJxFx1tcZGozY9gHYS fZkw== X-Gm-Message-State: APjAAAViI6/Y2GsA+s/sDhoX1flDMbc22xQVuSdzIeuRR2uZGXy2H4xZ 1tTcbllBJ1En0dRc4hVm4wCa7eUDP/8= X-Google-Smtp-Source: APXvYqwILRQsTLfwjZMiB8XQTRUb5EqtSKgc/ogllEix1oTkVtQed6awPq/VnLECXM8sMH9SMcnIzQ== X-Received: by 2002:a17:90a:5895:: with SMTP id j21mr2926067pji.129.1574820996715; Tue, 26 Nov 2019 18:16:36 -0800 (PST) Received: from [10.61.2.175] ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id v15sm13805911pfe.44.2019.11.26.18.16.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Nov 2019 18:16:36 -0800 (PST) Subject: Re: [Very RFC 26/46] powernv/pci: Remove pdn from pnv_pci_cfg_{read|write} To: Oliver O'Halloran , linuxppc-dev@lists.ozlabs.org References: <20191120012859.23300-1-oohall@gmail.com> <20191120012859.23300-27-oohall@gmail.com> From: Alexey Kardashevskiy Autocrypt: addr=aik@ozlabs.ru; keydata= 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 Message-ID: <523dfd77-7401-6fa7-e9a4-7ab99b483b51@ozlabs.ru> Date: Wed, 27 Nov 2019 13:16:32 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191120012859.23300-27-oohall@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: alistair@popple.id.au, s.miroshnichenko@yadro.com Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 20/11/2019 12:28, Oliver O'Halloran wrote: > Remove the use of pci_dn from the low-level config space access functions. > These are used by the eeh's config ops and the bus config ops that we > provide to the PCI core. > > Signed-off-by: Oliver O'Halloran > --- > arch/powerpc/platforms/powernv/eeh-powernv.c | 14 +++-------- > arch/powerpc/platforms/powernv/pci.c | 26 ++++++++------------ > arch/powerpc/platforms/powernv/pci.h | 6 ++--- > 3 files changed, 16 insertions(+), 30 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c > index 49a932ff092a..8a73bc7517c5 100644 > --- a/arch/powerpc/platforms/powernv/eeh-powernv.c > +++ b/arch/powerpc/platforms/powernv/eeh-powernv.c > @@ -331,31 +331,25 @@ static inline bool pnv_eeh_cfg_blocked(struct eeh_dev *edev) > static int pnv_eeh_read_config(struct eeh_dev *edev, > int where, int size, u32 *val) > { > - struct pci_dn *pdn = eeh_dev_to_pdn(edev); > - > - if (!pdn) > - return PCIBIOS_DEVICE_NOT_FOUND; > + struct pnv_phb *phb = edev->controller->private_data; > > if (pnv_eeh_cfg_blocked(edev)) { > *val = 0xFFFFFFFF; > return PCIBIOS_SET_FAILED; > } > > - return pnv_pci_cfg_read(pdn, where, size, val); > + return pnv_pci_cfg_read(phb, edev->bdfn, where, size, val); > } > > static int pnv_eeh_write_config(struct eeh_dev *edev, > int where, int size, u32 val) > { > - struct pci_dn *pdn = eeh_dev_to_pdn(edev); > - > - if (!pdn) > - return PCIBIOS_DEVICE_NOT_FOUND; > + struct pnv_phb *phb = edev->controller->private_data; > > if (pnv_eeh_cfg_blocked(edev)) > return PCIBIOS_SET_FAILED; > > - return pnv_pci_cfg_write(pdn, where, size, val); > + return pnv_pci_cfg_write(phb, edev->bdfn, where, size, val); > } > > static struct eeh_pe *pnv_eeh_pe_get_parent(struct pci_dev *pdev) > diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c > index 50142ff045ac..36eea4bb514c 100644 > --- a/arch/powerpc/platforms/powernv/pci.c > +++ b/arch/powerpc/platforms/powernv/pci.c > @@ -654,11 +654,9 @@ static void pnv_pci_config_check_eeh(struct pnv_phb *phb, u16 bdfn) > } > } > > -int pnv_pci_cfg_read(struct pci_dn *pdn, > +int pnv_pci_cfg_read(struct pnv_phb *phb, u16 bdfn, > int where, int size, u32 *val) > { > - struct pnv_phb *phb = pdn->phb->private_data; > - u32 bdfn = (pdn->busno << 8) | pdn->devfn; > s64 rc; > > switch (size) { > @@ -685,19 +683,16 @@ int pnv_pci_cfg_read(struct pci_dn *pdn, > return PCIBIOS_FUNC_NOT_SUPPORTED; > } > > - pr_devel("%s: bus: %x devfn: %x +%x/%x -> %08x\n", > - __func__, pdn->busno, pdn->devfn, where, size, *val); > + pr_devel("%s: bdfn: %x +%x/%x -> %08x\n", > + __func__, bdfn, where, size, *val); > return PCIBIOS_SUCCESSFUL; > } > > -int pnv_pci_cfg_write(struct pci_dn *pdn, > +int pnv_pci_cfg_write(struct pnv_phb *phb, u16 bdfn, > int where, int size, u32 val) > { > - struct pnv_phb *phb = pdn->phb->private_data; > - u32 bdfn = (pdn->busno << 8) | pdn->devfn; > - > - pr_devel("%s: bus: %x devfn: %x +%x/%x -> %08x\n", > - __func__, pdn->busno, pdn->devfn, where, size, val); > + pr_devel("%s: bdfn: %x +%x/%x -> %08x\n", > + __func__, bdfn, where, size, val); > switch (size) { > case 1: > opal_pci_config_write_byte(phb->opal_id, bdfn, where, val); > @@ -753,12 +748,11 @@ static int pnv_pci_read_config(struct pci_bus *bus, > if (!pdn) > return PCIBIOS_DEVICE_NOT_FOUND; > > - edev = pdn_to_eeh_dev(pdn); > + edev = pnv_eeh_find_edev(phb, bdfn); > if (!pnv_eeh_pre_cfg_check(edev)) > return PCIBIOS_DEVICE_NOT_FOUND; > > - ret = pnv_pci_cfg_read(pdn, where, size, val); > - phb = pdn->phb->private_data; > + ret = pnv_pci_cfg_read(phb, bdfn, where, size, val); > if (phb->flags & PNV_PHB_FLAG_EEH && edev) { > if (*val == EEH_IO_ERROR_VALUE(size) && > eeh_dev_check_failure(edev)) > @@ -784,11 +778,11 @@ static int pnv_pci_write_config(struct pci_bus *bus, > if (!pdn) > return PCIBIOS_DEVICE_NOT_FOUND; > > - edev = pdn_to_eeh_dev(pdn); > + edev = pnv_eeh_find_edev(phb, bdfn); > if (!pnv_eeh_pre_cfg_check(edev)) > return PCIBIOS_DEVICE_NOT_FOUND; > > - ret = pnv_pci_cfg_write(pdn, where, size, val); > + ret = pnv_pci_cfg_write(phb, bdfn, where, size, val); > > if (!(phb->flags & PNV_PHB_FLAG_EEH)) > pnv_pci_config_check_eeh(phb, bdfn); > diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h > index be435a810d19..52dc4d05eaca 100644 > --- a/arch/powerpc/platforms/powernv/pci.h > +++ b/arch/powerpc/platforms/powernv/pci.h > @@ -7,8 +7,6 @@ > #include > #include > > -struct pci_dn; > - This is the best bit :) Reviewed-by: Alexey Kardashevskiy > enum pnv_phb_type { > PNV_PHB_IODA1 = 0, > PNV_PHB_IODA2 = 1, > @@ -174,9 +172,9 @@ extern struct pci_ops pnv_pci_ops; > > void pnv_pci_dump_phb_diag_data(struct pci_controller *hose, > unsigned char *log_buff); > -int pnv_pci_cfg_read(struct pci_dn *pdn, > +int pnv_pci_cfg_read(struct pnv_phb *phb, u16 bdfn, > int where, int size, u32 *val); > -int pnv_pci_cfg_write(struct pci_dn *pdn, > +int pnv_pci_cfg_write(struct pnv_phb *phb, u16 bdfn, > int where, int size, u32 val); > extern struct iommu_table *pnv_pci_table_alloc(int nid); > > -- Alexey