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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 46037C4360C for ; Thu, 26 Sep 2019 17:20:35 +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 EF7E2222C7 for ; Thu, 26 Sep 2019 17:20:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF7E2222C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46fMBm4TPWzDqlm for ; Fri, 27 Sep 2019 03:20:32 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=ajd@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 46fM8M282JzDqpv for ; Fri, 27 Sep 2019 03:18:27 +1000 (AEST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x8QHCoAA111825 for ; Thu, 26 Sep 2019 13:18:25 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2v9084ksx1-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 26 Sep 2019 13:18:24 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Sep 2019 18:18:22 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 26 Sep 2019 18:18:20 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x8QHIJig44761310 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Sep 2019 17:18:19 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 04E825205F; Thu, 26 Sep 2019 17:18:19 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6393752052; Thu, 26 Sep 2019 17:18:18 +0000 (GMT) Received: from [9.81.205.230] (unknown [9.81.205.230]) (using TLSv1.2 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id E72DFA00F9; Fri, 27 Sep 2019 03:18:12 +1000 (AEST) Subject: Re: [PATCH 10/11] pci/hotplug/pnv-php: Wrap warnings in macro To: Frederic Barrat , linuxppc-dev@lists.ozlabs.org, andrew.donnellan@au1.ibm.com, clombard@linux.ibm.com References: <20190909154600.19917-1-fbarrat@linux.ibm.com> <20190909154600.19917-11-fbarrat@linux.ibm.com> From: Andrew Donnellan Date: Thu, 26 Sep 2019 19:18:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190909154600.19917-11-fbarrat@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-AU Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 19092617-0028-0000-0000-000003A2F87D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19092617-0029-0000-0000-000024651758 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-09-26_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909260146 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: groug@kaod.org, alastair@au1.ibm.com Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 9/9/19 5:45 pm, Frederic Barrat wrote: > An opencapi slot doesn't have an associated bridge device. It's not > needed for operation, but any warning is displayed through pci_warn() > which uses the pci_dev struct of the assocated bridge device. So wrap > those warning so that a different trace mechanism can be used if it's > an opencapi slot. > > Signed-off-by: Frederic Barrat Reviewed-by: Andrew Donnellan > --- > drivers/pci/hotplug/pnv_php.c | 51 +++++++++++++++++++---------------- > 1 file changed, 28 insertions(+), 23 deletions(-) > > diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c > index 5ca51d67db4b..d01a8595bc5c 100644 > --- a/drivers/pci/hotplug/pnv_php.c > +++ b/drivers/pci/hotplug/pnv_php.c > @@ -18,6 +18,9 @@ > #define DRIVER_AUTHOR "Gavin Shan, IBM Corporation" > #define DRIVER_DESC "PowerPC PowerNV PCI Hotplug Driver" > > +#define SLOT_WARN(sl, x...) \ > + ((sl)->pdev ? pci_warn((sl)->pdev, x) : dev_warn(&(sl)->bus->dev, x)) > + > struct pnv_php_event { > bool added; > struct pnv_php_slot *php_slot; > @@ -265,7 +268,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) > > ret = pnv_pci_get_device_tree(php_slot->dn->phandle, fdt1, 0x10000); > if (ret) { > - pci_warn(php_slot->pdev, "Error %d getting FDT blob\n", ret); > + SLOT_WARN(php_slot, "Error %d getting FDT blob\n", ret); > goto free_fdt1; > } > > @@ -279,7 +282,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) > dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL); > if (!dt) { > ret = -EINVAL; > - pci_warn(php_slot->pdev, "Cannot unflatten FDT\n"); > + SLOT_WARN(php_slot, "Cannot unflatten FDT\n"); > goto free_fdt; > } > > @@ -289,15 +292,15 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) > ret = pnv_php_populate_changeset(&php_slot->ocs, php_slot->dn); > if (ret) { > pnv_php_reverse_nodes(php_slot->dn); > - pci_warn(php_slot->pdev, "Error %d populating changeset\n", > - ret); > + SLOT_WARN(php_slot, "Error %d populating changeset\n", > + ret); > goto free_dt; > } > > php_slot->dn->child = NULL; > ret = of_changeset_apply(&php_slot->ocs); > if (ret) { > - pci_warn(php_slot->pdev, "Error %d applying changeset\n", ret); > + SLOT_WARN(php_slot, "Error %d applying changeset\n", ret); > goto destroy_changeset; > } > > @@ -337,10 +340,10 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot, > if (ret > 0) { > if (be64_to_cpu(msg.params[1]) != php_slot->dn->phandle || > be64_to_cpu(msg.params[2]) != state) { > - pci_warn(php_slot->pdev, "Wrong msg (%lld, %lld, %lld)\n", > - be64_to_cpu(msg.params[1]), > - be64_to_cpu(msg.params[2]), > - be64_to_cpu(msg.params[3])); > + SLOT_WARN(php_slot, "Wrong msg (%lld, %lld, %lld)\n", > + be64_to_cpu(msg.params[1]), > + be64_to_cpu(msg.params[2]), > + be64_to_cpu(msg.params[3])); > return -ENOMSG; > } > if (be64_to_cpu(msg.params[3]) != OPAL_SUCCESS) { > @@ -359,8 +362,8 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot, > return ret; > > error: > - pci_warn(php_slot->pdev, "Error %d powering %s\n", > - ret, (state == OPAL_PCI_SLOT_POWER_ON) ? "on" : "off"); > + SLOT_WARN(php_slot, "Error %d powering %s\n", > + ret, (state == OPAL_PCI_SLOT_POWER_ON) ? "on" : "off"); > return ret; > } > EXPORT_SYMBOL_GPL(pnv_php_set_slot_power_state); > @@ -378,8 +381,8 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state) > */ > ret = pnv_pci_get_power_state(php_slot->id, &power_state); > if (ret) { > - pci_warn(php_slot->pdev, "Error %d getting power status\n", > - ret); > + SLOT_WARN(php_slot, "Error %d getting power status\n", > + ret); > } else { > *state = power_state; > } > @@ -402,7 +405,7 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state) > *state = presence; > ret = 0; > } else { > - pci_warn(php_slot->pdev, "Error %d getting presence\n", ret); > + SLOT_WARN(php_slot, "Error %d getting presence\n", ret); > } > > return ret; > @@ -637,7 +640,7 @@ static int pnv_php_register_slot(struct pnv_php_slot *php_slot) > ret = pci_hp_register(&php_slot->slot, php_slot->bus, > php_slot->slot_no, php_slot->name); > if (ret) { > - pci_warn(php_slot->pdev, "Error %d registering slot\n", ret); > + SLOT_WARN(php_slot, "Error %d registering slot\n", ret); > return ret; > } > > @@ -690,7 +693,7 @@ static int pnv_php_enable_msix(struct pnv_php_slot *php_slot) > /* Enable MSIx */ > ret = pci_enable_msix_exact(pdev, &entry, 1); > if (ret) { > - pci_warn(pdev, "Error %d enabling MSIx\n", ret); > + SLOT_WARN(php_slot, "Error %d enabling MSIx\n", ret); > return ret; > } > > @@ -734,8 +737,9 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data) > (sts & PCI_EXP_SLTSTA_PDC)) { > ret = pnv_pci_get_presence_state(php_slot->id, &presence); > if (ret) { > - pci_warn(pdev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n", > - php_slot->name, ret, sts); > + SLOT_WARN(php_slot, > + "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n", > + php_slot->name, ret, sts); > return IRQ_HANDLED; > } > > @@ -764,8 +768,9 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data) > */ > event = kzalloc(sizeof(*event), GFP_ATOMIC); > if (!event) { > - pci_warn(pdev, "PCI slot [%s] missed hotplug event 0x%04x\n", > - php_slot->name, sts); > + SLOT_WARN(php_slot, > + "PCI slot [%s] missed hotplug event 0x%04x\n", > + php_slot->name, sts); > return IRQ_HANDLED; > } > > @@ -789,7 +794,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq) > /* Allocate workqueue */ > php_slot->wq = alloc_workqueue("pciehp-%s", 0, 0, php_slot->name); > if (!php_slot->wq) { > - pci_warn(pdev, "Cannot alloc workqueue\n"); > + SLOT_WARN(php_slot, "Cannot alloc workqueue\n"); > pnv_php_disable_irq(php_slot, true); > return; > } > @@ -813,7 +818,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq) > php_slot->name, php_slot); > if (ret) { > pnv_php_disable_irq(php_slot, true); > - pci_warn(pdev, "Error %d enabling IRQ %d\n", ret, irq); > + SLOT_WARN(php_slot, "Error %d enabling IRQ %d\n", ret, irq); > return; > } > > @@ -849,7 +854,7 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot) > > ret = pci_enable_device(pdev); > if (ret) { > - pci_warn(pdev, "Error %d enabling device\n", ret); > + SLOT_WARN(php_slot, "Error %d enabling device\n", ret); > return; > } > > -- Andrew Donnellan OzLabs, ADL Canberra ajd@linux.ibm.com IBM Australia Limited