From patchwork Tue Jul 5 02:30:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 644440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rk7FD4lppz9sRZ for ; Tue, 5 Jul 2016 12:32:00 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rk7FD1m8hzDqy0 for ; Tue, 5 Jul 2016 12:32:00 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 3rk7Cx3S7fzDqr5 for ; Tue, 5 Jul 2016 12:30:53 +1000 (AEST) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u652TGQY032876 for ; Mon, 4 Jul 2016 22:30:50 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0a-001b2d01.pphosted.com with ESMTP id 23x9mdet9f-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 04 Jul 2016 22:30:50 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 5 Jul 2016 12:30:46 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 5 Jul 2016 12:30:44 +1000 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: gwshan@linux.vnet.ibm.com X-IBM-RcptTo: skiboot@lists.ozlabs.org Received: from d23relay06.au.ibm.com (d23relay06.au.ibm.com [9.185.63.219]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 625742CE8054 for ; Tue, 5 Jul 2016 12:30:44 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u652UiWR13173162 for ; Tue, 5 Jul 2016 12:30:44 +1000 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u652UiXB028046 for ; Tue, 5 Jul 2016 12:30:44 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u652UhTw028013; Tue, 5 Jul 2016 12:30:43 +1000 Received: from bran.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 5B30DA0094; Tue, 5 Jul 2016 12:30:13 +1000 (AEST) Received: from gwshan (shangw.ozlabs.ibm.com [10.61.2.199]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id 4EDE7E3B4B; Tue, 5 Jul 2016 12:30:13 +1000 (AEST) Received: by gwshan (Postfix, from userid 1000) id 3207B942CA8; Tue, 5 Jul 2016 12:30:13 +1000 (AEST) From: Gavin Shan To: skiboot@lists.ozlabs.org Date: Tue, 5 Jul 2016 12:30:09 +1000 X-Mailer: git-send-email 2.1.0 In-Reply-To: <1467685811-7030-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1467685811-7030-1-git-send-email-gwshan@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16070502-0012-0000-0000-000001A700F7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16070502-0013-0000-0000-000005857170 Message-Id: <1467685811-7030-2-git-send-email-gwshan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-05_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607050022 Subject: [Skiboot] [PATCH 1/3] core/pci: Improve PCI config register filter X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair@popple.id.au MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This improves PCI config register filter so that it can be reused by PCI virtual device in subsequent patch: * First argument to pci_cfg_reg_func() is changed to "void *". It allows to accept variable data types including PCI virtual device in future. * Return value from pci_cfg_reg_func() to be used by PCI virtual device in future. * Shortened name of function phb3_pcicfg_filter_rc_pref_window(). Signed-off-by: Gavin Shan --- hw/phb3.c | 14 ++++++++------ include/pci.h | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/phb3.c b/hw/phb3.c index 905fdf4..85166d0 100644 --- a/hw/phb3.c +++ b/hw/phb3.c @@ -72,10 +72,10 @@ static bool phb3_fenced(struct phb3 *p) return false; } -static void phb3_pcicfg_filter_rc_pref_window(struct pci_device *pd __unused, - struct pci_cfg_reg_filter *pcrf, - uint32_t offset, uint32_t len, - uint32_t *data, bool write) +static int64_t phb3_pcicfg_rc_pref_window(void *dev __unused, + struct pci_cfg_reg_filter *pcrf, + uint32_t offset, uint32_t len, + uint32_t *data, bool write) { uint8_t *pdata; uint32_t i; @@ -85,7 +85,7 @@ static void phb3_pcicfg_filter_rc_pref_window(struct pci_device *pd __unused, pdata = &pcrf->data[offset - pcrf->start]; for (i = 0; i < len; i++, pdata++) *pdata = (uint8_t)(*data >> (8 * i)); - return; + return OPAL_SUCCESS; } /* Return whatever we cached */ @@ -100,6 +100,8 @@ static void phb3_pcicfg_filter_rc_pref_window(struct pci_device *pd __unused, *data |= *pdata; } + + return OPAL_SUCCESS; } /* @@ -495,7 +497,7 @@ static void phb3_check_device_quirks(struct phb *phb, struct pci_device *dev) pci_add_cfg_reg_filter(dev, PCI_CFG_PREF_MEM_BASE_U32, 12, PCI_REG_FLAG_READ | PCI_REG_FLAG_WRITE, - phb3_pcicfg_filter_rc_pref_window); + phb3_pcicfg_rc_pref_window); } } } diff --git a/include/pci.h b/include/pci.h index 83c9683..fcf6e86 100644 --- a/include/pci.h +++ b/include/pci.h @@ -25,10 +25,10 @@ struct pci_device; struct pci_cfg_reg_filter; -typedef void (*pci_cfg_reg_func)(struct pci_device *pd, - struct pci_cfg_reg_filter *pcrf, - uint32_t offset, uint32_t len, - uint32_t *data, bool write); +typedef int64_t (*pci_cfg_reg_func)(void *dev, + struct pci_cfg_reg_filter *pcrf, + uint32_t offset, uint32_t len, + uint32_t *data, bool write); struct pci_cfg_reg_filter { uint32_t flags; #define PCI_REG_FLAG_READ 0x1